Skip to content

Commit 6549a37

Browse files
committed
[ModelicaSystem] update handling of override file
* define file name based on result file name & Path * simplify code
1 parent a33dc68 commit 6549a37

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

OMPython/ModelicaSystem.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -954,14 +954,17 @@ def simulate_cmd(
954954
if simargs:
955955
om_cmd.args_set(args=simargs)
956956

957-
overrideFile = self._tempdir / f"{self._model_name}_override.txt"
958957
if self._override_variables or self._simulate_options_override:
959-
tmpdict = self._override_variables.copy()
960-
tmpdict.update(self._simulate_options_override)
958+
override_file = result_file.parent / f"{result_file.stem}_override.txt"
961959

962-
override_content = "\n".join([f"{key}={value}" for key, value in tmpdict.items()]) + "\n"
963-
overrideFile.write_text(override_content)
964-
om_cmd.arg_set(key="overrideFile", val=overrideFile.as_posix())
960+
override_content = (
961+
"\n".join([f"{key}={value}" for key, value in self._override_variables.items()])
962+
+ "\n".join([f"{key}={value}" for key, value in self._simulate_options_override.items()])
963+
+ "\n"
964+
)
965+
966+
override_file.write_text(override_content)
967+
om_cmd.arg_set(key="overrideFile", val=override_file.as_posix())
965968

966969
if self._has_inputs: # if model has input quantities
967970
# csvfile is based on name used for result file

0 commit comments

Comments
 (0)