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

Timestamp:

2017-11-27T14:10:49+01:00 (6 years ago)

Author:

nicolasmartin

Message:

Continuation of global refactoring of the tool, set cfg files mime property and modify trusting.env trying to handle default settings

File:

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

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

@@ -4 +4 @@
 cd $( dirname $0 )
 
-## Set defaults
-##---------------------------------------------------
+## Set flags & defaults
+##--------------------------------------------------------------------------------
+
 TRUST_MAIN_DIR=$PWD
+
 TRUST_FLAG_DEBUG=0; TRUST_FLAG_PROD=0; TRUST_FLAG_HELP=0
+TRUST_FLAG_RESULT='FAILED'; TRUST_FLAG_ERROR=0
+
 ## No update on SVN directories & 'FAILED' result for 'Unknown error' )
 TRUST_SVN_ACTION='svn status'
-TRUST_FLAG_RESULT='FAILED'; TRUST_FLAG_ERROR=0
 
 xios_mode='--full'; stdout_redir='>&'
@@ -17 +20 @@
 
 ## Get options (replacing initials settings)
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 while [ $# -ne 0 ]; do
 
     case $1 in
-   '-a'|'--archive') TRUST_CFG_FORC=$2; shift 2;; '-b'|'--branch' ) TRUST_SVN_BRANCH=$2; shift 2;;
+   '-a'|'--archive') TRUST_IO_FORC_TAR=$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;;
+   '-f'|'--forcdir') TRUST_IO_FORC_PATH=$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;;
@@ -35 +39 @@
 
 ## Initialization (HPC & user environment)
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 if [[ ! -e cfg/${TRUST_MAIN_USER}.cfg || ! -e cfg/${TRUST_MAIN_HPCC}.cfg || ${TRUST_FLAG_HELP} -eq 1 ]]; then
     cat ./inc/trusting_help.txt
@@ -69 +74 @@
 
 ## Display contextual summary of trusting test
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 echo
 
@@ -82 +88 @@
 echo '****************************************************************************************************'
 echo
+printf "\t§ (Super)Computer\t\t%s\n"             ${TRUST_MAIN_HPCC}
+printf "\t§ User installation\t\t%s\n\n"         ${TRUST_MAIN_USER}
+echo
 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}
+if [ ${TRUST_TEST_BENCHMARK} ]; then
+printf "\t§ Benchmark folder\t\t%s\n"               ${TRUST_TEST_BENCHMARK}
+fi
 
 
 ## Make timestamped directory with messenger files
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 print_step 'Timestamped testing directory'
 
-mkdir -p ${TRUST_DIR_SCRATCH} ${TRUST_DIR_STORE}
-cd       ${TRUST_DIR_SCRATCH}
-echo     ${TRUST_DIR_SCRATCH}
+mkdir -p ${TRUST_TEST_DIR} ${TRUST_TEST_BENCHMARK}
+cd       ${TRUST_TEST_DIR}
+echo     ${TRUST_TEST_DIR}
 
 init_files
@@ -103 +113 @@
 
 ## Get SVN revision on XIOS & NEMO essentials directories
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 print_step "SVN action on NEMO directories: ${TRUST_SVN_ACTION}"
 
@@ -110 +121 @@
 
 ## Check softwares versions (after sourced arch environment)
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 print_step 'Get testing environement'
 
@@ -120 +132 @@
 
 ## XIOS compilation from scratch
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 print_step 'Compile XIOS'
 
-cd ${TRUST_DIR_XIOS}
+cd ${TRUST_IO_XIOS}
 
 eval ./make_xios ${xios_mode} --arch ${TRUST_MAIN_HPCC} --job ${TRUST_COMPILE_NPROC} \
@@ -132 +145 @@
 
 ## NEMO compilation from scratch
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 print_step "Compile ${TRUST_CFG_REF} configuration"
 
-cd ${TRUST_DIR_NEMOGCM}/CONFIG
+cd ${TRUST_SVN_NEMOGCM}/CONFIG
 
 if [[ -d ${TRUST_CFG_NEW} && ${TRUST_FLAG_DEBUG} -eq 0 ]]; then
@@ -153 +167 @@
 
 ## Get all inputs for running
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 print_step 'Set job (copying or extracting inputs)'
 
-cd ${TRUST_DIR_SCRATCH}
+cd ${TRUST_TEST_DIR}
 
 get_inputs
 
-cp   ${TRUST_DIR_NEMOGCM}/CONFIG/${TRUST_CFG_NEW}/cpp_* .
-find ${TRUST_DIR_NEMOGCM}/CONFIG/${TRUST_CFG_NEW}/EXP00   \
+cp   ${TRUST_SVN_NEMOGCM}/CONFIG/${TRUST_CFG_NEW}/cpp_* .
+find ${TRUST_SVN_NEMOGCM}/CONFIG/${TRUST_CFG_NEW}/EXP00   \
     -regex '.*\(_cfg\|.in\|opa\|_ref\|.xml\)' \
     -exec  cp {} . \;
@@ -167 +182 @@
 
 ## Check inputs
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 print_step 'Compare inputs'
 
@@ -174 +190 @@
 
 ## Job submission & computation
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 print_step 'Submit job'
 
 ## Copy the submitting script to testing folder
-cp ${TRUST_JOB_SCRIPT} ${TRUST_DIR_SCRATCH}
+cp ${TRUST_JOB_SCRIPT} ${TRUST_TEST_DIR}
 TRUST_JOB_ID=$( eval ${TRUST_JOB_SUBMIT} )
 
@@ -191 +208 @@
 
 ## Check job state & get computation performances if succeeded
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 print_step 'Test job state'
 
@@ -208 +226 @@
 
 ## Check outputs
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 TRUST_FLAG_RESULT='OK' ## 'OK' by default
 
@@ -223 +242 @@
 
 ## End, at least nothing major has changed ;-)
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
 get_out 0