From af30fde81a2440b36f3b1e55220934b5ecaca294 Mon Sep 17 00:00:00 2001
From: Theophile Terraz <theophile.terraz@inrae.fr>
Date: Mon, 27 Jan 2025 17:57:44 +0100
Subject: [PATCH] debug adis path windows
---
src/Model/Results/ResultsAdisTS.py | 7 ++-----
src/Solver/AdisTS.py | 14 ++++++--------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/Model/Results/ResultsAdisTS.py b/src/Model/Results/ResultsAdisTS.py
index ac75c35d..e7bdcc06 100644
--- a/src/Model/Results/ResultsAdisTS.py
+++ b/src/Model/Results/ResultsAdisTS.py
@@ -17,7 +17,6 @@
import logging
import numpy as np
import os
-import glob
from copy import deepcopy
from datetime import datetime
@@ -42,10 +41,8 @@ class Results(object):
"creation_date": datetime.now(),
}
repertory_results = os.path.join(repertory, "resultats")
- self._pollutants_list = [
- el.split("/")[-1][0:-4]
- for el in glob.glob(repertory_results + "/*.bin")
- ]
+ filelist = [f for f in os.listdir(repertory_results) if os.path.isfile(os.path.join(repertory_results, f))]
+ self._pollutants_list = [f[0:-4] for f in filelist if f[-4:] == ".bin"]
self._pollutants_list.insert(0, self._pollutants_list.pop(
self._pollutants_list.index("total_sediment"))
)
diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py
index 337736dc..4578a23e 100644
--- a/src/Solver/AdisTS.py
+++ b/src/Solver/AdisTS.py
@@ -17,7 +17,6 @@
# -*- coding: utf-8 -*-
import os
-import glob
import logging
import numpy as np
@@ -621,9 +620,8 @@ class AdisTSwc(AdisTS):
def read_bin(self, study, repertory, results, qlog=None, name="0"):
repertory_results = os.path.join(repertory, "resultats")
-
- files_bin_names = [el.split("/")[-1]
- for el in glob.glob(repertory_results+"/*.bin")]
+ filelist = [f for f in os.listdir(repertory_results) if os.path.isfile(os.path.join(repertory_results, f))]
+ files_bin_names = [f for f in filelist if f[-4:] == ".bin"]
files_bin_names.insert(0, files_bin_names.pop(
files_bin_names.index("total_sediment.bin"))
)
@@ -856,11 +854,11 @@ class AdisTSwc(AdisTS):
return
repertory_results = os.path.join(repertory, "resultats")
+ filelist = [f for f in os.listdir(repertory_results) if os.path.isfile(os.path.join(repertory_results, f))]
+ files_bin_names = [f for f in filelist if f[-4:] == ".bin"]
- 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)
+ for el in files_bin_names:
+ os.remove(os.path.join(repertory_results, el))
@timer
def export(self, study, repertory, mage_rep, qlog=None, name="0"):
--
GitLab