Changeset 392 for trunk/libIGCM

Timestamp:

12/03/10 15:10:18 (14 years ago)

Author:

sdipsl

Message:

Step 2/3 toward CompletedFlag? auto-detection, part of ticket #40.
Tests OK. For chunck2D and chunck3D time series.

This should close ticket #42

Location:

trunk/libIGCM

Files:

• AA_TimeSeries_Checker (modified) (7 diffs)
• AA_create_ts (modified) (2 diffs)

trunk/libIGCM/AA_TimeSeries_Checker

@@ -101 +101 @@
 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
@@ -262 +260 @@
                                 FoundCandidat=false
                                 if [ ! "X${Candidat}" = "X" ] ; then
-                                    FoundCandidat=true
-                                    for i in ${Candidat} ; do
-                                        IGCM_debug_Print 1 -e "\033[1;32m[CompletedFlag CANDIDAT MATCH FOUND]\033[m $( basename ${i} )"
-                                        CandidatEnd=$( echo ${i}   | awk -F${config_UserChoices_JobName} '{print $3}' | awk -F_ '{print $3}' )
+                                    for candid in ${Candidat} ; do
+                                        #IGCM_debug_Print 1 -e "\033[1;32m[CompletedFlag CANDIDAT MATCH FOUND]\033[m $( basename ${candid} )"
+                                        CandidatEnd=$( echo ${candid}   | awk -F${config_UserChoices_JobName} '{print $3}' | awk -F_ '{print $3}' )
                                         if [ ${CandidatEnd} -gt ${ChunckFin} ] ; then
-                                            IGCM_debug_Print 2 -e "File $( basename ${i} ) should be suppress"
-                                            set +A RemoveList ${RemoveList[*]} ${i}
+                                            #IGCM_debug_Print 3 -e "File $( basename ${candid} ) should be suppress"
+                                            set +A RemoveList ${RemoveList[*]} ${candid}
                                         elif [ ${CandidatEnd} -lt ${ChunckFin} ] ; then
-                                            IGCM_debug_Print 2 -e "File $( basename ${i} ) should be suppress or used as a CompletedFlag baseline"
+                                            #IGCM_debug_Print 3 -e "File $( basename ${candid} ) should be suppress or used as a CompletedFlag baseline"
                                             # We keep the best candidat and remove the others
-                                            if [ ${BestCandidat} -lt ${CandidatEnd} ] ; then 
+                                            if [ ${BestCandidat} -lt ${CandidatEnd} ] ; then
                                                 BestCandidat=${CandidatEnd}
+                                                FoundCandidat=true
                                             else
-                                                set +A RemoveList ${RemoveList[*]} ${i}
+                                                set +A RemoveList ${RemoveList[*]} ${candid}
                                             fi
                                         fi
@@ -289 +287 @@
                                     IGCM_debug_Print 3 ${DIRECTORY}/${TestedFile}
                                     # Then we keep a track of the Best Candidat
-                                    [ ${FoundCandidat} = true ] && set +A PotentialCompletedFlag ${PotentialCompletedFlag[*]} ${BestCandidat}
+                                    if [ ${FoundCandidat} = true ] ; then
+                                        if [ ${chunck} = true ] ; then
+                                            set +A PotentialCompletedFlag ${PotentialCompletedFlag[*]} ${BestCandidat}
+                                        else
+                                            eval set +A PotentialCompletedFlag${Dimension} \${PotentialCompletedFlag${Dimension}[*]} \${BestCandidat}
+                                        fi
+                                    fi
                                 else
                                     (( countGood = countGood + 1 ))
-                                    # Then we do not need the best candidat
+                                    # Then we do not need the best candidat if any
                                     [ ${FoundCandidat} = true ] && set +A RemoveList ${RemoveList[*]} ${config_UserChoices_JobName}_${ChunckDebut}_${BestCandidat}_${FlagDir}_${var}.nc
                                 fi
@@ -311 +315 @@
                                 #IGCM_sys_Rm ${RemoveList[*]}
                             fi
-
+                            #[ ${FoundCandidat} = true ] && IGCM_debug_Print 2 "Potentials CompletedFlag: ${PotentialCompletedFlag[*]}"
                             if ( [ ${chunck} = true ] && [ ${SuccessRate} -ne 100 ] ) ; then
-
                                 #
                                 # TO REWRITE BEGIN
                                 #
