Changeset 5422 for BOL/LMDZ_Setup/lmdz_env.sh

Timestamp:

Dec 18, 2024, 9:29:49 AM (14 hours ago)

Author:

fhourdin

Message:

Changing $SUBMITCMD to a function submitcmd

Need for local use of LMDZ

File:

• BOL/LMDZ_Setup/lmdz_env.sh (modified) (6 diffs)

BOL/LMDZ_Setup/lmdz_env.sh

@@ -12 +12 @@
 
 function get_hostname {
-  if grep -q "Adastra" /etc/motd; then
+  if grep -q "Adastra" /etc/motd 2>/dev/null ; then
     hostname="adastra"
   elif which idrquota &> /dev/null; then
@@ -23 +23 @@
 function set_env {  # Platform-specific
   case ${hostname:0:5} in
-    jean-)
+#-------------------------------------------------------------------------
+    jean-) # Jean-zay, Idris-CNRS super computer
+#-------------------------------------------------------------------------
       module purge
       compilo=19.0.4 # available 2013.0, 2017.2
@@ -51 +53 @@
       MPICMD="srun -n"
       RUNBASHCMD="srun -A $account@cpu --label -n 1 -c"
-      SUBMITCMD="sbatch -A $account@cpu"
+      #SUBMITCMD="sbatch -A $account@cpu"
+      submitcmd() {
+         sbatch -A $account@cpu $1
+      }
       ;;
-    spiri)
+#-------------------------------------------------------------------------
+    spiri) # Spirit : IPSL cluster
+#-------------------------------------------------------------------------
       module purge
       module load subversion/1.13.0
@@ -70 +77 @@
       MPICMD="mpirun -np"  # on spirit, we can't run MPI using srun from within sbatch
       RUNBASHCMD="bash"
-      SUBMITCMD="sbatch"
+      #SUBMITCMD="sbatch"
+      submitcmd() {
+         sbatch $1
+      }
       ;;
-    adast)
+#-------------------------------------------------------------------------
+    adast) # Adastra, Cines computing center
+#-------------------------------------------------------------------------
       module purge
       module load PrgEnv-gnu  # we need to load the env because lmdz links some shared libraries
@@ -108 +120 @@
 #      RUNBASHCMD="srun --label --account=$account --constraint=GENOA --ntasks-per-node=1 -n 1 --time=00:15:00 -c"
       RUNBASHCMD="bash"  # On Adastra the docs says we can use login nodes for compilation
-      SUBMITCMD="env $(env | grep -E "SLURM_|SBATCH_|SRUN_" | cut -d= -f1 | awk '{print "-u " $0}' | tr '\n' ' ' ) sbatch --constraint=GENOA --account=$account"  # we need to remove the existing SLURM variables otherwise they may be unexpectedly inherited by the submitted script
+      #SUBMITCMD="env $(env | grep -E "SLURM_|SBATCH_|SRUN_" | cut -d= -f1 | awk '{print "-u " $0}' | tr '\n' ' ' ) sbatch --constraint=GENOA --account=$account"  # we need to remove the existing SLURM variables otherwise they may be unexpectedly inherited by the submitted script
+      submitcmd() {
+        env $(env | grep -E "SLURM_|SBATCH_|SRUN_" | cut -d= -f1 | awk '{print "-u " $0}' | tr '\n' ' ' ) sbatch --constraint=GENOA --account=$account
+      }  # we need to remove the existing SLURM variables otherwise they may be unexpectedly inherited by the submitted script
       ;;
-    *) echo "WARNING: RUNNING THIS SCRIPT ON A LOCAL COMPUTER IS DISCOURAGED (lackluster cpus and memory)"
+#-------------------------------------------------------------------------
+    *)  # Local machine.
+#-------------------------------------------------------------------------
       ARCH="local-gfortran-parallel"  # The arch file to use
       SIMRUNBASEDIR="$root_dir/SCRATCH/"  # Where the simulations will be executed ($SIMRUNBASEDIR/LMDZ_Setup/...)
@@ -121 +138 @@
       MPICMD="mpirun -np" # command to run an mpi executable, as $MPICMD <nprocs> <script>
       RUNBASHCMD="bash" # command to run a bash job, as $runbashcmd (nthreads) <script> [nthreads only supplied if =/="bash"]
-      SUBMITCMD="."  # command to sumbit a job, as $submitcmd <script>
+      #SUBMITCMD="."  # command to sumbit a job, as $submitcmd <script>
+      submitcmd() {
+         nohup bash $1 > out.$$ 2>err.$$ &
+      }
       ;;
   esac