Changeset 3869 for trunk/LMDZ.COMMON/libf/evolution/deftank/lib_launchPEM.sh

Timestamp:

Jul 28, 2025, 4:56:58 PM (6 days ago)

Author:

jbclement

Message:

PEM:
Bug correction to detect the job time limit with PBS/TORQUE. Making it more robust and automatic for the launching script and the Fortran code.
JBC

File:

• trunk/LMDZ.COMMON/libf/evolution/deftank/lib_launchPEM.sh (modified) (5 diffs)

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

@@ -28 +28 @@
     if command -v squeue &> /dev/null; then
         echo "SLURM is installed on $machine."
+        scheduler="SLURM"
         name_job="#SBATCH --job-name="
         kill_job="scancel"
-        submit_job="sbatch --parsable"
-        submit_dependjob="sbatch --parsable --dependency"
     elif command -v qstat &> /dev/null; then
         echo "PBS/TORQUE is installed on $machine."
+        scheduler="PBS"
         name_job="#PBS -N "
         kill_job="qdel"
-        submit_job="qsub"
-        submit_dependjob="qsub -W depend"
     else
         echo "Error: neither SLURM nor TORQUE/PBS is installed on $machine!"
@@ -256 +254 @@
             sed -i -E "/^$name_job/s/(.*[^0-9])([0-9]+)(_[^0-9]*)?$/\1${iPCM}\3/" 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")
+            if [[ "$scheduler" == "SLURM" ]]; then
+                jobID=$(sbatch --parsable PCMrun${iPCM}.job)
+            elif [[ "$scheduler" == "PBS" ]]; then
+                jobID=$(qsub PCMrun${iPCM}.job | cut -d. -f1)
+            fi
             # Create a file to cancel the dependent jobs of the cycle
             echo "#!/bin/bash" > kill_launchPEM.sh
@@ -283 +285 @@
                 sed -i -E "/^$name_job/s/(.*[^0-9])([0-9]+)(_[^0-9]*)?$/\1${iPCM}\3/" 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")
+                if [[ "$scheduler" == "SLURM" ]]; then
+                    jobID=$(sbatch --parsable --dependency=afterok:${jobID} PCMrun${iPCM}.job)
+                elif [[ "$scheduler" == "PBS" ]]; then
+                    jobID=$(qsub -W depend=afterok:${jobID} PCMrun${iPCM}.job | cut -d. -f1)
+                fi
                 echo $kill_job $jobID >> kill_launchPEM.sh
             fi
@@ -308 +314 @@
         else # Mode: submitting jobs
             sed -i -E "/^$name_job/s/(.*[^0-9])([0-9]+)(_[^0-9]*)?$/\1${iPEM}\3/" PEMrun.job
-            jobID=$(eval "$submit_job PEMrun.job")
+            if [[ "$scheduler" == "SLURM" ]]; then
+                jobID=$(sbatch --parsable PEMrun.job)
+            elif [[ "$scheduler" == "PBS" ]]; then
+                jobID=$(qsub PEMrun.job | cut -d. -f1)
+            fi
             # Create a file to cancel the dependent jobs of the cycle
             echo "#!/bin/bash" > kill_launchPEM.sh
@@ -338 +348 @@
         else # Mode: submitting jobs
             sed -i -E "/^$name_job/s/(.*[^0-9])([0-9]+)(_[^0-9]*)?$/\1${iPEM}\3/" PEMrun.job
-            jobID=$(eval "$submit_dependjob=afterok:${jobID} PEMrun.job")
+            if [[ "$scheduler" == "SLURM" ]]; then
+                jobID=$(sbatch --parsable --dependency=afterok:${jobID} PEMrun.job)
+            elif [[ "$scheduler" == "PBS" ]]; then
+                jobID=$(qsub -W depend=afterok:${jobID} PEMrun.job | cut -d. -f1)
+            fi
             echo $kill_job $jobID >> kill_launchPEM.sh
         fi