-                                ChunckCompletedFlag=""
-                                CompletedFlag=${SavedCompletedFlag}
-                                if [ X${CompletedFlag} != X ] ; then
-                                        ( [ ${CompletedFlag} -gt ${ChunckDebut} ] && [ ${CompletedFlag} -le ${ChunckFin} ] ) && ChunckCompletedFlag=${CompletedFlag}
+                                NbCandidats=${#PotentialCompletedFlag[@]}
+                                countCandid=1
+                                if [ ${NbCandidats} -eq 0 ] ; then
+                                    ChunckCompletedFlag=""
+                                    IGCM_debug_Print 2 -e "\033[1;31mNO CompletedFlag\033[m"
+                                elif [ ${NbCandidats} -eq 1 ] ; then
+                                    ChunckCompletedFlag=${PotentialCompletedFlag[0]}
+                                    IGCM_debug_Print 2 -e "\033[1;32mCompletedFlag=${ChunckCompletedFlag}\033[m"
+                                elif [ ${NbCandidats} -gt 1 ] ; then
+                                    k=1
+                                    until [ $k -ge ${NbCandidats} ]; do
+                                        ((k_m1=k-1))
+                                        if [ ${PotentialCompletedFlag[${k_m1}]} = ${PotentialCompletedFlag[${k}]} ] ; then
+                                            ((countCandid=countCandid+1))
+                                        fi
+                                        ((k=k+1))
+                                    done
+                                    if [ ${NbCandidats} -eq ${countCandid} ] ; then
+                                        ChunckCompletedFlag=${PotentialCompletedFlag[0]}
+                                        IGCM_debug_Print 2 -e "\033[1;32mCompletedFlag=${ChunckCompletedFlag}\033[m"
+                                    else
+                                        IGCM_debug_Print 2 -e "\033[1;31mToo Many Potential CompletedFlag\033[m CASE NOT HANDLE YET"
+                                    fi
                                 fi
                                 #
                                 # TO REWRITE END
                                 #
-
-
-                                IGCM_debug_Print 2 -e "\033[1;31mSubmit ${FILE} chunck ${Dimension}\033[m period ${ChunckDebut}-${ChunckFin}"
+                                IGCM_debug_Print 2 -e "\033[1;31mSubmit ${FILE} chunck ${Dimension}\033[m period ${ChunckDebut}-${ChunckFin} and CompletedFlag=${ChunckCompletedFlag}"
                                 listVarEnv="libIGCM,SUBMIT_DIR,POST_DIR,DateBegin,PeriodDateEnd,CompletedFlag,TsTask,CompToRead,FlagToRead"
                                 export libIGCM=${libIGCM}
@@ -359 +379 @@
                                 ChunckFin=${DateEnd}
                             else
-                                #PeriodDateEnd=$(( YearBegin + YearsChunckLength - 1 ))
                                 ChunckFin=$( IGCM_date_AddDaysToGregorianDate ${ChunckDebut} $(( YearsChunckLength * DaysInYear - 1 )) )
                             fi
@@ -385 +404 @@
 
 if [ X${Launch2D} = Xtrue ] ; then
+    #IGCM_debug_Print 2 "Potentials CompletedFlag: ${PotentialCompletedFlag2D[*]}"
     IGCM_debug_Print 2 -e "\033[1;31mSubmit 2D\033[m without chunck period ${DateBegin}-${DateEnd}"
     listVarEnv="libIGCM,SUBMIT_DIR,POST_DIR,DateBegin,PeriodDateEnd,CompletedFlag,TsTask"
@@ -403 +423 @@
 
 if [ X${Launch3D} = Xtrue ] ; then
+    #IGCM_debug_Print 2 "Potentials CompletedFlag: ${PotentialCompletedFlag3D[*]}"
     IGCM_debug_Print 2 -e "\033[1;31mSubmit 3D\033[m without chunck period ${DateBegin}-${DateEnd}"
     listVarEnv="libIGCM,SUBMIT_DIR,POST_DIR,DateBegin,PeriodDateEnd,CompletedFlag,TsTask"

trunk/libIGCM/AA_create_ts

@@ -269 +269 @@
 # Determine component to take care of depending on kind of task create_ts will perform
 #
-( [ X${TsTask} = XChunck2D ] || [ X${TsTask} = XChunck3D ] ) && set -A config_ListOfComponents ${CompToRead} || IGCM_card_DefineArrayFromSection ${CARD_DIR}/config.card ListOfComponents
+[ ${CompToRead} ] && set -A config_ListOfComponents ${CompToRead} || IGCM_card_DefineArrayFromSection ${CARD_DIR}/config.card ListOfComponents
 #
 # Determine period for time series. Default : value from AA_job or from launch_TS if any
@@ -324 +324 @@
         #
         typeset i
-        if ( [ X${TsTask} = XChunck2D ] || [ X${TsTask} = XChunck3D ] ) ; then
+        if [ ${FlagToRead} ] ; then
             ((NbFiles=${FlagToRead}))
             ((i=${NbFiles}))