Changeset 239

Timestamp:

03/02/10 18:40:37 (14 years ago)

Author:

sdipsl

Message:

• Hopefully the last step towards backward compatibilty

Location:

trunk/libIGCM

Files:

• AA_create_se (modified) (1 diff)
• libIGCM_comp/libIGCM_comp.ksh (modified) (2 diffs)
• libIGCM_post/libIGCM_post.ksh (modified) (2 diffs)

trunk/libIGCM/AA_create_se

@@ -244 +244 @@
                 # Check if seasonal is required for this file
                 #
-                IGCM_card_DefineArrayFromOption ${card} ${flag_post} Seasonal
-                #
-                # If option is not found (old cards) put SEASONAL ON by default
-                #
-                if [ "$( eval echo \${${compname}_${flag_post}_Seasonal[*]} )" = "Option not found ${flag_post}" ] ; then
+                IGCM_card_DefineArrayFromSection ${card} ${flag_post}
+                #
+                # Seasonal case : If option Seasonal is not found (old cards) put SEASONAL ON by default
+                #
+                # variable option allready typeset above
+                for option in $( eval echo \${${compname}_${flag_post}[*]} ) ; do
+                    if [ ${option} = Seasonal ] ; then
+                        FoundSeasonal=true
+                        IGCM_card_DefineVariableFromOption ${card} ${flag_post} Seasonal
+                    fi
+                done
+                #
+                if [ ! X${FoundSeasonal} = Xtrue ] ; then
                     eval ${compname}_${flag_post}_Seasonal=ON
                 fi

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -117 +117 @@
                 #
                 if [ X${flag_post} != XNONE ] ; then
+                    #
+                    # First of all
+                    #
+                    IGCM_card_DefineArrayFromSection ${card} ${flag_post}
+                    #
+                    # Seasonal case : If option Seasonal is not found (old cards) put SEASONAL ON by default
+                    #
+                    # variable option allready typeset above
+                    for option in $( eval echo \${${compname}_${flag_post}[*]} ) ; do
+                        if [ ${option} = Seasonal ] ; then
+                            FoundSeasonal=true
+                            IGCM_card_DefineVariableFromOption ${card} ${flag_post} Seasonal
+                        fi
+                    done
+                    #
+                    if [ ! X${FoundSeasonal} = Xtrue ] ; then
+                        eval ${compname}_${flag_post}_Seasonal=ON
+                    fi
+                    #
+                    if [ $( eval echo \${${compname}_${flag_post}_Seasonal} ) = ON ] ; then
+                        Seasonal=true
+                    fi
+                    
                     # Dimension = vide si vieille card.
                     IGCM_card_DefineArrayFromOption ${card} ${flag_post} TimeSeriesVars
@@ -162 +185 @@
                         TimeSeriesChunck2D=false
                         TimeSeriesChunck3D=false
-                    fi
-                    # Seasonal case
-                    IGCM_card_DefineArrayFromOption ${card} ${flag_post} Seasonal
-                    #
-                    # If option is not found (old cards) put SEASONAL ON by default
-                    #
-                    if [ "$( eval echo \${${compname}_${flag_post}_Seasonal[*]} )" = "Option not found ${flag_post}" ] ; then
-                        eval ${compname}_${flag_post}_Seasonal=ON
-                    fi
-                    #
-                    if [ $( eval echo \${${compname}_${flag_post}_Seasonal} ) = ON ] ; then
-                        Seasonal=true
                     fi
                 fi

trunk/libIGCM/libIGCM_post/libIGCM_post.ksh

@@ -164 +164 @@
 
     typeset POST NbDays PeriodEndJul PostEndJul LengthDays
+    #
+    # Initialize
+    #
     POST=false
+    TimeSeriesFrequency=false
+    SeasonalFrequency=false
     #
     # ONLY IF SOMETHING NEEDS TO BE DONE (EATHER TIME SERIES OR SEASONAL) COMPUTE THE MODULOS
@@ -180 +185 @@
     #
     for post_freq in ${list_post} ; do
-        #
-        # Initialize
-        #
-        eval ${post_freq}=false
         #
         # Extract frequency from previously defined variable