Changeset 4958 for BOL

Timestamp:

Jun 3, 2024, 2:30:11 PM (7 months ago)

Author:

abarral

Message:

(WIP) remove $GROUPE & prepare adastra env

Location:

BOL/LMDZ_Setup_amaury

Files:

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

BOL/LMDZ_Setup_amaury/lmdz_env.sh

@@ -4 +4 @@
 ##############################################################
 
-hostname=$(hostname)
+if grep -q "Adastra" /etc/motd; then
+  hostname="adastra"
+else
+  hostname=$(hostname)
+fi
 echo "Setting up lmdz_env on $hostname"
 
@@ -28 +32 @@
     #   idrproj -d newproj   redefinit "newproj" en tant que  projet actif,
     #        alors $STORE, $WORK etc vont designer les espaces de "newproj")
-    GROUPE=$(idrproj | grep active | awk '{ print $1}')
-    SUBMITCMD="sbatch -A $GROUPE@cpu "
+    account=$(idrproj | grep active | awk '{ print $1}')
+    SUBMITCMD="sbatch -A $account@cpu "
     RUNCMD="srun --label -n"
     # Espaces suivants definis par defaut en fonction du groupe actif,
@@ -41 +45 @@
     #LMDZ_Init sur le $STORE du $groupe
     LMDZ_INIT=$STORE/LMDZ_Init
+    ;;
+  adast)
+#    module purge
+#    module load PrgEnv-gnu
+#    module load cray-hdf5-parallel
+#    module load netcdf-hdf5parallel/gnu/10.3
 
-    JOB_HEADER="#SBATCH -A $groupe@cpu
-    #@TESTQ#SBATCH --qos=qos_cpu-dev"
-
+    account=$(/usr/sbin/my_project.py -l 2>&1 | head -1 | cut -d " " -f 3- | cut -c 5-)
+    root_dir="$WORKDIR/LMDZ_Setup";
+    ARCH="X64_ADASTRA-GNU"
+    SIMRUNBASEDIR="$SCRATCHDIR/"
+    LMDZD="$root_dir/LMDZD"
+    LMDZ_INIT="$root_dir/LMDZ_Init"
+    NB_MPI_MAX=2000
+    NB_OMP_MAX=20
+    RUNCMD="srun --label --account=$account -n"
+    SUBMITCMD="sbatch --account=$account"
     ;;
   *) echo "WARNING: RUNNING THIS SCRIPT ON A LOCAL COMPUTER IS DISCOURAGED (lacklusted cpus and memory)"
-    local_env_dir="/home/abarral/PycharmProjects/installLMDZ/LMDZ_Setup"; if [[ ! -d $local_env_dir ]]; then echo "STOP: local_env_dir $local_env_dir not found, either you are running on an unsupported cluster, or you haven't edited lmdz_env.sh properly"; exit 1; fi  # Can't use $(pwd) since this script gets copied and ran from several locations
+    root_dir="/home/abarral/PycharmProjects/installLMDZ/LMDZ_Setup"; # Where LMDZ_Setup is extracted. Can't use $(pwd) since this script gets copied and ran from several locations
     ARCH="local-gfortran-parallel"
     SIMRUNBASEDIR="/tmp/SCRATCH/"  # Where the simulations will be executed ($SIMRUNBASEDIR/LMDZ_Setup/...)
-    LMDZD="$local_env_dir/LMDZD"  # Where the sources will be downloaded and compiled
-    LMDZ_INIT="$local_env_dir/LMDZ_Init"  # Where to store shared files used for initialisation
+    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
     NB_OMP_MAX=1  # Max number of OMP threads
-    GROUPE=""  # the group to execute the job as
     RUNCMD="mpirun -np" # command to run a job, as $runcmd <nprocs> <script>
     SUBMITCMD="."  # command to sumbit a job, as $submitcmd <script>
     ;;
 esac
+
+if [[ ! (-d $root_dir && -f $root_dir/lmdz_env.sh) ]]; then
+  echo "STOP: root_dir $root_dir not found, either you are running on an unsupported cluster, or you haven't edited lmdz_env.sh properly"; exit 1
+fi

BOL/LMDZ_Setup_amaury/reb.sh

@@ -25 +25 @@
 ## Headers managed by sed
 #@JZ#JeanZay
-#@JZ#SBATCH -A @@groupe@cpu
 #@JZ#SBATCH --job-name=Seq              # nom du job
 #@JZ#SBATCH --nodes=1                   # nombre de noeuds
@@ -54 +53 @@
 
   echo "Submitting the rebuild job $job"
-  sbatch "$job"
+  $RUNCMD "$job"
 done

BOL/LMDZ_Setup_amaury/script_SIMU

@@ -3 +3 @@
 #@JZ#JeanZay
 #@JZ#SBATCH --job-name=NOM_SIMU         # nom du job
-#@JZ#SBATCH -A @@groupe@cpu
 #@JZ# Nombre de processus MPI :
 #@JZ#SBATCH --ntasks=8

BOL/LMDZ_Setup_amaury/setup.sh

@@ -389 +389 @@
     # Edit reb.sh
     cp reb.sh "$local/$SIM/reb.sh"; chmod +x "$local/$SIM/reb.sh"
-    sed -i'' -e "s:^rebuild=.*.$:rebuild=$LMDZD/$LMDZname/modipsl/bin/rebuild:" \
-    -e "s/@@groupe/$GROUPE/" "$local/$SIM/reb.sh"
+    sed -i'' -e "s:^rebuild=.*.$:rebuild=$LMDZD/$LMDZname/modipsl/bin/rebuild:" "$local/$SIM/reb.sh"
     enable_groupe "$local/$SIM/reb.sh"
 
@@ -432 +431 @@
   local isotopes="n"
   if [[ $phylmd = "lmdiso" ]]; then isotopes="y"; fi
-  sed -e "s/@@groupe/$GROUPE/" \
-  -e "s/NOM_SIMU/$SIM/" \
+  sed -e "s/NOM_SIMU/$SIM/" \
   -e "s/time=.*.$/time=$cput/" \
   -e "s/ntasks=.*.$/ntasks=$mpi/" \
@@ -601 +599 @@
 #@JZ#JeanZay
 #@JZ#SBATCH --job-name=Init         # nom du job
-#@JZ#SBATCH -A "$GROUPE"@cpu
 #@JZ#SBATCH --ntasks=1             # Nombre de processus MPI
 #@JZ#SBATCH --cpus-per-task=16     # nombre de threads OpenMP