Changeset 10704

Timestamp:

2019-02-20T11:10:07+01:00 (4 years ago)

Author:

mathiot

Message:

apply Simon suggestion + minor change in report display (ticket #2239)

Location:

NEMO/branches/2019/fix_sette_ticket2239

Files:

• all_functions.sh (modified) (4 diffs)
• sette_rpt.sh (modified) (2 diffs)

NEMO/branches/2019/fix_sette_ticket2239/all_functions.sh

@@ -183 +183 @@
 # function to tidy up after each test and populate the NEMO_VALIDATION store
 post_test_tidyup () {
+# Save current exit status of caller script 
+    RUN_STATUS=$? 
+    echo "Exit status: ${RUN_STATUS}" 
 #
 # requires the following variables defined and exported from the calling script:
@@ -204 +207 @@
 ################################################################
 # SMALL DEBUG
+    EXIT_STATUS=${RUN_STATUS}
     if [ ! -r ${EXE_DIR}/ocean.output ]
         then
         grep "E R R O R" ${EXE_DIR}/ocean.output && echo "Some ERRORS at execution time, see ${EXE_DIR}/ocean.output"
+        EXIT_STATUS=2
         # exit 2 Error now catch in the report 
     fi
@@ -214 +219 @@
         echo "file time.step does not exist"   >> ${SETTE_DIR}/output.sette
         echo "some problems during execution of model"  >> ${SETTE_DIR}/output.sette 
+        EXIT_STATUS=1
         # exit 1 Error now catch in the report
     else
@@ -234 +240 @@
    exit 1
     fi
+# 
+# Exit before populating validation directory if the model run has 
+# returned a non-zero exit status 
+# On CRAY NEMO exit is not the expected 999 or 123456 (let this bloc in case useful later on).
+#    case ${EXIT_STATUS} in
+#        0|123456|999) echo " NEMO finished with exit code $EXIT_STATUS " ; post_test_tidyup ;;
+#        *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $EXIT_STATUS "
+#    esac
+
+    [ ${EXIT_STATUS} -ne 0 ] && exit ${EXIT_STATUS}  
 #
 # Save output & debug files in NEMO_VALIDATION tree

NEMO/branches/2019/fix_sette_ticket2239/sette_rpt.sh

@@ -532 +532 @@
 #
 # before/after tests
-#
+ echo ""
+ echo "   !----result comparison check----!   "
  if [ $NEMO_VALID_REF != "/path/to/reference/sette/results" ]; then
    echo ''
@@ -545 +546 @@
  else
    echo ''
-   echo 'Result are not compare with any other revision. To do it please fill NEMO_VALID_REF and NEMO_REV_REF in param.cfg'
+   echo ' No path for comparison specified. Result are not compare with any other revision. '
+   echo ' To do it please fill NEMO_VALID_REF and NEMO_REV_REF in param.cfg. '
    echo ''
  fi