Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added missing causality #1854

Merged
merged 4 commits into from
Mar 25, 2024
Merged

Added missing causality #1854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
137ee3a
Added missing causality
mwetter Mar 18, 2024
ba0db25
updated revision notes
mwetter Mar 18, 2024
e216401
Merge branch 'master' into issue1853_causal_acausal2
mwetter Mar 21, 2024
cc040bb
Updated reference result
mwetter Mar 21, 2024
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: 8 additions & 3 deletions IBPSA/Fluid/FMI/Adaptors/Inlet.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ model Inlet "Adaptor for connecting a fluid inlet to the FMI interface"
rotation=270,
origin={0,-110})));
protected
IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
input IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
redeclare final package Medium = Medium)
"Internal connector for fluid properties for back flow";
IBPSA.Fluid.FMI.Interfaces.PressureOutput p_in_internal
"Internal connector for pressure";
IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_in_internal
output IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_in_internal
"Internal connector for mass fraction of forward flow properties";
IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_out_internal
output IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_out_internal
"Internal connector for mass fraction of backward flow properties";
initial equation
assert(Medium.nXi < 2,
Expand Down Expand Up @@ -170,6 +170,11 @@ for how to use this model.
</html>", revisions="<html>
<ul>
<li>
March 18, 2024, by Michael Wetter:<br/>
Added causality.<br/>
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1853\">IBPSA, #1853</a>.
</li>
<li>
January 18, 2019, by Jianjun Hu:<br/>
Limited the media choice to moist air and water.
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
Expand Down
11 changes: 8 additions & 3 deletions IBPSA/Fluid/FMI/Adaptors/Outlet.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ model Outlet "Adaptor for connecting a fluid outlet to the FMI interface"
rotation=90,
origin={0,-120})));
protected
IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
output IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
redeclare final package Medium = Medium)
"Internal connector for fluid properties for back flow";
IBPSA.Fluid.FMI.Interfaces.PressureOutput p_in_internal
"Internal connector for pressure";

IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_in_internal
input IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_in_internal
"Internal connector for mass fraction of forward flow properties";
IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_out_internal
output IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_out_internal
"Internal connector for mass fraction of backward flow properties";
initial equation
assert(Medium.nXi < 2,
Expand Down Expand Up @@ -153,6 +153,11 @@ for how to use this model.
</html>", revisions="<html>
<ul>
<li>
March 18, 2024, by Michael Wetter:<br/>
Added causality.<br/>
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1853\">IBPSA, #1853</a>.
</li>
<li>
June 29, 2023, by Michael Wetter:<br/>
Corrected dimension of <code>X</code> in function call.<br/>
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1768\">#1768</a>.
Expand Down
9 changes: 7 additions & 2 deletions IBPSA/Fluid/FMI/FlowSplitter_u.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ protected
final parameter Modelica.Units.SI.MassFlowRate mAve_flow_nominal=sum(
m_flow_nominal)/nout "Average nominal mass flow rate";
protected
IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
input IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
redeclare final package Medium = Medium)
"Internal connector for fluid properties for back flow";
IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_out_internal = 0
output IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_out_internal = 0
"Internal connector for mass fraction of backward flow properties";

initial equation
Expand Down Expand Up @@ -145,6 +145,11 @@ the model stops with an error.
</html>", revisions="<html>
<ul>
<li>
March 18, 2024, by Michael Wetter:<br/>
Added causality.<br/>
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1853\">IBPSA, #1853</a>.
</li>
<li>
January 18, 2019, by Jianjun Hu:<br/>
Limited the media choice.
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
Expand Down
7 changes: 6 additions & 1 deletion IBPSA/Fluid/FMI/Sink_T.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ model Sink_T
rotation=180,
origin={-120,-80})));
protected
IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
input IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
redeclare final package Medium = Medium)
"Internal connector for fluid properties for back flow";
IBPSA.Fluid.FMI.Interfaces.PressureOutput p_in_internal
Expand Down Expand Up @@ -115,6 +115,11 @@ may be needed to iteratively solve for the mass flow rate.
</html>", revisions="<html>
<ul>
<li>
March 18, 2024, by Michael Wetter:<br/>
Added causality.<br/>
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1853\">IBPSA, #1853</a>.
</li>
<li>
January 18, 2019, by Jianjun Hu:<br/>
Limited the media choice to moist air and water.
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
Expand Down
7 changes: 6 additions & 1 deletion IBPSA/Fluid/FMI/Source_T.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ model Source_T
protected
IBPSA.Fluid.FMI.Interfaces.PressureOutput p_in_internal
"Internal connector for pressure";
IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_in_internal
input IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_in_internal
"Internal connector for mass fraction of forward flow properties";
initial equation
assert(Medium.nXi < 2,
Expand Down Expand Up @@ -102,6 +102,11 @@ and the mass flow rate of the system.
</html>", revisions="<html>
<ul>
<li>
March 18, 2024, by Michael Wetter:<br/>
Added causality.<br/>
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1853\">IBPSA, #1853</a>.
</li>
<li>
January 18, 2019, by Jianjun Hu:<br/>
Limited the media choice to moist air only.
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
Expand Down
78 changes: 40 additions & 38 deletions ...ReferenceResults/Dymola/IBPSA_Fluid_FMI_ExportContainers_Examples_FMUs_FlowSplitter_u.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,65 @@
last-generated=2016-12-22
last-generated=2024-03-21
statistics-fmu-dependencies=
{
"Outputs": {
"Derivatives": {},
"InitialUnknowns": {
"X_w_out_internal": [],
"inlet.backward.T": [],
"inlet.backward.X_w": [],
"outlet[1].forward.T": [
"inlet.forward.T"
],
"outlet[1].forward.X_w": [
"inlet.forward.X_w"
],
"outlet[1].m_flow": [
"m_flow_nominal[1]",
"u[1]"
],
],
"outlet[1].p": [
"inlet.p"
],
],
"outlet[2].forward.T": [
"inlet.forward.T"
],
"inlet.backward.T": [],
"outlet[1].forward.T": [
"inlet.forward.T"
],
],
"outlet[2].forward.X_w": [
"inlet.forward.X_w"
],
"outlet[2].m_flow": [
"m_flow_nominal[2]",
"u[2]"
],
"inlet.backward.X_w": [],
"outlet[1].forward.X_w": [
"inlet.forward.X_w"
],
],
"outlet[2].p": [
"inlet.p"
],
"outlet[2].forward.X_w": [
"inlet.forward.X_w"
]
},
"InitialUnknowns": {
},
"Outputs": {
"X_w_out_internal": [],
"inlet.backward.T": [],
"inlet.backward.X_w": [],
"outlet[1].forward.T": [
"inlet.forward.T"
],
"outlet[1].forward.X_w": [
"inlet.forward.X_w"
],
"outlet[1].m_flow": [
"m_flow_nominal[1]",
"u[1]"
],
],
"outlet[1].p": [
"inlet.p"
],
],
"outlet[2].forward.T": [
"inlet.forward.T"
],
"inlet.backward.T": [],
"outlet[1].forward.T": [
"inlet.forward.T"
],
],
"outlet[2].forward.X_w": [
"inlet.forward.X_w"
],
"outlet[2].m_flow": [
"m_flow_nominal[2]",
"u[2]"
],
"inlet.backward.X_w": [],
"outlet[1].forward.X_w": [
"inlet.forward.X_w"
],
],
"outlet[2].p": [
"inlet.p"
],
"outlet[2].forward.X_w": [
"inlet.forward.X_w"
]
},
"Derivatives": {}
}
}
Loading