openstudio-standards 0.8.4 → 0.8.5.rc1

data/lib/openstudio-standards/standards/ashrae_90_1/nrel_zne_ready_2017/nrel_zne_ready_2017.PlantLoop.rb

@@ -14,11 +14,11 @@ class NRELZNEReady2017 < ASHRAE901
     plant_loop.demandComponents.each do |sc|
       if sc.to_PumpVariableSpeed.is_initialized
         pump = sc.to_PumpVariableSpeed.get
-        pump_variable_speed_set_control_type(pump, sec_control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: sec_control_type)
         has_secondary_pump = true
       elsif sc.to_HeaderedPumpsVariableSpeed.is_initialized
         pump = sc.to_HeaderedPumpsVariableSpeed.get
-        headered_pumps_variable_speed_set_control_type(pump, control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: sec_control_type)
         has_secondary_pump = true
       end
     end
@@ -30,10 +30,10 @@ class NRELZNEReady2017 < ASHRAE901
     plant_loop.supplyComponents.each do |sc|
       if sc.to_PumpVariableSpeed.is_initialized
         pump = sc.to_PumpVariableSpeed.get
-        pump_variable_speed_set_control_type(pump, pri_control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: pri_control_type)
       elsif sc.to_HeaderedPumpsVariableSpeed.is_initialized
         pump = sc.to_HeaderedPumpsVariableSpeed.get
-        headered_pumps_variable_speed_set_control_type(pump, control_type)
+         OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: pri_control_type)
       end
     end
 
@@ -57,7 +57,7 @@ class NRELZNEReady2017 < ASHRAE901
     plant_loop.supplyComponents.each do |sc|
       if sc.to_PumpVariableSpeed.is_initialized
         pump = sc.to_PumpVariableSpeed.get
-        pump_variable_speed_set_control_type(pump, control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: control_type)
       end
     end
 

data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.AirTerminalSingleDuctVAVReheat.rb

@@ -9,7 +9,7 @@ class ZEAEDGMultifamily < ASHRAE901
   # @return [Double] minimum damper position
   def air_terminal_single_duct_vav_reheat_minimum_damper_position(air_terminal_single_duct_vav_reheat, has_ddc = true)
     min_damper_position = nil
-    case air_terminal_single_duct_vav_reheat_reheat_type(air_terminal_single_duct_vav_reheat)
+    case OpenstudioStandards::HVAC.air_terminal_single_duct_vav_reheat_reheat_type(air_terminal_single_duct_vav_reheat)
     when 'HotWater'
       min_damper_position = if has_ddc
                               0.2

data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.PlantLoop.rb

@@ -14,11 +14,11 @@ class ZEAEDGMultifamily < ASHRAE901
     plant_loop.demandComponents.each do |sc|
       if sc.to_PumpVariableSpeed.is_initialized
         pump = sc.to_PumpVariableSpeed.get
-        pump_variable_speed_set_control_type(pump, sec_control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: sec_control_type)
         has_secondary_pump = true
       elsif sc.to_HeaderedPumpsVariableSpeed.is_initialized
         pump = sc.to_HeaderedPumpsVariableSpeed.get
-        headered_pumps_variable_speed_set_control_type(pump, control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: sec_control_type)
         has_secondary_pump = true
       end
     end
@@ -30,10 +30,10 @@ class ZEAEDGMultifamily < ASHRAE901
     plant_loop.supplyComponents.each do |sc|
       if sc.to_PumpVariableSpeed.is_initialized
         pump = sc.to_PumpVariableSpeed.get
-        pump_variable_speed_set_control_type(pump, pri_control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: pri_control_type)
       elsif sc.to_HeaderedPumpsVariableSpeed.is_initialized
         pump = sc.to_HeaderedPumpsVariableSpeed.get
-        headered_pumps_variable_speed_set_control_type(pump, control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: pri_control_type)
       end
     end
 
@@ -57,7 +57,7 @@ class ZEAEDGMultifamily < ASHRAE901
     plant_loop.supplyComponents.each do |sc|
       if sc.to_PumpVariableSpeed.is_initialized
         pump = sc.to_PumpVariableSpeed.get
-        pump_variable_speed_set_control_type(pump, control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: control_type)
       end
     end
 

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.AirLoopHVAC.rb

@@ -191,7 +191,7 @@ class ASHRAE901PRM < Standard
   # Set fan curve for stable baseline to be VSD with fixed static pressure setpoint
   # @return [String name of appropriate curve for this code version
   def air_loop_hvac_set_vsd_curve_type
-    return 'Multi Zone VAV with VSD and Fixed SP Setpoint'
+    return 'Multi Zone VAV with Fixed Static Pressure Setpoint'
   end
 
   # Determines if optimum start control is required.

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.ChillerElectricEIR.rb

@@ -7,7 +7,7 @@ class ASHRAE901PRM < Standard
   # @return [Boolean] returns true if successful, false if not
   def chiller_electric_eir_apply_efficiency_and_curves(chiller_electric_eir)
     # Get the chiller capacity
-    capacity_w = chiller_electric_eir_find_capacity(chiller_electric_eir)
+    capacity_w = OpenstudioStandards::HVAC.chiller_electric_get_capacity(chiller_electric_eir)
 
     # Convert capacity to tons
     capacity_tons = OpenStudio.convert(capacity_w, 'W', 'ton').get
@@ -21,7 +21,7 @@ class ASHRAE901PRM < Standard
     chiller_electric_eir.setReferenceCOP(cop)
 
     # Append the name with size and kw/ton
-    kw_per_ton = cop_to_kw_per_ton(cop)
+    kw_per_ton = OpenstudioStandards::HVAC.cop_to_kw_per_ton(cop)
     chiller_electric_eir.setName("#{chiller_electric_eir.name} #{capacity_tons.round}tons #{kw_per_ton.round(1)}kW/ton")
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.ChillerElectricEIR', "For #{template}: #{chiller_electric_eir.name}: Capacity = #{capacity_tons.round}tons; COP = #{cop.round(1)} (#{kw_per_ton.round(1)}kW/ton)")
 

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.CoilCoolingDXSingleSpeed.rb

@@ -3,73 +3,6 @@ class ASHRAE901PRM < Standard
 
   include ASHRAEPRMCoilDX
 
