Updates for lemaitre3

3.2.2/runtime/classic/config-run.xml

@@ -66,7 +66,7 @@
         <Parameter name="INI_DATA_DIR">
             <Description>Initial data directory used by EC-Earth</Description>
             <Type>PATH</Type>
-            <Value>/scratch/ucl/elic/pbarriat/DATA</Value>
+            <Value>/scratch/ucl/elic/pbarriat/DATA/EC-EARTH</Value>
         </Parameter>
 
         <Parameter name="PROC_PER_NODE">

3.2.2/runtime/classic/lemaitre3.sh.tmpl

@@ -1,11 +1,10 @@
 #!/bin/bash
 # Submission script for Lemaitre3
 #SBATCH --job-name=ece3
-#SBATCH --time=23:50:00 # hh:mm:ss
+#SBATCH --time=23:50:00
 #
 #SBATCH --ntasks=384
-#SBATCH --mem-per-cpu=4096 # 4GB
-#SBATCH --partition=Def
+#SBATCH --mem-per-cpu=4096
 #
 #SBATCH --mail-user=noname@uclouvain.be
 #SBATCH --mail-type=ALL
@@ -15,7 +14,6 @@ echo "------------------ Job Info --------------------"
 echo "jobid : $SLURM_JOB_ID"
 echo "jobname : $SLURM_JOB_NAME"
 echo "submit dir : $SLURM_SUBMIT_DIR"
-echo "queue : $MPIRUN_PARTITION
 
 set -ue 
 

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

@@ -15,7 +15,7 @@ function configure()
 
     # File for standard output.
     # NOTE: This will be modified for restart jobs!
-    stdout_file=${SLURM_SUBMIT_DIR-$PWD}/$(basename ${SLURM_JOB_NAME})_${SLURM_JOB_ID-"id"}.log
+    stdout_file=${SLURM_SUBMIT_DIR-$PWD}/${SLURM_JOB_NAME}_${SLURM_JOB_ID-"id"}.log
 
     # Resubmit this job for automatic restarts? [true/false]
     # Also, add options for the resubmit command here.

3.2.2/sources/config-build.xml

@@ -76,7 +76,7 @@
 
     <Platform name="lemaitre3-intelmpi">
         <Description>
-            HOST:        zenobe.cism.ucl.ac.be
+            HOST:        lemaitre3.cism.ucl.ac.be
             ARCH:        linux_x86_64
             CPU MODEL:   Intel Skylake
             MAINTAINER:  PY Barriat [pierre-yves.barriat@uclouvain.be]
@@ -94,7 +94,7 @@
         <Parameter name="MPI_BASE_DIR">
             <Description>MPI base directory</Description>
             <Type>PATH</Type>
-            <Value>/opt/cecisw/arch/easybuild/2018a/software/impi/2018.1.163-iccifort-2018.1.163-GCC-6.4.0-2.28/intel64</Value>
+            <Value>$(EBROOTIMPI)/intel64</Value>
         </Parameter>
 
         <Parameter name="MPI_INC_SUBDIR">
@@ -112,13 +112,13 @@
         <Parameter name="MPI_LIBS_WITHOUT_L">
             <Description>MPI libraries (without -l prefix)</Description>
             <Type>STRING</Type>
-            <Value>mpi mpigf</Value>
+            <Value>mpi mpiif mpigf</Value>
         </Parameter>
 
         <Parameter name="LAPACK_BASE_DIR">
             <Description>LAPACK base directory</Description>
             <Type>PATH</Type>
-            <Value>/opt/cecisw/arch/easybuild/2018a/software/imkl/2018.1.163-iimpi-2018a/compilers_and_libraries_2018.1.163/linux/mkl</Value>
+            <Value>$(EBROOTIMKL)/mkl</Value>
         </Parameter>
 
         <Parameter name="LAPACK_LIB_SUBDIR">
@@ -136,19 +136,19 @@
         <Parameter name="NETCDF_BASE_DIR">
             <Description>NetCDF base directory</Description>
             <Type>PATH</Type>
-            <Value>/opt/cecisw/arch/easybuild/2018a/software/netCDF/4.4.1.1-intel-2018a</Value>
+            <Value>$(EBROOTNETCDF)</Value>
         </Parameter>
 
         <Parameter name="NETCDF_INC_SUBDIR">
             <Description>NetCDF include directory relative to base dir</Description>
             <Type>PATH</Type>
-            <Value>include /opt/cecisw/arch/easybuild/2018a/software/netCDF-Fortran/4.4.4-intel-2018a/include</Value>
+            <Value>include $(EBROOTNETCDFMINFORTRAN)/include</Value>
         </Parameter>
 
         <Parameter name="NETCDF_LIB_SUBDIR">
             <Description>NetCDF lib directory relative to base dir</Description>
             <Type>PATH</Type>
-            <Value>lib64 /opt/cecisw/arch/easybuild/2018a/software/netCDF-Fortran/4.4.4-intel-2018a/lib</Value>
+            <Value>lib64 $(EBROOTNETCDFMINFORTRAN)/lib</Value>
         </Parameter>
 
         <Parameter name="NETCDF_LIBS_WITHOUT_L">
@@ -160,7 +160,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_INC_SUBDIR">
@@ -202,7 +202,7 @@
         <Parameter name="JPEG_BASE_DIR">
             <Description>JPEG base directory</Description>
             <Type>PATH</Type>
