Skip to content

Commit 297d2f5

Browse files
committed
[ModelicaSystem*] rebase cleanup
1 parent 1d55f4e commit 297d2f5

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

OMPython/ModelicaSystem.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,12 @@
3838
import numbers
3939
import numpy as np
4040
import os
41-
import platform
42-
import re
43-
import subprocess
4441
import textwrap
4542
from typing import Optional, Any
4643
import warnings
4744
import xml.etree.ElementTree as ET
4845

49-
from OMPython.OMCSession import OMCSessionException, OMCSessionRunData, OMCSessionZMQ, OMCProcessLocal, OMCPath
46+
from OMPython.OMCSession import OMCSessionException, OMCSessionRunData, OMCSessionZMQ, OMCProcess, OMCPath
5047

5148
# define logger using the current module name as ID
5249
logger = logging.getLogger(__name__)
@@ -115,7 +112,7 @@ class ModelicaSystemCmd:
115112
def __init__(
116113
self,
117114
session: OMCSessionZMQ,
118-
runpath: pathlib.Path,
115+
runpath: OMCPath,
119116
modelname: str,
120117
timeout: Optional[float] = None,
121118
) -> None:
@@ -265,7 +262,9 @@ def definition(self) -> OMCSessionRunData:
265262
cmd_timeout=self._timeout,
266263
)
267264

268-
omc_run_data_updated = self._session.omc_run_data_update(omc_run_data=omc_run_data)
265+
omc_run_data_updated = self._session.omc_run_data_update(
266+
omc_run_data=omc_run_data,
267+
)
269268

270269
return omc_run_data_updated
271270

@@ -318,7 +317,7 @@ def __init__(
318317
variableFilter: Optional[str] = None,
319318
customBuildDirectory: Optional[str | os.PathLike] = None,
320319
omhome: Optional[str] = None,
321-
omc_process: Optional[OMCProcessLocal] = None,
320+
omc_process: Optional[OMCProcess] = None,
322321
build: bool = True,
323322
) -> None:
324323
"""Initialize, load and build a model.
@@ -383,8 +382,6 @@ def __init__(
383382
self._linearized_states: list[str] = [] # linearization states list
384383

385384
if omc_process is not None:
386-
if not isinstance(omc_process, OMCProcessLocal):
387-
raise ModelicaSystemError("Invalid (local) omc process definition provided!")
388385
self._getconn = OMCSessionZMQ(omc_process=omc_process)
389386
else:
390387
self._getconn = OMCSessionZMQ(omhome=omhome)

0 commit comments

Comments
 (0)