-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed 'hpxml-measures/' changes from e29d955f19..426260c958
426260c958 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hers_sizing_methodology 8faaceebf8 Minor cleanup of docs/changelog. [ci skip] 4a58f367ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hers_sizing_methodology 0d5fe88fee A little code simplification/refactoring. No diffs expected. ef7fc41102 Latest results. 650c0ad021 Merge pull request #1791 from NREL/battery-unavailable-periods 775eb0f9ef Battery charging and discharging is unavailable during an outage whether solar present or not. df4a4f8fea Merge branch 'master' into battery-unavailable-periods 2c47fdd2f2 Catch warning for scheduled battery with outage period. 5d4c5b90f5 Revert adding battery schedules to unavailable_periods.csv. b55992149a Merge branch 'master' into battery-unavailable-periods a3f40fb687 Latest results. 91dda9a2d4 Downgrade error to a warning. 041f154fa5 Merge branch 'master' into battery-unavailable-periods 25a1c1dccc Latest results. 7e32f7cd34 Update used_by_unavailable_periods attrs. 0850d26fe9 Add battery charging and discharging to unavailable_periods.csv. fd8f6ec794 Demonstrate failing battery with unavailable period sample file. git-subtree-dir: hpxml-measures git-subtree-split: 426260c9585413ec80c6c6c276ef73c68b5e6346
- Loading branch information
Showing
15 changed files
with
805 additions
and
309 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,3 +33,5 @@ house_fan,0,1 | |
kitchen_fan,1,1 | ||
bath_fan,1,1 | ||
whole_house_fan,0,1 | ||
battery_charging,0,1 | ||
battery_discharging,0,1 |
Large diffs are not rendered by default.
Oops, something went wrong.
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.