Changeset 413 for trunk/libIGCM/AA_TimeSeries_Checker

Timestamp:

01/31/11 09:55:13 (13 years ago)

Author:

mafoipsl

Message:

Correct algorithm to delete unnecessary files when more than 2 best candidates (for CompletedFlag?=) exist.

File:

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

trunk/libIGCM/AA_TimeSeries_Checker

@@ -291 +291 @@
                                             #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
-                                                BestCandidat=${CandidatEnd}
-                                                FoundCandidat=true
-                                            else
-                                                set +A RemoveList ${RemoveList[*]} ${candid}
-                                            fi
+                                            if [ ${BestCandidat} -lt ${CandidatEnd} ] ; then
+                                                if [ ${FoundCandidat} = true ] ; then
+                                                   set +A RemoveList ${RemoveList[*]} ${DIRECTORY}/${config_UserChoices_JobName}_${ChunckDebut}_${BestCandidat}_${FlagDir}_${var}.nc
+                                                else
+                                                   FoundCandidat=true
+                                                fi
+                                                BestCandidat=${CandidatEnd}
+                                            else
+                                                set +A RemoveList ${RemoveList[*]} ${candid}
+                                            fi
                                         fi
                                     done
@@ -336 +340 @@
                                 IGCM_debug_Print 2 "File(s) that will be removed ${RemoveList[*]}"
                                 if [ ${action} = true ] ; then
-                                    echo -e "\033[1;32mDo you want to remove them?"
-                                    echo -n " Your answer (y/n) : \033[m"
+                                    echo -e "\033[1;32mDo you want to remove them?\033[m"
+                                    echo -n " Your answer (y/n) : "
                                     read RemoveAnswer
                                     case ${RemoveAnswer} in