diff --git a/.gitattributes b/.gitattributes index f4dc5fabe82..ffb3debd969 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,3 +10,6 @@ Buildings/Resources/src/ThermalZones/EnergyPlus*/FMUs/Zones1.fmu filter=lfs diff Buildings/Resources/src/ThermalZones/EnergyPlus*/FMUs/Zones3.fmu filter=lfs diff=lfs merge=lfs -text Buildings/Resources/bin/spawn-*/linux64/bin/spawn* filter=lfs diff=lfs merge=lfs -text Buildings/Resources/bin/spawn-*/win64/bin/spawn* filter=lfs diff=lfs merge=lfs -text +Buildings/Resources/Data/Fluid/ZoneEquipment/FanCoil.dat filter=lfs diff=lfs merge=lfs -text +Buildings/Resources/Data/Fluid/ZoneEquipment/FanCoilAutoSize_ConstantFlowVariableFan.dat filter=lfs diff=lfs merge=lfs -text +Buildings/Resources/Data/Fluid/ZoneEquipment/fan_curve_calculations.xlsx filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index bb81292c50b..c863564ad86 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,5 @@ Buildings/Resources/src/fluid/heatpumps/calibration/doc/build/doctrees eplus* sqlite* Buildings/spawn-* +Buildings/Fluid/ZoneEquipment/BaseClasses/Types.mo +Buildings/Fluid/ZoneEquipment/UnitHeater/Validation/CoolingMode.mo diff --git a/Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo b/Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo index 283dd51ef49..fb094931ced 100644 --- a/Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo +++ b/Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo @@ -2,7 +2,8 @@ within Buildings.Applications.DataCenters.DXCooled.Examples; model DXCooledAirsideEconomizer "Example that illustrates the use of Buildings.Fluid.HeatExchanger.DXCoil in a data center room" extends Modelica.Icons.Example; - extends Buildings.Applications.DataCenters.ChillerCooled.Examples.BaseClasses.PostProcess( + extends + Buildings.Applications.DataCenters.ChillerCooled.Examples.BaseClasses.PostProcess( fulMecCooSig( y=if cooModCon.y == Integer(Buildings.Applications.DataCenters.Types.CoolingModes.FullMechanical) then 1 else 0), @@ -47,7 +48,7 @@ model DXCooledAirsideEconomizer m_flow_nominal=mA_flow_nominal, nPorts=2) "Simplified data center room" annotation (Placement(transformation(extent={{40,-120},{60,-100}}))); - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.VariableSpeed varSpeDX( + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.VariableSpeedCooling varSpeDX( redeclare package Medium = Medium, dp_nominal=400, datCoi=datCoi, @@ -90,53 +91,53 @@ model DXCooledAirsideEconomizer Modelica.Blocks.Sources.Constant SATSetPoi(k=TAirSupSet) "Supply air temperature set point" annotation (Placement(transformation(extent={{-240,90},{-220,110}}))); - parameter Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.DXCoil datCoi( + parameter Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.CoolingCoil datCoi( nSta=4, sta={ - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.Stage( + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.Stage( spe=900/60, nomVal= - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.NominalValues( + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.NominalValues( Q_flow_nominal=QCoiC_flow_nominal*(3/8), COP_nominal=3, SHR_nominal=0.8, TEvaIn_nominal=TRooSet, m_flow_nominal=mA_flow_nominal), perCur= - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Examples.PerformanceCurves.Curve_I()), - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.Stage( + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Examples.PerformanceCurves.DXCooling_Curve_I()), + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.Stage( spe=1200/60, nomVal= - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.NominalValues( + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.NominalValues( Q_flow_nominal=QCoiC_flow_nominal*(1/2), COP_nominal=3, SHR_nominal=0.8, TEvaIn_nominal=TRooSet, m_flow_nominal=mA_flow_nominal), perCur= - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Examples.PerformanceCurves.Curve_I()), - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.Stage( + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Examples.PerformanceCurves.DXCooling_Curve_I()), + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.Stage( spe=1800/60, nomVal= - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.NominalValues( + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.NominalValues( Q_flow_nominal=QCoiC_flow_nominal*(3/4), COP_nominal=3, SHR_nominal=0.8, TEvaIn_nominal=TRooSet, m_flow_nominal=mA_flow_nominal), perCur= - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Examples.PerformanceCurves.Curve_II()), - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.Stage( + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Examples.PerformanceCurves.DXCooling_Curve_II()), + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.Stage( spe=2400/60, nomVal= - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.NominalValues( + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.NominalValues( Q_flow_nominal=QCoiC_flow_nominal, COP_nominal=3, SHR_nominal=0.8, TEvaIn_nominal=TRooSet, m_flow_nominal=mA_flow_nominal), perCur= - Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Examples.PerformanceCurves.Curve_III())}) + Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Examples.PerformanceCurves.DXCooling_Curve_III())}) "Coil data" annotation (Placement(transformation(extent={{100,80},{120,100}}))); Buildings.Fluid.Actuators.Dampers.MixingBox eco( @@ -293,14 +294,6 @@ equation connect(roo.TRooAir, cooModCon.TRet) annotation (Line(points={{61,-110},{90,-110},{90,-88},{-180,-88},{-180,65}, {-172,65}}, color={0,0,127})); - connect(weaBus.TDryBul, varSpeDX.TConIn) - annotation (Line( - points={{-240,70},{-240,-40},{-60,-40},{-60,-57},{-21,-57}}, - color={255,204,51}, - thickness=0.5), Text( - textString="%first", - index=-1, - extent={{-6,3},{-6,3}})); connect(cooModCon.y, sigCha.u) annotation (Line( points={{-149,70},{-142,70},{-142,160},{178,160}}, @@ -329,6 +322,14 @@ equation annotation (Line( points={{-39,-10},{-28,-10},{-28,-52},{-21,-52}}, color={0,0,127})); + connect(weaBus.TDryBul, varSpeDX.TOut) annotation (Line( + points={{-240,70},{-240,-40},{-40,-40},{-40,-57},{-21,-57}}, + color={255,204,51}, + thickness=0.5), Text( + string="%first", + index=-1, + extent={{-6,3},{-6,3}}, + horizontalAlignment=TextAlignment.Right)); annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-280,-200},{320,220}})), __Dymola_Commands(file= @@ -336,8 +337,8 @@ equation "Simulate and plot"), Documentation(info="

-This example illustrates how to use -Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.VariableSpeed in a cooling system for data center rooms. +This example illustrates how to use +Buildings.Fluid.HeatExchangers.DXCoils.AirSource.VariableSpeed in a cooling system for data center rooms.

System description

@@ -375,6 +376,12 @@ The room temperature is maintained at 24°C by adjusting the speed of the sup ", revisions="