Changeset 390 for trunk/libIGCM

Timestamp:

11/24/10 18:07:12 (14 years ago)

Author:

sdipsl

Message:

Step 1/3 toward CompletedFlag? auto-detection, part of ticket #40
Tests ongoing.

This should close ticket #41

File:

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

trunk/libIGCM/AA_TimeSeries_Checker

@@ -251 +251 @@
                             countGood=0
                             countBad=0
+                            unset RemoveList
+                            unset PotentialCompletedFlag
                             for var in $( eval echo \${${compname}_Post_${FILE}_TimeSeriesVars${Dimension}[*]} ) ; do
                                 TestedFile=${config_UserChoices_JobName}_${ChunckDebut}_${ChunckFin}_${FlagDir}_${var}.nc
                                 #
+                                Candidat=$( find ${DIRECTORY} -name "${config_UserChoices_JobName}_${ChunckDebut}_*_${FlagDir}_${var}.nc" )
+                                #
+                                BestCandidat=${ChunckDebut}
+                                #
+                                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}' )
+                                        if [ ${CandidatEnd} -gt ${ChunckFin} ] ; then
+                                            IGCM_debug_Print 2 -e "File $( basename ${i} ) should be suppress"
+                                            set +A RemoveList ${RemoveList[*]} ${i}
+                                        elif [ ${CandidatEnd} -lt ${ChunckFin} ] ; then
+                                            IGCM_debug_Print 2 -e "File $( basename ${i} ) should be suppress or used as a CompletedFlag baseline"
+                                            # We keep the best candidat and remove the others
+                                            if [ ${BestCandidat} -lt ${CandidatEnd} ] ; then 
+                                                BestCandidat=${CandidatEnd}
+                                            else
+                                                set +A RemoveList ${RemoveList[*]} ${i}
+                                            fi
+                                        fi
+                                    done
+                                else
+                                    # No CompletedFlag candidat found
+                                    CandidatCompletedFlag=""
+                                fi
+                                #
                                 if [ ! -f ${DIRECTORY}/${TestedFile} ] ; then
                                     (( countBad = countBad + 1 ))
                                     [ ${countBad} = 1 ] && IGCM_debug_Print 3 "Missing time series from ${FILE} :"
                                     IGCM_debug_Print 3 ${DIRECTORY}/${TestedFile}
+                                    # Then we keep a track of the Best Candidat
+                                    [ ${FoundCandidat} = true ] && set +A PotentialCompletedFlag ${PotentialCompletedFlag[*]} ${BestCandidat}
                                 else
                                     (( countGood = countGood + 1 ))
+                                    # Then we do not need the best candidat
+                                    [ ${FoundCandidat} = true ] && set +A RemoveList ${RemoveList[*]} ${config_UserChoices_JobName}_${ChunckDebut}_${BestCandidat}_${FlagDir}_${var}.nc
                                 fi
                                 (( countTotal = countTotal + 1 ))
@@ -270 +304 @@
                                 IGCM_debug_Print 2 -e "\033[1;32m${SuccessRate}% files OK.\033[m for period ${ChunckDebut}-${ChunckFin}"
                             fi
-
                             echo
+
+                            # Remove what's in the RemoveList
+                            if [ ${RemoveList} ] ; then
+                                IGCM_debug_Print 2 "File(s) that will be removed ${RemoveList[*]}"
+                                #IGCM_sys_Rm ${RemoveList[*]}
+                            fi
+
                             if ( [ ${chunck} = true ] && [ ${SuccessRate} -ne 100 ] ) ; then
+
+                                #
+                                # TO REWRITE BEGIN
+                                #
                                 ChunckCompletedFlag=""
                                 CompletedFlag=${SavedCompletedFlag}
@@ -278 +322 @@
                                         ( [ ${CompletedFlag} -gt ${ChunckDebut} ] && [ ${CompletedFlag} -le ${ChunckFin} ] ) && ChunckCompletedFlag=${CompletedFlag}
                                 fi
+                                #
+                                # TO REWRITE END
+                                #
+
+
                                 IGCM_debug_Print 2 -e "\033[1;31mSubmit ${FILE} chunck ${Dimension}\033[m period ${ChunckDebut}-${ChunckFin}"
                                 listVarEnv="libIGCM,SUBMIT_DIR,POST_DIR,DateBegin,PeriodDateEnd,CompletedFlag,TsTask,CompToRead,FlagToRead"