-
Notifications
You must be signed in to change notification settings - Fork 17
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.
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
Add unmet water heater loads EMS program #1502
Open
jmaguire1
wants to merge
97
commits into
master
Choose a base branch
from
unmet_wh_loads
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 88 commits
Commits
Show all changes
97 commits
Select commit
Hold shift + click to select a range
6335d24
Add unmet loads EMS program
jmaguire1 e70d0e9
busted by rubocop :)
jmaguire1 23381f8
First cut at setting up annual unmet water heating loads.
joseph-robertson ddc558c
Merge branch 'master' into unmet_wh_loads
joseph-robertson dffe6f6
Wrong direction for sag calculation
jmaguire1 92c0e97
Some updates to break out showers from "fixtures"
jmaguire1 4aa4a0c
One more change towards adding showers back in
jmaguire1 ec8cef2
Add shower column to constants
jmaguire1 9d3b025
Fix shower schedules for smooth occupancy
jmaguire1 7658e4f
Still in progress, but: working on restructuring the calculation base…
jmaguire1 6a8b015
Working again. Still needs some cleanup and review
jmaguire1 44c4c61
Merge remote-tracking branch 'remotes/origin/master' into unmet_wh_loads
jmaguire1 c59eaec
Add to changelog, fix merge conflicts, rubocop
jmaguire1 6d68919
Fix some typos
jmaguire1 a58dcbf
rename constant for consistency with schedule:file
jmaguire1 04b94ad
Major refactor of the unmet WH load calculation
jmaguire1 227138e
Fix unmet energy calc (incorrectly passing shower peak flow rate)
jmaguire1 e250890
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
jmaguire1 caae214
remove print statement, rubocop
jmaguire1 2bae66b
Update some output variable names, add showers to unavailable_periods…
jmaguire1 3044382
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
jmaguire1 0379ace
Bit of code cleanup and adding FIXMEs to address.
joseph-robertson 70a9868
Oops, showers_schedule_obj does get used.
joseph-robertson 015383e
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
jmaguire1 a58ada4
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
jmaguire1 6421080
oops, missed one update in the merge
jmaguire1 c4239f0
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
jmaguire1 258c28f
Remove total shower time, only output unmet shower time (in hours) an…
jmaguire1 921a0f0
oops, missed removing shower time in one spot
jmaguire1 dc3a752
Some fixes for unmet showers with multiple WHs.
jmaguire1 d513cf4
Clean up EMS a bit, change hot water usage be 0 during outages (helps…
jmaguire1 309714c
This should actually exclude solar storage tanks from 2 tank systems,…
jmaguire1 8ed29e1
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit 1641ec1
Bugfix.
shorowit 6e63c6c
tasks.rb update_hpxmls
shorowit ca76f23
Some more fixes/cleanup.
shorowit 11d46ea
Bunch of cleanup and test updates.
joseph-robertson 6b630e8
Try a sample file with undersized tank water heater.
joseph-robertson 47a60a4
Remove warning for both shower schedule types provided.
joseph-robertson b22a027
Update reporting measure with include argument for unmet loads timese…
joseph-robertson 51dbd2e
Update reporting measure test for unmet loads outputs.
joseph-robertson 32fdfdd
Update run_simulation with unmet loads timeseries request option.
joseph-robertson 6def768
Start updating the docs.
joseph-robertson f0d68ea
Update the changelog entry.
joseph-robertson 7e939bc
Few more fixes and updates.
joseph-robertson 1daadab
Fix comments. [ci skip]
joseph-robertson 1737481
Catch target water temperature warnings for new dhw undersized sample…
joseph-robertson f28fceb
Minor fix to ems program.
joseph-robertson 44a980a
Update the docs. [ci skip]
joseph-robertson e6b6ee0
Spaces in ems program and exceptions for 10x checks.
joseph-robertson 7d96e30
Latest results.
e36fd4e
Change energy annual units to kBtu and timeseries units to Btu.
joseph-robertson 3b38d32
Relax expected results for dhw-undersized.
joseph-robertson b55a993
Updates due to output name change.
joseph-robertson d8f0bc2
Latest results.
20449e9
Clean up loop that finds appropriate tank.
joseph-robertson 624bfd6
Add sample files for undersized tankless, heat pump, and multiple.
joseph-robertson e572c5f
Refactor unmet loads program for multiple water heaters.
joseph-robertson f75b4e3
Clean up expected warnings and checks.
joseph-robertson 0fee44d
Typo.
joseph-robertson 4a7a1d1
Expect err and run log warnings.
joseph-robertson bb41452
Latest results.
b0ad6ab
Change shower draws to be a % of fixtures (if smooth profiles) based …
jmaguire1 d70bbe1
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit 3d506df
Merge branch 'master' into unmet_wh_loads
joseph-robertson 593d488
Try WarmupFlag in program to avoid counting first timestep.
joseph-robertson c5e21b8
Add unmet loads method for building-level EMS program.
joseph-robertson 992fdb2
Merge branch 'master' into unmet_wh_loads
joseph-robertson a0288de
Skip building-level EMS program if no water heating systems.
joseph-robertson 169617f
Try changing unit multiplier tolerances.
joseph-robertson 5f5cc93
Latest results.
45b6200
Merge branch 'master' into unmet_wh_loads
joseph-robertson 6f364b1
Latest results.
2177b8a
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
jmaguire1 0c8732a
Oops, messed this up in merging. Might still have to fix one or two m…
jmaguire1 966f0b8
Update unmet shower program to account for latest OS-HPXML changes
jmaguire1 354360a
Go back to more generic unmet loads program (rather than unmet shower…
jmaguire1 773ae8b
missed one "." to "::" for stochastic showers
jmaguire1 7c878ea
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
jmaguire1 41105c5
Fix schedules tests to match latest OS-HPXML updates
jmaguire1 1a905c7
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
jmaguire1 a529822
Latest results.
9cccccf
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit 85145ed
Latest results.
2b5c158
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit cb8ecd8
Latest results.
2aff460
Merge branch 'master' into unmet_wh_loads
joseph-robertson 442bd58
Updates to sample files and reported outputs.
joseph-robertson 07c650b
Merge branch 'master' into unmet_wh_loads
joseph-robertson 6bc29d5
Clean up new methods and fill out TODOs.
joseph-robertson 82e0153
Get name of the schedule, not the object.
joseph-robertson 42169b2
Avoid divide by zero when no dhw.
joseph-robertson afadd97
Merge branch 'master' into unmet_wh_loads
joseph-robertson d1db089
Update reporting measure descriptions and tests.
joseph-robertson 0a7ba8a
Revert stuff in workflow tests util file.
joseph-robertson 1224612
Update the docs. [ci skip]
joseph-robertson 52e9681
Latest results.
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Need a better description.