Changeset 12135 for utils/CI

Timestamp:

2019-12-10T11:49:36+01:00 (4 years ago)

Author:

acc

Message:

Undo errneous commit to sette branch

Location:

utils/CI/sette

Files:

• param.cfg (modified) (3 diffs)
• sette.sh (modified) (1 diff)

utils/CI/sette/param.cfg

@@ -1 +1 @@
 # Computer/user dependant variable needed to run sette
-#
-# Compiler among those in NEMOGCM/ARCH
-COMPILER=X64_MOBILIS
 #
 # REFERENCE run.stat tracer.stat you want to compare with
 # (if no change to the default, no check on result change will be done)
-NEMO_VALIDATION_REF=/home/acc/NEMO/IMMERSE/trunk/sette/NEMO_VALIDATION
-NEMO_REV_REF=20190314
+NEMO_VALIDATION_REF=/path/to/reference/sette/results
+NEMO_REV_REF=0000
 #
 # ------------------------------------------------------------------------------------------
@@ -16 +13 @@
 # otherwise, you need to update the default initialisation
 #
-# ADVISE: setup the default value in your startup file if it doesn't fit your need.
+# ADVISE: setup the default value in your startup file if it doesn't fit your need for at least
+# SETTE_COMPILER, SETTE_BATCH_CMD, SETTE_BATCH_STAT, SETTE_BATCH_NAME, SETTE_FORCING_DIR, 
+#
+# ------------------------------------------------------------------------------------------
+# COMPILER setting
+# Compiler among those in NEMOGCM/ARCH
+COMPILER=${SETTE_COMPILER:-XXXXXXXX}
+# ------------------------------------------------------------------------------------------
 #
 # BATCH command
 # command to submit a job
-BATCH_CMD="sbatch"
+BATCH_CMD=${SETTE_BATCH_CMD:-llsubmit}
 # command to check job status
-BATCH_STAT="squeue"
+BATCH_STAT=${SETTE_BATCH_STAT:-llq}
 # generic sette job name (as it appears with $BATCH_STAT command)
 BATCH_NAME=${SETTE_BATCH_NAME:-sette}
 # ------------------------------------------------------------------------------------------
 #
-#
-# FILES STORING
+# FILES STORING paths
 # forcing files storing
-FORCING_DIR=/hpcdata/scratch/omfman/shared/V3.7_INPUTS
+FORCING_DIR=${SETTE_FORCING_DIR:-$WORKDIR/FORCING}
 # validation files storing
-NEMO_VALIDATION_DIR=/home/acc/NEMO/IMMERSE/dev_r11613_ENHANCE-04_namelists_as_internalfiles/sette/NEMO_VALIDATION
+NEMO_VALIDATION_DIR=${SETTE_NEMO_VALIDATION_DIR:-$MAIN_DIR}/NEMO_VALIDATION
 # input files storing (namelist, iodef ...) (DO NOT CHANGE)
 INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
@@ -47 +50 @@
 #                      "no"  to run in SPMD (attached) mode without separate IO servers 
 # MPMD
-USING_MPMD=${SETTE_MPMD:-"yes"}
+USING_MPMD=${SETTE_MPMD:-"no"}
 # generique batch scrip prefix name if MPMD set to true/false
-JOB_PREFIX_MPMD=${SETTE_JOB_PREFIX_MPMD:-batch}
+JOB_PREFIX_MPMD=${SETTE_JOB_PREFIX_MPMD:-batch-mpmd}
 JOB_PREFIX_NOMPMD=${SETTE_JOB_PREFIX_NOMPMD:-batch}
 # ------------------------------------------------------------------------------------------

utils/CI/sette/sette.sh

@@ -57 +57 @@
 while [[ $NRUN -ne 0 && $nit -le 1080 ]]; do
    nit=$((nit+1))
-   NRUN=$( ${BATCH_STAT} | grep run_job | wc -l ) 
+   NRUN=$( ${BATCH_STAT} | grep nemo_sette | wc -l ) 
    if [[ $NRUN -ne 0 ]]; then 
-      printf "%-3d %s\r" $NRUN 'run_job run still in queue or running ...';
+      printf "%-3d %s\r" $NRUN 'nemo_sette run still in queue or running ...';
    else
       printf "%-50s\n" " "