-  # Finds capacity in W
-  #
-  # @param coil_cooling_dx_single_speed [OpenStudio::Model::CoilCoolingDXSingleSpeed] coil cooling dx single speed object
-  # @param sys_type [String] HVAC system type
-  # @return [Double] capacity in W to be used for find object
-  def coil_cooling_dx_single_speed_find_capacity(coil_cooling_dx_single_speed, sys_type)
-    capacity_w = nil
-    if coil_cooling_dx_single_speed.ratedTotalCoolingCapacity.is_initialized
-      capacity_w = coil_cooling_dx_single_speed.ratedTotalCoolingCapacity.get
-    elsif coil_cooling_dx_single_speed.autosizedRatedTotalCoolingCapacity.is_initialized
-      capacity_w = coil_cooling_dx_single_speed.autosizedRatedTotalCoolingCapacity.get
-    else
-      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.CoilCoolingDXSingleSpeed', "For #{coil_cooling_dx_single_speed.name} capacity is not available, cannot apply efficiency standard.")
-      return 0.0
-    end
-
-    # Check for user data that indicates multiple systems per thermal zone
-    # This could be true for a data center where this is common practice
-    # Or it could be for a thermal zone that represents multiple real building zones
-    mult = 1
-    thermal_zone = nil
-    comp = coil_cooling_dx_single_speed.containingHVACComponent
-    if comp.is_initialized && comp.get.to_AirLoopHVACUnitarySystem.is_initialized
-      unitary = comp.get.to_AirLoopHVACUnitarySystem.get
-      thermal_zone = unitary.controllingZoneorThermostatLocation.get
-    end
-    # meth = comp.methods
-    comp = coil_cooling_dx_single_speed.containingZoneHVACComponent
-    if comp.is_initialized && comp.get.thermalZone.is_initialized
-      thermal_zone = comp.get.thermalZone.get
-    end
-
-    if !thermal_zone.nil? && standards_data.key?('userdata_thermal_zone')
-      standards_data['userdata_thermal_zone'].each do |row|
-        next unless row['name'].to_s.downcase.strip == thermal_zone.name.to_s.downcase.strip
-
-        if row['number_of_systems'].to_s.upcase.strip != ''
-          mult = row['number_of_systems'].to_s
-          if mult.to_i.to_s == mult
-            mult = mult.to_i
-            capacity_w /= mult
-          else
-            OpenStudio.logFree(OpenStudio::Error, 'prm.log', 'In userdata_thermalzone, number_of_systems requires integer input.')
-          end
-          break
-        end
-      end
-    end
-
-    # If it's a PTAC or PTHP System, we need to divide the capacity by the potential zone multiplier
-    # because the COP is dependent on capacity, and the capacity should be the capacity of a single zone, not all the zones
-    if sys_type == 'PTAC' || sys_type == 'PTHP'
-      mult = 1
-      comp = coil_cooling_dx_single_speed.containingZoneHVACComponent
-      if comp.is_initialized && comp.get.thermalZone.is_initialized
-        mult = comp.get.thermalZone.get.multiplier
-        if mult > 1
-          total_cap = capacity_w
-          capacity_w /= mult
-          OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.CoilCoolingDXSingleSpeed', "For #{coil_cooling_dx_single_speed.name}, total capacity of #{OpenStudio.convert(total_cap, 'W', 'kBtu/hr').get.round(2)}kBTU/hr was divided by the zone multiplier of #{mult} to give #{capacity_kbtu_per_hr = OpenStudio.convert(capacity_w, 'W', 'kBtu/hr').get.round(2)}kBTU/hr.")
-        end
-      end
-    end
-
-    return capacity_w
-  end
-
   # Finds lookup object in standards and return efficiency
   #
   # @param coil_cooling_dx_single_speed [OpenStudio::Model::CoilCoolingDXSingleSpeed] coil cooling dx single speed object
@@ -78,7 +11,8 @@ class ASHRAE901PRM < Standard
   # @return [Double] full load efficiency (COP)
   def coil_cooling_dx_single_speed_standard_minimum_cop(coil_cooling_dx_single_speed, sys_type, rename = false)
     # find properties
-    capacity_w = coil_cooling_dx_single_speed_find_capacity(coil_cooling_dx_single_speed, sys_type)
+    multiplier = coil_dx_number_of_systems(coil_cooling_dx_single_speed, sys_type)
+    capacity_w = OpenstudioStandards::HVAC.coil_cooling_dx_single_speed_get_capacity(coil_cooling_dx_single_speed, multiplier: multiplier)
     capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
     search_criteria = coil_dx_find_search_criteria(coil_cooling_dx_single_speed, capacity_btu_per_hr, sys_type)
 

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.CoilCoolingDXTwoSpeed.rb

@@ -3,40 +3,6 @@ class ASHRAE901PRM < Standard
 
   include ASHRAEPRMCoilDX
 
