Changeset 5695 for branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

Timestamp:

2015-08-17T20:12:12+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE return svn cmd to main script; add variable for CDO diff operator; correct exit sequence

File:

• branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh (modified) (14 diffs)

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

@@ -1 +1 @@
 #!/bin/bash
 
-
-mkdir -p ${TEST_DIR} ${REFE_DIR}
 
 ## Messenger filenames
@@ -45 +43 @@
 
 get_nemo_rev() {
-    local rev_loc svn_cmd
-    local rev=0 svn_opt='status'
-
-    ## If -v|--version option has been set, modify svn command
-    if   [ $( echo ${NEMO_VERS} | grep  "HEAD\|up\|update"                     ) ]; then
-   svn_cmd='svn update -r HEAD'
-    elif [ $( echo ${NEMO_VERS} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' ) ]; then
-   svn_cmd='svn update -r '$( echo ${NEMO_VERS} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' )
-    elif [ $( echo ${NEMO_VERS} | grep -o '[0-9]*'                             ) ]; then
-   svn_cmd='svn update -r '$( echo ${NEMO_VERS} | grep -o '[0-9]*'                             )
-    else
-   svn_cmd='svn '${svn_opt}
-    fi
+    local dir rev_loc
+    local rev=0
 
     ## Loop on essential directories
@@ -75 +62 @@
    fi
 
-   echo $dir
-   ${svn_cmd} $dir
+   echo $dir && ${SVN_CMD} $dir
    rev_loc=$( svn info $dir | awk '(NR == 9) {print $NF}' )
 
@@ -91 +77 @@
 
 get_soft_rel() {
-    local soft_rel
+    local soft soft_rel
 
     for soft in $CDO $COMPILER $MPI $NETCDF; do
@@ -129 +115 @@
 
 get_inputs() {
-    # List archive content & extract by default
+    # List archive content & extract it by default
     local cmd_iol="tar -tvf ${NEMO_FORC}/${NEMO_TARF}" cmd_iof="tar -vxf ${NEMO_FORC}/${NEMO_TARF}"
 
-    ## List & copy file in case of personal inputs
+    ## List & copy files in case of personal inputs
     [ -z "${NEMO_TARF}" ] && cmd_iol="ls ${NEMO_FORC}/*" && cmd_iof="\cp ${NEMO_FORC}/* ."
 
@@ -141 +127 @@
 
 diff_inputs() {
-    local dif
+    local dif file
     local files_list='' mesg='Same' 
 
@@ -152 +138 @@
 
    ## Pass over useless file omission in benckmark directory
-   if [ -n "$dif" && "$dif" != '0' ]; then
+   if [[ -n "$dif" && "$dif" != '0' ]]; then
        mesg='Different'; echo $dif; files_list+=$file' '
    fi
@@ -186 +172 @@
 
     ## Kill remaining job & stop the test if it's too long
-    if [ ${time_elapsed} -eq ${TIME_LIMI} ]; then
-   ${JOB_DELE} ${JOB_ID} &> /dev/null
-   get_out 6
-    fi
+    [ ${time_elapsed} -eq ${TIME_LIMI} ] && ${JOB_DELE} ${JOB_ID} &> /dev/null && get_out 6
 }
 
 
 diff_results() {
+    local file
     local files_list=''
 
@@ -215 +199 @@
 
 diff_restart() {
-    local base_name dif file list_comp list_tmsp nb_dom
+    local base_name comp dif file list_comp list_tmsp nb_dom time_step tmsp
     local files_list='' dift=0
 
-    ## Stop if no benchmark files (time.step)
+    ## Stop if no benchmark files (ie time.step)
     [ ! -e ${REFE_DIR}/time.step ] && export ST='FAILED' && get_out 7
-
     time_step=$( cat ${REFE_DIR}/time.step | tr -d [:space:] )
-    echo 'Last time step of benchmark run: '${time_step}
 
     ## Find all restart files to rebuild
@@ -253 +235 @@
 
                    ## UNIX `cmp` not suitable (timestamp in .nc file)
-         dif=$( $CDO diffn $file.nc ${REFE_DIR}/$file.nc 2> /dev/null      \
-                | awk '/records/ {print $0}' | sed '2 s/^/,/' | tr -d '\n'  )
-
-         ## CDO can return no output on stdout with no difference
+         dif=$( $CDOD $file.nc ${REFE_DIR}/$file.nc 2> /dev/null          \
+                | awk '/records/ {print $0}' | sed '2 s/^/,/' | tr -d '\n' )
+
+         ## 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' '
@@ -277 +259 @@
    if [ $dift -ne 0 ]; then
        echo 'Restarts: '${files_list}$dift' record(s) differ<br>' | tee -a temp_${FILE_COMM}
-   else 
-       echo 'No restart differ'
    fi
 
@@ -297 +277 @@
 
 comments() {
-    local opt
-    local state=$1
-
-    ## 'W A R N I N G' by default
-    opt='-A2 "^ $state"'
-    [ "$state" == 'E R R O R' ] && opt="-A4 $state"
-
-    ## Select first occurence for web comment
-    line=$( grep -m1 $opt ocean.output | tr -d '\n' )
-
-    echo   $line
+    local opat
+    local line='' state=$1
+
+    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'"
+
+        ## Select first occurence for web comment
+   line=$( grep -m1 $opat ocean.output | tr -d '\n' )
+   echo $line
+    fi
+
     printf "$line<br>"      \
    >> temp_${FILE_COMM}
@@ -364 +346 @@
 
 get_out() {
+    local time_step=0
+
     ERR=$1
-
-    cd ${TEST_DIR}
+    cd ${TEST_DIR} ## In case of compilation error
 
     if [ $ST == 'FAILED' ]; then
+   echo 'Failure'
 
         ## Error identification
    case $ERR in
-       ## Compilation
-       1) ERR='XIOS compilation failed' ;; 2) ERR='NEMO compilation failed';;
+            ## Compilation
+       '1') ERR='XIOS compilation failed' ;; '2') ERR='NEMO compilation failed';;
        ## Submission
-       3) ERR='Missing input files'     ;; 4) ERR='Job submission error'   ;;
+       '3') ERR='Missing input files'     ;; '4') ERR='Job submission error'   ;;
        ## Running
-       5) ERR='Crashed at time step'    ;; 6) ERR='Exceeded time limit'    ;;
+       '5') ERR='Crashed at time step'    ;; '6') ERR='Exceeded time limit'    ;;
        ## Results
