Changeset 10717

Timestamp:

2019-02-22T16:52:47+01:00 (4 years ago)

Author:

mathiot

Message:

change related to discussion with Simon (ticket #2239)

Location:

NEMO/branches/2019/fix_sette_ticket2239

Files:

• param.cfg (modified) (2 diffs)
• sette.sh (modified) (2 diffs)
• sette_list_avail_rev.sh (moved) (moved from NEMO/branches/2019/fix_sette_ticket2239/list_avail_rev.sh) (2 diffs)
• sette_reference-configurations.sh (modified) (2 diffs)
• sette_rpt.sh (modified) (2 diffs)
• sette_test-cases.sh (modified) (2 diffs)

NEMO/branches/2019/fix_sette_ticket2239/param.cfg

@@ -4 +4 @@
 COMPILER=XC40_METO_perso
 #
+# 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=/projects/jomp/pmathiot/NEMO/NEMO_dev/NEMO/trunk/NEMO_VALIDATION
+NEMO_REV_REF=10702
+#
+# IF SETTE_* variable mentioned below are exported from your initialisation, nothing to do
+# otherwise, please update the default iniitialisation or overwrite it
+#
 # BATCH command
 # command to submit a job
-BATCH_CMD=qsub
+BATCH_CMD=${SETTE_BATCH_CMD:-llsubmit}
 # command to check job status
-BATCH_STAT=qstat
+BATCH_STAT=${SETTE_BATCH_STAT:-llq}
+# generic sette job name
+BATCH_NAME=${SETTE_BATCH_NAME:-sette}
 #
 #- FORCING files storing
-FORCING_DIR=/projects/jomp/pmathiot/SETTE_FORCING/v4.0
+FORCING_DIR=${SETTE_FORCING_DIR:-$WORKDIR/FORCING}
+#
+# CMD for svn (some people use git svn) 
+# used in sette_rpt and in all_function to display revision and build correct repository name
+SVN_CMD=${SETTE_SVN_CMD:-svn}
+#
+#- only for IBM
+#TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
+#
+#- key_nosignedzero
+ADD_NOSIGNEDZERO=${SETTE_ADD_NOSIGNEDZERO:-"yes"}
 #
 #- INPUT files storing
@@ -17 +37 @@
 #
 #- VALIDATION files storing
-NEMO_VALIDATION_DIR=/projects/jomp/pmathiot/NEMO/NEMO_dev/NEMO/trunk/sette_ticket2239/NEMO_VALIDATION
+NEMO_VALIDATION_DIR=${WORKDIR:-$MAIN_DIR}/NEMO_VALIDATION
 #
-# 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=/projects/jomp/pmathiot/NEMO/NEMO_dev/NEMO/trunk/sette/NEMO_VALIDATION
-NEMO_REV_REF=10508
-#
-# CMD for svn (some people use git svn) 
-# used in sette_rpt and in all_function to display revision and build correct repository name
-SVN_CMD=svn
-#
-#- only for IBM
-#TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
-#
-#- key_nosignedzero
-ADD_NOSIGNEDZERO="yes"

NEMO/branches/2019/fix_sette_ticket2239/sette.sh

@@ -1 +1 @@
 #!/bin/sh
 # initialise user dependent variable
+SETTE_DIR=$(cd $(dirname "$0"); pwd)
+MAIN_DIR=$(dirname $SETTE_DIR)
 . ./param.cfg
 
@@ -39 +41 @@
       printf "%-3d %s\r" $NRUN 'nemo_sette run still in queue or running ...';
    else
-      printf "%s\n" " "
+      printf "%-50s\n" " "
       ./sette_rpt.sh
       exit

NEMO/branches/2019/fix_sette_ticket2239/sette_list_avail_rev.sh

@@ -27 +27 @@
 }
 
+  SETTE_DIR=$(cd $(dirname "$0"); pwd)
+  MAIN_DIR=$(dirname $SETTE_DIR)
   . ./param.cfg
 
@@ -33 +35 @@
  
  # list of all revision available
- DIRLST='';for dir in `find NEMO_VALIDATION -maxdepth 3 -mindepth 3` ; do REV=`basename $dir`; DIRLST="$DIRLST $REV"; done
+ DIRLST='';for dir in `find ${NEMO_VALID} -maxdepth 3 -mindepth 3 -iname [0-9][0-9][0-9][0-9][0-9]` ; do REV=`basename $dir`; DIRLST="$DIRLST $REV"; done
  DIRLST=`echo $DIRLST | grep -o -E '\w+' | sort -u -r `
 

NEMO/branches/2019/fix_sette_ticket2239/sette_reference-configurations.sh

@@ -91 +91 @@
 #
 # LOAD param value
+SETTE_DIR=$(cd $(dirname "$0"); pwd)
+MAIN_DIR=$(dirname $SETTE_DIR)
 . ./param.cfg
 
@@ -132 +134 @@
 
 # Directory to run the tests
-SETTE_DIR=$(cd $(dirname "$0"); pwd)
-MAIN_DIR=$(dirname $SETTE_DIR)
 CONFIG_DIR0=${MAIN_DIR}/cfgs
 TOOLS_DIR=${MAIN_DIR}/tools

NEMO/branches/2019/fix_sette_ticket2239/sette_rpt.sh

@@ -504 +504 @@
 #
 # LOAD param variable (COMPILER, NEMO_VALIDATION_DIR, SVN_CMD)
+  SETTE_DIR=$(cd $(dirname "$0"); pwd)
+  MAIN_DIR=$(dirname $SETTE_DIR)
   . ./param.cfg
 
@@ -517 +519 @@
 #
 # Directory to run the tests
-  SETTE_DIR=$(cd $(dirname "$0"); pwd)
-  MAIN_DIR=${SETTE_DIR}/..
   CONFIG_DIR0=${MAIN_DIR}/cfgs
   TOOLS_DIR=${MAIN_DIR}/tools

NEMO/branches/2019/fix_sette_ticket2239/sette_test-cases.sh

@@ -93 +93 @@
 #
 # LOAD param value
+SETTE_DIR=$(cd $(dirname "$0"); pwd)
+MAIN_DIR=$(dirname $SETTE_DIR)
 . ./param.cfg
 
@@ -133 +135 @@
 
 # Directory to run the tests
-SETTE_DIR=$(cd $(dirname "$0"); pwd)
-MAIN_DIR=$(dirname $SETTE_DIR)
 CONFIG_DIR0=${MAIN_DIR}/cfgs
 TOOLS_DIR=${MAIN_DIR}/tools