-  # Finds capacity in W
-  #
-  # @param coil_cooling_dx_two_speed [OpenStudio::Model::CoilCoolingDXTwoSpeed] coil cooling dx two speed object
-  # @param sys_type [String] HVAC system type
-  # @return [Double] capacity in W to be used for find object
-  def coil_cooling_dx_two_speed_find_capacity(coil_cooling_dx_two_speed, sys_type)
-    capacity_w = nil
-    if coil_cooling_dx_two_speed.ratedHighSpeedTotalCoolingCapacity.is_initialized
-      capacity_w = coil_cooling_dx_two_speed.ratedHighSpeedTotalCoolingCapacity.get
-    elsif coil_cooling_dx_two_speed.autosizedRatedHighSpeedTotalCoolingCapacity.is_initialized
-      capacity_w = coil_cooling_dx_two_speed.autosizedRatedHighSpeedTotalCoolingCapacity.get
-    else
-      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.CoilCoolingDXTwoSpeed', "For #{coil_cooling_dx_two_speed.name} capacity is not available, cannot apply efficiency standard.")
-      return 0.0
-    end
-
-    # If it's a PTAC or PTHP System, we need to divide the capacity by the potential zone multiplier
-    # because the COP is dependent on capacity, and the capacity should be the capacity of a single zone, not all the zones
-    if sys_type == 'PTAC' || sys_type == 'PTHP'
-      mult = 1
-      comp = coil_cooling_dx_two_speed.containingZoneHVACComponent
-      if comp.is_initialized && comp.get.thermalZone.is_initialized
-        mult = comp.get.thermalZone.get.multiplier
-        if mult > 1
-          total_cap = capacity_w
-          capacity_w /= mult
-          OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.CoilCoolingDXTwoSpeed', "For #{coil_cooling_dx_single_speed.name}, total capacity of #{OpenStudio.convert(total_cap, 'W', 'kBtu/hr').get.round(2)}kBTU/hr was divided by the zone multiplier of #{mult} to give #{capacity_kbtu_per_hr = OpenStudio.convert(capacity_w, 'W', 'kBtu/hr').get.round(2)}kBTU/hr.")
-        end
-      end
-    end
-
-    return capacity_w
-  end
-
   # Finds lookup object in standards and return efficiency
   #
   # @param coil_cooling_dx_two_speed [OpenStudio::Model::CoilCoolingDXTwoSpeed] coil cooling dx two speed object
@@ -45,7 +11,8 @@ class ASHRAE901PRM < Standard
   # @return [Double] full load efficiency (COP)
   def coil_cooling_dx_two_speed_standard_minimum_cop(coil_cooling_dx_two_speed, sys_type, rename = false)
     # find properties
-    capacity_w = coil_cooling_dx_two_speed_find_capacity(coil_cooling_dx_two_speed, sys_type)
+    multiplier = coil_dx_number_of_systems(coil_cooling_dx_two_speed, sys_type)
+    capacity_w = OpenstudioStandards::HVAC.coil_cooling_dx_two_speed_get_capacity(coil_cooling_dx_two_speed, multiplier: multiplier)
     capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
     search_criteria = coil_dx_find_search_criteria(coil_cooling_dx_two_speed, capacity_btu_per_hr, sys_type)
 

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.CoilDX.rb

@@ -30,6 +30,48 @@ module ASHRAEPRMCoilDX
     return sub_category
   end
 
+  # Finds the subcategory.
+  #
+  # @param coil_dx [OpenStudio::Model::StraightComponent] coil cooling object
+  # @param sys_type [String] HVAC system type
+  # @return [Double] the number of systems
+  def coil_dx_number_of_systems(coil_dx, sys_type)
+    # default to 1
+    multiplier = 1
+
+    # get thermal zone
+    thermal_zone = OpenstudioStandards::HVAC.hvac_component_get_thermal_zone(coil_dx)
+
+    if thermal_zone.nil?
+      OpenStudio.logFree(OpenStudio::Error, 'prm.log', "Unable to determine thermal zone for coil #{coil_dx.name}.")
+      return multiplier
+    end
+
+    # use user data multiplier if available
+    if standards_data.key?('userdata_thermal_zone')
+      standards_data['userdata_thermal_zone'].each do |row|
+        next unless row['name'].to_s.downcase.strip == thermal_zone.name.to_s.downcase.strip
+
+        if row['number_of_systems'].to_s.upcase.strip != ''
+          mult = row['number_of_systems'].to_s
+          if mult.to_i.to_s == mult
+            multiplier = mult.to_i
+          else
+            OpenStudio.logFree(OpenStudio::Error, 'prm.log', 'In userdata_thermalzone, number_of_systems requires integer input.')
+          end
+          break
+        end
+      end
+    end
+
+    if (sys_type == 'PTAC') || (sys_type == 'PTHP')
+      # use zone multiplier
+      multiplier = thermal_zone.multiplier
+    end
+
+    return multiplier
+  end
+
   # Finds the search criteria
   #
   # @param coil_dx [OpenStudio::Model::StraightComponent] coil cooling object

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.CoilHeatingDXSingleSpeed.rb

@@ -65,13 +65,16 @@ class ASHRAE901PRM < Standard
       return capacity_w
     end
 
