diff --git a/src/Model/Geometry/Reach.py b/src/Model/Geometry/Reach.py index b5a39e45f638dab66b6b2c966caba72dace6f40c..b6a5952dfcebe77ee60c436e4b4bad9dde8957ae 100644 --- a/src/Model/Geometry/Reach.py +++ b/src/Model/Geometry/Reach.py @@ -134,6 +134,10 @@ class Reach(SQLSubModel): return self._profiles + @profiles.setter + def profiles(self, profiles): + self._profiles = profiles + def get_profiles_from_kp(self, kp): return list( filter( diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py index 1bab8ac3a1abad5bf3ac9f1432c44068b0fbeeff..b814fd7154d7301f757daf2a7488ce995bff45f1 100644 --- a/src/Solver/Mage.py +++ b/src/Solver/Mage.py @@ -197,7 +197,7 @@ class Mage(CommandLineSolver): ) # Profile header line - wfile.write(f"{num}{c1}{c2}{t} {kp} {name} {sediment}\n") + wfile.write(f"{num}{c1}{c2}{t} {kp} {pname} {sediment}\n") def _export_ST_point_line(self, wfile, files, point): x = f"{point.x:<12f}"[0:12] diff --git a/src/View/RunSolver/Window.py b/src/View/RunSolver/Window.py index b338c302e03c3f0fe90a92014bc3ad59cf37dc30..c940b6acb9a6faf109f6d3f5b65520d2c8a10f18 100644 --- a/src/View/RunSolver/Window.py +++ b/src/View/RunSolver/Window.py @@ -215,12 +215,18 @@ class SolverLogWindow(PamhyrWindow): if self._solver.log_file() != "": self.find(QAction, "action_log_file").setEnabled(True) - # Get results - if self._results is None: - self._results = self._solver.results( - self._study, self._workdir, qlog=self._output) - self._parent.set_results(self._solver, self._results) + self._update_get_results() + self._update_logs_all() + + def _update_get_results(self): + if self._results is None: + self._results = self._solver.results( + self._study, self._workdir, qlog=self._output + ) + self._parent.set_results(self._solver, self._results) + + def _update_logs_all(self): while self._output.qsize() != 0: s = self._output.get() if type(s) is str and "[ERROR]" in s: