From 05e039011afeb75886113d0d516a7d2565e5fd55 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Mon, 27 Oct 2025 09:29:33 +0100 Subject: [PATCH] Scenario: Fix workdir path for last result opening. --- src/Model/Scenario.py | 2 +- src/Solver/Mage.py | 1 + src/View/MainWindow.py | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Model/Scenario.py b/src/Model/Scenario.py index 8ceb8161..b66faa64 100644 --- a/src/Model/Scenario.py +++ b/src/Model/Scenario.py @@ -276,7 +276,7 @@ class Scenario(SQLSubModel): if self.id != 0: srep = os.path.join( self.parent.workdir(), - "senario_" + str(self.id) + "scenario_" + str(self.id) ) return srep diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py index 7501cb4f..95f642bf 100644 --- a/src/Solver/Mage.py +++ b/src/Solver/Mage.py @@ -1375,6 +1375,7 @@ class Mage8(Mage): results = super(Mage8, self).results(study, repertory, qlog, name=name) if results is None: return None + if with_gra: self.read_gra(study, repertory, results, qlog, name=name) diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index f60d2ca1..6306e77e 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -1511,7 +1511,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): return False def open_solver_results(self, solver, results=None): - logger.info(f"{solver} {results}") + logger.info(f"Open results for '{solver}' ({results})") def reading_fn(): self._tmp_results = results @@ -1647,6 +1647,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): "_PAMHYR_", self._study.name.replace(" ", "_"), solver.name.replace(" ", "_"), + self._study.status.scenario.workdir(), ) return workdir @@ -1870,6 +1871,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): solver_results_adists = solver_results.results( self._study, repertory=dir_path, qlog=None) # self._output) + logger.info(f"Select results: {dir_path}") if len(bin_list) >= 2 and ("total_sediment.bin" in bin_list): self.open_solver_results_adists(