Skip to content

Commit

Permalink
Merge branch 'develop' into resstock-args-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
rajeee committed Jan 10, 2025
2 parents 8d088c4 + 4b7fcd7 commit d888168
Show file tree
Hide file tree
Showing 183 changed files with 98,544 additions and 80,357 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ on:
workflow_dispatch:

env:
OPENSTUDIO_VER: "3.8.0"
OPENSTUDIO_SHA: "f953b6fcaf"
OPENSTUDIO_PLATFORM: "Ubuntu-20.04-x86_64"
OPENSTUDIO_EXT: "deb"
OPENSTUDIO_URL: "https://github.com/NREL/OpenStudio/releases/download/v3.8.0"
OPENSTUDIO_VER: 3.9.0
OPENSTUDIO_SHA: c77fbb9569
OPENSTUDIO_PLATFORM: Ubuntu-22.04-x86_64
OPENSTUDIO_EXT: deb
OPENSTUDIO_URL: https://github.com/NREL/OpenStudio/releases/download/v3.9.0

jobs:
format-files:
Expand All @@ -38,7 +38,7 @@ jobs:
runs-on: ubuntu-22.04
needs: [format-files]
container:
image: docker://nrel/openstudio:3.8.0
image: docker://nrel/openstudio:3.9.0
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
runs-on: ubuntu-22.04
needs: [unit-tests]
container:
image: docker://nrel/openstudio:3.8.0
image: docker://nrel/openstudio:3.9.0
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: '3.11'

- name: Download and Install OpenStudio
run: |
Expand Down
143 changes: 143 additions & 0 deletions docs/read_the_docs/source/changelog/changelog_3_4_0.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
================
v3.4.0 Changelog
================

.. changelog::
:version: v3.4.0
:released: 2024-12-02

.. change::
:tags: software, openstudio, feature
:pullreq: 1318

**Date**: 2024-11-19

Title:
Latest OS-HPXML

Description:
Update to OpenStudio-HPXML 1.9/OpenStudio 3.9/EnergyPlus 24.2.

OpenStudio-HPXML: `pull request 1883 <https://github.com/NREL/OpenStudio-HPXML/pull/1883>`_

Assignees: Joe Robertson, Scott Horowitz


.. change::
:tags: bugfix, characteristics
:pullreq: 1265
:tickets: 1236

**Date**: 2024-09-24

Title:
Fix Hot Water Fixtures multipliers

Description:
Mean-shift hot water usage multipliers distribution by increasing weighted average from 0.8 to 1.0 in Hot Water Fixtures.tsv.

resstock-estimation: `pull request 420 <https://github.com/NREL/resstock-estimation/pull/420>`_

Assignees: Lixi Liu


.. change::
:tags: workflow, infiltration, bugfix
:pullreq: 1257

**Date**: 2024-08-20

Title:
Air leakage type "unit total"

Description:
Update options_lookup and ResStockArguments to use "unit total" air leakage type instead of the current "unit exterior only" type w/ infiltration adjustment approach.
Modeled infiltration for dwelling units now have an upper bound equal to the sampled ACH50 option.
Update BuildExistingModel to register adjusted total infiltration ACH50 value.

Assignees: Joe Robertson


.. change::
:tags: characteristics, floor area, bugfix
:pullreq: 1301
:tickets: 1273

**Date**: 2024-09-23

Title:
Fix RECS floor area bins

Description:
RECS have been using incorrect floor area bins when assigning some characteristics due to a bug on how floor area bin is calculated. This PR fixes the issue.

resstock-estimation: `pull request 424 <https://github.com/NREL/resstock-estimation/pull/424>`_

Assignees: Rajendra Adhikari, Anthony Fontanini


.. change::
:tags: workflow, hot water, feature
:pullreq: 1282

**Date**: 2024-09-04

Title:
Latest OS-HPXML

Description:
For hot water end uses OS-HPXML now directly uses equations from https://www.fsec.ucf.edu/en/publications/pdf/fsec-pf-464-15.pdf, that are a function of number of occupants, for operational calculations.

OpenStudio-HPXML: `pull request 1761 <https://github.com/NREL/OpenStudio-HPXML/pull/1761>`_

Assignees: Joe Robertson


.. change::
:tags: workflow, plug loads, feature
:pullreq: 1298

**Date**: 2024-09-26

Title:
Latest OS-HPXML

Description:
For TV plug loads, we are now using OS-HPXML defaults that directly use equations from RECS 2020 that are a function of number of occupants and conditioned floor area.
For operational calculations in general, we are also updating the relationships between number of bedrooms/occupants based on RECS 2020 and disaggregated by building types.

OpenStudio-HPXML: `pull request 1690 <https://github.com/NREL/OpenStudio-HPXML/pull/1690>`_, `pull request 1775 <https://github.com/NREL/OpenStudio-HPXML/pull/1775>`_

