[ModelicaSystemDoE] rename variables

Author: syntron

OMPython/ModelicaSystem.py

@@ -1893,8 +1893,8 @@ def run_doe():
         resdir.mkdir(exist_ok=True)
 
         doe_mod = OMPython.ModelicaSystemDoE(
-            fileName=model.as_posix(),
-            modelName="M",
+            model_name="M",
+            model_file=model.as_posix(),
             parameters=param,
             resultpath=resdir,
             simargs={"override": {'stopTime': 1.0}},
@@ -1922,11 +1922,11 @@ def run_doe():
     def __init__(
             self,
             # data to be used for ModelicaSystem
-            fileName: Optional[str | os.PathLike] = None,
-            modelName: Optional[str] = None,
-            lmodel: Optional[list[str | tuple[str, str]]] = None,
+            model_file: Optional[str | os.PathLike] = None,
+            model_name: Optional[str] = None,
+            libraries: Optional[list[str | tuple[str, str]]] = None,
             commandLineOptions: Optional[list[str]] = None,
-            variableFilter: Optional[str] = None,
+            variable_filter: Optional[str] = None,
             customBuildDirectory: Optional[str | os.PathLike] = None,
             omhome: Optional[str] = None,
             omc_process: Optional[OMCProcess] = None,
@@ -1943,6 +1943,8 @@ def __init__(
         ModelicaSystem.simulate(). Additionally, the path to store the result files is needed (= resultpath) as well as
         a list of parameters to vary for the Doe (= parameters). All possible combinations are considered.
         """
+        if model_name is None:
+            raise ModelicaSystemError("No model name provided!")
 
         self._mod = ModelicaSystem(
             commandLineOptions=commandLineOptions,
@@ -1951,13 +1953,13 @@ def __init__(
             omc_process=omc_process,
         )
         self._mod.model(
-            model_file=fileName,
-            model_name=modelName,
-            libraries=lmodel,
-            variable_filter=variableFilter,
+            model_file=model_file,
+            model_name=model_name,
+            libraries=libraries,
+            variable_filter=variable_filter,
         )
 
-        self._model_name = modelName
+        self._model_name = model_name
 
         self._simargs = simargs
         self._timeout = timeout

tests/test_ModelicaSystemDoE.py

@@ -54,8 +54,8 @@ def test_ModelicaSystemDoE_local(tmp_path, model_doe, param_doe):
     tmpdir.mkdir(exist_ok=True)
 
     doe_mod = OMPython.ModelicaSystemDoE(
-        fileName=model_doe.as_posix(),
-        modelName="M",
+        model_file=model_doe.as_posix(),
+        model_name="M",
         parameters=param_doe,
         resultpath=tmpdir,
         simargs={"override": {'stopTime': 1.0}},
@@ -73,8 +73,8 @@ def test_ModelicaSystemDoE_docker(tmp_path, model_doe, param_doe):
 
     modelpath = omc.omcpath_tempdir()
     doe_mod = OMPython.ModelicaSystemDoE(
-        fileName=model_doe.as_posix(),
-        modelName="M",
+        model_file=modelpath.as_posix(),
+        model_name="M",
         parameters=param_doe,
         omc_process=omcp,
         resultpath=modelpath,
@@ -91,8 +91,8 @@ def test_ModelicaSystemDoE_WSL(tmp_path, model_doe, param_doe):
     tmpdir.mkdir(exist_ok=True)
 
     doe_mod = OMPython.ModelicaSystemDoE(
-        fileName=model_doe.as_posix(),
-        modelName="M",
+        model_file=model_doe.as_posix(),
+        model_name="M",
         parameters=param_doe,
         resultpath=tmpdir,
         simargs={"override": {'stopTime': 1.0}},