Update OMSimulator (#7054)

OpenModelica · Dec 21, 2020 · 0e7708c · 0e7708c
1 parent 06d99fa
commit 0e7708c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/OMSimulator b/OMSimulator
diff --git a/testsuite/omsimulator/test03.mos b/testsuite/omsimulator/test03.mos
@@ -98,14 +98,6 @@ unloadOMSimulator();
 // <?xml version="1.0"?>
 // <ssd:SystemStructureDescription xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssd="http://ssp-standard.org/SSP1/SystemStructureDescription" xmlns:ssv="http://ssp-standard.org/SSP1/SystemStructureParameterValues" xmlns:ssm="http://ssp-standard.org/SSP1/SystemStructureParameterMapping" xmlns:ssb="http://ssp-standard.org/SSP1/SystemStructureSignalDictionary" xmlns:oms="https://raw.githubusercontent.com/OpenModelica/OMSimulator/master/schema/oms.xsd" name="test" version="1.0">
 // 	<ssd:System name="eoo">
-// 		<ssd:Annotations>
-// 			<ssc:Annotation type="org.openmodelica">
-// 				<oms:SimulationInformation>
-// 					<oms:FixedStepMaster description="oms-ma" stepSize="0.100000" absoluteTolerance="0.000100" relativeTolerance="0.000100" />
-// 				</oms:SimulationInformation>
-// 			</ssc:Annotation>
-// 		</ssd:Annotations>
-// 		<ssd:Connectors />
 // 		<ssd:Elements>
 // 			<ssd:Component name="source" type="application/x-fmu-sharedlibrary" source="resources/0001_source.fmu">
 // 				<ssd:Connectors>
@@ -131,12 +123,22 @@ unloadOMSimulator();
 // 				</ssd:Connectors>
 // 			</ssd:Component>
 // 		</ssd:Elements>
-// 		<ssd:Connections />
+// 		<ssd:Annotations>
+// 			<ssc:Annotation type="org.openmodelica">
+// 				<oms:Annotations>
+// 					<oms:SimulationInformation>
+// 						<oms:FixedStepMaster description="oms-ma" stepSize="0.100000" absoluteTolerance="0.000100" relativeTolerance="0.000100" />
+// 					</oms:SimulationInformation>
+// 				</oms:Annotations>
+// 			</ssc:Annotation>
+// 		</ssd:Annotations>
 // 	</ssd:System>
 // 	<ssd:DefaultExperiment startTime="0.000000" stopTime="1.000000">
 // 		<ssd:Annotations>
 // 			<ssc:Annotation type="org.openmodelica">
-// 				<oms:SimulationInformation resultFile="test_res.mat" loggingInterval="0.000000" bufferSize="10" signalFilter=".*" />
+// 				<oms:Annotations>
+// 					<oms:SimulationInformation resultFile="test_res.mat" loggingInterval="0.000000" bufferSize="10" signalFilter=".*" />
+// 				</oms:Annotations>
 // 			</ssc:Annotation>
 // 		</ssd:Annotations>
 // 	</ssd:DefaultExperiment>
@@ -146,14 +148,6 @@ unloadOMSimulator();
 // <?xml version="1.0"?>
 // <ssd:SystemStructureDescription xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssd="http://ssp-standard.org/SSP1/SystemStructureDescription" xmlns:ssv="http://ssp-standard.org/SSP1/SystemStructureParameterValues" xmlns:ssm="http://ssp-standard.org/SSP1/SystemStructureParameterMapping" xmlns:ssb="http://ssp-standard.org/SSP1/SystemStructureSignalDictionary" xmlns:oms="https://raw.githubusercontent.com/OpenModelica/OMSimulator/master/schema/oms.xsd" name="test" version="1.0">
 // 	<ssd:System name="eoo">
-// 		<ssd:Annotations>
-// 			<ssc:Annotation type="org.openmodelica">
-// 				<oms:SimulationInformation>
-// 					<oms:FixedStepMaster description="oms-ma" stepSize="0.100000" absoluteTolerance="0.000100" relativeTolerance="0.000100" />
-// 				</oms:SimulationInformation>
-// 			</ssc:Annotation>
-// 		</ssd:Annotations>
-// 		<ssd:Connectors />
 // 		<ssd:Elements>
 // 			<ssd:Component name="source" type="application/x-fmu-sharedlibrary" source="resources/0001_source.fmu">
 // 				<ssd:Connectors>
@@ -179,12 +173,22 @@ unloadOMSimulator();
 // 				</ssd:Connectors>
 // 			</ssd:Component>
 // 		</ssd:Elements>
-// 		<ssd:Connections />
+// 		<ssd:Annotations>
+// 			<ssc:Annotation type="org.openmodelica">
+// 				<oms:Annotations>
+// 					<oms:SimulationInformation>
+// 						<oms:FixedStepMaster description="oms-ma" stepSize="0.100000" absoluteTolerance="0.000100" relativeTolerance="0.000100" />
+// 					</oms:SimulationInformation>
+// 				</oms:Annotations>
+// 			</ssc:Annotation>
+// 		</ssd:Annotations>
 // 	</ssd:System>
 // 	<ssd:DefaultExperiment startTime="0.000000" stopTime="1.000000">
 // 		<ssd:Annotations>
 // 			<ssc:Annotation type="org.openmodelica">
-// 				<oms:SimulationInformation resultFile="test_res.mat" loggingInterval="0.000000" bufferSize="10" signalFilter=".*" />
+// 				<oms:Annotations>
+// 					<oms:SimulationInformation resultFile="test_res.mat" loggingInterval="0.000000" bufferSize="10" signalFilter=".*" />
+// 				</oms:Annotations>
 // 			</ssc:Annotation>
 // 		</ssd:Annotations>
 // 	</ssd:DefaultExperiment>