Changeset 4980 for BOL/LMDZ_Setup_amaury/script_SIMU

Timestamp:

Jun 13, 2024, 2:39:53 PM (5 months ago)

Author:

abarral

Message:

(WIP) update spirit arch
update script_SIMU env
fix setup.sh, add netcdf option
fix aerosols detection

File:

• BOL/LMDZ_Setup_amaury/script_SIMU (modified) (5 diffs)

BOL/LMDZ_Setup_amaury/script_SIMU

@@ -23 +23 @@
 #@SP#SBATCH --time=00:30:00
 #@SP#SBATCH --output=outNOM_SIMU%j
-#@SP#SBATCH --error=outNOM_SIMU%j#@SP#Spirit
-#@SP#SBATCH --job-name=NOM_SIMU
-#@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
 #@SP#SBATCH --error=outNOM_SIMU%j
 #@ADS#Adastra
@@ -40 +33 @@
 #@ADS#SBATCH --error=outNOM_SIMU%j
 
-set -ex
-set +u  # Amaury 06/24: for local use (no $SLURM_CPUS_PER_TASK) - should be removed if we ever rewrite this whole legacy script properly...
+set -eux
 
 # Number of MPI processes :
@@ -48 +40 @@
 nthreads=8
 export OMP_NUM_THREADS=$nthreads
-
-# For Jean-Zay (replacing the next 3 lines, commented out) 
-#export OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
-
+#@JZ#export OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK  # For Jean-Zay (replacing the next 3 lines, commented out)
 # private memory for each thread
 export OMP_STACKSIZE=800M
-# Binding
-export OMP_PLACES=cores
+
+
+#@JZ#export OMP_PLACES=cores  # "binding" present in old script_SIMU, but terribly reduces performance on Spirit...
+ulimit -s unlimited
+#@SP ulimit -Ss 8192
 
 simul=NOM_SIMU
-ulimit -s unlimited
-#### reste ada  : export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/smplocal/pub/NetCDF/4.1.3/lib:/smplocal/pub/HDF5/1.8.9/seq/lib
-
 
 reseau_local=0
@@ -403 +392 @@
       if [ $num -le 250 ] ; then
          sed -e 's/^simul=.*.$/simul='$simul_new'/' -e 's/^\# @ job_nam.*.=.*.$/\# @ job_name = '$simul_new'/' tmp_$simul >| tmp_$simul_new
-         sbatch tmp_$simul_new
+         $SUBMITCMD tmp_$simul_new
       fi
    fi
@@ -417 +406 @@
 
 cd $SCRIPTDIR
-sbatch tmp_$simul
+$SUBMITCMD tmp_$simul