Skip to content

Commit 78062ac

Browse files
committed
[ModelicaSystem] resultfile
1 parent dbb084e commit 78062ac

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

OMPython/ModelicaSystem.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -679,14 +679,14 @@ def simulate(self, resultfile=None, simflags=None, timeout: Optional[int] = None
679679
>>> simulate(simflags="-noEventEmit -noRestart -override=e=0.3,g=10") # set runtime simulation flags
680680
"""
681681
if resultfile is None:
682-
r = ""
682+
# default result file generated by OM
683683
self.resultfile = (pathlib.Path(self.tempdir) / f"{self.modelName}_res.mat").as_posix()
684+
elif os.path.exists(resultfile):
685+
self.resultfile = resultfile
684686
else:
685-
if os.path.exists(resultfile):
686-
self.resultfile = resultfile
687-
else:
688-
self.resultfile = (pathlib.Path(self.tempdir) / resultfile).as_posix()
689-
r = " -r=" + self.resultfile
687+
self.resultfile = (pathlib.Path(self.tempdir) / resultfile).as_posix()
688+
# always define the resultfile to use
689+
resultfileflag = " -r=" + self.resultfile
690690

691691
# allow runtime simulation flags from user input
692692
if simflags is None:
@@ -731,7 +731,7 @@ def simulate(self, resultfile=None, simflags=None, timeout: Optional[int] = None
731731
if not exe_file.exists():
732732
raise Exception(f"Error: Application file path not found: {exe_file}")
733733

734-
cmd = exe_file.as_posix() + override + csvinput + r + simflags
734+
cmd = exe_file.as_posix() + override + csvinput + resultfileflag + simflags
735735
cmd = [s for s in cmd.split(' ') if s]
736736
self._run_cmd(cmd=cmd, timeout=timeout)
737737
self.simulationFlag = True

0 commit comments

Comments
 (0)