Changeset 819

Timestamp:

03/06/13 18:55:34 (11 years ago)

Author:

sdipsl

Message:

• Generalyze Cyclic functionnalities. DateBegin? can be before CyclicBegin?. JG.
• Example apply a 1979-2009 forcing cyclically from 1853 to 2009.

File:

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

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -411 +411 @@
   typeset i
 
-  # When Cyclic is active, the simulation MUST start with the same year as the CyclicBegin year.
-  if ( [ ! X${config_UserChoices_CyclicBegin} = X ] && [ ! X${config_UserChoices_CyclicEnd} = X ] ) ; then
-    IGCM_debug_Print 1 "Check coherence between CyclicBegin year and DateBegin year"
-    if [ ${InitYear} -ne ${config_UserChoices_CyclicBegin} ] ; then
-      IGCM_debug_Print 1 "The simulation MUST start with the same year as the CyclicBegin year"
-      IGCM_debug_Exit "Check your CyclicBegin option in config.card UserChoices section"
-    fi
-  fi
-
   # Check RebuildFrequency against key frequencies : PeriodLength ; PackFrequency ; TimeSeriesFrequency ; SeasonalFrequency
   if ( [ ! X${config_Post_RebuildFrequency} = X${NULL_STR} ] && [ ! X${config_Post_RebuildFrequency} = XNONE ] ) ; then
@@ -648 +639 @@
   # To use the variable CyclicYear, one must add in config.card CyclicBegin and CyclicEnd.
   # CyclicBegin is the first year in the cycle. CyclicEnd is the last year included in the cycle.
-  # The simulation MUST start with the same year as the CyclicBegin year.
   if ( [ ! X${config_UserChoices_CyclicBegin} = X ] && [ ! X${config_UserChoices_CyclicEnd} = X ] ) ; then
     CycleNb=$(( ${config_UserChoices_CyclicEnd} - ${config_UserChoices_CyclicBegin} + 1 ))
-    CyclicYear=$(( ( ( ${year} - ${config_UserChoices_CyclicBegin} ) % ${CycleNb} ) + ${config_UserChoices_CyclicBegin} ))
-    CyclicYear_p1=$(( ( ( ${year} + 1 - ${config_UserChoices_CyclicBegin} ) % ${CycleNb} ) + ${config_UserChoices_CyclicBegin} ))
+    CyclicYear_p1=NOTDEFINED
+
+    # For current year
+    yeartmp=$year
+    diffy=$(( $yeartmp - ${config_UserChoices_CyclicBegin} ))
+    while [ $diffy -lt 0 ] ; do
+      yeartmp=$(( ${yeartmp} + ${CycleNb} ))
+      diffy=$(( $yeartmp - ${config_UserChoices_CyclicBegin} ))
+    done
+    CyclicYear=$(( ( ${diffy} % ${CycleNb} ) + ${config_UserChoices_CyclicBegin} ))
+
+    # For next coming year
+    yeartmp=$(( $year + 1 ))
+    diffy=$(( $yeartmp - ${config_UserChoices_CyclicBegin} ))
+    while [ $diffy -lt 0 ] ; do
+      yeartmp=$(( ${yeartmp} + ${CycleNb} ))
+      diffy=$(( $yeartmp - ${config_UserChoices_CyclicBegin} ))
+    done
+    CyclicYear_p1=$(( ( ${diffy} % ${CycleNb} ) + ${config_UserChoices_CyclicBegin} ))
+
     IGCM_debug_Print 1 "CyclicYear   = ${CyclicYear}, CyclicYear_p1 = ${CyclicYear_p1}, current year=$year"
   else
     CyclicYear="ERROR_CyclicYear_Variable_Not_Defined"
     CyclicYear_p1="ERROR_CyclicYear_p1_Variable_Not_Defined"
-    IGCM_debug_Print 1 "CyclicYear not possible to use without adding CyclicBegin and CyclicEnd in config.card"
+    IGCM_debug_Print 1 "CyclicYear wont be use without adding CyclicBegin and CyclicEnd in config.card"
   fi