Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add unmet water heater loads EMS program #1502

Draft
wants to merge 30 commits into
base: master
Choose a base branch
from
Draft

Add unmet water heater loads EMS program #1502

wants to merge 30 commits into from

Commits on Oct 4, 2023

  1. Add unmet loads EMS program

    @jmaguire1
    jmaguire1 committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    6335d24 View commit details
    Browse the repository at this point in the history

  2. busted by rubocop :)

    @jmaguire1
    jmaguire1 committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    e70d0e9 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. First cut at setting up annual unmet water heating loads.

    @joseph-robertson
    joseph-robertson committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    23381f8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into unmet_wh_loads

    @joseph-robertson
    joseph-robertson committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    ddc558c View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Wrong direction for sag calculation

    @jmaguire1
    jmaguire1 committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    dffe6f6 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. Some updates to break out showers from "fixtures"

    @jmaguire1
    jmaguire1 committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    92c0e97 View commit details
    Browse the repository at this point in the history

  2. One more change towards adding showers back in

    @jmaguire1
    jmaguire1 committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    4aa4a0c View commit details
    Browse the repository at this point in the history

  3. Add shower column to constants

    @jmaguire1
    jmaguire1 committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    ec8cef2 View commit details
    Browse the repository at this point in the history

  4. Fix shower schedules for smooth occupancy

    @jmaguire1
    jmaguire1 committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    9d3b025 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Still in progress, but: working on restructuring the calculation base… 

    …d on some discussions with Joe. Still need to connect the EMS sensor for WH outlet temperature.
    @jmaguire1
    jmaguire1 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    7658e4f View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Working again. Still needs some cleanup and review

    @jmaguire1
    jmaguire1 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    6a8b015 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'remotes/origin/master' into unmet_wh_loads

    @jmaguire1
    jmaguire1 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    44c4c61 View commit details
    Browse the repository at this point in the history

  3. Add to changelog, fix merge conflicts, rubocop

    @jmaguire1
    jmaguire1 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    c59eaec View commit details
    Browse the repository at this point in the history

  4. Fix some typos

    @jmaguire1
    jmaguire1 committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    6d68919 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. rename constant for consistency with schedule:file

    @jmaguire1
    jmaguire1 committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    a58dcbf View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Major refactor of the unmet WH load calculation

    @jmaguire1
    jmaguire1 committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    04b94ad View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Fix unmet energy calc (incorrectly passing shower peak flow rate)

    @jmaguire1
    jmaguire1 committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    227138e View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int… 

    …o unmet_wh_loads
    @jmaguire1
    jmaguire1 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    e250890 View commit details
    Browse the repository at this point in the history

  2. remove print statement, rubocop

    @jmaguire1
    jmaguire1 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    caae214 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Update some output variable names, add showers to unavailable_periods… 

    ….csv
    @jmaguire1
    jmaguire1 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    2bae66b View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int… 

    …o unmet_wh_loads
    @jmaguire1
    jmaguire1 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    3044382 View commit details
    Browse the repository at this point in the history

  2. Bit of code cleanup and adding FIXMEs to address.

    @joseph-robertson
    joseph-robertson committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    0379ace View commit details
    Browse the repository at this point in the history

  3. Oops, showers_schedule_obj does get used.

    @joseph-robertson
    joseph-robertson committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    70a9868 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int… 

    …o unmet_wh_loads
    @jmaguire1
    jmaguire1 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    015383e View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int… 

    …o unmet_wh_loads.

Attempt #1 at fixing all the conflicts
    @jmaguire1
    jmaguire1 committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    a58ada4 View commit details
    Browse the repository at this point in the history

  2. oops, missed one update in the merge

    @jmaguire1
    jmaguire1 committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    6421080 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int… 

    …o unmet_wh_loads
    @jmaguire1
    jmaguire1 committed May 14, 2024
    Configuration menu
    Copy the full SHA
    c4239f0 View commit details
    Browse the repository at this point in the history

  2. Remove total shower time, only output unmet shower time (in hours) an… 

    …d unmet shower energy
    @jmaguire1
    jmaguire1 committed May 14, 2024
    Configuration menu
    Copy the full SHA
    258c28f View commit details
    Browse the repository at this point in the history

  3. oops, missed removing shower time in one spot

    @jmaguire1
    jmaguire1 committed May 14, 2024
    Configuration menu
    Copy the full SHA
    921a0f0 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Some fixes for unmet showers with multiple WHs. 

    Still need to develop a few new test cases (since unmet loads is basically always expected to be 0 with smooth profiles, and that's especially true with multiple WHs) and do some testing for 2 tank SHWs (to exclude calculating unmet showers from the storage tank before the backup WH)
    @jmaguire1
    jmaguire1 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    dc3a752 View commit details
    Browse the repository at this point in the history