EnergyPlus v24.2.0: add model and FT tests

resources/energyplus/ProposedEnergy+.idd

@@ -43458,10 +43458,10 @@ Chiller:Electric:EIR,
   A17, \field Condenser Flow Control
        \note Select the chiller condenser flow request mode. With "ConstantFlow" a chiller will always request
        \note its maximum condenser flow rate. With "ModulatedChillerPLR" the condenser flow request corresponds
-       \note to the chiller part load ratio multiplied by the chiller maximum condenser flow rate.  With 
-       \note "ModulatedLoopPLR" the chiller will request a flow rate that is function of the chilled water 
+       \note to the chiller part load ratio multiplied by the chiller maximum condenser flow rate.  With
+       \note "ModulatedLoopPLR" the chiller will request a flow rate that is function of the chilled water
        \note loop's part load ratio, see the "Condenser Loop Flow Rate Fraction Function of Loop Part Load Ratio
-       \note Curve Name" input. With "ModulatedDeltaTemperature" the chiller will request the flow rate required to meet 
+       \note Curve Name" input. With "ModulatedDeltaTemperature" the chiller will request the flow rate required to meet
        \note the condenser loop load based on the condenser leaving fluid temperature and a reference temperature,
        \note see the "Temperature Difference Across Condenser"  and "Temperature Difference Across Condenser Schedule
        \note Name" input.
@@ -43475,15 +43475,15 @@ Chiller:Electric:EIR,
        \default ConstantFlow
   A18, \field Condenser Loop Flow Rate Fraction Function of Loop Part Load Ratio Curve Name
        \note Condenser loop flow rate fraction as a function of loop part load ratio
-       \note CWFR = C * PLR + D 
+       \note CWFR = C * PLR + D
        \note Where:
        \note CWFR is the condenser water flow fraction (actual/design)
        \note C and D are coefficients, see "Optimizing Design & Control Of Chilled Water Plants, Part 5", S. Taylor, ASHRAE Journal June 2012
        \note PLR is the chilled water plant loop part load ratio (actual/design)
        \type object-list
        \object-list UnivariateFunctions
   A19, \field Temperature Difference Across Condenser Schedule Name
-       \note A schedule that defines the temperature difference across the condenser. This input is used to 
+       \note A schedule that defines the temperature difference across the condenser. This input is used to
        \note calculate the condenser flow. This input is only used when "Condenser Flow Control" is set to
        \note "ModulatedDeltaTemperature".
        \type object-list
@@ -43707,10 +43707,10 @@ Chiller:Electric:ReformulatedEIR,
   A16, \field Condenser Flow Control
        \note Select the chiller condenser flow request mode. With "ConstantFlow" a chiller will always request
        \note its maximum condenser flow rate. With "ModulatedChillerPLR" the condenser flow request corresponds
-       \note to the chiller part load ratio multiplied by the chiller maximum condenser flow rate.  With 
-       \note "ModulatedLoopPLR" the chiller will request a flow rate that is function of the chilled water 
+       \note to the chiller part load ratio multiplied by the chiller maximum condenser flow rate.  With
+       \note "ModulatedLoopPLR" the chiller will request a flow rate that is function of the chilled water
        \note loop's part load ratio, see the "Condenser Loop Flow Rate Fraction Function of Loop Part Load Ratio
-       \note Curve Name" input. With "ModulatedDeltaTemperature" the chiller will request the flow rate required to meet 
+       \note Curve Name" input. With "ModulatedDeltaTemperature" the chiller will request the flow rate required to meet
        \note the condenser loop load based on the condenser leaving fluid temperature and a reference temperature,
        \note see the "Temperature Difference Across Condenser"  and "Temperature Difference Across Condenser Schedule
        \note Name" input.
@@ -43724,15 +43724,15 @@ Chiller:Electric:ReformulatedEIR,
        \default ConstantFlow
   A17, \field Condenser Loop Flow Rate Fraction Function of Loop Part Load Ratio Curve Name
        \note Condenser loop flow rate fraction as a function of loop part load ratio
-       \note CWFR = C * PLR + D 
+       \note CWFR = C * PLR + D
        \note Where:
        \note CWFR is the condenser water flow fraction (actual/design)
        \note C and D are coefficients, see "Optimizing Design & Control Of Chilled Water Plants, Part 5", S. Taylor, ASHRAE Journal June 2012
        \note PLR is the chilled water plant loop part load ratio (actual/design)
        \type object-list
        \object-list UnivariateFunctions
   A18, \field Temperature Difference Across Condenser Schedule Name
-       \note A schedule that defines the temperature difference across the condenser. This input is used to 
+       \note A schedule that defines the temperature difference across the condenser. This input is used to
        \note calculate the condenser flow. This input is only used when "Condenser Flow Control" is set to
        \note "ModulatedDeltaTemperature".
        \type object-list
@@ -45259,7 +45259,7 @@ HeatPump:PlantLoop:EIR:Cooling,
         \note curve = a + b*CWS + c*CWS**2 + d*ECT + e*ECT**2 + f*CWS*ECT
         \note CWS = supply (leaving) chilled water temperature(C)
         \note ECT = entering condenser fluid temperature(C)
-        \note If this field is blank, the AWHP curve without heat recovery will be used 
+        \note If this field is blank, the AWHP curve without heat recovery will be used
    A19, \field Thermosiphon Capacity Fraction Curve Name
         \type object-list
         \object-list UnivariateFunctions
@@ -45513,7 +45513,7 @@ HeatPump:PlantLoop:EIR:Heating,
         \note curve = a + b*HWS + c*HWS**2 + d*ECT + e*ECT**2 + f*HWS*ECT
         \note HWS = supply (leaving) hot water temperature(C)
         \note ECT = entering condenser fluid temperature(C)
-        \note If this field is blank, the AWHP curve without heat recovery will be used 
+        \note If this field is blank, the AWHP curve without heat recovery will be used
 
 HeatPump:AirToWater:FuelFired:Heating,
        \memo The object defines a fuel-fired absorption heat pump based on equation-fit models.

resources/model/OpenStudio.idd

@@ -14290,7 +14290,7 @@ OS:HeatPump:PlantLoop:EIR:Heating,
        \note curve = a + b*HWS + c*HWS**2 + d*ECT + e*ECT**2 + f*HWS*ECT
        \note HWS = supply (leaving) hot water temperature(C)
        \note ECT = entering condenser fluid temperature(C)
-       \note If this field is blank, the AWHP curve without heat recovery will be used 
+       \note If this field is blank, the AWHP curve without heat recovery will be used
 
 OS:HeatPump:PlantLoop:EIR:Cooling,
        \memo An EIR formulated water to water heat pump model, cooling operation.
@@ -14471,7 +14471,7 @@ OS:HeatPump:PlantLoop:EIR:Cooling,
        \note curve = a + b*CWS + c*CWS**2 + d*ECT + e*ECT**2 + f*CWS*ECT
        \note CWS = supply (leaving) chilled water temperature(C)
        \note ECT = entering condenser fluid temperature(C)
-       \note If this field is blank, the AWHP curve without heat recovery will be used 
+       \note If this field is blank, the AWHP curve without heat recovery will be used
    A18,\field Thermosiphon Capacity Fraction Curve Name
        \type object-list
        \object-list UnivariateFunctions
@@ -15048,10 +15048,10 @@ OS:Chiller:Electric:EIR,
   A18, \field Condenser Flow Control
        \note Select the chiller condenser flow request mode. With "ConstantFlow" a chiller will always request
        \note its maximum condenser flow rate. With "ModulatedChillerPLR" the condenser flow request corresponds
-       \note to the chiller part load ratio multiplied by the chiller maximum condenser flow rate.  With 
-       \note "ModulatedLoopPLR" the chiller will request a flow rate that is function of the chilled water 
+       \note to the chiller part load ratio multiplied by the chiller maximum condenser flow rate.  With
+       \note "ModulatedLoopPLR" the chiller will request a flow rate that is function of the chilled water
        \note loop's part load ratio, see the "Condenser Loop Flow Rate Fraction Function of Loop Part Load Ratio
-       \note Curve Name" input. With "ModulatedDeltaTemperature" the chiller will request the flow rate required to meet 
+       \note Curve Name" input. With "ModulatedDeltaTemperature" the chiller will request the flow rate required to meet
        \note the condenser loop load based on the condenser leaving fluid temperature and a reference temperature,
        \note see the "Temperature Difference Across Condenser"  and "Temperature Difference Across Condenser Schedule
        \note Name" input.
@@ -15065,15 +15065,15 @@ OS:Chiller:Electric:EIR,
        \required-field
   A19, \field Condenser Loop Flow Rate Fraction Function of Loop Part Load Ratio Curve Name
        \note Condenser loop flow rate fraction as a function of loop part load ratio
-       \note CWFR = C * PLR + D 
+       \note CWFR = C * PLR + D
        \note Where:
        \note CWFR is the condenser water flow fraction (actual/design)
        \note C and D are coefficients, see "Optimizing Design & Control Of Chilled Water Plants, Part 5", S. Taylor, ASHRAE Journal June 2012
        \note PLR is the chilled water plant loop part load ratio (actual/design)
        \type object-list
        \object-list UnivariateFunctions
   A20, \field Temperature Difference Across Condenser Schedule Name
-       \note A schedule that defines the temperature difference across the condenser. This input is used to 
+       \note A schedule that defines the temperature difference across the condenser. This input is used to
        \note calculate the condenser flow. This input is only used when "Condenser Flow Control" is set to
        \note "ModulatedDeltaTemperature".
        \type object-list
@@ -15300,7 +15300,7 @@ OS:Chiller:Electric:ReformulatedEIR,
        \note Using this triggers a model more suited to series bundle and chillers with higher temperature heat recovery
        \note If this field is not used, the bundles are modeled as being in parallel
        \type object-list
-       \object-list ConnectionNames
+       \object-list Node
   A16, \field End-Use Subcategory
        \note Any text may be used here to categorize the end-uses in the ABUPS End Uses by Subcategory table.
        \type alpha
