Changeset 251

Timestamp:

03/23/10 16:52:22 (14 years ago)

Author:

brocksce

Message:

Corrected and simplified conditional test to pass monitoring process
if monitoring file does not exist.

File:

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

trunk/libIGCM/AA_monitoring

@@ -154 +154 @@
     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
+    if [[ -d ${CARD_DIR}/POST && -f ${CARD_DIR}/POST/monitoring01_${compname}.cfg ]] ; then
+        PATH_monitoring_file=${CARD_DIR}/POST/${monitoring_file}
     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}."
+        IGCM_debug_Print 1 "No monitoring file found for this component. Was expecting ${monitoring_file}"
+        IGCM_debug_Print 1 "Step to next component"
+        continue
     fi
     #