Merge pull request #807 from NatLabRockies/latest-os-hpxml

Latest OS-HPXML

Author: shorowit

.github/workflows/config.yml

@@ -17,7 +17,7 @@ concurrency:
 env:
   OS_VERSION: "3.11.0"
   OS_SHA: 241b8abb4d
-  OS_URL: https://github.com/NREL/OpenStudio/releases/download
+  OS_URL: https://github.com/NatLabRockies/OpenStudio/releases/download
 
 jobs:
   run-ruleset-tests:
@@ -197,7 +197,7 @@ jobs:
           merge-multiple: true
 
       - name: Delete artifacts
-        uses: geekyeggo/delete-artifact@v5
+        uses: geekyeggo/delete-artifact@v6
         with:
           name: test_results_*
 

Changelog.md

@@ -634,7 +634,7 @@ __Bugfixes__
 __Breaking changes__
 - OpenStudio version 2.9.1 is now required.
 - The `--hourly-output` argument now only generates hourly output for the Reference/Rated Homes, not the IAD Homes, for faster runtime.
-- Foundation walls described with the `Insulation/Layer` approach now require two layers (i.e., interior and exterior). (Foundation walls described using the `Insulation/AssemblyEffectiveRValue` approach are unchanged.) See [here](https://github.com/NREL/OpenStudio-HPXML/pull/120) for more information.
+- Foundation walls described with the `Insulation/Layer` approach now require two layers (i.e., interior and exterior). (Foundation walls described using the `Insulation/AssemblyEffectiveRValue` approach are unchanged.) See [here](https://github.com/NatLabRockies/OpenStudio-HPXML/pull/120) for more information.
 
 __New Features__
 - Runtime performance improvements for all buildings.

README.md

@@ -1,13 +1,13 @@
 OpenStudio®-ERI
 ==============
 
-[![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/NREL/OpenStudio-ERI?include_prereleases)](https://github.com/NREL/OpenStudio-ERI/releases)
-[![ci](https://github.com/NREL/OpenStudio-ERI/actions/workflows/config.yml/badge.svg?branch=master)](https://github.com/NREL/OpenStudio-ERI/actions/workflows/config.yml)
+[![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/NatLabRockies/OpenStudio-ERI?include_prereleases)](https://github.com/NatLabRockies/OpenStudio-ERI/releases)
+[![ci](https://github.com/NatLabRockies/OpenStudio-ERI/actions/workflows/config.yml/badge.svg?branch=master)](https://github.com/NatLabRockies/OpenStudio-ERI/actions/workflows/config.yml)
 [![Documentation Status](https://readthedocs.org/projects/openstudio-eri/badge/?version=latest)](https://openstudio-eri.readthedocs.io/en/latest/?badge=latest)
 
 
 The OpenStudio-ERI project allows calculating an Energy Rating Index (ERI) using the Department of Energy's [EnergyPlus™](https://energyplus.net/) simulation platform.
-The building description is provided in an [HPXML file](https://hpxml.nrel.gov/) format.
+The building description is provided in an [HPXML file](https://hpxml.nlr.gov/) format.
 OpenStudio-ERI is intended to be used by user interfaces or other automated software workflows that automatically produce the HPXML file.
 
 The project supports:
@@ -18,7 +18,7 @@ The project supports:
 
 For more information on running simulations, generating HPXML files, etc., please visit the [documentation](https://openstudio-eri.readthedocs.io/en/latest).
 
-OpenStudio-ERI uses [OpenStudio-HPXML](https://github.com/NREL/OpenStudio-HPXML) to run the individual EnergyPlus simulations.
+OpenStudio-ERI uses [OpenStudio-HPXML](https://github.com/NatLabRockies/OpenStudio-HPXML) to run the individual EnergyPlus simulations.
 A high-level workflow diagram is shown below:
 
 ![Image](https://github.com/user-attachments/assets/9212f9ff-a1a3-4c9b-8b2e-09296a1d1b0b)
@@ -32,12 +32,12 @@ OpenStudio-ERI is used by a number of software products or organizations, includ
 - [HouseRater](https://www.houserater.com)
 - [REM/Rate™](https://www.remrate.com)
 
-Are you using OpenStudio-ERI and want to be mentioned here? [Email us](mailto:scott.horowitz@nrel.gov) or [open a Pull Request](https://github.com/NREL/OpenStudio-ERI/edit/master/README.md).
+Are you using OpenStudio-ERI and want to be mentioned here? [Email us](mailto:scott.horowitz@nlr.gov) or [open a Pull Request](https://github.com/NatLabRockies/OpenStudio-ERI/edit/master/README.md).
 
 ## License
 
 This workflow is available under a BSD-3-like license, which is a free, open-source, and permissive license.
-For more information, check out the [license file](https://github.com/NREL/OpenStudio-ERI/blob/master/LICENSE.md).
+For more information, check out the [license file](https://github.com/NatLabRockies/OpenStudio-ERI/blob/master/LICENSE.md).
 
 ## Disclaimer
 

docs/source/intro.rst

@@ -2,7 +2,7 @@ Introduction
 ============
 
 The OpenStudio-ERI project allows calculating an Energy Rating Index (ERI) using the Department of Energy's open-source `OpenStudio <https://www.openstudio.net/>`_/`EnergyPlus <https://energyplus.net/>`_ simulation platform.
-The building description is provided in an `HPXML file <https://hpxml.nrel.gov/>`_ format.
+The building description is provided in an `HPXML file <https://hpxml.nlr.gov/>`_ format.
 
 The project supports:
 
@@ -14,7 +14,7 @@ The project supports:
 License
 -------
 
-This workflow is available under a BSD-3-like license, which is a free, open-source, and permissive license. For more information, check out the `license file <https://github.com/NREL/OpenStudio-ERI/blob/master/LICENSE.md>`_.
+This workflow is available under a BSD-3-like license, which is a free, open-source, and permissive license. For more information, check out the `license file <https://github.com/NatLabRockies/OpenStudio-ERI/blob/master/LICENSE.md>`_.
 
 Disclaimer
 ----------

docs/source/packaging.rst

@@ -12,7 +12,7 @@ First, OpenStudio must be available.
 Web applications may wish to use the `nrel/openstudio docker image <https://hub.docker.com/r/nrel/openstudio>`_.
 Alternatively, the OpenStudio installer can be executed on the web server -- only the EnergyPlus and Command Line Interface (CLI) components are required.
 
-Then grab the latest `OpenStudio-ERI release <https://github.com/NREL/OpenStudio-ERI/releases>`_.
+Then grab the latest `OpenStudio-ERI release <https://github.com/NatLabRockies/OpenStudio-ERI/releases>`_.
 
 Desktop Applications
 --------------------
@@ -23,4 +23,4 @@ First, OpenStudio must be bundled -- only the EnergyPlus and Command Line Interf
 Either the OpenStudio setup file can be automatically run as part of your install, or the OpenStudio application can be installed to a local computer and its contents can be re-bundled in your installer (there are no external dependencies required).
 The only required OpenStudio contents are the ``openstudio/bin`` and ``openstudio/EnergyPlus`` directories.
 
-Then grab the latest `OpenStudio-ERI release <https://github.com/NREL/OpenStudio-ERI/releases>`_.
+Then grab the latest `OpenStudio-ERI release <https://github.com/NatLabRockies/OpenStudio-ERI/releases>`_.

docs/source/usage_instructions.rst

@@ -6,8 +6,8 @@ Setup
 
 To get started:
 
-#. Either download `OpenStudio 3.11.0 <https://github.com/NREL/OpenStudio/releases/tag/v3.11.0>`_ and install the Command Line Interface/EnergyPlus components, or use the `nrel/openstudio docker image <https://hub.docker.com/r/nrel/openstudio>`_.
-#. Download the `latest release <https://github.com/NREL/OpenStudio-ERI/releases>`_ release.
+#. Either download `OpenStudio 3.11.0 <https://github.com/NatLabRockies/OpenStudio/releases/tag/v3.11.0>`_ and install the Command Line Interface/EnergyPlus components, or use the `nrel/openstudio docker image <https://hub.docker.com/r/nrel/openstudio>`_.
+#. Download the `latest release <https://github.com/NatLabRockies/OpenStudio-ERI/releases>`_ release.
 
 .. note::
 

docs/source/workflow_inputs.rst

@@ -6,7 +6,7 @@ Workflow Inputs
 Introduction
 ------------
 
-OpenStudio-ERI requires a building description in an `HPXML file <https://hpxml.nrel.gov/>`_ format.
+OpenStudio-ERI requires a building description in an `HPXML file <https://hpxml.nlr.gov/>`_ format.
 HPXML is an open data standard for collecting and transferring home energy data.
 Using HPXML files reduces the complexity and effort for software developers to leverage the EnergyPlus simulation engine.
 
@@ -244,7 +244,7 @@ Each fuel type available to the building is entered in ``/HPXML/Building/Buildin
   ``Fuel``  string             See [#]_     Yes                Fuel name
   ========  ========  =======  ===========  ========  =======  ============================
 
-  .. [#] Fuel choices can be found at the `HPXML Toolbox website <https://hpxml.nrel.gov/datadictionary/3.0.0/Building/BuildingDetails/BuildingSummary/Site/FuelTypesAvailable/Fuel>`_.
+  .. [#] Fuel choices can be found at the `HPXML Toolbox website <https://hpxml.nlr.gov/datadictionary/latest/Building/BuildingDetails/BuildingSummary/Site/FuelTypesAvailable/Fuel>`_.
 
 .. note::
 
@@ -2486,7 +2486,7 @@ A simple solar hot water system is entered as a ``/HPXML/Building/BuildingDetail
   ====================  =======  =====  ============  ========  ========  ======================
 
   .. [#] Portion of total conventional hot water heating load (delivered energy plus tank standby losses).
-         Can be obtained from `Directory of SRCC OG-300 Solar Water Heating System Ratings <https://solar-rating.org/programs/og-300-program/>`_ or NREL's `System Advisor Model <https://sam.nrel.gov/>`_ or equivalent.
+         Can be obtained from `Directory of SRCC OG-300 Solar Water Heating System Ratings <https://solar-rating.org/programs/og-300-program/>`_ or NLR's `System Advisor Model <https://sam.nlr.gov/>`_ or equivalent.
   .. [#] ConnectedTo must reference a ``WaterHeatingSystem``.
          The referenced water heater cannot be a space-heating boiler nor attached to a desuperheater.
   .. [#] If ConnectedTo not provided, solar fraction will apply to all water heaters in the building.
@@ -2529,7 +2529,7 @@ HPXML Photovoltaics
 
 Each solar electric photovoltaic (PV) system is entered as a ``/HPXML/Building/BuildingDetails/Systems/Photovoltaics/PVSystem``.
 
-Many of the inputs are adopted from the `PVWatts model <https://pvwatts.nrel.gov>`_.
+Many of the inputs are adopted from the `PVWatts model <https://pvwatts.nlr.gov/>`_.
 
   ====================================  =======  =====  ==================  ========  ========  ============================================
   Element                               Type     Units  Constraints         Required  Default   Notes
@@ -2551,7 +2551,7 @@ Many of the inputs are adopted from the `PVWatts model <https://pvwatts.nrel.gov
   .. [#] ModuleType choices are "standard", "premium", or "thin film".
   .. [#] Tracking choices are "fixed", "1-axis", "1-axis backtracked", or "2-axis".
   .. [#] System losses due to soiling, shading, snow, mismatch, wiring, degradation, etc.
-         Default from the `PVWatts documentation <https://www.nrel.gov/docs/fy14osti/62641.pdf>`_ is 0.14, which breaks down as follows.
+         Default from the `PVWatts documentation <https://docs.nlr.gov/docs/fy14osti/62641.pdf>`_ is 0.14, which breaks down as follows.
          Note that the total loss (14%) is not the sum of the individual losses but is calculated by multiplying the reduction due to each loss.
 
          \- **Soiling**: 2%

hpxml-measures/.github/workflows/config.yml

@@ -170,7 +170,7 @@ jobs:
           merge-multiple: true
 
       - name: Delete artifacts
-        uses: geekyeggo/delete-artifact@v5
+        uses: geekyeggo/delete-artifact@v6
         with:
           name: results-*
 
@@ -264,7 +264,7 @@ jobs:
           if [[ $(git diff --cached --exit-code) ]]; then
             git config --global user.email "github-action@users.noreply.github.com"
             git config --global user.name "GitHub Action"
-            git commit -m "Latest results."
+            git commit -m "Latest results. [skip ci]"
             echo "Pushing to branch: $branch_name"
             git push -u origin $branch_name
           fi

hpxml-measures/BuildResidentialHPXML/README.md

@@ -1220,7 +1220,7 @@ The location of the water heater. Defaults based on the foundation/garage type.
 
 - **Required:** ``false``
 
-- **Choices:** <br/>  - `Default`<br/>  - `Conditioned Space`<br/>  - `Basement`<br/>  - `Garage`<br/>  - `Crawlspace`<br/>  - `Attic`<br/>  - `Other Heated Space`<br/>  - `Outside`
+- **Choices:** <br/>  - `Default`<br/>  - `Conditioned Space`<br/>  - `Basement`<br/>  - `Garage`<br/>  - `Crawlspace`<br/>  - `Attic`<br/>  - `SFA/MF Other Heated Space`<br/>  - `Outside`
 
 
 - **Default:** `Default`

hpxml-measures/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>d78d122b-6e59-4fde-af8a-1708240ade46</version_id>
-  <version_modified>2026-03-26T20:59:07Z</version_modified>
+  <version_id>a388db27-a2f7-4811-8d2e-95ba875a8820</version_id>
+  <version_modified>2026-04-02T19:43:52Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -6939,8 +6939,8 @@
           <display_name>Attic</display_name>
         </choice>
         <choice>
-          <value>Other Heated Space</value>
-          <display_name>Other Heated Space</display_name>
+          <value>SFA/MF Other Heated Space</value>
+          <display_name>SFA/MF Other Heated Space</display_name>
         </choice>
         <choice>
           <value>Outside</value>
@@ -11413,7 +11413,7 @@
       <filename>README.md</filename>
       <filetype>md</filetype>
       <usage_type>readme</usage_type>
-      <checksum>75446FA4</checksum>
+      <checksum>9F136C7C</checksum>
     </file>
     <file>
       <filename>README.md.erb</filename>
@@ -11562,7 +11562,7 @@
       <filename>options/dhw_water_heater_location.tsv</filename>
       <filetype>tsv</filetype>
       <usage_type>resource</usage_type>
-      <checksum>6DD86A53</checksum>
+      <checksum>9EC79B81</checksum>
     </file>
     <file>
       <filename>options/electric_vehicle.tsv</filename>