From cfee11bb3c28a44c920a64903337d0e0ddc411d6 Mon Sep 17 00:00:00 2001 From: Lixing Gu Date: Wed, 16 Aug 2023 11:57:01 -0400 Subject: [PATCH] Conflict correction --- src/EnergyPlus/UnitarySystem.cc | 1 - .../DOAToWaterToAirHPInlet_MultispeedFan.idf | 125 +++++++----------- tst/EnergyPlus/unit/UnitarySystem.unit.cc | 72 +++++----- 3 files changed, 83 insertions(+), 115 deletions(-) diff --git a/src/EnergyPlus/UnitarySystem.cc b/src/EnergyPlus/UnitarySystem.cc index abfa9a1c5e1..6bed08bacc9 100644 --- a/src/EnergyPlus/UnitarySystem.cc +++ b/src/EnergyPlus/UnitarySystem.cc @@ -11976,7 +11976,6 @@ namespace UnitarySystems { } } break; case DataHVACGlobals::Coil_HeatingWaterToAirHPSimple: { - } WaterToAirHeatPumpSimple::SimWatertoAirHPSimple(state, blankString, diff --git a/testfiles/DOAToWaterToAirHPInlet_MultispeedFan.idf b/testfiles/DOAToWaterToAirHPInlet_MultispeedFan.idf index a584ea9139a..3e22ba99eed 100644 --- a/testfiles/DOAToWaterToAirHPInlet_MultispeedFan.idf +++ b/testfiles/DOAToWaterToAirHPInlet_MultispeedFan.idf @@ -2188,10 +2188,6 @@ SPACE1-1 HP Heating Mode,!- Heating Coil Name Coil:Cooling:WaterToAirHeatPump:EquationFit, !- Cooling Coil Object Type SPACE1-1 HP Cooling Mode,!- Cooling Coil Name - 2.5, !- Maximum Cycling Rate {cycles/hr} - 60.0, !- Heat Pump Time Constant {s} - 0.01, !- Fraction of On-Cycle Power Use - 60, !- Heat Pump Fan Delay Time {s} Coil:Heating:Fuel, !- Supplemental Heating Coil Object Type SPACE1-1 HP Supp Coil, !- Supplemental Heating Coil Name 50.0, !- Maximum Supply Air Temperature from Supplemental Heater {C} @@ -2251,10 +2247,6 @@ SPACE2-1 HP Heating Mode,!- Heating Coil Name Coil:Cooling:WaterToAirHeatPump:VariableSpeedEquationFit, !- Cooling Coil Object Type SPACE2-1 HP Cooling Mode,!- Cooling Coil Name - 2.5, !- Maximum Cycling Rate {cycles/hr} - 60.0, !- Heat Pump Time Constant {s} - 0.01, !- Fraction of On-Cycle Power Use - 60, !- Heat Pump Fan Delay Time {s} Coil:Heating:Fuel, !- Supplemental Heating Coil Object Type SPACE2-1 HP Supp Coil, !- Supplemental Heating Coil Name 50.0, !- Maximum Supply Air Temperature from Supplemental Heater {C} @@ -2409,19 +2401,20 @@ SPACE2-1 Cooling Coil Outlet, !- Indoor Air Outlet Node Name 10.0, !- Number of Speeds {dimensionless} 10.0, !- Nominal Speed Level {dimensionless} - Autosize, !- Gross Rated Total Cooling Capacity At Selected Nominal Speed Level {W} - Autosize, !- Rated Air Flow Rate At Selected Nominal Speed Level {m3/s} - Autosize, !- Rated Water Flow Rate At Selected Nominal Speed Level {m3/s} + Autosize, !- Gross Rated Total Cooling Capacity At Selected Nominal Speed Level {W} + Autosize, !- Rated Air Flow Rate At Selected Nominal Speed Level {m3/s} + Autosize, !- Rated Water Flow Rate At Selected Nominal Speed Level {m3/s} 0.0, !- Nominal Time for Condensate to Begin Leaving the Coil {s} 0.0, !- Initial Moisture Evaporation Rate Divided by Steady-State AC Latent Capacity {dimensionless} + 2.5, !- Maximum Cycling Rate {cycles/hr} + 60, !- Latent Capacity Time Constant {s} + 60, !- Fan Delay Time {s} 0, !- Flag for Using Hot Gas Reheat, 0 or 1 {dimensionless} VS Energy Part Load Fraction 1, !- Energy Part Load Fraction Curve Name 1524.1, !- Speed 1 Reference Unit Gross Rated Total Cooling Capacity {W} 0.75, !- Speed 1 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless} 4.0, !- Speed 1 Reference Unit Gross Rated Cooling COP {W/W} 0.1359072, !- Speed 1 Reference Unit Rated Air Flow Rate {m3/s} - , !- Speed 1 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- Speed 1 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} 0.000381695, !- Speed 1 Reference Unit Rated Water Flow Rate {m3/s} TC VS Temp1 Test, !- Speed 1 Total Cooling Capacity Function of Temperature Curve Name TC VS AirFrac Test, !- Speed 1 Total Cooling Capacity Function of Air Flow Fraction Curve Name @@ -2435,8 +2428,6 @@ 0.75, !- Speed 2 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless} 4.0, !- Speed 2 Reference Unit Gross Rated Cooling COP {W/W} 0.151008, !- Speed 2 Reference Unit Rated Air Flow Rate {m3/s} - , !- Speed 2 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- Speed 2 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} 0.000381695, !- Speed 2 Reference Unit Rated Water Flow Rate {m3/s} TC VS Temp1 Test, !- Speed 2 Total Cooling Capacity Function of Temperature Curve Name TC VS AirFrac Test, !- Speed 2 Total Cooling Capacity Function of Air Flow Fraction Curve Name @@ -2450,8 +2441,6 @@ 0.75, !- Speed 3 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless} 4.0, !- Speed 3 Reference Unit Gross Rated Cooling COP {W/W} 0.1661088, !- Speed 3 Reference Unit Rated Air Flow Rate {m3/s} - , !- Speed 3 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- Speed 3 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} 0.000381695, !- Speed 3 Reference Unit Rated Water Flow Rate {m3/s} TC VS Temp1 Test, !- Speed 3 Total Cooling Capacity Function of Temperature Curve Name TC VS AirFrac Test, !- Speed 3 Total Cooling Capacity Function of Air Flow Fraction Curve Name @@ -2465,8 +2454,6 @@ 0.75, !- Speed 4 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless} 4.0, !- Speed 4 Reference Unit Gross Rated Cooling COP {W/W} 0.1963104, !- Speed 4 Reference Unit Rated Air Flow Rate {m3/s} - , !- Speed 4 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- Speed 4 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} 0.000381695, !- Speed 4 Reference Unit Rated Water Flow Rate {m3/s} TC VS Temp1 Test, !- Speed 4 Total Cooling Capacity Function of Temperature Curve Name TC VS AirFrac Test, !- Speed 4 Total Cooling Capacity Function of Air Flow Fraction Curve Name @@ -2480,8 +2467,6 @@ 0.75, !- Speed 5 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless} 4.0, !- Speed 5 Reference Unit Gross Rated Cooling COP {W/W} 0.226512, !- Speed 5 Reference Unit Rated Air Flow Rate {m3/s} - , !- Speed 5 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- Speed 5 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} 0.000381695, !- Speed 5 Reference Unit Rated Water Flow Rate {m3/s} TC VS Temp1 Test, !- Speed 5 Total Cooling Capacity Function of Temperature Curve Name TC VS AirFrac Test, !- Speed 5 Total Cooling Capacity Function of Air Flow Fraction Curve Name @@ -2495,8 +2480,6 @@ 0.75, !- Speed 6 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless} 4.0, !- Speed 6 Reference Unit Gross Rated Cooling COP {W/W} 0.2567136, !- Speed 6 Reference Unit Rated Air Flow Rate {m3/s} - , !- Speed 6 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- Speed 6 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} 0.000381695, !- Speed 6 Reference Unit Rated Water Flow Rate {m3/s} TC VS Temp1 Test, !- Speed 6 Total Cooling Capacity Function of Temperature Curve Name TC VS AirFrac Test, !- Speed 6 Total Cooling Capacity Function of Air Flow Fraction Curve Name @@ -2510,8 +2493,6 @@ 0.75, !- Speed 7 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless} 4.0, !- Speed 7 Reference Unit Gross Rated Cooling COP {W/W} 0.2869152, !- Speed 7 Reference Unit Rated Air Flow Rate {m3/s} - , !- Speed 7 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- Speed 7 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} 0.000381695, !- Speed 7 Reference Unit Rated Water Flow Rate {m3/s} TC VS Temp1 Test, !- Speed 7 Total Cooling Capacity Function of Temperature Curve Name TC VS AirFrac Test, !- Speed 7 Total Cooling Capacity Function of Air Flow Fraction Curve Name @@ -2525,8 +2506,6 @@ 0.75, !- Speed 8 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless} 4.0, !- Speed 8 Reference Unit Gross Rated Cooling COP {W/W} 0.3171168, !- Speed 8 Reference Unit Rated Air Flow Rate {m3/s} - , !- Speed 8 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- Speed 8 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} 0.000381695, !- Speed 8 Reference Unit Rated Water Flow Rate {m3/s} TC VS Temp1 Test, !- Speed 8 Total Cooling Capacity Function of Temperature Curve Name TC VS AirFrac Test, !- Speed 8 Total Cooling Capacity Function of Air Flow Fraction Curve Name @@ -2540,8 +2519,6 @@ 0.75, !- Speed 9 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless} 4.0, !- Speed 9 Reference Unit Gross Rated Cooling COP {W/W} 0.3473184, !- Speed 9 Reference Unit Rated Air Flow Rate {m3/s} - , !- Speed 9 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- Speed 9 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} 0.000381695, !- Speed 9 Reference Unit Rated Water Flow Rate {m3/s} TC VS Temp1 Test, !- Speed 9 Total Cooling Capacity Function of Temperature Curve Name TC VS AirFrac Test, !- Speed 9 Total Cooling Capacity Function of Air Flow Fraction Curve Name @@ -2555,8 +2532,6 @@ 0.75, !- Speed 10 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless} 4.0, !- Speed 10 Reference Unit Gross Rated Cooling COP {W/W} 0.37752, !- Speed 10 Reference Unit Rated Air Flow Rate {m3/s} - , !- Speed 10 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- Speed 10 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} 0.000381695, !- Speed 10 Reference Unit Rated Water Flow Rate {m3/s} TC VS Temp1 Test, !- Speed 10 Total Cooling Capacity Function of Temperature Curve Name TC VS AirFrac Test, !- Speed 10 Total Cooling Capacity Function of Air Flow Fraction Curve Name @@ -2763,10 +2738,6 @@ SPACE3-1 HP Heating Mode,!- Heating Coil Name Coil:Cooling:WaterToAirHeatPump:EquationFit, !- Cooling Coil Object Type SPACE3-1 HP Cooling Mode,!- Cooling Coil Name - 2.5, !- Maximum Cycling Rate {cycles/hr} - 60.0, !- Heat Pump Time Constant {s} - 0.01, !- Fraction of On-Cycle Power Use - 60, !- Heat Pump Fan Delay Time {s} Coil:Heating:Fuel, !- Supplemental Heating Coil Object Type SPACE3-1 HP Supp Coil, !- Supplemental Heating Coil Name 50.0, !- Maximum Supply Air Temperature from Supplemental Heater {C} @@ -2794,10 +2765,6 @@ SPACE4-1 HP Heating Mode,!- Heating Coil Name Coil:Cooling:WaterToAirHeatPump:EquationFit, !- Cooling Coil Object Type SPACE4-1 HP Cooling Mode,!- Cooling Coil Name - 2.5, !- Maximum Cycling Rate {cycles/hr} - 60.0, !- Heat Pump Time Constant {s} - 0.01, !- Fraction of On-Cycle Power Use - 60, !- Heat Pump Fan Delay Time {s} Coil:Heating:Fuel, !- Supplemental Heating Coil Object Type SPACE4-1 HP Supp Coil, !- Supplemental Heating Coil Name 50.0, !- Maximum Supply Air Temperature from Supplemental Heater {C} @@ -2825,10 +2792,6 @@ SPACE5-1 HP Heating Mode,!- Heating Coil Name Coil:Cooling:WaterToAirHeatPump:EquationFit, !- Cooling Coil Object Type SPACE5-1 HP Cooling Mode,!- Cooling Coil Name - 2.5, !- Maximum Cycling Rate {cycles/hr} - 60.0, !- Heat Pump Time Constant {s} - 0.01, !- Fraction of On-Cycle Power Use - 60, !- Heat Pump Fan Delay Time {s} Coil:Heating:Fuel, !- Supplemental Heating Coil Object Type SPACE5-1 HP Supp Coil, !- Supplemental Heating Coil Name 50.0, !- Maximum Supply Air Temperature from Supplemental Heater {C} @@ -3191,8 +3154,6 @@ SPACE1-1 Zone Unit Fan Outlet, !- Air Inlet Node Name SPACE1-1 Cooling Coil Outlet, !- Air Outlet Node Name Autosize, !- Rated Air Flow Rate {m3/s} - , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} Autosize, !- Rated Water Flow Rate {m3/s} Autosize, !- Gross Rated Total Cooling Capacity {W} Autosize, !- Gross Rated Sensible Cooling Capacity {W} @@ -3203,8 +3164,12 @@ TotCoolCapCurve, !- Total Cooling Capacity Curve Name CoolSensCapCurve, !- Sensible Cooling Capacity Curve Name CoolPowCurve, !- Cooling Power Consumption Curve Name + HPACCOOLPLFFPLR, !- Part Load Fraction Correlation Curve Name 0, !- Nominal Time for Condensate Removal to Begin {s} - 0; !- Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless} + 0, !- Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless} + 2.5, !- Maximum Cycling Rate {cycles/hr} + 60, !- Latent Capacity Time Constant {s} + 60; !- Fan Delay Time {s} Coil:Cooling:WaterToAirHeatPump:EquationFit, SPACE3-1 HP Cooling Mode,!- Name @@ -3213,8 +3178,6 @@ SPACE3-1 Zone Unit Fan Outlet, !- Air Inlet Node Name SPACE3-1 Cooling Coil Outlet, !- Air Outlet Node Name Autosize, !- Rated Air Flow Rate {m3/s} - , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} Autosize, !- Rated Water Flow Rate {m3/s} Autosize, !- Gross Rated Total Cooling Capacity {W} Autosize, !- Gross Rated Sensible Cooling Capacity {W} @@ -3225,8 +3188,12 @@ TotCoolCapCurve, !- Total Cooling Capacity Curve Name CoolSensCapCurve, !- Sensible Cooling Capacity Curve Name CoolPowCurve, !- Cooling Power Consumption Curve Name + HPACCOOLPLFFPLR, !- Part Load Fraction Correlation Curve Name 0, !- Nominal Time for Condensate Removal to Begin {s} - 0; !- Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless} + 0, !- Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless} + 2.5, !- Maximum Cycling Rate {cycles/hr} + 60, !- Latent Capacity Time Constant {s} + 60; !- Fan Delay Time {s} Coil:Cooling:WaterToAirHeatPump:EquationFit, SPACE4-1 HP Cooling Mode,!- Name @@ -3235,8 +3202,6 @@ SPACE4-1 Zone Unit Fan Outlet, !- Air Inlet Node Name SPACE4-1 Cooling Coil Outlet, !- Air Outlet Node Name Autosize, !- Rated Air Flow Rate {m3/s} - , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} Autosize, !- Rated Water Flow Rate {m3/s} Autosize, !- Gross Rated Total Cooling Capacity {W} Autosize, !- Gross Rated Sensible Cooling Capacity {W} @@ -3247,8 +3212,12 @@ TotCoolCapCurve, !- Total Cooling Capacity Curve Name CoolSensCapCurve, !- Sensible Cooling Capacity Curve Name CoolPowCurve, !- Cooling Power Consumption Curve Name + HPACCOOLPLFFPLR, !- Part Load Fraction Correlation Curve Name 0, !- Nominal Time for Condensate Removal to Begin {s} - 0; !- Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless} + 0, !- Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless} + 2.5, !- Maximum Cycling Rate {cycles/hr} + 60, !- Latent Capacity Time Constant {s} + 60; !- Fan Delay Time {s} Coil:Cooling:WaterToAirHeatPump:EquationFit, SPACE5-1 HP Cooling Mode,!- Name @@ -3257,8 +3226,6 @@ SPACE5-1 Zone Unit Fan Outlet, !- Air Inlet Node Name SPACE5-1 Cooling Coil Outlet, !- Air Outlet Node Name Autosize, !- Rated Air Flow Rate {m3/s} - , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} - , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)} Autosize, !- Rated Water Flow Rate {m3/s} Autosize, !- Gross Rated Total Cooling Capacity {W} Autosize, !- Gross Rated Sensible Cooling Capacity {W} @@ -3269,8 +3236,12 @@ TotCoolCapCurve, !- Total Cooling Capacity Curve Name CoolSensCapCurve, !- Sensible Cooling Capacity Curve Name CoolPowCurve, !- Cooling Power Consumption Curve Name + HPACCOOLPLFFPLR, !- Part Load Fraction Correlation Curve Name 0, !- Nominal Time for Condensate Removal to Begin {s} - 0; !- Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless} + 0, !- Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless} + 2.5, !- Maximum Cycling Rate {cycles/hr} + 60, !- Latent Capacity Time Constant {s} + 60; !- Fan Delay Time {s} !- =========== ALL OBJECTS IN CLASS: COIL:HEATING:WATERTOAIRHEATPUMP:EQUATIONFIT =========== @@ -3288,23 +3259,8 @@ 20.0, !- Rated Entering Air Dry-Bulb Temperature {C} 1.0, !- Ratio of Rated Heating Capacity to Rated Cooling Capacity HeatCapCurve, !- Heating Capacity Curve Name - HeatPowCurve; !- Heating Power Consumption Curve Name - -! Coil:Heating:WaterToAirHeatPump:EquationFit, -! SPACE2-1 HP Heating Mode-1,!- Name -! SPACE2-1 HP Heating Water Inlet, !- Water Inlet Node Name -! SPACE2-1 HP Heating Water Outlet, !- Water Outlet Node Name -! SPACE2-1 Cooling Coil Outlet, !- Air Inlet Node Name -! SPACE2-1 Heating Coil Outlet, !- Air Outlet Node Name -! Autosize, !- Rated Air Flow Rate {m3/s} -! Autosize, !- Rated Water Flow Rate {m3/s} -! Autosize, !- Gross Rated Heating Capacity {W} -! 4.75, !- Gross Rated Heating COP {W/W} -! 20.0, !- Rated Entering Water Temperature {C} -! 20.0, !- Rated Entering Air Dry-Bulb Temperature {C} -! 1.0, !- Ratio of Rated Heating Capacity to Rated Cooling Capacity -! HeatCapCurve, !- Heating Capacity Curve Name -! HeatPowCurve; !- Heating Power Consumption Curve Name + HeatPowCurve, !- Heating Power Consumption Curve Name + HPACHEATPLFFPLR; !- Part Load Fraction Correlation Curve Name Coil:Heating:WaterToAirHeatPump:EquationFit, SPACE3-1 HP Heating Mode,!- Name @@ -3320,7 +3276,8 @@ 20.0, !- Rated Entering Air Dry-Bulb Temperature {C} 1.0, !- Ratio of Rated Heating Capacity to Rated Cooling Capacity HeatCapCurve, !- Heating Capacity Curve Name - HeatPowCurve; !- Heating Power Consumption Curve Name + HeatPowCurve, !- Heating Power Consumption Curve Name + HPACHEATPLFFPLR; !- Part Load Fraction Correlation Curve Name Coil:Heating:WaterToAirHeatPump:EquationFit, SPACE4-1 HP Heating Mode,!- Name @@ -3336,7 +3293,8 @@ 20.0, !- Rated Entering Air Dry-Bulb Temperature {C} 1.0, !- Ratio of Rated Heating Capacity to Rated Cooling Capacity HeatCapCurve, !- Heating Capacity Curve Name - HeatPowCurve; !- Heating Power Consumption Curve Name + HeatPowCurve, !- Heating Power Consumption Curve Name + HPACHEATPLFFPLR; !- Part Load Fraction Correlation Curve Name Coil:Heating:WaterToAirHeatPump:EquationFit, SPACE5-1 HP Heating Mode,!- Name @@ -3352,7 +3310,24 @@ 20.0, !- Rated Entering Air Dry-Bulb Temperature {C} 1.0, !- Ratio of Rated Heating Capacity to Rated Cooling Capacity HeatCapCurve, !- Heating Capacity Curve Name - HeatPowCurve; !- Heating Power Consumption Curve Name + HeatPowCurve, !- Heating Power Consumption Curve Name + HPACHEATPLFFPLR; !- Part Load Fraction Correlation Curve Name + + Curve:Quadratic, + HPACCOOLPLFFPLR, !- Name + 0.75, !- Coefficient1 Constant + 0.25, !- Coefficient2 x + 0.0, !- Coefficient3 x**2 + 0.0, !- Minimum Value of x + 1.0; !- Maximum Value of x + + Curve:Quadratic, + HPACHEATPLFFPLR, !- Name + 0.75, !- Coefficient1 Constant + 0.25, !- Coefficient2 x + 0.0, !- Coefficient3 x**2 + 0.0, !- Minimum Value of x + 1.0; !- Maximum Value of x !- =========== ALL OBJECTS IN CLASS: CURVE:QUADLINEAR =========== diff --git a/tst/EnergyPlus/unit/UnitarySystem.unit.cc b/tst/EnergyPlus/unit/UnitarySystem.unit.cc index cc616f75f2b..bd8ccce58fd 100644 --- a/tst/EnergyPlus/unit/UnitarySystem.unit.cc +++ b/tst/EnergyPlus/unit/UnitarySystem.unit.cc @@ -21148,7 +21148,7 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) std::string const idf_objects = delimited_string({ - " Version,23.1;", +" Version,23.1;", " SimulationControl,", " Yes, !- Do Zone Sizing Calculation", @@ -22112,10 +22112,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " SPACE1-1 HP Heating Mode,!- Heating Coil Name", " Coil:Cooling:WaterToAirHeatPump:EquationFit, !- Cooling Coil Object Type", " SPACE1-1 HP Cooling Mode,!- Cooling Coil Name", - " 2.5, !- Maximum Cycling Rate {cycles/hr}", - " 60.0, !- Heat Pump Time Constant {s}", - " 0.01, !- Fraction of On-Cycle Power Use", - " 60, !- Heat Pump Fan Delay Time {s}", " Coil:Heating:Fuel, !- Supplemental Heating Coil Object Type", " SPACE1-1 HP Supp Coil, !- Supplemental Heating Coil Name", " 50.0, !- Maximum Supply Air Temperature from Supplemental Heater {C}", @@ -22175,10 +22171,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " SPACE2-1 HP Heating Mode,!- Heating Coil Name", " Coil:Cooling:WaterToAirHeatPump:VariableSpeedEquationFit, !- Cooling Coil Object Type", " SPACE2-1 HP Cooling Mode,!- Cooling Coil Name", - " 2.5, !- Maximum Cycling Rate {cycles/hr}", - " 60.0, !- Heat Pump Time Constant {s}", - " 0.01, !- Fraction of On-Cycle Power Use", - " 60, !- Heat Pump Fan Delay Time {s}", " Coil:Heating:Fuel, !- Supplemental Heating Coil Object Type", " SPACE2-1 HP Supp Coil, !- Supplemental Heating Coil Name", " 50.0, !- Maximum Supply Air Temperature from Supplemental Heater {C}", @@ -22338,14 +22330,15 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " Autosize, !- Rated Water Flow Rate At Selected Nominal Speed Level {m3/s}", " 0.0, !- Nominal Time for Condensate to Begin Leaving the Coil {s}", " 0.0, !- Initial Moisture Evaporation Rate Divided by Steady-State AC Latent Capacity {dimensionless}", + " 2.5, !- Maximum Cycling Rate {cycles/hr}", + " 60, !- Latent Capacity Time Constant {s}", + " 60, !- Fan Delay Time {s}", " 0, !- Flag for Using Hot Gas Reheat, 0 or 1 {dimensionless}", " VS Energy Part Load Fraction 1, !- Energy Part Load Fraction Curve Name", " 1524.1, !- Speed 1 Reference Unit Gross Rated Total Cooling Capacity {W}", " 0.75, !- Speed 1 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless}", " 4.0, !- Speed 1 Reference Unit Gross Rated Cooling COP {W/W}", " 0.1359072, !- Speed 1 Reference Unit Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " 0.000381695, !- Speed 1 Reference Unit Rated Water Flow Rate {m3/s}", " TC VS Temp1 Test, !- Speed 1 Total Cooling Capacity Function of Temperature Curve Name", " TC VS AirFrac Test, !- Speed 1 Total Cooling Capacity Function of Air Flow Fraction Curve Name", @@ -22359,8 +22352,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " 0.75, !- Speed 2 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless}", " 4.0, !- Speed 2 Reference Unit Gross Rated Cooling COP {W/W}", " 0.151008, !- Speed 2 Reference Unit Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " 0.000381695, !- Speed 2 Reference Unit Rated Water Flow Rate {m3/s}", " TC VS Temp1 Test, !- Speed 2 Total Cooling Capacity Function of Temperature Curve Name", " TC VS AirFrac Test, !- Speed 2 Total Cooling Capacity Function of Air Flow Fraction Curve Name", @@ -22374,8 +22365,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " 0.75, !- Speed 3 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless}", " 4.0, !- Speed 3 Reference Unit Gross Rated Cooling COP {W/W}", " 0.1661088, !- Speed 3 Reference Unit Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " 0.000381695, !- Speed 3 Reference Unit Rated Water Flow Rate {m3/s}", " TC VS Temp1 Test, !- Speed 3 Total Cooling Capacity Function of Temperature Curve Name", " TC VS AirFrac Test, !- Speed 3 Total Cooling Capacity Function of Air Flow Fraction Curve Name", @@ -22389,8 +22378,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " 0.75, !- Speed 4 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless}", " 4.0, !- Speed 4 Reference Unit Gross Rated Cooling COP {W/W}", " 0.1963104, !- Speed 4 Reference Unit Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " 0.000381695, !- Speed 4 Reference Unit Rated Water Flow Rate {m3/s}", " TC VS Temp1 Test, !- Speed 4 Total Cooling Capacity Function of Temperature Curve Name", " TC VS AirFrac Test, !- Speed 4 Total Cooling Capacity Function of Air Flow Fraction Curve Name", @@ -22404,8 +22391,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " 0.75, !- Speed 5 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless}", " 4.0, !- Speed 5 Reference Unit Gross Rated Cooling COP {W/W}", " 0.226512, !- Speed 5 Reference Unit Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " 0.000381695, !- Speed 5 Reference Unit Rated Water Flow Rate {m3/s}", " TC VS Temp1 Test, !- Speed 5 Total Cooling Capacity Function of Temperature Curve Name", " TC VS AirFrac Test, !- Speed 5 Total Cooling Capacity Function of Air Flow Fraction Curve Name", @@ -22419,8 +22404,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " 0.75, !- Speed 6 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless}", " 4.0, !- Speed 6 Reference Unit Gross Rated Cooling COP {W/W}", " 0.2567136, !- Speed 6 Reference Unit Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " 0.000381695, !- Speed 6 Reference Unit Rated Water Flow Rate {m3/s}", " TC VS Temp1 Test, !- Speed 6 Total Cooling Capacity Function of Temperature Curve Name", " TC VS AirFrac Test, !- Speed 6 Total Cooling Capacity Function of Air Flow Fraction Curve Name", @@ -22434,8 +22417,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " 0.75, !- Speed 7 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless}", " 4.0, !- Speed 7 Reference Unit Gross Rated Cooling COP {W/W}", " 0.2869152, !- Speed 7 Reference Unit Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " 0.000381695, !- Speed 7 Reference Unit Rated Water Flow Rate {m3/s}", " TC VS Temp1 Test, !- Speed 7 Total Cooling Capacity Function of Temperature Curve Name", " TC VS AirFrac Test, !- Speed 7 Total Cooling Capacity Function of Air Flow Fraction Curve Name", @@ -22449,8 +22430,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " 0.75, !- Speed 8 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless}", " 4.0, !- Speed 8 Reference Unit Gross Rated Cooling COP {W/W}", " 0.3171168, !- Speed 8 Reference Unit Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " 0.000381695, !- Speed 8 Reference Unit Rated Water Flow Rate {m3/s}", " TC VS Temp1 Test, !- Speed 8 Total Cooling Capacity Function of Temperature Curve Name", " TC VS AirFrac Test, !- Speed 8 Total Cooling Capacity Function of Air Flow Fraction Curve Name", @@ -22464,8 +22443,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " 0.75, !- Speed 9 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless}", " 4.0, !- Speed 9 Reference Unit Gross Rated Cooling COP {W/W}", " 0.3473184, !- Speed 9 Reference Unit Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " 0.000381695, !- Speed 9 Reference Unit Rated Water Flow Rate {m3/s}", " TC VS Temp1 Test, !- Speed 9 Total Cooling Capacity Function of Temperature Curve Name", " TC VS AirFrac Test, !- Speed 9 Total Cooling Capacity Function of Air Flow Fraction Curve Name", @@ -22479,8 +22456,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " 0.75, !- Speed 10 Reference Unit Gross Rated Sensible Heat Ratio {dimensionless}", " 4.0, !- Speed 10 Reference Unit Gross Rated Cooling COP {W/W}", " 0.37752, !- Speed 10 Reference Unit Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " 0.000381695, !- Speed 10 Reference Unit Rated Water Flow Rate {m3/s}", " TC VS Temp1 Test, !- Speed 10 Total Cooling Capacity Function of Temperature Curve Name", " TC VS AirFrac Test, !- Speed 10 Total Cooling Capacity Function of Air Flow Fraction Curve Name", @@ -22812,8 +22787,6 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " SPACE1-1 Zone Unit Fan Outlet, !- Air Inlet Node Name", " SPACE1-1 Cooling Coil Outlet, !- Air Outlet Node Name", " Autosize, !- Rated Air Flow Rate {m3/s}", - " , !- 2017 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", - " , !- 2023 Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}", " Autosize, !- Rated Water Flow Rate {m3/s}", " Autosize, !- Gross Rated Total Cooling Capacity {W}", " Autosize, !- Gross Rated Sensible Cooling Capacity {W}", @@ -22824,8 +22797,12 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " TotCoolCapCurve, !- Total Cooling Capacity Curve Name", " CoolSensCapCurve, !- Sensible Cooling Capacity Curve Name", " CoolPowCurve, !- Cooling Power Consumption Curve Name", + " HPACCOOLPLFFPLR, !- Part Load Fraction Correlation Curve Name", " 0, !- Nominal Time for Condensate Removal to Begin {s}", - " 0; !- Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless}", + " 0, !- Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless}", + " 2.5, !- Maximum Cycling Rate {cycles/hr}", + " 60, !- Latent Capacity Time Constant {s}", + " 60; !- Fan Delay Time {s}", " Coil:Heating:WaterToAirHeatPump:EquationFit,", " SPACE1-1 HP Heating Mode,!- Name", @@ -22841,7 +22818,24 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) " 20.0, !- Rated Entering Air Dry-Bulb Temperature {C}", " 1.0, !- Ratio of Rated Heating Capacity to Rated Cooling Capacity", " HeatCapCurve, !- Heating Capacity Curve Name", - " HeatPowCurve; !- Heating Power Consumption Curve Name", + " HeatPowCurve, !- Heating Power Consumption Curve Name", + " HPACHEATPLFFPLR; !- Part Load Fraction Correlation Curve Name", + + " Curve:Quadratic,", + " HPACCOOLPLFFPLR, !- Name", + " 0.75, !- Coefficient1 Constant", + " 0.25, !- Coefficient2 x", + " 0.0, !- Coefficient3 x**2", + " 0.0, !- Minimum Value of x", + " 1.0; !- Maximum Value of x", + + " Curve:Quadratic,", + " HPACHEATPLFFPLR, !- Name", + " 0.75, !- Coefficient1 Constant", + " 0.25, !- Coefficient2 x", + " 0.0, !- Coefficient3 x**2", + " 0.0, !- Minimum Value of x", + " 1.0; !- Maximum Value of x", " Curve:QuadLinear,", " TotCoolCapCurve, !- Name", @@ -23468,7 +23462,7 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) EXPECT_NEAR(thisSys.m_SpeedRatio, 0.0, 0.0001); EXPECT_NEAR(thisSys.m_CycRatio, 0.81485929, 0.0001); EXPECT_EQ(thisSys.m_SpeedNum, 1); - EXPECT_NEAR(sensOut, 2000.0, 0.0001); + EXPECT_NEAR(sensOut, 2000.0, 0.5); state->dataZoneEnergyDemand->ZoneSysEnergyDemand[0].RemainingOutputRequired = 3000.0; state->dataZoneEnergyDemand->ZoneSysEnergyDemand[0].RemainingOutputReqToCoolSP = 3000.0; @@ -23485,7 +23479,7 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) ZoneEquipment, sensOut, latOut); - EXPECT_NEAR(thisSys.m_SpeedRatio, 0.692461, 0.0001); + EXPECT_NEAR(thisSys.m_SpeedRatio, 0.691837, 0.0001); EXPECT_NEAR(thisSys.m_CycRatio, 1.0, 0.0001); EXPECT_EQ(thisSys.m_SpeedNum, 2); EXPECT_NEAR(sensOut, 3000.0, 2); @@ -23510,7 +23504,7 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) sensOut, latOut); EXPECT_NEAR(thisSys.m_SpeedRatio, 0.0, 0.0001); - EXPECT_NEAR(thisSys.m_CycRatio, 0.801644, 0.0001); + EXPECT_NEAR(thisSys.m_CycRatio, 0.801813, 0.0001); EXPECT_EQ(thisSys.m_SpeedNum, 1); EXPECT_NEAR(sensOut, -800.0, 2); state->dataZoneEnergyDemand->ZoneSysEnergyDemand[0].RemainingOutputRequired = -1500.0; @@ -23529,7 +23523,7 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) ZoneEquipment, sensOut, latOut); - EXPECT_NEAR(thisSys.m_SpeedRatio, 0.274679, 0.0001); + EXPECT_NEAR(thisSys.m_SpeedRatio, 0.27708, 0.0001); EXPECT_NEAR(thisSys.m_CycRatio, 1.0, 0.0001); EXPECT_EQ(thisSys.m_SpeedNum, 2); EXPECT_NEAR(sensOut, -1500.0, 2); @@ -23576,7 +23570,7 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) sensOut, latOut); // Sixth speed cooling - EXPECT_NEAR(thisSys1.m_SpeedRatio, 0.36171248, 0.0001); + EXPECT_NEAR(thisSys1.m_SpeedRatio, 0.361666, 0.0001); EXPECT_NEAR(thisSys1.m_CycRatio, 1.0, 0.0001); EXPECT_EQ(thisSys1.m_SpeedNum, 6); EXPECT_NEAR(sensOut, -500.0, 2); @@ -23621,7 +23615,7 @@ TEST_F(EnergyPlusFixture, UnitarySystemModel_MultiSpeedFanWSHP_Test) sensOut, latOut); // Second speed heating - EXPECT_NEAR(thisSys1.m_SpeedRatio, 0.92618, 0.0001); + EXPECT_NEAR(thisSys1.m_SpeedRatio, 0.926240, 0.0001); EXPECT_NEAR(thisSys1.m_CycRatio, 1.0, 0.0001); EXPECT_EQ(thisSys1.m_SpeedNum, 2); EXPECT_NEAR(sensOut, 500.0, 2);