diff --git a/IDEAS/Buildings/Components/Validations/AirflowBoxModel.mo b/IDEAS/Buildings/Components/Validations/AirflowBoxModel.mo index 90cefce3e..f94eb53ca 100644 --- a/IDEAS/Buildings/Components/Validations/AirflowBoxModel.mo +++ b/IDEAS/Buildings/Components/Validations/AirflowBoxModel.mo @@ -3,13 +3,18 @@ model AirflowBoxModel extends Modelica.Icons.Example; - Box_Sim Energy_Only(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None)) annotation (Placement(transformation(rotation=0, extent={{-82,18},{-22,78}}))); + Box_Sim Energy_Only(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None)) annotation (Placement(transformation(rotation=0, extent={{-124,16}, + {-64,76}}))); Box_Sim Energy_n50Corr(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None, unify_n50=true)) annotation (Placement(transformation(rotation=0, - extent={{20,20},{80,80}}))); - Box_Sim IAQ_1port(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort), winD( + extent={{-22,18},{38,78}}))); + Box_Sim IAQ_1port(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort)) + annotation (Placement(transformation(rotation=0, extent={{-164,-82},{-104,-22}}))); + Box_Sim IAQ_1port_trickle(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort), + winD( use_trickle_vent=true, m_flow_nominal=50*1.2041/3600, - dp_nominal=2)) annotation (Placement(transformation(rotation=0,extent={{-80,-80},{-20,-20}}))); + dp_nominal=2)) annotation (Placement(transformation(rotation=0, extent={{-80, + -80},{-20,-20}}))); Box_Sim IAQ_2Port(sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts), use_operable_window=true, winD(crackOrOperableDoor(nCom=2), @@ -114,5 +119,7 @@ protected __Dymola_Algorithm="Dassl"), Documentation(info=" This model runs the 4 possible interzonal airflow configurations of a simple box model. Temperature is kept constant at 18° degrees -")); +"), + Diagram(coordinateSystem(extent={{-180,-100},{100,100}})), + Icon(coordinateSystem(extent={{-180,-100},{100,100}}))); end AirflowBoxModel; diff --git a/IDEAS/Buildings/Components/Validations/TwoStoreyBoxes.mo b/IDEAS/Buildings/Components/Validations/TwoStoreyBoxes.mo index bee3f0adc..8223d81f6 100644 --- a/IDEAS/Buildings/Components/Validations/TwoStoreyBoxes.mo +++ b/IDEAS/Buildings/Components/Validations/TwoStoreyBoxes.mo @@ -7,6 +7,7 @@ model TwoStoreyBoxes annotation (Placement(transformation(extent={{-100,80},{-80,100}}))); RectangularZoneTemplate Level( + redeclare package Medium = IDEAS.Media.Specialized.Air.PerfectGas, hFloor=5, T_start=291.15, bouTypA=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall, @@ -27,6 +28,7 @@ model TwoStoreyBoxes annotation (Placement(transformation(extent={{-40,20},{-20,40}}))); RectangularZoneTemplate Groundfloor( + redeclare package Medium = IDEAS.Media.Specialized.Air.PerfectGas, T_start=291.15, bouTypA=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall, bouTypB=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall, diff --git a/IDEAS/Buildings/Components/Window.mo b/IDEAS/Buildings/Components/Window.mo index 32a383d96..432547204 100644 --- a/IDEAS/Buildings/Components/Window.mo +++ b/IDEAS/Buildings/Components/Window.mo @@ -374,6 +374,12 @@ equation connect(outside_trickleCol.port_b, outsideAir.ports[if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts then 3 else 2]) annotation ( Line(points={{18,-102},{18,-110},{6,-110},{6,-80},{-20,-80}}, color = {0, 127, 255})); + connect(outside_trickleCol.port_a, trickleVent.port_a) + annotation (Line(points={{18,-82},{18,-80},{26,-80}}, color={0,127,255})); + if sim.interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort and use_trickle_vent then + connect(outsideAir.ports[2], trickleVent.port_a) annotation (Line(points={{-20,-80}, + {-20,-80},{26,-80}}, color={0,127,255})); + end if; connect(y_window_trunc.y, solWin.y) annotation ( Line(points={{-10,-79},{-10,-58}}, color = {0, 0, 127})); connect(y_window_trunc.y, crackOrOperableDoor.y) annotation (