Changeset 5034

Timestamp:

Jul 9, 2024, 2:11:12 PM (2 months ago)

Author:

abarral

Message:

fix Adastra max cpu/node
fix Adastra sbatch env inheritance
remove Adastra nomultithread
fix ini script SUBMITCMD

Location:

BOL/LMDZ_Setup_amaury

Files:

• lmdz_env.sh (modified) (1 diff)
• script_SIMU (modified) (2 diffs)
• setup.sh (modified) (1 diff)

BOL/LMDZ_Setup_amaury/lmdz_env.sh

@@ -100 +100 @@
       NB_MPI_MAX=2000
       NB_OMP_MAX=200
-      NB_CORE_PER_NODE_MAX=96
+      NB_CORE_PER_NODE_MAX=192
       N_HYPERTHREADING=2
       MPICMD="srun -n"
       RUNBASHCMD="srun --label --account=$account --constraint=GENOA --ntasks-per-node=1 -n 1 --time=00:15:00 -c"
-      SUBMITCMD="sbatch --constraint=GENOA --account=$account"
+      SUBMITCMD="env $(env | grep -E "SLURM_|SBATCH_|SRUN_" | cut -d= -f1 | awk '{print "-u " $0}') sbatch --constraint=GENOA --account=$account"  # we need to remove the existing SLURM variables otherwise they lay be unexpectedly inherited by the submitted script
       ;;
     *) echo "WARNING: RUNNING THIS SCRIPT ON A LOCAL COMPUTER IS DISCOURAGED (lackluster cpus and memory)"

BOL/LMDZ_Setup_amaury/script_SIMU

@@ -20 +20 @@
 #@SP#SBATCH --ntasks=8
 #@SP#SBATCH --cpus-per-task=8
-#@SP#SBATCH --hint=nomultithread
 #@SP#SBATCH --time=00:30:00
 #@SP#SBATCH --output=outNOM_SIMU%j
@@ -28 +27 @@
 #@ADS#SBATCH --ntasks=8
 #@ADS#SBATCH --cpus-per-task=8
-#@ADS#SBATCH --ntasks-per-node=8  # TODO check how to scale this
-#@ADS#SBATCH --hint=nomultithread
+#@ADS#SBATCH --ntasks-per-node=8
 #@ADS#SBATCH --time=00:30:00
 #@ADS#SBATCH --output=outNOM_SIMU%j

BOL/LMDZ_Setup_amaury/setup.sh

@@ -688 +688 @@
     if [[ $ok_guide != "y" ]]; then # Running first simulation automatically except for nudging
       cat << ...eod >> tmp
-       $SUBMITCMD tmp_$SIM
+      echo "Submitting job tmp_$SIM"
+      echo "\$SUBMITCMD tmp_$SIM"
+      \$SUBMITCMD tmp_$SIM
 ...eod
     fi