Changeset 1204

Timestamp:

06/05/15 15:29:38 (9 years ago)

Author:

sdipsl

Message:

• Add an optional flag for the [Post] section of config.card : IgnoreNonMonotonic? See #259

Location:

trunk/libIGCM

Files:

• libIGCM_config/libIGCM_config.ksh (modified) (1 diff)
• libIGCM_debug/libIGCM_debug.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -154 +154 @@
   if ( [ X${config_Post_DodsCopy} = X${NULL_STR} ] || [ X${config_Post_DodsCopy} = X ] ) ; then
     config_Post_DodsCopy=TRUE
+  fi
+
+  #====================================================
+  # IgnoreNonMonotonic : apply default value if not defined
+  if ( [ X${config_Post_IgnoreNonMonotonic} = X${NULL_STR} ] || [ X${config_Post_IgnoreNonMonotonic} = X ] ) ; then
+    config_Post_IgnoreNonMonotonic=FALSE
   fi
 

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -202 +202 @@
       attachmentsOptions="-a ${metricsFile} ${attachmentsOptions}"
     done
+    IGCM_debug_Print 2 "IGCM_debug_sendAMQP_Metrics "
     echo ${encodedBody}|mailx -s "[TEMPORARY AMQP CHANNEL]" ${attachmentsOptions} ${mail_recipient}
   fi

trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

@@ -1446 +1446 @@
       IGCM_debug_Print 2 "IGCM_sys_ncrcat : ${i}/${NB_ESSAI} sleep ${DELAI} seconds and try again."
       sleep $DELAI
-    elif [ ! "X$( grep "WARNING Intra-file non-monotonicity" ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ )" = "X" ] ; then
+    elif ( [ ! "X$( grep "WARNING Intra-file non-monotonicity" ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ )" = "X" ] && [ X${config_Post_IgnoreNonMonotonic} = XFALSE ] ) ; then
       IGCM_debug_Print 2 "IGCM_sys_ncrcat : WARNING Intra-file non-monotonicity"
       cat ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$
       # remove files having corrupted time axis
       eval lastArg=\${$#}
+      IGCM_debug_Print 2 "Remove files having corrupted time axis"
       IGCM_debug_Print 2 "IGCM_sys_ncrcat : Delete ${lastArg}"
       \rm ${lastArg}