Changeset 8859 for branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting_func.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/inc/trusting_func.sh (modified) (6 diffs, 2 props)

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting_func.sh

@@ -18 +18 @@
 ##--------------------------------------------------------------------------------
 
-print_step() {
+step() {
     local char_nb=$( echo "$1" | wc -c )
     local outline=$( printf "%${char_nb}s" )
 
-    printf "\n\nStep.....\n%s\n%s\n\n" "$1" ${outline// /-}
+    printf "\n%s\n%s\n\n" "$1" ${outline// /-}
 }
 
@@ -152 +152 @@
     cd ${TRUST_SVN_NEMOGCM}/CONFIG
 
-    ## Recompiling from scratch if not in debug mode
-    if [[ -d ${TRUST_CFG_NEW} && ${TRUST_FLAG_DEBUG} == 'false' ]]; then
-   ./makenemo -n ${TRUST_CFG_NEW} clean_config \
-       > /dev/null <<EOF
+    ## Recompiling from scratch if not in debug or dev mode
+    if [[ ${TRUST_FLAG_DEBUG} == 'false' && ${TRUST_FLAG_DEV} == 'false' ]]; then
+
+     if [[ -d ${TRUST_CFG_NEW} ]]; then
+         ./makenemo -n ${TRUST_CFG_NEW} clean_config \
+         > /dev/null <<EOF
 y
 EOF
+     fi
+
     fi
 
@@ -420 +424 @@
        if [ -e ${TRUST_TEST_BENCHMARK}/$filebase.nc ]; then
 
-      #bcmk='true'
       cdo diffn $filebase.nc ${TRUST_TEST_BENCHMARK}/$filebase.nc \
           > cdo_diff.out 2> /dev/null
@@ -574 +577 @@
 
        ## Computing
-       'H') TRUST_FLAG_ERROR='Crashed at time step'              ;;
-       'I') TRUST_FLAG_ERROR='Exceeded time limit'               ;;
+       'H') TRUST_FLAG_ERROR='Crashed at time step '
+      comments 'E R R O R'
+      [ -e time.step ] && time_step=$( cat time.step )
+      TRUST_FLAG_ERROR+=${time_step:=0}                     ;;
+       'I') TRUST_FLAG_ERROR='Exceeded time limit of '
+      TRUST_FLAG_ERROR+=$(( ${TRUST_JOB_TIMEOUT}/3600 ))'h' ;;
 
        ## Results
@@ -592 +599 @@
 
     ## Eventual comments from ocean.output
-    if [ ${TRUST_FLAG_ERROR} == 'Crashed at time step' ]; then
-   comments 'E R R O R'
-   [ -e time.step ] && time_step=$( cat time.step )
-   TRUST_FLAG_ERROR+=' '${time_step:=0}
-    else
-   comments 'W A R N I N G'
-
-   if [ ${TRUST_FLAG_ERROR} == 'Exceeded time limit' ]; then
-       TRUST_FLAG_ERROR+=' '$(( ${TRUST_JOB_TIMEOUT}/3600 ))'h'
-   fi
-
-    fi
+    [[ ! ${TRUST_FLAG_ERROR} =~ 'Crashed at time step' ]] && comments 'W A R N I N G'
 
     ## Last messenger files
@@ -609 +605 @@
     sed -i "2 s/.*/$TRUST_FLAG_ERROR/"  ${file_stat}
 
-    ## Save tested configuration if trusting failed in production mode (-p|--prod)
+    ## Save tested configuration if trusting failed in production mode ('-p')
     if [[ ${TRUST_FLAG_RESULT} == 'FAILED' && ${TRUST_FLAG_PROD} == 'true' ]]; then
    echo 'Creating archive '${TRUST_TEST_BACKUP}' under '${TRUST_TEST_BENCHMARK}