Changeset 892 for trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

Timestamp:

07/08/13 19:07:34 (11 years ago)

Author:

sdipsl

Message:

• check coherency between (PeriodDateBegin?, PeriodDateEnd?) and (DateBegin?, CumulPeriod?, PeriodLength?) and exit if not the case. see #79

File:

• trunk/libIGCM/libIGCM_config/libIGCM_config.ksh (modified) (3 diffs)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -405 +405 @@
   IGCM_debug_PushStack "IGCM_config_DateCoherency"
 
-  # If one of the following modulo is not zero :
-  # we will issue an error then explain and exit in
-  # AA_job IGCM_debug_Verif_Exit call before binary submission
-
   echo
   IGCM_debug_Print 1 "IGCM_config_DateCoherency"
@@ -430 +426 @@
     ;;
   esac
-  VerifiedPeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate ${DateBegin} ${Length} )
+  VerifiedPeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate ${DateBegin} ${Length}-1 )
+
+  if [ ${VerifiedPeriodDateEnd} != ${PeriodDateEnd} ] ; then
+    IGCM_debug_Print 1 "From run.card PeriodDateEnd is not consistent with DateBegin and CumulPeriod."
+    IGCM_debug_Print 1 "We have DateBegin = ${DateBegin}"
+    IGCM_debug_Print 1 "We have CumulPeriod = ${CumulPeriod}"
+    IGCM_debug_Print 1 "We have PeriodDateEnd = ${PeriodDateEnd}"
+    IGCM_debug_Print 1 "We have VerifiedPeriodDateEnd = ${VerifiedPeriodDateEnd}"
+    IGCM_debug_Print 1 "You must have change run.card in an inconsistent way."
+
+    IGCM_debug_Exit "STOP here to avoid further issues."
+  fi
 
   # PeriodDateBegin + PeriodLength = PeriodDateEnd
@@ -629 +636 @@
     fi
 
-    # 
+    # Determine number of day(s) in PeriodLength
     IGCM_date_GetYearMonthDay $PeriodDateBegin year month day
     IGCM_config_DaysInPeriodLength
+
+    # Check coherency between (PeriodDateBegin, PeriodDateEnd) and (DateBegin, CumulPeriod, PeriodLength)
+    IGCM_config_DateCoherency
+    # And EXIT if not OK
+    IGCM_debug_Verif_Exit
 
     IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodState "Running"