Changeset 3068

Timestamp:

Oct 3, 2023, 11:25:57 AM (14 months ago)

Author:

jbclement

Message:

PEM:
Following the commits r3066 and r3067, the PEM initialization in 1D has been adapted.
JBC

Location:

trunk

Files:

• LMDZ.COMMON/libf/evolution/changelog.txt (modified) (1 diff)
• LMDZ.COMMON/libf/evolution/pem.F90 (modified) (5 diffs)
• LMDZ.MARS/deftank/pem/launch_pem.sh (modified) (4 diffs)

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

@@ -77 +77 @@
 == 26/09/2023 == JBC
 Minor changes concerning the form of the code in the PEM.
+
+== 28/09/2023 == JBC
 Addition of a file "changelog.txt" in LMDZ.COMMON/libf/evolution/ specific to the PEM rather than using the one for Mars. Completed with changesets since 01/07/2023.
 
 == 02/10/2023 == JBC
 Initialization of the PEM in 1D through the subroutine "init_testphys1d_mod.F90" + Some adaptations of the Mars PCM in 1D + Update of "launch_pem.sh" in deftank.
+
+== 03/10/2023 == JBC
+Following the commits r3066 and r3067, the PEM initialization in 1D has been adapted.

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

@@ -138 +138 @@
 ! Variables to read starfi.nc
 character (len = *), parameter :: FILE_NAME = "startfi_evol.nc" ! Name of the file used for initialsing the PEM
-character*2 str2
-integer :: ncid, varid, status                      ! Variable for handling opening of files
-integer :: phydimid, subdimid, nlayerdimid, nqdimid ! Variable ID for Netcdf files
-integer :: lonvarid, latvarid, areavarid, sdvarid   ! Variable ID for Netcdf files
-integer :: apvarid, bpvarid                         ! Variable ID for Netcdf files
+character(2)                   :: str2
+integer                        :: ncid, varid, status                      ! Variable for handling opening of files
+integer                        :: phydimid, subdimid, nlayerdimid, nqdimid ! Variable ID for Netcdf files
+integer                        :: lonvarid, latvarid, areavarid, sdvarid   ! Variable ID for Netcdf files
+integer                        :: apvarid, bpvarid                         ! Variable ID for Netcdf files
 
 ! Variables to read starfi.nc and write restartfi.nc
@@ -165 +165 @@
 logical                             :: STOPPING_pressure    ! Logical: is the criterion (% of change in the surface pressure) reached?
 integer                             :: criterion_stop       ! which criterion is reached ? 1= h2o ice surf, 2 = co2 ice surf, 3 = ps, 4 = orb param
-real, save                          :: A , B, mmean         ! Molar mass: intermediate A, B for computations of the  mean molar mass of the layer [mol/kg]
+real, save                          :: A, B, mmean          ! Molar mass: intermediate A, B for computations of the  mean molar mass of the layer [mol/kg]
 real, dimension(:,:),   allocatable :: vmr_co2_gcm          ! Physics x Times  co2 volume mixing ratio retrieve from the gcm [m^3/m^3]
 real, dimension(:,:),   allocatable :: vmr_co2_pem_phys     ! Physics x Times  co2 volume mixing ratio used in the PEM
@@ -238 +238 @@
     real, dimension(:,:),   allocatable :: emis                          ! Subslope variable, only needed in the GENERIC case
     real, dimension(:,:),   allocatable :: watercap                      ! Subslope variable, only needed in the GENERIC case =0 no watercap in generic model
-    logical, dimension(:),  allocatable :: WATERCAPTAG                   ! Subslope variable, only needed in the GENERIC case =false no watercaptag in generic model
+    logical, dimension(:),  allocatable :: watercaptag                   ! Subslope variable, only needed in the GENERIC case =false no watercaptag in generic model
     real, dimension(:,:,:), allocatable :: albedo                        ! Subslope variable, only needed in the GENERIC case
     real, dimension(:,:,:), allocatable :: inertiesoil                   ! Subslope variable, only needed in the GENERIC case
@@ -249 +249 @@
 
     ! Dummy variables to use the subroutine 'init_testphys1d'
