Skip to content

Commit

Permalink
Merge branch 'master' into issue3438_DXdehumidifier
Browse files Browse the repository at this point in the history
  • Loading branch information
@JayHuLBL
JayHuLBL committed Nov 14, 2023
2 parents 06451b2 + c3542e0 commit 0c32b32
Show file tree
Hide file tree
Showing 249 changed files with 5,183 additions and 3,277 deletions.
26 changes: 24 additions & 2 deletions Buildings/.copiedFiles.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1064,6 +1064,20 @@ Buildings/Fluid/FixedResistances/Validation/package.mo
Buildings/Fluid/FixedResistances/Validation/package.order
Buildings/Fluid/FixedResistances/package.mo
Buildings/Fluid/FixedResistances/package.order
Buildings/Fluid/Geothermal/Aquifer/Data/Rock.mo
Buildings/Fluid/Geothermal/Aquifer/Data/Template.mo
Buildings/Fluid/Geothermal/Aquifer/Data/package.mo
Buildings/Fluid/Geothermal/Aquifer/Data/package.order
Buildings/Fluid/Geothermal/Aquifer/Examples/CoolingOffice.mo
Buildings/Fluid/Geothermal/Aquifer/Examples/package.mo
Buildings/Fluid/Geothermal/Aquifer/Examples/package.order
Buildings/Fluid/Geothermal/Aquifer/MultiWell.mo
Buildings/Fluid/Geothermal/Aquifer/Validation/NumberWells.mo
Buildings/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mo
Buildings/Fluid/Geothermal/Aquifer/Validation/package.mo
Buildings/Fluid/Geothermal/Aquifer/Validation/package.order
Buildings/Fluid/Geothermal/Aquifer/package.mo
Buildings/Fluid/Geothermal/Aquifer/package.order
Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo
Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo
Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo
Expand Down Expand Up @@ -2051,6 +2065,11 @@ Buildings/Resources/Images/Fluid/FixedResistances/Junction.svg
Buildings/Resources/Images/Fluid/FixedResistances/PressureDrop.png
Buildings/Resources/Images/Fluid/FixedResistances/Validation/PlugFlowPipes/AITTestBench.png
Buildings/Resources/Images/Fluid/FixedResistances/Validation/PlugFlowPipes/ULgTestBench.png
Buildings/Resources/Images/Fluid/Geothermal/Aquifer/Geometry.png
Buildings/Resources/Images/Fluid/Geothermal/Aquifer/Geometry.svg
Buildings/Resources/Images/Fluid/Geothermal/Aquifer/PressureCircuit.png
Buildings/Resources/Images/Fluid/Geothermal/Aquifer/PressureCircuit.svg
Buildings/Resources/Images/Fluid/Geothermal/Aquifer/results.png
Buildings/Resources/Images/Fluid/Geothermal/Borefields/BorefieldGeometry_01.png
Buildings/Resources/Images/Fluid/Geothermal/Borefields/BorefieldGeometry_01.tex
Buildings/Resources/Images/Fluid/Geothermal/Borefields/BoreholeResistances_01.png
Expand Down Expand Up @@ -2355,6 +2374,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
Expand Down Expand Up @@ -2425,7 +2445,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
Expand Down Expand Up @@ -2484,6 +2503,9 @@ Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDro
Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mos
Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsParallel.mos
Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsSeries.mos
Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Aquifer/Examples/CoolingOffice.mos
Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Aquifer/Validation/NumberWells.mos
Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mos
Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mos
Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mos
Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mos
Expand Down
11 changes: 7 additions & 4 deletions Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@ model Guideline36
Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Controller con(
eneStd=Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1,
venStd=Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1,

final VAreBreZon_flow=0.0144,
final VPopBreZon_flow=0.0075,
ecoHigLimCon=Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulb,

ashCliZon=Buildings.Controls.OBC.ASHRAE.G36.Types.ASHRAEClimateZone.Zone_6B,

freSta=Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.No_freeze_stat,
have_winSen=true,
have_CO2Sen=false,
buiPreCon=Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.BarometricRelief,
buiPreCon=Buildings.Controls.OBC.ASHRAE.G36.Types.PressureControl.BarometricRelief,

have_locAdj=false,
ignDemLim=false,
kCoo=0.1,
Expand All @@ -36,11 +40,10 @@ model Guideline36
have_occSen=false,
TSup_max=343.15,
TSup_min=286.15,
outDamMinFloMinSpe = 0.2304,
outDamMinFloMinSpe=0.2304,
outDamMinFloMaxSpe=0.02304,
outDamDesFloMinSpe=0.4,
outDamDesFloMaxSpe=0.04)
"VAV controller"
outDamDesFloMaxSpe=0.04) "VAV controller"
annotation (Placement(transformation(extent={{-120,-20},{-80,60}})));

Buildings.Controls.OBC.CDL.Reals.Hysteresis hysChiPla(
Expand Down
9 changes: 6 additions & 3 deletions Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUG36.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,18 @@ block ZoneWithAHUG36
Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Controller con(
eneStd=Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1,
venStd=Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1,

VAreBreZon_flow=0.4989,
VPopBreZon_flow=0.2075,
ecoHigLimCon=Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulb,

ashCliZon=Buildings.Controls.OBC.ASHRAE.G36.Types.ASHRAEClimateZone.Zone_6B,

freSta=Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.No_freeze_stat,
have_winSen=false,
have_CO2Sen=false,
buiPreCon=Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.BarometricRelief,
buiPreCon=Buildings.Controls.OBC.ASHRAE.G36.Types.PressureControl.BarometricRelief,

have_locAdj=false,
TSupDew_max=297.15,
maxHeaSpe=0.2,
Expand All @@ -71,8 +75,7 @@ block ZoneWithAHUG36
TSup_max=343.15,
TSup_min=286.15,
uLow=0,
uHigh=0.5)
"VAV controller"
uHigh=0.5) "VAV controller"
annotation (Placement(transformation(extent={{-80,-90},{-40,-10}})));
Buildings.ThermalZones.Detailed.Validation.BaseClasses.SingleZoneFloor sinZonFlo(
redeclare package Medium = MediumA)
Expand Down
39 changes: 39 additions & 0 deletions Buildings/BoundaryConditions/WeatherData/Bus.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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>
Expand Down
Loading

0 comments on commit 0c32b32

Please sign in to comment.