NREL · joseph-robertson · May 13, 2025 · May 13, 2025 · May 13, 2025 · May 13, 2025
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -15,11 +15,11 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  OPENSTUDIO_VER: 3.9.0
-  OPENSTUDIO_SHA: c77fbb9569
+  OPENSTUDIO_VER: 3.10.0-rc5
+  OPENSTUDIO_SHA: e2e9b52d54
   OPENSTUDIO_PLATFORM: Ubuntu-22.04-x86_64
   OPENSTUDIO_EXT: deb
-  OPENSTUDIO_URL: https://github.com/NREL/OpenStudio/releases/download/v3.9.0
+  OPENSTUDIO_URL: https://github.com/NREL/OpenStudio/releases/download/v3.10.0-rc5
   BUILDSTOCK_BRANCH: develop
   BUILDSTOCK_QUERY_BRANCH: main
 
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: [format-files]
     container:
-      image: docker://nrel/openstudio:3.9.0
+      image: docker://nrel/openstudio:3.10-rc5
     steps:
       - uses: actions/checkout@v4
         with:
@@ -136,7 +136,7 @@ jobs:
           if-no-files-found: error
 
       - name: Commit latest documentation
-        shell: bash        
+        shell: bash
         run: |
           branch_name="${{ github.head_ref }}"
           git pull origin $branch_name
@@ -154,7 +154,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: [unit-tests]
     container:
-      image: docker://nrel/openstudio:3.9.0
+      image: docker://nrel/openstudio:3.10-rc5
     steps:
       - uses: actions/checkout@v4
         with:
@@ -435,7 +435,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: [unit-tests]
     container:
-      image: docker://nrel/openstudio:3.9.0
+      image: docker://nrel/openstudio:3.10-rc5
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/...technical_development_guide/source/advanced_tutorial/repository_development.rst b/...technical_development_guide/source/advanced_tutorial/repository_development.rst
@@ -4,12 +4,10 @@ Repository Development
 At this point in the tutorial, it is assumed that you have checked out a new branch that is up-to-date with either the ``develop`` or ``latest-os-hpxml`` branch of the `ResStock <https://github.com/NREL/resstock>`_ repository.
 Note that a pull request review is required if your changes are intended to be merged into the ``develop`` branch of the `ResStock <https://github.com/NREL/resstock>`_ repository.
 
-ResStock's ``develop`` branch generally points to the ``resstock`` [#]_ branch of OpenStudio-HPXML.
+ResStock's ``develop`` branch generally points to the ``master`` branch of OpenStudio-HPXML.
 A standing ``latest-os-hpxml`` branch in ResStock helps to ensure that ResStock stays up-to-date with OpenStudio-HPXML's development.
 The ``latest-os-hpxml`` is periodically merged into ``develop`` using a "Latest OS-HPXML" pull request (`here <https://github.com/NREL/resstock/pull/1328>`_ is an example).
 
