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

Timestamp:

Jun 20, 2024, 5:27:58 PM (6 months ago)

Author:

jbclement

Message:

PEM:

• Correction of the way the PEM stops before it reaches the SLURM time limit.
• Small correction for 1D related to r3386.
• Improvement of launching script.

JBC

Location:

trunk/LMDZ.COMMON/libf/evolution/deftank

Files:

• jobPEM.slurm (modified) (1 diff)
• lib_launchPEM.sh (modified) (4 diffs)

trunk/LMDZ.COMMON/libf/evolution/deftank/jobPEM.slurm

@@ -37 +37 @@
 read i_myear n_myear convert_years iPCM iPEM nPCM nPCM_ini < info_PEM.txt
 cp run_PEM.def run.def
-./$exePEM > out_runPEM${iPEM} 2>&1
+./$exePEM $SLURM_JOB_ID > out_runPEM${iPEM} 2>&1
 if [ ! -f "restartfi.nc" ] || ! (tail -n 1 out_runPEM${iPEM} | grep -iq "so far, so good!"); then # Check if it ended abnormally
     echo "Error: the run PEM $iPEM crashed!"

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

@@ -153 +153 @@
         echo "Run PCM $iPCM: call $ii/$1..."
         cp jobPCM.slurm jobPCM${iPCM}.slurm
-        sed -i "s/#SBATCH --job-name=jobPCM.*/#SBATCH --job-name=jobPCM${iPCM}/" jobPCM${iPCM}.slurm
+        sed -i -E "s/(#SBATCH --job-name=[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPCM}/" jobPCM${iPCM}.slurm
         sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc -l)/" jobPCM${iPCM}.slurm
         jobID=$(sbatch --parsable jobPCM${iPCM}.slurm)
@@ -170 +170 @@
             echo "Run PCM $iPCM: call $i/$1..."
             cp jobPCM.slurm jobPCM${iPCM}.slurm
-            sed -i "s/#SBATCH --job-name=jobPCM.*/#SBATCH --job-name=jobPCM${iPCM}/" jobPCM${iPCM}.slurm
+            sed -i -E "s/(#SBATCH --job-name=[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPCM}/" jobPCM${iPCM}.slurm
             sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc -l)/" jobPCM${iPCM}.slurm
             jobID=$(sbatch --parsable --dependency=afterok:${jobID} jobPCM${iPCM}.slurm)
@@ -186 +186 @@
     if [ $i_myear -lt $n_myear ]; then
         echo "Run PEM $iPEM"
-        sed -i "s/#SBATCH --job-name=jobPEM.*/#SBATCH --job-name=jobPEM${iPEM}/" jobPEM.slurm
+        sed -i -E "s/(#SBATCH --job-name=[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPEM}/" jobPEM.slurm
         jobID=$(sbatch --parsable jobPEM.slurm)
         # Create a file to cancel the dependent jobs of the cycle
@@ -207 +207 @@
     if [ $i_myear -lt $n_myear ]; then
         echo "Run PEM $iPEM"
-        sed -i "s/#SBATCH --job-name=jobPEM.*/#SBATCH --job-name=jobPEM${iPEM}/" jobPEM.slurm
+        sed -i -E "s/(#SBATCH --job-name=[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPEM}/" jobPEM.slurm
         jobID=$(sbatch --parsable --dependency=afterok:${jobID} jobPEM.slurm)
         echo "scancel" $jobID >> kill_launchPEM.sh