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

Timestamp:

2017-11-30T16:01:29+01:00 (6 years ago)

Author:

nicolasmartin

Message:

Continuation of global refactoring of Trusting tool

• Introduce new 'dev' mode beetween 'debug' and 'prod' modes to skip XIOS compilation from scratch and working in a solely testing directory (thanks Andrew for the suggestion)
• Switch cfg files from 'svn:mime-type=text/x-shellscript' to 'svn:executable' trying to get syntax highlighting under Trac
• Bugfixes: correct XIOS branch 'XIOS_DEV_CMIP6' for ORCA1 and remove remaining 'TRUST_DIR_BENCHMARK' (replace by TRUST_TEST_BENCHMARK)
• Improve the workflow displayed in the terminal

File:

• branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.sh (modified) (8 diffs, 2 props)

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

@@ -9 +9 @@
 
 TRUST_MAIN_DIR=$PWD
+TRUST_FLAG_HELP='false'
+TRUST_FLAG_DEBUG='false'; TRUST_FLAG_DEV='false' ; TRUST_FLAG_PROD='false'
 
-TRUST_FLAG_DEBUG='false'  ; TRUST_FLAG_HELP='false' ; TRUST_FLAG_PROD='false'
-
+# Revision number of the tool
 rev=$( svn info | awk '/Last Changed Rev/ {print $NF}' )
 
 
 ##--------------------------------------------------------------------------------
-## Get arguments from command line
+## Get short or long arguments from command line
 ##--------------------------------------------------------------------------------
 
@@ -45 +46 @@
     cat ./inc/trusting_help.txt
 
+    ## Color this section to part with help
+    printf "\033[0;33m"
+
     if [ ${TRUST_FLAG_HELP} == 'false' ]; 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" ${TRUST_MAIN_USER} ${TRUST_MAIN_HPCC}
-   printf "\033[0m"
+   printf "                                                           \
+       \nAt least 1 cfg file (arch or user) is missing or misspelled: \
+       '%s.cfg' or '%s.cfg'\n"                                        \
+       ${TRUST_MAIN_USER} ${TRUST_MAIN_HPCC}
     fi
 
-    printf "\n\nContent of 'config' folder:"
-    find config -name *.cfg | cut -d/ -f2 \
-   | xargs -n 4 printf "%-25s\t%-25s\t%-25s\n"
+    echo -e "\nContent of './cfg' folder:"
+    find ./cfg -name *.cfg | cut -d/ -f3 \
+   | xargs -n 3 printf "%-20s\t%-20s\t%-20s\n"
+    printf "\033[0m\n"
+
     exit 1
 else
@@ -95 +101 @@
 ##------------------
 
-print_step 'Timestamped testing directory'
+step 'Testing directory'
 init
 
@@ -102 +108 @@
 ##-------------------
 
-print_step 'SVN action on NEMO directories'
-printf "${TRUST_SVN_ACTION} on ${TRUST_SVN_NEMOGCM}:\n\n"  
+step 'Local working copy'
+
+echo "${TRUST_SVN_ACTION} on ${TRUST_SVN_NEMOGCM}:"
 get_nemo_rev
 
@@ -110 +117 @@
 ##------------
 
-print_step 'Get testing environment'
+step 'Environment'
 get_soft_rel
 
@@ -117 +124 @@
 ##---------------
 
-print_step 'Compile XIOS'
+step 'Compilation(s)'
+
+printf "XIOS? "
 compile_xios
 
-print_step "Compile ${TRUST_CFG_NEW} cfg from ${TRUST_CFG_REF}"
+printf "\nNEMO ${TRUST_CFG_NEW} cfg. from ${TRUST_CFG_REF}? "
 compile_nemo
 
@@ -127 +136 @@
 ##-------
 
-print_step 'Set job (copying or extracting inputs)'
+step 'Inputs'
+
 get_inputs
 
-print_step 'Compare inputs'
+printf "\nCompare with benchmark? "
 diff_inputs
 
@@ -137 +147 @@
 ##----
 
-print_step 'Submit job'
+step 'Job'
+
+printf "Submit? "
 job_submit
 
-print_step 'Pending job'
+echo 'Pending...'
 job_pending
 
-print_step 'Job finished'
+echo 'Finished!'
 
-print_step 'Test job state'
+printf "State? "
 job_state
 
-print_step 'Get job performances'
+printf "Perfs?"
 job_perfs
 
 
-## Outputs
-##--------
+## Output(s)
+##----------
 
-print_step 'Compare outputs'
+step 'Ouput(s)'
+
+echo 'Compare with benchmark:'
+
+printf "Plain text files? "
 diff_results
 
-print_step 'Compare restarts'
+printf "Restart files? "
 diff_restarts