Changeset 5667


Ignore:
Timestamp:
2015-08-04T14:47:23+02:00 (5 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS_SETTE Cosmetic changes

Location:
branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh

    r5664 r5667  
    88NEMO_TRUS=$PWD 
    99DEBUG=0; PUBLISH=0; 
    10 I_MODULE=0; ST='FAILED' ## No 'module' command & 'FAILED' status by default 
     10I_MODULE=0; ST='FAILED' ## No 'module' command & 'FAILED' status 
    1111xios_full='--full'; stderr_redir='>&' ## DEBUG options 
    1212 
     
    5050Testing ${TEST_CONF} based on ${REFE_CONF} from ${NEMO_BRAN}\n\ 
    5151NEMO installation: ${NEMO_USER}\n\ 
    52 Computing architecture: ${NEMO_HPCC}\n" 
     52Computing architecture: ${NEMO_HPCC}\n\ 
     53Trusting SVN version: $( svn info | awk '(NR == 9) {print $NF}' )\n" 
    5354 
    5455## Making timestamped directory with messenger files 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

    r5665 r5667  
    1010FILE_COMM=mesg_11_comments_$PATTERNAME.txt; 
    1111 
    12 ## Trusting summary & archive filenames 
     12## Trusting summary & archive timestamped filenames 
    1313FILE_TRUS=trusting_${DATE}_$PATTERNAME.txt; FILE_ARCH=trusting_${DATE}_$PATTERNAME.tar.gz 
    1414 
     
    2323    echo 'Comments'      >  ${FILE_COMM} 
    2424 
     25    # 'Failed' status with 'Unknown error' by default 
    2526    echo $ST             >> ${FILE_STAT}; echo 'Unknown error'    >> ${FILE_RESU} 
    2627} 
     
    221222 
    222223    echo   $line 
    223     printf $line >> temp_${FILE_COMM} 
     224    printf "$line<br>" >> temp_${FILE_COMM} 
    224225} 
    225226 
    226227mesg_make() { 
    227     cat temp_${FILE_COMM} | tr -d '\n' | sed 's/<br>$//' >> ${FILE_COMM} ## Special construct for comments 
     228    cat temp_${FILE_COMM} | tr -d '\n' | sed 's/<br>$//' >> ${FILE_COMM} ## Format comments for web 
    228229    paste -d ';' mesg_*.txt | tee ${FILE_TRUS} 
    229230} 
     
    252253 
    253254END_MAIL 
    254        [ -e ${TEST_DIR}/${FILE_TRUS} ] && cat ${TEST_DIR}/${FILE_TRUS}     >> trusting.mail 
    255        mail -s "[NEMO Trusting ${REFE_CONF} ${NEMO_BRAN}] $ST $ERR" $EMAIL <  trusting.mail 
     255       [ -e ${TEST_DIR}/${FILE_TRUS} ] && cat ${TEST_DIR}/${FILE_TRUS}                  >> trusting.mail 
     256       mail -s "[NEMO Trusting ${NEMO_HPCC} ${REFE_CONF} ${NEMO_BRAN}] $ST $ERR" $EMAIL <  trusting.mail 
    256257   fi 
    257258 
     
    269270   case $ERR in 
    270271       ## Compilation 
    271        1) ERR='XIOS compilation failed'          ;;  2) ERR='NEMO compilation failed'            ;; 
     272       1) ERR='XIOS compilation failed'          ;; 2) ERR='NEMO compilation failed'            ;; 
    272273       ## Submission 
    273        3) ERR='Missing input files'              ;;  4) ERR='Job submission error'               ;; 
     274       3) ERR='Missing input files'              ;; 4) ERR='Job submission error'               ;; 
    274275       ## Running 
    275        5) ERR='Crashed at time step '${TIME_STEP};;  6) ERR='Exceeded time limit '${TIME_LIMI}'h';; 
     276       5) ERR='Crashed at time step '${TIME_STEP};; 6) ERR='Exceeded time limit '${TIME_LIMI}'h';; 
    276277       ## Results 
    277        7) ERR='Missing previous outputs'         ;;  8) ERR='New outputs differ'                 ;; 
     278       7) ERR='Missing previous outputs'         ;; 8) ERR='New outputs differ'                 ;; 
    278279       ## Undefined 
    279280       *) ERR='Unknown error'                    ;; 
     
    283284    fi 
    284285 
    285     sed -i "2 s/.*/$ST/"  ${FILE_STAT} 
    286     sed -i "2 s/.*/$ERR/" ${FILE_RESU} 
     286    sed -i "2 s/.*/$ST/"  ${FILE_STAT} && sed -i "2 s/.*/$ERR/" ${FILE_RESU} 
    287287 
    288288    ## Save tested configuration if trusting failed 
Note: See TracChangeset for help on using the changeset viewer.