Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Roberts/FMI3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@
<Float64 name="y2" valueReference="4" causality="output" initial="exact" start="0" nominal="1e-2"/>
<Float64 name="der(y2)" valueReference="5" derivative="4"/>
<Float64 name="y3" valueReference="6" causality="output" initial="approx" start="0" nominal="1e-2"/>
<Float64 name="y3_nominal" valueReference="7" variability="constant" start="1e-2"/>
<Float64 name="r" valueReference="8"/>
<Float64 name="g1" valueReference="9"/>
<Float64 name="g2" valueReference="10"/>
<Float64 name="r" valueReference="7"/>
<Float64 name="g1" valueReference="8"/>
<Float64 name="g2" valueReference="9"/>
</ModelVariables>

<ModelStructure>
Expand All @@ -54,8 +53,8 @@
<InitialUnknown valueReference="3" dependencies="2 4" dependenciesKind="dependent dependent"/>
<InitialUnknown valueReference="5" dependencies="2 4" dependenciesKind="dependent dependent"/>
<InitialUnknown valueReference="6" dependencies="2 4" dependenciesKind="constant constant"/>
<EventIndicator valueReference="9" dependencies="2" dependenciesKind="constant"/>
<EventIndicator valueReference="10" dependencies="6" dependenciesKind="constant"/>
<EventIndicator valueReference="8" dependencies="2" dependenciesKind="constant"/>
<EventIndicator valueReference="9" dependencies="6" dependenciesKind="constant"/>
</ModelStructure>

</fmiModelDescription>
1 change: 0 additions & 1 deletion Roberts/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ typedef enum {
vr_y2,
vr_der_y2,
vr_y3,
vr_y3_nominal,
vr_r,
vr_g1,
vr_g2,
Expand Down
29 changes: 11 additions & 18 deletions Roberts/fmi-ls-dae.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<fmiLayeredStandardManifest
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://fmi-standard.org/fmi-ls-manifest"
<fmiDAEManifest
xmlns:fmi-ls="http://fmi-standard.org/fmi-ls-manifest"
fmi-ls:fmi-ls-name="fmi-ls-dae"
fmi-ls:fmi-ls-version=""
fmi-ls:fmi-ls-description="Layered standard for DAE support in FMI">
<EnableDAE valueReference="1"/>
fmi-ls:fmi-ls-name="org.fmi-standard.fmi-ls-dae"
fmi-ls:fmi-ls-version="1.0.0-alpha.1"
fmi-ls:fmi-ls-description="Layered standard for DAE support in FMI 3">
<EnableDAEParameter valueReference="1"/>
<AlgebraicVariables>
<AlgebraicVariable
valueReference="6"
nominal="7"/>
<AlgebraicVariable valueReference="6"/>
</AlgebraicVariables>
<ModelStructure>
<ContinuousStateDerivative
Expand Down Expand Up @@ -41,12 +37,9 @@
valueReference="10"
dependencies="6"
dependenciesKind="constant"/>
<Residual>
<Formulation
index="1"
valueReference="8"
dependencies="2 4 6"
dependenciesKind="constant constant constant"/>
</Residual>
<Residual
valueReference="7"
dependencies="2 4 6"
dependenciesKind="constant constant constant"/>
</ModelStructure>
</fmiLayeredStandardManifest>
</fmiDAEManifest>
4 changes: 0 additions & 4 deletions Roberts/model.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ Status getFloat64(ModelInstance* comp, ValueReference vr, double values[], size_
ASSERT_NVALUES(1);
values[(*index)++] = M(y3);
return OK;
case vr_y3_nominal:
ASSERT_NVALUES(1);
values[(*index)++] = Y3_NOMINAL;
return OK;
case vr_r:
ASSERT_NVALUES(1);
values[(*index)++] = M(r);
Expand Down