Skip to content

Commit a351732

Browse files
syntronadeas31
andauthored
[ModelicaSystem] small changes (#338)
* [ModelicaSystem] simplify definition of optimizeOptions * [ModelicaSystem] add ',' for last element of list definitions * [ModelicaSystem] cleanup check for result file --------- Co-authored-by: Adeel Asghar <adeel.asghar@liu.se>
1 parent d2ebb57 commit a351732

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

OMPython/ModelicaSystem.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,7 @@ def __init__(
360360
self._override_variables: dict[str, str] = {}
361361
self._simulate_options_override: dict[str, str] = {}
362362
self._linearization_options = {'startTime': 0.0, 'stopTime': 1.0, 'stepSize': 0.002, 'tolerance': 1e-8}
363-
self._optimization_options = {'startTime': 0.0, 'stopTime': 1.0, 'numberOfIntervals': 500, 'stepSize': 0.002,
364-
'tolerance': 1e-8}
363+
self._optimization_options = self._linearization_options | {'numberOfIntervals': 500}
365364
self._linearized_inputs: list[str] = [] # linearization input list
366365
self._linearized_outputs: list[str] = [] # linearization output list
367366
self._linearized_states: list[str] = [] # linearization states list
@@ -1094,9 +1093,9 @@ def getSolutions(self, varList: Optional[str | list[str]] = None, resultfile: Op
10941093
else:
10951094
result_file = pathlib.Path(resultfile)
10961095

1097-
# check for result file exits
1096+
# check if the result file exits
10981097
if not result_file.is_file():
1099-
raise ModelicaSystemError(f"Result file does not exist {result_file}")
1098+
raise ModelicaSystemError(f"Result file does not exist {result_file.as_posix()}")
11001099

11011100
# get absolute path
11021101
result_file = result_file.absolute()
@@ -1413,7 +1412,7 @@ def _createCSVData(self, csvfile: Optional[pathlib.Path] = None) -> pathlib.Path
14131412
interpolated_inputs[signal_name] = np.interp(
14141413
all_times,
14151414
signal[:, 0], # times
1416-
signal[:, 1] # values
1415+
signal[:, 1], # values
14171416
)
14181417

14191418
# Write CSV file
@@ -1425,7 +1424,7 @@ def _createCSVData(self, csvfile: Optional[pathlib.Path] = None) -> pathlib.Path
14251424
row = [
14261425
t, # time
14271426
*(interpolated_inputs[name][i] for name in input_names), # input values
1428-
0 # trailing 'end' column
1427+
0, # trailing 'end' column
14291428
]
14301429
csv_rows.append(row)
14311430

0 commit comments

Comments
 (0)