Merge pull request #4968 from NREL/v23.2.0-IOFreeze-fuel_types

V23.2.0-IOFreeze - Fuel Type enum changes (DistrictHeatingWater / DistrictHeatingSteam)
NREL · Sep 19, 2023 · 69021c4 · 69021c4
2 parents d8aa548 + 821293a
commit 69021c4
Show file tree

Hide file tree

Showing 36 changed files with 1,259 additions and 181 deletions.
diff --git a/resources/energyplus/ProposedEnergy+.idd b/resources/energyplus/ProposedEnergy+.idd
@@ -15410,7 +15410,6 @@ Exterior:FuelEquipment,
        \required-field
        \type choice
        \key Electricity
-       \key Water
        \key NaturalGas
        \key Propane
        \key FuelOilNo1

diff --git a/resources/model/OpenStudio.idd b/resources/model/OpenStudio.idd
@@ -1848,7 +1848,6 @@ OS:WeatherProperty:SkyTemperature,
        \key Idso
        \key BerdahlMartin
        \key ScheduleValue
-       \key ScheduleValue
        \key DifferenceScheduleDryBulbValue
        \key DifferenceScheduleDewPointValue
   A4, \field Schedule Name
@@ -7353,8 +7352,8 @@ OS:OtherEquipment,
        \key Coal
        \key OtherFuel1
        \key OtherFuel2
-       \key Steam
-       \key DistrictHeating
+       \key DistrictHeatingSteam
+       \key DistrictHeatingWater
        \key DistrictCooling
        \default None
   A7;  \field End-Use Subcategory
@@ -7592,8 +7591,8 @@ OS:Exterior:FuelEquipment,
        \key Coal
        \key OtherFuel1
        \key OtherFuel2
-       \key Steam
-       \key DistrictHeating
+       \key DistrictHeatingSteam
+       \key DistrictHeatingWater
        \key DistrictCooling
   N1,  \field Multiplier
        \type real
@@ -30218,8 +30217,8 @@ OS:WaterHeater:Mixed,
        \key Gasoline
        \key OtherFuel1
        \key OtherFuel2
-       \key Steam
-       \key DistrictHeating
+       \key DistrictHeatingSteam
+       \key DistrictHeatingWater
   N8 , \field Heater Thermal Efficiency
        \type real
        \minimum> 0.0
@@ -30244,8 +30243,8 @@ OS:WaterHeater:Mixed,
        \key Gasoline
        \key OtherFuel1
        \key OtherFuel2
-       \key Steam
-       \key DistrictHeating
+       \key DistrictHeatingSteam
+       \key DistrictHeatingWater
   N10, \field Off Cycle Parasitic Heat Fraction to Tank
        \type real
        \minimum 0.0
@@ -30268,8 +30267,8 @@ OS:WaterHeater:Mixed,
        \key Gasoline
        \key OtherFuel1
        \key OtherFuel2
-       \key Steam
-       \key DistrictHeating
+       \key DistrictHeatingSteam
+       \key DistrictHeatingWater
   N12, \field On Cycle Parasitic Heat Fraction to Tank
        \type real
        \minimum 0.0
@@ -31575,8 +31574,8 @@ OS:WaterHeater:Stratified,
        \key Gasoline
        \key OtherFuel1
        \key OtherFuel2
-       \key Steam
-       \key DistrictHeating
+       \key DistrictHeatingSteam
+       \key DistrictHeatingWater
   N11, \field Heater Thermal Efficiency
        \required-field
        \type real
@@ -31600,8 +31599,8 @@ OS:WaterHeater:Stratified,
        \key Gasoline
        \key OtherFuel1
        \key OtherFuel2
-       \key Steam
-       \key DistrictHeating
+       \key DistrictHeatingSteam
+       \key DistrictHeatingWater
   N13, \field Off Cycle Parasitic Heat Fraction to Tank
        \required-field
        \type real
@@ -31630,8 +31629,8 @@ OS:WaterHeater:Stratified,
        \key Gasoline
        \key OtherFuel1
        \key OtherFuel2
-       \key Steam
-       \key DistrictHeating
+       \key DistrictHeatingSteam
+       \key DistrictHeatingWater
   N16, \field On Cycle Parasitic Heat Fraction to Tank
        \required-field
        \type real
@@ -35642,7 +35641,7 @@ OS:LifeCycleCost:UsePriceEscalation,
         \key ElectricitySurplusSold
         \key ElectricityNet
         \key NaturalGas
-        \key Steam
+        \key DistrictHeatingSteam
         \key Gasoline
         \key Diesel
         \key Coal
@@ -35695,19 +35694,19 @@ OS:UtilityBill,
        \type choice
        \required-field
        \key Electricity
-       \key Gas
+       \key NaturalGas
        \key Gasoline
        \key Diesel
        \key Coal
-       \key FuelOil_1
-       \key FuelOil_2
+       \key FuelOilNo1
+       \key FuelOilNo2
        \key Propane
        \key Water
-       \key Steam
+       \key DistrictHeatingSteam
        \key DistrictCooling