@@ -15309,10 +15309,10 @@ OS:Chiller:Electric:ReformulatedEIR,
   A17, \field Condenser Flow Control
        \note Select the chiller condenser flow request mode. With "ConstantFlow" a chiller will always request
        \note its maximum condenser flow rate. With "ModulatedChillerPLR" the condenser flow request corresponds
-       \note to the chiller part load ratio multiplied by the chiller maximum condenser flow rate.  With 
-       \note "ModulatedLoopPLR" the chiller will request a flow rate that is function of the chilled water 
+       \note to the chiller part load ratio multiplied by the chiller maximum condenser flow rate.  With
+       \note "ModulatedLoopPLR" the chiller will request a flow rate that is function of the chilled water
        \note loop's part load ratio, see the "Condenser Loop Flow Rate Fraction Function of Loop Part Load Ratio
-       \note Curve Name" input. With "ModulatedDeltaTemperature" the chiller will request the flow rate required to meet 
+       \note Curve Name" input. With "ModulatedDeltaTemperature" the chiller will request the flow rate required to meet
        \note the condenser loop load based on the condenser leaving fluid temperature and a reference temperature,
        \note see the "Temperature Difference Across Condenser"  and "Temperature Difference Across Condenser Schedule
        \note Name" input.
@@ -15326,15 +15326,15 @@ OS:Chiller:Electric:ReformulatedEIR,
        \required-field
   A18, \field Condenser Loop Flow Rate Fraction Function of Loop Part Load Ratio Curve Name
        \note Condenser loop flow rate fraction as a function of loop part load ratio
-       \note CWFR = C * PLR + D 
+       \note CWFR = C * PLR + D
        \note Where:
        \note CWFR is the condenser water flow fraction (actual/design)
        \note C and D are coefficients, see "Optimizing Design & Control Of Chilled Water Plants, Part 5", S. Taylor, ASHRAE Journal June 2012
        \note PLR is the chilled water plant loop part load ratio (actual/design)
        \type object-list
        \object-list UnivariateFunctions
   A19, \field Temperature Difference Across Condenser Schedule Name
-       \note A schedule that defines the temperature difference across the condenser. This input is used to 
+       \note A schedule that defines the temperature difference across the condenser. This input is used to
        \note calculate the condenser flow. This input is only used when "Condenser Flow Control" is set to
        \note "ModulatedDeltaTemperature".
        \type object-list

src/energyplus/CMakeLists.txt

@@ -687,6 +687,8 @@ set(${target_name}_test_src
   Test/BoilerHotWater_GTest.cpp
   Test/Building_GTest.cpp
   Test/ChillerElectricASHRAE205_GTest.cpp
+  Test/ChillerElectricEIR_GTest.cpp
+  Test/ChillerElectricReformulatedEIR_GTest.cpp
   Test/CentralHeatPumpSystem_GTest.cpp
   Test/CoilCoolingDX_GTest.cpp
   Test/CoilCoolingDXCurveFitPerformance_GTest.cpp
@@ -799,6 +801,7 @@ set(${target_name}_test_src
   Test/ShadingSurface_GTest.cpp
   Test/ShadowCalculation_GTest.cpp
   Test/SimulationControl_GTest.cpp
+  Test/Site_GTest.cpp
   Test/SiteGroundTemperatureUndisturbedKusudaAchenbach_GTest.cpp
   Test/SiteGroundTemperatureUndisturbedXing_GTest.cpp
   Test/SizingSystem_GTest.cpp

src/energyplus/ForwardTranslator/ForwardTranslateChillerElectricEIR.cpp

@@ -293,9 +293,7 @@ namespace energyplus {
     }
 
     // Condenser Minimum Flow Fraction
-    if ((value = modelObject.condenserMinimumFlowFraction())) {
-      idfObject.setDouble(Chiller_Electric_EIRFields::CondenserMinimumFlowFraction, value.get());
-    }
+    idfObject.setDouble(Chiller_Electric_EIRFields::CondenserMinimumFlowFraction, modelObject.condenserMinimumFlowFraction());
 
     // Thermosiphon Capacity Fraction Curve Name
     if (boost::optional<Curve> thermosiphonCapacityFractionCurve_ = modelObject.thermosiphonCapacityFractionCurve()) {

src/energyplus/ForwardTranslator/ForwardTranslateChillerElectricReformulatedEIR.cpp

@@ -237,9 +237,7 @@ namespace energyplus {
     }
 
     // Condenser Minimum Flow Fraction
-    if ((value = modelObject.condenserMinimumFlowFraction())) {
-      idfObject.setDouble(Chiller_Electric_ReformulatedEIRFields::CondenserMinimumFlowFraction, value.get());
-    }
+    idfObject.setDouble(Chiller_Electric_ReformulatedEIRFields::CondenserMinimumFlowFraction, modelObject.condenserMinimumFlowFraction());
 
     // Thermosiphon Capacity Fraction Curve Name
     if (boost::optional<Curve> thermosiphonCapacityFractionCurve_ = modelObject.thermosiphonCapacityFractionCurve()) {