Changeset 3093

Timestamp:

Oct 18, 2023, 3:40:56 PM (15 months ago)

Author:

jbclement

Message:

PEM:
The optional file to define the wanted outputs in "diagpem.nc" is now "diagpem.def" (instead of "diagfi.def") + Some updates in the files of deftank.
JBC

Location:

trunk

Files:

• LMDZ.COMMON/libf/evolution/changelog.txt (modified) (1 diff)
• LMDZ.COMMON/libf/evolution/writediagpem.F90 (modified) (6 diffs)
• LMDZ.MARS/deftank/pem/README (modified) (1 diff)
• LMDZ.MARS/deftank/pem/launch_pem.sh (modified) (2 diffs)
• LMDZ.MARS/deftank/pem/modify_startfi_orbit.sh (modified) (1 diff)

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

@@ -108 +108 @@
     - 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.
+
+== 18/10/2023 == JBC
+The optional file to define the wanted outputs in "diagpem.nc" is now "diagpem.def" (instead of "diagfi.def") + Some updates in the files of deftank.

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

@@ -30 +30 @@
 !
 ! Modifs: Aug.2010 Ehouarn: enforce outputs to be real*4
-!         Oct 2011 Francois: enable having a 'diagfi.def' file to select
+!         Oct 2011 Francois: enable having a 'diagpem.def' file to select
 !                            at runtime, which variables to put in file
 !         Oct 2023 JB: conversion into Fortran 90 with module for the PEM
@@ -90 +90 @@
 integer, dimension(4)   :: edges, corner
 
-! Added to use diagfi.def to select output variable
+! Added to use diagpem.def to select output variable
 logical,                                  save :: diagfi_def
 logical                                        :: getout
@@ -98 +98 @@
 character(120), dimension(n_nom_def_max), save :: nom_def
 logical,                                  save :: firstcall = .true.
-!$OMP THREADPRIVATE(firstcall) !diagfi_def,n_nom_def,nom_def read in diagfi.def
+!$OMP THREADPRIVATE(firstcall) !diagfi_def,n_nom_def,nom_def read in diagpem.def
 
 #ifdef CPP_PARA
@@ -123 +123 @@
 
 !***************************************************************
-! At very first call, check if there is a "diagfi.def" to use and read it
-! -----------------------------------------------------------------------
+! At very first call, check if there is a "diagpem.def" to use and read it
+! ------------------------------------------------------------------------
 IF (firstcall) THEN
     firstcall=.false.
 
 !$OMP MASTER
-    ! Open diagfi.def definition file if there is one:
-        open(99,file="diagfi.def",status='old',form='formatted',iostat=ierr2)
+    ! Open diagpem.def definition file if there is one:
+        open(99,file="diagpem.def",status='old',form='formatted',iostat=ierr2)
 
         if (ierr2 == 0) then
             diagfi_def=.true.
-            write(*,*) "******************"
-            write(*,*) "Reading diagfi.def"
-            write(*,*) "******************"
+            write(*,*) "*******************"
+            write(*,*) "Reading diagpem.def"
+            write(*,*) "*******************"
             do n=1,n_nom_def_max
                 read(99,fmt='(a)',end=88) nom_def(n)
@@ -155 +155 @@
 ENDIF ! of IF (firstcall)
 
-! Get out of write_diagfi if there is diagfi.def AND variable not listed
-!  ---------------------------------------------------------------------
+! Get out of write_diagfi if there is diagpem.def AND variable not listed
+!  ----------------------------------------------------------------------
 if (diagfi_def) then
     getout=.true.
@@ -167 +167 @@
 ! Initialisation of 'firstnom' and create/open the "diagfi.nc" NetCDF file
 ! ------------------------------------------------------------------------
-! (at very first call to the subroutine, in accordance with diagfi.def)
+! (at very first call to the subroutine, in accordance with diagpem.def)
 if (firstnom.eq.'1234567890') then ! .true. for the very first valid
     ! call to this subroutine; now set 'firstnom'

trunk/LMDZ.MARS/deftank/pem/README

@@ -21 +21 @@
 
 # modify_startfi_orbit.sh:
-  Bash script file to modify orbital parameters in the file "startfi.nc" (obliquity, eccentricity, Ls perihelion and possibly initial Ls). They should be consistent with Laskar data in "obl_ecc_lsp.asc" to start the chained simulation.
+  Bash script file to modify orbital parameters in the file "startfi.nc" (obliquity, eccentricity, Ls perihelion and possibly initial Ls). They should be consistent with Laskar's data in "obl_ecc_lsp.asc" to start a chained simulation at a specific date.
 
 # concat_diagpem.sh:
-  Bash script file to concatenate along the variable 'Time' all the "diagfi.nc" files of the PEM into one NetCDF file. 'Time' is reindexed with the numbering of Martian years simulated by the PEM.
+  Bash script file to concatenate along the variable 'Time' all the "diagpem.nc" files of the PEM into one NetCDF file. 'Time' is re-indexed with the numbering of Martian years simulated by the PEM run.
 
 Note:
   To run the chained simulation, be careful to have:
       (i)   the xml files for XIOS. There should be "iodef.xml", "context_lmdz_physics.xml", "file_def_physics_mars.xml" and "field_def_physics_mars.xml" which can be found in the deftank folder. In "context_lmdz_physics.xml", the line for Xdiurnalave should be activated (enabled=".true.");
-      (ii)  the usual def files to run the GCM with "run.def" renamed in "run_GCM.def";
-      (iii) the "startfi.nc" file modified accordingly thanks to "modify_startfi_orbit.sh";
-      (iv)  "diagfi_PEM.def", "diagfi_GCM.def" and eventually other files...
+      (ii)  the usual def files to run the GCM. "run.def" should be renamed in "run_GCM.def";
+      (iii  the starting files ("startfi.nc" and "start.nc"). The former can be modified by "modify_startfi_orbit.sh";
+      (iv)  some optional files. For example, "diagfi.def" and "diagpem.def".

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

@@ -110 +110 @@
     #--- Loop to run GCM year by year
     cp run_GCM.def run.def
-    if [ -f "diagfi.def" ]; then
-        rm diagfi.def
-    fi
-    if [ -f "diagfi_GCM.def" ]; then
-        cp diagfi_GCM.def diagfi.def
-    fi
     for ((i = 1; i <= $nGCM; i++)); do
         echo "Run GCM $iGCM: call $i/$nGCM..."
@@ -160 +154 @@
     echo "Run PEM $iPEM..."
     cp run_PEM.def run.def
-    if [ -f "diagfi.def" ]; then
-        rm diagfi.def
-    fi
-    if [ -f "diagfi_PEM.def" ]; then
-        cp diagfi_PEM.def diagfi.def
-    fi
     mv startfi.nc startfi_evol.nc
     if [ -f "start.nc" ]; then

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

@@ -4 +4 @@
 ######################################################################
 
-#Name of the file to be modified
+# Name of the file to be modified
 name_file="startfi.nc"