Merge pull request #1328 from NREL/latest-os-hpxml

Latest OS-HPXML
NREL · Jan 27, 2025 · f9ad567 · f9ad567
2 parents 0610fc1 + fcef5ac
commit f9ad567
Show file tree

Hide file tree

Showing 90 changed files with 18,346 additions and 17,724 deletions.
diff --git a/docs/technical_development_guide/source/workflow_inputs/characteristics.rst b/docs/technical_development_guide/source/workflow_inputs/characteristics.rst
diff --git a/measures/ResStockArguments/README.md b/measures/ResStockArguments/README.md
diff --git a/measures/ResStockArguments/measure.xml b/measures/ResStockArguments/measure.xml
diff --git a/measures/ResStockArguments/resources/measure.txt b/measures/ResStockArguments/resources/measure.txt
@@ -0,0 +1 @@
+357944431a5a88e46e2b12c30da3f703
diff --git a/resources/hpxml-measures/BuildResidentialHPXML/README.md b/resources/hpxml-measures/BuildResidentialHPXML/README.md
diff --git a/resources/hpxml-measures/BuildResidentialHPXML/measure.rb b/resources/hpxml-measures/BuildResidentialHPXML/measure.rb
diff --git a/resources/hpxml-measures/BuildResidentialHPXML/measure.xml b/resources/hpxml-measures/BuildResidentialHPXML/measure.xml
diff --git a/resources/hpxml-measures/BuildResidentialHPXML/resources/geometry.rb b/resources/hpxml-measures/BuildResidentialHPXML/resources/geometry.rb
diff --git a/resources/hpxml-measures/BuildResidentialHPXML/resources/version.txt b/resources/hpxml-measures/BuildResidentialHPXML/resources/version.txt
@@ -0,0 +1 @@
+e8edd0fdf30035cab93a927df4f12ebb
diff --git a/resources/hpxml-measures/BuildResidentialHPXML/tests/test_build_residential_hpxml.rb b/resources/hpxml-measures/BuildResidentialHPXML/tests/test_build_residential_hpxml.rb
diff --git a/resources/hpxml-measures/BuildResidentialScheduleFile/measure.rb b/resources/hpxml-measures/BuildResidentialScheduleFile/measure.rb
@@ -269,7 +269,7 @@ def get_generator_inputs(hpxml_bldg, weather, args)
     args[:column_names] = args[:schedules_column_names].split(',').map(&:strip) if !args[:schedules_column_names].nil?
 
     if hpxml_bldg.building_occupancy.number_of_residents.nil?
-      args[:geometry_num_occupants] = Geometry.get_occupancy_default_num(nbeds: hpxml_bldg.building_construction.number_of_bedrooms)
+      args[:geometry_num_occupants] = Geometry.get_occupancy_default_num(hpxml_bldg.building_construction.number_of_bedrooms)
     else
       args[:geometry_num_occupants] = hpxml_bldg.building_occupancy.number_of_residents
     end

diff --git a/resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml b/resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_residential_schedule_file</name>
   <uid>f770b2db-1a9f-4e99-99a7-7f3161a594b1</uid>
-  <version_id>fac68af6-8045-433e-8eca-df53c8274e61</version_id>
-  <version_modified>2024-09-29T23:07:27Z</version_modified>
+  <version_id>c5bb6758-f028-455a-a49d-25f4df40e500</version_id>
+  <version_modified>2025-01-02T23:31:30Z</version_modified>
   <xml_checksum>03F02484</xml_checksum>
   <class_name>BuildResidentialScheduleFile</class_name>
   <display_name>Schedule File Builder</display_name>
@@ -133,7 +133,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>655C4010</checksum>
+      <checksum>F7D77A2C</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -229,7 +229,7 @@
       <filename>schedules.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>F53FB2CB</checksum>
+      <checksum>F14B1337</checksum>
     </file>
     <file>
       <filename>shower_cluster_size_probability.csv</filename>

