Changeset 236 for trunk/libIGCM/AA_create_ts

Timestamp:

03/01/10 16:59:54 (14 years ago)

Author:

sdipsl

Message:

• Slight modification in the way we read and interpret card for post-processing. Actual card will not work with this revision

List=(histmth.nc, ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmth.nc, Post_1M_histmth), \

(histday.nc, ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc, Post_1D_histday), \
(histhf.nc, ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf.nc, Post_HF_histhf)

• ChunckJob2D, ChunckJob3d have control over TS, with the folliwing keywords :

OFF (TimeSeries? not active), NONE (TimeSeries? active but without chunck), 10Y (TimeSeries? active, but produce as many as needed 10 years lenght time series)

• Seasonnal (ON/OFF), have control over SE files production.
• Patch can be applied systematicaly even if no Time Series or Seasonal post-proceesing are required
• A first step towards the merge between rebuildFromArchive and rebuildFrowWorkdir jobs
• We may change rebuildFromArchive job name as it is not that meaningful in this context
• We may change ChunckJob2D/ChunckJob3D as it is not that meaningful in this context
• Some bugfix and optimisation

• For testing purpose only (still try to have backward compatibility)

Exemple :

[Post_1D_histday]
Patches= (Patch_20091030_histcom_time_axis)
GatherWithInternal? = (lon, lat, presnivs, time_counter)
TimeSeriesVars2D = (bils, cldh, ...)
ChunckJob2D = 50Y
TimeSeriesVars3D = (temp, theta, ovap, ovapinit, geop, ...)
ChunckJob3D = OFF
Seasonal=OFF

File:

• trunk/libIGCM/AA_create_ts (modified) (3 diffs)

trunk/libIGCM/AA_create_ts

@@ -290 +290 @@
                 #
                 FILE=$( echo ${flag_post} | awk "-FPost_" '{print $2}' )
-                IGCM_card_DefineArrayFromOption ${card} Post_${FILE} TimeSeriesVars${Dimension}
+                IGCM_card_DefineArrayFromOption ${card}    Post_${FILE} TimeSeriesVars${Dimension}
+                IGCM_card_DefineVariableFromOption ${card} Post_${FILE} ChunckJob${Dimension}
                 #
+                # If TimeSeriesVars list is empty we skip
+                #
                 if [ $( eval echo \${${compname}_Post_${FILE}_TimeSeriesVars${Dimension}} ) = ${NULL_STR} ] ; then
                     #
                     IGCM_debug_Print 3 "Nothing to do for ${FILE} according to ${card}"
+                    IGCM_debug_Print 3 "TimeSeriesVars${Dimension} for ${FILE} is empty"
                     (( i=i+3 ))
                     continue
@@ -300 +304 @@
                 fi
                 #
-                # If we are not a Chunck type task, skip files/variables handled  by chunck task
+                # If files/variables has been switch off by ChunckJob${Dimension}=0 we skip
+                #
+                if [ X$( eval echo \${${compname}_Post_${FILE}_ChunckJob${Dimension}} ) = X0 ] ; then
+                    IGCM_debug_Print 3 "Nothing to do for ${FILE} according to ${card}"
+                    IGCM_debug_Print 3 "ChunckJob${Dimension}=0 for ${FILE} so it has been switched off"
+                    (( i=i+3 ))
+                    continue
+                fi
+                #
+                # If we are not a Chunck type task, we skip files/variables handled by chunck task
                 #
                 if ( [ ! X${TsTask} = XChunck${Dimension} ] && [ ! X${TsTask} = X ] && [ ! XChunck${Dimension} = XChunck ] ) ; then
-                    IGCM_card_DefineVariableFromOption ${card} Post_${FILE} ChunckJob${Dimension}
                     if [ ! $( eval echo \${${compname}_Post_${FILE}_ChunckJob${Dimension}} ) = NONE ] ; then
                         IGCM_debug_Print 3 "Nothing to do for ${FILE} TimeSeriesVars${Dimension} according to ${card}"
@@ -311 +323 @@
                     fi
                 fi
+                #
+                # Now on we know we have things to do
+                #
+
                 #
                 #  We need coordinates axis to properly fill produced time series