Fix for lemaitre3

3.2.2/runtime/classic/config-run.xml

@@ -60,7 +60,7 @@
         <Parameter name="RUN_DIR">
             <Description>EC-Earth run directory</Description>
             <Type>PATH</Type>
-            <Value>/scratch/ucl/elic/${USER}/ecearth/run/${exp_name}</Value>
+            <Value>/CECI/trsf/${USER}/run/ecearth/${exp_name}</Value>
         </Parameter>
 
         <Parameter name="INI_DATA_DIR">
@@ -96,7 +96,7 @@
         <Parameter name="GRIBAPI_BASE_DIR">
             <Description>GRIB API base directory</Description>
             <Type>PATH</Type>
-            <Value>/opt/cecisw/arch/easybuild/2018a/software/grib_api/1.16.0-intel-2018a</Value>
+            <Value>${EBROOTGRIB_API}</Value>
         </Parameter>
 
         <Parameter name="GRIBAPI_BIN_SUBDIR">
@@ -132,7 +132,7 @@
         <Parameter name="MODULE_LIST">
             <Description>List of modules to load</Description>
             <Type>STRING</Type>
-            <Value>Boost netCDF-Fortran/4.4.4-intel-2018a grib_api</Value>
+            <Value>2016a netCDF-Fortran/4.4.4-intel-2016a grib_api/1.16.0-intel-2016a openjpeg/1.5.2-intel-2016a</Value>
         </Parameter>
 
     </Platform>

3.2.2/runtime/classic/ece-ifs+nemo.sh.tmpl

@@ -622,7 +622,7 @@ do
     # -------------------------------------------------------------------------
     # *** Move IFS output files to archive directory
     # -------------------------------------------------------------------------
-    outdir="output/ifs/$(printf %03d $((leg_number)))"
+    outdir="${archive_dir}/output/ifs/$(printf %03d $((leg_number)))"
     mkdir -p ${outdir}
 
     prv_leg=$(printf %03d $((leg_number-1)))
@@ -646,23 +646,24 @@ do
     # -------------------------------------------------------------------------
     # *** Move NEMO output files to archive directory
     # -------------------------------------------------------------------------
-    outdir="output/nemo/$(printf %03d $((leg_number)))"
+    outdir="${archive_dir}/output/nemo/$(printf %03d $((leg_number)))"
     mkdir -p ${outdir}
 
-    for v in grid_U grid_V grid_W grid_T icemod SBC scalar SBC_scalar
-    do
-        for f in ${exp_name}_??_????????_????????_${v}.nc
-        do
-            test -f $f && mv $f $outdir/
-        done
-    done
+    for f in ${exp_name}_??_????????_????????_*.nc ; do mv $f $outdir/ ; done
+    #for v in grid_U grid_V grid_W grid_T icemod SBC scalar SBC_scalar
+    #do
+    #    for f in ${exp_name}_??_????????_????????_${v}.nc
+    #    do
+    #        test -f $f && mv $f $outdir/
+    #    done
+    #done
 
     # -------------------------------------------------------------------------
     # *** Move IFS restart files to archive directory
     # -------------------------------------------------------------------------
     if $leg_is_restart
     then
-        outdir="restart/ifs/$(printf %03d $((leg_number)))"
+        outdir="${archive_dir}/restart/ifs/$(printf %03d $((leg_number)))"
         mkdir -p ${outdir}
 
         # Figure out the time part of the restart files (cf. CTIME on rcf files)
@@ -677,7 +678,7 @@ do
     # -------------------------------------------------------------------------
     if $leg_is_restart
     then
-        outdir="restart/nemo/$(printf %03d $((leg_number)))"
+        outdir="${archive_dir}/restart/nemo/$(printf %03d $((leg_number)))"
         mkdir -p ${outdir}
 
         ns=$(printf %08d $(( leg_start_sec / nem_time_step_sec - nem_restart_offset )))
@@ -694,7 +695,7 @@ do
     #           Note also that the OASIS restart files present at the end of
     #           the leg correspond to the start of the next leg!
     # -------------------------------------------------------------------------
