Changeset 10631 for utils

Timestamp:

2019-02-04T17:19:48+01:00 (5 years ago)

Author:

smueller

Message:

Slight SETTE enhancement to improve the reliability of restartability and reproducibility tests; see ticket #2226

Location:

utils/CI/sette

Files:

• BATCH_TEMPLATE/batch-X64_MOBILIS (modified) (2 diffs)
• all_functions.sh (modified) (1 diff)
• param.cfg (modified) (2 diffs)
• prepare_exe_dir.sh (modified) (1 diff)
• sette.sh (modified) (3 diffs)

utils/CI/sette/BATCH_TEMPLATE/batch-X64_MOBILIS

@@ -1 +1 @@
 #!/bin/bash
 #SBATCH -N NODES
-#SBATCH --time=00:59:00 
+#SBATCH --time=03:59:00 
 
 module purge
 module load shared
-module use /home/acc/MyMods
-# set programming environment and XIO_HOME 
-module load nemo-PrgEnv/4.0 
+module load gcc
+module load noc/intel/17.0.4
+module load openmpi/intel/64/1.6.5
+module load slurm/16.05.8
+module load noc/subversion/1.7.16
 
 #
@@ -14 +16 @@
   export XCORES=NXIOPROCS
   export SETTE_DIR=DEF_SETTE_DIR
+  export XIO_HOME=/hpcdata/working/smueller/xios-2.5
 #
 # load sette functions (only post_test_tidyup needed)

utils/CI/sette/all_functions.sh

@@ -196 +196 @@
 # Creation of NEMO_VALIDATION tree
     export LANG=en_US 
-    REVISION_NB=`svn info ${SETTE_DIR}/../.. | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2`
+    REVISION_NB=`svn info ${SETTE_DIR}/.. | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2`
     if [ ${#REVISION_NB} -eq 0 ]
     then

utils/CI/sette/param.cfg

@@ +1 @@
+WORKDIR=/hpcdata/working/smueller/NEMO_dev/releases/release-4.0
+SCRATCHDIR=/hpcdata/working/smueller/
 #- forcing files storing
-FORCING_DIR=$WORKDIR/FORCING
+FORCING_DIR=$SCRATCHDIR/FORCING_NEMO_v4.0
 #- input files storing
 INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
@@ -6 +8 @@
 #TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
 #- VALIDATION files storing
-NEMO_VALIDATION_DIR=$WORKDIR/NEMO_VALIDATION
+NEMO_VALIDATION_DIR=/hpcdata/working/smueller/NEMO_dev/releases/release-4.0/NEMO_VALIDATION

utils/CI/sette/prepare_exe_dir.sh

@@ -73 +73 @@
 #cat ${SETTE_DIR}/iodef_sette.xml | sed -e"s;DEF_SHARED;${CONFIG_DIR0}/SHARED;" > ${EXE_DIR}/iodef.xml
 cd ${EXE_DIR}
+
+# Remove previously generated output files used for test evaluation
+# (if any)
+[ -f ./ocean.output ] && mv ./ocean.output ./ocean.output.old
+[ -f ./run.stat ]     && mv ./run.stat     ./run.stat.old
+[ -f ./tracer.stat ]  && mv ./tracer.stat  ./tracer.stat.old

utils/CI/sette/sette.sh

@@ -88 +88 @@
 #
 # Compiler among those in NEMOGCM/ARCH
-COMPILER=X64_ADA
-
-export BATCH_COMMAND_PAR="llsubmit"
-export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR 
+COMPILER=X64_MOBILIS
+
+export BATCH_COMMAND_PAR="sbatch"
+export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR
 export INTERACT_FLAG="no"
 export MPIRUN_FLAG="yes"
@@ -105 +105 @@
 # Settings which control the use of stand alone servers (only relevant if using xios)
 #
-export USING_MPMD="no"
-export NUM_XIOSERVERS=4
-export JOB_PREFIX=batch-mpmd
+export USING_MPMD="yes"
+export NUM_XIOSERVERS=1
+export JOB_PREFIX=batch
 #
 if [ ${USING_MPMD} == "no" ] 
@@ -143 +143 @@
 # SPITZ12           :  9      regional configuration including sea-ice and tides (Spitzbergen)
 
-for config in 1 2 3 4 5 6 7 8 9
+for config in 4
 do