Changeset 5696 for branches/2015

Timestamp:

2015-08-17T21:28:42+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Improve trusting output readability; use of commands block instead of multiples '&&'

Location:

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST

Files:

• config/X64_ADA.cfg (modified) (1 diff)
• config/X64_ADA_at.cfg (modified) (1 diff)
• config/romr005.cfg (modified) (1 diff)
• trusting.sh (modified) (1 diff)
• trusting_func.sh (modified) (13 diffs)

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/X64_ADA.cfg

@@ -23 +23 @@
 
 ## $CDO command to compare 2 datasets
-CDOD=$CDO' diffn'
+CDOD='cdo diffn'

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/X64_ADA_at.cfg

@@ -23 +23 @@
 
 ## $CDO command to compare 2 datasets
-CDOD=$CDO' diffn'
+CDOD='cdo diffn'

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/romr005.cfg

@@ -34 +34 @@
 REFE_DIR=${DIR_STOR}/${REFE_CONF}/${NEMO_BRAN}
 TEST_DIR=${DIR_SCRA}/${REFE_CONF}/${NEMO_BRAN}/trusting_${DATE}
-CDOD="$CDO diffn"
+
 
 ## External softs directories:

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

@@ -164 +164 @@
 print_step 'Compare new outputs to benchmark files'
 diff_results
-[ $ST == 'FAILED' ] && echo 'Failure' || echo 'Success'
 print_step 'Compare new restarts to benchmark files'
 diff_restart
-[ $ST == 'FAILED' ] && get_out 8      || echo 'Success'
+[ $ST == 'FAILED' ] && get_out 8
 
 

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

@@ -119 +119 @@
 
     ## List & copy files in case of personal inputs
-    [ -z "${NEMO_TARF}" ] && cmd_iol="ls ${NEMO_FORC}/*" && cmd_iof="\cp ${NEMO_FORC}/* ."
+    [ -z "${NEMO_TARF}" ] && { cmd_iol="ls ${NEMO_FORC}/*"; cmd_iof="\cp ${NEMO_FORC}/* ."; }
 
     ${cmd_iol} > inputs_list.txt
@@ -172 +172 @@
 
     ## Kill remaining job & stop the test if it's too long
-    [ ${time_elapsed} -eq ${TIME_LIMI} ] && ${JOB_DELE} ${JOB_ID} &> /dev/null && get_out 6
+    [ ${time_elapsed} -eq ${TIME_LIMI} ] && { ${JOB_DELE} ${JOB_ID} &> /dev/null; get_out 6; }
 }
 
@@ -178 +178 @@
 diff_results() {
     local file
-    local files_list=''
+    local files_list='' mesg='Same'
 
     ## Simple diff
@@ -184 +184 @@
 
    ## Stop if no benchmark files (ocean.output, eventual stat files)
-   [ ! -e ${REFE_DIR}/$file ] && export ST='FAILED' && get_out 7
+   [ ! -e ${REFE_DIR}/$file ] && { export ST='FAILED'; get_out 7; }
 
    diff -q $file ${REFE_DIR}/$file
 
    ## Continue even if it differs
-   [ $? -ne 0 ] && export ST='FAILED' && files_list+=$file' '
+   [ $? -ne 0 ] && { export ST='FAILED'; mesg='Different'; files_list+=$file' '; }
     done
+
+    [ $mesg == 'Same' ] && echo $mesg
 
     ## List different files for web comment
@@ -203 +205 @@
 
     ## Stop if no benchmark files (ie time.step)
-    [ ! -e ${REFE_DIR}/time.step ] && export ST='FAILED' && get_out 7
+    [ ! -e ${REFE_DIR}/time.step ] && { export ST='FAILED'; get_out 7; }
     time_step=$( cat ${REFE_DIR}/time.step | tr -d [:space:] )
 
@@ -240 +242 @@
          ## CDO can return void stdout with no difference
          if [[ -n "$dif" && $( echo $dif | awk '{print $1}' ) -ne 0 ]]; then
-             export ST='FAILED' && files_list+=$file' '
-             let dift+=$( echo $dif | awk '{print $1}' )
+             export ST='FAILED'
+             files_list+=$file' ' && let dift+=$( echo $dif | awk '{print $1}' )
              echo $file.nc': '$dif
          fi
@@ -258 +260 @@
         ## List different files for web comment with sum of different parameters
    if [ $dift -ne 0 ]; then
-       echo 'Restarts: '${files_list}$dift' record(s) differ<br>' | tee -a temp_${FILE_COMM}
+       echo 'Restarts: '${files_list}$dift' record(s) differ<br>' \
+      >> temp_${FILE_COMM}
+   else
+       echo 'Same'
    fi
 
@@ -269 +274 @@
 
 get_cpu_time() {
-    ## Interest 
+    ## Interest for checking unusual time computing
     local real_cpu_time=$( eval ${JOB_TIME} )
 
@@ -282 +287 @@
     if [ -e ocean.output ]; then
         ## 'W A R N I N G' by default
-   opat="-A2 '^ $state'"
-   [ "$state" == 'E R R O R' ] && opat="-A4 '$state'"
+   opat="-A2 \"^ $state\""
+   [ "$state" == 'E R R O R' ] && opat="-A4 \"$state\""
 
         ## Select first occurence for web comment
-   line=$( grep -m1 $opat ocean.output | tr -d '\n' )
+   line=$( eval grep -m1 $opat ocean.output | tr -d '\n' )
    echo $line
     fi
@@ -349 +354 @@
 
     ERR=$1
-    cd ${TEST_DIR} ## In case of compilation error
+
+    print_step 'End of trusting test'
+
+    ## In case of compilation error
+    cd ${TEST_DIR}
 
     if [ $ST == 'FAILED' ]; then
@@ -369 +378 @@
 
     else
-   ERR='Code is reliable'
-    fi
-
-    print_step ''
+   echo 'Success' && ERR='Code is reliable'
+    fi
 
     ## Eventual comments from ocean.output
@@ -384 +391 @@
     fi
 
+    ## Last messenger files
     export ERR
     sed -i "2 s/.*/$ST/" ${FILE_STAT}; sed -i "2 s/.*/$ERR/" ${FILE_RESU}
@@ -395 +403 @@
 
     ## Share trusting result (.txt file/mail)
+    print_step 'Trusting digest'
     mesg_make
     mesg_publish