From b9e2903f5774f32bee3a90f02d4ee2dcad874419 Mon Sep 17 00:00:00 2001 From: Yujie Xu Date: Fri, 28 Apr 2023 11:02:45 -0700 Subject: [PATCH] Change curve field name to match existing pattern --- design/FY2023/NFP-crankcaseHeater.md | 2 +- src/EnergyPlus/DXCoils.cc | 6 +++--- src/EnergyPlus/VariableSpeedCoils.cc | 2 +- ...CoilCoolingDXCurveFitOperatingMode.unit.cc | 2 +- tst/EnergyPlus/unit/DXCoils.unit.cc | 20 +++++++++---------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/design/FY2023/NFP-crankcaseHeater.md b/design/FY2023/NFP-crankcaseHeater.md index d09f31be160..e54367cd932 100644 --- a/design/FY2023/NFP-crankcaseHeater.md +++ b/design/FY2023/NFP-crankcaseHeater.md @@ -133,7 +133,7 @@ heater capacity. The added optional field is: - Ai, \field Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name + Ai, \field Crankcase Heater Capacity Function of Outdoor Temperature Curve Name \note A Curve:* or Table:Lookup object encoding the relationship between \note the crankcase heater capacity and the outdoor air temperature. When this field is \note missing or empty, constant crankcase heater capacity will be assumed. diff --git a/src/EnergyPlus/DXCoils.cc b/src/EnergyPlus/DXCoils.cc index 7cea7c0ce52..fe9774ba381 100644 --- a/src/EnergyPlus/DXCoils.cc +++ b/src/EnergyPlus/DXCoils.cc @@ -1362,7 +1362,7 @@ void GetDXCoils(EnergyPlusData &state) ShowContinueError(state, format("...not found {}=\"{}\".", cAlphaFields(18), Alphas(18))); } } - // A19; \field Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name + // A19; \field Crankcase Heater Capacity Function of Outdoor Temperature Curve Name if (!lAlphaBlanks(19)) { thisDXCoil.CrankcaseHeaterCapacityCurveIndex = Curve::GetCurveIndex(state, Alphas(19)); } @@ -1913,7 +1913,7 @@ void GetDXCoils(EnergyPlusData &state) ShowContinueError(state, "Basin heater will be available to operate throughout the simulation."); } } - // A16; \field Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name + // A16; \field Crankcase Heater Capacity Function of Outdoor Temperature Curve Name if (!lAlphaBlanks(16)) { thisDXCoil.CrankcaseHeaterCapacityCurveIndex = Curve::GetCurveIndex(state, Alphas(16)); } @@ -2368,7 +2368,7 @@ void GetDXCoils(EnergyPlusData &state) } } } - // A17; \field Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name + // A17; \field Crankcase Heater Capacity Function of Outdoor Temperature Curve Name if (!lAlphaBlanks(17)) { thisDXCoil.CrankcaseHeaterCapacityCurveIndex = Curve::GetCurveIndex(state, Alphas(17)); } diff --git a/src/EnergyPlus/VariableSpeedCoils.cc b/src/EnergyPlus/VariableSpeedCoils.cc index 0408ec826ea..72a28414036 100644 --- a/src/EnergyPlus/VariableSpeedCoils.cc +++ b/src/EnergyPlus/VariableSpeedCoils.cc @@ -1386,7 +1386,7 @@ namespace VariableSpeedCoils { state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).MSRatedTotCap(I); } - // A50; \field Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name + // A50; \field Crankcase Heater Capacity Function of Outdoor Temperature Curve Name if (!lAlphaBlanks(50)) { state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CrankcaseHeaterCapacityCurveIndex = Curve::GetCurveIndex(state, AlphArray(50)); } diff --git a/tst/EnergyPlus/unit/Coils/CoilCoolingDXCurveFitOperatingMode.unit.cc b/tst/EnergyPlus/unit/Coils/CoilCoolingDXCurveFitOperatingMode.unit.cc index 3469c0debac..1c5f89279b9 100644 --- a/tst/EnergyPlus/unit/Coils/CoilCoolingDXCurveFitOperatingMode.unit.cc +++ b/tst/EnergyPlus/unit/Coils/CoilCoolingDXCurveFitOperatingMode.unit.cc @@ -238,7 +238,7 @@ TEST_F(CoilCoolingDXTest, CoilCoolingDXCurveFitCrankcaseHeaterCurve) " Coil Cooling DX Curve Fit Operating Mode 1, !- Base Operating Mode", ",", ",", - "heaterCapCurve; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + "heaterCapCurve; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", "Curve:Linear,", "heaterCapCurve, !- Name", diff --git a/tst/EnergyPlus/unit/DXCoils.unit.cc b/tst/EnergyPlus/unit/DXCoils.unit.cc index 08705b22c7d..b37bd68ac38 100644 --- a/tst/EnergyPlus/unit/DXCoils.unit.cc +++ b/tst/EnergyPlus/unit/DXCoils.unit.cc @@ -1118,7 +1118,7 @@ TEST_F(EnergyPlusFixture, TestReadingCoilCoolingHeatingDX) ", !- Sensible Heat Ratio Function of Flow Fraction Curve Name", ", !- Report ASHRAE Standard 127 Performance Ratings", ", !- Zone Name for Condenser Placement", - "heaterCapCurve; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + "heaterCapCurve; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", "Coil:Heating:DX:SingleSpeed,", "Coil:Heating:DX:SingleSpeed coil, !- Name", @@ -1153,7 +1153,7 @@ TEST_F(EnergyPlusFixture, TestReadingCoilCoolingHeatingDX) ", !- Nominal Sensible Heat Ratio of Secondary Coil", ", !- Sensible Heat Ratio Modifier Function of Temperature Curve Name", ", !- Sensible Heat Ratio Modifier Function of Flow Fraction Curve Name", - "heaterCapCurve2; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + "heaterCapCurve2; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", "Coil:Cooling:DX:MultiSpeed,", "Coil:Cooling:DX:MultiSpeed coil, !- Name", @@ -1255,7 +1255,7 @@ TEST_F(EnergyPlusFixture, TestReadingCoilCoolingHeatingDX) "0.3, !- Speed 4 Evaporative Condenser Air Flow Rate{ m3 / s }", "100, !- Speed 4 Rated Evaporative Condenser Pump Power Consumption{ W }", ", !- Zone Name for Condenser Placement", - "heaterCapCurve3; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + "heaterCapCurve3; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", " Coil:Heating:DX:MultiSpeed,", "Coil:Heating:DX:MultiSpeed coil, !- Name", @@ -1345,7 +1345,7 @@ TEST_F(EnergyPlusFixture, TestReadingCoilCoolingHeatingDX) ",", ",", ",", - "heaterCapCurve4; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + "heaterCapCurve4; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", " Coil:Cooling:DX:VariableSpeed,", "Coil:Cooling:DX:VariableSpeed coil, !- Name", @@ -1469,7 +1469,7 @@ TEST_F(EnergyPlusFixture, TestReadingCoilCoolingHeatingDX) ",", ",", ",", - "heaterCapCurve5; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + "heaterCapCurve5; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", " Coil:Heating:DX:VariableSpeed,", "Coil:Heating:DX:VariableSpeed coil, !- Name", @@ -1560,7 +1560,7 @@ TEST_F(EnergyPlusFixture, TestReadingCoilCoolingHeatingDX) " Cubic, !- Speed 10 Heating Capacity Function of Air Flow Fraction Curve Name", " Biquadratic, !- Speed 10 Energy Input Ratio Function of Temperature Curve Name", " Cubic, !- Speed 10 Energy Input Ratio Function of Air Flow Fraction Curve Name", - "heaterCapCurve6; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + "heaterCapCurve6; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", "Coil:Cooling:DX:TwoStageWithHumidityControlMode,", "Coil:Cooling:DX:TwoStageWithHumidityControlMode coil, !- Name", @@ -1585,7 +1585,7 @@ TEST_F(EnergyPlusFixture, TestReadingCoilCoolingHeatingDX) ", !- Basin Heater Capacity", ", !- Basin Heater Setpoint Temperature", ", !- Basin Heater Operating Schedule Name", - "heaterCapCurve7; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + "heaterCapCurve7; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", "Coil:WaterHeating:AirToWaterHeatPump:Wrapped,", " HPWH Coil_1, !- Name", @@ -1607,7 +1607,7 @@ TEST_F(EnergyPlusFixture, TestReadingCoilCoolingHeatingDX) " Biquadratic, !- Heating COP Function of Temperature Curve Name", " ,", " ,", - " heaterCapCurve8; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + " heaterCapCurve8; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", " Coil:WaterHeating:AirToWaterHeatPump:Pumped,", " Zone4HPWHDXCoil, !- Name", @@ -1638,7 +1638,7 @@ TEST_F(EnergyPlusFixture, TestReadingCoilCoolingHeatingDX) " , !- Heating COP Function of Air Flow Fraction Curve Name", " , !- Heating COP Function of Water Flow Fraction Curve Name", " Cubic, !- Part Load Fraction Correlation Curve Name", - " heaterCapCurve9; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + " heaterCapCurve9; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", " Coil:WaterHeating:AirToWaterHeatPump:VariableSpeed,", " HPWHOutdoorDXCoilVS, !- Name", @@ -1782,7 +1782,7 @@ TEST_F(EnergyPlusFixture, TestReadingCoilCoolingHeatingDX) " Biquadratic, !- Heating COP Function of Temperature Curve Name", " Cubic, !- Heating COP Function of Air Flow Fraction Curve Name", " Cubic, !- Heating COP Function of Water Flow Fraction Curve Name", - " heaterCapCurve10; !- Outdoor Temperature Dependent Crankcase Heater Capacity Curve Name", + " heaterCapCurve10; !- Crankcase Heater Capacity Function of Outdoor Temperature Curve Name", "CoilPerformance:DX:Cooling,", "DOAS Standard Perf 1, !- Name",