Changeset 5664 for branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh

Timestamp:

2015-08-03T21:34:03+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Few bugfixes & improvments, clarify displayed comments

File:

• branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh (modified) (6 diffs)

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

@@ -6 +6 @@
 ## Set defaults
 ##---------------------------------------------------
-NEMO_TRUS=$( pwd )
-DEBUG=0; PUBLISH=0
-I_MODULE=0      ## No 'module' command by default
-ST='FAILED'     ## 'FAILED'            ""   " "  
+NEMO_TRUS=$PWD
+DEBUG=0; PUBLISH=0;
+I_MODULE=0; ST='FAILED' ## No 'module' command & 'FAILED' status by default
+xios_full='--full'; stderr_redir='>&' ## DEBUG options
 
 ## Get options for replacing some initials settings
@@ -45 +45 @@
 ## Summary of trusting test context
 ##---------------------------------------------------
-printf "\
+printf "\n\
 NEMO Trusting test:\n\
 -------------------\n\
 Testing ${TEST_CONF} based on ${REFE_CONF} from ${NEMO_BRAN}\n\
-Configuration files: ${NEMO_USER}.cfg & ${NEMO_HPCC}.cfg\n"
+NEMO installation: ${NEMO_USER}\n\
+Computing architecture: ${NEMO_HPCC}\n"
 
 ## Making timestamped directory with messenger files
@@ -75 +76 @@
 print_step 'Compile XIOS'
 cd ${DIR_XIOS}
-full=''; [ $DEBUG -eq 0 ] && full='--full'
-./make_xios $full --arch ${NEMO_HPCC} --job $NPROC >& /dev/null
+[ $DEBUG -eq 1 ] && xios_full='' && stderr_redir='>'
+eval ./make_xios ${xios_full} --arch ${NEMO_HPCC} --job $NPROC ${stderr_redir} /dev/null
 [ ! -e ${DIR_XIOS}/lib/libxios.a ] && get_out 1
 
@@ -83 +84 @@
 print_step "Compile ${REFE_CONF} configuration"
 cd ${NEMO_CONF}
-[[ -d ${TEST_CONF} && $DEBUG -eq 0 ]] && ./makenemo -n ${TEST_CONF} clean >  /dev/null
-./makenemo -n ${TEST_CONF} -r ${REFE_CONF} -m ${NEMO_HPCC} -j $NPROC      >& /dev/null
+[[ -d ${TEST_CONF} && $DEBUG -eq 0 ]] && eval ./makenemo -n ${TEST_CONF} clean >               /dev/null
+eval ./makenemo -n ${TEST_CONF} -r ${REFE_CONF} -m ${NEMO_HPCC} -j $NPROC      ${stderr_redir} /dev/null
 [ ! -e ${TEST_CONF}/BLD/bin/nemo.exe ] && get_out 2
 
@@ -114 +115 @@
 print_step 'Test job state'
 if   [[ ! -e time.step || $( grep -q 'E R R O R' ocean.output ) ]]; then
+    echo 'Error'
     comments 'E R R O R'
     get_out 5
 else
+    echo 'Good'
     ## Get time computation
     ##---------------------------------------------------
@@ -127 +130 @@
 ## Inspect output text files
 ##---------------------------------------------------
-print_step 'Test ASCII output files diff'
+print_step 'Test output files diff'
 diff_results
-[ "$ST" == 'FAILED' ] && get_out 8
 
 ## Inspect output NetCDF files
 ##---------------------------------------------------
-print_step 'Test last restart NetCDF files diff'
+print_step 'Test last restart files diff'
 diff_restart
-[ "$ST" == 'FAILED' ] && get_out 10
+[ "$ST" == 'FAILED' ] && get_out 8
 
 ## Get comments (ocean.output & diff model.log)