debug remove sediment

src/Solver/AdisTS.py

@@ -619,6 +619,7 @@ class AdisTSwc(AdisTS):
 
     @timer
     def read_bin(self, study, repertory, results, qlog=None, name="0"):
+
         repertory_results = os.path.join(repertory, "resultats")
 
         files_bin_names = [el.split("/")[-1]
@@ -626,13 +627,11 @@ class AdisTSwc(AdisTS):
         files_bin_names.insert(0, files_bin_names.pop(
             files_bin_names.index("total_sediment.bin"))
         )
-        print("files names resultats: ", files_bin_names)
 
         ifilename = os.path.join(repertory_results, files_bin_names[0])
 
         logger.info(f"read_bin: Start reading '{ifilename}' ...")
 
-        print("reading ", ifilename)
         with open(ifilename, 'rb') as f:
             # header
             # first line
@@ -651,7 +650,6 @@ class AdisTSwc(AdisTS):
             data = np.fromfile(f, dtype=np.int32, count=2 * ibmax)
             is1 = np.zeros(ibmax, dtype=np.int32)
             is2 = np.zeros(ibmax, dtype=np.int32)
-            print("nombre de biefs : ", ibmax)
 
             logger.debug(f"read_bin: nb_reach = {ibmax}")
             logger.debug(f"read_bin: nb_profile = {ismax}")
@@ -813,15 +811,6 @@ class AdisTSwc(AdisTS):
                                [timestamps_keys[0]].keys())
         type_pol_index = len(phys_data_names)
 
-        # ##print("pol keys: ", pollutants_keys)
-        # ##print("t keys: ", timestamps_keys)
-        # ##print("phys var: ", phys_data_names)
-        # ##print("phys data names mass zero:",
-        #          list(data_tmp[pollutants_keys[1]][timestamps_keys[0]].keys()))
-        # print("set timestamps keys: ", set(timestamps_keys))
-        # print("isma")
-        # ##print("iprofiles: ", iprofiles)
-
         for r, reach in enumerate(reachs):
             for i in range(is1[r]-1, is2[r]):
                 p_i = ip_to_ri(reach, i)
@@ -861,15 +850,29 @@ class AdisTSwc(AdisTS):
             self._export_POLs,
         ]
 
+    def rm_previous_results(self, study, repertory, qlog):
+
+        if "resultats" not in os.listdir(repertory):
+            return
+
+        repertory_results = os.path.join(repertory, "resultats")
+
+        files_bin_names = [el.split("/")[-1]
+                           for el in glob.glob(repertory_results+"/*.bin")]
+        for el in glob.glob(repertory_results+"/*.bin"):
+            os.remove(el)
+
     @timer
     def export(self, study, repertory, mage_rep, qlog=None, name="0"):
-        print("cmd solver adistswc : ", self._cmd_solver)
+        logger.debug(f"cmd solver adistswc : {self._cmd_solver}")
         self._study = study
         name = study.name.replace(" ", "_")
 
         # Generate files
         files = []
 
+        self.rm_previous_results(study, repertory, qlog)
+
         try:
             for func in self.export_func_dict():
                 files = files + func(study, repertory, qlog, name=name)