Changeset 3498 for trunk/LMDZ.COMMON/libf/evolution/deftank

Timestamp:

Nov 7, 2024, 2:48:08 PM (2 weeks ago)

Author:

jbclement

Message:

PEM:

• Correction of the variable name for the ice table depth in "pemetat0.F90". So it is now got as intended from the "startpem.nc" file;
• Renaming of the tendencies in the PEM with the prefix 'd_' instead of 'tend_';
• Modification of the PEM time step type from integer to real. As a consequence, all time variables are now of real type. This change adds the possibility to consider fractions of year as time step.

JBC

Location:

trunk/LMDZ.COMMON/libf/evolution/deftank

Files:

• README (modified) (1 diff)
• launchPEM.sh (modified) (2 diffs)
• lib_launchPEM.sh (modified) (9 diffs)
• run_PEM.def (modified) (1 diff)

trunk/LMDZ.COMMON/libf/evolution/deftank/README

@@ -7 +7 @@
       (ii)  nPCM_ini -> the number of initial PCM runs (at least 2);
       (iii) nPCM -> the number of PCM runs between each PEM run (usually 2);
-      (iv)  mode -> the launching mode (0 = "processing scripts"; any other values = "submitting jobs"). The former option is usually used to process the script on a local machine while the latter is used to submit jobs on supercomputer.
+      (iv)  mode -> the launching mode (0 = "processing scripts"; any other values = "submitting jobs"). The former option is usually used to process the script on a local machine while the latter is used to submit jobs on a supercomputer.
   The script can take an argument:
       - If there is no argument, then the script initiates a PEM simulation from scratch.

trunk/LMDZ.COMMON/libf/evolution/deftank/launchPEM.sh

@@ -14 +14 @@
 ###############################################
 # Set the number of years to be simulated, either Martian or Earth years:
-n_mars_years=100
-#n_earth_years=300
+n_mars_years=100.
+#n_earth_years=300.
 
 # Set the number of initial PCM runs (>= 2):
@@ -23 +23 @@
 nPCM=2
 
-# Set the launching mode (0 = "processing scripts"; any other values = "submitting jobs"). The former option is usually used to process the script on a local machine while the latter is used to submit jobs on supercomputer:
+# Set the launching mode (0 = "processing scripts"; any other values = "submitting jobs"). The former option is usually used to process the script on a local machine while the latter is used to submit jobs on a supercomputer:
 mode=1
 ########################################################################

trunk/LMDZ.COMMON/libf/evolution/deftank/lib_launchPEM.sh

@@ -52 +52 @@
 
     if [ -v n_mars_years ] && [ ! -z "$n_mars_years" ]; then
-        if [ $n_mars_years -lt 1 ]; then
+        if [ $n_mars_years -lt 0. ]; then
             echo "Error: the value of 'n_mars_years' must be >0!"
             errlaunch
         fi
     elif [ -v n_earth_years ] && [ ! -z "$n_earth_years" ]; then
-        if [ $n_earth_years -lt 1 ]; then
+        if [ $n_earth_years -lt 0. ]; then
             echo "Error: the value of 'n_earth_years' must be >0!"
             errlaunch
@@ -132 +132 @@
         echo "Number of years to be simulated: $n_myear Martian years."
     elif [ -v n_earth_years ]; then
-        n_myear=$(echo "($n_earth_years/$convert_years + 0.999999)/1" | bc) # Ceiling of n_earth_years/convert_years
+        n_myear=$(echo "$n_earth_years/$convert_years" | bc -l)
         echo "Number of years to be simulated: $n_earth_years Earth years = $n_myear Martian years."
     fi
@@ -141 +141 @@
     echo "This is a chained simulation for PEM and PCM runs in $dir on $machine by $user."
     convertyears
-    i_myear=0
+    i_myear=0.
     iPEM=1
     iPCM=1
@@ -176 +176 @@
                 errlaunch
             fi
-        else # Mode: launching jobs
+        else # Mode: submitting jobs
             cp PCMrun.job PCMrun${iPCM}.job
             sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPCM}/" PCMrun${iPCM}.job
@@ -187 +187 @@
         fi
         ((iPCM++))
-        ((i_myear++))
+        i_myear = $(echo "$i_myear + 1." | bc - l)
         ((ii++))
     else
@@ -201 +201 @@
                     errlaunch
                 fi
-            else # Mode: launching jobs
+            else # Mode: submitting jobs
                 cp PCMrun.job PCMrun${iPCM}.job
                 sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPCM}/" PCMrun${iPCM}.job
@@ -209 +209 @@
             fi
             ((iPCM++))
-            ((i_myear++))
+            i_myear = $(echo "$i_myear + 1." | bc - l)
         else
             endlaunch
@@ -226 +226 @@
                 errlaunch
             fi
-        else # Mode: launching jobs
+        else # Mode: submitting jobs
             sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPEM}/" PEMrun.job
             jobID=$(eval "$submit_job PEMrun.job")
@@ -255 +255 @@
                 errlaunch
             fi
-        else # Mode: launching jobs
+        else # Mode: submitting jobs
             sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPEM}/" PEMrun.job
             jobID=$(eval "$submit_dependjob=afterok:${jobID} PEMrun.job")

trunk/LMDZ.COMMON/libf/evolution/deftank/run_PEM.def

@@ -39 +39 @@
 # ps_criterion = 0.15
 
-# Time step length of the PEM in Martian years? Default = 1
-# dt_pem=1
+# Time step length of the PEM in Martian years? Default = 1.
+# dt=1
 
 #---------- Subsurface parameters ----------#