Changeset 901

Timestamp:

08/07/13 17:38:06 (11 years ago)

Author:

sdipsl

Message:

• can monitor other frequency not only what's in TS_MO. see #157

File:

• trunk/libIGCM/AA_monitoring (modified) (4 diffs)

trunk/libIGCM/AA_monitoring

@@ -145 +145 @@
 ######################################################################
 
-#set -vx 
+#set -vx
 
 #===========================================
@@ -193 +193 @@
 fi
 # --------------------------------------------
-# Insert your commands between III...III lines 
+# Insert your commands between III...III lines
 # and precise produced directories to save
 # IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
@@ -217 +217 @@
   if [ X${PATH_monitoring_file} != X"" ] ; then
     IGCM_debug_Print 1 "Monitoring file used : ${PATH_monitoring_file}"
+    IGCM_debug_Print 1 "Determine which frequency of time series to be used."
+
+    FreqTS=$( grep FreqTS ${PATH_monitoring_file} | grep -v \# | awk -F "=" '{print $2}' )
+    if [ X${FreqTS} = X ] ; then
+      # Default frequency is MO
+      FreqTS=MO
+    fi
+
+    IGCM_debug_Print 1 "Times series frequency to be used is ${FreqTS}"
     IGCM_debug_Print 1 "Determine which files we need."
-    . monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive_NoError ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO
-    liste_file_monitoring=$( . monitoring01 -q -l2 --listcommand 'IGCM_sys_RshArchive_NoError ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO )
+    . monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive_NoError ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_${FreqTS}
+    liste_file_monitoring=$( . monitoring01 -q -l2 --listcommand 'IGCM_sys_RshArchive_NoError ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_${FreqTS} )
   fi
   #
@@ -229 +238 @@
   else
     IGCM_debug_Print 1 "No time series detected by this command :"
-    IGCM_debug_Print 1 "monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive_NoError ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO"
-    . monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive_NoError ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO
+    IGCM_debug_Print 1 "monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive_NoError ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_${FreqTS}"
+    . monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive_NoError ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_${FreqTS}
   fi
   #