-    outdir="restart/oasis/$(printf %03d $((leg_number+1)))"
+    outdir="${archive_dir}/restart/oasis/$(printf %03d $((leg_number+1)))"
     mkdir -p ${outdir}
 
     for f in ${oas_rst_files}
@@ -705,7 +706,7 @@ do
     # -------------------------------------------------------------------------
     # *** Copy rcf files to the archive directory (of the next leg!)
     # -------------------------------------------------------------------------
-    outdir="restart/ifs/$(printf %03d $((leg_number+1)))"
+    outdir="${archive_dir}/restart/ifs/$(printf %03d $((leg_number+1)))"
     mkdir -p ${outdir}
 
     for f in rcf
@@ -716,7 +717,7 @@ do
     # -------------------------------------------------------------------------
     # *** Move log files to archive directory
     # -------------------------------------------------------------------------
-    outdir="log/$(printf %03d $((leg_number)))"
+    outdir="${archive_dir}/log/$(printf %03d $((leg_number)))"
     mkdir -p ${outdir}
 
     for f in \

3.2.2/runtime/classic/lemaitre3.sh.tmpl

@@ -3,17 +3,20 @@
 #SBATCH --job-name=ece3
 #SBATCH --time=23:50:00
 #
-#SBATCH --ntasks=384
-#SBATCH --mem-per-cpu=4096
+#SBATCH --ntasks=144
+#SBATCH --mem-per-cpu=3072
 #
-#SBATCH --mail-user=noname@uclouvain.be
+##SBATCH --mail-user=noname@uclouvain.be
 #SBATCH --mail-type=ALL
+#SBATCH --open-mode=append
+#SBATCH --switches=1@47:50:00
+set -ueo pipefail
 
 exec > ${SLURM_SUBMIT_DIR-$PWD}/${SLURM_JOB_NAME-"local"}_${SLURM_JOB_ID-"id"}.log
 echo "------------------ Job Info --------------------"
-echo "jobid : $SLURM_JOB_ID"
-echo "jobname : $SLURM_JOB_NAME"
-echo "submit dir : $SLURM_SUBMIT_DIR"
+echo "jobid : ${SLURM_JOB_ID-"local"}"
+echo "jobname : ${SLURM_JOB_NAME-"local"}"
+echo "submit dir : ${SLURM_SUBMIT_DIR-"local"}"
 
 set -ue 
 

3.2.2/runtime/classic/platform/lemaitre3.cfg.tmpl

@@ -12,25 +12,17 @@ function configure()
     ecearth_src_dir=[[[PLT:ACTIVE:ECEARTH_SRC_DIR]]]
     run_dir=[[[PLT:ACTIVE:RUN_DIR]]]
     ini_data_dir=[[[PLT:ACTIVE:INI_DATA_DIR]]]
+    archive_dir=/scratch/ucl/elic/${USER}/ecearth/archive/${exp_name}
 
     # File for standard output.
     # NOTE: This will be modified for restart jobs!
-    stdout_file=${SLURM_SUBMIT_DIR-$PWD}/${SLURM_JOB_NAME}_${SLURM_JOB_ID-"id"}.log
+    stdout_file=${SLURM_SUBMIT_DIR-$PWD}/${SLURM_JOB_NAME-"local"}_${SLURM_JOB_ID-"id"}.log
 
     # Resubmit this job for automatic restarts? [true/false]
     # Also, add options for the resubmit command here.
     resubmit_job=[[[PLT:ACTIVE:RESUBMIT_JOB]]]
     resubmit_opt="[[[PLT:ACTIVE:RESUBMIT_OPT]]]"
 
