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

Timestamp:

2015-06-24T15:12:16+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Ping pong updates between Curie & Ada to finalize

File:

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

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

@@ -55 +55 @@
 #---------------------------------------------------
 print_step 'Get softwares release'
-. ${ARCH_ENV} > /dev/null
+[ -e ${ARCH_ENV} ] && . ${ARCH_ENV} > /dev/null
 get_soft_rel
 cat model.log
@@ -91 +91 @@
 #---------------------------------------------------
 print_step 'Submitting job'
-JOB_ID=$( ${JOB_SUBM} | awk '{print $NF}' )
+JOB_ID=$( eval ${JOB_SUBM} )
 [ $? -ne 0 ] && get_out $STATUS $STEP
 print_step 'Holding-Running job'
@@ -97 +97 @@
 print_step 'Job finished'
 
-# Eventual crash during computing
+# Job state
 #---------------------------------------------------
-print_step 'Test if job crashed'
+print_step 'Test job state'
 if   [[ ! -e ocean.output || $( grep 'E R R O R' ocean.output ) ]]; then
     comments 'E R R O R'
     get_out $STATUS $STEP
+else
+    # Get time computation
+    #---------------------------------------------------
+    print_step 'Get real CPU time'
+    get_cpu_time
 fi
 
@@ -110 +115 @@
 print_step 'Test ASCII output files diff'
 diff_textfiles
-if [ "$STATUS" == 'FAILED' ] && get_out $STATUS $STEP
+[ "$STATUS" == 'FAILED' ] && get_out $STATUS $STEP
 
 # Inspect output NetCDF files
@@ -116 +121 @@
 print_step 'Test last restart NetCDF files diff'
 diff_restart
-if [ "$STATUS" == 'FAILED' ] && get_out $STATUS $STEP
-
-# Get computation duration
-#---------------------------------------------------
-print_step 'Get real CPU time'
-get_cpu_time
+[ "$STATUS" == 'FAILED' ] && get_out $STATUS $STEP
 
 # Get comments (ocean.output & diff model.log)