diff --git a/resources/hpxml-measures/BuildResidentialScheduleFile/resources/schedules.rb b/resources/hpxml-measures/BuildResidentialScheduleFile/resources/schedules.rb
@@ -176,7 +176,7 @@ def create_stochastic_schedules(args:,
     plugload_tv_monthly_multiplier = Schedule.validate_values(schedules_csv_data[SchedulesFile::Columns[:PlugLoadsTV].name]['PlugLoadsTVMonthlyMultipliers'], 12, 'monthly') # American Time Use Survey
     ceiling_fan_weekday_sch = Schedule.validate_values(default_schedules_csv_data[SchedulesFile::Columns[:CeilingFan].name]['WeekdayScheduleFractions'], 24, 'weekday') # Table C.3(5) of ANSI/RESNET/ICC 301-2022 Addendum C
     ceiling_fan_weekend_sch = Schedule.validate_values(default_schedules_csv_data[SchedulesFile::Columns[:CeilingFan].name]['WeekendScheduleFractions'], 24, 'weekend') # Table C.3(5) of ANSI/RESNET/ICC 301-2022 Addendum C
-    ceiling_fan_monthly_multiplier = Schedule.validate_values(Defaults.get_ceiling_fan_months(weather).join(', '), 12, 'monthly') # based on monthly average outdoor temperatures per ANSI/RESNET/ICC 301-2019
+    ceiling_fan_monthly_multiplier = Schedule.validate_values(Defaults.get_ceiling_fan_months(weather).join(', '), 12, 'monthly') # based on monthly average outdoor temperatures per ANSI/RESNET/ICC 301
 
     sch = get_building_america_lighting_schedule(args[:time_zone_utc_offset], args[:latitude], args[:longitude], schedules_csv_data)
     interior_lighting_schedule = []

diff --git a/resources/hpxml-measures/Changelog.md b/resources/hpxml-measures/Changelog.md
@@ -1,3 +1,20 @@
+## OpenStudio-HPXML v1.10.0
+
+__New Features__
+
+__Bugfixes__
+- Fixes zero occupants specified for one unit in a whole MF building from being treated like zero occupants for every unit.
+- Fixes using detailed schedules with higher resolution (e.g., 10-min data) than the simulation timestep (e.g., 60-min).
+- Fixes possible heating/cooling spikes when using maximum power ratio detailed schedule for variable-speed HVAC systems.
+
+## OpenStudio-HPXML v1.9.1
+
+__New Features__
+- Now can be used to obtain ACCA Manual J approval; see the [OpenStudio-HPXML documentation](https://openstudio-hpxml.readthedocs.io/en/latest/intro.html#capabilities).
+
+__Bugfixes__
+- Fixes Manual J design load calculations for radiant floors.
+
 ## OpenStudio-HPXML v1.9.0
 
 __New Features__

diff --git a/resources/hpxml-measures/HPXMLtoOpenStudio/measure.rb b/resources/hpxml-measures/HPXMLtoOpenStudio/measure.rb
@@ -109,7 +109,7 @@ def run(model, runner, user_arguments)
     end
 
     Version.check_openstudio_version()
-    Model.reset(model, runner)
+    Model.reset(runner, model)
 
     args = runner.getArgumentValues(arguments(model), user_arguments)
     set_file_paths(args)
@@ -327,7 +327,7 @@ def create_unit_model(hpxml, hpxml_bldg, runner, model, epw_path, weather, sched
     # Conditioned space & setpoints
     spaces = {} # Map of HPXML locations => OpenStudio Space objects
     Geometry.create_or_get_space(model, spaces, HPXML::LocationConditionedSpace, hpxml_bldg)
-    hvac_days = HVAC.apply_setpoints(model, runner, weather, spaces, hpxml_bldg, hpxml.header, schedules_file)
+    hvac_days = HVAC.apply_setpoints(runner, model, weather, spaces, hpxml_bldg, hpxml.header, schedules_file)
 
     # Geometry & Enclosure
     Geometry.apply_roofs(runner, model, spaces, hpxml_bldg, hpxml.header)
@@ -407,20 +407,6 @@ def init(model, hpxml_bldg, hpxml_header)
     if hpxml_header.apply_ashrae140_assumptions.nil?
       hpxml_header.apply_ashrae140_assumptions = false
     end
-
-    if not hpxml_bldg.building_occupancy.number_of_residents.nil?
-      # If zero occupants, ensure end uses of interest are zeroed out
-      if (hpxml_bldg.building_occupancy.number_of_residents == 0) && (not hpxml_header.apply_ashrae140_assumptions)
-        hpxml_header.unavailable_periods.add(column_name: 'Vacancy',
-                                             begin_month: hpxml_header.sim_begin_month,
-                                             begin_day: hpxml_header.sim_begin_day,
-                                             begin_hour: 0,
-                                             end_month: hpxml_header.sim_end_month,
-                                             end_day: hpxml_header.sim_end_day,
-                                             end_hour: 24,
-                                             natvent_availability: HPXML::ScheduleUnavailable)
-      end
-    end
   end
 end