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.

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

docs badge points to master version #409

Merged
merged 3 commits into from
Feb 24, 2020
Merged

docs badge points to master version #409

merged 3 commits into from
Feb 24, 2020

Conversation

joseph-robertson
Copy link
Contributor

Addresses #[issue number here].

Pull Request Description

[description here]

Checklist

Not all may apply:

  • Unit tests have been added or updated
  • All rake tasks have been run, and pass
  • Documentation has been modified appropriately
  • Any new options are added to project_testing
  • project_testing runs without any failures
  • No unexpected regression test changes
  • All tests are passing (green) on circleci
  • The changelog has been updated appropriately
  • This branch is up-to-date with master

For more information on how to perform these checklist items, see the documentation's Advanced Tutorial.

@joseph-robertson joseph-robertson added this to the ResStock v2.3.0 milestone Feb 21, 2020
@joseph-robertson joseph-robertson self-assigned this Feb 21, 2020
@joseph-robertson joseph-robertson marked this pull request as ready for review February 21, 2020 23:35
@joseph-robertson joseph-robertson merged commit 700d97b into master Feb 24, 2020
@joseph-robertson joseph-robertson deleted the badge-update branch February 24, 2020 21:54
joseph-robertson added a commit that referenced this pull request Jun 15, 2020
dc012fbc3b Add roof material and wall siding type arguments.
43d3cf10d8 Add back in geometry, constants methods.
915adb5889 Merge branch 'master' into build-res-hpxml-v3
5f671d70e1 Fix some class names.
357296ca42 Use compact dishwasher in test file.
b9cfb83b3f Merge pull request #390 from NREL/hvac_sizing_refactor
fd9293e476 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_refactor
671fc5b4f0 Merge pull request #375 from NREL/wh_refactor
08f5e6c242 Oops, not for combi systems.
5ea7fd14f0 Pull code back out of hpxml_defaults.rb.
b2576b2b6c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh_refactor
0caa2761ef Normalize the crankcase power by the fraction load served. If there’s a single system, it will behave as before; if there are multiple systems, it will scale down (by the fraction load served, which should scale similarly to capacity).
37fb8c0493 Merge pull request #418 from NREL/140update
35d00da3c4 Minor changes for ASHRAE 140 test files.
33fd2fd7c1 Moves a bit more code out of measure.rb. Relocates some methods in waterheater.rb so that all apply_foo methods are at the top.
5726bc1c2f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh_refactor
59d4f1dc67 Merge pull request #416 from NREL/os_warnings
a2f4483b57 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_warnings
1c5333255f Addresses OpenStudio warnings.
c8d099c3b6 Merge pull request #415 from NREL/cond_bsmt_ceiling
88b0490b77 Update XML.
1286e94758 Remove debug.
c16c70a5df Switch to modifying a single test file.
fc575e7e49 Bugfix for a file w/ a conditioned basement ceiling, where an incorrect outside boundary condition was being set. Added check for warning in eplusout.err file.
5a7db007f2 Fix test.
980678469a Merge pull request #412 from NREL/interior_windows
40d5e7db18 Merge branch 'master' into build-res-hpxml-v3
2a4f0490ef Update test file to include interior window.
e92869ee52 Update docs. [ci skip]
b4293bb648 Fix window height when there are overhangs.
fd543a20f3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into interior_windows
dd113622e7 Merge pull request #411 from NREL/v010
8a9c510447 Models interior windows as doors to workaround E+ limitations (with the exception of windows on adiabatic surfaces, which are ignored like doors).
0fa44ccbfd Merge pull request #410 from NREL/appliance_error_checking
f4f50cac21 Add a couple examples. [ci skip]
4bf9e8d9e9 Add Scope and Input Defaults sections to the docs. [ci skip]
05663fd1c6 Bump to version 0.10.0.
31bdbf3ca0 Remove constraint.
2eeb432637 Change from an error to a warning based on feedback.
93588ab86f Some cleanup.
8aa07c2e95 Small bugfix to clothes washer NCY for pre-2019A.
94e6feab22 Adds appliance error-checking for negative calculated energy use or hot water use.
464fe564b9 Merge branch 'master' into build-res-hpxml-v3
b443fe771a Oops. Fix XML.
390478c0e1 Merge pull request #409 from NREL/combined_infil_mech_vent
c21c24a319 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into combined_infil_mech_vent
74b6fe9271 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh_refactor
2f7dadae9d Removed some unused EnergyManagementSystemGlobalVariables, spotted by Yueyue. Converted two identical local sensors to a global sensor.
c08a46f0b6 Changes how infiltration and mechanical ventilation are combined, per ASHRAE 62.2-2016/19, Appendix C.
e8237c6ff3 remove propane test
362a12b60e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh_refactor
4489df2460 Minor docs update.
7a5a078d31 Misc code cleanup.
64db0c8319 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_refactor
eccb5e2ded rake, bugfix
f2c8cacb2c merge master into wh_refactor, conflict resolved
a7bb1a7abd Bugfix.
1e0f4efad7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_refactor
3afdcfd147 Bugfix.
17be6c444a A little cleanup.
a0d32672d1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_refactor
28598d644b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_refactor
098daf0309 address some issues
b71acb4951 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_refactor
e1a1053ccc Bugfix.
243db3c149 Merge branch 'additional_duct_locations' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_refactor
3afa3ed905 Merge branch 'additional_duct_locations' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_refactor
f2e1df9638 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_refactor
cfd1e60294 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_refactor
4d118876d6 Bugfixes.
d8d794cb3c switch to test gpd
56b4c1ca53 Update exterior surface area in compartmentalization_boundary_areas to exclude additional space types. [ci skip]
f0fccf8a14 add appliance tests
49db84d158 A couple bugfixes.
f6fbe79642 Bugfixes.
d384e701f7 Updated schema.
975a268e01 Update sample files.
f843700d06 Address "Very small surface area" warnings in eplusout.err.
e4ff9af09b More cleanup.
04fd84a64e Bugfix and some more progress.
f4efd14e84 Bugfix.
8ba183a1ac First pass.
49fe47b79e bugfix in merging
1877682afe Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh_refactor
ee58f671f1 bugfix
41c9415660 some more cleanups
6f3ff88c6c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh_refactor
7b2c972fb4 Merge branch 'wh_refactor' of https://github.com/NREL/OpenStudio-HPXML into wh_refactor
d82f9727e8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh_refactor
e7787f1d9b Removes some code that's no longer needed.
a5d93fed4a more cleanups and unit tests added
9e394e2120 default tank height
4310563b85 hpwh refactor
f4c47191fb bugfix + update_measures
83dae66e23 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh_refactor
420119fc9c hot_water_appliance cleanup
12f557a4ca progress
194207127e wh_test added, not completed yet
92eff7a625 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh_refactor
1e6f4d2a12 revert test
a20d6d3fc6 wh cleanup

git-subtree-dir: resources/hpxml-measures
git-subtree-split: dc012fbc3b536675bff0963399933c5059cd9bd7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants