Skip to content

ModelicaSystem - remove csvfile as class variable #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adeas31 merged 5 commits into from
Jul 11, 2025
Merged

ModelicaSystem - remove csvfile as class variable #313

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01e93f5
[ModelicaSystem] remove class variable csvFile; define name based on …
syntron Jun 23, 2025
9ff5d86
[ModelicaSystem/test_ModelicaSystem] fix test (csvFile no longer a cl…
syntron Jun 23, 2025
f716011
[ModelicaSystem] fix rebase - use csvfile instead of csvFile
syntron Jul 7, 2025
945306b
[test_ModelicaSystem] fix rebase fallout
syntron Jul 7, 2025
cc44b79
[ModelicaSystem.simulate_cmd] fix result_file handling
syntron Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
[ModelicaSystem.simulate_cmd] fix result_file handling 
* rename resultfile => result_file
* use local variable result_file and not self._result_file
  • Loading branch information
@syntron
syntron committed Jul 9, 2025
commit cc44b7913a3ea9a29abb2cbeffb3cdfd014e5be2
10 changes: 5 additions & 5 deletions OMPython/ModelicaSystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ def getOptimizationOptions(self, names: Optional[str | list[str]] = None) -> dic

def simulate_cmd(
self,
resultfile: pathlib.Path,
result_file: pathlib.Path,
simflags: Optional[str] = None,
simargs: Optional[dict[str, Optional[str | dict[str, str]]]] = None,
timeout: Optional[float] = None,
Expand All @@ -933,7 +933,7 @@ def simulate_cmd(

Parameters
----------
resultfile
result_file
simflags
simargs
timeout
Expand All @@ -946,7 +946,7 @@ def simulate_cmd(
om_cmd = ModelicaSystemCmd(runpath=self._tempdir, modelname=self._model_name, timeout=timeout)

# always define the result file to use
om_cmd.arg_set(key="r", val=resultfile.as_posix())
om_cmd.arg_set(key="r", val=result_file.as_posix())

# allow runtime simulation flags from user input
if simflags is not None:
Expand All @@ -968,7 +968,7 @@ def simulate_cmd(

if self._has_inputs: # if model has input quantities
# csvfile is based on name used for result file
csvfile = self._result_file.parent / f"{self._result_file.stem}.csv"
csvfile = result_file.parent / f"{result_file.stem}.csv"

for i in self._inputs:
val = self._inputs[i]
Expand Down Expand Up @@ -1023,7 +1023,7 @@ def simulate(
self._result_file = self._tempdir / resultfile

om_cmd = self.simulate_cmd(
resultfile=self._result_file,
result_file=self._result_file,
simflags=simflags,
simargs=simargs,
timeout=timeout,
Expand Down