Changeset 3199 for trunk/LMDZ.COMMON/libf/evolution

Timestamp:

Feb 2, 2024, 5:30:15 PM (10 months ago)

Author:

jbclement

Message:

PEM:
Small correction following r3189 in the case where "soilpem = .false.".
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• pem.F90 (modified) (4 diffs)

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

@@ -220 +220 @@
 Fixing bug in writediagpem: soil layers written in the diagpem where those of the PCM and not the PEM.
 
+== 02/02/2023 == JBC
+Small correction following r3189 in the case where "soilpem = .false.".

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

@@ -477 +477 @@
 
 allocate(tsoil_ave(ngrid,nsoilmx,nslope))
-allocate(tsoil_anom(ngrid,nsoilmx,nslope))
 allocate(watersoil_density_PEM_ave(ngrid,nsoilmx_PEM,nslope))
 allocate(vmr_co2_PCM(ngrid,timelen))
@@ -502 +501 @@
 
 write(*,*) "Downloading data Y1..."
-call read_data_PCM("data_PCM_Y1.nc",timelen, iim,jjm_value,ngrid,nslope,vmr_co2_PCM,ps_timeseries,min_co2_ice(:,:,1),min_h2o_ice(:,:,1), &
+call read_data_PCM("data_PCM_Y1.nc",timelen,iim,jjm_value,ngrid,nslope,vmr_co2_PCM,ps_timeseries,min_co2_ice(:,:,1),min_h2o_ice(:,:,1), &
                    tsurf_avg_yr1,tsoil_ave,tsurf_PCM_timeseries,tsoil_PCM_timeseries,q_co2_PEM_phys,q_h2o_PEM_phys,                      &
                    co2_ice_PCM,watersurf_density_ave,watersoil_density_timeseries)
-write(*,*) "Downloading data Y1 done"
+write(*,*) "Downloading data Y1 done!"
 
 ! Then we read the evolution of water and co2 ice (and the mass mixing ratio) over the second year of the PCM run, saving only the minimum value
-write(*,*) "Downloading data Y2"
+write(*,*) "Downloading data Y2..."
 call read_data_PCM("data_PCM_Y2.nc",timelen,iim,jjm_value,ngrid,nslope,vmr_co2_PCM,ps_timeseries,min_co2_ice(:,:,2),min_h2o_ice(:,:,2), &
                    tsurf_ave,tsoil_ave,tsurf_PCM_timeseries,tsoil_PCM_timeseries,q_co2_PEM_phys,q_h2o_PEM_phys,                         &
                    co2_ice_PCM,watersurf_density_ave,watersoil_density_timeseries)
-write(*,*) "Downloading data Y2 done"
+write(*,*) "Downloading data Y2 done!"
 
 !------------------------
@@ -525 +524 @@
 call ini_ice_table_porefilling(ngrid,nslope)
 
-tsoil_anom(:,:,:) = tsoil(:,:,:) - tsoil_ave(:,:,:) ! compute anomaly between Tsoil(t) in the startfi - <Tsoil> to recompute properly tsoil in the restart
 if (soil_pem) then
+    allocate(tsoil_anom(ngrid,nsoilmx,nslope))
+    tsoil_anom = tsoil - tsoil_ave ! compute anomaly between Tsoil(t) in the startfi - <Tsoil> to recompute properly tsoil in the restart
     call soil_settings_PEM(ngrid,nslope,nsoilmx_PEM,nsoilmx,inertiesoil,TI_PEM)
     tsoil_PEM(:,1:nsoilmx,:) = tsoil_ave
@@ -989 +989 @@
     call interpol_TI_PEM2PCM(ngrid,nslope,nsoilmx_PEM,nsoilmx,TI_PEM,inertiesoil)
     tsoil = tsoil_PEM(:,1:nsoilmx,:) + tsoil_anom
+    deallocate(tsoil_anom)
 #ifndef CPP_STD
     flux_geo = fluxgeo