Changeset 5030

Timestamp:

Jul 9, 2024, 9:50:38 AM (2 months ago)

Author:

abarral

Message:

update main.sh default tar
fix ntasks-per-node sed
remove test_ERAfiles_JeanZay.sh

Location:

BOL/LMDZ_Setup_amaury

Files:

• lmdz_env.sh (modified) (1 diff)
• main.sh (modified) (2 diffs)
• setup.sh (modified) (4 diffs)
• test_ERAfiles_JeanZay.sh (deleted)

BOL/LMDZ_Setup_amaury/lmdz_env.sh

@@ -112 +112 @@
       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=33  # Max number of MPI cores (only for running simulations)
-      NB_OMP_MAX=100  # Max number of OMP threads (only for running simulations)
+      NB_MPI_MAX=2  # Max number of MPI cores (only for running simulations)
+      NB_OMP_MAX=2  # 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

BOL/LMDZ_Setup_amaury/main.sh

@@ -26 +26 @@
 # Version of the tar file on https://lmdz.lmd.jussieu.fr/pub/src
 # Last "testing" version, thoroughly checked by the LMDZ team : contains LMDZ rev 4729 (2023-10-22)
-version="20240308.trunk" #!! DON'T CHANGE IT WITHOUT CHECKING WITH LMDZ TEAM !!
+version="20240508.CM7" #!! DON'T CHANGE IT WITHOUT CHECKING WITH LMDZ TEAM !!
 svn=""                   #!! DON'T CHANGE IT WITHOUT CHECKING WITH LMDZ TEAM !!
 # CONTACT LMDZ Team :
@@ -34 +34 @@
 # Grid number of points IMxJMxLM
 resol="144x142x79"
-resol="32x32x39"  # TODO TEMP
 
 ## Using XIOS for IOs: "-xios" (enabled) / "" (disabled)

BOL/LMDZ_Setup_amaury/setup.sh

@@ -165 +165 @@
   # NOTES :
   # omp=8 by default (for Jean-Zay must be a divisor of 40 procs/node), but we need
-  #   omp=1 for SPLA (only MPI parallelisation)
-  #   omp=2 for veget=CMIP6 beacause of a bug in ORCHIDEE/src_xml/xios_orchidee.f90
+  # omp=1 for SPLA (only MPI parallelisation)
   ######################################################################
   jm=$(echo "$resol" | cut -dx -f2)
@@ -172 +171 @@
   omp=8
   if [[ $aerosols = "spla" ]]; then omp=1; fi
-  if [[ $veget = "CMIP6" && $xios = "y" ]]; then omp=2; fi
   if [[ $mpi -gt $NB_MPI_MAX ]]; then mpi=$NB_MPI_MAX; fi
   if [[ $omp -gt $NB_OMP_MAX ]]; then omp=$NB_OMP_MAX; fi
 
   # Compute how many mpi per node (required e.g. for Adastra)
+  mpi_per_node=0
   if [[ $NB_CORE_PER_NODE_MAX -gt 0 ]]; then
     local N_omp_mt=1
@@ -273 +272 @@
   ######################################################################
 
-  # Choix du fichier traceur.def coherent avec l'option "aerosols"
+  # Choix du fichier tracer.def coherent avec l'option "aerosols"
   #  NOTE : Le nouveau tracer.def_nospla par defaut n'inclut pas Rn-Pb;
   #             si on les veut, il faut utiliser ci-dessous; a la place, tracer_RN_PB.def
   #---------------------------------------------------------------------
-  # NB: Si on change de traceur.def (entre spla et nospla), il faut refaire l'etape "initialisation" (ce0l)?
-  # Normalement les traceurs absents de start* files sont initialises=0 dans le code; verifier pour spla !
+  # NB : Les traceurs absents de start* files sont initialises=0 dans le code
   if [[ $aerosols = "spla" ]]; then
-    # ancien traceur pour l instant
+    # nouveau tracer.def (remplace "traceur.def")
     cp DEF/tracer.def_spla DEF/tracer.def
   elif [[ $phylmd = "lmdiso" ]]; then
-    # nouveau traceur , déjà copié si 'y'
+    # déjà copié si 'y'
     cp DEF/tracer.def_nospla DEF/tracer.def
   fi
@@ -440 +438 @@
   -e "s/time=.*.$/time=$cput/" \
   -e "s/ntasks=.*.$/ntasks=$mpi/" \
-  -e "s/ntasks=.*.$/ntasks-per-node=$mpi_per_node/" \
+  -e "s/ntasks-per-node=.*.$/ntasks-per-node=$mpi_per_node/" \
   -e "s/cpus-per-task=.*.$/cpus-per-task=$omp/" \
   -e "s/nthreads=.*./nthreads=$omp/" \