Changeset 5545

Timestamp:

2015-07-03T18:42:48+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Bugfixe

Location:

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST

Files:

• config/X64_CURIE.cfg (modified) (1 diff)
• trusting_func.sh (modified) (2 diffs)

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/X64_CURIE.cfg

@@ -8 +8 @@
 
 # Job commands: ccc_*
-JOB_SUBM="ccc_msub ${NEMO_TRUS}/batch/${CFG_ARCH}.sh | awk '{print \$NF}'"
+JOB_SUBM="ccc_msub ${NEMO_TRUS}/batch/${CFG_ARCH}.sh | grep -oe '\<[0-9]*\>'"
 JOB_LIST=ccc_mpp
 JOB_INFO=ccc_macct
-JOB_TIME="awk 'END{print \$9}'"
-JOB_DELE=ccc_mdel                          
+JOB_TIME="ccc_macct \${JOB_ID} | awk '/opa/ {print \$9}'"
+JOB_DELE=ccc_mdel
 
 # Compiling & computing settings

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

@@ -64 +64 @@
                  | awk '/records/ {print $1}'                           )
 
-      if [ ${nc_diff} -ne 0 ]; then
+      if [[ ! -z ${nc_diff} && ${nc_diff} -ne 0 ]]; then
           export ST='FAILED'
           printf "$CDO ${nc_diff}\n"
@@ -197 +197 @@
 
     if [ "$ST" == 'FAILED' ]; then
-   if [ ! -e mesg_09_inputs_${CFG_USER}_${CFG_ARCH}.txt ]; then
-       printf "Input files\n\n"   > mesg_09_inputs_${CFG_USER}_${CFG_ARCH}.txt
-   fi
-
-   if [ ! -e mesg_10_cputime_${CFG_USER}_${CFG_ARCH}.txt ]; then
-       printf "Real CPU time\n\n" > mesg_10_cputime_${CFG_USER}_${CFG_ARCH}.txt
-   fi
-
-   if [ ! -e mesg_11_comments_${CFG_USER}_${CFG_ARCH}.txt ]; then
-       printf "Comments\n\n"      > mesg_11_comments_${CFG_USER}_${CFG_ARCH}.txt
-   fi
+   file=mesg_09_inputs_${CFG_USER}_${CFG_ARCH}.txt
+   [ ! -e $file ] && printf "Input files\n\n"   > $file
+   file=mesg_10_cputime_${CFG_USER}_${CFG_ARCH}.txt
+   [ ! -e $file ] && printf "Real CPU time\n\n" > $file
+   file=mesg_11_comments_${CFG_USER}_${CFG_ARCH}.txt
+   [ ! -e $file ] && printf "Comments\n\n"      > $file
 
         # Error identification