Changeset 8808 for branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.sh

Timestamp:

2017-11-24T15:03:07+01:00 (6 years ago)

Author:

nicolasmartin

Message:

Continuation of global refactoring of the tool, in particular a intelligible variables namelist

File:

• branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.sh (modified) (16 diffs)

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

@@ -6 +6 @@
 ## Set defaults
 ##---------------------------------------------------
-TRUS_DIRE=$PWD
-TRUS_DBUG=0; TRUS_PROD=0; TRUS_HELP=0
+TRUST_MAIN_DIR=$PWD
+TRUST_FLAG_DEBUG=0; TRUST_FLAG_PROD=0; TRUST_FLAG_HELP=0
 ## No update on SVN directories & 'FAILED' result for 'Unknown error' )
-TRUS_SVNA='svn status'; TRUS_RSLT='FAILED'; TRUS_RORR=0
+TRUST_SVN_ACTION='svn status'
+TRUST_FLAG_RESULT='FAILED'; TRUST_FLAG_ERROR=0
+
 xios_mode='--full'; stdout_redir='>&'
 rev=$( svn info | awk '(NR == 9) {print $NF}' )
@@ -17 +19 @@
 ##---------------------------------------------------
 while [ $# -ne 0 ]; do
+
     case $1 in
-   '-a'|'--archive') TRUS_TARF=$2; shift 2;; '-b'|'--branch' ) TRUS_BRAN=$2; shift 2;;
-   '-d'|'--debug'  ) TRUS_DBUG=1 ; shift  ;; '-e'|'--email'  ) TRUS_MAIL=$2; shift 2;;
-   '-f'|'--forcdir') TRUS_FORC=$2; shift 2;; '-j'|'--job'    ) TRUS_NPRO=$2; shift 2;;
-   '-h'|'--help'   ) TRUS_HELP=1 ; shift  ;; '-m'|'--machine') TRUS_HPCC=$2; shift 2;;
-   '-n'|'--newconf') TRUS_CONF=$2; shift 2;; '-r'|'--refconf') TRUS_REFE=$2; shift 2;;
-   '-t'|'--time'   ) TRUS_TOUT=$2; shift 2;; '-p'|'--prod'   ) TRUS_PROD=1 ; shift  ;;
-   '-u'|'--user'   ) TRUS_USER=$2; shift 2;; '-v'|'--version') TRUS_SVNV=$2; shift 2;;
-   '-w'|'--workdir') TRUS_WORK=$2; shift 2;; "*"             ) TRUS_HELP=1 ; shift  ;;
+   '-a'|'--archive') TRUST_CFG_FORC=$2; shift 2;; '-b'|'--branch' ) TRUST_SVN_BRANCH=$2; shift 2;;
+   '-d'|'--debug'  ) TRUST_FLAG_DEBUG=1 ; shift  ;; '-e'|'--email'  ) TRUST_TEST_MAILING=$2; shift 2;;
+   '-f'|'--forcdir') TRUST_DIR_FORC=$2; shift 2;; '-j'|'--job'    ) TRUST_COMPILE_NPROC=$2; shift 2;;
+   '-h'|'--help'   ) TRUST_FLAG_HELP=1 ; shift  ;; '-m'|'--machine') TRUST_MAIN_HPCC=$2; shift 2;;
+   '-n'|'--newconf') TRUST_CFG_NEW=$2; shift 2;; '-r'|'--refconf') TRUST_CFG_REF=$2; shift 2;;
+   '-t'|'--time'   ) TRUST_JOB_TIMEOUT=$2; shift 2;; '-p'|'--prod'   ) TRUST_FLAG_PROD=1 ; shift  ;;
+   '-u'|'--user'   ) TRUST_MAIN_USER=$2; shift 2;; '-v'|'--version') TRUST_SVN_REV=$2; shift 2;;
+   '-w'|'--workdir') TRUST_DIR_WORK=$2; shift 2;; "*"             ) TRUST_FLAG_HELP=1 ; shift  ;;
     esac
+
 done
 
@@ -32 +36 @@
 ## Initialization (HPC & user environment)
 ##---------------------------------------------------
