mirror of https://gitlab.com/pamhyr/pamhyr2
Scenario: Add scenario separated repertory.
parent
cab1bceae8
commit
2859d0f4ff
|
|
@ -16,6 +16,8 @@
|
||||||
|
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
from tools import logger_exception
|
from tools import logger_exception
|
||||||
|
|
||||||
from Model.Tools.PamhyrDB import SQLSubModel
|
from Model.Tools.PamhyrDB import SQLSubModel
|
||||||
|
|
@ -271,3 +273,13 @@ class Scenario(SQLSubModel):
|
||||||
return self.parent
|
return self.parent
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def workdir(self):
|
||||||
|
srep = ""
|
||||||
|
if self.id != 0:
|
||||||
|
srep = os.path.join(
|
||||||
|
self.parent.workdir(),
|
||||||
|
"senario_" + str(self.id)
|
||||||
|
)
|
||||||
|
|
||||||
|
return srep
|
||||||
|
|
|
||||||
|
|
@ -191,17 +191,27 @@ class SolverLogWindow(PamhyrWindow):
|
||||||
self._alarm.timeout.connect(self.update)
|
self._alarm.timeout.connect(self.update)
|
||||||
|
|
||||||
def setup_workdir(self):
|
def setup_workdir(self):
|
||||||
|
scenario = self._study.status.scenario
|
||||||
|
srep = scenario.workdir()
|
||||||
|
|
||||||
self._workdir = ""
|
self._workdir = ""
|
||||||
|
|
||||||
if self._study.filename == "":
|
if self._study.filename == "":
|
||||||
self._workdir = tempfile.TemporaryDirectory()
|
self._workdir = os.path.join(
|
||||||
|
tempfile.TemporaryDirectory(),
|
||||||
|
srep
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
self._workdir = os.path.join(
|
self._workdir = os.path.join(
|
||||||
os.path.dirname(self._study.filename),
|
os.path.dirname(self._study.filename),
|
||||||
"_PAMHYR_",
|
"_PAMHYR_",
|
||||||
self._study.name.replace(" ", "_"),
|
self._study.name.replace(" ", "_"),
|
||||||
self._solver.name.replace(" ", "_"),
|
self._solver.name.replace(" ", "_"),
|
||||||
|
srep
|
||||||
)
|
)
|
||||||
os.makedirs(self._workdir, exist_ok=True)
|
|
||||||
|
logger.info(f"Create workdir: '{self._workdir}'")
|
||||||
|
os.makedirs(self._workdir, exist_ok=True)
|
||||||
|
|
||||||
def setup_process(self):
|
def setup_process(self):
|
||||||
self._alarm.start(100)
|
self._alarm.start(100)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue