Changeset 1604

Timestamp:

11/20/23 16:50:13 (7 months ago)

Author:

falletti

Message:

C-ESM-EP in libIGCM (for S. Senesi), changes for config.card options: Cesmep option doesn't accept <n>Y anymore ; New option CesmepSlicesDuration?

File:

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

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -232 +232 @@
        [ X${config_Post_Cesmep} = X ] || [ X${config_Post_Cesmep} = XFALSE ] ) ; then
     config_Post_Cesmep=FALSE
-  elif [ X${config_Post_Cesmep} = XTRUE ] || [[ X${config_Post_Cesmep} =~ X[1-9][0-9]?Y ]] ; then
-      if [[ X${config_Post_Cesmep} =~ X[1-9][0-9]?Y ]] ; then
-          CesmepPeriod=${config_Post_Cesmep%Y}
-      fi
+  elif [ X${config_Post_Cesmep} = XTRUE ]  ; then
       if ([ ! X${config_Post_SeasonalFrequency} = XNONE ] && [ ! X${config_Post_SeasonalFrequency} = X ] ) ; then
           config_Post_Cesmep="SE"
@@ -249 +246 @@
   #
   if [ X${config_Post_Cesmep} != XFALSE ] ; then
+      if ( [ X${config_Post_CesmepPeriod} != X${NULL_STR} ] && [ X${config_Post_CesmepPeriod} != X ] ) ; then
+          CesmepPeriod=${config_Post_CesmepPeriod%Y}
+      fi
       if [ X${config_Post_Cesmep} = XSE ] ; then
           if ([ X${config_Post_SeasonalFrequency} = XNONE ] || [ X${config_Post_SeasonalFrequency} = X ] ) ; then
@@ -268 +268 @@
           fi
       elif [ X${config_Post_Cesmep} != XAtEnd ] ; then
-          IGCM_debug_Exit "config.card's Post section's value for Cesmep (${config_Post_Cesmep}) is invalid; use SE, TS, Pack, AtEnd, TRUE or <n>Y"
+          IGCM_debug_Exit "config.card's Post section's value for Cesmep (${config_Post_Cesmep}) is invalid; use SE, TS, Pack, AtEnd or TRUE"
       else
           [ -z $CesmepPeriod ] && CesmepPeriod=0
@@ -290 +290 @@
       if ( [ X${config_Post_CesmepSlices} = XNONE ] || [ X${config_Post_CesmepSlices} = X ] ) ; then
           config_Post_CesmepSlices=8
+      fi
+      if ( [ X${config_Post_CesmepSlicesDuration} != X${NULL_STR} ] && [ X${config_Post_CesmepSlicesDuration} != X ] ) ; then
+          CesmepSlicesDuration=${config_Post_CesmepSlicesDuration%Y}
+      else
+          CesmepSlicesDuration=$CesmepPeriod
       fi
   fi