-    real, dimension(:,:), allocatable :: q_tmp ! Temporary tracer mixing ratio (e.g. kg/kg)
-    logical                           :: startfiles_1D, therestart1D, therestartfi
-    integer                           :: ndt, day0
-    real                              :: ptif, pks, day, gru, grv, atm_wat_profile, atm_wat_tau
-    real, dimension(:),   allocatable :: zqsat, qsurf_tmp
-    real, dimension(:,:), allocatable :: dq, dqdyn
-    real, dimension(nlayer)           :: play, w
-    real, dimension(nlayer + 1)       :: plev, q2_tmp
-    real, dimension(nsoilmx)          :: tsoil_tmp
-    real, dimension(1)                :: tsurf_tmp, emis_tmp
-    real, dimension(1,1)              :: albedo_tmp
+    logical                             :: startfiles_1D, therestart1D, therestartfi
+    integer                             :: ndt, day0
+    real                                :: ptif, pks, day, gru, grv, atm_wat_profile, atm_wat_tau
+    real, dimension(:),     allocatable :: zqsat
+    real, dimension(:,:,:), allocatable :: dq, dqdyn
+    real, dimension(nlayer)             :: play, w
+    real, dimension(nlayer + 1)         :: plev
 #else
     integer, parameter                :: jjm_value = jjm
@@ -301 +297 @@
     allocate(longitude(ngrid),latitude(ngrid),cell_area(ngrid))
 #else
+    allocate(q(1,llm,nqtot))
     allocate(longitude(1),latitude(1),cell_area(1))
-    call init_testphys1d(.true.,ngrid,nlayer,610.,nq,q_tmp,time_0,ps(1),ucov,vcov,teta,startfiles_1D,therestart1D,therestartfi, &
-                         ndt,ptif,pks,dtphys,zqsat,qsurf_tmp,dq,dqdyn,day0,day,tsurf_tmp,gru,grv,w,q2_tmp,play,plev,tsoil_tmp,              &
-                         albedo_tmp,emis_tmp,latitude,longitude,cell_area,atm_wat_profile,atm_wat_tau)
+    call init_testphys1d(.true.,ngrid,nlayer,610.,nq,q,time_0,ps(1),ucov,vcov,teta,startfiles_1D,therestart1D, &
+                         therestartfi,ndt,ptif,pks,dtphys,zqsat,dq,dqdyn,day0,day,gru,grv,w,                   &
+                         play,plev,latitude,longitude,cell_area,atm_wat_profile,atm_wat_tau)
     ps(2) = ps(1)
-    allocate(q(ip1jmp1,llm,nqtot))
-    q(ip1jmp1,:,:) = q_tmp(:,:)
-    deallocate(q_tmp,qsurf_tmp)
     nsplit_phys = 1
 #endif

trunk/LMDZ.MARS/deftank/pem/launch_pem.sh

@@ -16 +16 @@
 # Path to the arch.env to source:
 source ../trunk/LMDZ.COMMON/arch.env
+
+# Save the current value of LC_NUMERIC and set it to a locale that uses a dot as the decimal separator
+OLD_LC_NUMERIC=$LC_NUMERIC
+LC_NUMERIC=en_US.UTF-8
 
 #------- Modify here the number of Earth years to be simulated ---------
@@ -106 +110 @@
     #--- Loop to run GCM year by year
     cp run_GCM.def run.def
-    rm diagfi.def
+    if [ -f "diagfi.def" ]; then
+        rm diagfi.def
+    fi
     if [ -f "diagfi_GCM.def" ]; then
         cp diagfi_GCM.def diagfi.def
@@ -154 +160 @@
     echo "Run PEM $iPEM..."
     cp run_PEM.def run.def
-    rm diagfi.def
+    if [ -f "diagfi.def" ]; then
+        rm diagfi.def
+    fi
     if [ -f "diagfi_PEM.def" ]; then
         cp diagfi_PEM.def diagfi.def
@@ -191 +199 @@
 rm tmp_PEMyears.txt
 
+# Restore the previous value of LC_NUMERIC
+LC_NUMERIC=$OLD_LC_NUMERIC
+
 #----------------- Preparation for relaunch if needed ------------------
 #echo "Reinitializing starting files..."