Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…

…ssue3539_containerActuator

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,6 +2,40 @@ within Buildings.BoundaryConditions.WeatherData;
 expandable connector Bus "Data bus that stores weather data"
   extends Modelica.Icons.SignalBus;
 
+  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";
+
+  Real HDirNor(final unit="W/m2") "Direct normal solar irradiation";
+  Real HGloHor(final unit="W/m2") "Global horizontal solar irradiation";
+  Real HDifHor(final unit="W/m2") "Diffuse horizontal solar irradiation";
+
+  Real HHorIR(final unit="W/m2") "Horizontal infrared irradiation";
+
+  Modelica.Units.SI.Angle winDir "Wind direction";
+  Modelica.Units.SI.Velocity winSpe "Wind speed";
+
+  Modelica.Units.SI.Height ceiHei "Cloud cover ceiling height";
+  Real nOpa(final unit="1") "Opaque sky cover";
+  Real nTot(final unit="1") "Total sky cover";
+
+  Modelica.Units.SI.Angle lat "Latitude of the location";
+  Modelica.Units.SI.Angle lon "Longitude of the location";
+  Modelica.Units.SI.Height alt "Location altitude above sea level";
+
+  Modelica.Units.SI.AbsolutePressure pAtm "Atmospheric pressure";
+
+  Modelica.Units.SI.Angle solAlt "Solar altitude angle";
+  Modelica.Units.SI.Angle solDec "Solar declination angle";
+  Modelica.Units.SI.Angle solHouAng "Solar hour angle";
+  Modelica.Units.SI.Angle solZen "Solar zenith angle";
+
+  Modelica.Units.SI.Time solTim "Solar time";
+  Modelica.Units.SI.Time cloTim "Model time";
+
   annotation (
     defaultComponentName="weaBus",
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
@@ -16,6 +50,11 @@ This component is an expandable connector that is used to implement a bus that c
 </html>", revisions="<html>
 <ul>
 <li>
+September 22, 2023, by Michael Wetter:<br/>
+Declared the variables that are on the bus.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1798\">IBPSA, #1798</a>.
+</li>
+<li>
 June 25, 2010, by Wangda Zuo:<br/>
 First implementation.
 </li>