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

Timestamp:

Feb 28, 2025, 5:51:32 PM (4 months ago)

Author:

jbclement

Message:

PEM:

• Adjusments of few scripts to handle more situations.
• Bug correction related to deallocation in case of "soil_pem = .false." or "layering_algo = .true.".

JBC

File:

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

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

@@ -181 +181 @@
         else # Mode: submitting jobs
             cp PCMrun.job PCMrun${iPCM}.job
-            sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPCM}\2/" PCMrun${iPCM}.job
+            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")
@@ -208 +208 @@
             else # Mode: submitting jobs
                 cp PCMrun.job PCMrun${iPCM}.job
-                sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPCM}\2/" PCMrun${iPCM}.job
+                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")
@@ -234 +234 @@
             fi
         else # Mode: submitting jobs
-            sed -i -E "s/($name_job[^0-9]*)[0-9]+([^0-9]*)$/\1${iPEM}\2/" PEMrun.job
+            sed -i -E "/^$name_job/s/(.*[^0-9])([0-9]+)(_[^0-9]*)?$/\1${iPEM}\3/" 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]*)$/\1${iPEM}\2/" PEMrun.job
+            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")
             echo $kill_job $jobID >> kill_launchPEM.sh