Changeset 3088 for trunk/LMDZ.COMMON/libf

Timestamp:

Oct 16, 2023, 10:31:19 AM (14 months ago)

Author:

jbclement

Message:

PEM:

• Addition of the bash script "concat_diagpem.sh" in deftank to concatenate all the "diagpem.nc" outputs into one file;
• Addition of "writediagpem_mod.F90" inspired by the subroutine "writediagfi.F" in phymars/;
• Renaming of PEM outputs ('startfi_PEM' -> 'startpem' and 'diagfi' -> 'diagpem');
• Gathering of all "diagpem.nc" outputs at the same place at the end of the main PEM loop;
• Update of "launch_pem.sh", "README" and "modify_startfi_orbit.sh" in the deftank.

JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• pem.F90 (modified) (11 diffs)
• writediagpem.F90 (added)

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

@@ -101 +101 @@
     - Correction of a bug in the initialization of constants. The correct modules are now used: 'comcstfi_h' (and no longer 'comconst_mod'!) in the general case and 'comcstfi_mod' in the case of generic model;
     - Addition of the variable 'ecritpem' in "run_PEM.def" to set the frequency of outputs in the "diagfi.nc". By default, 'ecritpem = 1' which means there is one output at each PEM year.
+
+== 16/10/2023 == JBC
+    - Addition of the bash script "concat_diagpem.sh" in deftank to concatenate all the "diagpem.nc" outputs into one file;
+    - Addition of "writediagpem_mod.F90" inspired by the subroutine "writediagfi.F" in phymars/;
+    - Renaming of PEM outputs ('startfi_PEM' -> 'startpem' and 'diagfi' -> 'diagpem');
+    - Gathering of all "diagpem.nc" outputs at the same place at the end of the main PEM loop;
+    - Update of "launch_pem.sh", "README" and "modify_startfi_orbit.sh" in the deftank.

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

@@ -8 +8 @@
 !    I_f Compute tendencies & Save initial situation
 !    I_g Save initial PCM situation
-!    I_h Read the PEMstart
+!    I_h Read the startpem.nc
 !    I_i Compute orbit criterion
 
@@ -16 +16 @@
 !    II_c CO2 & H2O glaciers flows
 !    II_d Update surface and soil temperatures
-!    II_e Update the tendencies
-!    II_f Checking the stopping criterion
+!    II_e Outputs
+!    II_f Update the tendencies
+!    II_g Checking the stopping criterion
 
 ! III Output
 !    III_a Update surface value for the PCM start files
 !    III_b Write restart_evol.nc and restartfi_evol.nc
-!    III_c Write restartfi_PEM.nc
+!    III_c Write restartpem.nc
 !------------------------
 
@@ -69 +70 @@
 use recomp_tend_co2_slope_mod,    only: recomp_tend_co2_slope
 use soil_pem_compute_mod,         only: soil_pem_compute
+use writediagpem_mod,             only: writediagpem
 
 #ifndef CPP_STD
@@ -598 +600 @@
 !------------------------
 ! I   Initialization
