Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ibpsa/modelica-ibpsa into issue18…
Browse files Browse the repository at this point in the history
…30_redundantInitialConditions
  • Loading branch information
AntoineGautier committed Feb 7, 2024
2 parents bb1ed02 + 698e04d commit 8c78453
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
13 changes: 9 additions & 4 deletions IBPSA/Fluid/FMI/Conversion/AirToOutlet.mo
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ block AirToOutlet
if allowFlowReversal
"Temperature of the backward flowing medium in the connector outlet"
annotation (Placement(
visible=allowFloWReserval,
visible=allowFlowReversal,
transformation(extent={{20,20},{-20,-20}},
rotation=90,
origin={-60,-120}),
Expand All @@ -61,7 +61,7 @@ block AirToOutlet
if Medium.nXi > 0 and allowFlowReversal
"Water mass fraction per total air mass of the backward flowing medium in the connector outlet"
annotation (Placement(
visible=allowFloWReserval,
visible=allowFlowReversal,
transformation(extent={{20,20},{-20,-20}},
rotation=90,
origin={0,-120}),
Expand All @@ -74,7 +74,7 @@ block AirToOutlet
if allowFlowReversal
"Trace substances of the backward flowing medium in the connector outlet"
annotation (Placement(
visible=allowFloWReserval,
visible=allowFlowReversal,
transformation(extent={{20,20},{-20,-20}},
rotation=90,
origin={60,-120}),
Expand All @@ -93,7 +93,7 @@ protected
"Internal connector for water vapor concentration in kg/kg total air";

// Conditional connectors for the backward flowing medium
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";

Expand Down Expand Up @@ -174,6 +174,11 @@ for its usage.
</html>", revisions="<html>
<ul>
<li>
February 1, 2024, by Michael Wetter:<br/>
Added causality.<br/>
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1829\">#1829</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
13 changes: 9 additions & 4 deletions IBPSA/Fluid/FMI/Conversion/InletToAir.mo
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ block InletToAir
if allowFlowReversal
"Zone air temperature"
annotation (Placement(
visible=allowFloWReserval,
visible=allowFlowReversal,
transformation(extent={{-20,-20},{20,20}},
rotation=90,
origin={-60,-120}),
Expand All @@ -37,7 +37,7 @@ block InletToAir
if Medium.nXi > 0 and allowFlowReversal
"Zone air water mass fraction per total air mass"
annotation (Placement(
visible=allowFloWReserval,
visible=allowFlowReversal,
transformation(extent={{-20,-20},{20,20}},
rotation=90,
origin={0,-120}),
Expand All @@ -50,7 +50,7 @@ block InletToAir
if allowFlowReversal
"Zone air trace substances"
annotation (Placement(
visible=allowFloWReserval,
visible=allowFlowReversal,
transformation(extent={{-20,-20},{20,20}},
rotation=90,
origin={60,-120}),
Expand All @@ -77,7 +77,7 @@ block InletToAir
annotation (Placement(transformation(extent={{100,-100},{140,-60}})));

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";

Expand Down Expand Up @@ -172,6 +172,11 @@ for its usage.
</html>", revisions="<html>
<ul>
<li>
February 1, 2024, by Michael Wetter:<br/>
Added causality.<br/>
See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1829\">#1829</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

0 comments on commit 8c78453

Please sign in to comment.