Merge pull request #1292 from NREL/fix/propane_naming

add handling for propane
NREL · Mar 29, 2022 · 7f6231a · 7f6231a
2 parents 685a147 + 1cabbba
commit 7f6231a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/data/standards/export_OpenStudio_libraries.rb b/data/standards/export_OpenStudio_libraries.rb
@@ -87,6 +87,8 @@ def export_openstudio_libraries
               boiler.setFuelType('NaturalGas')
             when 'Electric'
               boiler.setFuelType('Electricity')
+            when 'Propane', 'PropaneGas'
+              boiler.setFuelType('Propane')
             when 'Oil'
               boiler.setFuelType('FuelOilNo2')
           end

diff --git a/lib/openstudio-standards/hvac_sizing/Siz.ThermalZone.rb b/lib/openstudio-standards/hvac_sizing/Siz.ThermalZone.rb
@@ -236,7 +236,7 @@ def heatingDesignLoad
   # serving those air loops.
   #
   # return [Array<String>] An array. Possible values are 
-  # Electricity, NaturalGas, PropaneGas, FuelOilNo1, FuelOilNo2,
+  # Electricity, NaturalGas, Propane, PropaneGas, FuelOilNo1, FuelOilNo2,
   # Coal, Diesel, Gasoline, DistrictCooling, DistrictHeating, 
   # and SolarEnergy.
   def heating_fuels
@@ -278,7 +278,7 @@ def heating_fuels
   # serving those air loops.
   #
   # return [Array<String>] An array. Possible values are
-  # Electricity, NaturalGas, PropaneGas, FuelOilNo1, FuelOilNo2,
+  # Electricity, NaturalGas, Propane, PropaneGas, FuelOilNo1, FuelOilNo2,
   # Coal, Diesel, Gasoline, DistrictCooling, DistrictHeating, 
   # and SolarEnergy.
   def cooling_fuels