-!    I_h Read the PEMstart
-!------------------------
-call pemetat0("startfi_PEM.nc",ngrid,nsoilmx,nsoilmx_PEM,nslope,timelen,timestep,TI_PEM,tsoil_PEM,porefillingice_depth, &
+!    I_h Read the startpem.nc
+!------------------------
+call pemetat0("startpem.nc",ngrid,nsoilmx,nsoilmx_PEM,nslope,timelen,timestep,TI_PEM,tsoil_PEM,porefillingice_depth, &
               porefillingice_thickness,tsurf_ave_yr1, tsurf_ave, q_co2_PEM_phys, q_h2o_PEM_phys,ps_timeseries,          &
               tsoil_phys_PEM_timeseries,tendencies_h2o_ice,tendencies_co2_ice,qsurf(:,igcm_co2,:),                      &
@@ -665 +667 @@
         enddo
     enddo
-    call writediagfi(ngrid,'ps_ave','Global average pressure','Pa',0,global_ave_press_new)
 
     if (adsorption_pem) then
@@ -741 +742 @@
     call evol_co2_ice_s(qsurf(:,igcm_co2,:),tendencies_co2_ice,iim,jjm_value,ngrid,cell_area,nslope)
 
-    do islope = 1,nslope
-        write(str2(1:2),'(i2.2)') islope
-        call writediagfi(ngrid,'h2o_ice_s_slope'//str2,'H2O ice','kg.m-2',2,qsurf(:,igcm_h2o_ice,islope))
-        call writediagfi(ngrid,'tendencies_h2o_ice_slope'//str2,'H2O ice tend','kg.m-2.year-1',2,tendencies_h2o_ice(:,islope))
-        call writediagfi(ngrid,'c2ice_slope'//str2,'CO2 ice','kg.m-2',2,qsurf(:,igcm_co2,islope))
-        call writediagfi(ngrid,'tendencies_co2_ice_slope'//str2,'CO2 ice tend','kg.m-2.year-1',2,tendencies_co2_ice(:,islope))
-    enddo
-
 !------------------------
 ! II  Run
@@ -754 +747 @@
 !------------------------
     write(*,*) "CO2 glacier flows"
-
     if (co2glaciersflow) call co2glaciers_evol(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,vmr_co2_pem_phys,ps_timeseries, &
                                                global_ave_press_GCM,global_ave_press_new,qsurf(:,igcm_co2,:),flag_co2flow,flag_co2flow_mesh)
 
     write(*,*) "H2O glacier flows"
-
     if (h2oglaciersflow) call h2oglaciers_evol(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,tsurf_ave,qsurf(:,igcm_h2o_ice,:),flag_h2oflow,flag_h2oflow_mesh)
-
-    do islope = 1,nslope
-        write(str2(1:2),'(i2.2)') islope
-        call writediagfi(ngrid,'co2ice_slope'//str2,'CO2 ice','kg.m-2',2,qsurf(:,igcm_co2,islope))
-        call writediagfi(ngrid,'tendencies_co2_ice_slope'//str2,'CO2 ice tend','kg.m-2.year-1',2,tendencies_co2_ice(:,islope))
-        call writediagfi(ngrid,'Flow_co2ice_slope'//str2,'CO2 ice flow','Boolean',2,flag_co2flow(:,islope))
-    enddo
 
 !------------------------
@@ -845 +829 @@
     enddo
 
-    do islope = 1,nslope
-        write(str2(1:2),'(i2.2)') islope
-        call writediagfi(ngrid,'tsurf_slope'//str2,'tsurf','K',2,tsurf(:,islope))
-    enddo
-
     if (soil_pem) then
 
@@ -919 +898 @@
 !------------------------
 ! II  Run
-!    II_e Update the tendencies
+!    II_e Outputs
+!------------------------
+    call writediagpem(ngrid,'ps_ave','Global average pressure','Pa',0,(/global_ave_press_new/))
+    do islope = 1,nslope
+        write(str2(1:2),'(i2.2)') islope
+        call writediagpem(ngrid,'h2o_ice_s_slope'//str2,'H2O ice','kg.m-2',2,qsurf(:,igcm_h2o_ice,islope))
+        call writediagpem(ngrid,'tendencies_h2o_ice_slope'//str2,'H2O ice tend','kg.m-2.year-1',2,tendencies_h2o_ice(:,islope))
+        call writediagpem(ngrid,'tendencies_co2_ice_slope'//str2,'CO2 ice tend','kg.m-2.year-1',2,tendencies_co2_ice(:,islope))
+        call writediagpem(ngrid,'co2ice_slope'//str2,'CO2 ice','kg.m-2',2,qsurf(:,igcm_co2,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))
+    enddo
+
+!------------------------
+! II  Run
+!    II_f Update the tendencies
 !------------------------
     write(*,*) "Adaptation of the new co2 tendencies to the current pressure"
@@ -927 +921 @@
 !------------------------
 ! II  Run
-!    II_f Checking the stopping criterion
+!    II_g Checking the stopping criterion
 !------------------------
     call criterion_waterice_stop(cell_area,ini_surf_h2o,qsurf(:,igcm_h2o_ice,:),STOPPING_water,ngrid,initial_h2o_ice)
@@ -1136 +1130 @@
 !------------------------
 ! III Output
-!    III_c Write restartfi_PEM.nc
-!------------------------
-call pemdem0("restartfi_PEM.nc",longitude,latitude,cell_area,nsoilmx_PEM,ngrid, &
+!    III_c Write restartpem.nc
+!------------------------
+call pemdem0("restartpem.nc",longitude,latitude,cell_area,nsoilmx_PEM,ngrid, &
              float(day_ini),0.,nslope,def_slope,subslope_dist)
-call pemdem1("restartfi_PEM.nc",i_myear,nsoilmx_PEM,ngrid,nslope,tsoil_PEM, &
+call pemdem1("restartpem.nc",i_myear,nsoilmx_PEM,ngrid,nslope,tsoil_PEM, &
              TI_PEM, porefillingice_depth,porefillingice_thickness,         &
              co2_adsorbded_phys,h2o_adsorbded_phys,water_reservoir)
-write(*,*) "restartfi_PEM.nc has been written"
+write(*,*) "restartpem.nc has been written"
 
 call info_run_PEM(year_iter,criterion_stop,i_myear,n_myear)