Changeset 3181 for trunk/LMDZ.COMMON

Timestamp:

Jan 25, 2024, 2:33:52 PM (10 months ago)

Author:

jbclement

Message:

PEM:

• Addition of a script "inipem_orbit.sh" in the deftank to modify the orbital parameters of a file "startfi.nc" according to the date set in the file "run_PEM.def" and data found in "obl_ecc_lsp.asc";
• Flow of glaciers is now computed only when there are slopes;
• Reversion to the name "diagpem.nc" for the PEM outputs (as decided) which was modified in r3171;
• Some small cleanings.

JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• constants_marspem_mod.F90 (modified) (3 diffs)
• deftank/inipem_orbit.sh (added)
• deftank/launch_orb_1Dchained.sh (modified) (1 diff)
• deftank/launch_pem.sh (modified) (1 diff)
• pem.F90 (modified) (6 diffs)
• read_data_PCM_mod.F90 (modified) (1 diff)
• recomp_tend_co2_slope_mod.F90 (modified) (1 diff)
• reshape_XIOS_output.F90 (modified) (4 diffs)
• writediagpem.F90 (modified) (3 diffs)

trunk/LMDZ.COMMON/libf/evolution/changelog.txt

@@ -204 +204 @@
 gathered in an unique Tsoil module.
 (cosmetic commit)
+
+== 09/01/2023 == JBC
+- Addition of a script "inipem_orbit.sh" in the deftank to modify the orbital parameters of a file "startfi.nc" according to the date set in the file "run_PEM.def" and data found in "obl_ecc_lsp.asc";
+- Flow of glaciers is now computed only when there are slopes;
+- Reversion to the name "diagpem.nc" for the PEM outputs (as decided) which was modified in r3171;
+- Some small cleanings.

trunk/LMDZ.COMMON/libf/evolution/constants_marspem_mod.F90

@@ -3 +3 @@
 implicit none
 
-! Duration of a year and day 
+! Duration of a year and day
 integer, parameter :: sols_per_my = 669    ! Number of Sols per year
 real,    parameter :: sec_per_sol = 88775. ! Duration of a sol, in seconds
 
-! Molecular masses for CO2,H2O and non condensible gaz, following Franz et al. 2017    
-real, parameter :: m_co2 = 44.01e-3    ! CO2 molecular mass (kg/mol)   
-real, parameter :: m_noco2 = 33.37e-3  ! Non condensible mol mass (kg/mol)   
+! Molecular masses for CO2,H2O and non condensible gaz, following Franz et al. 2017
+real, parameter :: m_co2 = 44.01e-3    ! CO2 molecular mass (kg/mol)
+real, parameter :: m_noco2 = 33.37e-3  ! Non condensible mol mass (kg/mol)
 real, parameter :: m_h2o = 18.01528e-3 ! Molecular weight of h2o (kg/mol)
 
@@ -20 +20 @@
 real, parameter :: beta_clap_h2o = -6143.7  ! Kelvin, Murphy and Koop 2005
 
-! Density of the regolith (Zent et al., 1995, Buhler and Piqueux 2021)     
+! Density of the regolith (Zent et al., 1995, Buhler and Piqueux 2021)
 real, parameter :: rho_regolith = 2000. ! kg/m^3
 
@@ -32 +32 @@
 
 ! Stefan Boltzmann constant
-real, parameter :: sigmaB = 5.678e-8 
+real, parameter :: sigmaB = 5.678e-8
 
 ! Latent heat of CO2

trunk/LMDZ.COMMON/libf/evolution/deftank/launch_orb_1Dchained.sh

@@ -31 +31 @@
 #------------------ Modify here the name of PCM exe --------------------
 ## fill in the name of executable for PCM:
-exePCM=testphys1d_29_phymars_para.e
+exePCM="testphys1d_29_phymars_para.e"
 
 #----------- Modify here the name of the orbital data file -------------
 ## fill in the name of executable for PCM:
-orb_data=obl_ecc_lsp.asc
+orb_data="obl_ecc_lsp.asc"
 
 #------ Check if files/directories necessary for the script exist ------

trunk/LMDZ.COMMON/libf/evolution/deftank/launch_pem.sh

