Changeset 757

Timestamp:

12/10/12 18:13:43 (12 years ago)

Author:

labetoulle

Message:

RunChecker? :

• Added the number of IGCM_sys_Put[Buffer]_Out to the output for rebuild and pack_* jobs to get a more precise idea of how things went ;
• Added the possibility to choose the path from a list when more than one is found ;
• Eclude IGCM_OUT/ (where part of the atlas and monitoring files are stored on Curie) from search path to save some time.

File:

• trunk/libIGCM/AA_RunChecker (modified) (8 diffs)

trunk/libIGCM/AA_RunChecker

@@ -51 +51 @@
     echo "${JobName} not in Catalog, we'll try to find it in ${SEARCH_DIR}"
 
-    set -A FileList $( find ${SEARCH_DIR}/ -name "Job_${JobName}" )
+    set -A FileList $( find ${SEARCH_DIR}/ \
+                            -path ${SEARCH_DIR}/IGCM_OUT -prune -o \
+                            -name Job_${JobName} -print )
     if [ X$FileList == X ] ; then
       NbOcc=0
@@ -57 +59 @@
       NbOcc=${#FileList[@]}
       fg_new=true
+    fi
+  fi
+
+  if [ ${NbOcc} -gt 1 ] ; then
+    echo "More than one job"
+    ind=0
+    while [ ${ind} -lt ${NbOcc} ] ; do
+      printf '%2i) %-30s\n' ${ind} ${FileList[${ind}]}
+      (( ind = ind + 1 ))
+    done
+    echo "Give your choice number or 'q' to quit : "
+    read Choice
+    if [ X${Choice} == Xq ] ; then
+      exit
+    else
+      fg_new=true
+      FileList=${FileList[${Choice}]}
+      NbOcc=1
     fi
   fi
@@ -87 +107 @@
       break ;;
     *)
-      echo "More than one job"
       break ;;
   esac
@@ -198 +217 @@
       eval Date=\${${JobType}_Date[${ind}]}
       eval Status=\${${JobType}_Status[${ind}]}
+      eval Nb=\${${JobType}_Nb[${ind}]}
 
       if [ X${Status} == XOK  ] ; then
@@ -204 +224 @@
         Color=${ColFat}
       fi
-      printf "     ${Color}%-8s${ColNon}     |" ${Date}
+      printf "  ${Color}%-8s${ColNon} : %3i  |" ${Date} ${Nb}
     done
 
@@ -312 +332 @@
 done
 
+
 if ( ( ! $fg_path ) && [ $# -lt 1 ] ) ; then
   $0 -h
@@ -506 +527 @@
       eval ${JobType}_Date[$ind]=${LastDate}
       eval ${JobType}_Status[$ind]=${Status}
+      eval ${JobType}_Nb[$ind]=$( grep -c ^${String} ${POST_DIR}/${JobType}.${LastDate}.out )
       
       (( ind = ind + 1 ))
@@ -526 +548 @@
     set -A FileList $( ls ${CWORK_DIR}/ATLAS | tail -n ${NbHisto} )
 
-    if [ ${#FileList[*]} -gt ${NbLines}=0 ] ; then
+    if [ ${#FileList[*]} -gt ${NbLines} ] ; then
       NbLines=${#FileList[*]}
     fi