Changeset 760

Timestamp:

12/12/12 19:03:06 (12 years ago)

Author:

labetoulle

Message:

RunChecker? :

• Bugfix in error detection for post-treatment jobs ;
• Cosmetic change in IGCM_config_CommonConfiguration to avoid blank lines in output.

Location:

trunk/libIGCM

Files:

• AA_RunChecker (modified) (3 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (5 diffs)

trunk/libIGCM/AA_RunChecker

@@ -365 +365 @@
 fi
 
-echo "TargetUsr = ${TargetUsr}"
-echo "HostName = ${HostName}"
+echo "Target user = ${TargetUsr}"
 
 TargetGrp=$( groups $TargetUsr | awk '{print $3}' )
@@ -515 +514 @@
       LastDate=$( basename ${FileName} | awk -F"." '{ print $(NF-1) }' )
 
-      dum=$( basename $( grep ^${String} ${POST_DIR}/${JobType}.${LastDate}.out | \
-               tail -1 | awk -v Field=${Field} '{ print $( Field ) }' ) | \
-               awk -F"_" '{ print $3 }' )
-
-      if [[ X${dum} == X${LastDate} ]] ; then
+      Error=$( awk -v String=${String} \
+                   'BEGIN { x=0 } ($1~String) && ($3~"error.") { x=x+1 } END { print x }' \
+                   ${POST_DIR}/${JobType}.${LastDate}.out )
+
+      Match=$( awk -v String=${String} \
+                   'BEGIN { x=0 } ($1~String) && ($3!~"error.") { x=x+1 } END { print x }' \
+                   ${POST_DIR}/${JobType}.${LastDate}.out )
+      (( Nb = ${Match} - ${Error} ))
+
+      if ( [ ${Error} -eq 0 ] && [ ${Nb} -gt 0 ] ) ; then
         Status=OK
       else
@@ -527 +531 @@
       eval ${JobType}_Date[$ind]=${LastDate}
       eval ${JobType}_Status[$ind]=${Status}
-      eval ${JobType}_Nb[$ind]=$( grep -c ^${String} ${POST_DIR}/${JobType}.${LastDate}.out )
+      eval ${JobType}_Nb[$ind]=${Nb}
       
       (( ind = ind + 1 ))

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -18 +18 @@
 
   # Debug Print :
-  echo
+  [ Verbosity -gt 0 ] && echo
   IGCM_debug_Print 1 "IGCM_config_CommonConfiguration" $@
 
@@ -38 +38 @@
   #==================================
   # Read UserChoices section:
-  echo
+  [ Verbosity -gt 0 ] && echo
   IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices"
 
@@ -50 +50 @@
   #==================================
   # Read Ensemble section:
-  echo
+  [ Verbosity -gt 0 ] && echo
   IGCM_debug_Print 1 "DefineArrayFromOption  : config_Ensemble"
 
@@ -62 +62 @@
   #==================================
   # Read Post section:
-  echo
+  [ Verbosity -gt 0 ] && echo
   IGCM_debug_Print 1 "DefineArrayFromOption : config_Post"
 
@@ -71 +71 @@
     IGCM_debug_Print 3 "${option} : ${auxprint}"
   done
-  echo
+  [ Verbosity -gt 0 ] && echo
 
   #==================================