Skip to content

Commit

Permalink
Merge pull request #12 from klausschuch/start-description
Browse files Browse the repository at this point in the history
First draft of the standard
  • Loading branch information
chrbertsch authored Jul 5, 2024
2 parents dd512ba + 9fc2258 commit 09d67bc
Show file tree
Hide file tree
Showing 10 changed files with 860 additions and 17 deletions.
13 changes: 13 additions & 0 deletions docs/examples/combi1d_modelDescription.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
...
<Float64 name="combitable1d_example " valueReference="1" causality="parameter"
start="1.0 2.0 4.0 7.0
2.0 3.0 2.0 5.0
3.0 4.0 1.0 2.0">
<Dimension start="3"/>
<Dimension start="4"/>
</Float64>
<Int64 name="InterpolationOrder" valueReference="2" causality="parameter" start="1" />
<Float64 name="in_x" valueReference="3" causality="input" start="2.0"/>
<Float64 name="out_v1" valueReference="4" causality="local" />
<Float64 name="out_v3" valueReference="5" causality="local" />
...
15 changes: 15 additions & 0 deletions docs/examples/combi1d_terminalsAndIcons.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<fmiTerminalsAndIcons fmiVersion="3.0">
<Terminals>
<Terminal name="map2d" terminalKind="org.fmi-standard.fmi-ls-struct.map.combitable2d" matchingRule="org.fmi-standard.fmi-ls-struct.map">
<TerminalMemberVariable variableName="combitable1d_example" memberName="x" variableKind="org.fmi-standard.fmi-ls-struct.map.domain" />
<TerminalMemberVariable variableName="in_x" memberName="in_x" variableKind="org.fmi-standard.fmi-ls-struct.domainInput" />
<TerminalMemberVariable variableName="combitable1d_example" memberName="v1" variableKind="org.fmi-standard.fmi-ls-struct.map.codomain" />
<TerminalMemberVariable variableName="out_v1" memberName="out_v1" variableKind="org.fmi-standard.fmi-ls-struct.map.codomainOutput" />
<TerminalMemberVariable variableName="combitable1d_example" memberName="v2" variableKind="org.fmi-standard.fmi-ls-struct.map.codomain" />
<TerminalMemberVariable variableName="combitable1d_example" memberName="v3" variableKind="org.fmi-standard.fmi-ls-struct.map.codomain" />
<TerminalMemberVariable variableName="out_v3" memberName="out_v3" variableKind="org.fmi-standard.fmi-ls-struct.map.codomainOutput" />
<TerminalMemberVariable variableName="interpolationOrder" memberName="interpolationOrder" variableKind="com.example.related" />
</Terminal>
</Terminals>
</fmiTerminalsAndIcons>
13 changes: 13 additions & 0 deletions docs/examples/combi2d_modelDescription.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
...
<Float64 name="combitable2d_example" valueReference="1" causality="parameter"
start=" 0 1.0 2.0 3.0
1.0 1.0 3.0 5.0
2.0 2.0 4.0 6.0">
<Dimension start="3"/>
<Dimension start="4"/>
</Float64>
<Int64 name="InterpolationOrder" valueReference="2" causality="parameter" start="1" />
<Float64 name="in_x" valueReference="3" causality="input" start="2.0"/>
<Float64 name="in_y" valueReference="4" causality="local" />
<Float64 name="out_v" valueReference="5" causality="local" />
...
14 changes: 14 additions & 0 deletions docs/examples/combi2d_terminalsAndIcons.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<fmiTerminalsAndIcons fmiVersion="3.0">
<Terminals>
<Terminal name="map2d" terminalKind="org.fmi-standard.fmi-ls-struct.map.combitable2d" matchingRule="org.fmi-standard.fmi-ls-struct.map">
<TerminalMemberVariable variableName="combitable2d_example" memberName="x" variableKind="org.fmi-standard.fmi-ls-struct.map.domain" />
<TerminalMemberVariable variableName="in_x" memberName="in_x" variableKind="org.fmi-standard.fmi-ls-struct.domainInput" />
<TerminalMemberVariable variableName="combitable2d_example" memberName="y" variableKind="org.fmi-standard.fmi-ls-struct.map.domain" />
<TerminalMemberVariable variableName="in_y" memberName="in_y" variableKind="org.fmi-standard.fmi-ls-struct.map.domainInput" />
<TerminalMemberVariable variableName="combitable2d_example" memberName="v" variableKind="org.fmi-standard.fmi-ls-struct.map.codomain" />
<TerminalMemberVariable variableName="out_v" memberName="out_v" variableKind="org.fmi-standard.fmi-ls-struct.map.codomainOutput" />
<TerminalMemberVariable variableName="interpolationOrder" memberName="interpolationOrder" variableKind="com.example.related" />
</Terminal>
</Terminals>
</fmiTerminalsAndIcons>
21 changes: 21 additions & 0 deletions docs/examples/irregular_modelDescription.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
...
<Float64 name="x" valueReference="1" causality="parameter" start="2.0 3.0 10.0">
<Dimension start="3"/>
</Float64>
<Float64 name="y" valueReference="2" causality="parameter" start="10.0 25.0 30.0">
<Dimension start="3"/>
</Float64>
<Float64 name="z" valueReference="3" causality="parameter" start="10.0 28.0 30.0">
<Dimension start="3"/>
</Float64>
<Float64 name="v1" valueReference="4" causality="parameter" start="11.0 1.0 13.0">
<Dimension start="3"/>
</Float64>
<Float64 name="v2" valueReference="5" causality="parameter" start="1.0 4.0 3.0">
<Dimension start="3"/>
</Float64>
<Int64 name="InterpolationOrder" valueReference="6" causality="parameter" start="1" />
<Float64 name="in_x" valueReference="7" causality="input" start="2.0"/>
<Float64 name="in_z" valueReference="8" causality="local" />
<Float64 name="out_v2" valueReference="10" causality="local" />
...
16 changes: 16 additions & 0 deletions docs/examples/irregular_terminalsAndIcons.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<fmiTerminalsAndIcons fmiVersion="3.0">
<Terminals>
<Terminal name="points" terminalKind="org.fmi-standard.fmi-ls-struct.map.irregular" matchingRule="org.fmi-standard.fmi-ls-struct.map">
<TerminalMemberVariable variableName="x" memberName="x" variableKind="org.fmi-standard.fmi-ls-struct.map.domain" />
<TerminalMemberVariable variableName="in_x" memberName="in_x" variableKind="org.fmi-standard.fmi-ls-struct.domainInput" />
<TerminalMemberVariable variableName="y" memberName="y" variableKind="org.fmi-standard.fmi-ls-struct.map.domain" />
<TerminalMemberVariable variableName="z" memberName="z" variableKind="org.fmi-standard.fmi-ls-struct.map.domain" />
<TerminalMemberVariable variableName="in_z" memberName="in_y" variableKind="org.fmi-standard.fmi-ls-struct.map.domainInput" />
<TerminalMemberVariable variableName="v1" memberName="v1" variableKind="org.fmi-standard.fmi-ls-struct.map.codomain" />
<TerminalMemberVariable variableName="v2" memberName="v2" variableKind="org.fmi-standard.fmi-ls-struct.map.codomain" />
<TerminalMemberVariable variableName="out_v2" memberName="out_v2" variableKind="org.fmi-standard.fmi-ls-struct.map.codomainOutput" />
<TerminalMemberVariable variableName="interpolationOrder" memberName="interpolationOrder" variableKind="com.example.related" />
</Terminal>
</Terminals>
</fmiTerminalsAndIcons>
16 changes: 16 additions & 0 deletions docs/examples/modelDescription.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
...
<Float64 name="x" valueReference="1" causality="parameter" start="2.0 3.0">
<Dimension start="2"/>
</Float64>
<Float64 name="y" valueReference="2" causality="parameter" start="10.0 25.0 30.0">
<Dimension start="3"/>
</Float64>
<Float64 name="v" valueReference="3" causality="parameter" start="11.0 12.0 13.0 21.0 22.0 23.0">
<Dimension start="2"/>
<Dimension start="3"/>
</Float64>
<Int64 name="InterpolationOrder" valueReference="9" causality="parameter" start="1" />
<Float64 name="in_x" valueReference="6" causality="input" start="2.0"/>
<Float64 name="in_y" valueReference="7" causality="local" />
<Float64 name="out_v" valueReference="8" causality="local" />
...
14 changes: 14 additions & 0 deletions docs/examples/terminalsAndIcons.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<fmiTerminalsAndIcons fmiVersion="3.0">
<Terminals>
<Terminal name="map2d" terminalKind="org.fmi-standard.fmi-ls-struct.map.rectilinearGrid" matchingRule="org.fmi-standard.fmi-ls-struct.map">
<TerminalMemberVariable variableName="x" memberName="x" variableKind="org.fmi-standard.fmi-ls-struct.map.domain" />
<TerminalMemberVariable variableName="in_x" memberName="in_x" variableKind="org.fmi-standard.fmi-ls-struct.domainInput" />
<TerminalMemberVariable variableName="y" memberName="y" variableKind="org.fmi-standard.fmi-ls-struct.map.domain" />
<TerminalMemberVariable variableName="in_y" memberName="in_y" variableKind="org.fmi-standard.fmi-ls-struct.map.domainInput" />
<TerminalMemberVariable variableName="v" memberName="v" variableKind="org.fmi-standard.fmi-ls-struct.map.codomain" />
<TerminalMemberVariable variableName="out_v" memberName="out_v" variableKind="org.fmi-standard.fmi-ls-struct.map.codomainOutput" />
<TerminalMemberVariable variableName="interpolationOrder" memberName="interpolationOrder" variableKind="com.example.related" />
</Terminal>
</Terminals>
</fmiTerminalsAndIcons>
Loading

0 comments on commit 09d67bc

Please sign in to comment.