Skip to content

Commit c333302

Browse files
ClaasRostockClaasRostock
committed
OspSystemStructure.xml files: Added missing (yet mandatory) <Algorithm/> element:
<Algorithm>fixedStep</Algorithm>
1 parent ba89776 commit c333302

8 files changed

Lines changed: 92 additions & 80 deletions

File tree

‎tests/data/BouncingBall0/OspSystemStructure.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure"
3-
version="0.1">
2+
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure" version="0.1">
43
<BaseStepSize>0.01</BaseStepSize>
4+
<Algorithm>fixedStep</Algorithm>
55
<Simulators>
66
<Simulator name="bb" source="BouncingBall.fmu">
77
</Simulator>
@@ -12,4 +12,4 @@
1212
</Simulators>
1313
<Connections>
1414
</Connections>
15-
</OspSystemStructure>
15+
</OspSystemStructure>

‎tests/data/BouncingBall3D/OspSystemStructure.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure"
3-
version="0.1">
2+
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure" version="0.1">
43
<BaseStepSize>0.01</BaseStepSize>
4+
<Algorithm>fixedStep</Algorithm>
55
<Simulators>
66
<Simulator name="bb" source="BouncingBall3D.fmu">
77
</Simulator>
88
</Simulators>
99
<Connections>
1010
</Connections>
11-
</OspSystemStructure>
11+
</OspSystemStructure>

‎tests/data/BouncingBall3D/crane_table.xml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure" version="0.1">
2-
<StartTime>0.0</StartTime>
3-
<BaseStepSize>0.01</BaseStepSize>
4-
<Simulators>
5-
<Simulator name="simpleTable" source="SimpleTable.fmu" stepSize="0.01" />
6-
<Simulator name="mobileCrane" source="MobileCrane.fmu" stepSize="0.01" />
7-
</Simulators>
8-
<Functions />
9-
<Connections>
10-
<VariableConnection>
11-
<Variable simulator="simpleTable" name="outputs[0]" />
12-
<Variable simulator="mobileCrane" name="pedestal.angularVelocity" />
13-
</VariableConnection>
14-
</Connections>
15-
</OspSystemStructure>
3+
<StartTime>0.0</StartTime>
4+
<BaseStepSize>0.01</BaseStepSize>
5+
<Algorithm>fixedStep</Algorithm>
6+
<Simulators>
7+
<Simulator name="simpleTable" source="SimpleTable.fmu" stepSize="0.01" />
8+
<Simulator name="mobileCrane" source="MobileCrane.fmu" stepSize="0.01" />
9+
</Simulators>
10+
<Functions />
11+
<Connections>
12+
<VariableConnection>
13+
<Variable simulator="simpleTable" name="outputs[0]" />
14+
<Variable simulator="mobileCrane" name="pedestal.angularVelocity" />
15+
</VariableConnection>
16+
</Connections>
17+
</OspSystemStructure>

‎tests/data/BouncingBall3D/systemModel.xml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure" version="0.1">
2-
<StartTime>0.0</StartTime>
3-
<BaseStepSize>0.01</BaseStepSize>
4-
<Simulators>
5-
<Simulator name="simpleTable" source="SimpleTable.fmu" stepSize="0.01" />
6-
<Simulator name="mobileCrane" source="MobileCrane.fmu" stepSize="0.01" />
7-
</Simulators>
8-
<Functions />
9-
<Connections>
10-
<VariableConnection>
11-
<Variable simulator="simpleTable" name="outputs[0]" />
12-
<Variable simulator="mobileCrane" name="pedestal.angularVelocity" />
13-
</VariableConnection>
14-
</Connections>
15-
</OspSystemStructure>
3+
<StartTime>0.0</StartTime>
4+
<BaseStepSize>0.01</BaseStepSize>
5+
<Algorithm>fixedStep</Algorithm>
6+
<Simulators>
7+
<Simulator name="simpleTable" source="SimpleTable.fmu" stepSize="0.01" />
8+
<Simulator name="mobileCrane" source="MobileCrane.fmu" stepSize="0.01" />
9+
</Simulators>
10+
<Functions />
11+
<Connections>
12+
<VariableConnection>
13+
<Variable simulator="simpleTable" name="outputs[0]" />
14+
<Variable simulator="mobileCrane" name="pedestal.angularVelocity" />
15+
</VariableConnection>
16+
</Connections>
17+
</OspSystemStructure>

