Changeset 3417 for trunk/LMDZ.COMMON/libf/evolution

Timestamp:

Aug 22, 2024, 2:44:54 PM (3 months ago)

Author:

jbclement

Message:

PEM:
Small update for the launching script.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• deftank/PEMrun.job (modified) (1 diff)
• deftank/launchPEM.sh (modified) (2 diffs)

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

@@ -407 +407 @@
 == 22/08/2024 == JBC
 Adaptation of the job submission script to get enough memory for the job without asking the exclusive mode.
+
+== 22/08/2024 == JBC
+Small update for the launching script.

trunk/LMDZ.COMMON/libf/evolution/deftank/PEMrun.job

@@ -5 +5 @@
 #SBATCH --constraint=GENOA
 ### Number of Nodes to use
+#SBATCH --nodes=1
 #SBATCH --ntasks=1
+#SBATCH --cpus-per-task=1
 ###SBATCH --exclusive
 #SBATCH --output=jobPEM_%j.out

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

@@ -81 +81 @@
             if [ $relaunch = "PCM" ]; then
                 echo "What is the number of the PCM run?"
-                echo "It should be between 1 and $((iPCM - 1))."
+                echo "It should be between 1 and $(( $((iPCM - 1)) > 1 ? $((iPCM - 1)) : 1 ))."
                 read irelaunch
-                if [ 0 -lt $irelaunch ] && [ $irelaunch -lt $iPCM ]; then
+                if [ 1 -le $irelaunch ] && [ $irelaunch -le $(( $((iPCM - 1)) > 1 ? $((iPCM - 1)) : 1 )) ]; then
                     break
                 else
@@ -90 +90 @@
             else
                 echo "What is the number of the PEM run?"
-                echo "It should be between 1 and $((iPEM - 1))."
+                echo "It should be between 1 and $(( $((iPEM - 1)) > 1 ? $((iPEM - 1)) : 1 ))."
                 read irelaunch
-                if [ 0 -lt $irelaunch ] && [ $irelaunch -lt $iPEM ]; then
+                if [ 1 -le $irelaunch ] && [ $irelaunch -le $(( $((iPEM - 1)) > 1 ? $((iPEM - 1)) : 1 )) ]; then
                     break
                 else