Changeset 5667 for branches/2015

Timestamp:

2015-08-04T14:47:23+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Cosmetic changes

Location:

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST

Files:

• trusting.sh (modified) (2 diffs)
• trusting_func.sh (modified) (6 diffs)

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

@@ -8 +8 @@
 NEMO_TRUS=$PWD
 DEBUG=0; PUBLISH=0;
-I_MODULE=0; ST='FAILED' ## No 'module' command & 'FAILED' status by default
+I_MODULE=0; ST='FAILED' ## No 'module' command & 'FAILED' status
 xios_full='--full'; stderr_redir='>&' ## DEBUG options
 
@@ -50 +50 @@
 Testing ${TEST_CONF} based on ${REFE_CONF} from ${NEMO_BRAN}\n\
 NEMO installation: ${NEMO_USER}\n\
-Computing architecture: ${NEMO_HPCC}\n"
+Computing architecture: ${NEMO_HPCC}\n\
+Trusting SVN version: $( svn info | awk '(NR == 9) {print $NF}' )\n"
 
 ## Making timestamped directory with messenger files

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

@@ -10 +10 @@
 FILE_COMM=mesg_11_comments_$PATTERNAME.txt;
 
-## Trusting summary & archive filenames
+## Trusting summary & archive timestamped filenames
 FILE_TRUS=trusting_${DATE}_$PATTERNAME.txt; FILE_ARCH=trusting_${DATE}_$PATTERNAME.tar.gz
 
@@ -23 +23 @@
     echo 'Comments'      >  ${FILE_COMM}
 
+    # 'Failed' status with 'Unknown error' by default
     echo $ST             >> ${FILE_STAT}; echo 'Unknown error'    >> ${FILE_RESU}
 }
@@ -221 +222 @@
 
     echo   $line
-    printf $line >> temp_${FILE_COMM}
+    printf "$line<br>" >> temp_${FILE_COMM}
 }
 
 mesg_make() {
-    cat temp_${FILE_COMM} | tr -d '\n' | sed 's/<br>$//' >> ${FILE_COMM} ## Special construct for comments
+    cat temp_${FILE_COMM} | tr -d '\n' | sed 's/<br>$//' >> ${FILE_COMM} ## Format comments for web
     paste -d ';' mesg_*.txt | tee ${FILE_TRUS}
 }
@@ -252 +253 @@
 
 END_MAIL
-       [ -e ${TEST_DIR}/${FILE_TRUS} ] && cat ${TEST_DIR}/${FILE_TRUS}     >> trusting.mail
-       mail -s "[NEMO Trusting ${REFE_CONF} ${NEMO_BRAN}] $ST $ERR" $EMAIL <  trusting.mail
+       [ -e ${TEST_DIR}/${FILE_TRUS} ] && cat ${TEST_DIR}/${FILE_TRUS}                  >> trusting.mail
+       mail -s "[NEMO Trusting ${NEMO_HPCC} ${REFE_CONF} ${NEMO_BRAN}] $ST $ERR" $EMAIL <  trusting.mail
    fi
 
@@ -269 +270 @@
    case $ERR in
        ## Compilation
-       1) ERR='XIOS compilation failed'          ;;  2) ERR='NEMO compilation failed'            ;;
+       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 '${TIME_STEP};;  6) ERR='Exceeded time limit '${TIME_LIMI}'h';;
+       5) ERR='Crashed at time step '${TIME_STEP};; 6) ERR='Exceeded time limit '${TIME_LIMI}'h';;
        ## 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'                    ;;
@@ -283 +284 @@
     fi
 
-    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