‎tests/data/MobileCrane/OspSystemStructure.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure" version="0.1">
2-
<Simulators>
3-
<Simulator name="mobileCrane" source="MobileCrane.fmu" stepSize="0.1">
4-
</Simulator>
5-
</Simulators>
6-
</OspSystemStructure>
3+
<Algorithm>fixedStep</Algorithm>
4+
<Simulators>
5+
<Simulator name="mobileCrane" source="MobileCrane.fmu" stepSize="0.1">
6+
</Simulator>
7+
</Simulators>
8+
</OspSystemStructure>

‎tests/data/MobileCrane/crane_table.xml‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure" version="0.1">
2-
<StartTime>0.0</StartTime>
3-
<BaseStepSize>0.01</BaseStepSize>
4-
<Simulators>
5-
<Simulator name="simpleTable" source="../SimpleTable/SimpleTable.fmu" stepSize="0.01">
6-
<InitialValues>
3+
<StartTime>0.0</StartTime>
4+
<BaseStepSize>0.01</BaseStepSize>
5+
<Algorithm>fixedStep</Algorithm>
6+
<Simulators>
7+
<Simulator name="simpleTable" source="../SimpleTable/SimpleTable.fmu" stepSize="0.01">
8+
<InitialValues>
79
<InitialValue variable="interpolate">
8-
<Boolean value="true" />
10+
<Boolean value="true" />
911
</InitialValue>
10-
</InitialValues>
11-
</Simulator>
12-
<Simulator name="mobileCrane" source="MobileCrane.fmu" stepSize="0.01">
13-
<InitialValues>
12+
</InitialValues>
13+
</Simulator>
14+
<Simulator name="mobileCrane" source="MobileCrane.fmu" stepSize="0.01">
15+
<InitialValues>
1416
<InitialValue variable="pedestal.pedestalMass">
15-
<Real value="5000.0" />
17+
<Real value="5000.0" />
1618
</InitialValue>
1719
<InitialValue variable="boom.boom[0]">
18-
<Real value="20.0" />
20+
<Real value="20.0" />
1921
</InitialValue>
20-
</InitialValues>
21-
</Simulator>
22-
</Simulators>
23-
<Functions />
24-
<Connections>
25-
<VariableConnection>
26-
<Variable simulator="simpleTable" name="outputs[0]" />
27-
<Variable simulator="mobileCrane" name="pedestal.angularVelocity" />
28-
</VariableConnection>
29-
</Connections>
30-
</OspSystemStructure>
22+
</InitialValues>
23+
</Simulator>
24+
</Simulators>
25+
<Functions />
26+
<Connections>
27+
<VariableConnection>
28+
<Variable simulator="simpleTable" name="outputs[0]" />
29+
<Variable simulator="mobileCrane" name="pedestal.angularVelocity" />
30+
</VariableConnection>
31+
</Connections>
32+
</OspSystemStructure>

‎tests/data/Oscillator/ForcedOscillator.xml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure" version="0.1">
2-
<StartTime>0.0</StartTime>
3-
<BaseStepSize>0.01</BaseStepSize>
4-
<Simulators>
5-
<Simulator name="osc" source="HarmonicOscillator.fmu" stepSize="0.01" />
6-
<Simulator name="drv" source="DrivingForce.fmu" stepSize="0.01" />
7-
</Simulators>
8-
<Functions />
9-
<Connections>
10-
<VariableConnection>
11-
<Variable simulator="drv" name="f[2]" />
12-
<Variable simulator="osc" name="f[2]" />
13-
</VariableConnection>
14-
</Connections>
15-
</OspSystemStructure>
3+
<StartTime>0.0</StartTime>
4+
<BaseStepSize>0.01</BaseStepSize>
5+
<Algorithm>fixedStep</Algorithm>
6+
<Simulators>
7+
<Simulator name="osc" source="HarmonicOscillator.fmu" stepSize="0.01" />
8+
<Simulator name="drv" source="DrivingForce.fmu" stepSize="0.01" />
9+
</Simulators>
10+
<Functions />
11+
<Connections>
12+
<VariableConnection>
13+
<Variable simulator="drv" name="f[2]" />
14+
<Variable simulator="osc" name="f[2]" />
15+
</VariableConnection>
16+
</Connections>
17+
</OspSystemStructure>

‎tests/data/SimpleTable/OspSystemStructure.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<OspSystemStructure xmlns="http://opensimulationplatform.com/MSMI/OSPSystemStructure" version="0.1">
2-
<Simulators>
3-
<Simulator name="tab" source="SimpleTable.fmu" stepSize="0.1" />
4-
</Simulators>
5-
</OspSystemStructure>
3+
<Algorithm>fixedStep</Algorithm>
4+
<Simulators>
5+
<Simulator name="tab" source="SimpleTable.fmu" stepSize="0.1" />
6+
</Simulators>
7+
</OspSystemStructure>

0 commit comments

Comments
 (0)