Changeset 5929 for branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.sh

Timestamp:

2015-11-26T16:55:09+01:00 (8 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS18_TRUST Last commits before merging to trunk

File:

• branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.sh (modified) (9 diffs)

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

@@ -33 +33 @@
 ##---------------------------------------------------
 if [[ ! -e config/${TRUS_USER}.cfg || ! -e config/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then
-    cat trusting_help.txt
+    cat ./inc/trusting_help.txt
 
     if [ ${TRUS_HELP} -eq 0 ]; then
@@ -47 +47 @@
     exit 1
 else
-    . trusting.env && . trusting_func.sh
-#echo $WRAPPER_LDFLAGS
+    . ./inc/trusting.env && . ./inc/trusting_func.sh
+
     ## DEBUG option to speed up & expand verbosity of compilation
     [ ${TRUS_DBUG} -eq 1 ] && { set -vx; xios_mode=''; stdout_redir='>'; }
@@ -67 +67 @@
 ##---------------------------------------------------
 echo
-if [ -t 0 ]; then cat banner.txt; else cat banner.html; fi
+if [ -t 0 ]; then cat ./inc/banner.txt; else cat ./inc/banner.html; fi
 echo
 echo '****************************************************************************************************'
@@ -76 +76 @@
 echo '****************************************************************************************************'
 echo
-echo '  - Testing configuration   '${TRUS_CONF}' based on '${TRUS_REFE}
-echo '  - SVN working copy        '${TRUS_WORK}/${TRUS_BRAN}
-echo '  - Benchmark folder        '${TRUS_BHMK}
-echo '  - (Super)Computer         '${TRUS_HPCC}
-echo '  - User installation       '${TRUS_USER}
-echo
+printf "\t§ Testing configuration\t\t%s based on %s\n" ${TRUS_CONF} ${TRUS_REFE}
+printf "\t§ SVN working copy\t\t%s/%s\n"               ${TRUS_WORK} ${TRUS_BRAN}
+printf "\t§ Benchmark folder\t\t%s\n"               ${TRUS_STOR}
+printf "\t§ (Super)Computer\t\t%s\n"             ${TRUS_HPCC}
+printf "\t§ User installation\t\t%s\n\n"         ${TRUS_USER}
 
 
@@ -87 +86 @@
 ##---------------------------------------------------
 print_step 'Timestamped testing directory'
-mkdir -p ${TRUS_TEST} ${TRUS_BHMK}
-cd       ${TRUS_TEST}
-echo     ${TRUS_TEST}
+mkdir -p ${TRUS_SCRA} ${TRUS_STOR}
+cd       ${TRUS_SCRA}
+echo     ${TRUS_SCRA}
 init_files
 get_date
@@ -104 +103 @@
 print_step 'Get testing environement'
 get_soft_rel
-cat model.log
+cat model.log | awk '{printf "%-20s %s %s\n", $1, $2, $3}'
 env | sort > env.log
-#echo $WRAPPER_LDFLAGS
+
 
 ## XIOS compilation from scratch
@@ -135 +134 @@
 ##---------------------------------------------------
 print_step 'Set job (copying or extracting inputs)'
-cd ${TRUS_TEST}
+cd ${TRUS_SCRA}
+get_inputs
+[ $? -ne 0 ] && get_out 3 || echo 'Success'
 cp   ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/cpp_* .
 find ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/EXP00 -regex '.*\(_cfg\|.in\|opa\|_ref\|.xml\)' \
                                             -exec  cp {} . \;
-get_inputs
-[ $? -ne 0 ] && get_out 3 || echo 'Success'
-[ $( find . -name '*.gz' -print -quit ) ] && find . -name '*.gz' -exec gunzip {} \;
 
 
@@ -153 +151 @@
 ##---------------------------------------------------
 print_step 'Submit job'
-JOB_ID=$( eval ${TRUS_JSUB} )
-[ $? -ne 0 ] && get_out 4 || echo 'Success (job ID '${JOB_ID}')'
+cp ${TRUS_DIRE}/batch/${TRUS_JSPT} ${TRUS_SCRA} ## Copy the submitting script to testing folder
+TRUS_JIDN=$( eval ${TRUS_JSUB} )
+[ $? -ne 0 ] && get_out 4 || printf "Success (job ID %s)\n" ${TRUS_JIDN}
 print_step 'Pending job'
 job_pending
@@ -163 +162 @@
 ##---------------------------------------------------
 print_step 'Test job state'
-[[ ! -e time.step || $( grep 'E R R O R' ocean.output ) ]] && get_out 5 || echo 'Success'
+[[ ! -e time.step || $( grep 'E R R O R' ocean.output ) ]] && get_out 5 || echo 'Success' ## Must be reviewed
 print_step 'Get job performances'
 get_time