Merge remote-tracking branch 'origin' into remove-corba

Author: adeas31

.github/workflows/FMITest.yml

@@ -30,7 +30,7 @@ jobs:
 
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'

OMPython/__init__.py

@@ -678,7 +678,7 @@ class ModelicaSystemError(Exception):
 class ModelicaSystem(object):
     def __init__(self, fileName=None, modelName=None, lmodel=None, commandLineOptions=None,
                  variableFilter=None, customBuildDirectory=None, verbose=True, raiseerrors=False,
-                 omhome: str = None):  # 1
+                 omhome: str = None, session: OMCSessionBase = None):  # 1
         """
         "constructor"
         It initializes to load file and build a model, generating object, exe, xml, mat, and json files. etc. It can be called :
@@ -688,6 +688,11 @@ def __init__(self, fileName=None, modelName=None, lmodel=None, commandLineOption
         Note: If the model file is not in the current working directory, then the path where file is located must be included together with file name. Besides, if the Modelica model contains several different models within the same package, then in order to build the specific model, in second argument, user must put the package name with dot(.) followed by specific model name.
         ex: myModel = ModelicaSystem("ModelicaModel.mo", "modelName")
         """
+        if session is not None:
+            self.getconn = session
+        else:
+            self.getconn = OMCSession(omhome=omhome)
+
         if fileName is None and modelName is None and not lmodel:  # all None
             self.getconn = OMCSession(omhome=omhome)
             return
@@ -757,9 +762,6 @@ def __init__(self, fileName=None, modelName=None, lmodel=None, commandLineOption
 
         self.buildModel(variableFilter)
 
-    def __del__(self):
-        OMCSessionBase.__del__(self)
-
     def setCommandLineOptions(self, commandLineOptions: str):
         ## set commandLineOptions if provided by users
         if commandLineOptions is not None: