Changeset 181

Timestamp:

10/01/09 10:53:03 (15 years ago)

Author:

mmaipsl

Message:

MM: Add adaptable monitoring for each experience/component in new POST directory in SUBMIT_DIR.

POST directory is optionnal.
If there is a monitoring_${compname}.cfg file (with no RESOL postfix) inside, it will be choosed
by default.
If POST is not found, monitoring for component is searched in standard "atlas" directory (with
RESOL parameter).

File:

• trunk/libIGCM/AA_monitoring (modified) (1 diff)

trunk/libIGCM/AA_monitoring

@@ -136 +136 @@
     IGCM_card_DefineArrayFromOption ${CARD_DIR}/config.card ListOfComponents ${comp}
     eval compname=\${config_ListOfComponents_${comp}[0]}                > /dev/null 2>&1
+
+    PATH_monitoring_file=""
     eval monitoring_file=monitoring01_${compname}_\${RESOL_${comp}}.cfg > /dev/null 2>&1
+    if [ -d ${CARD_DIR}/POST ] ; then
+        if [ -f  ${CARD_DIR}/POST/monitoring01_${compname}.cfg ] ; then
+            eval monitoring_file=monitoring01_${compname}.cfg > /dev/null 2>&1
+            PATH_monitoring_file=${CARD_DIR}/POST/${monitoring_file}
+        elif [ -f ${FER_ATLAS}/${monitoring_file} ] ; then
+            PATH_monitoring_file=${FER_ATLAS}/${monitoring_file}
+        fi
+    elif [ -f ${FER_ATLAS}/${monitoring_file} ] ; then
+        PATH_monitoring_file=${FER_ATLAS}/${monitoring_file}
+    else
+        IGCM_debug_Print 1 "WARNING. No MONITORING file found for component ${compname}."
+    fi
     #
-    if [ -f ${FER_ATLAS}/${monitoring_file} ] ; then
+    if [ X${PATH_monitoring_file} != X"" ] ; then
         IGCM_debug_Print 1 "Determine which files we need."
-        . monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive ls' ${FER_ATLAS}/${monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO
-        liste_file_monitoring=$( . monitoring01 -q -l2 --listcommand 'IGCM_sys_RshArchive ls' ${FER_ATLAS}/${monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO )
-    else
-        IGCM_debug_Print 1 "WARNING. This file does not exist : ${FER_ATLAS}/${monitoring_file}"
+        . monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO
+        liste_file_monitoring=$( . monitoring01 -q -l2 --listcommand 'IGCM_sys_RshArchive ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO )
     fi
     #
     if [ ! "X${liste_file_monitoring}" = X ] ; then
         IGCM_sys_Get /l liste_file_monitoring ${RUN_DIR}
-        monitoring01 -c ${CARD_DIR} -p ${comp} --time -t "${config_UserChoices_JobName} monitoring" -o ${RUN_DIR}/MONITORING ${FER_ATLAS}/${monitoring_file} .
+        monitoring01 -c ${CARD_DIR} -p ${comp} --time -t "${config_UserChoices_JobName} monitoring" -o ${RUN_DIR}/MONITORING ${PATH_monitoring_file} .
     else
         IGCM_debug_Print 1 "No time series detected by this command :"
-        IGCM_debug_Print 1 "monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive ls' ${FER_ATLAS}/${monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO"
-        . monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive ls' ${FER_ATLAS}/${monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO
+        IGCM_debug_Print 1 "monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO"
+        . monitoring01 -l2 --listcommand 'IGCM_sys_RshArchive ls' ${PATH_monitoring_file} ${R_SAVE}/${comp}/Analyse/TS_MO
     fi
     #