[ModelicaSystem*] fix definitions of *Base and *OMC

Author: syntron

OMPython/ModelicaSystem.py

@@ -90,26 +90,20 @@ def __getitem__(self, index: int):
 
 class ModelicaSystemBase:
     """
-    Class to simulate a Modelica model using OpenModelica via OMCSession.
+    Base class to simulate a Modelica models.
     """
 
     def __init__(
             self,
-            command_line_options: Optional[list[str]] = None,
+            session: OMCSession,
             work_directory: Optional[str | os.PathLike] = None,
-            omhome: Optional[str] = None,
-            session: Optional[OMCSession] = None,
     ) -> None:
         """Create a ModelicaSystem instance. To define the model use model() or convertFmu2Mo().
 
         Args:
-            command_line_options: List with extra command line options as elements. The list elements are
-              provided to omc via setCommandLineOptions(). If set, the default values will be overridden.
-              To disable any command line options, use an empty list.
             work_directory: Path to a directory to be used for temporary
               files like the model executable. If left unspecified, a tmp
               directory will be created.
-            omhome: path to OMC to be used when creating the OMC session (see OMCSession).
             session: definition of a (local) OMC session to be used. If
               unspecified, a new local session will be created.
         """
@@ -135,23 +129,10 @@ def __init__(
         self._linearized_outputs: list[str] = []  # linearization output list
         self._linearized_states: list[str] = []  # linearization states list
 
-        if session is not None:
-            self._session = session
-        else:
-            self._session = OMCSessionLocal(omhome=omhome)
+        self._session = session
 
         # get OpenModelica version
         self._version = self._session.get_version()
-        # set commandLineOptions using default values or the user defined list
-        if command_line_options is None:
-            # set default command line options to improve the performance of linearization and to avoid recompilation if
-            # the simulation executable is reused in linearize() via the runtime flag '-l'
-            command_line_options = [
-                "--linearizationDumpLanguage=python",
-                "--generateSymbolicLinearization",
-            ]
-        for opt in command_line_options:
-            self.set_command_line_options(command_line_option=opt)
 
         self._simulated = False  # True if the model has already been simulated
         self._result_file: Optional[OMCPath] = None  # for storing result file
@@ -1243,8 +1224,49 @@ def getLinearStates(self) -> list[str]:
 
 
 class ModelicaSystemOMC(ModelicaSystemBase):
+    """
+    Class to simulate a Modelica model using OpenModelica via OMCSession.
+    """
 
+    def __init__(
+            self,
+            command_line_options: Optional[list[str]] = None,
+            work_directory: Optional[str | os.PathLike] = None,
+            omhome: Optional[str] = None,
+            session: Optional[OMCSession] = None,
+    ) -> None:
+        """Create a ModelicaSystem instance. To define the model use model() or convertFmu2Mo().
+
+        Args:
+            command_line_options: List with extra command line options as elements. The list elements are
+              provided to omc via setCommandLineOptions(). If set, the default values will be overridden.
+              To disable any command line options, use an empty list.
+            work_directory: Path to a directory to be used for temporary
+              files like the model executable. If left unspecified, a tmp
+              directory will be created.
+            omhome: path to OMC to be used when creating the OMC session (see OMCSession).
+            session: definition of a (local) OMC session to be used. If
+              unspecified, a new local session will be created.
+        """
 
+        if session is None:
+            session = OMCSessionLocal(omhome=omhome)
+
+        super().__init__(
+            session=session,
+            work_directory=work_directory,
+        )
+
+        # set commandLineOptions using default values or the user defined list
+        if command_line_options is None:
+            # set default command line options to improve the performance of linearization and to avoid recompilation if
+            # the simulation executable is reused in linearize() via the runtime flag '-l'
+            command_line_options = [
+                "--linearizationDumpLanguage=python",
+                "--generateSymbolicLinearization",
+            ]
+        for opt in command_line_options:
+            self.set_command_line_options(command_line_option=opt)
 
     def model(
             self,