Changeset 5644 for branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh

Timestamp:

2015-07-29T20:33:51+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Wide modifications on trusting_func.sh for clearness & other significant changes on different names

File:

• branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh (modified) (5 diffs)

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh

@@ -2 +2 @@
 
 
+cd $( dirname $0 )
+
 ## Set defaults
 ##---------------------------------------------------
-NEMO_TRUS=$( pwd $( dirname $0 ) )
+NEMO_TRUS=$( pwd )
 DEBUG=0; PUBLISH=0
 I_MODULE=0      ## No 'module' command by default
@@ -13 +15 @@
 while [ $# -ne 0 ]; do
     case $1 in
-   -a|--archive) FORC_TARF=$2         ; shift 2;; -b|--branch ) NEMO_BRAN=$2         ; shift 2;;
+   -a|--archive) NEMO_TARF=$2         ; shift 2;; -b|--branch ) NEMO_BRAN=$2         ; shift 2;;
    -d|--debug  ) set -vx; DEBUG=1     ; shift  ;; -e|--email  ) EMAIL=$2             ; shift 2;;
    -j|--job    ) NPROC=$2             ; shift 2;; -h|--help   ) cat trusting_help.txt; exit  1;;
-   -m|--machine) CFG_ARCH=$2          ; shift 2;; -n|--newconf) TEST_CONF=$2         ; shift 2;;
+   -m|--machine) NEMO_HPCC=$2         ; shift 2;; -n|--newconf) TEST_CONF=$2         ; shift 2;;
    -r|--refconf) REFE_CONF=$2         ; shift 2;; -t|--time   ) TIME_LIMI=$2         ; shift 2;;
-   -p|--publish) PUBLISH=1            ; shift  ;; -u|--user   ) CFG_USER=$2          ; shift 2;;
+   -p|--publish) PUBLISH=1            ; shift  ;; -u|--user   ) NEMO_USER=$2         ; shift 2;;
    -v|--version) NEMO_VERS=$2         ; shift 2;;            *) cat trusting_help.txt; exit  1;;
     esac
@@ -25 +27 @@
 ## Initialization (super-computer & user environment)
 ##---------------------------------------------------
-if [[ ! -z "${CFG_ARCH}" && ! -z "${CFG_USER}" ]]; then
+if [[ ! -z "${NEMO_HPCC}" && ! -z "${NEMO_USER}" ]]; then
 
-    if   [ ! $( find ${NEMO_TRUS}/config -name ${CFG_USER}.cfg ) ]; then
-   echo 'No configuration file in '${NEMO_TRUS}'/config for '${CFG_USER}; exit 1
-    elif [ ! $( find ${NEMO_TRUS}/config -name ${CFG_ARCH}.cfg ) ]; then
-   echo 'No configuration file in '${NEMO_TRUS}'/config for '${CFG_ARCH}; exit 1
+    if   [ ! $( find ${NEMO_TRUS}/config -name ${NEMO_USER}'.cfg' ) ]; then
+   echo 'No configuration file (.cfg) in '${NEMO_TRUS}'/config for '${NEMO_USER}; exit 1
+    elif [ ! $( find ${NEMO_TRUS}/config -name ${NEMO_HPCC}'.cfg' ) ]; then
+   echo 'No configuration file (.cfg) in '${NEMO_TRUS}'/config for '${NEMO_HPCC}; exit 1
     else
    . ${NEMO_TRUS}/trusting.env
@@ -41 +43 @@
 . ./trusting_func.sh
 
-## 
+## Summary of trusting test context
 ##---------------------------------------------------
+printf "\
+NEMO Trusting test:\n\
+-------------------\n\
+Testing ${TEST_CONF} based on ${REFE_CONF} from ${NEMO_BRAN}\n\
+Configuration files: ${NEMO_USER}.cfg & ${NEMO_HPCC}.cfg\n"
+
+## Making timestamped directory with messenger files
+##---------------------------------------------------
+print_step 'Time-stamp generation & testing directory creation'
 mkdir -p ${TEST_DIR} ${REFE_DIR}
 echo ${TEST_DIR} && cd ${TEST_DIR}
-date_str=$( date -ud ${DATESTR} +"%F %R %Z" )
-printf "Date\n${date_str}\n" > mesg_01_date_${CFG_USER}_${CFG_ARCH}.txt
+init_files && get_date
 
 ## SVN action on XIOS & NEMO essentials directories
 ##---------------------------------------------------
-print_step 'SVN actions on NEMO directories'
+print_step 'SVN command on NEMO directories:'
 get_nemo_rev
 
 ## Check softwares versions (source arch environment)
 ##---------------------------------------------------
-print_step 'Get softwares release'
+print_step 'Get softwares releases'
 [ -e ${ARCH_ENV} ] && . ${ARCH_ENV} > /dev/null
-[ $? -eq 0 ] && I_MODULE=1
-export I_MODULE
+(( $? == 0  )) && export I_MODULE=1
 get_soft_rel
 cat model.log
@@ -64 +73 @@
 ## XIOS compiling
 ##---------------------------------------------------
-print_step 'Compiling XIOS'
+print_step 'Compile XIOS'
 cd ${DIR_XIOS}
 full=''; [ $DEBUG -eq 0 ] && full='--full'
-./make_xios $full --arch ${CFG_ARCH} --job $NPROC >& /dev/null
+./make_xios $full --arch ${NEMO_HPCC} --job $NPROC >& /dev/null
 [ ! -e ${DIR_XIOS}/lib/libxios.a ] && get_out 1
 
 ## NEMO config compiled from scratch
 ##---------------------------------------------------
-print_step "Compiling ${REFE_CONF} configuration"
+print_step "Compile ${REFE_CONF} configuration"
 cd ${NEMO_CONF}
 [[ -d ${TEST_CONF} && $DEBUG -eq 0 ]] && ./makenemo -n ${TEST_CONF} clean >  /dev/null
-./makenemo -n ${TEST_CONF} -r ${REFE_CONF} -m ${CFG_ARCH} -j $NPROC       >& /dev/null
+./makenemo -n ${TEST_CONF} -r ${REFE_CONF} -m ${NEMO_HPCC} -j $NPROC      >& /dev/null
 [ ! -e ${TEST_CONF}/BLD/bin/nemo.exe ] && get_out 2
 
 ## Get namelists, xml & forcing files for running
 ##---------------------------------------------------
-print_step "Preparing job by copying ${REFE_CONF} input files"
+print_step 'Set job (copying & extracting input files)'
 cd ${TEST_DIR}
 find ${NEMO_CONF}/${TEST_CONF}/EXP00 -regex '.*\(cfg\|opa\|ref\|xml\)' -exec cp {} . \;
 get_inputs
-[ $? -ne 0 ] && get_out 3
+(( $? != 0 )) && get_out 3
 [ $( find . -name '*.gz' -print -quit ) ] && gunzip *.gz
 
 ## Check input files in all cases
 ##---------------------------------------------------
-print_step 'Difference with standard input files list'
+print_step 'Compare with standard input files list'
 diff_inputs
 
 ## Job submission & computing
 ##---------------------------------------------------
-print_step 'Submitting job'
+print_step 'Submit job'
 JOB_ID=$( eval ${JOB_SUBM} )
-[ $? -ne 0 ] && get_out 4
-print_step 'Holding/Running job'
+(( $? != 0 )) && get_out 4
+print_step 'Pending job'
 job_pending
 print_step 'Job finished'