Skip to content

Commit f9bee56

Browse files
committed
Rename _resultfile to _result_file
1 parent 56a673a commit f9bee56

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

OMPython/ModelicaSystem.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ def __init__(
390390
self._has_inputs = False # for model with input quantity
391391
self._simulated = False # True if the model has already been simulated
392392
self._csvFile: Optional[pathlib.Path] = None # for storing inputs condition
393-
self._resultfile: Optional[pathlib.Path] = None # for storing result file
393+
self._result_file: Optional[pathlib.Path] = None # for storing result file
394394
self._variableFilter = variableFilter
395395

396396
if self._file_name is not None and not self._file_name.is_file(): # if file does not exist
@@ -942,13 +942,13 @@ def simulate(self,
942942

943943
if resultfile is None:
944944
# default result file generated by OM
945-
self._resultfile = self._tempdir / f"{self._model_name}_res.mat"
945+
self._result_file = self._tempdir / f"{self._model_name}_res.mat"
946946
elif os.path.exists(resultfile):
947-
self._resultfile = pathlib.Path(resultfile)
947+
self._result_file = pathlib.Path(resultfile)
948948
else:
949-
self._resultfile = self._tempdir / resultfile
949+
self._result_file = self._tempdir / resultfile
950950
# always define the resultfile to use
951-
om_cmd.arg_set(key="r", val=self._resultfile.as_posix())
951+
om_cmd.arg_set(key="r", val=self._result_file.as_posix())
952952

953953
# allow runtime simulation flags from user input
954954
if simflags is not None:
@@ -985,17 +985,17 @@ def simulate(self,
985985
om_cmd.arg_set(key="csvInput", val=self._csvFile.as_posix())
986986

987987
# delete resultfile ...
988-
if self._resultfile.is_file():
989-
self._resultfile.unlink()
988+
if self._result_file.is_file():
989+
self._result_file.unlink()
990990
# ... run simulation ...
991991
returncode = om_cmd.run()
992992
# and check returncode *AND* resultfile
993-
if returncode != 0 and self._resultfile.is_file():
993+
if returncode != 0 and self._result_file.is_file():
994994
# check for an empty (=> 0B) result file which indicates a crash of the model executable
995995
# see: https://github.com/OpenModelica/OMPython/issues/261
996996
# https://github.com/OpenModelica/OpenModelica/issues/13829
997-
if self._resultfile.stat().st_size == 0:
998-
self._resultfile.unlink()
997+
if self._result_file.stat().st_size == 0:
998+
self._result_file.unlink()
999999
raise ModelicaSystemError("Empty result file - this indicates a crash of the model executable!")
10001000

10011001
logger.warning(f"Return code = {returncode} but result file exists!")
@@ -1035,9 +1035,9 @@ def getSolutions(self, varList: Optional[str | list[str]] = None, resultfile: Op
10351035
[-1. , -0.90483742, -0.81873075]])
10361036
"""
10371037
if resultfile is None:
1038-
if self._resultfile is None:
1038+
if self._result_file is None:
10391039
raise ModelicaSystemError("No result file found. Run simulate() first.")
1040-
result_file = self._resultfile
1040+
result_file = self._result_file
10411041
else:
10421042
result_file = pathlib.Path(resultfile)
10431043

0 commit comments

Comments
 (0)