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

Timestamp:

2015-08-14T18:05:48+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Correct all arithmetic tests, global readability improvment & format words list in loop

File:

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

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

@@ -8 +8 @@
 NEMO_TRUS=$PWD
 DEBUG=0; PUBLISH=0; TIME_STEP=0
-I_MODULE=0; ST='FAILED' ## No 'module' command & 'FAILED' status
+IMOD=0; ST='FAILED' ## No 'module' command & 'FAILED' status
 xios_full='--full'; stderr_redir='>&' ## DEBUG options
 
@@ -50 +50 @@
 ## Summary of trusting test context
 ##---------------------------------------------------
-printf "\n\
-NEMO Trusting test:\n\
--------------------\n\
-Testing ${TEST_CONF} based on ${REFE_CONF} from ${NEMO_BRAN}\n\
-NEMO installation: ${NEMO_USER}\n\
-Computing architecture: ${NEMO_HPCC}\n\
-Trusting SVN version: $( svn info | awk '(NR == 9) {print $NF}' )\n"
+echo 'NEMO Trusting test:'
+echo '-------------------'
+echo 'Testing '${TEST_CONF}' based on '${REFE_CONF}' from '${NEMO_BRAN}
+echo 'NEMO installation: '${NEMO_USER}
+echo 'Computing architecture: '${NEMO_HPCC}
+echo 'Trusting SVN version: '$( svn info | awk '(NR == 9) {print $NF}' )
 
 
 ## Making timestamped directory with messenger files
 ##---------------------------------------------------
-print_step 'Time-stamp generation & testing directory creation'
-mkdir -p ${TEST_DIR} ${REFE_DIR}
-echo ${TEST_DIR} && cd ${TEST_DIR}
-init_files && get_date
+cd ${TEST_DIR}
+
+print_step 'Create timestamped testing directory'
+echo ${TEST_DIR} && init_files && get_date
 
 
 ## SVN action on XIOS & NEMO essentials directories
 ##---------------------------------------------------
-print_step 'SVN command on NEMO directories:'
-get_nemo_rev
+print_step 'SVN command on NEMO directories:'; get_nemo_rev
 
 
@@ -76 +74 @@
 ##---------------------------------------------------
 print_step 'Get softwares releases'
+
 [ -e ${ARCH_ENV} ] && . ${ARCH_ENV} > /dev/null
-(( $? == 0  )) && export I_MODULE=1
-get_soft_rel
-cat model.log
+[ $? -eq 0 ] && export IMOD=1
+
+get_soft_rel; cat model.log
 
 
 ## XIOS compiling
 ##---------------------------------------------------
+cd ${DIR_XIOS}
+
 print_step 'Compile XIOS'
-cd ${DIR_XIOS}
 [ $DEBUG -eq 1 ] && xios_full='' && stderr_redir='>'
 eval ./make_xios ${xios_full} --arch ${NEMO_HPCC} --job $NPROC \
@@ -93 +93 @@
 ## NEMO config compiled from scratch
 ##---------------------------------------------------
-print_step "Compile ${REFE_CONF} configuration"
 cd ${NEMO_CONF}
 
+print_step "Compile ${REFE_CONF} configuration"
+
 if [[ -d ${TEST_CONF} && $DEBUG -eq 0 ]]; then
-    eval ./makenemo -n ${TEST_CONF} clean_config > /dev/null <<EOF
+    ./makenemo -n ${TEST_CONF} clean_config > /dev/null <<EOF
 y
 EOF
@@ -103 +104 @@
 
 eval ./makenemo -n ${TEST_CONF} -r ${REFE_CONF} -m ${NEMO_HPCC} -j $NPROC \
-                ${KEYS_ADD} ${KEYS_DEL}                                   \
+                   ${KEYS_ADD} ${KEYS_DEL}                                \
     ${stderr_redir} /dev/null
 [ ! -e ${TEST_CONF}/BLD/bin/nemo.exe ] && get_out 2
@@ -110 +111 @@
 ## Get namelists, xml & forcing files for running
 ##---------------------------------------------------
+cd ${TEST_DIR}
+
 print_step 'Set job (copying & extracting input files)'
-cd ${TEST_DIR}
 cp ${NEMO_CONF}/${TEST_CONF}/cpp_* .
 find ${NEMO_CONF}/${TEST_CONF}/EXP00 -regex '.*\(_cfg\|.in\|opa\|_ref\|.xml\)' -exec cp {} . \;
+
 get_inputs
-(( $? != 0 )) && get_out 3
+[ $? -ne 0 ] && get_out 3
 [ $( find . -name '*.gz' -print -quit ) ] && find . -name '*.gz' -exec gunzip {} \;
 
@@ -121 +124 @@
 ## Check input files in all cases
 ##---------------------------------------------------
-print_step 'Compare with standard input files list'
-diff_inputs
+print_step 'Compare with benchmark input files list'; diff_inputs
 
 
 ## Job submission & computing
 ##---------------------------------------------------
-print_step 'Submit job'
-JOB_ID=$( eval ${JOB_SUBM} )
-(( $? != 0 )) && get_out 4
-print_step 'Pending job'
-job_pending
+print_step 'Submit job'; JOB_ID=$( eval ${JOB_SUBM} )
+[ $? -ne 0 ] && get_out 4
+
+print_step 'Pending job'; job_pending
+
 print_step 'Job finished'
 
 
-## Job state
+## Job state & get time computation if succeeded
 ##---------------------------------------------------
 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'
+if   [[ ! -e time.step || $( grep 'E R R O R' ocean.output ) ]]; then
+    echo 'Failure'
     get_out 5
 else
-    echo 'Good'
-    ## Get time computation
-    ##---------------------------------------------------
-    print_step 'Get real CPU time'
-    get_cpu_time
+    echo 'Success'
 fi
 
+print_step 'Get real CPU time'; get_cpu_time
+
+
+## Inspect outputs
+##---------------------------------------------------
 ST='OK' ## 'OK' by default
 
-
-## Inspect output text files
-##---------------------------------------------------
-print_step 'Test output files diff'
-diff_results
-
-
-## Inspect output NetCDF files
-##---------------------------------------------------
-print_step 'Test last restart files diff'
-diff_restart
+print_step 'Compare new outputs to benchmark files'; diff_results; diff_restart
 [ $ST == 'FAILED' ] && get_out 8
-
-
-## Get comments (ocean.output & diff model.log)
-##---------------------------------------------------
-comments 'W A R N I N G'