-       \key DistrictHeating
-       \key OtherFuel_1
-       \key OtherFuel_2
+       \key DistrictHeatingWater
+       \key OtherFuel1
+       \key OtherFuel2
        \key EnergyTransfer
   A4, \field Meter Install Location
        \note Location the meter associated with this utility bill object is installed.
@@ -36677,8 +36676,8 @@ OS:Meter:Custom,
         \key Coal
         \key OtherFuel1
         \key OtherFuel2
-        \key Steam
-        \key DistrictHeating
+        \key DistrictHeatingSteam
+        \key DistrictHeatingWater
         \key DistrictCooling
         \key Water
         \key Generic
@@ -36708,8 +36707,8 @@ OS:Meter:CustomDecrement,
         \key Coal
         \key OtherFuel1
         \key OtherFuel2
-        \key Steam
-        \key DistrictHeating
+        \key DistrictHeatingSteam
+        \key DistrictHeatingWater
         \key DistrictCooling
         \key Water
         \key Generic
@@ -36745,7 +36744,7 @@ OS:EnvironmentalImpactFactors,
   A1, \field Handle
       \type handle
       \required-field
-  N1, \field District Heating Efficiency
+  N1, \field District Heating Water Efficiency
       \note District heating efficiency used when converted to natural gas
       \minimum> 0.0
       \required-field
@@ -36754,7 +36753,7 @@ OS:EnvironmentalImpactFactors,
       \units W/W
       \minimum> 0.0
       \required-field
-  N3, \field Steam Conversion Efficiency
+  N3, \field District Heating Steam Conversion Efficiency
       \note Steam conversion efficiency used to convert steam usage to natural gas
       \minimum> 0.0
       \required-field
@@ -37398,9 +37397,9 @@ OS:EnergyManagementSystem:MeteredOutputVariable,
        \key WellWaterDrawn
        \key CondensateWaterCollected
        \key EnergyTransfer
-       \key Steam
+       \key DistrictHeatingSteam
        \key DistrictCooling
-       \key DistrictHeating
+       \key DistrictHeatingWater
        \key ElectricityProducedOnSite
        \key SolarWaterHeating
        \key SolarAirHeating
@@ -37638,9 +37637,9 @@ OS:PythonPlugin:OutputVariable,
        \key WellWaterDrawn
        \key CondensateWaterCollected
        \key EnergyTransfer
-       \key Steam
+       \key DistrictHeatingSteam
        \key DistrictCooling
-       \key DistrictHeating
+       \key DistrictHeatingWater
        \key ElectricityProducedOnSite
        \key SolarWaterHeating
        \key SolarAirHeating

