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

Timestamp:

Sep 18, 2024, 4:09:02 PM (3 months ago)

Author:

jbclement

Message:

PEM:

• Correction of the way stopping criteria interact with each other because of a situation where the algorithm does not stop even though a stopping criterion was met.
• Update and corrections for the layering algorithm: there is now only one subsurface stratum.
• Improvement of the launching script in the case of the 1D PEM: it ends automatically after PCM/PEM run crash.

JBC

File:

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

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

@@ -175 +175 @@
             sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc -l)/" PCMrun.job
             ./PCMrun.job
+            if [ $? -ne 0 ]; then
+                errlaunch
+            fi
         else # 3D model
             cp PCMrun.job PCMrun${iPCM}.job
@@ -197 +200 @@
                 sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc -l)/" PCMrun.job
                 ./PCMrun.job
+                if [ $? -ne 0 ]; then
+                    errlaunch
+                fi
             else # 3D model
                 cp PCMrun.job PCMrun${iPCM}.job
@@ -219 +225 @@
         if [ $1 -eq 1 ]; then # 1D model
             ./PEMrun.job
+            if [ $? -ne 0 ]; then
+                errlaunch
+            fi
         else # 3D model
             sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPEM}/" PEMrun.job
@@ -245 +254 @@
         if [ $1 -eq 1 ]; then # 1D model
             ./PEMrun.job
+            if [ $? -ne 0 ]; then
+                errlaunch
+            fi
         else # 3D model
             sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPEM}/" PEMrun.job
@@ -351 +363 @@
 # arg1: model dimension
 relaunchPEM() {
-    iPEM=$irelaunch
+    iPEM=$(($irelaunch + 1))
     iPCM=$(($nPCM_ini + $nPCM*($irelaunch - 1) + 1))
     i_myear=$(awk "NR==$(($iPEM + 1)) {print \$1}" "info_PEM.txt")