+    # find properties
+    multiplier = coil_dx_number_of_systems(clg_coil, sys_type)
+
     # If a coil was found, cast to the correct type
     if clg_coil.to_CoilCoolingDXSingleSpeed.is_initialized
       clg_coil = clg_coil.to_CoilCoolingDXSingleSpeed.get
-      capacity_w = coil_cooling_dx_single_speed_find_capacity(clg_coil, sys_type)
+      capacity_w = OpenstudioStandards::HVAC.coil_cooling_dx_single_speed_get_capacity(clg_coil, multiplier: multiplier)
     elsif clg_coil.to_CoilCoolingDXTwoSpeed.is_initialized
       clg_coil = clg_coil.to_CoilCoolingDXTwoSpeed.get
-      capacity_w = coil_cooling_dx_two_speed_find_capacity(clg_coil, sys_type)
+      capacity_w = OpenstudioStandards::HVAC.coil_cooling_dx_two_speed_get_capacity(clg_coil, multiplier: multiplier)
     end
 
     # Check for user data that indicates multiple systems per thermal zone

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.CoilHeatingGas.rb

@@ -28,7 +28,7 @@ class ASHRAE901PRM < Standard
   def coil_heating_gas_standard_minimum_thermal_efficiency(coil_heating_gas, sys_type, rename = false)
     # Get the coil properties
     search_criteria = coil_heating_gas_find_search_criteria(coil_heating_gas, sys_type)
-    capacity_w = coil_heating_gas_find_capacity(coil_heating_gas)
+    capacity_w = OpenstudioStandards::HVAC.coil_heating_gas_get_capacity(coil_heating_gas)
     capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
     capacity_kbtu_per_hr = OpenStudio.convert(capacity_w, 'W', 'kBtu/hr').get
 
@@ -59,7 +59,7 @@ class ASHRAE901PRM < Standard
     # If specified as combustion efficiency
     unless coil_props['minimum_combustion_efficiency'].nil?
       min_comb_eff = coil_props['minimum_combustion_efficiency']
-      thermal_eff = combustion_eff_to_thermal_eff(min_comb_eff)
+      thermal_eff = OpenstudioStandards::HVAC.combustion_eff_to_thermal_eff(min_comb_eff)
       new_comp_name = "#{coil_heating_gas.name} #{capacity_kbtu_per_hr.round}kBtu/hr #{min_comb_eff} Combustion Eff"
       OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.CoilHeatingGas', "For #{template}: #{coil_heating_gas.name}: Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; Combustion Efficiency = #{min_comb_eff}")
     end

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.PlantLoop.rb

@@ -137,7 +137,7 @@ class ASHRAE901PRM < Standard
     end
 
     # Get existing plant loop pump. We'll copy this pumps parameters before removing it. Throw exception for multiple pumps on supply side
-    if pumps.size.zero?
+    if pumps.empty?
       OpenStudio.logFree(OpenStudio::Error, 'prm.log', "For #{plant_loop.name}, found #{pumps.size} pumps. A loop must have at least one pump.")
       return false
     elsif pumps.size > 1
@@ -218,7 +218,7 @@ class ASHRAE901PRM < Standard
       new_pump.setName("#{chiller.name} Inlet Pump")
       new_pump.setRatedPumpHead(original_pump.ratedPumpHead / num_chillers)
 
-      pump_variable_speed_set_control_type(new_pump, control_type = 'Riding Curve')
+      OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(new_pump, control_type: 'Riding Curve')
       chiller_inlet_node = chiller.connectedObject(chiller.supplyInletPort).get.to_Node.get
       new_pump.addToNode(chiller_inlet_node)
 
@@ -271,7 +271,7 @@ class ASHRAE901PRM < Standard
     chw_sensor.setName("#{plant_name.gsub(/[-\s]+/, '_')}_CHW_DEMAND")
 
     # Sort chillers by their reference capacity
-    sorted_chiller_list = chiller_list.sort_by { |chiller| chiller.referenceCapacity.get.to_f}
+    sorted_chiller_list = chiller_list.sort_by { |chiller| chiller.referenceCapacity.get.to_f }
 
     # Make pump specific parameters for EMS. Use counter
     sorted_chiller_list.each_with_index do |chiller, i|

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.SpaceType.rb

