mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Scenario: Fix workdir path for last result opening.
This commit is contained in:
1 parent
002ebc5928
commit
05e039011a
3 files changed
+5
-2
No files matched your search
@@ -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
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in new issue
Block a user