Assignees: Joe Robertson


.. change::
:tags: workflow, hvac, feature
:pullreq: 1254

**Date**: 2024-09-27

Title:
Heating and Cooling Unavailable Days

Description:
The purpose of this PR is to account for dwelling units whose HVAC system (heating/cooling) is unavailable for some number of days during the year (per RECS 2020).
Specifically, this PR modifies HVAC heating/cooling seasons using number of unavailable days and BAHSP definition for heating/cooling months.

resstock-estimation: `pull request 416 <https://github.com/NREL/resstock-estimation/pull/416>`_

Assignees: Joe Robertson


.. change::
:tags: workflow, hvac, feature
:pullreq: 1304
:tickets: 1303

**Date**: 2024-11-14

Title:
Assign above-grade height for apartment units

Description:
The purpose of this PR is to set a value in ResStockArguments for apartment units based on the type/size of MF building and where the unit is located (lower, middle, or upper story).
96 changes: 8 additions & 88 deletions docs/read_the_docs/source/changelog/changelog_dev.rst
Original file line number Diff line number Diff line change
@@ -1,105 +1,25 @@
=====================
Development Changelog
=====================

.. changelog::
:version: v3.4.0
:version: v3.5.0
:released: pending

.. change::
:tags: characteristics, pool heater
:pullreq: 1324

:tags: bugfix, characteristics
:pullreq: 1265
:tickets: 1236

**Date**: 2024-08-06

Title:
Fix Hot Water Fixtures multipliers

Description:
Mean-shift hot water usage multipliers distribution by increasing weighted average from 0.8 to 1.0 in Hot Water Fixtures.tsv.

Assignees: Lixi Liu

:tags: workflow, infiltration, bugfix
:pullreq: 1257

**Date**: 2024-08-20

Title:
Air leakage type "unit total"

Description:
Update options_lookup and ResStockArguments to use "unit total" air leakage type instead of the current "unit exterior only" type w/ infiltration adjustment approach.
Modeled infiltration for dwelling units now have an upper bound equal to the sampled ACH50 option.
Update BuildExistingModel to register adjusted total infiltration ACH50 value.

Assignees: Joe Robertson

.. change::
:tags: characteristics, floor area, bugfix
:pullreq: 1301

**Date**: 2024-09-18

Title:
Fix RECS floor area bins

Description:
RECS have been using incorrect floor area bins when assigning some characteristics due to a bug on how floor area bin is calculated. This PR fixes the issue.

Assignees: Rajendra Adhikari, Anthony Fontanini

.. change::
:tags: workflow, hot water, feature
:pullreq: 1282

**Date**: 2024-09-04

Title:
Latest OS-HPXML

Description:
For hot water end uses OS-HPXML now directly uses equations from https://www.fsec.ucf.edu/en/publications/pdf/fsec-pf-464-15.pdf, that are a function of number of occupants, for operational calculations.

OpenStudio-HPXML: `pull request 1761 <https://github.com/NREL/OpenStudio-HPXML/pull/1761>`_

Assignees: Joe Robertson


.. change::
:tags: workflow, plug loads, feature
:pullreq: 1298

**Date**: 2024-09-24
**Date**: 2024-12-3

Title:
Latest OS-HPXML
Add heat pump pool heaters

Description:
For TV plug loads, we are now using OS-HPXML defaults that directly use equations from RECS 2020 that are a function of number of occupants and conditioned floor area.
For operational calculations in general, we are also updating the relationships between number of bedrooms/occupants based on RECS 2020 and disaggregated by building types.

OpenStudio-HPXML: `pull request 1690 <https://github.com/NREL/OpenStudio-HPXML/pull/1690>`_, `pull request 1775 <https://github.com/NREL/OpenStudio-HPXML/pull/1775>`_
Add heat pump pool heaters to baseline.

Assignees: Joe Robertson


.. change::
:tags: workflow, hvac, feature
:pullreq: 1254

**Date**: 2024-09-218

Title:
Heating and Cooling Unavailable Days

Description:
The purpose of this PR is to account for dwelling units whose HVAC system (heating/cooling) is unavailable for some number of days during the year (per RECS 2020).
Specifically, this PR modifies HVAC heating/cooling seasons using number of unavailable days and BAHSP definition for heating/cooling months.
resstock-estimation: `pull request 436 <https://github.com/NREL/resstock-estimation/pull/436>`_

Assignees: Joe Robertson
Assignees: Janet Reyna

.. change::
:tags: workflow, feature
Expand Down
1 change: 1 addition & 0 deletions docs/read_the_docs/source/changelog/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Changelogs
.. toctree::
:titlesonly:

changelog_3_4_0
changelog_3_3_0
changelog_3_2_0
changelog_3_1_1
Expand Down
Loading

0 comments on commit d888168

Please sign in to comment.