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

Timestamp:

2015-06-30T16:20:45+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Error management redefinition

File:

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

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

@@ -7 +7 @@
     if [ "$state" == 'E R R O R' ]; then
    [ -e time.step ] && LAST_TIME_STEP=$( cat time.step | tr -d [:space:] )
-   export ${LAST_TIME_STEP} ERR=1
+   export ${LAST_TIME_STEP}
     fi
 
     [ -e ocean.output ] && line=$( grep -m1 -A5 "$state" ocean.output | tr -d '\n' )
+
     if [[ -e ${REFE_DIR}/model.log && $( diff -q model.log ${REFE_DIR}/model.log ) ]]; then
    line=$( diff model.log ${REFE_DIR}/model.log  | tr -d '\n' )
@@ -22 +23 @@
     mesg='Same'
     for file in inputs_list.txt $( ls namelist_* ) $( ls *.xml ); do
-   diff -q $file ${REFE_DIR}/$file
+   diff -q $file ${REFE_DIR}/$file > /dev/null
    [ $? -ne 0 ] && mesg='Different'
     done
 
-    printf "Input files\n$mesg\n" | tee mesg_09_inputfiles_${CFG_USER}_${CFG_ARCH}.txt
+    printf "Input files\n$mesg\n" | tee mesg_09_inputs_${CFG_USER}_${CFG_ARCH}.txt
 }
 
 diff_results() {
     for file in ocean.output $( ls *.stat ); do
-   [ ! -e ${REFE_DIR}/$file ] && export ST='FAILED' && get_out $ST ERR=7
+   [ ! -e ${REFE_DIR}/$file ] && export ST='FAILED' && get_out 7
    diff -q $file ${REFE_DIR}/$file
    [ $? -ne 0 ] && export ST='FAILED'
@@ -38 +39 @@
 
 diff_restart() {
-    [ ! -e  ${REFE_DIR}/time.step ] && export ST='FAILED' && get_out $ST ERR=9
+    [ ! -e  ${REFE_DIR}/time.step ] && export ST='FAILED' && get_out 9
 
     export LAST_TIME_STEP=$( cat ${REFE_DIR}/time.step | tr -d [:space:] )
@@ -82 +83 @@
 get_cpu_time() {
     real_cpu_time=$( eval "${JOB_INFO} ${JOB_ID} | ${JOB_TIME}" )
-    printf "Real CPU time\n${real_cpu_time}\n" | tee mesg_10_realcputime_${CFG_USER}_${CFG_ARCH}.txt
+    printf "Real CPU time\n${real_cpu_time}\n" | tee mesg_10_cputime_${CFG_USER}_${CFG_ARCH}.txt
 }
 
@@ -175 +176 @@
 
 END_MAIL
-#`tail -n 1 ${TEST_DIR}/mesg_03_error_${CFG_USER}_${CFG_ARCH}.txt`
+
       if [ -e ${TEST_DIR}/trusting_${DATESTR}_${CFG_USER}_${CFG_ARCH}.txt ]; then
      cat ${TEST_DIR}/trusting_${DATESTR}_${CFG_USER}_${CFG_ARCH}.txt  >> trusting.mail
@@ -188 +189 @@
 
 get_out() {
+    ERR=$1
+
     printf "Status\n$ST\n"  > mesg_02_status_${CFG_USER}_${CFG_ARCH}.txt
 
-    # Save tested configuration if trusting failed
     if [ "$ST" == 'FAILED' ]; then
    cd ${TEST_DIR}
-   printf "Input files\n\n"   > mesg_09_inputfiles_${CFG_USER}_${CFG_ARCH}.txt
-   printf "Real CPU time\n\n" > mesg_10_realcputime_${CFG_USER}_${CFG_ARCH}.txt
+
+   if [ ! -e mesg_09_inputs_${CFG_USER}_${CFG_ARCH}.txt ]; then
+       printf "Input files\n\n"   > mesg_09_inputs_${CFG_USER}_${CFG_ARCH}.txt
+   fi
+
+   if [ ! -e mesg_10_cputime_${CFG_USER}_${CFG_ARCH}.txt ]; then
+       printf "Real CPU time\n\n" > mesg_10_cputime_${CFG_USER}_${CFG_ARCH}.txt
+   fi
 
    if [ ! -e mesg_11_comments_${CFG_USER}_${CFG_ARCH}.txt ]; then
@@ -201 +209 @@
 
         # Error identification
-   case ERR in
+   case $ERR in
        # Compilation
        1) ERR='XIOS compilation failed'            ;;  2) ERR='NEMO compilation failed'            ;;
@@ -215 +223 @@
    esac
 
-   #tar -czf ${REFE_DIR}/trusting_${DATESTR}_${CFG_USER}_${CFG_ARCH}.tar.gz *
+   export ERR
     fi
 
     printf "Result.....\n$ERR\n" > mesg_03_result_${CFG_USER}_${CFG_ARCH}.txt
+
+    # Save tested configuration if trusting failed
+    [ "$ST" == 'FAILED' ] && tar -czf ${REFE_DIR}/trusting_${DATESTR}_${CFG_USER}_${CFG_ARCH}.tar.gz *
 
     mesg_make
@@ -234 +245 @@
    ${JOB_INFO} ${JOB_ID}                                           >> computation.log
    sleep ${time_increment}
-#  let time_elapsed+=${time_increment}
    time_elapsed=$(( ${time_elapsed} + ${time_increment} ))
     done
@@ -244 +254 @@
    export ${TIME_LIMIT}
    get_out $ST ERR=6
-}
+    fi
+}