Changeset 4117 for trunk/LMDZ.COMMON/libf/evolution/clim_state_init.F90

Timestamp:

Mar 10, 2026, 4:52:43 PM (12 days ago)

Author:

jbclement

Message:

PEM:

• Remove 'd_h2oice' and 'd_co2ice' arguments from adsorption and soil thermal inertia routines (not needed and possible bugs).
• Move 'read_callphys' call from 'read_start1D' to 'read_rundef' so that 'CO2cond_ps' is initialized no matter what.
• Explicit initialization of 'delta_h2o_ads'/'delta_co2_ads' before 'read_startpem'.
• Add time index argument to 'put_var_nc' calls to write "restart.nc".
• Increase temporary string buffer size for 'real2str_qp'.
• Fixed some typos.

JBC

File:

• trunk/LMDZ.COMMON/libf/evolution/clim_state_init.F90 (modified) (7 diffs)

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

@@ -125 +125 @@
 use tracers,    only: nq, set_q_PCM
 use stoppage,   only: stop_clean
-use config,     only: read_callphys
 use display,    only: print_msg, LVL_NFO
 
@@ -174 +173 @@
 call set_ap(ap_tmp)
 call set_bp(bp_tmp)
-
-! Read the "callphys.def"
-call read_callphys() ! To get 'CO2cond_ps'
 
 END SUBROUTINE read_start1D
@@ -300 +296 @@
 
 !=======================================================================
-SUBROUTINE read_startpem(tsurf_avg_yr1,tsurf_avg_yr2,ps_avg_glob,ps_ts,q_co2_ts,q_h2o_ts,h2o_surfdensity_avg,d_h2oice,d_co2ice,h2o_ice,co2_ice, &
-                         tsoil_avg,h2o_soildensity_avg,icetable_depth,icetable_thickness,ice_porefilling,layerings_map,                         &
+SUBROUTINE read_startpem(tsurf_avg_yr1,tsurf_avg_yr2,ps_avg_glob,ps_ts,q_co2_ts,q_h2o_ts,h2o_surfdensity_avg,h2o_ice,co2_ice, &
+                         tsoil_avg,h2o_soildensity_avg,icetable_depth,icetable_thickness,ice_porefilling,layerings_map,       &
                          h2o_ads_reg,co2_ads_reg,delta_h2o_ads,delta_co2_ads)
 !-----------------------------------------------------------------------
@@ -351 +347 @@
 real(dp),       dimension(:,:),   intent(in)    :: q_co2_ts, q_h2o_ts           ! MMR of CO2 and H2O
 real(dp),       dimension(:,:),   intent(in)    :: h2o_surfdensity_avg          ! Average of surface water density
-real(dp),       dimension(:,:),   intent(in)    :: d_h2oice, d_co2ice           ! Tendencies on ice
 real(dp),       dimension(:,:),   intent(inout) :: h2o_ice, co2_ice             ! Surface ice
 real(dp),       dimension(:,:,:), intent(inout) :: tsoil_avg                    ! Soil temperature
@@ -471 +466 @@
         if (icetable_equilibrium) then
             call computeice_table_equilibrium(is_h2o_perice_PCM,h2o_surfdensity_avg,h2o_soildensity_avg,TI(:,1,:),icetable_depth,icetable_thickness)
-            call update_soil_TI(d_h2oice,h2o_ice,ps_avg_glob,icetable_depth,icetable_thickness,ice_porefilling,icetable_equilibrium,icetable_dynamic,TI)
+            call update_soil_TI(h2o_ice,ps_avg_glob,icetable_depth,icetable_thickness,ice_porefilling,icetable_equilibrium,icetable_dynamic,TI)
             do islope = 1,nslope
                 call ini_tsoil_pem(ngrid,nsoil,TI(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_avg(:,:,islope))
             end do
         else if (icetable_dynamic) then
-            call update_soil_TI(d_h2oice,h2o_ice,ps_avg_glob,icetable_depth,icetable_thickness,ice_porefilling,icetable_equilibrium,icetable_dynamic,TI)
+            call update_soil_TI(h2o_ice,ps_avg_glob,icetable_depth,icetable_thickness,ice_porefilling,icetable_equilibrium,icetable_dynamic,TI)
             do islope = 1,nslope
                 call ini_tsoil_pem(ngrid,nsoil,TI(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_avg(:,:,islope))
@@ -486 +481 @@
             h2o_ads_reg = 0._dp
             co2_ads_reg = 0._dp
-            call evolve_regolith_adsorption(d_h2oice,d_co2ice,h2o_ice,co2_ice,tsoil_avg,TI,ps_ts,q_h2o_ts,q_co2_ts,h2o_ads_reg,co2_ads_reg,delta_h2o_ads,delta_co2_ads)
-            delta_co2_ads = 0._dp
-            delta_h2o_ads = 0._dp
+            call evolve_regolith_adsorption(h2o_ice,co2_ice,tsoil_avg,TI,ps_ts,q_h2o_ts,q_co2_ts,h2o_ads_reg,co2_ads_reg,delta_h2o_ads,delta_co2_ads)
         end if ! do_sorption
     end if ! do_soil
@@ -565 +558 @@
         call get_var_nc('co2_ads_reg',co2_ads_reg(:,:,:))
         call get_var_nc('h2o_ads_reg',h2o_ads_reg(:,:,:))
-        call evolve_regolith_adsorption(d_h2oice,d_co2ice,h2o_ice,co2_ice,tsoil_avg,TI,ps_ts,q_h2o_ts,q_co2_ts,h2o_ads_reg,co2_ads_reg,delta_h2o_ads,delta_co2_ads)
+        call evolve_regolith_adsorption(h2o_ice,co2_ice,tsoil_avg,TI,ps_ts,q_h2o_ts,q_co2_ts,h2o_ads_reg,co2_ads_reg,delta_h2o_ads,delta_co2_ads)
     end if ! do_sorption
 end if ! do_soil