Changeset 3516 for trunk/LMDZ.COMMON

Timestamp:

Nov 14, 2024, 12:57:31 PM (8 days ago)

Author:

jbclement

Message:

PEM:
Small corrections related to r3498 (time step from integer to real) for the launching script + making a proper initilization of 'year_bp_ini' in case of there is no orbital evolution.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• conf_pem.F90 (modified) (3 diffs)
• deftank/lib_launchPEM.sh (modified) (1 diff)
• pem.F90 (modified) (1 diff)

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

@@ -483 +483 @@
 == 13/11/2024 == JBC
 Small correction for the launching script following the r3498 (time step from integer to real).
+
+== 14/11/2024 == JBC
+Small corrections related to r3498 (time step from integer to real) for the launching script + making a proper initilization of 'year_bp_ini' in case of there is no orbital evolution.

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

@@ -62 +62 @@
 call getin('evol_orbit_pem',evol_orbit_pem)
 
-year_bp_ini = 0.
+year_earth_bp_ini = 0.
 call getin('year_earth_bp_ini',year_earth_bp_ini)
 year_bp_ini = year_earth_bp_ini/convert_years
@@ -68 +68 @@
 var_obl = .true.
 call getin('var_obl',var_obl)
-write(*,*) 'Does obliquity vary ?',var_obl
+write(*,*) 'Does obliquity vary?',var_obl
 
 var_ecc = .true.
 call getin('var_ecc',var_ecc)
-write(*,*) 'Does eccentricity vary ?',var_ecc
+write(*,*) 'Does eccentricity vary?',var_ecc
 
 var_lsp = .true.
 call getin('var_lsp',var_lsp)
-write(*,*) 'Does Ls peri vary ?',var_lsp
+write(*,*) 'Does Ls peri vary?',var_lsp
 
 !#---------- Stopping criteria parameters ----------#
 Max_iter_pem = 100000000
 call getin('Max_iter_pem',Max_iter_pem)
+write(*,*) 'Max_iter_pem =',Max_iter_pem
 
 h2o_ice_crit = 0.2
 call getin('h2o_ice_crit',h2o_ice_crit)
+write(*,*) 'h2o_ice_crit =',h2o_ice_crit
 
 co2_ice_crit = 0.2
 call getin('co2_ice_crit',co2_ice_crit)
+write(*,*) 'co2_ice_crit =',co2_ice_crit
 
 ps_criterion = 0.15
 call getin('ps_criterion',ps_criterion)
+write(*,*) 'ps_criterion =',ps_criterion
 
 dt = 1.
@@ -128 +132 @@
     call abort_physic(modname,"Ice table must be used when soil_pem = T",1)
 endif
-if (icetable_equilibrium .or. icetable_dynamic) then
+if (icetable_equilibrium .and. icetable_dynamic) then
     write(*,*) 'Ice table is asked to be computed both by the equilibrium and dynamic method.'
     write(*,*) 'The dynamic method is then chosen.'
+    icetable_dynamic = .false.
 endif
 

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

@@ -52 +52 @@
 
     if [ -v n_mars_years ] && [ ! -z "$n_mars_years" ]; then
-        if [ $n_mars_years -lt 0. ]; then
+        if [ $(echo "$n_mars_years < 0." | bc -l) ]; then
             echo "Error: the value of 'n_mars_years' must be >0!"
             errlaunch
         fi
     elif [ -v n_earth_years ] && [ ! -z "$n_earth_years" ]; then
-        if [ $n_earth_years -lt 0. ]; then
+        if [ $(echo "$n_earth_years < 0." | bc -l) ]; then
             echo "Error: the value of 'n_earth_years' must be >0!"
             errlaunch

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

@@ -1012 +1012 @@
 !    II_f Update the tendencies
 !------------------------
-    call recomp_tend_co2_slope(ngrid,nslope,timelen,d_co2ice,d_co2ice_ini,co2_ice,emis,vmr_co2_PCM,vmr_co2_PEM_phys,ps_timeseries, &
-                               global_avg_press_PCM,global_avg_press_new)
+    call recomp_tend_co2_slope(ngrid,nslope,timelen,d_co2ice,d_co2ice_ini,co2_ice,emis,vmr_co2_PCM,vmr_co2_PEM_phys,ps_timeseries,global_avg_press_PCM,global_avg_press_new)
 
 !------------------------