@@ -32 +32 @@
 #------------------ Modify here the name of PEM exe --------------------
 ## fill in the name of executable for PEM:
-exePEM=pem_29_phymars_seq.e
+exePEM="pem_29_phymars_seq.e"
 
 #-------------- Modify here the name of reshape XIOS exe ---------------
 ## fill in the name of executable for reshape XIOS:
-exeReshape=reshape_XIOS_output_64x48x29_phymars_seq.e
+exeReshape="reshape_XIOS_output_64x48x29_phymars_seq.e"
 
 #------ Check if files/directories necessary for the script exist ------

trunk/LMDZ.COMMON/libf/evolution/pem.F90

@@ -68 +68 @@
 use recomp_tend_co2_slope_mod,  only: recomp_tend_co2_slope
 use compute_soiltemp_mod,       only: compute_tsoil_pem
-use writediagpem_mod,           only: writediagfipem, writediagsoilpem
+use writediagpem_mod,           only: writediagpem, writediagsoilpem
 
 #ifndef CPP_STD
@@ -219 +219 @@
 logical                               :: bool_sublim                        ! logical to check if there is sublimation or not
 real, dimension(:,:),     allocatable :: porefillingice_thickness_prev_iter ! ngrid x nslope: Thickness of the ice table at the previous iteration [m]
-real, dimension(:),       allocatable :: delta_h2o_icetablesublim(:)        ! ngrid x Total mass of the H2O that has sublimated / condenses from the ice table [kg]
+real, dimension(:),       allocatable :: delta_h2o_icetablesublim           ! ngrid x Total mass of the H2O that has sublimated / condenses from the ice table [kg]
 
 ! Some variables for the PEM run
@@ -725 +725 @@
 !    II_c Flow of glaciers
 !------------------------
