Changeset 1561 for branches/libIGCM_CESMEP

Timestamp:

09/19/22 15:54:06 (19 months ago)

Author:

ssenesi

Message:

Cesmep : fix case AtEnd?

Location:

branches/libIGCM_CESMEP

Files:

• libIGCM_config/libIGCM_config.ksh (modified) (5 diffs)
• libIGCM_post/libIGCM_post.ksh (modified) (1 diff)

branches/libIGCM_CESMEP/libIGCM_config/libIGCM_config.ksh

@@ -180 +180 @@
     config_Post_MetricsPCMDI=FALSE
   fi
-
   #====================================================
   # Cesmep : apply default value FALSE if not defined, and if TRUE
@@ -199 +198 @@
       else
           # This covers case SpaceName=TEST with no SE nor TS (nor Pack)
-          config_Post_Cesmep="AtEnd"
+          config_Post_Cesmep=AtEnd
       fi
   fi
   #
-  if ([ X${config_Post_Cesmep} = XSE ]) ; then
+  if [ X${config_Post_Cesmep} = XSE ] ; then
       if ([ X${config_Post_SeasonalFrequency} = XNONE ] || [ X${config_Post_SeasonalFrequency} = X ] ) ; then
           IGCM_debug_Exit "Cannot use SE for Cesmep : SE post-processing is not active"
@@ -209 +208 @@
           [ -z $CesmepPeriod ] && CesmepPeriod=X${config_Post_SeasonalFrequency%Y}
       fi
-  elif ([ X${config_Post_Cesmep} = XTS ]) ; then
+  elif [ X${config_Post_Cesmep} = XTS ] ; then
       if ([ X${config_Post_TimeSeriesFrequency} = XNONE ] || [ X${config_Post_TimeSeriesFrequency} = X ] ) ; then
           IGCM_debug_Exit "Cannot use TS for Cesmep : TS post-processing is not active"
@@ -215 +214 @@
           [ -z $CesmepPeriod ] && CesmepPeriod=X${config_Post_TimeSeriesFrequency%Y}
       fi
-  elif ([ X${config_Post_Cesmep} = XPack ]) ; then
+  elif [ X${config_Post_Cesmep} = XPack ] ; then
       if ([ X${config_Post_PackFrequency} = XNONE ] || [ X${config_Post_PackFrequency} = X ] ) ; then
           IGCM_debug_Exit "Cannot use Packed output for Cesmep : Pack post-processing is not active"
@@ -221 +220 @@
           [ -z $CesmepPeriod ] && CesmepPeriod=X${config_Post_PackFrequency%Y}
       fi
-  elif ([ X${config_Post_Cesmep} != XAtend ]) ; then
-      IGCM_debug_Exit "config.card Post section value for Cesmep is invalid (use SE, TS, Pack, AtEnd or TRUE) : ${config_Post_Cesmep}"
+  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"
   else
-        CesmepPeriod=NONE
+        [ -z $CesmepPeriod ] && CesmepPeriod=0
   fi
 

branches/libIGCM_CESMEP/libIGCM_post/libIGCM_post.ksh

@@ -682 +682 @@
   fi
 
-  
   IGCM_debug_PopStack "IGCM_post_Submit"
 }