Changeset 3108

Timestamp:

Oct 27, 2023, 6:00:07 PM (15 months ago)

Author:

jbclement

Message:

PEM:
Addition of the possibility to ask for a number of Mars years to be simulated in total (previously it was only in Earth years).
JBC

Location:

trunk

Files:

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

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

@@ -124 +124 @@
     - Correction of a bug when running with ifort, XIOS and no sub-slopes. If compiled with ifort, the 'Reshape' program cashed because of sub-slopes variables were written in the XIOS output but not filled. A new file definition without sub-slopes can be chosen in the xml file to avoid this issue.
     - Addition in the 'Reshape' program of a check to remove the output files if they exist to prevent a crash.
+
+== 27/10/2023 == JBC
+Addition of the possibility to ask for a number of Mars years to be simulated in total (previously it was only in Earth years).

trunk/LMDZ.MARS/deftank/pem/README

@@ -4 +4 @@
   Bash script file to launch the chained simulation of PEM and PCM runs.
   The user has to specify:
-      (i)   n_earth_years -> the number of Earth years to be simulated in total;
+      (i)   n_mars_years, n_earth_years -> the number of Mars/Earth years to be simulated in total;
       (ii)  nPCM -> the number of PCM calls between PEM runs (usually nPCM=2);
       (iii) exePEM -> the name of executable file for the PEM run;

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

@@ -21 +21 @@
 LC_NUMERIC=en_US.UTF-8
 
-#------- Modify here the number of Earth years to be simulated ---------
-## set the number of years:
-n_earth_years=1000000
+#---------- Modify here the number of years to be simulated ------------
+## set the number of years, either Martian or Earth years:
+n_mars_years=1000000
+#n_earth_years=1000000
 
 #---------------- Modify here the number of PCM calls ------------------
@@ -93 +94 @@
 convert_years=$(echo "$myear/$eyear" | bc -l)
 convert_years=$(printf "%.4f" $convert_years) # Rounding to the 4th decimal to respect the precision of Martian year
-n_myear=$(echo "($n_earth_years/$convert_years + 0.999999)/1" | bc) # Ceiling of n_earth_years/convert_years
-echo "Number of years to simulate: $n_earth_years Earth years = $n_myear Martian years."
+if [ -v n_mars_years ] && [ ! -z "$n_mars_years" ]; then
+    n_myear=$n_mars_years
+    echo "Number of years to be simulated: $n_myear Martian years."
+elif [ -v n_earth_years ] && [ ! -z "$n_earth_years" ]; then
+    n_myear=$(echo "($n_earth_years/$convert_years + 0.999999)/1" | bc) # Ceiling of n_earth_years/convert_years
+    echo "Number of years to be simulated: $n_earth_years Earth years = $n_myear Martian years."
+else
+    echo "No number of years to be simulated has been set!"
+    exit 1
+fi
 i_myear=0
 iPEM=1