Changeset 236 for trunk/libIGCM/AA_create_se

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_se (modified) (1 diff)

trunk/libIGCM/AA_create_se

@@ -230 +230 @@
     if [ X${FileName0} != X${NULL_STR} ] ; then
         #
-        #IGCM_debug_Print 1 "Component      : ${compname}"
-        #
         # INITIALISATION
         #
         eval NbFiles=\${#${ListFilesName}[@]} > /dev/null 2>&1
-        typeset i=0
+        typeset i=2
         #
         until [ $i -eq $NbFiles ]; do
             #
-            eval file_in_=\${${ListFilesName}[$i]} > /dev/null 2>&1
-            eval file_in=${file_in_}
-            let $(( i_ = i+2 ))
-            eval flag_post_=\${${ListFilesName}[$i_]} > /dev/null 2>&1
+            eval flag_post_=\${${ListFilesName}[$i]} > /dev/null 2>&1
             eval flag_post=${flag_post_}
             #
             if [ X${flag_post} != XNONE ] ; then
                 #
-                # Initialize ${flag_post}_${compname}_${post_freq}
+                # Check if seasonal is required for this file
                 #
-                eval export ${flag_post}_${compname}_SeasonalFrequency=true
+                IGCM_card_DefineArrayFromOption ${card} ${flag_post} Seasonal
+                #
+                if [ ! X$( eval echo \${${compname}_${flag_post}_Seasonal} ) = XON ] ; then
+                    continue
+                fi
+                #
+                # CREATE LIST
+                #
+                FILE=$( echo ${flag_post} | awk "-FPost_" '{print $2}' )
+                #
+                DIRECTORY=${R_SAVE}/${comp}/Analyse/SE
+                #
+                TestedFile=${config_UserChoices_JobName}_SE_${an_deb}_${an_fin}_${FILE}.nc
+                #
+                IGCM_sys_TestFileArchive ${DIRECTORY}/${TestedFile}
+                if [ ! $? = 0 ] ; then
+                    eval set +A LISTE_FILE_${comp} \$\{LISTE_FILE_${comp}[*]} ${FILE}
+                    if [ ! ${RebuildFrequency} = true ] ; then
+                        IGCM_card_DefineArrayFromOption ${card} Post_${FILE} Patches
+                        eval set +A LISTE_PATCHES_${FILE} \$\{${compname}_Post_${FILE}_Patches[*]}
+                        if [ X$( eval echo \${LISTE_PATCHES_${FILE}[0]} ) !=  X${NULL_STR} ]; then
+                            for Patch in $( eval echo \${LISTE_PATCHES_${FILE}[*]} ); do
+                                if [ Xload${Patch} != X ] ; then
+                                    . ${libIGCM}/libIGCM_post/IGCM_${Patch}.ksh
+                                    eval load${Patch}=loaded
+                                fi
+                            done
+                        fi
+                    fi
+                fi
             fi
             let $(( i=i+3 ))
-        done
+        done # until [ $i -eq $NbFiles ]
     fi
-
-    for element in $( env | grep Post_ | grep ${compname}_SeasonalFrequency | grep -i "=true" ) ; do
-        #
-        FILE=$( echo ${element} | awk -F "_${compname}_SeasonalFrequency" '{print $1}' | awk "-FPost_" '{print $2}' )
-        #
-        # CREATE LIST
-        #
-        DIRECTORY=${R_SAVE}/${comp}/Analyse/SE
-        #
-        TestedFile=${config_UserChoices_JobName}_SE_${an_deb}_${an_fin}_${FILE}.nc
-        #
-        IGCM_sys_TestFileArchive ${DIRECTORY}/${TestedFile}
-        if [ ! $? = 0 ] ; then
-            eval set +A LISTE_FILE_${comp} \$\{LISTE_FILE_${comp}[*]} ${FILE}
-            if [ ! ${RebuildFrequency} = true ] ; then
-                IGCM_card_DefineArrayFromOption ${card} Post_${FILE} Patches
-                eval set +A LISTE_PATCHES_${FILE} \$\{${compname}_Post_${FILE}_Patches[*]}
-                if [ X$( eval echo \${LISTE_PATCHES_${FILE}[0]} ) !=  X${NULL_STR} ]; then
-                    for Patch in $( eval echo \${LISTE_PATCHES_${FILE}[*]} ); do
-                        if [ Xload${Patch} != X ] ; then
-                            . ${libIGCM}/libIGCM_post/IGCM_${Patch}.ksh
-                            eval load${Patch}=loaded
-                        fi
-                    done
-                fi
-            fi
-        fi
-             #
-    done     # for element
 done         # for comp