diff --git a/IBPSA/Examples/SimpleHouse.mo b/IBPSA/Examples/SimpleHouse.mo
new file mode 100644
index 0000000000..28640bded5
--- /dev/null
+++ b/IBPSA/Examples/SimpleHouse.mo
@@ -0,0 +1,379 @@
+within IBPSA.Examples;
+model SimpleHouse
+ "Illustrative example of a simple heating, ventilation and room model"
+ extends Modelica.Icons.Example;
+
+ package MediumAir = IBPSA.Media.Air;
+ package MediumWater = IBPSA.Media.Water;
+
+ parameter Modelica.Units.SI.Area AWall=100 "Wall area";
+ parameter Modelica.Units.SI.Area AWin=5 "Window area";
+ parameter Real gWin(min=0, max=1, unit="1") = 0.3 "Solar heat gain coefficient of window";
+ parameter Modelica.Units.SI.Volume VZone=AWall*3 "Wall area";
+ parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=700
+ "Nominal capacity of heating system";
+ parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=QHea_flow_nominal/
+ 10/4200 "Nominal mass flow rate for water loop";
+ parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal=VZone*2*1.2/3600
+ "Nominal mass flow rate for air loop";
+
+ parameter Modelica.Units.SI.PressureDifference dpAir_nominal=200
+ "Pressure drop at nominal mass flow rate for air loop";
+ parameter Boolean allowFlowReversal=false
+ "= false because flow will not reverse in these circuits";
+
+ Modelica.Thermal.HeatTransfer.Components.HeatCapacitor walCap(
+ T(fixed=true),
+ C=10*AWall*0.05*1000*1000)
+ "Thermal mass of walls"
+ annotation (Placement(transformation(extent={{-10,-10},{10,10}},
+ rotation=270,
+ origin={170,0})));
+ Fluid.MixingVolumes.MixingVolume zon(
+ redeclare package Medium = MediumAir,
+ V=VZone,
+ nPorts=2,
+ energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+ m_flow_nominal=mAir_flow_nominal,
+ massDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial)
+ "Very based zone air model"
+ annotation (Placement(transformation(extent={{160,50},{180,30}})));
+ Modelica.Thermal.HeatTransfer.Components.ThermalResistor conRes(R=1/2/AWall)
+ "Thermal resistance for convective heat transfer with h=2" annotation (
+ Placement(transformation(
+ extent={{-10,-10},{10,10}},
+ rotation=270,
+ origin={110,20})));
+ Fluid.HeatExchangers.Radiators.RadiatorEN442_2 rad(
+ redeclare package Medium = MediumWater,
+ T_a_nominal=273.15 + 50,
+ T_b_nominal=273.15 + 40,
+ energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+ allowFlowReversal=allowFlowReversal,
+ Q_flow_nominal=QHea_flow_nominal)
+ "Radiator"
+ annotation (Placement(transformation(extent={{120,-140},{140,-120}})));
+
+ Fluid.Sources.Boundary_pT bouAir(
+ redeclare package Medium = MediumAir,
+ nPorts=2,
+ use_T_in=true) "Air boundary with constant temperature" annotation (
+ Placement(transformation(extent={{-10,-10},{10,10}}, origin={-110,140})));
+ Fluid.Sources.Boundary_pT bouWat(redeclare package Medium = MediumWater,
+ nPorts=1) "Pressure bound for water circuit" annotation (Placement(
+ transformation(extent={{-10,-10},{10,10}}, origin={20,-180})));
+ BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+ filNam=Modelica.Utilities.Files.loadResource("modelica://IBPSA/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"))
+ "Weather data reader"
+ annotation (Placement(transformation(extent={{-180,-10},{-160,10}})));
+ BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
+ annotation (Placement(transformation(extent={{-140,-10},{-120,10}}),
+ iconTransformation(extent={{-160,-10},{-140,10}})));
+ Modelica.Thermal.HeatTransfer.Components.ThermalResistor walRes(R=0.25/AWall/
+ 0.04) "Thermal resistor for wall: 25 cm of rockwool"
+ annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+ Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature TOut
+ "Exterior temperature boundary condition"
+ annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+ Fluid.HeatExchangers.HeaterCooler_u heaWat(
+ redeclare package Medium = MediumWater,
+ m_flow_nominal=mWat_flow_nominal,
+ energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+ allowFlowReversal=allowFlowReversal,
+ dp_nominal=5000,
+ Q_flow_nominal=QHea_flow_nominal)
+ "Heater for water circuit"
+ annotation (Placement(transformation(extent={{60,-140},{80,-120}})));
+
+ Fluid.Movers.FlowControlled_m_flow pum(
+ redeclare package Medium = MediumWater,
+ use_inputFilter=false,
+ m_flow_nominal=mWat_flow_nominal,
+ energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+ allowFlowReversal=allowFlowReversal,
+ nominalValuesDefineDefaultPressureCurve=true,
+ inputType=IBPSA.Fluid.Types.InputType.Stages,
+ massFlowRates=mWat_flow_nominal*{1}) "Pump"
+ annotation (Placement(transformation(extent={{140,-190},{120,-170}})));
+ Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor senTemZonAir
+ "Zone air temperature sensor"
+ annotation (Placement(transformation(extent={{120,170},{100,190}})));
+ Fluid.Actuators.Dampers.Exponential vavDam(
+ redeclare package Medium = MediumAir,
+ from_dp=true,
+ m_flow_nominal=mAir_flow_nominal,
+ dpDamper_nominal=10,
+ dpFixed_nominal=dpAir_nominal - 10) "Damper" annotation (Placement(
+ transformation(extent={{-10,10},{10,-10}}, origin={110,130})));
+
+ Fluid.Movers.FlowControlled_dp fan(
+ redeclare package Medium = MediumAir,
+ dp_nominal=dpAir_nominal,
+ use_inputFilter=false,
+ energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+ nominalValuesDefineDefaultPressureCurve=true,
+ m_flow_nominal=mAir_flow_nominal,
+ show_T=true) "Constant head fan" annotation (Placement(transformation(
+ extent={{-10,10},{10,-10}}, origin={-10,130})));
+ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow win
+ "Very simple window model"
+ annotation (Placement(transformation(extent={{60,-50},{80,-30}})));
+ Fluid.HeatExchangers.ConstantEffectiveness hexRec(
+ redeclare package Medium1 = MediumAir,
+ redeclare package Medium2 = MediumAir,
+ dp1_nominal=0,
+ dp2_nominal=0,
+ m1_flow_nominal=mAir_flow_nominal,
+ m2_flow_nominal=mAir_flow_nominal,
+ eps=0.85) "Heat exchanger for heat recuperation"
+ annotation (Placement(transformation(extent={{-45,124},{-75,156}})));
+ Modelica.Blocks.Logical.Hysteresis hysRad(uLow=273.15 + 20, uHigh=273.15 + 22)
+ "Hysteresis controller for radiator"
+ annotation (Placement(transformation(extent={{-80,-120},{-60,-100}})));
+ Modelica.Blocks.Logical.Not not1
+ "negation for enabling heating when temperatur is low"
+ annotation (Placement(transformation(extent={{-40,-120},{-20,-100}})));
+ Modelica.Blocks.Math.BooleanToReal booToRea "Boolean to real"
+ annotation (Placement(transformation(extent={{0,-120},{20,-100}})));
+ Modelica.Blocks.Sources.Constant con_dp(k=dpAir_nominal) "Pressure head"
+ annotation (Placement(transformation(extent={{-50,90},{-30,110}})));
+
+ Modelica.Blocks.Math.Gain gaiWin(k=AWin*gWin)
+ "Gain for window solar transmittance and area as HGloHor is in W/m2"
+ annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
+ Modelica.Blocks.Math.BooleanToInteger booToInt "Boolean to integer"
+ annotation (Placement(transformation(extent={{0,-160},{20,-140}})));
+ Controls.Continuous.LimPID conDam(
+ controllerType=Modelica.Blocks.Types.SimpleController.P,
+ yMin=0.25) "Controller for damper"
+ annotation (Placement(transformation(extent={{80,90},{100,110}})));
+ Modelica.Blocks.Sources.Constant TSetRoo(k=273.15 + 24)
+ "Room temperature set point for air system"
+ annotation (Placement(transformation(extent={{40,90},{60,110}})));
+ Fluid.HeatExchangers.SensibleCooler_T cooAir(
+ energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+ allowFlowReversal=allowFlowReversal,
+ m_flow_nominal=mAir_flow_nominal,
+ dp_nominal=0,
+ redeclare package Medium = MediumAir) "Cooling for supply air"
+ annotation (Placement(transformation(extent={{30,140},{50,120}})));
+ Modelica.Blocks.Sources.Constant TSupAirCoo(k=273.15 + 20)
+ "Cooling setpoint for supply air"
+ annotation (Placement(transformation(extent={{0,90},{20,110}})));
+equation
+ connect(conRes.port_a, zon.heatPort)
+ annotation (Line(points={{110,30},{110,40},{160,40}}, color={191,0,0}));
+ connect(weaDat.weaBus, weaBus) annotation (Line(
+ points={{-160,0},{-130,0}},
+ color={255,204,51},
+ thickness=0.5));
+ connect(walRes.port_b, walCap.port) annotation (Line(points={{80,0},{122,0},{122,
+ 1.77636e-15},{160,1.77636e-15}},
+ color={191,0,0}));
+ connect(TOut.T, weaBus.TDryBul)
+ annotation (Line(points={{-82,0},{-130,0}}, color={0,0,127}));
+ connect(TOut.port, walRes.port_a)
+ annotation (Line(points={{-60,0},{60,0}}, color={191,0,0}));
+ connect(heaWat.port_b, rad.port_a) annotation (Line(points={{80,-130},{120,-130}},
+ color={0,127,255}));
+ connect(bouWat.ports[1], heaWat.port_a) annotation (Line(points={{30,-180},{42,
+ -180},{42,-130},{60,-130}}, color={0,127,255}));
+ connect(rad.port_b, pum.port_a) annotation (Line(points={{140,-130},{150,-130},
+ {150,-180},{140,-180}},color={0,127,255}));
+ connect(senTemZonAir.port, zon.heatPort) annotation (Line(points={{120,180},{160,
+ 180},{160,40}}, color={191,0,0}));
+ connect(bouAir.ports[1], hexRec.port_b1) annotation (Line(points={{-100,139},{
+ -100,149.6},{-75,149.6}},
+ color={0,127,255}));
+ connect(rad.heatPortCon, zon.heatPort) annotation (Line(points={{128,-122.8},{
+ 128,40},{160,40}}, color={191,0,0}));
+ connect(not1.y, booToRea.u) annotation (Line(points={{-19,-110},{-2,-110}},
+ color={255,0,255}));
+ connect(not1.u, hysRad.y) annotation (Line(points={{-42,-110},{-59,-110}},
+ color={255,0,255}));
+ connect(booToRea.y, heaWat.u) annotation (Line(points={{21,-110},{40,-110},{40,
+ -124},{58,-124}}, color={0,0,127}));
+ connect(heaWat.port_a, pum.port_b) annotation (Line(points={{60,-130},{42,-130},
+ {42,-180},{120,-180}}, color={0,127,255}));
+ connect(con_dp.y, fan.dp_in) annotation (Line(points={{-29,100},{-10,100},{-10,
+ 118}}, color={0,0,127}));
+ connect(gaiWin.y, win.Q_flow) annotation (Line(points={{41,-40},{60,-40}},
+ color={0,0,127}));
+ connect(gaiWin.u, weaBus.HGloHor) annotation (Line(points={{18,-40},{-130,-40},
+ {-130,0}}, color={0,0,127}));
+ connect(booToInt.u, not1.y) annotation (Line(points={{-2,-150},{-11,-150},{-11,
+ -110},{-19,-110}}, color={255,0,255}));
+ connect(booToInt.y, pum.stage) annotation (Line(points={{21,-150},{130,-150},{
+ 130,-168}}, color={255,127,0}));
+ connect(hexRec.port_b2, fan.port_a) annotation (Line(points={{-45,130.4},{-30,
+ 130.4},{-30,130},{-20,130}}, color={0,127,255}));
+ connect(vavDam.port_b, zon.ports[1])
+ annotation (Line(points={{120,130},{140,130},{140,50},{169,50}},
+ color={0,127,255}));
+ connect(senTemZonAir.T, hysRad.u) annotation (Line(points={{99,180},{-209.25,180},
+ {-209.25,-110},{-82,-110}}, color={0,0,127}));
+ connect(senTemZonAir.T,conDam. u_s) annotation (Line(points={{99,180},{74,180},
+ {74,100},{78,100}}, color={0,0,127}));
+ connect(conDam.y, vavDam.y) annotation (Line(points={{101,100},{110,100},{110,
+ 118}},color={0,0,127}));
+ connect(TSetRoo.y,conDam. u_m) annotation (Line(points={{61,100},{70,100},{70,
+ 82},{90,82},{90,88}},
+ color={0,0,127}));
+ connect(fan.port_b, cooAir.port_a)
+ annotation (Line(points={{0,130},{30,130}}, color={0,127,255}));
+ connect(cooAir.port_b, vavDam.port_a)
+ annotation (Line(points={{50,130},{100,130}}, color={0,127,255}));
+ connect(TSupAirCoo.y, cooAir.TSet) annotation (Line(points={{21,100},{24,100},
+ {24,122},{28,122}},color={0,0,127}));
+ connect(bouAir.T_in, weaBus.TDryBul) annotation (Line(points={{-122,144},{
+ -130,144},{-130,0}}, color={0,0,127}));
+ connect(bouAir.ports[2], hexRec.port_a2) annotation (Line(points={{-100,141},{
+ -100,130.4},{-75,130.4}}, color={0,127,255}));
+ connect(hexRec.port_a1, zon.ports[2]) annotation (Line(points={{-45,149.6},{171,
+ 149.6},{171,50}}, color={0,127,255}));
+ connect(conRes.port_b, walCap.port) annotation (Line(points={{110,10},{110,0},
+ {122,0},{122,1.77636e-15},{160,1.77636e-15}}, color={191,0,0}));
+ connect(win.port, walCap.port) annotation (Line(points={{80,-40},{110,-40},{110,
+ 0},{132,0},{132,1.77636e-15},{160,1.77636e-15}}, color={191,0,0}));
+ connect(rad.heatPortRad, walCap.port) annotation (Line(points={{132,-122.8},{132,
+ 1.77636e-15},{160,1.77636e-15}}, color={191,0,0}));
+ annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,
+ -220},{220,220}}), graphics={
+ Rectangle(
+ extent={{-200,200},{200,80}},
+ fillColor={238,238,238},
+ fillPattern=FillPattern.Solid,
+ pattern=LinePattern.None),
+ Rectangle(
+ extent={{-200,-80.25},{200,-199.75}},
+ fillColor={238,238,238},
+ fillPattern=FillPattern.Solid,
+ pattern=LinePattern.None),
+ Rectangle(
+ extent={{-199.75,60},{-20.25,-60}},
+ fillColor={238,238,238},
+ fillPattern=FillPattern.Solid,
+ pattern=LinePattern.None),
+ Text(
+ extent={{-63,182},{-197,198}},
+ textColor={0,0,127},
+ fillColor={255,213,170},
+ fillPattern=FillPattern.Solid,
+ textString="Cooling and ventilation"),
+ Rectangle(
+ extent={{0,60},{200,-60}},
+ fillColor={238,238,238},
+ fillPattern=FillPattern.Solid,
+ pattern=LinePattern.None),
+ Text(
+ extent={{64.5,40.5},{-4.5,59.5}},
+ textColor={0,0,127},
+ fillColor={255,213,170},
+ fillPattern=FillPattern.Solid,
+ textString="Building"),
+ Text(
+ extent={{-137,-99},{-203,-81}},
+ textColor={0,0,127},
+ fillColor={255,213,170},
+ fillPattern=FillPattern.Solid,
+ textString="Heating"),
+ Text(
+ extent={{-141,41},{-199,59}},
+ textColor={0,0,127},
+ fillColor={255,213,170},
+ fillPattern=FillPattern.Solid,
+ textString="Weather")}),
+ experiment(Tolerance=1e-06, StopTime=3.1536e+07),
+ Documentation(revisions="
+
+-
+September 15, 2023, by Jelger Jansen:
+Move the example model to IBPSA.Examples,
+update the information section, and revise lay-out.
+This is for
+IBPSA, #1791.
+
+-
+June 15, 2022, by Hongxiang Fu:
+Changed conDam.yMin
from 0.1 to 0.25.
+This is for
+IBPSA, #1624.
+
+-
+May 8, 2017, by Michael Wetter:
+Updated heater model.
+This is for
+IBPSA, #763.
+
+-
+November 10, 2016, by Michael Wetter:
+Connected supply air temperature to outdoor air temperature,
+added cooling to supply air,
+changed capacity of heating system, switched heating pump off when heater is off,
+and added proportional controller for the air damper.
+This is
+for IBPSA, #584.
+
+-
+September 9, 2016, by Michael Wetter:
+Corrected error in window model, as the solar heat gain was
+not multiplied with the window area. Dymola 2017 reported this
+error due to mismatching units of W/m2
and W
.
+
+-
+June 23, 2016, by Michael Wetter:
+Changed graphical annotation.
+
+-
+March 11, 2016, by Michael Wetter:
+Corrected wrong limits for hysAir
so that
+uLow < uHigh
.
+This is
+for IBPSA, #429.
+
+-
+January 22, 2016, by Michael Wetter:
+Corrected type declaration of pressure difference.
+This is
+for IBPSA, #404.
+
+-
+September 19, 2015, by Filip Jorissen:
+First implementation.
+
+
+", info="
+
+This model contains a simple model of a house
+with a heating system, ventilation, and weather boundary conditions.
+It serves as a demonstration case of how the IBPSA
library can be used.
+
+
+A step-by-step tutorial on how to build up this model can be found in
+
+IBPSA.Examples.Tutorial.SimpleHouse.
+There are however some minor differences between this model and the models in the tutorial:
+
+
+-
+Different numerical values are used for almost all model parameters.
+
+-
+The solar irradiation (in W/m2) is calculated as
+the global horizontal irradiation multiplied with a solar heat gain coefficient
+instead of the direct normal irradiation.
+
+-
+The ventilation system is equiped with a cooler that sets the temperature
+of the air flow entering the zone equal to a constant value of 20°C.
+
+-
+The damper in the ventilation system is operated by
+a proportional-controller instead of a hysteresis controller.
+
+
+"),
+ __Dymola_Commands(file=
+ "modelica://IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos"
+ "Simulate and plot"));
+end SimpleHouse;
diff --git a/IBPSA/Examples/package.order b/IBPSA/Examples/package.order
index cb1be3b6b6..cea794e60c 100644
--- a/IBPSA/Examples/package.order
+++ b/IBPSA/Examples/package.order
@@ -1 +1,2 @@
Tutorial
+SimpleHouse
diff --git a/IBPSA/Fluid/Examples/SimpleHouse.mo b/IBPSA/Fluid/Examples/SimpleHouse.mo
deleted file mode 100644
index b4d8fd3ce0..0000000000
--- a/IBPSA/Fluid/Examples/SimpleHouse.mo
+++ /dev/null
@@ -1,349 +0,0 @@
-within IBPSA.Fluid.Examples;
-model SimpleHouse
- "Illustrative example of a simple heating, ventilation and room model"
- extends Modelica.Icons.Example;
-
- package MediumAir = IBPSA.Media.Air;
- package MediumWater = IBPSA.Media.Water;
-
- parameter Modelica.Units.SI.Area A_wall=100 "Wall area";
- parameter Modelica.Units.SI.Area A_win=5 "Window area";
- parameter Real g_win(min=0, max=1, unit="1") = 0.3 "Solar heat gain coefficient of window";
- parameter Modelica.Units.SI.Volume V_zone=A_wall*3 "Wall area";
- parameter Modelica.Units.SI.HeatFlowRate QHea_nominal=700
- "Nominal capacity of heating system";
- parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=QHea_nominal/10/
- 4200 "Nominal mass flow rate for water loop";
- parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal=V_zone*2*1.2/3600
- "Nominal mass flow rate for air loop";
-
- parameter Modelica.Units.SI.PressureDifference dpAir_nominal=200
- "Pressure drop at nominal mass flow rate for air loop";
- parameter Boolean allowFlowReversal=false
- "= false because flow will not reverse in these circuits";
-
- Modelica.Thermal.HeatTransfer.Components.HeatCapacitor walCap(
- T(fixed=true),
- C=10*A_wall*0.05*1000*1000)
- "Thermal mass of walls"
- annotation (Placement(transformation(extent={{-10,-10},{10,10}},
- rotation=270,
- origin={142,-8})));
- MixingVolumes.MixingVolume zone(
- redeclare package Medium = MediumAir,
- V=V_zone,
- nPorts=2,
- energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
- m_flow_nominal=mAir_flow_nominal,
- massDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial)
- "Very based zone air model"
- annotation (Placement(transformation(extent={{102,140},{82,160}})));
- Modelica.Thermal.HeatTransfer.Components.ThermalResistor convRes(R=1/2/A_wall)
- "Thermal resistance for convective heat transfer with h=2"
- annotation (Placement(transformation(extent={{-10,-10},{10,10}},
- rotation=270,
- origin={132,22})));
- HeatExchangers.Radiators.RadiatorEN442_2 rad(
- redeclare package Medium = MediumWater,
- T_a_nominal=273.15 + 50,
- T_b_nominal=273.15 + 40,
- energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
- allowFlowReversal=allowFlowReversal,
- Q_flow_nominal=QHea_nominal) "Radiator"
- annotation (Placement(transformation(extent={{104,-116},{124,-96}})));
-
- Sources.Boundary_pT bouAir(redeclare package Medium = MediumAir, nPorts=2,
- use_T_in=true) "Air boundary with constant temperature"
- annotation (Placement(transformation(
- extent={{-10,-10},{10,10}},
- origin={-112,140})));
- Sources.Boundary_pT bouWat(redeclare package Medium = MediumWater, nPorts=1)
- "Pressure bound for water circuit" annotation (Placement(transformation(
- extent={{-10,-10},{10,10}},
- origin={-8,-170})));
- BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
- filNam=Modelica.Utilities.Files.loadResource("modelica://IBPSA/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"))
- "Weather data reader"
- annotation (Placement(transformation(extent={{-200,-18},{-180,2}})));
- BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
- annotation (Placement(transformation(extent={{-162,-18},{-142,2}})));
- Modelica.Thermal.HeatTransfer.Components.ThermalResistor wallRes(R=0.25/
- A_wall/0.04) "Thermal resistor for wall: 25 cm of rockwool"
- annotation (Placement(transformation(extent={{66,-10},{86,10}})));
- Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature Tout
- "Exterior temperature boundary condition"
- annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
- HeatExchangers.HeaterCooler_u heaWat(
- redeclare package Medium = MediumWater,
- m_flow_nominal=mWat_flow_nominal,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
- allowFlowReversal=allowFlowReversal,
- dp_nominal=5000,
- Q_flow_nominal=QHea_nominal) "Heater for water circuit"
- annotation (Placement(transformation(extent={{44,-116},{64,-96}})));
-
- Movers.FlowControlled_m_flow pump(
- redeclare package Medium = MediumWater,
- use_inputFilter=false,
- m_flow_nominal=mWat_flow_nominal,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
- allowFlowReversal=allowFlowReversal,
- nominalValuesDefineDefaultPressureCurve=true,
- inputType=IBPSA.Fluid.Types.InputType.Stages,
- massFlowRates=mWat_flow_nominal*{1}) "Pump"
- annotation (Placement(transformation(extent={{80,-180},{60,-160}})));
- Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor senTemZonAir
- "Zone air temperature sensor"
- annotation (Placement(transformation(extent={{80,170},{60,190}})));
- Actuators.Dampers.Exponential vavDam(
- redeclare package Medium = MediumAir,
- from_dp=true,
- m_flow_nominal=mAir_flow_nominal,
- dpDamper_nominal=10,
- dpFixed_nominal=dpAir_nominal - 10)
- "Damper" annotation (Placement(transformation(extent={{-10,10},{10,
- -10}}, origin={72,120})));
-
- Movers.FlowControlled_dp fan(
- redeclare package Medium = MediumAir,
- dp_nominal=dpAir_nominal,
- use_inputFilter=false,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
- nominalValuesDefineDefaultPressureCurve=true,
- m_flow_nominal=mAir_flow_nominal,
- show_T=true) "Constant head fan" annotation (Placement(transformation(
- extent={{-10,-10},{10,10}},
- origin={-22,120})));
- Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow window
- "Very simple window model"
- annotation (Placement(transformation(extent={{-20,-36},{0,-16}})));
- HeatExchangers.ConstantEffectiveness hexRec(
- redeclare package Medium1 = MediumAir,
- redeclare package Medium2 = MediumAir,
- dp1_nominal=0,
- dp2_nominal=0,
- m1_flow_nominal=mAir_flow_nominal,
- m2_flow_nominal=mAir_flow_nominal,
- eps=0.85) "Heat exchanger for heat recuperation"
- annotation (Placement(transformation(extent={{-54,114},{-84,146}})));
- Modelica.Blocks.Logical.Hysteresis hysRad(uLow=273.15 + 20, uHigh=273.15 + 22)
- "Hysteresis controller for radiator"
- annotation (Placement(transformation(extent={{-74,-110},{-54,-90}})));
- Modelica.Blocks.Math.BooleanToReal booleanToReal1 "Boolean to real"
- annotation (Placement(transformation(extent={{-16,-110},{4,-90}})));
- Modelica.Blocks.Logical.Not not1
- "negation for enabling heating when temperatur is low"
- annotation (Placement(transformation(extent={{-46,-110},{-26,-90}})));
- Modelica.Blocks.Sources.Constant const_dp(k=dpAir_nominal) "Pressure head"
- annotation (Placement(transformation(extent={{-52,150},{-32,170}})));
-
- Modelica.Blocks.Math.Gain gaiWin(k=A_win*g_win)
- "Gain for window solar transmittance and area as HGloHor is in W/m2"
- annotation (Placement(transformation(extent={{-60,-36},{-40,-16}})));
- Modelica.Blocks.Math.BooleanToInteger booleanToInt "Boolean to integer"
- annotation (Placement(transformation(extent={{-16,-144},{4,-124}})));
- Controls.Continuous.LimPID conDam(
- controllerType=Modelica.Blocks.Types.SimpleController.P,
- yMin=0.25) "Controller for damper"
- annotation (Placement(transformation(extent={{-20,80},{0,100}})));
- Modelica.Blocks.Sources.Constant TSetRoo(k=273.15 + 24)
- "Room temperature set point for air system"
- annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
- HeatExchangers.SensibleCooler_T cooAir(
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
- allowFlowReversal=allowFlowReversal,
- m_flow_nominal=mAir_flow_nominal,
- dp_nominal=0,
- redeclare package Medium = MediumAir) "Cooling for supply air"
- annotation (Placement(transformation(extent={{30,110},{50,130}})));
- Modelica.Blocks.Sources.Constant TSupAirCoo(k=273.15 + 20)
- "Cooling setpoint for supply air"
- annotation (Placement(transformation(extent={{-12,150},{8,170}})));
-equation
- connect(convRes.port_b, walCap.port)
- annotation (Line(points={{132,12},{132,12},{132,-8}}, color={191,0,0}));
- connect(convRes.port_a, zone.heatPort) annotation (Line(points={{132,32},{132,
- 150},{102,150}}, color={191,0,0}));
- connect(weaDat.weaBus, weaBus) annotation (Line(
- points={{-180,-8},{-180,-8},{-152,-8}},
- color={255,204,51},
- thickness=0.5));
- connect(wallRes.port_b, walCap.port) annotation (Line(points={{86,0},{132,0},{
- 132,-6},{132,-8}}, color={191,0,0}));
- connect(Tout.T, weaBus.TDryBul)
- annotation (Line(points={{-22,0},{-152,0},{-152,-8}}, color={0,0,127}));
- connect(Tout.port, wallRes.port_a)
- annotation (Line(points={{0,0},{0,0},{66,0}}, color={191,0,0}));
- connect(heaWat.port_b, rad.port_a) annotation (Line(points={{64,-106},{84,-106},
- {104,-106}}, color={0,127,255}));
- connect(bouWat.ports[1], heaWat.port_a) annotation (Line(points={{2,-170},{40,
- -170},{40,-106},{44,-106}}, color={0,127,255}));
- connect(rad.port_b, pump.port_a) annotation (Line(points={{124,-106},{130,-106},
- {130,-170},{80,-170}}, color={0,127,255}));
- connect(senTemZonAir.port, zone.heatPort) annotation (Line(points={{80,180},{80,
- 180},{112,180},{112,150},{102,150}},
- color={191,0,0}));
- connect(window.port, walCap.port) annotation (Line(points={{0,-26},{132,-26},{
- 132,-12},{132,-8}},
- color={191,0,0}));
- connect(bouAir.ports[1], hexRec.port_b1) annotation (Line(points={{-102,142},{
- -102,139.6},{-84,139.6}},
- color={0,127,255}));
- connect(hexRec.port_a1, zone.ports[1]) annotation (Line(points={{-54,139.6},{85,
- 139.6},{85,140},{94,140}}, color={0,127,255}));
- connect(rad.heatPortCon, zone.heatPort) annotation (Line(points={{112,-98.8},{
- 112,-98.8},{112,48},{112,150},{102,150}}, color={191,0,0}));
- connect(rad.heatPortRad, walCap.port) annotation (Line(points={{116,-98.8},{116,
- -98.8},{116,-70},{116,-26},{132,-26},{132,-8}},
- color={191,0,0}));
- connect(not1.y, booleanToReal1.u) annotation (Line(points={{-25,-100},{-22,-100},
- {-18,-100}}, color={255,0,255}));
- connect(not1.u, hysRad.y) annotation (Line(points={{-48,-100},{-52,-100},{-53,
- -100}}, color={255,0,255}));
- connect(booleanToReal1.y, heaWat.u) annotation (Line(points={{5,-100},{16,-100},
- {26,-100},{42,-100}}, color={0,0,127}));
- connect(heaWat.port_a, pump.port_b) annotation (Line(points={{44,-106},{40,-106},
- {40,-112},{40,-170},{60,-170}}, color={0,127,255}));
- connect(const_dp.y, fan.dp_in) annotation (Line(points={{-31,160},{-22,160},{
- -22,132},{-22,132}}, color={0,0,127}));
- connect(gaiWin.y, window.Q_flow) annotation (Line(points={{-39,-26},{-34,-26},
- {-30,-26},{-20,-26}}, color={0,0,127}));
- connect(gaiWin.u, weaBus.HGloHor) annotation (Line(points={{-62,-26},{-90,-26},
- {-152,-26},{-152,-8}}, color={0,0,127}));
- connect(booleanToInt.u, not1.y) annotation (Line(points={{-18,-134},{-22,-134},
- {-22,-100},{-25,-100}}, color={255,0,255}));
- connect(booleanToInt.y, pump.stage) annotation (Line(points={{5,-134},{32,-134},
- {70,-134},{70,-158}}, color={255,127,0}));
- connect(bouAir.ports[2], hexRec.port_a2) annotation (Line(points={{-102,138},{
- -102,142},{-90,142},{-90,120.4},{-84,120.4}}, color={0,127,255}));
- connect(hexRec.port_b2, fan.port_a) annotation (Line(points={{-54,120.4},{-44,
- 120.4},{-44,120},{-32,120}}, color={0,127,255}));
- connect(vavDam.port_b, zone.ports[2])
- annotation (Line(points={{82,120},{90,120},{90,140}}, color={0,127,255}));
- connect(senTemZonAir.T, hysRad.u) annotation (Line(points={{60,180},{60,180},{
- -132,180},{-132,-100},{-76,-100}}, color={0,0,127}));
- connect(senTemZonAir.T,conDam. u_s) annotation (Line(points={{60,180},{60,180},
- {-132,180},{-132,90},{-62,90},{-22,90}},
- color={0,0,127}));
- connect(conDam.y, vavDam.y) annotation (Line(points={{1,90},{26,90},{72,90},{72,
- 108}},color={0,0,127}));
- connect(TSetRoo.y,conDam. u_m) annotation (Line(points={{-39,70},{-40,70},{-36,
- 70},{-40,70},{-10,70},{-10,78}},
- color={0,0,127}));
- connect(fan.port_b, cooAir.port_a)
- annotation (Line(points={{-12,120},{30,120}}, color={0,127,255}));
- connect(cooAir.port_b, vavDam.port_a)
- annotation (Line(points={{50,120},{50,120},{62,120}}, color={0,127,255}));
- connect(TSupAirCoo.y, cooAir.TSet) annotation (Line(points={{9,160},{20,160},{
- 20,128},{28,128}}, color={0,0,127}));
- connect(bouAir.T_in, weaBus.TDryBul) annotation (Line(points={{-124,144},{
- -152,144},{-152,-8}}, color={0,0,127}));
- annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-240,
- -220},{200,220}}), graphics={
- Rectangle(
- extent={{-222,200},{180,50}},
- fillColor={238,238,238},
- fillPattern=FillPattern.Solid,
- pattern=LinePattern.None),
- Rectangle(
- extent={{-220,-60},{180,-200}},
- fillColor={238,238,238},
- fillPattern=FillPattern.Solid,
- pattern=LinePattern.None),
- Rectangle(
- extent={{-220,40},{20,-48}},
- fillColor={238,238,238},
- fillPattern=FillPattern.Solid,
- pattern=LinePattern.None),
- Text(
- extent={{-78,182},{-212,198}},
- textColor={0,0,127},
- fillColor={255,213,170},
- fillPattern=FillPattern.Solid,
- textString="Cooling and ventilation"),
- Rectangle(
- extent={{40,40},{180,-46}},
- fillColor={238,238,238},
- fillPattern=FillPattern.Solid,
- pattern=LinePattern.None),
- Text(
- extent={{98,20},{32,38}},
- textColor={0,0,127},
- fillColor={255,213,170},
- fillPattern=FillPattern.Solid,
- textString="Wall"),
- Text(
- extent={{-148,-86},{-214,-68}},
- textColor={0,0,127},
- fillColor={255,213,170},
- fillPattern=FillPattern.Solid,
- textString="Heating"),
- Text(
- extent={{-154,20},{-212,38}},
- textColor={0,0,127},
- fillColor={255,213,170},
- fillPattern=FillPattern.Solid,
- textString="Weather")}),
- experiment(Tolerance=1e-06, StopTime=3.1536e+07),
- Documentation(revisions="
-
--
-June 15, 2022, by Hongxiang Fu:
-Changed conDam.yMin
from 0.1 to 0.25.
-This is for
-IBPSA, #1624.
-
--
-May 8, 2017, by Michael Wetter:
-Updated heater model.
-This is for
-IBPSA, #763.
-
--
-November 10, 2016, by Michael Wetter:
-Connected supply air temperature to outdoor air temperature,
-added cooling to supply air,
-changed capacity of heating system, switched heating pump off when heater is off,
-and added proportional controller for the air damper.
-This is
-for #584.
-
--
-September 9, 2016, by Michael Wetter:
-Corrected error in window model, as the solar heat gain was
-not multiplied with the window area. Dymola 2017 reported this
-error due to mismatching units of W/m2
and W
.
-
--
-June 23, 2016, by Michael Wetter:
-Changed graphical annotation.
-
--
-March 11, 2016, by Michael Wetter:
-Corrected wrong limits for hysAir
so that
-uLow < uHigh
.
-This is
-for #429.
-
--
-January 22, 2016, by Michael Wetter:
-Corrected type declaration of pressure difference.
-This is
-for #404.
-
--
-September 19, 2015, by Filip Jorissen:
-First implementation.
-
-
-", info="
-
-This model contains a simple model of a house
-with a heating system, ventilation and weather boundary conditions.
-It serves as a demonstration case of how the IBPSA
library can be used.
-
-"),
- __Dymola_Commands(file=
- "modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Examples/SimpleHouse.mos"
- "Simulate and plot"));
-end SimpleHouse;
diff --git a/IBPSA/Fluid/Examples/package.order b/IBPSA/Fluid/Examples/package.order
index dfba118b86..3aca7c2d91 100644
--- a/IBPSA/Fluid/Examples/package.order
+++ b/IBPSA/Fluid/Examples/package.order
@@ -1,4 +1,3 @@
ResistanceVolumeFlowReversal
-SimpleHouse
FlowSystem
Performance
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_SimpleHouse.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
similarity index 75%
rename from IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_SimpleHouse.txt
rename to IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
index 7150f143e5..c7c87ba983 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_SimpleHouse.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
@@ -12,7 +12,7 @@ statistics-simulation=
"numerical Jacobians": "0"
}
time=[0e+00, 3.1536e+07]
-zone.T=[2.931499938964844e+02, 2.938165893554688e+02, 2.948394775390625e+02, 2.951160888671875e+02, 2.933800964355469e+02, 2.949007263183594e+02, 2.937331848144531e+02, 2.949746704101562e+02, 2.94963623046875e+02, 2.944449768066406e+02, 2.949704284667969e+02, 2.932081604003906e+02, 2.945489196777344e+02, 2.949959106445312e+02, 2.950682983398438e+02, 2.951320190429688e+02, 2.94079345703125e+02, 2.940500793457031e+02, 2.93251708984375e+02, 2.933990783691406e+02, 2.932026672363281e+02, 2.936112365722656e+02, 2.94181396484375e+02, 2.951331481933594e+02, 2.93716552734375e+02, 2.932184143066406e+02, 2.950964050292969e+02, 2.934932556152344e+02, 2.940997009277344e+02, 2.96098876953125e+02, 2.970375061035156e+02, 2.962566223144531e+02, 2.963293762207031e+02, 2.957511291503906e+02, 2.968561096191406e+02, 2.973106079101562e+02, 2.972330017089844e+02, 2.974053955078125e+02, 2.972986145019531e+02, 2.974791564941406e+02, 2.975252075195312e+02, 2.975371398925781e+02, 2.97523681640625e+02, 2.975829772949219e+02, 2.975098876953125e+02, 2.974816284179688e+02, 2.975858459472656e+02, 2.975862426757812e+02, 2.97521728515625e+02, 2.975988159179688e+02, 2.974871520996094e+02, 2.975801086425781e+02, 2.97568115234375e+02, 2.975059204101562e+02, 2.975872802734375e+02, 2.97644775390625e+02, 2.975877075195312e+02, 2.975962524414062e+02, 2.976087341308594e+02, 2.975819396972656e+02, 2.975243835449219e+02, 2.975371398925781e+02, 2.974706420898438e+02, 2.975225830078125e+02, 2.975242614746094e+02, 2.97474609375e+02, 2.974830017089844e+02, 2.974789428710938e+02, 2.974937438964844e+02, 2.974887390136719e+02, 2.974450988769531e+02, 2.974119873046875e+02, 2.970668029785156e+02, 2.966719360351562e+02, 2.971568603515625e+02, 2.972576599121094e+02, 2.966737670898438e+02, 2.959289245605469e+02, 2.957213745117188e+02, 2.9481201171875e+02, 2.944169616699219e+02, 2.947103271484375e+02, 2.939195556640625e+02, 2.940602722167969e+02, 2.940169677734375e+02, 2.937295227050781e+02, 2.931671142578125e+02, 2.933880310058594e+02, 2.950133056640625e+02, 2.940987243652344e+02, 2.951145935058594e+02, 2.951122131347656e+02, 2.931902465820312e+02, 2.951495361328125e+02, 2.950298767089844e+02, 2.942200012207031e+02, 2.936318054199219e+02, 2.943542785644531e+02, 2.931622009277344e+02, 2.951441650390625e+02, 2.932530822753906e+02]
+zon.T=[2.931499938964844e+02, 2.938165893554688e+02, 2.948394775390625e+02, 2.951160888671875e+02, 2.933800964355469e+02, 2.949007263183594e+02, 2.937331848144531e+02, 2.949746704101562e+02, 2.94963623046875e+02, 2.944449768066406e+02, 2.949704284667969e+02, 2.932081604003906e+02, 2.945489196777344e+02, 2.949959106445312e+02, 2.950682983398438e+02, 2.951320190429688e+02, 2.94079345703125e+02, 2.940500793457031e+02, 2.93251708984375e+02, 2.933990783691406e+02, 2.932026672363281e+02, 2.936112365722656e+02, 2.94181396484375e+02, 2.951331481933594e+02, 2.93716552734375e+02, 2.932184143066406e+02, 2.950964050292969e+02, 2.934932556152344e+02, 2.940997009277344e+02, 2.96098876953125e+02, 2.970375061035156e+02, 2.962566223144531e+02, 2.963293762207031e+02, 2.957511291503906e+02, 2.968561096191406e+02, 2.973106079101562e+02, 2.972330017089844e+02, 2.974053955078125e+02, 2.972986145019531e+02, 2.974791564941406e+02, 2.975252075195312e+02, 2.975371398925781e+02, 2.97523681640625e+02, 2.975829772949219e+02, 2.975098876953125e+02, 2.974816284179688e+02, 2.975858459472656e+02, 2.975862426757812e+02, 2.97521728515625e+02, 2.975988159179688e+02, 2.974871520996094e+02, 2.975801086425781e+02, 2.97568115234375e+02, 2.975059204101562e+02, 2.975872802734375e+02, 2.97644775390625e+02, 2.975877075195312e+02, 2.975962524414062e+02, 2.976087341308594e+02, 2.975819396972656e+02, 2.975243835449219e+02, 2.975371398925781e+02, 2.974706420898438e+02, 2.975225830078125e+02, 2.975242614746094e+02, 2.97474609375e+02, 2.974830017089844e+02, 2.974789428710938e+02, 2.974937438964844e+02, 2.974887390136719e+02, 2.974450988769531e+02, 2.974119873046875e+02, 2.970668029785156e+02, 2.966719360351562e+02, 2.971568603515625e+02, 2.972576599121094e+02, 2.966737670898438e+02, 2.959289245605469e+02, 2.957213745117188e+02, 2.9481201171875e+02, 2.944169616699219e+02, 2.947103271484375e+02, 2.939195556640625e+02, 2.940602722167969e+02, 2.940169677734375e+02, 2.937295227050781e+02, 2.931671142578125e+02, 2.933880310058594e+02, 2.950133056640625e+02, 2.940987243652344e+02, 2.951145935058594e+02, 2.951122131347656e+02, 2.931902465820312e+02, 2.951495361328125e+02, 2.950298767089844e+02, 2.942200012207031e+02, 2.936318054199219e+02, 2.943542785644531e+02, 2.931622009277344e+02, 2.951441650390625e+02, 2.932530822753906e+02]
heaWat.u=[1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00]
vavDam.y=[2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.554025948047638e-01, 2.5e-01, 3.29160213470459e-01, 3.752192556858063e-01, 3.871423006057739e-01, 3.736800849437714e-01, 4.329911172389984e-01, 3.599009811878204e-01, 3.316185176372528e-01, 4.358335733413696e-01, 4.362431168556213e-01, 3.717152774333954e-01, 4.48826789855957e-01, 3.371655642986298e-01, 4.301155805587769e-01, 4.181102514266968e-01, 3.559122383594513e-01, 4.37283456325531e-01, 4.947710633277893e-01, 4.377006590366364e-01, 4.462576806545258e-01, 4.58719402551651e-01, 4.31939035654068e-01, 3.743763864040375e-01, 3.871388733386993e-01, 3.206299543380737e-01, 3.725927770137787e-01, 3.742593824863434e-01, 3.246186673641205e-01, 3.33006888628006e-01, 3.289314806461334e-01, 3.437333405017853e-01, 3.387492895126343e-01, 2.950859367847443e-01, 2.619776129722595e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01]
fan.sta_a.T=[2.883200073242188e+02, 2.90562744140625e+02, 2.883319396972656e+02, 2.920919799804688e+02, 2.906665649414062e+02, 2.918930969238281e+02, 2.898759155273438e+02, 2.901109619140625e+02, 2.89111572265625e+02, 2.908656616210938e+02, 2.898673706054688e+02, 2.899195861816406e+02, 2.912050170898438e+02, 2.915523681640625e+02, 2.904037475585938e+02, 2.919996948242188e+02, 2.906729431152344e+02, 2.909330749511719e+02, 2.910764465332031e+02, 2.914588623046875e+02, 2.901047668457031e+02, 2.916375122070312e+02, 2.910815734863281e+02, 2.919293212890625e+02, 2.92504638671875e+02, 2.907031555175781e+02, 2.918236694335938e+02, 2.916273803710938e+02, 2.919345703125e+02, 2.964934997558594e+02, 2.946243896484375e+02, 2.942006225585938e+02, 2.941107788085938e+02, 2.946829528808594e+02, 2.956533813476562e+02, 2.953515014648438e+02, 2.958345642089844e+02, 2.946706848144531e+02, 2.963741760253906e+02, 2.969334106445312e+02, 2.952789306640625e+02, 2.982248229980469e+02, 2.966036376953125e+02, 2.979476318359375e+02, 2.962223205566406e+02, 2.965768737792969e+02, 2.962604675292969e+02, 2.985108032226562e+02, 2.948568725585938e+02, 2.9739111328125e+02, 2.97256591796875e+02, 2.973014831542969e+02, 2.968691101074219e+02, 2.978995361328125e+02, 2.976356811523438e+02, 2.979755554199219e+02, 2.981031188964844e+02, 2.967643127441406e+02, 2.979931640625e+02, 2.976788024902344e+02, 2.957882080078125e+02, 2.974443054199219e+02, 2.967668151855469e+02, 2.963309020996094e+02, 2.979713745117188e+02, 2.966609191894531e+02, 2.968990478515625e+02, 2.969129638671875e+02, 2.965253295898438e+02, 2.967495727539062e+02, 2.962158203125e+02, 2.966826782226562e+02, 2.9535986328125e+02, 2.960602416992188e+02, 2.956841430664062e+02, 2.958915100097656e+02, 2.955003356933594e+02, 2.934600830078125e+02, 2.941224365234375e+02, 2.925818786621094e+02, 2.921419067382812e+02, 2.928599243164062e+02, 2.915148315429688e+02, 2.920691223144531e+02, 2.939436645507812e+02, 2.926375732421875e+02, 2.904195556640625e+02, 2.91980224609375e+02, 2.920718688964844e+02, 2.905301208496094e+02, 2.907398986816406e+02, 2.901202697753906e+02, 2.900093688964844e+02, 2.924759521484375e+02, 2.906303100585938e+02, 2.909695129394531e+02, 2.895492553710938e+02, 2.903458862304688e+02, 2.896872253417969e+02, 2.911193237304688e+02, 2.893901062011719e+02]
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Examples/SimpleHouse.mos b/IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos
similarity index 62%
rename from IBPSA/Resources/Scripts/Dymola/Fluid/Examples/SimpleHouse.mos
rename to IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos
index 295589b0b8..82e9fbc0b0 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Examples/SimpleHouse.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos
@@ -1,5 +1,5 @@
-simulateModel("IBPSA.Fluid.Examples.SimpleHouse", stopTime=3.1536e+07, method="Lsodar", tolerance=1e-06, resultFile="SimpleHouse");
-createPlot(id=1, position={0, 0, 792, 1247}, y={"zone.T"}, range={0.0, 32000000.0, 19.5, 24.5}, grid=true, colors={{28,108,200}});
+simulateModel("IBPSA.Examples.SimpleHouse", stopTime=3.1536e+07, method="Lsodar", tolerance=1e-06, resultFile="SimpleHouse");
+createPlot(id=1, position={0, 0, 792, 1247}, y={"zon.T"}, range={0.0, 32000000.0, 19.5, 24.5}, grid=true, colors={{28,108,200}});
createPlot(id=1, position={0, 0, 792, 413}, y={"heaWat.u"}, range={0.0, 32000000.0, -0.1, 1.1}, grid=true, subPlot=2, colors={{28,108,200}});
createPlot(id=1, position={0, 0, 792, 413}, y={"vavDam.y"}, range={0.0, 380.0, 0.098, 0.124}, grid=true, subPlot=3, colors={{28,108,200}});
createPlot(id=2, position={818, 10, 662, 377}, y={"fan.sta_a.T", "fan.sta_b.T"}, range={0.0, 380.0, 18.0, 22.5}, grid=true, colors={{28,108,200}, {238,46,47}});