Skip to content

Commit d43852a

Browse files
authored
Update OMSimulator (#895)
* Update OMSimulator * Update expected output
1 parent f2c00c8 commit d43852a

File tree

2 files changed

+53
-23
lines changed

2 files changed

+53
-23
lines changed

OMSimulator

Submodule OMSimulator updated 150 files

testsuite/omsimulator/test03.mos

Lines changed: 52 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -95,53 +95,83 @@ unloadOMSimulator();
9595
// "[Modelica 3.2.3/Blocks/Sources.mo:517:5-517:73:writable] Warning: Parameter freqHz has no value, and is fixed during initialization (fixed=true), using available start value (start=1.0) as default value.
9696
// "
9797
// <?xml version="1.0"?>
98-
// <ssd:SystemStructureDescription name="test" version="Draft20180219">
98+
// <ssd:SystemStructureDescription name="test" version="1.0">
9999
// <ssd:System name="eoo">
100-
// <ssd:SimulationInformation>
101-
// <FixedStepMaster description="oms-ma" stepSize="0.100000" />
102-
// </ssd:SimulationInformation>
100+
// <ssd:Annotations>
101+
// <ssd:Annotation type="org.openmodelica">
102+
// <oms:SimulationInformation>
103+
// <FixedStepMaster description="oms-ma" stepSize="0.100000" />
104+
// </oms:SimulationInformation>
105+
// </ssd:Annotation>
106+
// </ssd:Annotations>
107+
// <ssd:Connectors />
103108
// <ssd:Elements>
104109
// <ssd:Component name="source" type="application/x-fmu-sharedlibrary" source="resources/0001_source.fmu">
105110
// <ssd:Connectors>
106-
// <ssd:Connector name="y" kind="output" type="Real">
111+
// <ssd:Connector name="y" kind="output">
112+
// <ssc:Real />
107113
// <ssd:ConnectorGeometry x="1.000000" y="0.500000" />
108114
// </ssd:Connector>
109-
// <ssd:Connector name="amplitude" kind="parameter" type="Real" />
110-
// <ssd:Connector name="freqHz" kind="parameter" type="Real" />
111-
// <ssd:Connector name="offset" kind="parameter" type="Real" />
112-
// <ssd:Connector name="phase" kind="parameter" type="Real" />
113-
// <ssd:Connector name="startTime" kind="parameter" type="Real" />
115+
// <ssd:Connector name="amplitude" kind="parameter">
116+
// <ssc:Real />
117+
// </ssd:Connector>
118+
// <ssd:Connector name="freqHz" kind="parameter">
119+
// <ssc:Real />
120+
// </ssd:Connector>
121+
// <ssd:Connector name="offset" kind="parameter">
122+
// <ssc:Real />
123+
// </ssd:Connector>
124+
// <ssd:Connector name="phase" kind="parameter">
125+
// <ssc:Real />
126+
// </ssd:Connector>
127+
// <ssd:Connector name="startTime" kind="parameter">
128+
// <ssc:Real />
129+
// </ssd:Connector>
114130
// </ssd:Connectors>
115131
// </ssd:Component>
116132
// </ssd:Elements>
117-
// <ssd:Connectors />
118133
// <ssd:Connections />
119134
// </ssd:System>
120135
// <ssd:DefaultExperiment startTime="0.000000" stopTime="1.000000" />
121136
// </ssd:SystemStructureDescription>
122137
// info: Delete source
123138
// status: [correct] ok
124139
// <?xml version="1.0"?>
125-
// <ssd:SystemStructureDescription name="test" version="Draft20180219">
140+
// <ssd:SystemStructureDescription name="test" version="1.0">
126141
// <ssd:System name="eoo">
127-
// <ssd:SimulationInformation>
128-
// <FixedStepMaster description="oms-ma" stepSize="0.100000" />
129-
// </ssd:SimulationInformation>
142+
// <ssd:Annotations>
143+
// <ssd:Annotation type="org.openmodelica">
144+
// <oms:SimulationInformation>
145+
// <FixedStepMaster description="oms-ma" stepSize="0.100000" />
146+
// </oms:SimulationInformation>
147+
// </ssd:Annotation>
148+
// </ssd:Annotations>
149+
// <ssd:Connectors />
130150
// <ssd:Elements>
131151
// <ssd:Component name="source" type="application/x-fmu-sharedlibrary" source="resources/0001_source.fmu">
132152
// <ssd:Connectors>
133-
// <ssd:Connector name="y" kind="output" type="Real">
153+
// <ssd:Connector name="y" kind="output">
154+
// <ssc:Real />
134155
// <ssd:ConnectorGeometry x="1.000000" y="0.500000" />
135156
// </ssd:Connector>
136-
// <ssd:Connector name="amplitude" kind="parameter" type="Real" />
137-
// <ssd:Connector name="freqHz" kind="parameter" type="Real" />
138-
// <ssd:Connector name="offset" kind="parameter" type="Real" />
139-
// <ssd:Connector name="phase" kind="parameter" type="Real" />
140-
// <ssd:Connector name="startTime" kind="parameter" type="Real" />
157+
// <ssd:Connector name="amplitude" kind="parameter">
158+
// <ssc:Real />
159+
// </ssd:Connector>
160+
// <ssd:Connector name="freqHz" kind="parameter">
161+
// <ssc:Real />
162+
// </ssd:Connector>
163+
// <ssd:Connector name="offset" kind="parameter">
164+
// <ssc:Real />
165+
// </ssd:Connector>
166+
// <ssd:Connector name="phase" kind="parameter">
167+
// <ssc:Real />
168+
// </ssd:Connector>
169+
// <ssd:Connector name="startTime" kind="parameter">
170+
// <ssc:Real />
171+
// </ssd:Connector>
141172
// </ssd:Connectors>
142173
// </ssd:Component>
143174
// </ssd:Elements>
144-
// <ssd:Connectors />
145175
// <ssd:Connections />
146176
// </ssd:System>
147177
// <ssd:DefaultExperiment startTime="0.000000" stopTime="1.000000" />

0 commit comments

Comments
 (0)