-    if (co2ice_flow) call flow_co2glaciers(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,vmr_co2_PEM_phys,ps_timeseries, &
+    if (co2ice_flow .and. nslope > 1) call flow_co2glaciers(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,vmr_co2_PEM_phys,ps_timeseries, &
                                             global_avg_press_PCM,global_avg_press_new,co2_ice,flag_co2flow,flag_co2flow_mesh)
-    if (h2oice_flow) call flow_h2oglaciers(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,tsurf_ave,h2o_ice,flag_h2oflow,flag_h2oflow_mesh)
+    if (h2oice_flow .and. nslope > 1) call flow_h2oglaciers(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,tsurf_ave,h2o_ice,flag_h2oflow,flag_h2oflow_mesh)
 
 !------------------------
@@ -776 +776 @@
                 do t = 1,timelen
                     if (co2_ice_PCM(ig,islope,t) > 1.e-3) then
-                        ave = ave + beta_clap_co2/(alpha_clap_co2-log(vmr_co2_PEM_phys(ig,t)*ps_timeseries(ig,t)/100.))
+                        ave = ave + beta_clap_co2/(alpha_clap_co2 - log(vmr_co2_PEM_phys(ig,t)*ps_timeseries(ig,t)/100.))
                     else
                         ave = ave + tsurf_PCM_timeseries(ig,islope,t)
@@ -874 +874 @@
 !    II_e Outputs
 !------------------------
-    call writediagfipem(ngrid,'ps_ave','Global average pressure','Pa',0,(/global_avg_press_new/))
+    call writediagpem(ngrid,'ps_ave','Global average pressure','Pa',0,(/global_avg_press_new/))
     do islope = 1,nslope
         write(str2(1:2),'(i2.2)') islope
-        call writediagfipem(ngrid,'h2o_ice_slope'//str2,'H2O ice','kg.m-2',2,h2o_ice(:,islope))
-        call writediagfipem(ngrid,'co2_ice_slope'//str2,'CO2 ice','kg.m-2',2,co2_ice(:,islope))
-        call writediagfipem(ngrid,'tend_h2o_ice_slope'//str2,'H2O ice tend','kg.m-2.year-1',2,tend_h2o_ice(:,islope))
-        call writediagfipem(ngrid,'tend_co2_ice_slope'//str2,'CO2 ice tend','kg.m-2.year-1',2,tend_co2_ice(:,islope))
-        call writediagfipem(ngrid,'Flow_co2ice_slope'//str2,'CO2 ice flow','Boolean',2,flag_co2flow(:,islope))
-        call writediagfipem(ngrid,'tsurf_slope'//str2,'tsurf','K',2,tsurf(:,islope))
+        call writediagpem(ngrid,'h2o_ice_slope'//str2,'H2O ice','kg.m-2',2,h2o_ice(:,islope))
+        call writediagpem(ngrid,'co2_ice_slope'//str2,'CO2 ice','kg.m-2',2,co2_ice(:,islope))
+        call writediagpem(ngrid,'tend_h2o_ice_slope'//str2,'H2O ice tend','kg.m-2.year-1',2,tend_h2o_ice(:,islope))
+        call writediagpem(ngrid,'tend_co2_ice_slope'//str2,'CO2 ice tend','kg.m-2.year-1',2,tend_co2_ice(:,islope))
+        call writediagpem(ngrid,'Flow_co2ice_slope'//str2,'CO2 ice flow','Boolean',2,flag_co2flow(:,islope))
+        call writediagpem(ngrid,'tsurf_slope'//str2,'tsurf','K',2,tsurf(:,islope))
         if(icetable_equilibrium) then
-            call writediagfipem(ngrid,'ssi_depth_slope'//str2,'ice table depth','m',2,porefillingice_depth(:,islope))
-            call writediagfipem(ngrid,'ssi_thick_slope'//str2,'ice table depth','m',2,porefillingice_thickness(:,islope))
+            call writediagpem(ngrid,'ssi_depth_slope'//str2,'ice table depth','m',2,porefillingice_depth(:,islope))
+            call writediagpem(ngrid,'ssi_thick_slope'//str2,'ice table depth','m',2,porefillingice_thickness(:,islope))
         endif
         if(soil_pem) then
@@ -985 +985 @@
     tsoil = tsoil_phys_PEM_timeseries(:,1:nsoilmx,:,timelen)
 #ifndef CPP_STD
-    flux_geo(:,:) = fluxgeo
+    flux_geo = fluxgeo
 #endif
 endif

trunk/LMDZ.COMMON/libf/evolution/read_data_PCM_mod.F90

@@ -35 +35 @@
 !=======================================================================
 ! Arguments:
-
 character(*), intent(in) :: filename                            ! File name
 integer,      intent(in) :: timelen                             ! number of times stored in the file
 integer,      intent(in) :: iim_input, jjm_input, ngrid, nslope ! number of points in the lat x lon dynamical grid, number of subgrid slopes
 ! Ouputs
-real, dimension(ngrid,nslope),         intent(out) :: min_co2_ice      ! Minimum of co2 ice  per slope of the year [kg/m^2]
+real, dimension(ngrid,nslope),         intent(out) :: min_co2_ice      ! Minimum of co2 ice per slope of the year [kg/m^2]
 real, dimension(ngrid,nslope),         intent(out) :: min_h2o_ice      ! Minimum of h2o ice per slope of the year [kg/m^2]
-real, dimension(ngrid,timelen),        intent(out) :: vmr_co2_PCM_phys ! Physics x Times  co2 volume mixing ratio retrieve from the PCM [m^3/m^3]
+real, dimension(ngrid,timelen),        intent(out) :: vmr_co2_PCM_phys ! Physics x Times co2 volume mixing ratio retrieve from the PCM [m^3/m^3]
 real, dimension(ngrid,timelen),        intent(out) :: ps_timeseries    ! Surface Pressure [Pa]
 real, dimension(ngrid,timelen),        intent(out) :: q_co2            ! CO2 mass mixing ratio in the first layer [kg/m^3]

trunk/LMDZ.COMMON/libf/evolution/recomp_tend_co2_slope_mod.F90

@@ -24 +24 @@
 !   INPUT
 integer,                        intent(in) :: timelen, ngrid, nslope
-real, dimension(ngrid,timelen), intent(in) :: vmr_co2_PCM                 ! physical point field : Volume mixing ratio of co2 in the first layer
-real, dimension(ngrid,timelen), intent(in) :: vmr_co2_pem                 ! physical point field : Volume mixing ratio of co2 in the first layer
-real, dimension(ngrid,timelen), intent(in) :: ps_PCM_2                    ! physical point field : Surface pressure in the PCM
+real, dimension(ngrid,timelen), intent(in) :: vmr_co2_PCM                 ! physical point field: Volume mixing ratio of co2 in the first layer
+real, dimension(ngrid,timelen), intent(in) :: vmr_co2_pem                 ! physical point field: Volume mixing ratio of co2 in the first layer
+real, dimension(ngrid,timelen), intent(in) :: ps_PCM_2                    ! physical point field: Surface pressure in the PCM
 real,                           intent(in) :: global_avg_press_PCM        ! global averaged pressure at previous timestep
 real,                           intent(in) :: global_avg_press_new        ! global averaged pressure at current timestep
-real, dimension(ngrid,nslope),  intent(in) :: tendencies_co2_ice_phys_ini ! physical point field : Evolution of perennial ice over one year
+real, dimension(ngrid,nslope),  intent(in) :: tendencies_co2_ice_phys_ini ! physical point field: Evolution of perennial ice over one year
 real, dimension(ngrid,nslope),  intent(in) :: co2ice_slope                ! CO2 ice per mesh and sub-grid slope (kg/m^2)
 real, dimension(ngrid,nslope),  intent(in) :: emissivity_slope            ! Emissivity per mesh and sub-grid slope(1)
 !   OUTPUT
-real, intent(inout) ::  tendencies_co2_ice_phys(ngrid,nslope) ! physical point field : Evolution of perennial ice over one year
+real, dimension(ngrid,nslope), intent(inout) ::  tendencies_co2_ice_phys ! physical point field: Evolution of perennial ice over one year
 
 !   local:
-!   ----
+!   ------
 integer :: i, t, islope
 real    :: coef, ave

trunk/LMDZ.COMMON/libf/evolution/reshape_XIOS_output.F90

@@ -30 +30 @@
     write(*,*) 'numyear',numyear
     write(str(1:1),'(i1.1)') numyear
-    !nf90_open                 ! open existing netCDF dataset
-    !integer :: ncid, state
-    !...
+
     state = nf90_open(path = "data2reshape"//str//".nc", mode = nf90_nowrite, ncid = ncid1)
     if (state /= nf90_noerr) call handle_err(state)
@@ -69 +67 @@
             len_lon = len_
             len_ = len_ + 1
-        elseif (name_ == "lat".or. name_ == "latitude") then
+        else if (name_ == "lat".or. name_ == "latitude") then
             dimid_lat=dimids(i)
             len_lat=len_
-        elseif (name_ == "time_counter".or. name_ ==  "Time") then
+        else if (name_ == "time_counter".or. name_ ==  "Time") then
             dimid_time=dimids(i)
             len_time=len_
-        elseif (name_ == "soil_layers".or. name_ ==  "subsurface_layers") then
+        else if (name_ == "soil_layers".or. name_ ==  "subsurface_layers") then
             dimid_soil=dimids(i)
             len_soil = len_
@@ -161 +159 @@
                 deallocate(tempvalues_2d)
             endif
-        elseif (numdims == 3) then
+        else if (numdims == 3) then
             allocate(tempvalues_3d(len_lon,len_lat,len_time))
             allocate(values_3d(len_lon + 1,len_lat,len_time))
@@ -210 +208 @@
 
 END PROGRAM reshape_XIOS_output
-

trunk/LMDZ.COMMON/libf/evolution/writediagpem.F90

@@ -7 +7 @@
 !=======================================================================
 
-SUBROUTINE writediagfipem(ngrid,nom,titre,unite,dim,px)
+SUBROUTINE writediagpem(ngrid,nom,titre,unite,dim,px)
 
 !  Ecriture de variables diagnostiques au choix dans la physique
@@ -86 +86 @@
 integer                 :: idim, varid
 integer                 :: nid
-character(*), parameter :: fichnom = "diagfipem.nc"
+character(*), parameter :: fichnom = "diagpem.nc"
 integer, dimension(4)   :: id
 integer, dimension(4)   :: edges, corner
@@ -578 +578 @@
 if (is_master) ierr= NF_CLOSE(nid)
 
-END SUBROUTINE writediagfipem
+END SUBROUTINE writediagpem
 
 subroutine writediagsoilpem(ngrid,name,title,units,dimpx,px)