Changeset 3649 for trunk/LMDZ.COMMON

Timestamp:

Feb 26, 2025, 9:58:28 AM (4 months ago)

Author:

jbclement

Message:

PEM:
Correction and simplification of the numbering of jobs/runs in the launching script.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• deftank/PCMrun.job (modified) (1 diff)
• deftank/lib_launchPEM.sh (modified) (6 diffs)
• pem.F90 (modified) (2 diffs)
• reshape_XIOS_output.F90 (modified) (1 diff)

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

@@ -606 +606 @@
 == 21/02/2025 == JBC
 Unset inherited SLURM memory env variables to prevent conflicts in chained job re-launch (it happenned on MCMeSU).
+
+== 26/02/2025 == JBC
+Correction and simplification of the numbering of jobs/runs in the launching script.

trunk/LMDZ.COMMON/libf/evolution/deftank/PCMrun.job ¶

@@ -58 +58 @@
 fi
 k=0
-if [ $(echo "$k < 1" | bc -l) -eq 1 ]; then # Only the last 2 years are taken for the PEM
-    mv Xdiurnalave.nc diags/data2reshape${iPCM}.nc
-else
-    cp Xdiurnalave.nc diags/data2reshape${iPCM}.nc
-    mv Xdiurnalave.nc data2reshape_Y${k}.nc
+if [ $(echo "$k > 0" | bc) -eq 1 ]; then # Only the last 2 years are taken for the PEM
+    cp Xdiurnalave.nc data2reshape_Y${k}.nc
 fi
+mv Xdiurnalave.nc diags/data2reshape${iPCM}.nc
 cp restartfi.nc starts/restartfi${iPCM}.nc
 mv restartfi.nc startfi.nc

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

@@ -172 +172 @@
     fi
     if [ $(echo "$i_myear < $n_myear" | bc -l) -eq 1 ]; then
-        echo "Run \"PCM $iPCM\": call $ii/$3..."
+        echo "Run \"PCM $iPCM\" ($ii/$3)..."
         if [ $1 -eq 0 ]; then # Mode: processing scripts
-            sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc)/" PCMrun.job
+            sed -i "s/^k=[0-9]\+$/k=$(echo "$ii - $3 + 2" | bc)/" PCMrun.job
             ./PCMrun.job
             if [ $? -ne 0 ]; then
@@ -181 +181 @@
         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
-            sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc)/" PCMrun${iPCM}.job
+            sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPCM}\2/" PCMrun${iPCM}.job
+            sed -i "s/^k=[0-9]\+$/k=$(echo "$ii - $3 + 2" | bc)/" PCMrun${iPCM}.job
             jobID=$(eval "$submit_job PCMrun${iPCM}.job")
             # Create a file to cancel the dependent jobs of the cycle
@@ -199 +199 @@
     for ((i = $ii; i <= $3; i++)); do
         if [ $(echo "$i_myear < $n_myear" | bc -l) -eq 1 ]; then
-            echo "Run \"PCM $iPCM\": call $i/$3..."
+            echo "Run \"PCM $iPCM\" ($i/$3)..."
             if [ $1 -eq 0 ]; then # Mode: processing scripts
-                sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc)/" PCMrun.job
+                sed -i "s/^k=[0-9]\+$/k=$(echo "$i - $3 + 2" | bc)/" PCMrun.job
                 ./PCMrun.job
                 if [ $? -ne 0 ]; then
@@ -208 +208 @@
             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
-                sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc)/" PCMrun${iPCM}.job
+                sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPCM}\2/" PCMrun${iPCM}.job
+                sed -i "s/^k=[0-9]\+$/k=$(echo "$i - $3 + 2" | bc)/" PCMrun${iPCM}.job
                 jobID=$(eval "$submit_dependjob=afterok:${jobID} PCMrun${iPCM}.job")
                 echo $kill_job $jobID >> kill_launchPEM.sh
@@ -234 +234 @@
             fi
         else # Mode: submitting jobs
-            sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPEM}/" PEMrun.job
+            sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPEM}\2/" PEMrun.job
             jobID=$(eval "$submit_job PEMrun.job")
             # Create a file to cancel the dependent jobs of the cycle
@@ -264 +264 @@
             fi
         else # Mode: submitting jobs
-            sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPEM}/" PEMrun.job
+            sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPEM}\2/" PEMrun.job
             jobID=$(eval "$submit_dependjob=afterok:${jobID} PEMrun.job")
             echo $kill_job $jobID >> kill_launchPEM.sh

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

@@ -299 +299 @@
 logical :: num_str
 
-write(*,*) '  *    .          .   +     .    *        .. +      .    .       .      '
+write(*,*) '  *    .          .   +     .    *        .  +      .    .       .      '
 write(*,*) '           +         _______  ________  ____    ____      *           + '
 write(*,*) ' +   .        *     |_   __ \|_   __  ||_   \  /   _|          .       *'
@@ -305 +305 @@
 write(*,*) '       .              |  ___/  |  _| _   | |\  /| |      .        .     '
 write(*,*) '.  *          *      _| |_    _| |__/ | _| |_\/_| |_                  * '
-write(*,*) '                    |_____|  |________||_____||_____|   +     .         '
-write(*,*) '  .      *          .   *      ..   +       *          .        +      .'
+write(*,*) '            +       |_____|  |________||_____||_____|   +     .         '
+write(*,*) '  .      *          .   *       .   +       *          .        +      .'
 
 ! Elapsed time with system clock

trunk/LMDZ.COMMON/libf/evolution/reshape_XIOS_output.F90 ¶

@@ -4 +4 @@
 !
 ! Purpose: Read XIOS files, and convert them into the correct PCM grid
-!          XIOS  longitudes start at -180 but stop before -180 (not duplicated)
+!          XIOS longitudes start at -180 but stop before -180 (not duplicated)
 !          We basically add the last point, and complete the XIOS file. Looped
 !          over the two PCM runs