diff --git a/src/energyplus/ForwardTranslator/ForwardTranslateEnvironmentalImpactFactors.cpp b/src/energyplus/ForwardTranslator/ForwardTranslateEnvironmentalImpactFactors.cpp
@@ -24,13 +24,14 @@ namespace energyplus {
     m_idfObjects.push_back(idfObject);
 
     // District Heating Water Efficiency
-    idfObject.setDouble(EnvironmentalImpactFactorsFields::DistrictHeatingWaterEfficiency, modelObject.districtHeatingEfficiency());
+    idfObject.setDouble(EnvironmentalImpactFactorsFields::DistrictHeatingWaterEfficiency, modelObject.districtHeatingWaterEfficiency());
 
     // District Cooling COP
     idfObject.setDouble(EnvironmentalImpactFactorsFields::DistrictCoolingCOP, modelObject.districtCoolingCOP());
 
     // District Heating Steam Conversion Efficiency
-    idfObject.setDouble(EnvironmentalImpactFactorsFields::DistrictHeatingSteamConversionEfficiency, modelObject.steamConversionEfficiency());
+    idfObject.setDouble(EnvironmentalImpactFactorsFields::DistrictHeatingSteamConversionEfficiency,
+                        modelObject.districtHeatingSteamConversionEfficiency());
 
     // Total Carbon Equivalent Emission Factor From N2O
     idfObject.setDouble(EnvironmentalImpactFactorsFields::TotalCarbonEquivalentEmissionFactorFromN2O,

diff --git a/src/energyplus/ReverseTranslator/ReverseTranslateEnvironmentalImpactFactors.cpp b/src/energyplus/ReverseTranslator/ReverseTranslateEnvironmentalImpactFactors.cpp
@@ -22,9 +22,9 @@ namespace energyplus {
     auto modelObject = m_model.getUniqueModelObject<EnvironmentalImpactFactors>();
 
     // District Heating Water Efficiency: Optional Double
-    if (boost::optional<double> _districtHeatingEfficiency =
+    if (boost::optional<double> _districtHeatingWaterEfficiency =
           workspaceObject.getDouble(EnvironmentalImpactFactorsFields::DistrictHeatingWaterEfficiency)) {
-      modelObject.setDistrictHeatingEfficiency(_districtHeatingEfficiency.get());
+      modelObject.setDistrictHeatingWaterEfficiency(_districtHeatingWaterEfficiency.get());
     }
 
     // District Cooling COP: Optional Double
@@ -33,9 +33,9 @@ namespace energyplus {
     }
 
     // District Heating Steam Conversion Efficiency: Optional Double
-    if (boost::optional<double> _steamConversionEfficiency =
+    if (boost::optional<double> _districtHeatingSteamConversionEfficiency =
           workspaceObject.getDouble(EnvironmentalImpactFactorsFields::DistrictHeatingSteamConversionEfficiency)) {
-      modelObject.setSteamConversionEfficiency(_steamConversionEfficiency.get());
+      modelObject.setDistrictHeatingSteamConversionEfficiency(_districtHeatingSteamConversionEfficiency.get());
     }
 
     // Total Carbon Equivalent Emission Factor From N2O: Optional Double

diff --git a/src/energyplus/Test/EnvironmentalImpactFactors_GTest.cpp b/src/energyplus/Test/EnvironmentalImpactFactors_GTest.cpp
@@ -37,9 +37,9 @@ TEST_F(EnergyPlusFixture, ForwardTranslator_EnvironmentalImpactFactors) {
   // Get the unique object
   auto environmentalImpactFactors = m.getUniqueModelObject<EnvironmentalImpactFactors>();
 
-  EXPECT_TRUE(environmentalImpactFactors.setDistrictHeatingEfficiency(0.35));
+  EXPECT_TRUE(environmentalImpactFactors.setDistrictHeatingWaterEfficiency(0.35));
   EXPECT_TRUE(environmentalImpactFactors.setDistrictCoolingCOP(3.3));
-  EXPECT_TRUE(environmentalImpactFactors.setSteamConversionEfficiency(0.27));
+  EXPECT_TRUE(environmentalImpactFactors.setDistrictHeatingSteamConversionEfficiency(0.27));
   EXPECT_TRUE(environmentalImpactFactors.setTotalCarbonEquivalentEmissionFactorFromN2O(79.2));
   EXPECT_TRUE(environmentalImpactFactors.setTotalCarbonEquivalentEmissionFactorFromCH4(6.1));
   EXPECT_TRUE(environmentalImpactFactors.setTotalCarbonEquivalentEmissionFactorFromCO2(0.31));
@@ -99,9 +99,9 @@ TEST_F(EnergyPlusFixture, ReverseTranslator_EnvironmentalImpactFactors) {
     ASSERT_TRUE(m.getOptionalUniqueModelObject<EnvironmentalImpactFactors>());
     auto environmentalImpactFactors = m.getUniqueModelObject<EnvironmentalImpactFactors>();
 
-    EXPECT_EQ(0.35, environmentalImpactFactors.districtHeatingEfficiency());
+    EXPECT_EQ(0.35, environmentalImpactFactors.districtHeatingWaterEfficiency());
     EXPECT_EQ(3.3, environmentalImpactFactors.districtCoolingCOP());
-    EXPECT_EQ(0.27, environmentalImpactFactors.steamConversionEfficiency());
+    EXPECT_EQ(0.27, environmentalImpactFactors.districtHeatingSteamConversionEfficiency());
     EXPECT_EQ(79.2, environmentalImpactFactors.totalCarbonEquivalentEmissionFactorFromN2O());
     EXPECT_EQ(6.1, environmentalImpactFactors.totalCarbonEquivalentEmissionFactorFromCH4());
     EXPECT_EQ(0.31, environmentalImpactFactors.totalCarbonEquivalentEmissionFactorFromCO2());

diff --git a/src/model/DistrictCooling.cpp b/src/model/DistrictCooling.cpp
@@ -34,8 +34,12 @@ namespace model {
 
     const std::vector<std::string>& DistrictCooling_Impl::outputVariableNames() const {
       static const std::vector<std::string> result{
-        "District Cooling Chilled Water Rate", "District Cooling Chilled Water Energy", "District Cooling Rate",
-        "District Cooling Inlet Temperature",  "District Cooling Outlet Temperature",   "District Cooling Mass Flow Rate"};
+        "District Cooling Water Rate",
+        "District Cooling Water Energy",
+        "District Cooling Water Inlet Temperature",
+        "District Cooling Water Outlet Temperature",
+        "District Cooling Water Mass Flow Rate",
+      };
       return result;
     }
 

diff --git a/src/model/DistrictHeating.cpp b/src/model/DistrictHeating.cpp
@@ -34,8 +34,12 @@ namespace model {
 
     const std::vector<std::string>& DistrictHeating_Impl::outputVariableNames() const {
       static const std::vector<std::string> result{
-        "District Heating Hot Water Rate",    "District Heating Hot Water Energy",   "District Heating Rate",
-        "District Heating Inlet Temperature", "District Heating Outlet Temperature", "District Heating Mass Flow Rate"};
+        "District Heating Water Energy",
+        "District Heating Water Rate",
+        "District Heating Water Inlet Temperature",
+        "District Heating Water Outlet Temperature",
+        "District Heating Water Mass Flow Rate",
+      };
       return result;
     }