-if [[ ! -e cfg/${TRUS_USER}.cfg || ! -e cfg/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then
+if [[ ! -e cfg/${TRUST_MAIN_USER}.cfg || ! -e cfg/${TRUST_MAIN_HPCC}.cfg || ${TRUST_FLAG_HELP} -eq 1 ]]; then
     cat ./inc/trusting_help.txt
 
-    if [ ${TRUS_HELP} -eq 0 ]; then
+    if [ ${TRUST_FLAG_HELP} -eq 0 ]; then
    printf "\n\n\033[0;33m"
    printf "At least one configuration (arch or user) file is missing or misspelled:"
-   printf "\t'%s'.cfg\t'%s'.cfg" ${TRUS_USER} ${TRUS_HPCC}
+   printf "\t'%s'.cfg\t'%s'.cfg" ${TRUST_MAIN_USER} ${TRUST_MAIN_HPCC}
    printf "\033[0m"
     fi
@@ -50 +54 @@
 
     ## DEBUG option to speed up & expand verbosity of compilation
-    [ ${TRUS_DBUG} -eq 1 ] && { set -vx; xios_mode=''; stdout_redir='>'; }
+    [ ${TRUST_FLAG_DEBUG} -eq 1 ] && { set -vx; xios_mode=''; stdout_redir='>'; }
 
     ## If -v|--version option has been set, modify default SVN action on directories
-    if   [ $( echo ${TRUS_SVNV} | grep  "HEAD\|up\|update"                     ) ]; then
-   TRUS_SVNA='svn update -r HEAD'
-    elif [ $( echo ${TRUS_SVNV} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' ) ]; then
-   TRUS_SVNA='svn update -r     '$( echo ${TRUS_SVNV} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' )
-    elif [ $( echo ${TRUS_SVNV} | grep -o '[0-9]*'                             ) ]; then
-   TRUS_SVNA='svn update -r     '$( echo ${TRUS_SVNV} | grep -o '[0-9]*' )
+    if   [ $( echo ${TRUST_SVN_REV} | grep  "HEAD\|up\|update"                     ) ]; then
+   TRUST_SVN_ACTION='svn update -r HEAD'
+    elif [ $( echo ${TRUST_SVN_REV} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' ) ]; then
+   TRUST_SVN_ACTION='svn update -r     '$( echo ${TRUST_SVN_REV} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' )
+    elif [ $( echo ${TRUST_SVN_REV} | grep -o '[0-9]*'                             ) ]; then
+   TRUST_SVN_ACTION='svn update -r     '$( echo ${TRUST_SVN_REV} | grep -o '[0-9]*' )
     fi
 
@@ -67 +71 @@
 ##---------------------------------------------------
 echo
+
 if [ -t 0 ]; then cat ./inc/banner.txt; else cat ./inc/banner.html; fi
+
 echo
 echo '****************************************************************************************************'
@@ -76 +82 @@
 echo '****************************************************************************************************'
 echo
-printf "\t§ Testing configuration\t\t%s based on %s\n" ${TRUS_CONF} ${TRUS_REFE}
-printf "\t§ SVN working copy\t\t%s/%s\n"               ${TRUS_WORK} ${TRUS_BRAN}
-printf "\t§ Benchmark folder\t\t%s\n"               ${TRUS_STOR}
-printf "\t§ (Super)Computer\t\t%s\n"             ${TRUS_HPCC}
-printf "\t§ User installation\t\t%s\n\n"         ${TRUS_USER}
+printf "\t§ Testing configuration\t\t%s based on %s\n" ${TRUST_CFG_NEW} ${TRUST_CFG_REF}
+printf "\t§ SVN working copy\t\t%s/%s\n"               ${TRUST_DIR_WORK} ${TRUST_SVN_BRANCH}
+printf "\t§ Benchmark folder\t\t%s\n"               ${TRUST_DIR_STORE}
+printf "\t§ (Super)Computer\t\t%s\n"             ${TRUST_MAIN_HPCC}
+printf "\t§ User installation\t\t%s\n\n"         ${TRUST_MAIN_USER}
 
 
@@ -86 +92 @@
 ##---------------------------------------------------
 print_step 'Timestamped testing directory'
-mkdir -p ${TRUS_SCRA} ${TRUS_STOR}
-cd       ${TRUS_SCRA}
-echo     ${TRUS_SCRA}
+
+mkdir -p ${TRUST_DIR_SCRATCH} ${TRUST_DIR_STORE}
+cd       ${TRUST_DIR_SCRATCH}
+echo     ${TRUST_DIR_SCRATCH}
+
 init_files
+
 get_date
 
@@ -95 +104 @@
 ## Get SVN revision on XIOS & NEMO essentials directories
 ##---------------------------------------------------
-print_step "SVN action on NEMO directories: ${TRUS_SVNA}"
+print_step "SVN action on NEMO directories: ${TRUST_SVN_ACTION}"
+
 get_nemo_rev
 
@@ -102 +112 @@
 ##---------------------------------------------------
 print_step 'Get testing environement'
+
 get_soft_rel
+
 cat model.log | awk '{printf "%-20s %s %s\n", $1, $2, $3}'
 env | sort > env.log
@@ -110 +122 @@
 ##---------------------------------------------------
 print_step 'Compile XIOS'
-cd ${TRUS_XIOS}
-eval ./make_xios ${xios_mode} --arch ${TRUS_HPCC} --job ${TRUS_NPRO} \
+
+cd ${TRUST_DIR_XIOS}
+
+eval ./make_xios ${xios_mode} --arch ${TRUST_MAIN_HPCC} --job ${TRUST_COMPILE_NPROC} \
     ${stdout_redir} /dev/null
+
 [ ! -e lib/libxios.a ] && get_out 1 || echo 'Success'
 
@@ -118 +133 @@
 ## NEMO compilation from scratch
 ##---------------------------------------------------
-print_step "Compile ${TRUS_REFE} configuration"
-cd ${TRUS_NGCM}/CONFIG
-[[ -d ${TRUS_CONF} && ${TRUS_DBUG} -eq 0 ]] && ./makenemo -n ${TRUS_CONF} clean_config \
-    > /dev/null <<EOF
+print_step "Compile ${TRUST_CFG_REF} configuration"
+
+cd ${TRUST_DIR_NEMOGCM}/CONFIG
+
+if [[ -d ${TRUST_CFG_NEW} && ${TRUST_FLAG_DEBUG} -eq 0 ]]; then
+    ./makenemo -n ${TRUST_CFG_NEW} clean_config \
+   > /dev/null <<EOF
 y
 EOF
-
-eval ./makenemo -n ${TRUS_CONF} -r ${TRUS_REFE} -m ${TRUS_HPCC} -j ${TRUS_NPRO} \
-                ${TRUS_KEYA} ${TRUS_KEYD}                                       \
+fi
+
+eval ./makenemo -n ${TRUST_CFG_NEW} -r ${TRUST_CFG_REF} \
+                -m ${TRUST_MAIN_HPCC} -j ${TRUST_COMPILE_NPROC} \
+                   ${TRUST_CFG_KEY_ADD} ${TRUST_CFG_KEY_DEL}    \
     ${stdout_redir} /dev/null
-[ ! -e ${TRUS_CONF}/BLD/bin/nemo.exe ] && get_out 2 || echo 'Success'
+
+[ ! -e ${TRUST_CFG_NEW}/BLD/bin/nemo.exe ] && get_out 2 || echo 'Success'
 
 
@@ -134 +155 @@
 ##---------------------------------------------------
 print_step 'Set job (copying or extracting inputs)'
-cd ${TRUS_SCRA}
+
+cd ${TRUST_DIR_SCRATCH}
+
 get_inputs
-cp   ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/cpp_* .
-find ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/EXP00 -regex '.*\(_cfg\|.in\|opa\|_ref\|.xml\)' \
-                                            -exec  cp {} . \;
+
+cp   ${TRUST_DIR_NEMOGCM}/CONFIG/${TRUST_CFG_NEW}/cpp_* .
+find ${TRUST_DIR_NEMOGCM}/CONFIG/${TRUST_CFG_NEW}/EXP00   \
+    -regex '.*\(_cfg\|.in\|opa\|_ref\|.xml\)' \
+    -exec  cp {} . \;
 
 
@@ -144 +169 @@
 ##---------------------------------------------------
 print_step 'Compare inputs'
+
 diff_inputs
 
@@ -150 +176 @@
 ##---------------------------------------------------
 print_step 'Submit job'
-cp ${TRUS_DIRE}/batch/${TRUS_JSPT} ${TRUS_SCRA} ## Copy the submitting script to testing folder
-TRUS_JIDN=$( eval ${TRUS_JSUB} )
-[ $? -ne 0 ] && get_out 4 || printf "Success (job ID %s)\n" ${TRUS_JIDN}
+
+## Copy the submitting script to testing folder
+cp ${TRUST_JOB_SCRIPT} ${TRUST_DIR_SCRATCH}
+TRUST_JOB_ID=$( eval ${TRUST_JOB_SUBMIT} )
+
+[ $? -ne 0 ] && get_out 4 || printf "Success (job ID %s)\n" ${TRUST_JOB_ID}
+
 print_step 'Pending job'
+
 job_pending
+
 print_step 'Job finished'
 
@@ -161 +193 @@
 ##---------------------------------------------------
 print_step 'Test job state'
-[[ ! -e time.step || $( grep 'E R R O R' ocean.output ) ]] && get_out 5 || echo 'Success' ## Must be reviewed
+
+if [[ ! -e time.step || $( grep 'E R R O R' ocean.output ) ]]; then
+    get_out 5
+else
+    echo 'Success' ## Must be reviewed
+fi
+
 print_step 'Get job performances'
+
 get_time
+
 get_memy
 
@@ -169 +209 @@
 ## Check outputs
 ##---------------------------------------------------
-TRUS_RSLT='OK' ## 'OK' by default
+TRUST_FLAG_RESULT='OK' ## 'OK' by default
+
 print_step 'Compare outputs'
+
 diff_results
+
 print_step 'Compare restarts'
-diff_restart
-[ $TRUS_RSLT == 'FAILED' ] && get_out 8
-
-
-## End, at least nothing has changed ;-)
+
+diff_restarts
+
+[ $TRUST_RESULT == 'FAILED' ] && get_out 8
+
+
+## End, at least nothing major has changed ;-)
 ##---------------------------------------------------
 get_out 0