Changeset 835

Timestamp:

03/22/13 16:05:09 (11 years ago)

Author:

labetoulle

Message:

Runchecker : add rsh access for monitoring files on Ada. See #128.

Location:

trunk/libIGCM

Files:

• AA_RunChecker (modified) (9 diffs)
• libIGCM_sys/libIGCM_sys_ada.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_curie.ksh (modified) (1 diff)

trunk/libIGCM/AA_RunChecker

@@ -41 +41 @@
   fi
 
-  if ( [ ${NbOcc} -eq 0 ] && ( $fg_path ) ) ; then
+  if ( [ ${NbOcc} -eq 0 ] && ( ${fg_path} ) ) ; then
     set -A FileList $( ls ${ConfigPath}/Job_* )
     if [ X$FileList == X ] ; then
@@ -114 +114 @@
         exit
       fi
-      break ;;
+      ;;
     *)
       break ;;
@@ -184 +184 @@
       Fatal)
         Color=${ColFat}
-        break ;;
+        ;;
       Completed)
         Color=${ColCpl}
-        break ;;
+        ;;
       Waiting|OnQueue)
         Color=${ColAtt}
-        break ;;
+        ;;
       *)
         Color=${ColDef}
-        break ;;
+        ;;
     esac
     printf "${Color}%-11s${ColNon} | " $PeriodState
@@ -273 +273 @@
 #======================================================================#
 
-#D- Task type (computing ,post-processing or checking)
+#D- Task type (computing, post-processing or checking)
 TaskType=checking
 typeset -i Verbosity=0
@@ -340 +340 @@
 
 
-if ( ( ! $fg_path ) && [ $# -lt 1 ] ) ; then
+if ( ( ! ${fg_path} ) && [ $# -lt 1 ] ) ; then
   $0 -h
   exit
@@ -356 +356 @@
 
 DEBUG_debug=false
+DEBUG_sys=false
 
 . ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh
@@ -392 +393 @@
 
   echo "Submit:  >${SUBMIT_DIR}<"
-  cd $SUBMIT_DIR
+  IGCM_sys_Cd $SUBMIT_DIR
 
 
@@ -589 +590 @@
     # ==========================
     JobType=monitoring
-    if [ -d ${CWORK_DIR}/MONITORING ] ; then
-      LastDate=$( cdo showyear ${CWORK_DIR}/MONITORING/files/ATM_bils_global_ave.nc 2> /dev/null | \
-                      gawk '{ print $NF }' )
+    IGCM_sys_TestDirArchive ${CWORK_DIR}/MONITORING
+    RC=$?
+    if [ $RC == 0 ] ; then
+      FileTmp=$( IGCM_sys_RshArchive "ls ${CWORK_DIR}/MONITORING/files/*.nc | head -n 1" )
+      IGCM_sys_GetDate_Monitoring ${FileTmp} LastDate
       eval ${JobType}_Date=${LastDate}
     fi
@@ -598 +601 @@
     # =====================
     JobType=atlas
-    if [ -d ${CWORK_DIR}/ATLAS ] ; then
-      set -A FileList $( ls ${CWORK_DIR}/ATLAS | tail -n ${NbHisto} )
+    IGCM_sys_TestDirArchive ${CWORK_DIR}/ATLAS
+    RC=$?
+    if [ $RC == 0 ] ; then
+      set -A FileList $( IGCM_sys_RshArchive "ls ${CWORK_DIR}/ATLAS | tail -n ${NbHisto}" )
 
       if [ ${#FileList[*]} -gt ${NbLines} ] ; then

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -1544 +1544 @@
 
 #D-#==================================================
+#D-function IGCM_sys_GetDate_Monitoring
+#D-* Purpose: get the last year for which the monitoring has been computed
+#D-* Examples:
+#D-
+function IGCM_sys_GetDate_Monitoring {
+#set -vx
+  IGCM_debug_PushStack "IGCM_sys_GetDate_Monitoring" $@
+  if ( $DEBUG_sys ) ; then
+    echo "IGCM_sys_GetDate_Monitoring :" $@
+  fi
+
+  IGCM_sys_Cd /tmp
+  IGCM_sys_Get ${1} .
+  eval ${2}=$( cdo showyear $( basename ${1} ) 2> /dev/null | gawk '{ print $NF }' )
+  IGCM_sys_Cd -
+
+#set +vx
+  IGCM_debug_PopStack "IGCM_sys_GetDate_Monitoring"
+}
+
+#D-#==================================================
 #D-function IGCM_sys_Put_Dods
 #D-* Purpose: Put $(ARCHIVE) files on DODS internet protocole.

trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

@@ -1694 +1694 @@
 
 #D-#==================================================
+#D-function IGCM_sys_GetDate_Monitoring
+#D-* Purpose: get the last year for which the monitoring has been computed
+#D-* Examples:
+#D-
+function IGCM_sys_GetDate_Monitoring {
+  IGCM_debug_PushStack "IGCM_sys_GetDate_Monitoring" $@
+  if ( $DEBUG_sys ) ; then
+    echo "IGCM_sys_GetDate_Monitoring :" $@
+  fi
+
+  eval ${2}=$( cdo showyear ${1} 2> /dev/null | gawk '{ print $NF }' )
+
+  IGCM_debug_PopStack "IGCM_sys_GetDate_Monitoring"
+}
+
+#D-#==================================================
 #D-function IGCM_sys_Dods_Rm
 #D-* Purpose: DO NOTHING ! Put ${ARCHIVE} files on DODS internet protocole.