Changeset 1450 for trunk/libIGCM

Timestamp:

05/18/18 11:55:28 (6 years ago)

Author:

jgipsl

Message:

Correct error in SE_Checker : the date end was calculated wrong. It was always corresponding to the next coming period and therefor an error message was always done.

File:

• trunk/libIGCM/AA_SE_Checker (modified) (2 diffs)

trunk/libIGCM/AA_SE_Checker

@@ -36 +36 @@
 libIGCM=${libIGCM:=::modipsl::/libIGCM}
 
-# répertoire courrant
+# Current directory
 CURRENT_DIR=$( pwd )
 
-# Emplacement des cartes
+# Directory with comp.cards
 CARD_DIR=${CARD_DIR:=${CURRENT_DIR}}
 
-# répertoire de stockage des sorties des create_ts
+# Directory for script output
 POST_DIR=${POST_DIR:=${CARD_DIR}/OutScript}
 
@@ -109 +109 @@
 IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Post SeasonalFrequency
 
-#===================================#
-# Read updated run.card :
-IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card Configuration PeriodDateEnd
-
-#
+#===================================
+# Read DateBegin from config.card
 DateBegin=$( IGCM_date_ConvertFormatToGregorian ${config_UserChoices_DateBegin} )
-DateEnd=$( IGCM_date_ConvertFormatToGregorian ${run_Configuration_PeriodDateEnd} )
-
-#
+
+#===================================
+# Read end date from run.card or config.card
+if [ -f ${CARD_DIR}/run.card ] ; then
+   # Read updated run.card :
+   IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card Configuration PeriodDateBegin
+   IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card Configuration PeriodState
+
+  if [ X${run_Configuration_PeriodState} != X"Completed" ] ; then
+    # Calculate DateEnd by read PeriodDateBegin from run.card and remove one day  
+    DateEnd=$( IGCM_date_AddDaysToGregorianDate $( IGCM_date_ConvertFormatToGregorian ${run_Configuration_PeriodDateBegin} ) -1 )
+  else
+    # Simulation is finished, read DateEnd from config.card
+    DateEnd=$( IGCM_date_ConvertFormatToGregorian ${config_UserChoices_DateEnd} )
+  fi
+else
+  # No run.card available, read DateEnd from config.card
+  DateEnd=$( IGCM_date_ConvertFormatToGregorian ${config_UserChoices_DateEnd} )
+fi
+
+#===================================
+# Calculate offset
 if ( [ X${config_Post_SeasonalFrequencyOffset} = X${NULL_STR} ] || [ X${config_Post_SeasonalFrequencyOffset} = XNONE ] || [ X${config_Post_SeasonalFrequencyOffset} = X ] ) ; then
   PeriodOffset=0