Changeset 340 for trunk

Timestamp:

09/02/10 16:00:19 (14 years ago)

Author:

mafoipsl

Message:

Improve !TimeSeries_Checker to use CompletedFlag? based on PostProcessing TimeSeriesCompleted variable set into run.card.

File:

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

trunk/libIGCM/AA_TimeSeries_Checker

@@ -171 +171 @@
     IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card Configuration OldPrefix
     IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card Configuration PeriodState
+    IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card PostProcessing TimeSeriesCompleted
     IGCM_debug_PrintVariables 3 run_Configuration_OldPrefix
     IGCM_debug_PrintVariables 3 run_Configuration_PeriodState
+    IGCM_debug_PrintVariables 3 run_PostProcessing_TimeSeriesCompleted
     if [ X${run_Configuration_PeriodState} != X"Completed" ] ; then
         DateEnd=$( IGCM_date_ConvertFormatToGregorian $( echo ${run_Configuration_OldPrefix} | awk -F'_' '{print $2}' ) )
@@ -178 +180 @@
         DateEnd=$( IGCM_date_ConvertFormatToGregorian ${config_UserChoices_DateEnd} )
     fi
+    CompletedFlag=${run_PostProcessing_TimeSeriesCompleted}
 else
     DateEnd=$( IGCM_date_ConvertFormatToGregorian ${config_UserChoices_DateEnd} )
+    CompletedFlag=""
 fi
+SavedCompletedFlag=${CompletedFlag}
 
 echo
@@ -186 +191 @@
 IGCM_date_GetYearMonth ${DateEnd}   YearEnd   MonthEnd
 echo "YearEnd MonthEnd for TimeSeries_Checker : " ${YearEnd} ${MonthEnd}
+echo "CompletedFlag = " ${CompletedFlag}
 echo
+
 
 #set -vx
@@ -359 +366 @@
                             echo
                             if ( [ ${chunck} = true ] && [ ${SuccessRate} -ne 100 ] ) ; then
+                                ChunckCompletedFlag=""
+                                CompletedFlag=${SavedCompletedFlag}
+                                ( [ ${CompletedFlag} -gt ${ChunckDebut} ] && [ ${CompletedFlag} -le ${ChunckFin} ] ) && ChunckCompletedFlag=${CompletedFlag}
                                 IGCM_debug_Print 2 -e "\033[1;31mSubmit ${FILE} chunck ${Dimension}\033[m period ${ChunckDebut}-${ChunckFin}"
-                                listVarEnv="libIGCM,SUBMIT_DIR,POST_DIR,DateBegin,PeriodDateEnd,TsTask,CompToRead,FlagToRead"
+                                listVarEnv="libIGCM,SUBMIT_DIR,POST_DIR,DateBegin,PeriodDateEnd,CompletedFlag,TsTask,CompToRead,FlagToRead"
                                 export libIGCM=${libIGCM}
                                 export SUBMIT_DIR=${CARD_DIR}
@@ -366 +376 @@
                                 export DateBegin=${ChunckDebut}
                                 export PeriodDateEnd=${ChunckFin}
+                                export CompletedFlag=${ChunckCompletedFlag}
                                 export TsTask=Chunck${Dimension}
                                 export CompToRead=${comp}
@@ -411 +422 @@
 DateBegin=$( IGCM_date_ConvertFormatToGregorian ${config_UserChoices_DateBegin} )
 IGCM_date_GetYearMonth ${DateBegin} YearBegin MonthBegin
+CompletedFlag=${SavedCompletedFlag}
 
 if [ X${Launch2D} = Xtrue ] ; then
     IGCM_debug_Print 2 -e "\033[1;31mSubmit 2D\033[m without chunck period ${DateBegin}-${DateEnd}"
-    listVarEnv="libIGCM,SUBMIT_DIR,POST_DIR,DateBegin,PeriodDateEnd,TsTask"
+    listVarEnv="libIGCM,SUBMIT_DIR,POST_DIR,DateBegin,PeriodDateEnd,CompletedFlag,TsTask"
     export libIGCM=${libIGCM}
     export SUBMIT_DIR=${CARD_DIR}
@@ -420 +432 @@
     export DateBegin=${DateBegin}
     export PeriodDateEnd=${DateEnd}
+    export CompletedFlag=${CompletedFlag}
     export TsTask=2D
     export listVarEnv=${listVarEnv}
@@ -430 +443 @@
 if [ X${Launch3D} = Xtrue ] ; then
     IGCM_debug_Print 2 -e "\033[1;31mSubmit 3D\033[m without chunck period ${DateBegin}-${DateEnd}"
-    listVarEnv="libIGCM,SUBMIT_DIR,POST_DIR,DateBegin,PeriodDateEnd,TsTask"
+    listVarEnv="libIGCM,SUBMIT_DIR,POST_DIR,DateBegin,PeriodDateEnd,CompletedFlag,TsTask"
     export libIGCM=${libIGCM}
     export SUBMIT_DIR=${CARD_DIR}
@@ -436 +449 @@
     export DateBegin=${DateBegin}
     export PeriodDateEnd=${DateEnd}
+    export CompletedFlag=${CompletedFlag}
     export TsTask=3D
     export listVarEnv=${listVarEnv}