-    # Configure GRIBEX paths
-    export LOCAL_DEFINITION_TEMPLATES=[[[PLT:ACTIVE:GRIBEX_DEFINITION_PATH]]]/gribtemplates
-    export ECMWF_LOCAL_TABLE_PATH=[[[PLT:ACTIVE:GRIBEX_DEFINITION_PATH]]]/gribtables
-
-    # Configure grib api paths
-    export GRIB_DEFINITION_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_DEFINITION_SUBDIR]]]
-    export GRIB_SAMPLES_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_SAMPLES_SUBDIR]]]
-    export GRIB_BIN_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_BIN_SUBDIR]]]
-
     # Configure number of processors per node
     proc_per_node=[[[PLT:ACTIVE:PROC_PER_NODE]]]
 
@@ -44,9 +36,17 @@ function configure()
     fi
     module load ${module_list}
 
+    # Configure GRIBEX paths
+    export LOCAL_DEFINITION_TEMPLATES=[[[PLT:ACTIVE:GRIBEX_DEFINITION_PATH]]]/gribtemplates
+    export ECMWF_LOCAL_TABLE_PATH=[[[PLT:ACTIVE:GRIBEX_DEFINITION_PATH]]]/gribtables
+
+    # Configure grib api paths
+    export GRIB_DEFINITION_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_DEFINITION_SUBDIR]]]
+    export GRIB_SAMPLES_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_SAMPLES_SUBDIR]]]
+    export GRIB_BIN_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_BIN_SUBDIR]]]
+
     # Add directories to the shared library search path
     export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}"[[[PLT:ACTIVE:ADD_TO_LD_LIBRARY_PATH]]]"
-
 }
 
 function launch()

3.2.2/runtime/classic/platform/zenobe.cfg.tmpl

@@ -12,6 +12,7 @@ function configure()
     ecearth_src_dir=[[[PLT:ACTIVE:ECEARTH_SRC_DIR]]]
     run_dir=[[[PLT:ACTIVE:RUN_DIR]]]
     ini_data_dir=[[[PLT:ACTIVE:INI_DATA_DIR]]]
+    archive_dir=/SCRATCH/acad/ecearth/${USER}/archive/${exp_name}
 
     # File for standard output.
     # NOTE: This will be modified for restart jobs!
@@ -22,15 +23,6 @@ function configure()
     resubmit_job=[[[PLT:ACTIVE:RESUBMIT_JOB]]]
     resubmit_opt="[[[PLT:ACTIVE:RESUBMIT_OPT]]]"
 
-    # Configure GRIBEX paths
-    export LOCAL_DEFINITION_TEMPLATES=[[[PLT:ACTIVE:GRIBEX_DEFINITION_PATH]]]/gribtemplates
-    export ECMWF_LOCAL_TABLE_PATH=[[[PLT:ACTIVE:GRIBEX_DEFINITION_PATH]]]/gribtables
-
-    # Configure grib api paths
-    export GRIB_DEFINITION_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_DEFINITION_SUBDIR]]]
-    export GRIB_SAMPLES_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_SAMPLES_SUBDIR]]]
-    export GRIB_BIN_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_BIN_SUBDIR]]]
-
     # Configure number of processors per node
     proc_per_node=[[[PLT:ACTIVE:PROC_PER_NODE]]]
 
@@ -44,9 +36,17 @@ function configure()
     fi
     module load ${module_list}
 
+    # Configure GRIBEX paths
+    export LOCAL_DEFINITION_TEMPLATES=[[[PLT:ACTIVE:GRIBEX_DEFINITION_PATH]]]/gribtemplates
+    export ECMWF_LOCAL_TABLE_PATH=[[[PLT:ACTIVE:GRIBEX_DEFINITION_PATH]]]/gribtables
+
+    # Configure grib api paths
+    export GRIB_DEFINITION_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_DEFINITION_SUBDIR]]]
+    export GRIB_SAMPLES_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_SAMPLES_SUBDIR]]]
+    export GRIB_BIN_PATH=[[[PLT:ACTIVE:GRIBAPI_BASE_DIR]]]/[[[PLT:ACTIVE:GRIBAPI_BIN_SUBDIR]]]
+
     # Add directories to the shared library search path
     export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}"[[[PLT:ACTIVE:ADD_TO_LD_LIBRARY_PATH]]]"
-
 }
 
 function launch()