-.. [#] Historically the ``develop`` branch of ResStock has pointed to the ``master`` branch of OpenStudio-HPXML; this is a temporary change until all applicable OpenStudio-HPXML features are merged into ``master``.
-
 There is a ResStock maintenance task for keeping ``latest-os-hpxml`` up-to-date -- periodically merging its corresponding pull request (as well as creating a new one following the merge).
 Other ResStock tasks are developmental in nature and include, e.g.:
 
@@ -23,7 +21,7 @@ The ResStock branch from which to implement changes, and guidelines for implemen
 In general, changes may be:
 
 - unrelated to OpenStudio-HPXML
-- related to the ``resstock`` branch of OpenStudio-HPXML
+- related to the ``master`` branch of OpenStudio-HPXML
 - related to some other branch of OpenStudio-HPXML
 
 .. _branch-develop:
@@ -38,17 +36,17 @@ Branch from ``develop`` for:
 - tests and/or CI config updates
 - core ResStock measure updates
 
-These types of changes do not involve OpenStudio-HPXML, and so it is unnecessary to ensure files in the ``resources/hpxml-measures`` folder point to the OpenStudio-HPXML ``resstock`` branch.
+These types of changes do not involve OpenStudio-HPXML, and so it is unnecessary to ensure files in the ``resources/hpxml-measures`` folder point to the OpenStudio-HPXML ``master`` branch.
 
 Also branch from ``develop`` for creating a new ``latest-os-hpxml`` branch following the merge of an old one.
-For updating to the latest version of OpenStudio-HPXML's ``resstock`` branch enter the following command:
+For updating to the latest version of OpenStudio-HPXML's ``master`` branch enter the following command:
 
 .. code:: bash
 
   $ openstudio tasks.rb update_resources
 
 See :doc:`running_task_commands` for more information and context about running tasks.
-(Executing the ``update_resources`` task will issue the appropriate ``git subtree`` command for syncing ResStock with OpenStudio-HPXML's ``resstock`` branch; there is more on this below.)
+(Executing the ``update_resources`` task will issue the appropriate ``git subtree`` command for syncing ResStock with OpenStudio-HPXML's ``master`` branch; there is more on this below.)
 
 Once ``resources/hpxml-measures`` has been updated, there are a few :ref:`remaining steps<post-git-subtree-steps>` for ensuring ResStock is properly connected to OpenStudio-HPXML.
 
@@ -61,16 +59,13 @@ Branch from ``latest-os-hpxml``
 
 Branch from ``latest-os-hpxml`` for:
 
-- using the ``resstock`` branch of OpenStudio-HPXML
+- using the ``master`` branch of OpenStudio-HPXML
 - using some other branch of OpenStudio-HPXML
 
-If you want to ensure you are using the latest ``resstock`` branch of OpenStudio-HPXML, branch from the ``latest-os-hpxml`` ResStock branch.
-This will allow you to use/test a new OpenStudio-HPXML feature or bugfix that was recently merged into its ``resstock`` branch.
-
-For using an OpenStudio-HPXML feature or bugfix that has not yet been merged into ``resstock``:
+If you want to ensure you are using the latest ``master`` branch of OpenStudio-HPXML, branch from the ``latest-os-hpxml`` ResStock branch.
+This will allow you to use/test a new OpenStudio-HPXML feature or bugfix that was recently merged into its ``master`` branch.
 
-#. branch from your OpenStudio-HPXML feature branch and pull in the ``resstock`` branch, then
-#. branch from the ``latest-os-hpxml`` ResStock branch and follow the instructions below.
+For using an OpenStudio-HPXML feature or bugfix that has not yet been merged into ``master``, branch from the ``latest-os-hpxml`` ResStock branch and then follow the instructions below.
 
 ResStock contains a **subtree** to the `OpenStudio-HPXML <https://github.com/NREL/OpenStudio-HPXML>`_ repository.
 The subtree is located at ``resources/hpxml-measures``, and is basically a direct copy of all the folders and files contained in OpenStudio-HPXML for a particular commit.
@@ -92,7 +87,7 @@ Once ``resources/hpxml-measures`` has been updated, there are a few :ref:`remain
 
 If ``latest-os-hpxml`` moves ahead of your branch, merge ``latest-os-hpxml`` into your branch.
    Note that this can cause merge conflicts for files in the ``resources/hpxml-measures`` folder.
-The best practice is to instead keep the OpenStudio-HPXML branch up-to-date with ``resstock``, and enter the ``git subtree`` command again to pull in the latest version of ``resources/hpxml-measures``.
+The best practice is to instead keep the OpenStudio-HPXML branch up-to-date with ``master``, and enter the ``git subtree`` command again to pull in the latest version of ``resources/hpxml-measures``.
 Should a merge of ``latest-os-hpxml`` into your branch cause merge conflicts, choose the version of ``resources/hpxml-measures`` from the up-to-date OpenStudio-HPXML branch.
 
 .. _post-git-subtree-steps:

diff --git a/docs/technical_development_guide/source/workflow_outputs/csv_tables.rb b/docs/technical_development_guide/source/workflow_outputs/csv_tables.rb
@@ -9,7 +9,7 @@
   'characteristics.csv' => { 'annual' => false, 'timeseries' => false, 'kws' => ['build_existing_model.'], 'usecols' => ['Input Name', 'Input Description'] },
   'other_outputs.csv' => { 'annual' => false, 'timeseries' => false, 'kws' => ['build_existing_model.'], 'usecols' => ['Input Name', 'Input Description'] },
   'simulation_outputs.csv' => { 'annual' => true, 'timeseries' => true, 'kws' => ['.end_use_', '.energy_use_', 'fuel_use_', '.hot_water_', '.hvac_capacity_', '.hvac_design_', '.load_', '.peak_', '.resilience_', '.unmet_hours_'], 'usecols' => ['Annual Name', 'Annual Units', 'Timeseries ResStock Name', 'Timeseries BuildStockBatch Name', 'Timeseries Units', 'Notes'] },
-  'panel_outputs.csv' => { 'annual' => true, 'timeseries' => true, 'kws' => ['.electric_panel_'], 'usecols' => ['Annual Name', 'Annual Units', 'Notes'] },
+  'panel_outputs.csv' => { 'annual' => true, 'timeseries' => false, 'kws' => ['.electric_panel_'], 'usecols' => ['Annual Name', 'Annual Units', 'Notes'] },
   'cost_multipliers.csv' => { 'annual' => true, 'timeseries' => false, 'kws' => ['upgrade_costs.'], 'usecols' => ['Annual Name', 'Annual Units', 'Notes'] },
   'component_loads.csv' => { 'annual' => true, 'timeseries' => true, 'kws' => ['.component_load_'], 'usecols' => ['Annual Name', 'Annual Units', 'Timeseries ResStock Name', 'Timeseries BuildStockBatch Name', 'Timeseries Units', 'Notes'] },
   'emissions.csv' => { 'annual' => true, 'timeseries' => true, 'kws' => ['.emissions_'], 'usecols' => ['Annual Name', 'Annual Units', 'Timeseries ResStock Name', 'Timeseries BuildStockBatch Name', 'Timeseries Units', 'Notes'] },

diff --git a/docs/technical_development_guide/source/workflow_outputs/csv_tables/other_outputs.csv b/docs/technical_development_guide/source/workflow_outputs/csv_tables/other_outputs.csv
@@ -51,8 +51,8 @@ build_existing_model.weather_file_latitude,Latitude from the EPW weather file.
 build_existing_model.weather_file_longitude,Longitude from the EPW weather file.
 build_existing_model.heating_unavailable_period,Heating unavailable period.
 build_existing_model.cooling_unavailable_period,Cooling unavailable period.
-build_existing_model.electric_panel_service_rating,The service rating capacity value corresponding to the bin.
-build_existing_model.electric_panel_service_rating_bin,The sampled service rating capacity bin of the electric panel.
+build_existing_model.electric_panel_service_max_current_rating,The service rating capacity value corresponding to the bin.
+build_existing_model.electric_panel_service_max_current_rating_bin,The sampled service rating capacity bin of the electric panel.
 build_existing_model.unit_height_above_grade,Height of the lowest conditioned floor above grade for the unit.
 apply_upgrade.applicable,The measure was applied to the workflow.
 apply_upgrade.upgrade_name,User-specificed name that describes the upgrade.
@@ -74,7 +74,6 @@ report_simulation_output.include_annual_peak_loads,Generates annual peak loads f
 report_simulation_output.include_annual_component_loads,Generates annual heating and cooling loads disaggregated by component type.
 report_simulation_output.include_annual_hot_water_uses,Generates annual hot water usages for each end use.
 report_simulation_output.include_annual_hvac_summary,"Generates HVAC capacities, design temperatures, and design loads."
-report_simulation_output.include_annual_panel_summary,Generates electric panel breaker spaces and loads.
 report_simulation_output.include_annual_resilience,Generates annual resilience outputs.
 report_simulation_output.include_timeseries_total_consumptions,Generates timeseries energy consumptions for the total building.
 report_simulation_output.include_timeseries_fuel_consumptions,Generates timeseries energy consumptions for each fuel type.

diff --git a/measures/ApplyUpgrade/measure.rb b/measures/ApplyUpgrade/measure.rb
@@ -511,9 +511,8 @@ def set_battery(measures, hpxml)
   end
 
   def set_electric_panel(measures, hpxml_bldg, upgrade_args_hash)
-    measures['BuildResidentialHPXML'][0]['electric_panel_service_rating'] = hpxml_bldg.electric_panels[0].max_current_rating
-    measures['BuildResidentialHPXML'][0]['electric_panel_breaker_spaces_type'] = 'total'
-    measures['BuildResidentialHPXML'][0]['electric_panel_breaker_spaces'] = hpxml_bldg.electric_panels[0].breaker_spaces_total
+    measures['BuildResidentialHPXML'][0]['electric_panel_service_max_current_rating'] = hpxml_bldg.electric_panels[0].max_current_rating
+    measures['BuildResidentialHPXML'][0]['electric_panel_breaker_spaces_rated_total'] = hpxml_bldg.electric_panels[0].breaker_spaces_total
 
     panel_system_additions = get_panel_system_additions(upgrade_args_hash)
     measures['BuildResidentialHPXML'][0].update(panel_system_additions)
@@ -758,43 +757,43 @@ def get_panel_system_additions(args_hash)
     panel_system_additions = {}
     args_hash.each do |arg_name, _value|
       if arg_name.start_with?('heating_system_') && (not arg_name.start_with?('heating_system_2_'))
-        panel_system_additions['electric_panel_load_heating_system_addition'] = true
+        panel_system_additions['electric_panel_load_heating_system_new_load'] = true
       elsif arg_name.start_with?('cooling_system_')
-        panel_system_additions['electric_panel_load_cooling_system_addition'] = true
+        panel_system_additions['electric_panel_load_cooling_system_new_load'] = true
       elsif arg_name.start_with?('heat_pump_')
-        panel_system_additions['electric_panel_load_heat_pump_addition'] = true
+        panel_system_additions['electric_panel_load_heat_pump_new_load'] = true
       elsif arg_name.start_with?('heating_system_2_')
-        panel_system_additions['electric_panel_load_heating_system_2_addition'] = true
+        panel_system_additions['electric_panel_load_heating_system_2_new_load'] = true
       elsif arg_name.start_with?('mech_vent_') && (not arg_name.start_with?('mech_vent_2_'))
-        panel_system_additions['electric_panel_load_mech_vent_fan_addition'] = true
+        panel_system_additions['electric_panel_load_mech_vent_fan_new_load'] = true
       elsif arg_name.start_with?('mech_vent_2_')
-        panel_system_additions['electric_panel_load_mech_vent_2_addition'] = true
+        panel_system_additions['electric_panel_load_mech_vent_2_new_load'] = true
       elsif arg_name.start_with?('whole_house_fan_')
-        panel_system_additions['electric_panel_load_whole_house_fan_addition'] = true
+        panel_system_additions['electric_panel_load_whole_house_fan_new_load'] = true
       elsif arg_name.start_with?('kitchen_fans_')
-        panel_system_additions['electric_panel_load_kitchen_fans_addition'] = true
+        panel_system_additions['electric_panel_load_kitchen_fans_new_load'] = true
       elsif arg_name.start_with?('bathroom_fans_')
-        panel_system_additions['electric_panel_load_bathroom_fans_addition'] = true
+        panel_system_additions['electric_panel_load_bathroom_fans_new_load'] = true
       elsif arg_name.start_with?('water_heater_')
-        panel_system_additions['electric_panel_load_water_heater_addition'] = true
+        panel_system_additions['electric_panel_load_electric_water_heater_new_load'] = true
       elsif arg_name.start_with?('clothes_dryer_')
-        panel_system_additions['electric_panel_load_clothes_dryer_addition'] = true
+        panel_system_additions['electric_panel_load_electric_clothes_dryer_new_load'] = true
       elsif arg_name.start_with?('dishwasher_')
-        panel_system_additions['electric_panel_load_dishwasher_addition'] = true
+        panel_system_additions['electric_panel_load_dishwasher_new_load'] = true
       elsif arg_name.start_with?('cooking_range_oven_')
-        panel_system_additions['electric_panel_load_cooking_range_addition'] = true
+        panel_system_additions['electric_panel_load_electric_cooking_range_new_load'] = true
       elsif arg_name.start_with?('misc_plug_loads_well_pump_')
-        panel_system_additions['electric_panel_load_misc_plug_loads_well_pump_addition'] = true
+        panel_system_additions['electric_panel_load_misc_plug_loads_well_pump_new_load'] = true
       elsif arg_name.start_with?('misc_plug_loads_vehicle_')
-        panel_system_additions['electric_panel_load_misc_plug_loads_vehicle_addition'] = true
+        panel_system_additions['electric_panel_load_misc_plug_loads_vehicle_new_load'] = true
       elsif arg_name.start_with?('pool_pump_')
-        panel_system_additions['electric_panel_load_pool_pump_addition'] = true
+        panel_system_additions['electric_panel_load_pool_pump_new_load'] = true
       elsif arg_name.start_with?('pool_heater_')
-        panel_system_additions['electric_panel_load_pool_heater_addition'] = true
+        panel_system_additions['electric_panel_load_electric_pool_heater_new_load'] = true
       elsif arg_name.start_with?('permanent_spa_pump_')
-        panel_system_additions['electric_panel_load_permanent_spa_pump_addition'] = true
+        panel_system_additions['electric_panel_load_permanent_spa_pump_new_load'] = true
       elsif arg_name.start_with?('permanent_spa_heater_')
-        panel_system_additions['electric_panel_load_permanent_spa_heater_addition'] = true
+        panel_system_additions['electric_panel_load_electric_permanent_spa_heater_new_load'] = true
         # else
         # panel_system_additions['electric_panel_load_other_addition'] = true
       end

diff --git a/measures/ApplyUpgrade/measure.xml b/measures/ApplyUpgrade/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>apply_upgrade</name>
   <uid>33f1654c-f734-43d1-b35d-9d2856e41b5a</uid>
-  <version_id>6cf55db7-3224-4aee-8b59-b71c08e75917</version_id>
-  <version_modified>2025-05-28T19:32:48Z</version_modified>
+  <version_id>0d4e78c4-9af6-4b0c-8809-8feeb7b8d699</version_id>
+  <version_modified>2025-05-30T22:27:31Z</version_modified>
   <xml_checksum>9339BE01</xml_checksum>
   <class_name>ApplyUpgrade</class_name>
   <display_name>Apply Upgrade</display_name>
@@ -25025,7 +25025,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>145995DC</checksum>
+      <checksum>02314ECB</checksum>
     </file>
     <file>
       <filename>constants.rb</filename>

diff --git a/measures/QOIReport/measure.rb b/measures/QOIReport/measure.rb
@@ -26,16 +26,18 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
     return args
   end
 
-  def energyPlusOutputRequests(runner, user_arguments)
-    super(runner, user_arguments)
+  def modelOutputRequests(model, runner, user_arguments)
+    return false if runner.halted
 
-    return OpenStudio::IdfObjectVector.new if runner.halted
+    # use the built-in error checking
+    if !runner.validateUserArguments(arguments(model), user_arguments)
+      return false
+    end
 
-    results = OpenStudio::IdfObjectVector.new
-    results << OpenStudio::IdfObject.load('Output:Variable,*,Site Outdoor Air Drybulb Temperature,hourly;').get
-    results << OpenStudio::IdfObject.load('Output:Meter,Electricity:Facility,hourly;').get
+    Model.add_output_variable(model, key_value: '*', variable_name: 'Site Outdoor Air Drybulb Temperature', reporting_frequency: 'hourly')
+    Model.add_output_meter(model, meter_name: 'Electricity:Facility', reporting_frequency: 'hourly')
 
-    return results
+    return true
   end
 
   def seasons

diff --git a/measures/QOIReport/measure.xml b/measures/QOIReport/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>qoi_report</name>
   <uid>be0bfc7f-25c6-435a-9acd-2f5fa8ac817d</uid>
-  <version_id>88e75066-1ab0-4415-8f5b-1891c9d18f34</version_id>
-  <version_modified>2024-08-22T15:15:07Z</version_modified>
+  <version_id>d0162a9c-0a92-4d84-a00d-2a15f32d1aa4</version_id>
+  <version_modified>2025-06-12T19:44:12Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>QOIReport</class_name>
   <display_name>QOI Report</display_name>
@@ -45,7 +45,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>726311C6</checksum>
+      <checksum>58EBB489</checksum>
     </file>
     <file>
       <filename>constants.rb</filename>