@@ -18,7 +18,7 @@ class ASHRAE901PRM < Standard
   # @param set_gas_equipment [Boolean] if true, set the gas equipment density
   # @param set_ventilation [Boolean] if true, set the ventilation rates (per-person and per-area)
   # @return [Boolean] returns true if successful, false if not
-  def space_type_apply_internal_loads(space_type, set_people, set_lights, set_electric_equipment, set_gas_equipment, set_ventilation)
+  def space_type_apply_internal_loads(space_type, set_people: false, set_lights: true, set_electric_equipment: false, set_gas_equipment: false, set_ventilation: false)
     # Skip plenums
     # Check if the space type name
     # contains the word plenum.

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm_2019/ashrae_90_1_prm_2019.Model.rb

@@ -123,6 +123,7 @@ class ASHRAE901PRM2019 < ASHRAE901PRM
           plant_loop_adiabatic_pipes_only(plant_loop)
           plant_loop.supplyComponents.each do |component|
             next unless component.to_WaterHeaterMixed.is_initialized
+
             water_heater = component.to_WaterHeaterMixed.get
             model_apply_water_heater_prm_parameter(water_heater,
                                                    swh_building_type_new)

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm_2019/ashrae_90_1_prm_2019_WaterHeaterMixed.rb

@@ -1,5 +1,4 @@
 class ASHRAE901PRM2019 < ASHRAE901PRM
-
   # Apply the prm parameter to a water heater based on the
   # building area type.
   # @param water_heater_mixed [OpenStudio::Model::WaterHeaterMixed] water heater mixed object
@@ -19,12 +18,12 @@ class ASHRAE901PRM2019 < ASHRAE901PRM
   # @return [String] returns fuel type
   def water_heater_mixed_apply_prm_baseline_fuel_type(building_type)
     # Get the fuel type data
-    heater_prop = model_find_object(standards_data['prm_swh_bldg_type'], {'swh_building_type' => building_type})
+    heater_prop = model_find_object(standards_data['prm_swh_bldg_type'], { 'swh_building_type' => building_type })
     new_fuel_data = heater_prop['baseline_heating_method']
     # There are only two water heater fuel type in the prm database:
     # ("Gas Storage" and "Electric Resistance Storage")
     # Change the prm fuel type to openstudio fuel type
-    if new_fuel_data == "Gas Storage"
+    if new_fuel_data == 'Gas Storage'
       new_fuel = 'NaturalGas'
     else
       new_fuel = 'Electricity'
@@ -32,4 +31,3 @@ class ASHRAE901PRM2019 < ASHRAE901PRM
     return new_fuel
   end
 end
-

data/lib/openstudio-standards/standards/ashrae_90_1_prm/data/ashrae_90_1_prm.curves.json

@@ -8125,181 +8125,6 @@
       "maximum_dependent_variable_output": null,
       "notes": "From Reference Buildings"
     },
