Changeset 3178 for trunk/LMDZ.COMMON

Timestamp:

Jan 17, 2024, 5:58:11 PM (10 months ago)

Author:

llange

Message:

PEM
Cleaning of the several subroutine regarding soil temperatures: they are now
gathered in an unique Tsoil module.
(cosmetic commit)
LL

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• compute_soiltemp_mod.F90 (added)
• pem.F90 (modified) (2 diffs)
• pemetat0.F90 (modified) (6 diffs)
• soil_pem_compute_mod.F90 (deleted)
• soil_pem_ini_mod.F90 (deleted)

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

@@ -199 +199 @@
 - Correction of script "launch_orb_1Dchained.sh" which read orbital parameters missing one interval of years in two.
 - Addition of the Martian date in "info_PEM.txt" for post-processing.
+
+== 17/01/2023 == LL
+Cleaning of the several subroutine regarding soil temperatures: they are now
+gathered in an unique Tsoil module.
+(cosmetic commit)

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

@@ -67 +67 @@
 use read_data_PCM_mod,          only: read_data_PCM
 use recomp_tend_co2_slope_mod,  only: recomp_tend_co2_slope
-use soil_pem_compute_mod,       only: soil_pem_compute
+use compute_soiltemp_mod,       only: compute_tsoil_pem
 use writediagpem_mod,           only: writediagfipem, writediagsoilpem
 
@@ -819 +819 @@
                 Tsoil_locslope = tsoil_phys_PEM_timeseries(:,:,islope,t)
                 Tsurf_locslope = tsurf_PCM_timeseries(:,islope,t)
-                call soil_pem_compute(ngrid,nsoilmx_PEM,.true.,TI_locslope,timestep/timelen,Tsurf_locslope,Tsoil_locslope)
-                call soil_pem_compute(ngrid,nsoilmx_PEM,.false.,TI_locslope,timestep/timelen,Tsurf_locslope,Tsoil_locslope)
+                call compute_tsoil_pem(ngrid,nsoilmx_PEM,.true.,TI_locslope,timestep/timelen,Tsurf_locslope,Tsoil_locslope)
+                call compute_tsoil_pem(ngrid,nsoilmx_PEM,.false.,TI_locslope,timestep/timelen,Tsurf_locslope,Tsoil_locslope)
                 tsoil_phys_PEM_timeseries(:,:,islope,t) = Tsoil_locslope
                 do ig = 1,ngrid

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

@@ -21 +21 @@
 use tracer_mod,                 only: mmol, igcm_h2o_vap ! tracer names and molar masses
 use abort_pem_mod,              only: abort_pem
-use soil_pem_compute_mod,       only: soil_pem_compute
-use soil_pem_ini_mod,           only: soil_pem_ini
+use compute_soiltemp_mod,       only: ini_tsoil_pem, compute_tsoil_pem
 use comslope_mod,               only: def_slope_mean, subslope_dist
 
@@ -244 +243 @@
 !                    enddo
 !                enddo
-                call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
-                call soil_pem_compute(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
+                call ini_tsoil_pem(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
+                call compute_tsoil_pem(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
             else
 ! predictor corrector: restart from year 1 of the PCM and build the evolution of
 ! tsoil at depth
                 tsoil_tmp_yr1(:,:,islope) = tsoil_startPEM(:,:,islope)
-                call soil_pem_compute(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr1(:,islope),tsoil_tmp_yr1(:,:,islope))
-                call soil_pem_compute(ngrid,nsoil_PEM,.false.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr1(:,islope),tsoil_tmp_yr1(:,:,islope))
+                call compute_tsoil_pem(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr1(:,islope),tsoil_tmp_yr1(:,:,islope))
+                call compute_tsoil_pem(ngrid,nsoil_PEM,.false.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr1(:,islope),tsoil_tmp_yr1(:,:,islope))
                 tsoil_tmp_yr2(:,:,islope) = tsoil_tmp_yr1(:,:,islope)
-                call soil_pem_compute(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_tmp_yr2(:,:,islope))
+                call compute_tsoil_pem(ngrid,nsoil_PEM,.false.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_tmp_yr2(:,:,islope))
 
                 do iloop = nsoil_PCM+1,nsoil_PEM
@@ -283 +282 @@
                 call update_soil_thermalproperties(ngrid,nslope,nsoil_PEM,tend_h2o_ice,h2o_ice,global_avg_pressure,ice_table,ice_table_thickness,TI_PEM)
                 do islope = 1,nslope
-                    call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
+                    call ini_tsoil_pem(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
                 enddo
             endif
@@ -418 +417 @@
 !                enddo
 !            enddo
-            call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
-            call soil_pem_compute(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
+            call ini_tsoil_pem(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
+            call compute_tsoil_pem(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
 
 ! First raw initialization
@@ -430 +429 @@
             do it = 1,timelen
                 do isoil = nsoil_PCM + 1,nsoil_PEM
-                    call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_inst(:,:,islope,it))
+                    call ini_tsoil_pem(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_inst(:,:,islope,it))
                 enddo
             enddo
@@ -448 +447 @@
             call update_soil_thermalproperties(ngrid,nslope,nsoil_PEM,tend_h2o_ice,h2o_ice,global_avg_pressure,ice_table,ice_table_thickness,TI_PEM)
             do islope = 1,nslope
-                call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
+                call ini_tsoil_pem(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
             enddo
             write(*,*) 'PEMETAT0: Ice table done'