Index: BOL/LMDZ_Setup_amaury/lmdz_env.sh
===================================================================
--- BOL/LMDZ_Setup_amaury/lmdz_env.sh	(revision 5013)
+++ BOL/LMDZ_Setup_amaury/lmdz_env.sh	(revision 5014)
@@ -64,4 +64,6 @@
       NB_MPI_MAX=5
       NB_OMP_MAX=1
+      NB_CORE_PER_NODE_MAX=0
+      N_HYPERTHREADING=1
       MPICMD="mpirun -np"  # on spirit, we can't run MPI using srun from within sbatch
       RUNBASHCMD="bash"
@@ -96,6 +98,8 @@
       LMDZD="$root_dir/LMDZD"
       LMDZ_INIT="$root_dir/LMDZ_Init"
-      NB_MPI_MAX=1  # TODO 2000 in JZ
-      NB_OMP_MAX=1  # TODO 20 in JZ
+      NB_MPI_MAX=2000
+      NB_OMP_MAX=200
+      NB_CORE_PER_NODE_MAX=96
+      N_HYPERTHREADING=2
       MPICMD="srun -n"
       RUNBASHCMD="srun --label --account=$account --constraint=GENOA --ntasks-per-node=1 -n 1 --time=00:10:00 -c"
@@ -108,6 +112,8 @@
       LMDZD="$root_dir/LMDZD"  # Where the sources will be downloaded and compiled
       LMDZ_INIT="$root_dir/LMDZ_Init"  # Where to store shared files used for initialisation
-      NB_MPI_MAX=2  # Max number of MPI cores (only for running simulations)
-      NB_OMP_MAX=1  # Max number of OMP threads (only for running simulations)
+      NB_MPI_MAX=33  # Max number of MPI cores (only for running simulations)
+      NB_OMP_MAX=100  # Max number of OMP threads (only for running simulations)
+      NB_CORE_PER_NODE_MAX=0  # Max number of cores per node (real cores, not hyperthreading - only for running simulations, cluster-specific)
+      N_HYPERTHREADING=1  # How many hyperthreading threads per physical core
       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"]