From 771d5af052bd249e0eb44c4b7cfd5680d91e88e0 Mon Sep 17 00:00:00 2001 From: arun3688 Date: Fri, 28 Aug 2026 14:14:31 +0200 Subject: [PATCH 1/6] propagate model name to result file --- src/OMSimulatorPython/instantiated_model.py | 10 +++++----- src/OMSimulatorPython/ssd.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/OMSimulatorPython/instantiated_model.py b/src/OMSimulatorPython/instantiated_model.py index 51e1c2aea..c3801bdc9 100644 --- a/src/OMSimulatorPython/instantiated_model.py +++ b/src/OMSimulatorPython/instantiated_model.py @@ -64,13 +64,14 @@ def _system_type_label(system_type: SystemType) -> str: return "oms_system_wc" if system_type == SystemType.wc else "oms_system_sc" class InstantiatedModel: - def __init__(self, json_description, system: System, resources: dict): + def __init__(self, json_description, ssdName: str, system: System, resources: dict): #print(f"info: Instantiating model with JSON description:\n{json_description}", flush=True) config = json.loads(json_description) self.modelName = "model" ## create random name, but we cannot commits test as jenkins will gerate new model name self.apiCall = [] self.mappedCrefs = {} # Store mapped CRefs associated with their export names self.system = system + self.ssdName = ssdName self.resources = resources self.fmuInstantitated = False @@ -101,7 +102,7 @@ def __init__(self, json_description, system: System, resources: dict): root_label = _system_type_label(root_type) status = Capi.addSystem(f"{self.modelName}.root", root_type.value) - export_name = f"{self.system.name}" # Use the system's name as the export name for the root system + export_name = f"{self.ssdName}.{self.system.name}" # Use the system's name as the export name for the root system if export_name not in self.mappedCrefs: self.mappedCrefs[export_name] = f"{self.modelName}.root" if status != Status.ok: @@ -183,8 +184,7 @@ def __init__(self, json_description, system: System, resources: dict): status = Capi.addSubModel(comp_path, comp["path"]) if status != Status.ok: raise RuntimeError(f"Failed to add oms_addSubModel: {status}") - export_name = ".".join(comp["name"]) - + export_name =f"{self.ssdName}.{".".join(comp['name'])}" ## parse connector geometry for the component if exist and set it to capi after adding the component, this is needed for proper mapping of connector geometry if "connectors" in comp: for connector in comp["connectors"]: @@ -425,7 +425,7 @@ def _addConnector(self, connectors, systemName): if status != Status.ok: raise RuntimeError(f"Failed to set connector numeric type for {connector_path}: {status}") - export_name = systemName + export_name = f"{self.ssdName}.{systemName}" if not connector_name in self.mappedCrefs: self.mappedCrefs[connector_name] = connector_path status = Capi.setExportName(connector_path, export_name) # Set export name if provided diff --git a/src/OMSimulatorPython/ssd.py b/src/OMSimulatorPython/ssd.py index bcedf8984..bcf827991 100644 --- a/src/OMSimulatorPython/ssd.py +++ b/src/OMSimulatorPython/ssd.py @@ -270,7 +270,7 @@ def instantiate(self, resources: dict | None = None, tempdir: str | None = None) raise ValueError("Variant doesn't contain a system") simulation_info = {"startTime": self.startTime, "stopTime": self.stopTime, "resultFile": self.resultFile, "loggingInterval": self.loggingInterval, "bufferSize": self.bufferSize} json_desc = self.system.generateJson(resources, tempdir, simulation_info) - return InstantiatedModel(json_desc, self.system, resources) + return InstantiatedModel(json_desc, self._name, self.system, resources) def list(self, prefix=""): '''Prints the SSD contents.''' From 9a3efc5c1656fc9e2217e633cd15162b525f475f Mon Sep 17 00:00:00 2001 From: arun3688 Date: Fri, 28 Aug 2026 16:03:55 +0200 Subject: [PATCH 2/6] pass model name to set start values --- src/OMSimulatorPython/instantiated_model.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OMSimulatorPython/instantiated_model.py b/src/OMSimulatorPython/instantiated_model.py index c3801bdc9..219dd9e57 100644 --- a/src/OMSimulatorPython/instantiated_model.py +++ b/src/OMSimulatorPython/instantiated_model.py @@ -242,11 +242,11 @@ def __init__(self, json_description, ssdName: str, system: System, resources: di raise RuntimeError(f"Failed to set connection linear transformation: {status}") ## set start values - self.setStartValues(self.system.value, self.system.name, self.system.parameterMapping) + self.setStartValues(self.system.value, f"{self.ssdName}.{self.system.name}", self.system.parameterMapping) ## set start values from ssv files - self.setStartValuesFromSSV(self.system.parameterResources, self.system.name) + self.setStartValuesFromSSV(self.system.parameterResources, f"{self.ssdName}.{self.system.name}") ## iterate start values from sub-system both inline and ssv files if exist - self.setStartValuesFromElements(self.system.elements, self.system.name) + self.setStartValuesFromElements(self.system.elements, f"{self.ssdName}.{self.system.name}") self.apiCall.append(f'oms_instantiate("{self.modelName}")') status = Capi.instantiate(self.modelName) From ea5a8922e4e9c01e8c6904983b0d696e11b01de0 Mon Sep 17 00:00:00 2001 From: arun3688 Date: Fri, 28 Aug 2026 19:48:39 +0200 Subject: [PATCH 3/6] pass model name to setExportName API alone --- src/OMSimulatorPython/instantiated_model.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/OMSimulatorPython/instantiated_model.py b/src/OMSimulatorPython/instantiated_model.py index 219dd9e57..d9612309e 100644 --- a/src/OMSimulatorPython/instantiated_model.py +++ b/src/OMSimulatorPython/instantiated_model.py @@ -102,7 +102,7 @@ def __init__(self, json_description, ssdName: str, system: System, resources: di root_label = _system_type_label(root_type) status = Capi.addSystem(f"{self.modelName}.root", root_type.value) - export_name = f"{self.ssdName}.{self.system.name}" # Use the system's name as the export name for the root system + export_name = f"{self.system.name}" # Use the system's name as the export name for the root system if export_name not in self.mappedCrefs: self.mappedCrefs[export_name] = f"{self.modelName}.root" if status != Status.ok: @@ -184,7 +184,8 @@ def __init__(self, json_description, ssdName: str, system: System, resources: di status = Capi.addSubModel(comp_path, comp["path"]) if status != Status.ok: raise RuntimeError(f"Failed to add oms_addSubModel: {status}") - export_name =f"{self.ssdName}.{".".join(comp['name'])}" + export_name = ".".join(comp["name"]) + ## parse connector geometry for the component if exist and set it to capi after adding the component, this is needed for proper mapping of connector geometry if "connectors" in comp: for connector in comp["connectors"]: @@ -205,7 +206,7 @@ def __init__(self, json_description, ssdName: str, system: System, resources: di if not export_name in self.mappedCrefs: self.mappedCrefs[export_name] = comp_path self.mappedCrefs[".".join(comp["name"][:-1])] = solver_path # map parent system too for connector lookup - status = Capi.setExportName(comp_path, export_name) # Set export name if provided + status = Capi.setExportName(comp_path, f"{self.ssdName}.{export_name}") # Set export name if provided if status != Status.ok: raise RuntimeError(f"Failed to set export name: {status}") @@ -242,11 +243,11 @@ def __init__(self, json_description, ssdName: str, system: System, resources: di raise RuntimeError(f"Failed to set connection linear transformation: {status}") ## set start values - self.setStartValues(self.system.value, f"{self.ssdName}.{self.system.name}", self.system.parameterMapping) + self.setStartValues(self.system.value, self.system.name, self.system.parameterMapping) ## set start values from ssv files - self.setStartValuesFromSSV(self.system.parameterResources, f"{self.ssdName}.{self.system.name}") + self.setStartValuesFromSSV(self.system.parameterResources, self.system.name) ## iterate start values from sub-system both inline and ssv files if exist - self.setStartValuesFromElements(self.system.elements, f"{self.ssdName}.{self.system.name}") + self.setStartValuesFromElements(self.system.elements, self.system.name) self.apiCall.append(f'oms_instantiate("{self.modelName}")') status = Capi.instantiate(self.modelName) @@ -425,10 +426,10 @@ def _addConnector(self, connectors, systemName): if status != Status.ok: raise RuntimeError(f"Failed to set connector numeric type for {connector_path}: {status}") - export_name = f"{self.ssdName}.{systemName}" + export_name = systemName if not connector_name in self.mappedCrefs: self.mappedCrefs[connector_name] = connector_path - status = Capi.setExportName(connector_path, export_name) # Set export name if provided + status = Capi.setExportName(connector_path, f"{self.ssdName}.{export_name}") # Set export name if provided if status != Status.ok: raise RuntimeError(f"Failed to set export name: {status}") status = Capi.setAliasName(connector_path, str(connector.name)) # Set alias name for connector From aae94e04c1354afa41dffd3af1fa4409102e793e Mon Sep 17 00:00:00 2001 From: arun3688 Date: Fri, 28 Aug 2026 21:36:22 +0200 Subject: [PATCH 4/6] stripRoot in tests --- testsuite/tests/reference-fmus/2.0/cs/BouncingBall-cs.py | 1 + testsuite/tests/reference-fmus/2.0/cs/Dahlquist-cs.py | 1 + testsuite/tests/reference-fmus/2.0/cs/VanDerPol-cs.py | 1 + testsuite/tests/reference-fmus/2.0/me/BouncingBall-me.py | 1 + testsuite/tests/reference-fmus/2.0/me/Dahlquist-me.py | 1 + testsuite/tests/reference-fmus/2.0/me/Stair-me.py | 1 + testsuite/tests/reference-fmus/2.0/me/VanDerPol-me.py | 1 + testsuite/tests/reference-fmus/3.0/cs/BouncingBall-cs.py | 1 + testsuite/tests/reference-fmus/3.0/cs/Dahlquist-cs.py | 1 + testsuite/tests/reference-fmus/3.0/cs/Stair-cs.py | 1 + testsuite/tests/reference-fmus/3.0/cs/VanDerPol-cs.py | 1 + testsuite/tests/reference-fmus/3.0/me/BouncingBall-me.py | 1 + testsuite/tests/reference-fmus/3.0/me/Dahlquist-me.py | 1 + testsuite/tests/reference-fmus/3.0/me/Stair-me.py | 1 + testsuite/tests/reference-fmus/3.0/me/VanDerPol-me.py | 1 + 15 files changed, 15 insertions(+) diff --git a/testsuite/tests/reference-fmus/2.0/cs/BouncingBall-cs.py b/testsuite/tests/reference-fmus/2.0/cs/BouncingBall-cs.py index 36c6a3c0c..5cce2217d 100644 --- a/testsuite/tests/reference-fmus/2.0/cs/BouncingBall-cs.py +++ b/testsuite/tests/reference-fmus/2.0/cs/BouncingBall-cs.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/BouncingBall.fmu', new_name='resources/BouncingBall.fmu') diff --git a/testsuite/tests/reference-fmus/2.0/cs/Dahlquist-cs.py b/testsuite/tests/reference-fmus/2.0/cs/Dahlquist-cs.py index 31da77a7f..db6c8deea 100644 --- a/testsuite/tests/reference-fmus/2.0/cs/Dahlquist-cs.py +++ b/testsuite/tests/reference-fmus/2.0/cs/Dahlquist-cs.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Dahlquist.fmu', new_name='resources/Dahlquist.fmu') diff --git a/testsuite/tests/reference-fmus/2.0/cs/VanDerPol-cs.py b/testsuite/tests/reference-fmus/2.0/cs/VanDerPol-cs.py index 5a8a0ad02..afe0dc79f 100644 --- a/testsuite/tests/reference-fmus/2.0/cs/VanDerPol-cs.py +++ b/testsuite/tests/reference-fmus/2.0/cs/VanDerPol-cs.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/VanDerPol.fmu', new_name='resources/VanDerPol.fmu') diff --git a/testsuite/tests/reference-fmus/2.0/me/BouncingBall-me.py b/testsuite/tests/reference-fmus/2.0/me/BouncingBall-me.py index a781c6374..150a24c67 100644 --- a/testsuite/tests/reference-fmus/2.0/me/BouncingBall-me.py +++ b/testsuite/tests/reference-fmus/2.0/me/BouncingBall-me.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/BouncingBall.fmu', new_name='resources/BouncingBall.fmu') diff --git a/testsuite/tests/reference-fmus/2.0/me/Dahlquist-me.py b/testsuite/tests/reference-fmus/2.0/me/Dahlquist-me.py index 8a3dd951a..f4372d4b7 100644 --- a/testsuite/tests/reference-fmus/2.0/me/Dahlquist-me.py +++ b/testsuite/tests/reference-fmus/2.0/me/Dahlquist-me.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Dahlquist.fmu', new_name='resources/Dahlquist.fmu') diff --git a/testsuite/tests/reference-fmus/2.0/me/Stair-me.py b/testsuite/tests/reference-fmus/2.0/me/Stair-me.py index 36b1a6b47..9a1a7bc9b 100644 --- a/testsuite/tests/reference-fmus/2.0/me/Stair-me.py +++ b/testsuite/tests/reference-fmus/2.0/me/Stair-me.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Stair.fmu', new_name='resources/Stair.fmu') diff --git a/testsuite/tests/reference-fmus/2.0/me/VanDerPol-me.py b/testsuite/tests/reference-fmus/2.0/me/VanDerPol-me.py index 9369c5da5..a5c7e2fc3 100644 --- a/testsuite/tests/reference-fmus/2.0/me/VanDerPol-me.py +++ b/testsuite/tests/reference-fmus/2.0/me/VanDerPol-me.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/VanDerPol.fmu', new_name='resources/VanDerPol.fmu') diff --git a/testsuite/tests/reference-fmus/3.0/cs/BouncingBall-cs.py b/testsuite/tests/reference-fmus/3.0/cs/BouncingBall-cs.py index fd3fa4e15..a001ae84d 100644 --- a/testsuite/tests/reference-fmus/3.0/cs/BouncingBall-cs.py +++ b/testsuite/tests/reference-fmus/3.0/cs/BouncingBall-cs.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/BouncingBall3.fmu', new_name='resources/BouncingBall3.fmu') diff --git a/testsuite/tests/reference-fmus/3.0/cs/Dahlquist-cs.py b/testsuite/tests/reference-fmus/3.0/cs/Dahlquist-cs.py index eb2b6d049..07f9e8272 100644 --- a/testsuite/tests/reference-fmus/3.0/cs/Dahlquist-cs.py +++ b/testsuite/tests/reference-fmus/3.0/cs/Dahlquist-cs.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Dahlquist3.fmu', new_name='resources/Dahlquist3.fmu') diff --git a/testsuite/tests/reference-fmus/3.0/cs/Stair-cs.py b/testsuite/tests/reference-fmus/3.0/cs/Stair-cs.py index 6438883f3..351b05769 100644 --- a/testsuite/tests/reference-fmus/3.0/cs/Stair-cs.py +++ b/testsuite/tests/reference-fmus/3.0/cs/Stair-cs.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Stair3.fmu', new_name='resources/Stair3.fmu') diff --git a/testsuite/tests/reference-fmus/3.0/cs/VanDerPol-cs.py b/testsuite/tests/reference-fmus/3.0/cs/VanDerPol-cs.py index 690faa01a..a5b0c4e8d 100644 --- a/testsuite/tests/reference-fmus/3.0/cs/VanDerPol-cs.py +++ b/testsuite/tests/reference-fmus/3.0/cs/VanDerPol-cs.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/VanDerPol3.fmu', new_name='resources/VanDerPol3.fmu') diff --git a/testsuite/tests/reference-fmus/3.0/me/BouncingBall-me.py b/testsuite/tests/reference-fmus/3.0/me/BouncingBall-me.py index 88d08e59c..068123b5f 100644 --- a/testsuite/tests/reference-fmus/3.0/me/BouncingBall-me.py +++ b/testsuite/tests/reference-fmus/3.0/me/BouncingBall-me.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/BouncingBall3.fmu', new_name='resources/BouncingBall3.fmu') diff --git a/testsuite/tests/reference-fmus/3.0/me/Dahlquist-me.py b/testsuite/tests/reference-fmus/3.0/me/Dahlquist-me.py index d6e98e50e..7720902d7 100644 --- a/testsuite/tests/reference-fmus/3.0/me/Dahlquist-me.py +++ b/testsuite/tests/reference-fmus/3.0/me/Dahlquist-me.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Dahlquist3.fmu', new_name='resources/Dahlquist3.fmu') diff --git a/testsuite/tests/reference-fmus/3.0/me/Stair-me.py b/testsuite/tests/reference-fmus/3.0/me/Stair-me.py index baec7ed3e..b9ca9adef 100644 --- a/testsuite/tests/reference-fmus/3.0/me/Stair-me.py +++ b/testsuite/tests/reference-fmus/3.0/me/Stair-me.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Stair3.fmu', new_name='resources/Stair3.fmu') diff --git a/testsuite/tests/reference-fmus/3.0/me/VanDerPol-me.py b/testsuite/tests/reference-fmus/3.0/me/VanDerPol-me.py index 6e22c80cb..e21d8cb7d 100644 --- a/testsuite/tests/reference-fmus/3.0/me/VanDerPol-me.py +++ b/testsuite/tests/reference-fmus/3.0/me/VanDerPol-me.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/VanDerPol3.fmu', new_name='resources/VanDerPol3.fmu') From 2244488d059617c585bba70ac7183dd81df12d0a Mon Sep 17 00:00:00 2001 From: arun3688 Date: Fri, 28 Aug 2026 21:46:58 +0200 Subject: [PATCH 5/6] fix tests --- testsuite/tests/reference-fmus/2.0/cs/Feedthrough-cs.py | 3 ++- testsuite/tests/reference-fmus/2.0/cs/Stair-cs.py | 1 + testsuite/tests/reference-fmus/2.0/me/Feedthrough-me.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/testsuite/tests/reference-fmus/2.0/cs/Feedthrough-cs.py b/testsuite/tests/reference-fmus/2.0/cs/Feedthrough-cs.py index cec31dea7..449416e13 100644 --- a/testsuite/tests/reference-fmus/2.0/cs/Feedthrough-cs.py +++ b/testsuite/tests/reference-fmus/2.0/cs/Feedthrough-cs.py @@ -4,8 +4,9 @@ ## win: yes ## asan: yes -from OMSimulator import SSP, CRef, Settings +from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Feedthrough.fmu', new_name='resources/Feedthrough.fmu') diff --git a/testsuite/tests/reference-fmus/2.0/cs/Stair-cs.py b/testsuite/tests/reference-fmus/2.0/cs/Stair-cs.py index 202cce940..176204df1 100644 --- a/testsuite/tests/reference-fmus/2.0/cs/Stair-cs.py +++ b/testsuite/tests/reference-fmus/2.0/cs/Stair-cs.py @@ -6,6 +6,7 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Stair.fmu', new_name='resources/Stair.fmu') diff --git a/testsuite/tests/reference-fmus/2.0/me/Feedthrough-me.py b/testsuite/tests/reference-fmus/2.0/me/Feedthrough-me.py index b48b99e74..6cd859d0e 100644 --- a/testsuite/tests/reference-fmus/2.0/me/Feedthrough-me.py +++ b/testsuite/tests/reference-fmus/2.0/me/Feedthrough-me.py @@ -4,8 +4,9 @@ ## win: yes ## asan: yes -from OMSimulator import SSP, CRef, Settings +from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True +Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Feedthrough.fmu', new_name='resources/Feedthrough.fmu') From e0c5efffb8b84e159cc24477306bc4599ec70884 Mon Sep 17 00:00:00 2001 From: arun3688 Date: Sat, 29 Aug 2026 19:33:34 +0200 Subject: [PATCH 6/6] expected output --- testsuite/tests/reference-fmus/2.0/cs/Feedthrough-cs.py | 3 +-- testsuite/tests/reference-fmus/2.0/me/Feedthrough-me.py | 3 +-- testsuite/tests/reference-fmus/2.0/me/Stair-me-events.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/testsuite/tests/reference-fmus/2.0/cs/Feedthrough-cs.py b/testsuite/tests/reference-fmus/2.0/cs/Feedthrough-cs.py index 449416e13..55ad3b1ab 100644 --- a/testsuite/tests/reference-fmus/2.0/cs/Feedthrough-cs.py +++ b/testsuite/tests/reference-fmus/2.0/cs/Feedthrough-cs.py @@ -6,7 +6,6 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True -Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Feedthrough.fmu', new_name='resources/Feedthrough.fmu') @@ -39,7 +38,7 @@ ## Result: ## info: Result file: Feedthrough-cs.mat (bufferSize=10) -## info: Parameter default.Feedthrough.String_parameter will not be stored in the result file, because the signal type is not supported +## info: Parameter default.default.Feedthrough.String_parameter will not be stored in the result file, because the signal type is not supported ## info: Feedthrough.Boolean_output: True ## info: Feedthrough.Enumeration_output: 2 ## info: Feedthrough.Float64_continuous_output: 3.1 diff --git a/testsuite/tests/reference-fmus/2.0/me/Feedthrough-me.py b/testsuite/tests/reference-fmus/2.0/me/Feedthrough-me.py index 6cd859d0e..99bf8f205 100644 --- a/testsuite/tests/reference-fmus/2.0/me/Feedthrough-me.py +++ b/testsuite/tests/reference-fmus/2.0/me/Feedthrough-me.py @@ -6,7 +6,6 @@ from OMSimulator import SSP, CRef, Settings, Capi Settings.suppressPath = True -Capi.setCommandLineOption("--stripRoot=true") model = SSP() model.addResource('../../../resources/Feedthrough.fmu', new_name='resources/Feedthrough.fmu') @@ -45,7 +44,7 @@ ## info: model doesn't contain any continuous state ## info: maximum step size for 'model.root': 0.001000 ## info: Result file: Feedthrough-me.mat (bufferSize=10) -## info: Parameter default.Feedthrough.String_parameter will not be stored in the result file, because the signal type is not supported +## info: Parameter default.default.Feedthrough.String_parameter will not be stored in the result file, because the signal type is not supported ## info: Feedthrough.Boolean_output: True ## info: Feedthrough.Enumeration_output: 2 ## info: Feedthrough.Float64_continuous_output: 3.1 diff --git a/testsuite/tests/reference-fmus/2.0/me/Stair-me-events.py b/testsuite/tests/reference-fmus/2.0/me/Stair-me-events.py index e9545fc1b..4aecc2ce4 100644 --- a/testsuite/tests/reference-fmus/2.0/me/Stair-me-events.py +++ b/testsuite/tests/reference-fmus/2.0/me/Stair-me-events.py @@ -39,7 +39,7 @@ with open("Stair-me-events.csv") as file: rows = list(csv.reader(file, skipinitialspace=True)) -counter = rows[0].index('default.Stair.counter') +counter = rows[0].index('default.default.Stair.counter') # group the data points by their time stamp groups = []