Changeset 3354 for trunk

Timestamp:

Jun 3, 2024, 10:24:30 AM (7 months ago)

Author:

jbclement

Message:

PEM:
Addition of a script to execute multiple scripts in subdirectories (useful to launch multiple jobs at once for ex.) + Updates for several scripts in the deftank.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• deftank/clean.sh (modified) (2 diffs)
• deftank/jobPCM.slurm (modified) (2 diffs)
• deftank/jobPEM.slurm (modified) (3 diffs)
• deftank/lib_launchPEM.sh (modified) (1 diff)
• deftank/multiple_exec.sh (added)

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

@@ -341 +341 @@
 - Updates for several scripts in the deftank.
 - Addition of the bash script "clean.sh" to clean a folder after a PEM simulation.
+
+== 03/06/2024 == JBC
+Addition of a script to execute multiple scripts in subdirectories (useful to launch multiple jobs at once for ex.) + Updates for several scripts in the deftank.

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

@@ -5 +5 @@
 
 echo "Cleaning..."
-rm Bands*.dat
-rm data2reshape*
-rm data_PCM_Y*
-rm info_PEM.txt
+# Cleaning of files in the current folder
+rm -f Bands*.dat
+rm -f data2reshape*
+rm -f data_PCM_Y*
+rm -f info_PEM.txt
 find . -type f -name "jobPCM*.slurm" ! -name "jobPCM.slurm" -delete
-rm *.out
-rm kill_launchPEM.sh
-rm log_launchPEM.txt
-rm out_run*
-rm run.def
-rm start*.nc
-rm used_*
-rm Xdiurnalave.nc
-rm xios_client_*
-rm diag*.nc
-rm restart*.nc
-rm restart1D*.txt
-rm start1D*.txt
-cp starts/startfi.nc .
+rm -f *.out
+rm -f kill_launchPEM.sh
+rm -f log_launchPEM.txt
+rm -f out_run*
+rm -f run.def
+rm -f start*.nc
+rm -f used_*
+rm -f Xdiurnalave.nc
+rm -f xios_client_*
+rm -f diag*.nc
+rm -f restart*.nc
+rm -f restart1D*.txt
+rm -f start1D*.txt
+# Reset the initial starting files to prepare a new simulation
+if [ -f "starts/startfi.nc" ]; then
+    cp starts/startfi.nc .
+fi
 if [ -f "starts/start.nc" ]; then
     cp starts/start.nc .
@@ -29 +33 @@
     cp starts/start1D.txt .
 fi
-rm diags/*
-rm starts/*
-rm out_PCM/*
-rm out_PEM/*
+# Cleaning of files in the sub-folders
+rm -f diags/*
+rm -f starts/*
+rm -f out_PCM/*
+rm -f out_PEM/*
 echo "Done!"

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

@@ -25 +25 @@
 ########################################################################
 
-
+# Running the PCM
 echo "Run PCM $iPCM is starting."
 read i_myear n_myear convert_years iPCM iPEM nPCM nPCM_ini < info_PEM.txt
 cp run_PCM.def run.def
 srun --cpu-bind=threads --label -c${OMP_NUM_THREADS:=1} $exePCM > out_runPCM${iPCM} 2>&1
-
 if [ ! -f "restartfi.nc" ] || [ ! tail -n 1 out_runPCM${iPCM} | grep -iq "everything is cool!" ]; then # Check if it ended abnormally
     echo "Error: the run PCM $iPCM crashed!"
@@ -36 +35 @@
     exit 1
 fi
+
 # Copy data files and prepare the next run
 mv out_runPCM${iPCM} out_PCM/run${iPCM}

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

@@ -25 +25 @@
 
 
+# Reshaping PCM data with XIOS
 echo "Reshaping PCM data with XIOS is starting."
 ./$exeReshape
@@ -32 +33 @@
 fi
 
+# Running the PEM
 echo "Run PEM $iPEM is starting."
 read i_myear n_myear convert_years iPCM iPEM nPCM nPCM_ini < info_PEM.txt
@@ -40 +42 @@
     exit 1
 fi
+
 # Copy data files and prepare the next run
 mv out_runPEM${iPEM} out_PEM/run${iPEM}

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

@@ -138 +138 @@
 # To submit the PCM runs
 submitPCM() {
-    find . -type f -name "jobPCM*.slurm" ! -name "jobPCM.slurm" -exec rm {} +
+    find . -type f -name "jobPCM*.slurm" ! -name "jobPCM.slurm" -delete
     if [ $i_myear -lt $n_myear ]; then
         echo "Run PCM $iPCM: call 1/$1..."