diff --git a/lib/openstudio-standards/prototypes/common/objects/Prototype.BoilerHotWater.rb b/lib/openstudio-standards/prototypes/common/objects/Prototype.BoilerHotWater.rb
@@ -48,6 +48,8 @@ def create_boiler_hot_water(model,
 
     if fuel_type.nil? || fuel_type == 'Gas'
       boiler.setFuelType('NaturalGas')
+    elsif fuel_type == 'Propane' || fuel_type == 'PropaneGas'
+      boiler.setFuelType('Propane')
     else
       boiler.setFuelType(fuel_type)
     end

diff --git a/lib/openstudio-standards/prototypes/common/objects/Prototype.hvac_systems.rb b/lib/openstudio-standards/prototypes/common/objects/Prototype.hvac_systems.rb
@@ -24,7 +24,7 @@ def standard_design_sizing_temperatures
   # Creates a hot water loop with a boiler, district heating, or a water-to-water heat pump and adds it to the model.
   #
   # @param model [OpenStudio::Model::Model] OpenStudio model object
-  # @param boiler_fuel_type [String] valid choices are Electricity, NaturalGas, PropaneGas, FuelOilNo1, FuelOilNo2, DistrictHeating, HeatPump
+  # @param boiler_fuel_type [String] valid choices are Electricity, NaturalGas, Propane, PropaneGas, FuelOilNo1, FuelOilNo2, DistrictHeating, HeatPump
   # @param ambient_loop [OpenStudio::Model::PlantLoop] The condenser loop for the heat pump. Only used when boiler_fuel_type is HeatPump.
   # @param system_name [String] the name of the system, or nil in which case it will be defaulted
   # @param dsgn_sup_wtr_temp [Double] design supply water temperature in degrees Fahrenheit, default 180F
@@ -128,7 +128,7 @@ def model_add_hw_loop(model,
       when 'AirSourceHeatPump', 'ASHP'
         create_central_air_source_heat_pump(model, hot_water_loop)
       # Boiler
-      when 'Electricity', 'Gas', 'NaturalGas', 'PropaneGas', 'FuelOilNo1', 'FuelOilNo2'
+      when 'Electricity', 'Gas', 'NaturalGas', 'Propane', 'PropaneGas', 'FuelOilNo1', 'FuelOilNo2'
         if boiler_lvg_temp_dsgn.nil?
           lvg_temp_dsgn = dsgn_sup_wtr_temp
         else
@@ -803,7 +803,7 @@ def model_add_hp_loop(model,
     when 'AirSourceHeatPump', 'ASHP'
       heating_equipment = create_central_air_source_heat_pump(model, heat_pump_water_loop)
       heating_equipment_stpt_manager.setName("#{heat_pump_water_loop.name} ASHP Scheduled Dual Setpoint")
-    when 'Electricity', 'Gas', 'NaturalGas', 'PropaneGas', 'FuelOilNo1', 'FuelOilNo2'
+    when 'Electricity', 'Gas', 'NaturalGas', 'Propane', 'PropaneGas', 'FuelOilNo1', 'FuelOilNo2'
       heating_equipment = create_boiler_hot_water(model,
                                                   hot_water_loop: heat_pump_water_loop,
                                                   name: "#{heat_pump_water_loop.name} Supplemental Boiler",
@@ -4031,7 +4031,7 @@ def model_add_high_temp_radiant(model,
       high_temp_radiant = OpenStudio::Model::ZoneHVACHighTemperatureRadiant.new(model)
       high_temp_radiant.setName("#{zone.name} High Temp Radiant")
 
-      if heating_type.nil? || heating_type == 'Gas'
+      if heating_type.nil? || heating_type == 'NaturalGas' || heating_type == 'Gas'
         high_temp_radiant.setFuelType('NaturalGas')
       else
         high_temp_radiant.setFuelType(heating_type)

diff --git a/lib/openstudio-standards/standards/Standards.Model.rb b/lib/openstudio-standards/standards/Standards.Model.rb
@@ -5210,6 +5210,7 @@ def model_apply_baseline_swh_loops(model, building_type)
       electric = true
 
       if htg_fuels.include?('NaturalGas') ||
+         htg_fuels.include?('Propane') ||
          htg_fuels.include?('PropaneGas') ||
          htg_fuels.include?('FuelOilNo1') ||
          htg_fuels.include?('FuelOilNo2') ||

diff --git a/lib/openstudio-standards/standards/Standards.ThermalZone.rb b/lib/openstudio-standards/standards/Standards.ThermalZone.rb
@@ -602,12 +602,13 @@ def thermal_zone_fossil_hybrid_or_purchased_heat?(thermal_zone)
 
     # Get an array of the heating fuels
     # used by the zone.  Possible values are
-    # Electricity, NaturalGas, PropaneGas, FuelOilNo1, FuelOilNo2,
+    # Electricity, NaturalGas, Propane, PropaneGas, FuelOilNo1, FuelOilNo2,
     # Coal, Diesel, Gasoline, DistrictHeating,
     # and SolarEnergy.
     htg_fuels = thermal_zone.heating_fuels
 
     if htg_fuels.include?('NaturalGas') ||
+       htg_fuels.include?('Propane') ||
        htg_fuels.include?('PropaneGas') ||
        htg_fuels.include?('FuelOilNo1') ||
        htg_fuels.include?('FuelOilNo2') ||
@@ -641,6 +642,7 @@ def thermal_zone_fossil_or_electric_type(thermal_zone, custom)
     # Fossil heating
     htg_fuels = thermal_zone.heating_fuels
     if htg_fuels.include?('NaturalGas') ||
+       htg_fuels.include?('Propane') ||
        htg_fuels.include?('PropaneGas') ||
        htg_fuels.include?('FuelOilNo1') ||
        htg_fuels.include?('FuelOilNo2') ||
@@ -703,14 +705,15 @@ def thermal_zone_mixed_heating_fuel?(thermal_zone)
 
     # Get an array of the heating fuels
     # used by the zone.  Possible values are
-    # Electricity, NaturalGas, PropaneGas, FuelOilNo1, FuelOilNo2,
+    # Electricity, NaturalGas, Propane, PropaneGas, FuelOilNo1, FuelOilNo2,
     # Coal, Diesel, Gasoline, DistrictHeating,
     # and SolarEnergy.
     htg_fuels = thermal_zone.heating_fuels
 
     # Includes fossil
     fossil = false
     if htg_fuels.include?('NaturalGas') ||
+       htg_fuels.include?('Propane') ||
        htg_fuels.include?('PropaneGas') ||
        htg_fuels.include?('FuelOilNo1') ||
        htg_fuels.include?('FuelOilNo2') ||