-       7) ERR='Missing previous outputs';; 8) ERR='New outputs differ'     ;;
+       '7') ERR='Missing previous outputs';; '8') ERR='New outputs differ'     ;;
        ## Undefined
-       *) ERR='Unknown error'           ;;
+       "*") ERR='Unknown error'           ;;
    esac
 
-    fi
+    else
+   ERR='Code is reliable'
+    fi
+
+    print_step ''
 
     ## Eventual comments from ocean.output
-    print_step 'Comments'
-    if [ -e ocean.output ]; then 
-   if [ $ERR -eq 5 ]; then
-       comments 'E R R O R'
-       [ -e time.step ] && ERR+=' '$( cat time.step | tr -d ' ' )
-   else
-       comments 'W A R N I N G'
-       [ $ERR -eq 6   ] && ERR+=' '$(( ${TIME_LIMIT}/3600 ))'h'
-   fi
-    fi
-
-    ## Share trusting result (locally or not)
+    if [ "$ERR" == 'Crashed at time step' ]; then
+   comments 'E R R O R'
+   [ -e time.step ] && time_step=$( cat time.step | tr -d ' ' )
+   ERR+=' '$time_step
+    else
+   comments 'W A R N I N G'
+   [ "$ERR" == 'Exceeded time limit' ] && ERR+=' '$(( ${TIME_LIMIT}/3600 ))'h'
+    fi
+
     export ERR
-    sed -i "2 s/.*/$ST/"  ${FILE_STAT}
-    sed -i "2 s/.*/$ERR/" ${FILE_RESU}
+    sed -i "2 s/.*/$ST/" ${FILE_STAT}; sed -i "2 s/.*/$ERR/" ${FILE_RESU}
 
     ## Save tested configuration if trusting failed in production mode (-p|--publish)
-    if [[ $ST == 'FAILED' && $PUBLISH -eq 1 && $DEBUG -eq 0 ]]; then
+    if [[ $ST == 'FAILED' && $PUBLISH -eq 1 ]]; then
    echo 'Creating archive '${FILE_ARCH}' under '${REFE_DIR}
    tar -czf ${REFE_DIR}/${FILE_ARCH} * ${NEMO_HOME}/CONFIG/${TEST_CONF}/MY_SRC \
@@ -410 +394 @@
     fi
 
-    ## 
-    print_step 'Trusting outcome'; mesg_make; mesg_publish
+    ## Share trusting result (.txt file/mail)
+    mesg_make
+    mesg_publish
 
     exit 0