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

Timestamp:

Aug 26, 2024, 10:51:28 AM (4 months ago)

Author:

jbclement

Message:

PEM:
Correction for the launching script due to r3403: the job scheduler detection was missing in the case of a new cycle.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• deftank/launchPEM.sh (modified) (2 diffs)
• pem.F90 (modified) (1 diff)

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

@@ -410 +410 @@
 == 22/08/2024 == JBC
 Small update for the launching script.
+
+== 26/08/2024 == JBC
+Correction for the launching script due to r3403: the job scheduler detection was missing in the case of a new cycle.

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

@@ -57 +57 @@
         echo "This is a new cycle for the PEM simulation."
         date
+        if [ $dim -ne 1 ]; then
+            job_scheduler
+        fi
         read i_myear n_myear convert_years iPCM iPEM nPCM nPCM_ini < info_PEM.txt
         cyclelaunch $dim $nPCM
@@ -115 +118 @@
         fi
         sed -i "1s/.*/$i_myear $n_myear $convert_years $iPCM $iPEM $nPCM $nPCM_ini/" info_PEM.txt
+        if [ -f "kill_launchPEM.sh" ]; then
+            ./kill_launchPEM.sh
+        fi
         if [ $relaunch = "PCM" ]; then
             relaunchPCM $dim

trunk/LMDZ.COMMON/libf/evolution/pem.F90

@@ -1023 +1023 @@
                 write(*,*) "STOPPING because surface global pressure changed too much:", stopPEM, "See message above."
             case(5)
-                write(*,*) "STOPPING because maximum number of iterations due to orbital parameters is reached:", stopPEM
+                write(*,*) "STOPPING because maximum number of iterations is reached (possibly due to orbital parameters):", stopPEM
             case(6)
                 write(*,*) "STOPPING because maximum number of Martian years to be simulated is reached:", stopPEM