Replace Hard-Coded Sensible Capacity Curves with ADP/BF

BuildResidentialHPXML/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_residential_hpxml</name>
   <uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
-  <version_id>2439d1bf-b493-4236-97ab-badc6ee2b0c2</version_id>
-  <version_modified>2024-09-18T23:10:07Z</version_modified>
+  <version_id>7c042c03-f23f-43f8-aa9e-b7c404f70542</version_id>
+  <version_modified>2024-09-20T20:24:59Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -7455,6 +7455,48 @@
       <usage_type>resource</usage_type>
       <checksum>F80359E3</checksum>
     </file>
+    <file>
+      <filename>extra_files/base-mf.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>06C3D0DD</checksum>
+    </file>
+    <file>
+      <filename>extra_files/base-mf2.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>04582640</checksum>
+    </file>
+    <file>
+      <filename>extra_files/base-sfa.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>16ED9F15</checksum>
+    </file>
+    <file>
+      <filename>extra_files/base-sfa2.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>1B60C132</checksum>
+    </file>
+    <file>
+      <filename>extra_files/base-sfa3.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>DD9CD517</checksum>
+    </file>
+    <file>
+      <filename>extra_files/base-sfd.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>79463062</checksum>
+    </file>
+    <file>
+      <filename>extra_files/base-sfd2.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>9FC7FBA9</checksum>
+    </file>
     <file>
       <filename>test_build_residential_hpxml.rb</filename>
       <filetype>rb</filetype>

HPXMLtoOpenStudio/measure.rb

@@ -128,15 +128,15 @@ def run(model, runner, user_arguments)
 
       # Create OpenStudio unit model(s)
       hpxml_osm_map = {}
-      hpxml.buildings.each_with_index do |hpxml_bldg, i|
+      hpxml.buildings.each do |hpxml_bldg|
         # Create the model for this single unit
         # If we're running a whole SFA/MF building, all the unit models will be merged later
         if hpxml.buildings.size > 1
           unit_model = OpenStudio::Model::Model.new
-          create_unit_model(hpxml, hpxml_bldg, runner, unit_model, epw_path, weather, hpxml_sch_map[hpxml_bldg], i + 1)
+          create_unit_model(hpxml, hpxml_bldg, runner, unit_model, epw_path, weather, hpxml_sch_map[hpxml_bldg])
           hpxml_osm_map[hpxml_bldg] = unit_model
         else
-          create_unit_model(hpxml, hpxml_bldg, runner, model, epw_path, weather, hpxml_sch_map[hpxml_bldg], i + 1)
+          create_unit_model(hpxml, hpxml_bldg, runner, model, epw_path, weather, hpxml_sch_map[hpxml_bldg])
           hpxml_osm_map[hpxml_bldg] = model
         end
       end
@@ -313,19 +313,9 @@ def process_defaults_schedules_emissions_files(runner, weather, hpxml, args)
   # @param epw_path [String] Path to the EPW weather file
   # @param weather [WeatherFile] Weather object containing EPW information
   # @param schedules_file [SchedulesFile] SchedulesFile wrapper class instance of detailed schedule files
-  # @param unit_num [Integer] index number corresponding to an HPXML Building object
   # @return [nil]
-  def create_unit_model(hpxml, hpxml_bldg, runner, model, epw_path, weather, schedules_file, unit_num)
-    # Here we turn off OS error-checking so that any invalid values provided
-    # to OS SDK methods are passed along to EnergyPlus and produce errors. If
-    # we didn't go this, we'd end up with successful EnergyPlus simulations that
-    # use the wrong (default) value unless we check the return value of *every*
-    # OS SDK setter method to notice there was an invalid value provided.
-    # See https://github.com/NREL/OpenStudio/pull/4505 for more background.
-    model.setStrictnessLevel('None'.to_StrictnessLevel)
-
-    # Init
-    init(hpxml_bldg, hpxml.header)
+  def create_unit_model(hpxml, hpxml_bldg, runner, model, epw_path, weather, schedules_file)
+    init(model, hpxml_bldg, hpxml.header)
     SimControls.apply(model, hpxml.header)
     Location.apply(model, weather, hpxml_bldg, hpxml.header, epw_path)
 
