Changeset 362 for trunk/libIGCM/AA_TimeSeries_Checker

Timestamp:

10/04/10 17:35:24 (14 years ago)

Author:

sdipsl

Message:

• Correct checker behavior regarding time series that are set to OFF
• Some cosmetics

File:

• trunk/libIGCM/AA_TimeSeries_Checker (modified) (7 diffs)

trunk/libIGCM/AA_TimeSeries_Checker

@@ -129 +129 @@
 
 # Name of this job
-JobName=${JobName:=HISTORC2}
+JobName=${JobName:=v2.historical1}
 
 # répertoire courrant
@@ -154 +154 @@
 
 ########################################################################
+
+#set -vx
 
 # First of all
@@ -163 +165 @@
 
 echo
-IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices"
+IGCM_debug_Print 1 "DefineVariableFromOption  : config_UserChoices"
 IGCM_debug_PrintVariables 3 config_UserChoices_JobName
 #IGCM_debug_PrintVariables 3 config_UserChoices_SpaceName
@@ -175 +177 @@
     IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card Configuration PeriodState
     IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card PostProcessing TimeSeriesCompleted
+    IGCM_debug_Print 1 "DefineVariableFromOption  : run_Configuration"
     IGCM_debug_PrintVariables 3 run_Configuration_OldPrefix
     IGCM_debug_PrintVariables 3 run_Configuration_PeriodState
+    IGCM_debug_Print 1 "DefineVariableFromOption  : run_PostProcessing"
     IGCM_debug_PrintVariables 3 run_PostProcessing_TimeSeriesCompleted
     if [ X${run_Configuration_PeriodState} != X"Completed" ] ; then
@@ -189 +193 @@
 fi
 SavedCompletedFlag=${CompletedFlag}
+DateBegin=$( IGCM_date_ConvertFormatToGregorian ${config_UserChoices_DateBegin} )
+
+IGCM_date_GetYearMonth ${DateBegin} YearBegin MonthBegin
+IGCM_date_GetYearMonth ${DateEnd}   YearEnd   MonthEnd
 
 echo
-echo "DateEnd for TimeSeries_Checker : " ${DateEnd}
-IGCM_date_GetYearMonth ${DateEnd}   YearEnd   MonthEnd
-echo "YearEnd MonthEnd for TimeSeries_Checker : " ${YearEnd} ${MonthEnd}
-echo "CompletedFlag = " ${CompletedFlag}
+IGCM_debug_Print 1 "DateBegin for TimeSeries_Checker : "${DateBegin}
+IGCM_debug_Print 1 "DateEnd   for TimeSeries_Checker : "${DateEnd}
+IGCM_debug_Print 1 "YearBegin MonthBegin for TimeSeries_Checker : ${YearBegin} ${MonthBegin}"
+IGCM_debug_Print 1 "YearEnd   MonthEnd   for TimeSeries_Checker : ${YearEnd} ${MonthEnd}"
+IGCM_debug_Print 1 "CompletedFlag = "${CompletedFlag}
 echo
-
-
-#set -vx
 
 #====================================================
@@ -288 +294 @@
                         fi
                         (( j=j+1 ))
-
+                        #
+                        # If TimeSeriesVars list is empty or OFF we skip
+                        #
+                        if ( [ $( eval echo \${${compname}_${flag_post}_TimeSeriesVars${Dimension}} ) = ${NULL_STR} ] || \
+                            [ ${chunck_size} = OFF ] ) ; then
+                            #IGCM_debug_Print 2 "Empty TS : ${compname}_Post_${FILE}_TimeSeriesVars${Dimension}"
+                            #(( i=i+3 ))
+                            continue
+                        fi
                         #
                         #  ICI ON TESTE QUE LES FICHIERS TS SONT LA!
@@ -305 +319 @@
                            INS) TS_Dir=TS_INS ;;
                         esac
-
-                        #
-                        # If TimeSeriesVars list is empty we skip
-                        #
-                        if [ $( eval echo \${${compname}_Post_${FILE}_TimeSeriesVars${Dimension}} ) = ${NULL_STR} ] ; then
-                            #IGCM_debug_Print 2 "Empty TS : ${compname}_Post_${FILE}_TimeSeriesVars${Dimension}"
-                            #(( i=i+3 ))
-                            continue
-                        fi
                         #
                         # We need LIST of variables not allready produced (useful for standalone mode)