Fix lemaitre3 skeleton

templates/lemaitre3/experiment.cfg

@@ -3,14 +3,14 @@ exp_name=EXMP
 
 # Simulation start and end date. Use any (reasonable) syntax you want.
 run_start_date="1958-01-01"
-run_duration="50 year"
+run_duration="58 year"
 
 # Restart frequency. Use any (reasonable) number and time unit you want.
 # For runs without restart, leave this variable empty or set to 0
 rst_freq="1 year"
 
 # Number of restart legs to be run in one go
-run_num_legs=10
+run_num_legs=20
 
 # Special restart
 special_restart=false

templates/lemaitre3/job.cfg

@@ -9,7 +9,7 @@ SBATCH --mem-per-cpu=3072
 #SBATCH --mail-user=${email}
 SBATCH --mail-type=ALL
 SBATCH --open-mode=append
-SBATCH --switches=1
+SBATCH --switches=1@47:50:00
 
 # Cancel job on error
 set -ueo pipefail

templates/lemaitre3/programs.cfg

@@ -8,7 +8,7 @@ extralibs_list=""
 nemo_src_dir=${HOME}/modeles/nemo/NEMO_DEV
 shared_dir=${nemo_src_dir}/CONFIG/SHARED
 nem_exe_file=${nemo_src_dir}/CONFIG/${nem_config_name}/BLD/bin/nemo.exe
-nem_numproc=44
+nem_numproc=140
 
 # -----------------------------------------------------------------------------
 # *** XIOS configuration

templates/scripts/skeleton.sh

@@ -40,7 +40,7 @@ function leap_days()
 
 [[ $@ == *verbose* ]] && set -x
 
-module load "${module_list:?}"
+module load ${module_list:?}
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}"${extralibs_list}"
 
 #
@@ -264,12 +264,12 @@ if (( leg_end_epoch < run_end_epoch )) ; then
     echo "Leg end earlier than end of simulation."
     echo "Submitting another job."
     #[[ $@ == *local* ]] && exec $0 $@ || scontrol requeue $SLURM_JOB_ID #TODO: factorize this
-    if [ "$@" == *local* ] ; then
+    if [[ "$@" == *"local"* ]] ; then
         exec "$0" "$@"
-    elif [ "${submit_command}" == *sbatch* ] ; then
-        "${submit_command}" "$0" "$@" | awk '{print $4}' >> "${run_dir}"/.coral_jobs
+    elif [[ "sbatch" == *"sbatch"* ]] ; then
+        sbatch $0 $@ | awk '{print $4}' >> ${run_dir}/.coral_jobs
     else
-        "${submit_command}" -v PBS_OPTIONS="$@" "$0" | tee -a coral_jobs
+        "qsub" -v PBS_OPTIONS="$@" "$0" | tee -a coral_jobs
         sleep 2
         jobid=`cat coral_jobs`
         rm -f coral_jobs