Changeset 3387 for trunk

Timestamp:

Jun 20, 2024, 5:27:58 PM (6 months ago)

Author:

jbclement

Message:

PEM:

• Correction of the way the PEM stops before it reaches the SLURM time limit.
• Small correction for 1D related to r3386.
• Improvement of launching script.

JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• deftank/jobPEM.slurm (modified) (1 diff)
• deftank/lib_launchPEM.sh (modified) (4 diffs)
• info_PEM_mod.F90 (modified) (1 diff)
• pem.F90 (modified) (5 diffs)

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

@@ -381 +381 @@
 - Correction of files cleaning in the launching script.
 - Improvement of the launching script to take into account the modification of parameters for a relaunch.
+
+== 20/06/2024 == JBC
+- Correction of the way the PEM stops before it reaches the SLURM time limit.
+- Small correction for 1D related to r3386.
+- Improvement of launching script.

trunk/LMDZ.COMMON/libf/evolution/deftank/jobPEM.slurm

@@ -37 +37 @@
 read i_myear n_myear convert_years iPCM iPEM nPCM nPCM_ini < info_PEM.txt
 cp run_PEM.def run.def
-./$exePEM > out_runPEM${iPEM} 2>&1
+./$exePEM $SLURM_JOB_ID > out_runPEM${iPEM} 2>&1
 if [ ! -f "restartfi.nc" ] || ! (tail -n 1 out_runPEM${iPEM} | grep -iq "so far, so good!"); then # Check if it ended abnormally
     echo "Error: the run PEM $iPEM crashed!"

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

@@ -153 +153 @@
         echo "Run PCM $iPCM: call $ii/$1..."
         cp jobPCM.slurm jobPCM${iPCM}.slurm
-        sed -i "s/#SBATCH --job-name=jobPCM.*/#SBATCH --job-name=jobPCM${iPCM}/" jobPCM${iPCM}.slurm
+        sed -i -E "s/(#SBATCH --job-name=[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPCM}/" jobPCM${iPCM}.slurm
         sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc -l)/" jobPCM${iPCM}.slurm
         jobID=$(sbatch --parsable jobPCM${iPCM}.slurm)
@@ -170 +170 @@
             echo "Run PCM $iPCM: call $i/$1..."
             cp jobPCM.slurm jobPCM${iPCM}.slurm
-            sed -i "s/#SBATCH --job-name=jobPCM.*/#SBATCH --job-name=jobPCM${iPCM}/" jobPCM${iPCM}.slurm
+            sed -i -E "s/(#SBATCH --job-name=[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPCM}/" jobPCM${iPCM}.slurm
             sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc -l)/" jobPCM${iPCM}.slurm
             jobID=$(sbatch --parsable --dependency=afterok:${jobID} jobPCM${iPCM}.slurm)
@@ -186 +186 @@
     if [ $i_myear -lt $n_myear ]; then
         echo "Run PEM $iPEM"
-        sed -i "s/#SBATCH --job-name=jobPEM.*/#SBATCH --job-name=jobPEM${iPEM}/" jobPEM.slurm
+        sed -i -E "s/(#SBATCH --job-name=[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPEM}/" jobPEM.slurm
         jobID=$(sbatch --parsable jobPEM.slurm)
         # Create a file to cancel the dependent jobs of the cycle
@@ -207 +207 @@
     if [ $i_myear -lt $n_myear ]; then
         echo "Run PEM $iPEM"
-        sed -i "s/#SBATCH --job-name=jobPEM.*/#SBATCH --job-name=jobPEM${iPEM}/" jobPEM.slurm
+        sed -i -E "s/(#SBATCH --job-name=[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPEM}/" jobPEM.slurm
         jobID=$(sbatch --parsable --dependency=afterok:${jobID} jobPEM.slurm)
         echo "scancel" $jobID >> kill_launchPEM.sh

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

@@ -33 +33 @@
 
 !----- Code
-inquire(file = 'info_PEM.txt', exist = ok)
+inquire(file = 'info_PEM.txt',exist = ok)
 if (ok) then
     write(ich1,'(i0)') i_myear

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

@@ -307 +307 @@
         error stop 'pem: command execution not supported!'
     endif
-    ! Assume 'chtimelimit' format is "D-HH:MM:SS" or "HH:MM:SS"
-    if (index(chtimelimit,'-') > 0) then
+    if (index(chtimelimit,'-') > 0) then ! 'chtimelimit' format is "D-HH:MM:SS"
         read(chtimelimit, '(i1,a1,i2,a1,i2,a1,i2)') days, sep, hours, sep, minutes, sep, seconds
         timelimit = days*86400 + hours*3600 + minutes*60 + seconds
-    else
-        read(chtimelimit,'(i2,a1,i2,a1,i2)') hours, sep, minutes, sep, seconds
+    else if (index(chtimelimit,':') > 0 .and. len_trim(chtimelimit) > 5) then ! 'chtimelimit' format is "HH:MM:SS"
+        read(chtimelimit, '(i2,a1,i2,a1,i2)') hours, sep, minutes, sep, seconds
         timelimit = hours*3600 + minutes*60 + seconds
+    else ! 'chtimelimit' format is "MM:SS"
+        read(chtimelimit,'(i2,a1,i2)') minutes, sep, seconds
+        timelimit = minutes*60 + seconds
     endif
 endif
@@ -343 +345 @@
 #ifndef CPP_1D
     dtphys = daysec/48. ! Dummy value (overwritten in phyetat0)
-    day_step = steps_per_sol
     call conf_gcm(99,.true.)
     call infotrac_init
@@ -350 +351 @@
     allocate(longitude(ngrid),latitude(ngrid),cell_area(ngrid))
 #else
+    day_step = steps_per_sol
     allocate(q(1,llm,nqtot))
     allocate(longitude(1),latitude(1),cell_area(1))
@@ -724 +726 @@
 endif
 
-do while (year_iter < year_iter_max .and. i_myear < n_myear)
+do while (year_iter < 10000)
 ! II.a.1. Compute updated global pressure
     write(*,*) "Recomputing the new pressure..."
@@ -996 +998 @@
 !------------------------
     call system_clock(c2)
-    if (timelimit - real((c2 - c1)/cr) <= antetime) stopPEM = 7
+    if (real((c2 - c1)/cr) >= timelimit - antetime) stopPEM = 7
     call stopping_crit_h2o_ice(cell_area,h2oice_ini_surf,ini_h2oice_sublim,h2o_ice,stopPEM,ngrid)
     call stopping_crit_co2(cell_area,co2ice_ini_surf,ini_co2ice_sublim,co2_ice,stopPEM,ngrid,global_avg_press_PCM,global_avg_press_new,nslope)