merged master

Buildings/.copiedFiles.txt

@@ -747,6 +747,7 @@ Buildings/Electrical/Utilities/package.mo
 Buildings/Electrical/Utilities/package.order
 Buildings/Electrical/package.mo
 Buildings/Electrical/package.order
+Buildings/Examples/SimpleHouse.mo
 Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse0.mo
 Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse1.mo
 Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse2.mo
@@ -918,7 +919,6 @@ Buildings/Fluid/Examples/Performance/PressureDrop/package.order
 Buildings/Fluid/Examples/Performance/package.mo
 Buildings/Fluid/Examples/Performance/package.order
 Buildings/Fluid/Examples/ResistanceVolumeFlowReversal.mo
-Buildings/Fluid/Examples/SimpleHouse.mo
 Buildings/Fluid/Examples/package.mo
 Buildings/Fluid/Examples/package.order
 Buildings/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo
@@ -2355,6 +2355,7 @@ Buildings/Resources/Scripts/Dymola/Electrical/DC/Sources/Examples/VoltageSource.
 Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_low.mos
 Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_med.mos
 Buildings/Resources/Scripts/Dymola/Electrical/Utilities/Examples/TestVoltageCTRL.mos
+Buildings/Resources/Scripts/Dymola/Examples/SimpleHouse.mos
 Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse0.mos
 Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse1.mos
 Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse2.mos
@@ -2425,7 +2426,6 @@ Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/Serie
 Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlowOptimised.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Examples/ResistanceVolumeFlowReversal.mos
-Buildings/Resources/Scripts/Dymola/Fluid/Examples/SimpleHouse.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACWithExhaust.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/AirToOutlet.mos

Buildings/BoundaryConditions/WeatherData/Bus.mo

@@ -2,14 +2,10 @@ within Buildings.BoundaryConditions.WeatherData;
 expandable connector Bus "Data bus that stores weather data"
   extends Modelica.Icons.SignalBus;
 
-  Modelica.Units.SI.Temperature TDryBul(displayUnit="degC")
-    "Dry bulb temperature";
-  Modelica.Units.SI.Temperature TWetBul(displayUnit="degC")
-    "Wet bulb temperature";
-  Modelica.Units.SI.Temperature TDewPoi(displayUnit="degC")
-    "Dew point temperature";
-  Modelica.Units.SI.Temperature TBlaSky(displayUnit="degC")
-    "Black-body sky temperature";
+  Modelica.Units.SI.Temperature TDryBul "Dry bulb temperature";
+  Modelica.Units.SI.Temperature TWetBul "Wet bulb temperature";
+  Modelica.Units.SI.Temperature TDewPoi "Dew point temperature";
+  Modelica.Units.SI.Temperature TBlaSky "Black-body sky temperature";
 
   Real relHum(final unit="1") "Relative humidity";
 

Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse2.mo

@@ -53,7 +53,7 @@ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow</a>
 To be able to use the value of the outdoor solar irradiance
 you will need to access the weather data reader.
 To do this, make a connection to the <code>weaBus</code>.
-In the dialog box select <i>&lt;New Variable&gt;</i> and here type <code>HDirNor</code>,
+In the dialog box, select <code>HDirNor</code>,
 which is the direct solar irradiance on a surface of <i>1 m<sup>2</sup></i>,
 perpendicular to the sun rays.
 Set the gain factor <code>k</code> to 2,

Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo

@@ -2,12 +2,14 @@ within Buildings.Examples.Tutorial.SimpleHouse;
 model SimpleHouse4 "Heating model"
   extends SimpleHouse3;
 
+  constant Boolean use_constantHeater=true
+    "To enable/disable the connection between the constant source and heater and circulation pump";
+
   parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=3000
     "Nominal capacity of heating system";
   parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=0.1
     "Nominal mass flow rate for water loop";
-  parameter Boolean use_constantHeater=true
-    "To enable/disable the connection between the constant source and heater and circulation pump";
+
 
   Buildings.Fluid.HeatExchangers.Radiators.RadiatorEN442_2 rad(
     redeclare package Medium = MediumWater,
@@ -121,7 +123,17 @@ Pressure difference modelling may be disregarded in the heating circuit
 since the chosen pump sets a fixed mass flow rate regardless of the pressure drop.
 </p>
 <p>
-Set the heater input to 1, meaning that it will produce 1 times its nominal power.
+Set the heater input to <i>1</i>, meaning that it will produce <i>1</i> times its nominal power.
+</p>
+<h4>Implementation</h4>
+<p>
+The pump and the heater need a control input, which we set here to a constant
+of <i>1</i>.
+However, in the next version of this model, we want to connect an actual controller to these models.
+We can therefore introduce a <code>Boolean constant</code> (or a <code>Boolean parameter</code>
+would also work), and use this to conditionally remove the Modelica block
+that outputs the control signal. When Modelica removes such a block, then all
+connections to it will also be removed.
 </p>
 <h4>Reference result</h4>
 <p>

Buildings/Examples/package.order

@@ -1,4 +1,5 @@
 Tutorial
+SimpleHouse
 ChillerPlant
 DualFanDualDuct
 HydronicHeating