-    {
-      "name": "Multi Zone VAV with Airfoil or Backward Incline riding the curve",
-      "category": "FanEIR-FPLR",
-      "form": "Cubic",
-      "dependent_variable": "PwrRatio",
-      "independent_variable_1": "FlowRatio",
-      "independent_variable_2": null,
-      "coeff_1": 0.1631,
-      "coeff_2": 1.5901,
-      "coeff_3": -0.8817,
-      "coeff_4": 0.1281,
-      "coeff_5": null,
-      "coeff_6": null,
-      "coeff_7": null,
-      "coeff_8": null,
-      "coeff_9": null,
-      "coeff_10": null,
-      "minimum_independent_variable_1": 0.0,
-      "maximum_independent_variable_1": 1.0,
-      "minimum_independent_variable_2": null,
-      "maximum_independent_variable_2": null,
-      "minimum_dependent_variable_output": 0.7,
-      "maximum_dependent_variable_output": null,
-      "notes": "From ANSI/ASHRAE/IES Standard 90.1-2016 - Energy Standard for Buildings Except Low-Rise Residential Performance Rating Method"
-    },
-    {
-      "name": "Multi Zone VAV with Airfoil or Backward Incline with inlet vanes",
-      "category": "FanEIR-FPLR",
-      "form": "Cubic",
-      "dependent_variable": "PwrRatio",
-      "independent_variable_1": "FlowRatio",
-      "independent_variable_2": null,
-      "coeff_1": 0.9977,
-      "coeff_2": -0.659,
-      "coeff_3": 0.9547,
-      "coeff_4": -0.2936,
-      "coeff_5": null,
-      "coeff_6": null,
-      "coeff_7": null,
-      "coeff_8": null,
-      "coeff_9": null,
-      "coeff_10": null,
-      "minimum_independent_variable_1": 0.0,
-      "maximum_independent_variable_1": 1.0,
-      "minimum_independent_variable_2": null,
-      "maximum_independent_variable_2": null,
-      "minimum_dependent_variable_output": 0.5,
-      "maximum_dependent_variable_output": null,
-      "notes": "From ANSI/ASHRAE/IES Standard 90.1-2016 - Energy Standard for Buildings Except Low-Rise Residential Performance Rating Method"
-    },
-    {
-      "name": "Multi Zone VAV with Forward Curved fans riding the curve",
-      "category": "FanEIR-FPLR",
-      "form": "Cubic",
-      "dependent_variable": "PwrRatio",
-      "independent_variable_1": "FlowRatio",
-      "independent_variable_2": null,
-      "coeff_1": 0.1224,
-      "coeff_2": 0.612,
-      "coeff_3": 0.5983,
-      "coeff_4": -0.3334,
-      "coeff_5": null,
-      "coeff_6": null,
-      "coeff_7": null,
-      "coeff_8": null,
-      "coeff_9": null,
-      "coeff_10": null,
-      "minimum_independent_variable_1": 0.0,
-      "maximum_independent_variable_1": 1.0,
-      "minimum_independent_variable_2": null,
-      "maximum_independent_variable_2": null,
-      "minimum_dependent_variable_output": 0.3,
-      "maximum_dependent_variable_output": null,
-      "notes": "From ANSI/ASHRAE/IES Standard 90.1-2016 - Energy Standard for Buildings Except Low-Rise Residential Performance Rating Method"
-    },
-    {
-      "name": "Multi Zone VAV with Forward Curved with inlet vanes",
-      "category": "FanEIR-FPLR",
-      "form": "Cubic",
-      "dependent_variable": "PwrRatio",
-      "independent_variable_1": "FlowRatio",
-      "independent_variable_2": null,
-      "coeff_1": 0.3038,
-      "coeff_2": -0.7608,
-      "coeff_3": 2.2729,
-      "coeff_4": -0.8169,
-      "coeff_5": null,
-      "coeff_6": null,
-      "coeff_7": null,
-      "coeff_8": null,
-      "coeff_9": null,
-      "coeff_10": null,
-      "minimum_independent_variable_1": 0.0,
-      "maximum_independent_variable_1": 1.0,
-      "minimum_independent_variable_2": null,
-      "maximum_independent_variable_2": null,
-      "minimum_dependent_variable_output": 0.3,
-      "maximum_dependent_variable_output": null,
-      "notes": "From ANSI/ASHRAE/IES Standard 90.1-2016 - Energy Standard for Buildings Except Low-Rise Residential Performance Rating Method"
-    },
-    {
-      "name": "Multi Zone VAV with VSD and fixed SP setpoint",
-      "category": "FanEIR-FPLR",
-      "form": "Cubic",
-      "dependent_variable": "PwrRatio",
-      "independent_variable_1": "FlowRatio",
-      "independent_variable_2": null,
-      "coeff_1": 0.0013,
-      "coeff_2": 0.147,
-      "coeff_3": 0.9506,
-      "coeff_4": -0.0998,
-      "coeff_5": null,
-      "coeff_6": null,
-      "coeff_7": null,
-      "coeff_8": null,
-      "coeff_9": null,
-      "coeff_10": null,
-      "minimum_independent_variable_1": 0.0,
-      "maximum_independent_variable_1": 1.0,
-      "minimum_independent_variable_2": null,
-      "maximum_independent_variable_2": null,
-      "minimum_dependent_variable_output": 0.2,
-      "maximum_dependent_variable_output": null,
-      "notes": "Appendix G baseline from ANSI/ASHRAE/IES Standard 90.1-2016 - Energy Standard for Buildings Except Low-Rise Residential Performance Rating Method"
-    },
-    {
-      "name": "Multi Zone VAV with vane-axial with variable pitch blades",
-      "category": "FanEIR-FPLR",
-      "form": "Cubic",
-      "dependent_variable": "PwrRatio",
-      "independent_variable_1": "FlowRatio",
-      "independent_variable_2": null,
-      "coeff_1": 0.1639,
-      "coeff_2": -0.4016,
-      "coeff_3": 1.9909,
-      "coeff_4": -0.7541,
-      "coeff_5": null,
-      "coeff_6": null,
-      "coeff_7": null,
-      "coeff_8": null,
-      "coeff_9": null,
-      "coeff_10": null,
-      "minimum_independent_variable_1": 0.0,
-      "maximum_independent_variable_1": 1.0,
-      "minimum_independent_variable_2": null,
-      "maximum_independent_variable_2": null,
-      "minimum_dependent_variable_output": 0.2,
-      "maximum_dependent_variable_output": null,
-      "notes": "From ANSI/ASHRAE/IES Standard 90.1-2016 - Energy Standard for Buildings Except Low-Rise Residential Performance Rating Method"
-    },
-    {
-      "name": "Multi zone VAV with static pressure reset",
-      "category": "FanEIR-FPLR",
-      "form": "Cubic",
-      "dependent_variable": "PwrRatio",
-      "independent_variable_1": "FlowRatio",
-      "independent_variable_2": null,
-      "coeff_1": 0.040759894,
-      "coeff_2": 0.08804497,
-      "coeff_3": -0.07292612,
-      "coeff_4": 0.943739823,
-      "coeff_5": null,
-      "coeff_6": null,
-      "coeff_7": null,
-      "coeff_8": null,
-      "coeff_9": null,
-      "coeff_10": null,
-      "minimum_independent_variable_1": 0.0,
-      "maximum_independent_variable_1": 1.0,
-      "minimum_independent_variable_2": null,
-      "maximum_independent_variable_2": null,
-      "minimum_dependent_variable_output": 0.1,
-      "maximum_dependent_variable_output": null,
-      "notes": "OpenStudio default, baseline for System Types 5-8 from ANSI/ASHRAE/IES Standard 90.1-2016 - Energy Standard for Buildings Except Low-Rise Residential Performance Rating Method"
-    },
     {
       "name": "New_Low_Temp_Comp_Cap_Curve",
       "category": null,
@@ -12975,31 +12800,6 @@
       "maximum_dependent_variable_output": null,
       "notes": "From Reference Buildings"
     },
-    {
-      "name": "Single zone VAV fan",
-      "category": "FanEIR-FPLR",
-      "form": "Cubic",
-      "dependent_variable": "PwrRatio",
-      "independent_variable_1": "FlowRatio",
-      "independent_variable_2": null,
-      "coeff_1": 0.027827882,
-      "coeff_2": 0.026583195,
-      "coeff_3": -0.0870687,
-      "coeff_4": 1.03091975,
-      "coeff_5": null,
-      "coeff_6": null,
-      "coeff_7": null,
-      "coeff_8": null,
-      "coeff_9": null,
-      "coeff_10": null,
-      "minimum_independent_variable_1": 0.0,
-      "maximum_independent_variable_1": 1.0,
-      "minimum_independent_variable_2": null,
-      "maximum_independent_variable_2": null,
-      "minimum_dependent_variable_output": 0.1,
-      "maximum_dependent_variable_output": null,
-      "notes": "Baseline for System Type 11 from ANSI/ASHRAE/IES Standard 90.1-2016 - Energy Standard for Buildings Except Low-Rise Residential Performance Rating Method"
-    },
     {
       "name": "Small-CHW-Bypass-fAirflow",
       "category": "CHWCoils",