-            <Value>/opt/cecisw/arch/easybuild/2018a/software/openjpeg/1.5.2-intel-2018a</Value>
+            <Value>$(EBROOTOPENJPEG)</Value>
         </Parameter>
 
         <Parameter name="JPEG_INC_SUBDIR">
@@ -226,25 +226,25 @@
         <Parameter name="SZIP_BASE_DIR">
             <Description>SZIP base directory</Description>
             <Type>PATH</Type>
-            <Value></Value>
+            <Value>$(EBROOTSZIP)</Value>
         </Parameter>
 
         <Parameter name="SZIP_INC_SUBDIR">
             <Description>SZIP include directory relative to base dir</Description>
             <Type>PATH</Type>
-            <Value></Value>
+            <Value>include</Value>
         </Parameter>
 
         <Parameter name="SZIP_LIB_SUBDIR">
             <Description>SZIP lib directory relative to base dir</Description>
             <Type>PATH</Type>
-            <Value></Value>
+            <Value>lib</Value>
         </Parameter>
 
         <Parameter name="SZIP_LIBS_WITHOUT_L">
             <Description>SZIP libraries (without -l prefix)</Description>
             <Type>STRING</Type>
-            <Value></Value>
+            <Value>sz</Value>
         </Parameter>
 
         <Parameter name="HDF4_BASE_DIR">
@@ -274,7 +274,7 @@
         <Parameter name="HDF5_BASE_DIR">
             <Description>HDF5 base directory</Description>
             <Type>PATH</Type>
-            <Value>/opt/cecisw/arch/easybuild/2018a/software/HDF5/1.8.18-intel-2018a</Value>
+            <Value>$(EBROOTHDF5)</Value>
         </Parameter>
 
         <Parameter name="HDF5_INC_SUBDIR">

install.sh

@@ -5,7 +5,7 @@ echo "Release you want :"
 echo "##################"
 repertoirdebase=`pwd`
 PS3='> '   # le prompt
-COMPIL=("3.2.2" "primavera" "trunk")
+COMPIL=("3.2.2" "dev" "primavera" "trunk")
 select CHOIX in "${COMPIL[@]}" ; do
   case $REPLY in
       1)
@@ -14,9 +14,14 @@ select CHOIX in "${COMPIL[@]}" ; do
         ;;
       2)  
         TAG="ecearth_$CHOIX"
+        CHOIX="3.2.2"
         echo ""
         ;;
       3)  
+        TAG="ecearth_$CHOIX"
+        echo ""
+        ;;
+      4)  
         TAG="ecearth"
         cp $CHOIX/runtime/classic/ctrl/namelist.nemo-ORCA1L75-coupled.cfg.sh $HOME/modeles/ecearth/runtime/classic/ctrl
         echo ""
@@ -25,15 +30,30 @@ select CHOIX in "${COMPIL[@]}" ; do
   break
 done
 
-TARGET="$HOME/modeles/$TAG"
-
-mv $HOME/.bashrc $HOME/bashrc_old
-cp bashrc $HOME/.bashrc
+TARGET="$HOME/modeles/ecearth/$TAG"
 
 cp $CHOIX/sources/config-build.xml $TARGET/sources/config-build.xml
 cp $CHOIX/runtime/classic/config-run.xml $TARGET/runtime/classic/config-run.xml
-cp $CHOIX/runtime/classic/ece-ifs+nemo.sh.tmpl $TARGET/runtime/classic/ece-ifs+nemo.sh.tmpl
 
-cp $CHOIX/runtime/classic/platform/zenobe.cfg.tmpl $TARGET/runtime/classic/platform/zenobe.cfg.tmpl
+machine=`uname --nodename`
+case "$machine" in
+    *lm3*) 
+      echo "Lemaitre3"
+      cp $CHOIX/sources/nemo_lemaitre3_arch-ecconf.fcm.tmpl $TARGET/sources/nemo-3.6/ARCH/arch-ecconf.fcm.tmpl
+      cp $CHOIX/sources/runoff-mapper_lemaitre3_Makefile.tmpl $TARGET/sources/runoff-mapper/src/Makefile.tmpl
+      cp $CHOIX/runtime/classic/platform/lemaitre3.cfg.tmpl $TARGET/runtime/classic/platform/lemaitre3.cfg.tmpl
+      cat $CHOIX/runtime/classic/lemaitre3.sh.tmpl > $TARGET/runtime/classic/ece-ifs+nemo.sh.tmpl
+      cat $CHOIX/runtime/classic/ece-ifs+nemo.sh.tmpl >> $TARGET/runtime/classic/ece-ifs+nemo.sh.tmpl
+      ;;
+    *zenobe*) 
+      echo "Zenobe"
+      cp $CHOIX/runtime/classic/platform/zenobe.cfg.tmpl $TARGET/runtime/classic/platform/zenobe.cfg.tmpl
+      cat $CHOIX/runtime/classic/zenobe.sh.tmpl > $TARGET/runtime/classic/ece-ifs+nemo.sh.tmpl
+      cat $CHOIX/runtime/classic/ece-ifs+nemo.sh.tmpl >> $TARGET/runtime/classic/ece-ifs+nemo.sh.tmpl
+      ;;
+    *)
+      echo "Unknown machine"
+      ;;
+esac
 
-echo "Patch applied to ${CHOIX}."
+echo "Patch applied to ${TARGET}."