Skip to content

Commit 2608ffc

Browse files
committed
[ModelicaSystem] improve result file handling in simulate()
1 parent f3de972 commit 2608ffc

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

OMPython/ModelicaSystem.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,10 +1037,12 @@ def simulate(
10371037
if resultfile is None:
10381038
# default result file generated by OM
10391039
self._result_file = self.getWorkDirectory() / f"{self._model_name}_res.mat"
1040-
elif os.path.exists(resultfile):
1041-
self._result_file = self._getconn.omcpath(resultfile)
1040+
elif isinstance(resultfile, OMCPath):
1041+
self._result_file = resultfile
10421042
else:
1043-
self._result_file = self.getWorkDirectory() / resultfile
1043+
self._result_file = self._getconn.omcpath(resultfile)
1044+
if not self._result_file.is_absolute():
1045+
self._result_file = self.getWorkDirectory() / resultfile
10441046

10451047
if not isinstance(self._result_file, OMCPath):
10461048
raise ModelicaSystemError(f"Invalid result file path: {self._result_file} - must be an OMCPath object!")

0 commit comments

Comments
 (0)