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

Timestamp:

2015-06-22T21:04:36+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE End of main script trusting.sh size reduction

File:

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

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

@@ -6 +6 @@
 NEMO_TRUS=$( pwd $( dirname $0 ) )
 DEBUG=0; PUBLISH=0
-STATUS='FAILED'; STEP=''# Only at end status will change to OK
+STATUS='FAILED'; STEP='' # Only at end status will change to OK
 
 # Get options for replacing some initials settings
@@ -13 +13 @@
     case $1 in
         -b|--branch ) NEMO_BRAN=$2         ; shift 2;; -d|--debug  ) set -vx; DEBUG=1     ; shift  ;;
-   -e|--email  ) MAIL=$2              ; shift 2;; -j|--job    ) NPROC=$2             ; shift 2;;
+   -e|--email  ) EMAIL=$2             ; shift 2;; -j|--job    ) NPROC=$2             ; shift 2;;
    -h|--help   ) cat trusting_help.txt; exit  1;; -m|--machine) CFG_ARCH=$2          ; shift 2;;
    -n|--newconf) TEST_CONF=$2         ; shift 2;; -r|--refconf) REFE_CONF=$2         ; shift 2;;
@@ -44 +44 @@
 mkdir -p ${TEST_DIR} ${REFE_DIR}
 echo ${TEST_DIR} && cd ${TEST_DIR}
-datestr1=$( LC_ALL=C date -d"${DATE_STR}" +%Y-%m-%dT%H:%M )
-printf "Date\n$datestr1\n" > mesg_01_date_${CFG_USER}_${CFG_ARCH}.txt
+date_str=$( date -ud ${DATESTR} +"%F %R %Z" )
+printf "Date\n${date_str}\n" > mesg_01_date_${CFG_USER}_${CFG_ARCH}.txt
 
 # SVN action on XIOS & NEMO essentials directories
@@ -57 +57 @@
 . ${ARCH_ENV} > /dev/null
 get_soft_rel
-cat arch_env.log
+cat model.log
 
 # XIOS compiling
@@ -79 +79 @@
 cd ${TEST_DIR}
 find ${NEMO_CONF}/${TEST_CONF}/EXP00 -regex '.*\(cfg\|opa\|ref\|xml\)' -exec cp {} . \;
-
-if [ ! -z "${FORC_TAR}" ]; then
-    cmd_iol="tar -tvf ${NEMO_FORC}/${FORC_TAR}"; cmd_iof="tar -vxf ${NEMO_FORC}/${FORC_TAR}"
-else
-    cmd_iol="ls ${NEMO_FORC}/*"                ; cmd_iof="\cp ${NEMO_FORC}/* ."
-fi
-
-${cmd_iol} > inputs_list.txt && ${cmd_iof} > /dev/null
+get_inputs
 [ $? -ne 0 ] && get_out $STATUS $STEP
-
 [ $( find . -name '*.gz' -print -quit ) ] && gunzip *.gz
 
 # Check input files in all cases
 #---------------------------------------------------
-print_step 'Difference between input files'
+print_step 'Difference with standard input files list'
 diff_inputs
 
@@ -101 +93 @@
 JOB_ID=$( ${JOB_SUBM} | awk '{print $NF}' )
 [ $? -ne 0 ] && get_out $STATUS $STEP
-
-print_step 'Pending/Running job'
-time_elapsed=0; time_increment=30
-sleep ${time_increment}
-while [[ $( ${JOB_LIST} | grep ${JOB_ID} ) && ${time_elapsed} -lt ${TIME_LIMI} ]]; do
-    printf "\n####################################################" >> computation.log
-    ${JOB_VIEW} ${JOB_ID}                                           >> computation.log
-    sleep ${time_increment}
-    let time_elapsed+=${time_increment}
-done
-sleep ${time_increment}
-
-if [ ${time_elapsed} -eq ${TIME_LIMI} ]; then
-    print_step 'Killing job'
-    ${JOB_DELE} ${JOB_ID} &> /dev/null
-    get_out $STATUS 'Job timeout'
-fi
+print_step 'Holding-Running job'
+job_pending
 print_step 'Job finished'
 
@@ -128 +105 @@
 fi
 
-STATUS='OK'
 # Inspect output text files
 #---------------------------------------------------
 print_step 'Test ASCII output files diff'
-for file in ocean.output solver.stat tracer.stat; do
-    diff $file ${REFE_DIR}/$file
-    [ $? -ne 0 ] && get_out 'FAILED' 'ASCII output file diff'
-done
+diff_textfiles
 
 # Inspect output NetCDF files
@@ -141 +114 @@
 print_step 'Test last restart NetCDF files diff'
 diff_restart
-[ $? -ne 0 ] && get_out 'FAILED' "$CDO diff failed"
 
 # Get computation duration
@@ -148 +120 @@
 get_cpu_time
 
-# Get comments (ocean.output & diff arch_env.log)
+# Get comments (ocean.output & diff model.log)
 #---------------------------------------------------
 comments 'W A R N I N G'