@@ -347,7 +337,7 @@ def create_unit_model(hpxml, hpxml_bldg, runner, model, epw_path, weather, sched
     Geometry.apply_thermal_mass(model, spaces, hpxml_bldg, hpxml.header)
     Geometry.set_zone_volumes(spaces, hpxml_bldg, hpxml.header)
     Geometry.explode_surfaces(model, hpxml_bldg)
-    Geometry.apply_building_unit(model, unit_num)
+    Geometry.apply_building_unit(model, hpxml, hpxml_bldg)
 
     # HVAC
     airloop_map = HVAC.apply_hvac_systems(runner, model, weather, spaces, hpxml_bldg, hpxml.header, schedules_file, hvac_days)
@@ -380,10 +370,19 @@ def create_unit_model(hpxml, hpxml_bldg, runner, model, epw_path, weather, sched
 
   # Miscellaneous logic that needs to occur upfront.
   #
+  # @param model [OpenStudio::Model::Model] OpenStudio Model object
   # @param hpxml_bldg [HPXML::Building] HPXML Building object representing an individual dwelling unit
   # @param hpxml_header [HPXML::Header] HPXML Header object (one per HPXML file)
   # @return [nil]
-  def init(hpxml_bldg, hpxml_header)
+  def init(model, hpxml_bldg, hpxml_header)
+    # Here we turn off OS error-checking so that any invalid values provided
+    # to OS SDK methods are passed along to EnergyPlus and produce errors. If
+    # we didn't go this, we'd end up with successful EnergyPlus simulations that
+    # use the wrong (default) value unless we check the return value of *every*
+    # OS SDK setter method to notice there was an invalid value provided.
+    # See https://github.com/NREL/OpenStudio/pull/4505 for more background.
+    model.setStrictnessLevel('None'.to_StrictnessLevel)
+
     # Store the fraction of windows operable before we collapse surfaces
     hpxml_bldg.additional_properties.initial_frac_windows_operable = hpxml_bldg.fraction_of_windows_operable()
 

HPXMLtoOpenStudio/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>1650dfa9-50da-4856-b117-58dbffd75ff7</version_id>
-  <version_modified>2024-09-19T22:24:22Z</version_modified>
+  <version_id>3fa6e285-3db2-43a1-8e1c-66405c34438c</version_id>
+  <version_modified>2024-09-20T20:36:31Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -183,7 +183,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>1C013D19</checksum>
+      <checksum>65C907FB</checksum>
     </file>
     <file>
       <filename>airflow.rb</filename>
@@ -339,7 +339,7 @@
       <filename>geometry.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>095FE2B7</checksum>
+      <checksum>1DE39C4E</checksum>
     </file>
     <file>
       <filename>hotwater_appliances.rb</filename>
@@ -387,13 +387,13 @@
       <filename>hvac.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>E26C6DD2</checksum>
+      <checksum>D60E72E2</checksum>
     </file>
     <file>
       <filename>hvac_sizing.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>0998C39D</checksum>
+      <checksum>9EE935C4</checksum>
     </file>
     <file>
       <filename>internal_gains.rb</filename>
@@ -459,7 +459,7 @@
       <filename>psychrometrics.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>86A74352</checksum>
+      <checksum>716C98E6</checksum>
     </file>
     <file>
       <filename>pv.rb</filename>

HPXMLtoOpenStudio/resources/geometry.rb

@@ -1993,10 +1993,13 @@ def self.create_or_get_space(model, spaces, location, hpxml_bldg)
   # Store the HPXML Building object unit number for use in reporting measure.
   #
   # @param model [OpenStudio::Model::Model] OpenStudio Model object
-  # @param unit_number [Integer] index number corresponding to an HPXML Building object
+  # @param hpxml [HPXML] HPXML object
+  # @param hpxml_bldg [HPXML::Building] HPXML Building object representing an individual dwelling unit
   # @return [nil]
-  def self.apply_building_unit(model, unit_num)
-    return if unit_num.nil?
+  def self.apply_building_unit(model, hpxml, hpxml_bldg)
+    return if hpxml.buildings.size == 1
+
+    unit_num = hpxml.buildings.index(hpxml_bldg) + 1
 
     unit = OpenStudio::Model::BuildingUnit.new(model)
     unit.additionalProperties.setFeature('unit_num', unit_num)

HPXMLtoOpenStudio/resources/hvac.rb

@@ -5,6 +5,8 @@ module HVAC
   AirSourceHeatRatedODB = 47.0 # degF, Rated outdoor drybulb for air-source systems, heating
   AirSourceHeatRatedIDB = 70.0 # degF, Rated indoor drybulb for air-source systems, heating
   AirSourceCoolRatedODB = 95.0 # degF, Rated outdoor drybulb for air-source systems, cooling
+  AirSourceCoolRatedOWB = 75.0 # degF, Rated outdoor wetbulb for air-source systems, cooling
+  AirSourceCoolRatedIDB = 80.0 # degF, Rated indoor drybulb for air-source systems, cooling
   AirSourceCoolRatedIWB = 67.0 # degF, Rated indoor wetbulb for air-source systems, cooling
   CrankcaseHeaterTemp = 50.0 # degF
 
@@ -3634,7 +3636,7 @@ def self.set_cool_rated_shrs_gross(cooling_system)
       clg_ap.cool_rated_shrs_gross = [cooling_system.cooling_shr] # We don't model the fan separately, so set gross == net
     else
       # rated shr gross and fan speed ratios
-      dB_rated = 80.0 # F
+      dB_rated = HVAC::AirSourceCoolRatedIDB
       win = 0.01118470 # Humidity ratio corresponding to 80F dry bulb/67F wet bulb (from EnergyPlus)
 
       if cooling_system.compressor_type == HPXML::HVACCompressorTypeSingleStage