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

ANSI 301-2022 #701

Merged
merged 137 commits into from
Feb 8, 2024
Merged

ANSI 301-2022 #701

merged 137 commits into from
Feb 8, 2024

Conversation

shorowit
Copy link
Collaborator

@shorowit shorowit commented Dec 18, 2023

Pull Request Description

First batch of changes.

Checklist

PR Author: Check these when they're done. Not all may apply. strikethrough and check any that do not apply.

PR Reviewer: Verify each has been completed.

  • OS-HPXML git subtree has been pulled
  • 301/ES rulesets and unit tests have been updated
  • 301validator.xml has been updated (reference EPvalidator.xml)
  • Workflow tests have been updated
  • Documentation has been updated
  • Changelog has been updated
  • openstudio tasks.rb update_measures has been run
  • No unexpected regression test changes on CI

bddcef9920 Prep for ANSI 301-2022.

git-subtree-dir: hpxml-measures
git-subtree-split: bddcef9920bea4ab8c95fdaca4fe7fb7f1423b66
@shorowit shorowit self-assigned this Dec 18, 2023
shorowit and others added 27 commits December 18, 2023 16:08
85b40864fe Update Qinf=f(NL) equation.

git-subtree-dir: hpxml-measures
git-subtree-split: 85b40864fe07fc686a25e97681e3268f6fd93cf5
fe3dc91a5c Update default CFIS fan power. Fix ANSI 301 links in docs.

git-subtree-dir: hpxml-measures
git-subtree-split: fe3dc91a5c7a4f06bf8ccd77b6fe2f3a40e637d8
25cade3703 Latest results.
6a137735c6 Remove natural ventilation RH constraint to comply with ANSI 301-2022; HR constraint is still in place.

git-subtree-dir: hpxml-measures
git-subtree-split: 25cade3703433e6d7fffb010b0428ffc69967174
cb3775f586 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022
87ba6d0cf5 Merge pull request #1473 from NREL/radiant_barrier
bcf848a4df Add breaking change to changelog [ci skip]
65f172033e Add/update tests.
eab74e0f7e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into radiant_barrier
c9e7f3d389 Merge pull request #1574 from NREL/geothermal_loop_config
3dd1707320 Throw a warning, and skip adding geothermal loop, if no gshp.
96c0bd1cab Update workflow/hpxml_inputs.json.
47b312551f Update build measure readme and measure xml.
30bd5bfa45 Make geothermal_loop_configuration optional.
70b0745193 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into radiant_barrier
0b6477011e Latest results.
4a9e1b2d5a Updates
e22b6bc483 Updates
3f29833aab Merge branch 'radiant_barrier' of https://github.com/NREL/OpenStudio-HPXML into radiant_barrier
ad604ccafd Add comments, update docs.
bfc33cdd19 Latest results.
9ee626d541 Reorder args.
fc064d95e0 tasks.rb update_measures
376d104ad5 Merge branch 'radiant_barrier' of https://github.com/NREL/OpenStudio-HPXML into radiant_barrier
0c89398ae8 BuildResHPXML measure: Make logic consistent between roof/wall/floor. Remove radiant_barrier arg since we are making breaking changes (renaming args) anyway.
0fd4dd1fdb Latest results.
5ab3897578 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into radiant_barrier
dcbefdbaa0 Dust loading emissivity reduction of attic floor radiant barrier implemented through materials.rb
7ba4e67402 Latest results.
d282413349 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into radiant_barrier
254babad5d Fix CI error
318e4d256a Merge branch 'master' into radiant_barrier
84bfc754cb Revert ignore file and commit new sample files.
0a6a3c9d0b Remove location hpxml element from docs.
0d23186d1f Update build arg default value and clean up hpxml_inputs.json.
95bc1701a7 Update radiant barrier arg names in build test file.
d5f387e38b Updates.
132ed42f30 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into radiant_barrier
07a0280a22 Updates.
2193ed6232 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into radiant_barrier
6d7baaa5d7 Adding radiant barriers only when adjacent to vented or unvented attics.
d9b023e43d Temporary commit.
fdeab31f07 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into radiant_barrier
ea309fbc9e Gitignore update.
439cd98b96 HPXML sample file generation updates.
82496f2e11 HPXML creation updates.
bc944b11d3 Fix var name in roofs method.
29dff2b28e Temporary commit.
0217967733 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into radiant_barrier
5b4f1f7d19 Not working yet. Temporary commit for review
28e86d0528 Latest results.
e6e2531f97 Updates.
179ea11a90 Inputs documentation updated.
1a4819ad30 Updates to hpxml.rb
b95b5ba222 Unrelated file removed.
a1c85f11ea Schematron additions.
03942a5624 Initial commit

git-subtree-dir: hpxml-measures
git-subtree-split: cb3775f586a3b90ef2a00dde3c0d0dd681ad92a1
 into ansi_301_2022

# Conflicts:
#	hpxml-measures/HPXMLtoOpenStudio/measure.xml
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations1.csv
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations1_bills.csv
67848fe81e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022
93c1313799 Merge pull request #1582 from NREL/mains_above_freezing
087a7e3833 Minor rewording [ci skip]
69d5321afb Merge branch 'master' into mains_above_freezing
fd98da1711 Update changelog with bugfix
83d8f84663 rubocop
ba318367b5 Fix for mains temperature going below freezing.
2601c24cec Merge pull request #1580 from NREL/update_pv_test
aea9901664 Latest results.
6c6424587e Update PV test expected value for 2024.
a9d0011a12 Latest results.

git-subtree-dir: hpxml-measures
git-subtree-split: 67848fe81e8f79b2897fda76fbb6469fa01f80c9
 into ansi_301_2022

# Conflicts:
#	hpxml-measures/HPXMLtoOpenStudio/measure.xml
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations2.csv
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations2_bills.csv
c102844ee2 Oops.
d6d594c8e8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022
b0f18ace10 Merge pull request #1585 from NREL/suppress_test_warnings
a57f098ebd Use Fatal to suppress 'Cannot find current Workflow Step' error messages. Apply to all tasks in tasks.rb. Some cleanup.
323632e6b9 Switch to error log level.
20addaabfe Suppress warnings when running tests.
513acded4f Latest results.
ce3851566e Merge branch 'master' into ansi_301_2022
96232517d2 Merge pull request #1575 from NREL/test-schedules
c5cd9b7762 Latest results.
526f4afb8c Some minor cleanup.
1d9921002d Merge branch 'master' into test-schedules
16f1d1193c Update stochastic schedule tests to use new method.
87ebb787cd Add new period_equivalent_full_load_hrs method.
0ffa086948 Merge pull request #1579 from NREL/n_units_in_bldg
6eea9f16fa Remove unused import.
bdbf9cd0de Latest results.
53a4ecd49c Hardcode expected values for stochastic schedule tests.
b5e6ad3fc0 Update Changelog.md [ci skip]
56dee0bb9d Merge branch 'master' into test-schedules
783dd0601f update hpxmls
45041fdad3 Merge remote-tracking branch 'origin/master' into n_units_in_bldg
75581a521a change to optional input
6f5faeaa3a fixing merge conflict, update measures
be760fd7c2 Merge remote-tracking branch 'origin/master' into n_units_in_bldg
76512bc4d9 update measures
45d54adaa4 Merge remote-tracking branch 'origin/master' into hes_translator
a33b986563 Simplify stochastic schedule tests.
491c808553 Tighten tol and update tests in stochastic test file.
c5fe1d55f9 Set tolerances and update schedule tests.
0851b23802 Support constant schedule in flh simple schedule method.
feac36d746 Use interior lighting obj name with get_schedule.
531518c901 Need to map new lighting interior multipliers to floats.
abcf19b4de Try a more accurate method for comparing equiv full load hrs.
b4f9ed49df Merge commit '2e2e8a1c26d45d6e916b6d476470a05394dc93b8' into os_hpxml_v170
a0d58871ac Merge commit 'd000744440a779bada23d2b3eedfd5118fb1ed5d' into os_hpxml_v170
5927e91282 Merge commit '4fcb8d755577e9edcd8ac5fc5bf28f7e6d1ef7b9' into os_hpxml_v170
74eea631eb Merge commit '793a455c21d8c42bab1a646ac4d3c4353849a677' into os_hpxml_v170
f8d5a1d925 Merge commit '075f7f014f1c47dcc89659453d749ceebcef30b2' into os_hpxml_v170
370234988c Merge commit 'a697ad813d4298a5d88a6b70ee796ed84de24f6d' into os_hpxml_v170
e652a90657 Merge commit 'c3a60431d780e5ce39ee91d5404681ec760a6819' into os_hpxml_v170
8dbcc13f70 Merge commit 'e5124cb5df2be6fb7a05f7945da5468743d29fd8' into os_hpxml_v170
1925691738 Merge commit '72906f74cc4a10423b86b824a6b91185ff308c48' into os_hpxml_v170
d17d47cd18 adding NumberofUnitsInBuilding to generated HPXML file for HEScore translator
493256168e flake8 linting
c203801c87 Merge remote-tracking branch 'origin/master' into hes_translator
d1a82e4e8b Merge commit '8b888325c38d3ca233c509816bb889ef8145cd40' into mobile_home_belly_ducts
504d7044c1 Merge commit '1d8b333b681cd1ef9ed46ba232540866b1c061ff' into mobile_home_belly_ducts
87bad73bee Merge commit 'bef79cc7526058de9c2b135a247ca9e9a1e48ff2' into mobile_home_belly_ducts
e0de9cf00d Merge commit '52ac1c10565bba7d2c147b848e2b6121fd57bdad'
ac3ce0adbb Merge commit 'f1de0ca1dd5c8209a678811ee843edda9321a9c3' into os350
847867f88d Merge commit '02ea46a15703e08fa7b532a9acd722801f35c1c0' into os350
dad6a23f62 Merge commit '9b8cb11fbaa8dac9290e87a0ec9c2263e5456342' into os350
aaa7a77e34 Merge commit '761272701a19e1d34316d8adc8fb000cbfad06f4' into os350
72e9b93e71 Merge commit '86b0d1b07ce572b8604305632a48171abe9062e2' into os350
18ff395c00 Merge commit '9b0aca6b71f23bc7edce5c29dded1455289a8028' into os350
d46e85abab Merge commit 'ad5d51709461402afa322bbfe3493593da4b5238' into os350
08c4f7c7cd Merge commit 'ccce0a13e4b4d26a7bdee527c5dda1704e43e4c8' into os350
c5cc820715 Merge commit 'c6ebbe06d7cd06c342419cd57af94065d4ca0aaa' into os350
143e70037c Merge commit '04aa51b1bef7733ad275db9f89070831e12f4d09' into os350
a3fac0d92e Merge commit '758b66540420e898626cb047b4986e96e56e1052' into os350
5d49597427 Merge commit '3e82e6d9ecfe6692b761dc9fd0f1b1627d573973' into os350
e8d35b5a3b Merge commit '02f8d99ddc2086655c0a69a7b2065db42dc8f996' into os350
82f266d835 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os350
8efa065ada Merge commit 'd588224825b420d5518a11676e26939e9c4adeec' into os350
4fb9772fed Merge commit '79e3614006dd6e32a198bd03f3d78cc2c9878dbb' into os350
02dabd2b04 Renames "total_{fuel}" to "utility_{fuel}". Removes PV generation from total_site_energy. Disaggregates "utility_generated" from "utility_electric".
f4ce9758df Increase annual output sig figs.
b39f632b42 updating measures
bf1ade1410 Merge branch 'master' into os350
ee538ec470 Merge commit 'aec8822bfc1aba570ecf373719eef836ae5e51c9' into os350
bff8884484 Update unit tests to use HPXML class.
8d34f58d3c address comments
17840a2057 add new json regression file to auto generation, update jsons and update measures
cf2fe9024a hvac replacement applied to both heating and cooling. CI test changed to only run upgrades to three regression files
d350967928 Merge commit 'e8f8cad4e5fe738e5a72932234f8185b7c73c659' into os350
3d7015e731 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os350
6d8c421a71 Merge commit '834f7a6c620b841bd8fed995e423a5f4e068ee51' into os350
ec7441a21d Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into upgrades
114454d996 Revert "Revert "OpenStudio 3.5.0 (EnergyPlus 22.2)""
47da78d3c4 Revert "OpenStudio 3.5.0 (EnergyPlus 22.2)"
18ffdc9dcb Merge remote-tracking branch 'origin/os340' into hes_translator
681e8efda9 Merge commit '1b3a8a4ba3f9db0db339a6c8c17b485ab49b3af8' into os340
f4c8f5c9df Merge commit 'ab427db88d961b8446e2d25ee46958595d3c495c' into os340
758497e748 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into upgrades
d6041283d6 Merge remote-tracking branch 'origin/os340' into hes_translator
940fe3c7ac Merge commit '67e7b97d71e9f635230d978c07553f7a6b8a50cf' into hes_translator
6f7d366549 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os340
61f5c0daf5 Merge commit 'd88c7a8e72c55680c8686b8f5611baca2fb38209' into os340
01e367fa62 Merge commit '379215b331e74a9d0dcf4c76e6e21a6dcd7a827b' into os340
0180299995 Merge commit 'c45440f74cb2cc30d526c0af9412c5fc23ecaf3c' into os340
6bc07ffc21 Use new Ducts ID based on https://github.com/hpxmlwg/hpxml/pull/350.
53eca3ba57 Merge commit 'f1ff834185ec58ed8028b0e3094c189283981cef' into os340
b9db311c28 Some bugfixes and code refactoring.
d386c52518 First pass.
e41f7ae2e9 Merge commit '76e0554c33172b53558cb98c4322c2525726e2e7' into os340
2cd1f0aeed Merge commit 'e49ab2992b700271c0de187699494a7203ed5809' into os340
4e14f3fbfc Merge commit '4130980aada4a4a3c04e68a39800c236f25a4976' into os340
3510f86fd8 Merge commit '8cc8c6444afabc5ab14c53f9c42726ea23aa99fd' into os340
1a7057c03b Merge commit '15360aeb0c25ebafd5c55e24ef34cafb17976e99' into os340
4cdf53100b Merge branch 'reporting_measure' of https://github.com/NREL/OpenStudio-HEScore into hes_translator
0f9e6b0bc0 Merge commit '0dc4c95b51d94b976a918ebf77e764bfa7f430fa' into os340
3ec6646ee7 Merge commit '5d78b800ae2e4a9d825e71ce8eea00d56a26d6e6' into os340
a8e07c1c8b Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os340
e3b290f45e Merge commit 'a54b70ce331406277a9ea498c4133a565cd5ec19' into os340
3e6c5fd386 Merge commit '03e12780581da0d521ce2b87a0de79a1d29bb12f' into os340
ed3051cff4 Merge commit '6b116b879009c6c7ef4a0ae6b4f6d05987260209' into os340
8adc986bf9 run update_measures
33b815f58b Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os340
4a73d15a81 Backport a couple HVAC model changes from OS-HPXML v1.4.
c4120fe600 Merge commit 'cbf7d1987068ebb997ff4df0350cb77538986bb4' into os340
5852a69765 Merge commit '1b08e5bef17e4a6fc16a17d9e49e75ed59d889b5' into os340
143149d83a Merge commit '8211f2a99b0f2067127b8a1604d5af300ec511d5' into real_homes_mrt
d1cc979f45 Merge commit '0ea856d3f451096a6f80d553fa0f107bab2683ad' into real_homes_mrt
5987ebcb82 Merge commit '94c65f0014581b4c6256deaa79ab7f6cb0c110d6' into os340
5314015dd6 Merge commit '05f26b54c61e1bb700cab7ad53ff2bdc340c67f0' into os340
faecbe105b Bump to 3.4.0-rc1. Incorporate new Heat Pump Backup end use output.
cce13fee95 Merge commit 'b4897bb978b5157dc05ed9215013855eaaae93af' into os340
042cf642ff Merge commit 'e5c57a58c007b5bf1d9fcac7ea0f6c25bc27a8c9' into hes_translator
e5c57a58c0 Squashed 'hescore-hpxml/' changes from bfd035ddc..70a557974
15a239b38c Squashed 'hescore-hpxml/' changes from 644f8f8c..bfd035dd
8fe6bffa85 Squashed 'hescore-hpxml/' changes from 681cd58d..644f8f8c
5a03ea2065 Squashed 'hescore-hpxml/' changes from 8cb53554..681cd58d
31a8bf5321 Revert "revert call to translator"
2e44809233 fix incorrect class name
0b547ab057 revert call to translator
3b9c8ca707 Merge commit 'ffcc96f0d73399c4a4b2562e9c57fbff43816ae7' into os340
87cb9c4522 test translate measure using only resstock-generated hpxmls
910f4519a7 Merge commit '1627c0289e7c7cd0f8459556d6f3b98d6962cf2c' into hes_translator
1627c0289e Squashed 'hescore-hpxml/' changes from e6625ab31..258df06ea
aaae4517d5 Merge branch 'hes_translator' of https://github.com/NREL/OpenStudio-HEScore into hes_translator
13bb8efcb9 new test for HPXMLtoHEScore translator measure
b1670fd723 Merge commit '366d1685deacbfd3550fcec95831d4e7fc529947' into os340
a8550bb926 Merge commit '474cccf5e57f61bc5628d79eb7095dc55d648236' into os340
688269c2eb Merge commit 'ec7467433319897a18a916d09abed3e46fc52d2f' into os340
8b7995fd04 adding resstock hescore reporting measure
a990e8dde4 adding dockerfile for resstock-hescore
c036d23391 Merge remote-tracking branch 'origin/master' into hes_translator
28f984a369 Squashed 'hescore-hpxml/' changes from 07f55e92..e6625ab3
ba659db674 Merge commit '28f984a369cc3d2107b057cc7a043dc5ca622443' into hes_translator
c8d4c3e649 Merge pull request #340 from NREL/update_waterheater_ef_range
9a49da0b21 Merge commit 'e5cafccb91707044d3f45b701d933e6fe334d1db' into update_waterheater_ef_range
e5cafccb91 Squashed 'hescore-hpxml/' changes from 1f1d9bc9..8cb53554
ddb3004f2c calling python3.9
032f3c21fe Merge pull request #320 from NREL/knee_walls
128c4c64c8 Latest results.
3c8028f92e Merge commit '05c46f1d85a4cebc811f57f740c1273da5a36766' into knee_walls
05c46f1d85 Squashed 'hescore-hpxml/' changes from d554be8db..1f1d9bc94
d0dcee8f5c Merge commit '78c99c68b9dc15716cbad717eae5da41d3a94dfd' into hes_translator
78c99c68b9 Squashed 'hescore-hpxml/' changes from 693a2344a..07f55e922
da4658b11f Merge remote-tracking branch 'origin/master' into hes_translator
f60eb30022 Latest results.
b3fd66259c redeleting roof area
d771bced74 moving script to make knee wall R-values
ec565963c3 Merge remote-tracking branch 'origin/master' into knee_walls
500ed204fb Merge commit '5431674354df91d8265eea02dd5bd49d117daf1b' into knee_walls
5431674354 Squashed 'hescore-hpxml/' changes from 191807ab2..d554be8db
9e4b208756 Merge pull request #335 from NREL/increase_granularity_of_const_codes
47862d429f Squashed 'hescore-hpxml/' changes from 6a0dacd51..693a2344a
49909cb357 Merge commit '47862d429fafba261e786c242fd1173567a51937' into increase_granularity_of_const_codes
672672ddf5 Merge commit '047791ba962a032a8ee352294b06e485417b96e5' into hes_translator
047791ba96 Squashed 'hescore-hpxml/' changes from 7cdc7e67f..16fc24cae
47a25a3f29 update_measures
9c71e10c9b update_measures
01a5feaa74 update call to the translator
6f9757161f Latest results.
291a6e3bc8 Merge branch 'increase_granularity_of_const_codes' of github.com:NREL/OpenStudio-HEScore into increase_granularity_of_const_codes
8d8874306a Merge commit '0d5ed2acda53473a9d9e465d757d4ad7148074e4' into increase_granularity_of_const_codes
0d5ed2acda Squashed 'hescore-hpxml/' changes from ab5cd3a9..6a0dacd5
468f1cc37c Merge commit '375d052cdfdc30674c313c0564a7f853814cea1b' into increase_granularity_of_const_codes
375d052cdf Squashed 'hescore-hpxml/' changes from b1d0bf58..ab5cd3a9
7f16ce19cb Latest results.
2cdba322cc Merge commit '4b3244c2d83ab2a1a56940be7dfe1c5266e12fd1' into increase_granularity_of_const_codes
4b3244c2d8 Squashed 'hescore-hpxml/' changes from ac1b4d42..b1d0bf58
db4df5ea62 Squashed 'hescore-hpxml/' changes from 5f69767a2..7cdc7e67f
6798c336c2 Merge commit 'db4df5ea62e8cec96e6510961c03e4b6d5ddd49a' into hes_translator
dc938c440a Merge branch 'increase_granularity_of_const_codes' of github.com:NREL/OpenStudio-HEScore into increase_granularity_of_const_codes
3998255204 Squashed 'hescore-hpxml/' changes from 48b54c6a..ac1b4d42
35b129c059 Merge commit '3998255204f6cef4a8cbb155f8715faf55bc90ae' into increase_granularity_of_const_codes
2b9304d25b Latest results.
87fa515ceb Make use of lookups in hescore-hpxml
e71dbde292 Merge branch 'master' of github.com:NREL/OpenStudio-HEScore into increase_granularity_of_const_codes
e05f65b2ad Merge remote-tracking branch 'origin/master' into hes_translator
0f31410b5b Merge remote-tracking branch 'origin/master' into hes_translator
9caad9b3ef new HPXML to HEScore translator measure
4a7fc2b1ed merge fix
3d802dad49 merge fix
d8949e7c63 Merge commit '115eef5ca05a34acb7430ab28e38f1d94e0bc434' into hes_translator
d3e12067d8 Merge commit '115eef5ca05a34acb7430ab28e38f1d94e0bc434' into hes_translator
115eef5ca0 Squashed 'hpxml-measures/' changes from efb013fc6..85529c53a
72d213b1f0 Merge remote-tracking branch 'origin/master' into knee_walls
919f97dda1 Merge pull request #336 from NREL/pr_template
af7c32147b Revert "updating PR template"
4d21a2a9ac updating PR template
bc5c8fa01b update measures
c4275c163a Updates the PR template.
bd26060b5a Merge branch 'knee_walls' of github.com:NREL/OpenStudio-HEScore into knee_walls
1d339f093a updating test to also test knee wall assembly R-value lookup
9fb22c2737 Squashed 'hescore-hpxml/' changes from a8b1ffd35..191807ab2
f916c38cb7 Merge commit '9fb22c27376166945265e4ef6a2706d171eb5b8f' into knee_walls
e58cd329a9 removing references to cond_attic in tests
6af25535f5 Latest results.
2f442cb6c5 fixing regression json files
741fdb1541 Merge remote-tracking branch 'origin/master' into knee_walls
6db7beab93 Squashed 'hescore-hpxml/' changes from 5d2512af7..a8b1ffd35
a203a31bf0 Merge commit '6db7beab93191e1dfc2c10b240ecf6a4d302dab9' into knee_walls
b24eb5de5d Merge commit 'b40595439fc91049928b0ea35c792f3fc4f625d5' into increase_granularity_of_const_codes
b40595439f Squashed 'hescore-hpxml/' changes from 5f69767a..48b54c6a
a50fa7e9a7 Merge pull request #334 from NREL/latest-os-hpxml
2e0b7f9cd9 Latest results.
9bce08df76 Update location of HPXML schema.
c43c210089 Update location of HPXML schema.
f98744fddc Update measure xmls
ca7677079d Update for new measure arg.
aeccd5c4ec Merge commit 'f8f838834d0259d1c3214cbd60d46f7d98eaea07' into latest-os-hpxml
a1d84a210f Merge commit 'f8f838834d0259d1c3214cbd60d46f7d98eaea07' into latest-os-hpxml
f8f838834d Squashed 'hpxml-measures/' changes from efb013fc6..89ab5898e
dbda415c7c a few changes to knee wall assembly R-values
733e48dba2 adding R-13 to knee wall assemblies
de6dd03d98 Merge commit '7868fc24455328b643cef1c7585871d34daef934' into knee_walls
7868fc2445 Squashed 'hescore-hpxml/' changes from 5f69767a2..5d2512af7
29c6cae55c Merge remote-tracking branch 'origin/master' into knee_walls
b2d4d6a1e2 Merge pull request #327 from NREL/high-efficiency-heat-pump
244bceb18a Latest results.
17f6e5c49c fix
3fed6958ac Merge branch 'high-efficiency-heat-pump' of https://github.com/NREL/OpenStudio-HEScore into high-efficiency-heat-pump
8df1077925 simplify
6c31eb2bae add test files
fe46de5756 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into high-efficiency-heat-pump
c42400486d Merge pull request #331 from NREL/latest-hescore-hpxml
d11bb5cb94 Latest results.
fb92996655 Squashed 'hescore-hpxml/' changes from d24f18e4..5f69767a
7a206714b4 Merge commit 'fb92996655bb9dd827585101c72076b580e13222' into latest-hescore-hpxml
d89a0db1a7 Latest results.
9a6c0b1ccb Transition new Skylight_storm.json and Window_storm.json test files.
e9f0b872b8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into knee_walls
891d901f8a Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into high-efficiency-heat-pump
a15e52de13 Add USA_WA_Seattle-Boeing.Field.727935_TMY3.epw for new hescore-hpxml examples/house9.json
50c0c695ef Merge commit 'ebd561d4a655f7f36d7e4655922d72f7b907caad' into high-efficiency-heat-pump
ebd561d4a6 Squashed 'hescore-hpxml/' changes from 3bd9a14f..8e422bc5
529a68c3ae Merge commit 'bc8fbd8578574250a0850cc9307aac8e19045f9d' into high-efficiency-heat-pump
bc8fbd8578 Squashed 'hescore-hpxml/' changes from 51c7928f..3bd9a14f
94074bc266 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into high-efficiency-heat-pump
a6c6f4a764 add test files and unit tests
49e5a98c87 add test files and unit tests
cf841c0382 add cee regions, change to lookup table
5d7ae06846 Merge pull request #319 from NREL/low_e_storms
aed70f29dc Throw an error when the base windows u-factor is less than 0.45
eec8619e72 Merge branch 'low_e_storms' of github.com:NREL/OpenStudio-HEScore into low_e_storms
11c74a9826 Change 'get method' for storms to return adjusted ufactor/shgc
6d56bd6d42 Latest results.
f46cadb374 Latest results.
e7ae97dbe2 Merge branch 'master' of github.com:NREL/OpenStudio-HEScore into low_e_storms
6dfecb568f Run tasks.rb
ecd7b7450d Remove air leakage effect
2c42fcbef7 Merge pull request #323 from NREL/energystar_equip_update_rebase
029b27dbc0 Merge commit 'fdb0ff2d50aa93c2383243fd8084037cf834a662' into high-efficiency-heat-pump
fdb0ff2d50 Squashed 'hescore-hpxml/' changes from d24f18e4..51c7928f
909cba55e0 add efficiencies
9040d1761e Latest results.
b46128ca88 Fixes #325.
047e70358c Merge commit '9a66b11a4a908d896943cf4507387c421142d38a' into knee_walls
9a66b11a4a Squashed 'hescore-hpxml/' changes from 521abdff5..5f69767a2
28c379961c Merge remote-tracking branch 'origin/master' into knee_walls
c3c9a37364 Latest results.
25731db7be Merge pull request #326 from NREL/fix_hp_mixed_efficiencies
d72e92f133 Merge branch 'low_e_storms' of github.com:NREL/OpenStudio-HEScore into low_e_storms
4e46b420f9 Bugfix
69cf9de7e9 Latest results.
6759036f43 Code cleanup
3630ea1071 Merge branch 'low_e_storms' of github.com:NREL/OpenStudio-HEScore into low_e_storms
8f30523c63 Fix ufactor and sghc adjustment with storm windows
3fee8ba92d Latest results.
d850671bbf Update regression files with storm windows
d11c4499d1 Update U-factor and SHGC reduction by storm windows
5b5ceb7de2 Fixes #325.
ea72dd4194 setting maximum knee wall area to 5000
f65b60efe9 adding knee wall regression test
92f312c3a4 updating knee wall assembly R-value calcs
f78040b28d Latest results.
229e996099 fix test
56868cb1a3 using LF instead of CRLF for line endings
9b76fa1e08 changing mini splits to SEER 15
f6bb504590 updating energy star equipment to latest
43ee11e588 Latest results.
bfab0330db removing temporary script to generate jsons
48f9894519 updates hescore-hpxml example files
cd31f8b63e adding script to convert jsons to the new format
c36fd1a42f addressing a few bug that caused testing to fail
d12e4e2533 fixing syntax error
4bffbd1aee updating historical and regression files
e45b453ee2 adding knee wall lookup and hpxml generation
1255459c51 adding validation rules for knee walls and roofs
d5e49513bd adding new zone_roof elements
deb937998f Merge branch 'master' of github.com:NREL/OpenStudio-HEScore into low_e_storms
37d3d72247 Merge commit '1a1fbdb9d8acdd9f69559e6adec02f75642ec3ba' into knee_walls
1a1fbdb9d8 Squashed 'hescore-hpxml/' changes from d24f18e40..521abdff5
6bac592528 Merge remote-tracking branch 'origin/master' into knee_walls
5383de0c4b Revert "adding knee walls and reorganizing json schema for attics/roofs"
d52e416204 Merge pull request #280 from NREL/duct_blaster_measurements
d87e9895b3 Update new JSON test files from merge.
b620b37ae1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
1cb7ea32de Squashed 'hescore-hpxml/' changes from 1e4b5b2a..d24f18e4
4b55167031 Merge commit '1cb7ea32deefeca30db58611042dc11a52775141' into duct_blaster_measurements
3190798b95 adding knee walls and reorganizing json schema for attics/roofs
9cec110369 updating devcontainer stuff
8bf881bed6 Merge pull request #315 from NREL/addtl_duct_locations
30a079a4c8 Merge commit '66362784f619f12505e929480239f6353b726917' into addtl_duct_locations
66362784f6 Squashed 'hescore-hpxml/' changes from fc9596cc..d43ac56c
277775de1c Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into addtl_duct_locations
b7cf5a0d34 Latest results.
0d297feab8 Merge commit 'ef2866ac835b9b8ac06c0f6c33c90df3abd69edd' into low_e_storms
ef2866ac83 Squashed 'hescore-hpxml/' changes from b1cb372d..30016f87
0f74b4c789 Merge commit '091de221919f6c564f78a6351c04e4699a1e4166' into low_e_storms
091de22191 Squashed 'hescore-hpxml/' changes from 72e5137b..b1cb372d
af986dccbe First pass; add a modeling capability for storm windows; add sample jsons
65c4357ad6 Update README.md
354e3dd769 Fix a couple JSON test files.
734cc80fc5 Squashed 'hescore-hpxml/' changes from 72e5137b..1e4b5b2a
76e12854d9 Merge commit '734cc80fc573514af3179780c307e3e3457d1e1d' into duct_blaster_measurements
673ed36a20 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
9fe0850635 Merge commit '09c3e52c7206dff44f4aec49bd37cc7c55d9c8d9' into addtl_duct_locations
09c3e52c72 Squashed 'hescore-hpxml/' changes from 72e5137b..fc9596cc
78d3890158 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into addtl_duct_locations
5e7016c2d6 Merge pull request #318 from NREL/hescore-hpxml
877b85bb51 Merge pull request #313 from NREL/pv_tilt
f6e21d2e18 Squashed 'hescore-hpxml/' changes from ce3f6dfc..72e5137b
cdd3437fe2 Merge commit 'f6e21d2e181f5f39e5a04faf39641f9f91bb8664' into hescore-hpxml
92274a632f Fix ES_mini_split_electric.json and update PR template
c1439398ca Merge branch 'pv_tilt' of https://github.com/NREL/OpenStudio-HEScore into hescore-hpxml
94adabf86b Update a bunch of JSON file to pass validation
ba716e8014 Fix path
f4935fabb7 Use a different job
cc372b6829 pip install jsonschema
91abf423f3 Try JSON validation on CI.
015e850d32 Latest results.
b38f31f2d6 Add EPWs.
2926e7a2ba Test
d17587559f Test
404c9ea156 Add CI test/artifacts.
4091baf88b Squashed 'hescore-hpxml/' content from commit ce3f6dfc8
80333def07 Merge commit '4091baf88bb078c33adeee0b2d3ff1a28441e732' as 'hescore-hpxml'
20223691bb Merge pull request #317 from NREL/regression_jsons_v9_0_211202.zip
b8f0683cd5 Official files from LBL.
90b4f3b24f Latest results.
73deeb8ad4 First pass.
711cfc57a1 Latest results.
17ecb9e9a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
db75b785a6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
1820cd5e4f Latest results.
adffd073ef 7:12, not 6:12
f052dbfedc Allows "array_tilt" input for PV; adds 3 new regression test files.
6f427190e4 Merge pull request #312 from NREL/rubyzip
515ac40292 Replaces OpenStudio::UnzipFile with rubyzip when extracting weather files for performance reasons.
3844775f4b Merge pull request #310 from NREL/issue_templates
5940399f86 Merge pull request #309 from NREL/hourly_output
e77539688e Update issue templates
1fac84f14e Latest results.
ca3187d607 Update water heater type in one historic audit to be tankless given the EF.
b3964f0729 Adds an optional `--hourly` argument to request an hourly output CSV.
9828782c2c Merge commit 'c47db4c103226e4e577725b4301f5ce3609e8fe5' into hourly_output
c261fa1cc4 Merge commit 'c47db4c103226e4e577725b4301f5ce3609e8fe5' into hourly_output
c47db4c103 Squashed 'hpxml-measures/' changes from 8f8a627b2..efb013fc6
bb42128263 Merge pull request #293 from NREL/reduce-output-warnings
3ed8926a52 Merge commit 'ecdd72dd4819304e510c89c4fb925cf33c0aadde' into reduce-output-warnings
ecdd72dd48 Squashed 'hpxml-measures/' changes from ec2ce405c..8f8a627b2
f2245161bb Merge commit 'ecdd72dd4819304e510c89c4fb925cf33c0aadde' into reduce-output-warnings
cc13e24304 Sync.
b22ce192bb Merge commit '3983a6187bd12b3ca9a8b8e930779090cfe8d87d' into reduce-output-warnings
3983a6187b Squashed 'hpxml-measures/' changes from 5ab5b74a8..ec2ce405c
ad0bf7f945 Merge commit '3983a6187bd12b3ca9a8b8e930779090cfe8d87d' into reduce-output-warnings
35e991df95 Update ruleset.
1399250329 Bump to official os330
070114d174 Merge commit '16f19531e8c497e828d31a4eec87fa20557353c9' into reduce-output-warnings
384ebc69a3 Merge commit '16f19531e8c497e828d31a4eec87fa20557353c9' into reduce-output-warnings
16f19531e8 Squashed 'hpxml-measures/' changes from 2d0f5bd45..5ab5b74a8
9453fd0614 Merge commit '1275718f1261945d6f3b2805ea884541b28c0030' into reduce-output-warnings
d372b1a94a Merge commit '1275718f1261945d6f3b2805ea884541b28c0030' into reduce-output-warnings
1275718f12 Squashed 'hpxml-measures/' changes from 654a86dab..2d0f5bd45
6881efc57c Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
6b61724338 Merge commit '6fba21ac69c52f95816ef6e4391013da0835a19d' into reduce-output-warnings
6fba21ac69 Squashed 'hpxml-measures/' changes from 641f5a9bf..654a86dab
fe18a0ba88 Merge commit '6fba21ac69c52f95816ef6e4391013da0835a19d' into reduce-output-warnings
54889a5a4a Latest results.
743b4ed0c6 Bump to OS 3.3.0-rc2
6473a88142 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
b69becbe39 Merge commit '0beb734e79138dee6a57cb0779c1f2c41967364a' into reduce-output-warnings
0beb734e79 Squashed 'hpxml-measures/' changes from 0a3662b4b..641f5a9bf
4fae9c3a2c Merge commit '0beb734e79138dee6a57cb0779c1f2c41967364a' into reduce-output-warnings
ebc46f3dd9 Latest results.
8b18814ffb Merge commit '7f1370692b1a7ea299ee5041ae5079ac7f05eaf6' into reduce-output-warnings
7f1370692b Squashed 'hpxml-measures/' changes from 32f7a3f62..0a3662b4b
2475ec84b4 Merge commit '7f1370692b1a7ea299ee5041ae5079ac7f05eaf6' into reduce-output-warnings
c14a6f3166 Merge commit 'e6a8cf9ed85c645715dbedbfc0d1a73c54a2a584' into reduce-output-warnings
e6a8cf9ed8 Squashed 'hpxml-measures/' changes from a8886ae8b..32f7a3f62
c2d0518f21 Merge commit 'e6a8cf9ed85c645715dbedbfc0d1a73c54a2a584' into reduce-output-warnings
bffbab394a Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
dbdafc7ef7 Merge commit '9a39a8fb7975ce29d7a6a4b240e6e808ed21cb6f' into reduce-output-warnings
9a39a8fb79 Squashed 'hpxml-measures/' changes from 0b74cd621..a8886ae8b
76866d5ee5 Merge commit '9a39a8fb7975ce29d7a6a4b240e6e808ed21cb6f' into reduce-output-warnings
a9d822e8cb Latest results.
eb8c8dcaad Apparently one of the historic files has no window area.
96888ecaa4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
df7b8d7ec6 Merge pull request #300 from NREL/wall-furnace-min-afue
a2440c3d8a Latest results.
9bf0463e9c Increase minimum wall furnace AFUEs for consistency with the minimum value allowed by HEScore.
d194eda9f2 Fix CI
dcbd8cb473 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
c5885d6284 Update measure name.
7889b0ef79 Merge commit 'baae0c1ebbaeb8761e9dd2f1cc6514fe0b6c506a' into reduce-output-warnings
c9c4d838ea Merge commit 'baae0c1ebbaeb8761e9dd2f1cc6514fe0b6c506a' into reduce-output-warnings
baae0c1ebb Squashed 'hpxml-measures/' changes from 7b2f57b4f..0b74cd621
493716ef05 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
58336b573f Scrub addresses.
206f56e018 Merge branch 'duct_blaster_measurements' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
2493cf583d Remove `hvac_distribution` elements entirely when they don't apply.
db7b4c7c25 Latest results.
25c9829b95 Merge branch 'duct_blaster_measurements' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
9b8e718340 Bugfix.
8d49a3db0d Latest results.
a8d5c4988b Add example file back in, update ruleset.
1c975dd95a Update JSON files to new schema.
bc9c842acb Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
106fda8a5f Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
083edd0f23 Bump OS version used.
3bdb5f04e1 Latest results.
927a7b2f54 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
1f134fb3d3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
c9c42c794b Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
9b418f60fb Merge pull request #279 from NREL/uef_model
3b364c500a Latest results.
db8d827b04 Bugfix.
2ee745e138 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model
46757b4018 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model
1e7e265826 Merge pull request #261 from NREL/allow_for_passing_json_only
841aa838c8 Latest results.
717506d021 Revert temp name change
8dae146b4e tasks.rb update_measures
0ec3fe664d Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
e0b89fe704 Split is_ducted_system -- one for heating and one for cooling; use them to specify distribution system idref
acfc4a3e6c Latest results.
5a2ea68eda Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
6d0c2f9f66 Use a common logic for identifying ducted systems; Change distribution_system_idref logic for heat pumps to be consistent with other system types
7ea666de9f Rather than loop through all HVAC systems and add code (&& related_hvac_idref.nil?), break when we find the first one of interest
e70d984ccf Latest results.
0123f52b1f Latest results.
02efa1d33b Drop Floor_area_250.json, Roof_area_250.json, and Roof_color_medium.json
56fc1db0f9 Remove duct location check for heat pumps
fa2b232c94 Make use of ht_types array rather than calling out every HP type in many different places
59cdb1a370 Remove regex in zipcode distance calculation
df89b0d6f4 Bugfix on the zipcode distance calculation
b1ca3053a1 Apply rubocop
512d073df7 Add a lookup on zipcode, within a zip3
47b1536b6d Apply rubocop
c0e0360142 Address multiple review comments
6ab65ad46f Use the entire zip_code string
5900c4b4bf Latest results.
f7109780f7 Fix CI.
7363d95435 Latest results.
9e476a2d69 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
f08e0f5ec4 Revert the commit 8cacc24 so that the CI can generate comparison plots. Will need to be change names in result CSVs before the merge; Apply rubocop
3fbf338c8a Latest results.
8cacc24eee Revert name changes in result CSVs
e21191aba2 Cleanup hescore_test.rb
c661e35587 Another bugfix on heat pump distribution system idref
0aab70e7ec Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
d21a1c04ad Remove FIXMEs; change air distribution system ids
4d225e61ff Fix heat pump distribution system idref
745c314367 Latest results.
cb990df5d9 Latest results.
86d5c93ef8 Drop in the new set of historical JSON files after fixing wall translation and water heater EF rounding
99b8c62b66 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
850586a3f5 Latest results.
b18ceb2ccf Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
08f8818b76 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
4008eec728 Squashed 'hpxml-measures/' changes from d6e093c93..7b2f57b4f
9daf3f34f1 Merge commit '4008eec728963947ca1d4d7ba16239f19b64266e' into reduce-output-warnings
a8e3220cb1 Merge commit '4008eec728963947ca1d4d7ba16239f19b64266e' into reduce-output-warnings
bfd887cfee Reorder the HVAC systems in JSON files to match the corresponding HPXMLs
98712aafb6 Latest results.
9656e3f2bc Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
3fc1c8d2d5 Upload the new set of JSON files where the duct insulation has fixed
bd2ebf9e21 Latest results.
dcb7d8f8ff Temporarily change names in results CSVs to match master branch so that the CI can generate comparison plots. Will need to be reverted before the merge.
14f2219734 Latest results.
31a19715f2 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
3af83beb90 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only
a91b2aa3d6 Remove old file.
67d1d7d2ab Drop in the new set of JSON files
899a862bef Latest results.
5d91cfb8f7 Remove old file.
173dd75668 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only
a95d729cd2 Merge branch 'historical_regression' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only
9e5462c80b Merge branch 'historical_regression' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only
89597c5233 Merge pull request #291 from NREL/historical_regression
f5d56c4078 Latest results.
41d049bc18 Fix command.
2c354aa936 Renames sample files to regression files.
5e044439b1 Merge branch 'historical_regression' of https://github.com/NREL/OpenStudio-HEScore into historical_regression
ad782f7661 Re-enable all tests.
e1bfc81e9e Latest results.
357a93f34d Add missing weather files. Renamed "regression" to "historic" so they are not confused with the regression sample files.
a95e6a31c6 Test CI
0254eebec4 Manually fix HPXMLs that are not valid per the schema. Attempt to fix CI.
ee05dce074 Manually fix HPXMLs that are not valid per the schema. Attempt to fix CI.
b0126e9292 Bugfix
cb53364052 Replace the historical homes JSON files with ones converted from HPXMLs
1b254ef21b Map climate zone 7A and 7B to 7
77b86abfa2 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
0d60d72d2e Squashed 'hpxml-measures/' changes from f6498aa35..d6e093c93
1a954a14d6 Merge commit '0d60d72d2ee6557e0af3ab7ebcf3f48d5332c6ee' into reduce-output-warnings
5f8313f0f2 Merge commit '0d60d72d2ee6557e0af3ab7ebcf3f48d5332c6ee' into reduce-output-warnings
6a0a0312af Latest results.
f0b03d2e2e Update tests.
c4ced70d85 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings
938f17a335 Sync.
ddf140e6bb Squashed 'hpxml-measures/' changes from ed2c94668..f6498aa35
31b2ecfea1 Merge commit 'ddf140e6bbaa89edd56befda6984037d4097ee09' into reduce-output-warnings
3379190884 Merge commit 'ddf140e6bbaa89edd56befda6984037d4097ee09' into reduce-output-warnings
41b178ca82 Latest results.
aa83cf43ed Add require.
58165e4bac Squashed 'hpxml-measures/' changes from 082743c5a..ed2c94668
f3ff79f357 Merge commit '58165e4bacd7cec545d8b88be297449caafb07e6' into reduce-output-warnings
40aafb9a2e Merge commit '58165e4bacd7cec545d8b88be297449caafb07e6' into reduce-output-warnings
6ce895e94b add a test
26da36ce90 Add ~100 historical homes
e3c5228bea add test_historical_homes
e961ebe581 fix get_ducts_details
f7c2cedc08 allow for the ducted mini-split
38f201582d add hpxmls
9cbfda6ef5 Fix typo
b8a68b5378 Fix the ruleset to ignore windows with 0 area
d1a7c6448f add test files
ef7c1e2332 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
53919d3e8c Fix skylight azimuth and window properties when has_same_window_const is true
60ec29f09b Latest results.
51c5206f67 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
0c07e0a6df Fix duct fractions
9dd2e63d03 Latest results.
2d3e18a5a0 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
23e8fcd1a1 Remove the code that specifies hvac distribution for mini-split; use 0-1 duct fractions in regression json files
c1836ba636 Latest results.
a71d2d7aa5 bugfix for the related hvac system identifier
a36a927136 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
54827605da change the system identifier naming convention
ee635819ac Latest results.
2ec7fda204 apply rubocop
de3cb14319 bugfix
1cb983a8cc drop in a new set of ES files
cd07f7b61a Add ES json files.
82e65ef39a Apply rubocop (openstudio tasks.rb update_measures)
3a131f4969 Optimize code related to zipcode info; replaces two CSV lookups (one of which always read the entire CSV even after the row of interest was found) with one lookup that breaks once the info is found. Ruleset runtime is now identical to previous HPXML-based runtime.
da396d9f1e Remove old HPXML files.
fd6657926c Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
af136c45bd skip the front window with the area of 1
34ac88da96 intensionally set the front window area to 1 as an HPXML file with no windows does not pass validation
c91bbd14cd Latest results.
4fdd36ec61 fix bug in hescore_test
b95dfd1baf Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
520b09f62f remove the window on the front wall
bab6d8e918 Latest results.
b4c5a8df33 Merge branch 'master' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
309cb8ae81 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
da5124061e Merge pull request #288 from NREL/dpeaw
bb20e797c0 make use of the correct datatype
609718c081 Latest results.
c1b148ab6e Fix window gas fill for dpeaw.
8307b08a7a Latest results.
31d797f357 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
afc4cf1407 update the townhouse sample files
e7849b82d3 Latest results.
902bf2961e Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
80b2bd2c58 duct should be uninsulated
ff545012fc Latest results.
4b77f5ffa5 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
a529bc40ac fix the duct fraction calculation
018e664987 upload a new set of json files
348275d508 Latest results.
3b6e93b14e Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
30cd2529c4 change hvac fractions in Multiple_system_indirect.json to be consistent with Multiple_system_indirect_hpxml.xml
da87a5b79b change hvac fractions in Multiple_boiler_indirect.json to be consistent with Multiple_boiler_indirect_hpxml.xml; change the related hvac idref logic
12a08e4b42 Latest results.
1a84432baf Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
2830603013 bugfix on get_ducts_details
93236317fe Latest results.
a11fc3e15b fix the bug on the pv system max power
3512f0d488 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
8b83640287 fix roof absorptance if roof_color is cool_color
d040813af3 remove diagnostic puts
d93a9fd57e add conditions to get_ducts_details
f683e24ff2 fix hvac fractions in HVAC2.json
83e140fc00 make "duct1" uninsulated
0fc7f91455 Latest results.
59f1864680 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
b880b6b67a fix the unit of PV max power output
d8218ddc59 Latest results.
a53d0714c7 revert the changes made to HVAC_mini_split.json
ed9f06d8ff Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only
367bf30631 connect mini-split heat pump with the hvac distribution system only if the distribution system exists
b6d34edcb6 Latest results.
54e41a3cec add distribution system idref for mini-split
9d1c4534d1 bugfixes
b37db2ec27 Latest results.
361aaa1a90 convert floor area into float
5ac0dd6cdf bugfixes and upload json files received from LBL
a61d7a1b5b enable energy_star entry
5cf7905dcb Merge branch 'allow_for_passing_json_only' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only
aa1db5fe68 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only
d4c61565e3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only
214592013d Latest results.
bedf5d7608 change test filenames
f2e7c8ce4d Forgot to update it
25a934cc00 Another bugfixes
a4bc6aa699 add json files for the CI test. These files will be replaced when Leo provides the updated ones.
e6bd93a998 bugfixes and additional updates to hescore_test.rb
b50d364d9c more updates on hescore_test
c8e8c7a148 update hescore_test.rb
3be751e4c0 bugfix and update test_hescore_ruleset
4b6490430d add calc_ef_from_uef function
c958c21e3b bugfix
595069e6df handles solar_screen on windows and skylights
e0fa6ae257 update test_infiltration
afac2ea258 bugfix on skylight area
238f0dd13b bugfix on hesruleset
8d796fbb0e update set_systems_hvac
329ce2db29 update set_systems_hvac
d7eacafcfd Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model
244ceee916 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model
b71ba2b49f Merge branch 'duct_blaster_measurements' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
592daf51b3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
710185753b Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
3a60a66ec7 Merge commit '422dd3466722723583c61ff9137da48305583d9f'
422dd34667 Squashed 'hpxml-measures/' changes from dccbc2918..082743c5a
4634e66056 Merge commit '422dd3466722723583c61ff9137da48305583d9f'
07daae4afc Latest results.
3094f15b1f Latest results.
7a7268c96b Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
0a8e036552 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
9be3a65121 Merge branch 'uef_model' of https://github.com/NREL/OpenStudio-HEScore into uef_model
4cc4824142 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model
967e664ad8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model
2f5911e5b0 Merge pull request #283 from NREL/comparisons
7e60c90b5b Merge branch 'comparisons' of https://github.com/NREL/OpenStudio-HEScore into comparisons
d38f578d80 Merge commit 'd54e375af7172ce59dca4f395eb7f7e7854ef01d' into comparisons
d54e375af7 Squashed 'hpxml-measures/' changes from 2b8be6ec4..dccbc2918
07a41a499a Merge commit 'd54e375af7172ce59dca4f395eb7f7e7854ef01d' into comparisons
467db0c7f9 remove the unused function
cae0132f42 uncomment set functions for appliances, lighting, misc loads
04be7fce62 update functions that set water heater, water heating use, and pv
f1e4db5f61 bugfix in set_enclosure_doors
e007eb6f86 update functions that set frame floors, slabs, windows, skylights, and doors
b288ac52f4 Typo.
d55b766df7 Add script args to config.
59963fa471 Python, not ruby
dd023b21bb Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into comparisons
cb71787f8f Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into comparisons
668d4d3e01 Squashed 'hpxml-measures/' changes from 060c30862..2b8be6ec4
a38e76ceea Merge commit '668d4d3e018a5539edfa319f39e0cdd8def609dd' into comparisons
820df70b9c Merge commit '668d4d3e018a5539edfa319f39e0cdd8def609dd' into comparisons
02a9e0f742 Merge commit 'c9a1ae2092c53c086c96fb63f9931bcc0c86a2c0' into comparisons
4fad530763 Merge commit 'c9a1ae2092c53c086c96fb63f9931bcc0c86a2c0' into comparisons
c9a1ae2092 Squashed 'hpxml-measures/' changes from f34a377db..060c30862
617132cc78 remove unused functions
cc9484202d remove resolved fixmes
1fdd4c67bf Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only
5d7dd9d9ad update functions that set roofs, walls, and foundation walls
743b16589d remove diagnostic puts in measure.rb
8d496fd8e1 Merge pull request #284 from NREL/latest-os-hpxml
dbcfd48f21 Latest results.
980c7d33da A little cleanup.
1fe6e51c6e Fix measure.xml
a6b3eea8e8 New cops
edbd60bf14 Bump CI to OS 3.2.1
0dd3096c4e Merge commit 'd3358ac40dee3e55199da31181f535fe68d4d521' into latest-os-hpxml
955301ceb7 Merge commit 'd3358ac40dee3e55199da31181f535fe68d4d521' into latest-os-hpxml
d3358ac40d Squashed 'hpxml-measures/' changes from 896a53ea5..bad277e18
4d560f6c1d Latest results.
27ec4681ae Merge branch 'duct_blaster_measurements' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements
2adc0bfc0e Switch to using a single cfm25 input (supply + return).
7ed87e717d use @iecc_zone instead of hard-coded iecc_zone for calc_ach50
71cad280cc Merge commit '7fa58b7612a2366fe94336d0e605b4e297c9e2ee' into comparisons
7cc0382a94 Merge commit '7fa58b7612a2366fe94336d0e605b4e297c9e2ee' into comparisons
7fa58b7612 Squashed 'hpxml-measures/' changes from 896a53ea5..f34a377db
f7e230df49 Update config.
11e57a9811 update set_enclosure_roofs
62390a4a31 update set_climate
5765e4d8a3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only
e598be09b3 fix typo
f773d813dc Latest results.
b2b250b7c8 Merge branch 'uef_model' of https://github.com/NREL/OpenStudio-HEScore into uef_model
9d359636e3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model
6fffe2de95 Merge pull request #282 from NREL/sort_ci_tests
4393013d8f Latest results.
6563a7d220 Sort results.csv files so they align with the comparison csv.
0ac47d4b10 Latest results.
6d14797e44 Oops.
dcb2191bdd A bit more error checking.
8617d590c2 Initial implementation. Added a manually-created HPXML test file.
529576113c Latest results.
44219c1fe8 When UEF is provided, now use our UEF model (with "medium" usage bin assumption) instead of old EF->UEF regression.
65a926eb72 Merge pull request #272 from NREL/regression_v9_0
1e8b121c18 Merge branch 'regression_v9_0' of https://github.com/NREL/OpenStudio-HEScore into regression_v9_0
78f79f0926 Remove DOE2 simulation results and related comparison code.
a01d056feb Merge pull request #274 from NREL/duct_sum_error
9d189e5fd9 Latest results.
0425486cca Fixes possibility of duct sum error ("Unexpected sum of duct fractions: 1.0000000000000002.") due to floating point precision.
2727081367 Updated DOE2 results. Temporarily disabling ERI setpoint comparisons.
8d5162b295 Update to LBL's regression v9.0. Also adds energy star files.
5cb056d53b Merge pull request #271 from NREL/round_results
b3ee711176 Latest results.
6af962e81d Round values in the results.csv to two decimal places. Also a little code simplification related to unmet loads.
bd174be10a Merge pull request #258 from NREL/os320
afbb31affc Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os320
2eba3789ea Merge commit 'e3d550d13c53b1e4ead3f002416fc273cb80536e' into os320
e3d550d13c Squashed 'hpxml-measures/' changes from 355a40ae7..896a53ea5
077d186196 Merge commit 'e3d550d13c53b1e4ead3f002416fc273cb80536e' into os320
1a1456297e Merge branch 'os320' of https://github.com/NREL/OpenStudio-HEScore into os320
b8d7c067e5 Merge commit '1acedcb81cd1bf087b9973dc7beda40520b7a7f0' into os320
3517fd0e7d Merge commit '1acedcb81cd1bf087b9973dc7beda40520b7a7f0' into os320
1acedcb81c Squashed 'hpxml-measures/' changes from 03188d6b5..355a40ae7
6ddc249c3e allow for passing json and start changing HESruleset
d23819a4ad Merge pull request #260 from NREL/revert_json_to_hpxml
d0b3b6771e revert json_to_hpxml phase 1
48a676e011 Latest results.
6555ae7b93 Bump to OS 3.2 / E+ 9.5
1be6d9b075 Merge commit '962f186b5ce1ed57a09b67df81a4398b161510e1' into os320
962f186b5c Squashed 'hpxml-measures/' changes from ac8f3cb3b..03188d6b5
ccbd915a9f Merge commit '962f186b5ce1ed57a09b67df81a4398b161510e1' into os320
4fb7424472 Merge pull request #257 from NREL/json_to_hpxml
018001a517 leave two arguments (-x and -j) in run_simulation.rb
339d1d0811 change the measure argument
b91523d747 Merge pull request #256 from NREL/config-changes
13ff61783d first pass
7cb2d0e969 Same changes as OS-HPXML
24349c2275 Merge pull request #255 from NREL/coverage
0efc0fb5ee Merge commit '376872548bf919b4e5a3e5ae396ce90b898ef2c6' into coverage
376872548b Squashed 'hpxml-measures/' changes from 5be6bc7c7..ac8f3cb3b
a93005278c Merge commit '376872548bf919b4e5a3e5ae396ce90b898ef2c6' into coverage
ed0c2561e0 Propagate to OS-HEscore CI
e2f8ddaa56 Merge commit '84429577bdd408f0d8db9ac005e1cd2ce884b29d' into coverage
9443632d99 Merge commit '84429577bdd408f0d8db9ac005e1cd2ce884b29d' into coverage
84429577bd Squashed 'hpxml-measures/' changes from 350ebde85..5be6bc7c7
87d20584ae Merge pull request #254 from NREL/config-commit
97a84a2f3c Latest results.
cce6691829 Latest results.
041555b340 Apply the second commit.
2128998899 Apply the second commit.
53f51b87e5 Demonstrate the fix.
60101ff1e9 Demonstrate the fix.
45af388e7c Apply the second commit.
3705e80327 Apply the second commit.
82af12e0c8 Demonstrate the error.
604f26b75b Demonstrate the error.
2391100e85 Merge pull request #252 from NREL/compare-script
617e29c0a0 Merge commit '44cd7087099be1c7d1e368c77c1a5652c12a83b0' into compare-script
329cad2526 Merge commit '44cd7087099be1c7d1e368c77c1a5652c12a83b0' into compare-script
44cd708709 Squashed 'hpxml-measures/' changes from a76e00d13..350ebde85
e1a475d476 Latest results.
f3a82c1e92 Mod config, try 3.
e72e391b20 Mod config, try 2.
d401d6de75 Mod config, try 1.
3c77d2ba32 Merge commit '28bce4bd5107a137ea6e0a7ce8bf67561a4b8f73' into compare-script
28bce4bd51 Squashed 'hpxml-measures/' changes from d88eadda9..a76e00d13
93c12b2274 Merge commit '28bce4bd5107a137ea6e0a7ce8bf67561a4b8f73' into compare-script
967684cba3 Modify compare path in config.
4407e17898 Remove compare script.
247b149bcc Merge pull request #250 from NREL/compare-fixes
40e7efdde8 Merge pull request #251 from NREL/compare-fixes-2
0f8d5806fe Clean up config.
0deb2d0dff Include more fields in diffs.
761ab25790 Skip first column.
7d525f9e48 Fix bugs in compare script.
bba0c61d02 Merge pull request #247 from NREL/actions-updates
ee19d54b26 Minor update to config.
6ad48494e2 Commit only the results csv file.
d74a642327 Latest results.
a341131aa6 Merge branch 'master' into actions-updates
edff9007f2 fix header
725934d120 Merge branch 'master' into actions-updates
a49136c0df Merge pull request #248 from NREL/add-results
f5c85cd267 Remove runtimes.
e95d8b28db Add base results and compare scripts.
a334635812 Update actions config.
14ed829a79 Add compare script.
8a3db9fdee Add latest base results.
17b07b4a7b Merge pull request #245 from NREL/ci_reporting
56dfed37cb Merge commit '0d42c99514ed4127b99b65388f2843746721c52a' into ci_reporting
fe0197171c Merge commit '0d42c99514ed4127b99b65388f2843746721c52a' into ci_reporting
0d42c99514 Squashed 'hpxml-measures/' changes from 57b4afd98..d88eadda9
1bb4721a4e Merge commit '48e6d1d63332783779799e31dbf5ff10b5892fdc' into ci_reporting
016daf708d Merge commit '48e6d1d63332783779799e31dbf5ff10b5892fdc' into ci_reporting
48e6d1d633 Squashed 'hpxml-measures/' changes from c19ba7224..57b4afd98
1a5843cb19 And now revert ruleset changes.
3c5d7a12bb Oops.
d0783b6236 Re-enable minitest-reporters.
b95b120718 Re-enable minitest-reporters.
57fb8de2a7 Force CI errors.
3eb58bf8f2 Merge pull request #244 from NREL/room_ac_curve_bugfix
bc1ad65a47 Merge commit 'e32f26e5d4fd08e092e574342bcf42dbe7d452b3' into room_ac_curve_bugfix
3985bf8f45 Merge commit 'e32f26e5d4fd08e092e574342bcf42dbe7d452b3' into room_ac_curve_bugfix
e32f26e5d4 Squashed 'hpxml-measures/' changes from e252084a8..c19ba7224
0bb4bd930c Sync.
d74cf226f4 Merge commit '1fa407a11bfcc9515bee8bfed2f2a6dcf4b45088' into room_ac_curve_bugfix
f33a5393ee Merge commit '1fa407a11bfcc9515bee8bfed2f2a6dcf4b45088' into room_ac_curve_bugfix
1fa407a11b Squashed 'hpxml-measures/' changes from 3dad1cec5..e252084a8
e27677bf5a Merge pull request #241 from NREL/remove_codecov
469847986b Revert.
4d88992a98 Force test failure to make sure CI captures it.
7c084bf9c4 Fix
853e2f8018 Removes codecov
e1e85d2525 Removes codecov
31cc49a0d7 Sync.
8d5093ef66 Squashed 'hpxml-measures/' changes from 04c25978c..3dad1cec5
7ab21b1f03 Merge commit '8d5093ef6616739ea52591b7e8456d9961816cbb'
1c7baedf23 Merge commit '8d5093ef6616739ea52591b7e8456d9961816cbb'
536cd1ae1a Merge pull request #240 from NREL/skip_component_loads
ab2d8c78eb Fix tests.
750eeadf55 Enable --skip-component-loads argument.
369ae2be23 Merge commit '78b655acee1ee3e66a05eeadd6b0b5d0e51d3b97' into skip_component_loads
f2b67cd36b Merge commit '78b655acee1ee3e66a05eeadd6b0b5d0e51d3b97' into skip_component_loads
78b655acee Squashed 'hpxml-measures/' changes from 93a780327..04c25978c
ec4f63bca5 Merge pull request #237 from NREL/fix_roof_area
e464980e33 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into fix_roof_area
e14fce8522 Merge pull request #238 from NREL/latest-os-hpxml
06c3e7fa58 Merge commit 'b60417b51fb2e3fc89d90e986f18fc7e2d2fc25a' into latest-os-hpxml
b60417b51f Squashed 'hpxml-measures/' changes from 52d3f3621..93a780327
0cfefba333 Merge commit 'b60417b51fb2e3fc89d90e986f18fc7e2d2fc25a' into latest-os-hpxml
ed70f29b07 Update warning messages in tests.
77879cddc4 Sync.
c8c771229a Merge commit 'b78f8d2560ce690dd703d3d1541b7daf31143c34' into latest-os-hpxml
6a09fc058e Merge commit 'b78f8d2560ce690dd703d3d1541b7daf31143c34' into latest-os-hpxml
b78f8d2560 Squashed 'hpxml-measures/' changes from d63243d6f..52d3f3621
46f1bde851 Roof are was half of what it was supposed to be.
f4d0e84e44 Merge pull request #236 from NREL/boiler-pump-bugfix2
faf5a1631a Merge commit 'a6dea57ffd1de97e34601f43a933562293b9264d' into boiler-pump-bugfix2
c6b521b081 Merge commit 'a6dea57ffd1de97e34601f43a933562293b9264d' into boiler-pump-bugfix2
a6dea57ffd Squashed 'hpxml-measures/' changes from c149386ed..d63243d6f
52b9e89f53 Sync ruleset w/ latest HPXML class changes.
67e2859584 Merge commit '44ae0cc6cd9b67fa269c9bb875897502336441ea' into boiler-pump-bugfix2
44ae0cc6cd Squashed 'hpxml-measures/' changes from c38e0a3c0..c149386ed
eefd75addb Merge commit '44ae0cc6cd9b67fa269c9bb875897502336441ea' into boiler-pump-bugfix2
87e45201f0 Merge pull request #232 from NREL/hpxml_defaults3
dc3daba955 Merge commit 'fad09e5b2190950d089a6e1331146908b962e8e0' into hpxml_defaults3
fad09e5b21 Squashed 'hpxml-measures/' changes from 4a06621f3..c38e0a3c0
998ad437eb Merge commit 'fad09e5b2190950d089a6e1331146908b962e8e0' into hpxml_defaults3
5607d2b2a9 Merge commit '5ff34702157e601e4ee8185733c3c5063396b526' into hpxml_defaults3
5ff3470215 Squashed 'hpxml-measures/' changes from f1b7b538a..4a06621f3
aeb56f6fa4 Merge commit '5ff34702157e601e4ee8185733c3c5063396b526' into hpxml_defaults3
43d1efd1ec Merge commit 'f3e9cf4e0ff05639443e01419cd410fd3c9fe0d5' into hpxml_defaults3
f3e9cf4e0f Squashed 'hpxml-measures/' changes from db0259a03..f1b7b538a
5538103283 Merge commit 'f3e9cf4e0ff05639443e01419cd410fd3c9fe0d5' into hpxml_defaults3
31fc459ede Merge commit '4628dcf0f927bf345c290b19fa9323eb35bcd885' into hpxml_defaults3
4628dcf0f9 Squashed 'hpxml-measures/' changes from 5e4233284..db0259a03
a47676cd71 Merge commit '4628dcf0f927bf345c290b19fa9323eb35bcd885' into hpxml_defaults3
4ba85de269 Merge commit 'e42c9954a4182a012382d9da116aa9d739102ea6' into hpxml_defaults3
e42c9954a4 Squashed 'hpxml-measures/' changes from 8639119cc..5e4233284
c7be1e3d3e Merge commit 'e42c9954a4182a012382d9da116aa9d739102ea6' into hpxml_defaults3
36acd63df9 Simplifies how HPXML defaults are added.
d12703e542 Merge commit 'cfb5f177493e2bf0c7ce62fbb0b246c9ef974e1d' into hpxml_defaults3
cfb5f17749 Squashed 'hpxml-measures/' changes from 70edc200a..8639119cc
bfcfd7aa83 Merge commit 'cfb5f177493e2bf0c7ce62fbb0b246c9ef974e1d' into hpxml_defaults3
e491007539 Merge pull request #227 from NREL/latest-os-hpxml2
fb7f98d2e0 Merge commit 'ae2737d94fcf78e5c44b8dad6992ec34af634fd2' into latest-os-hpxml2
ae2737d94f Squashed 'hpxml-measures/' changes from 9d6c60aa0..70edc200a
6d120ff682 Merge commit 'ae2737d94fcf78e5c44b8dad6992ec34af634fd2' into latest-os-hpxml2
a3eda2191e Merge commit 'd9b506573412fe8159716fbbac3b104dde322735' into latest-os-hpxml2
f4e11ca629 Merge commit 'd9b506573412fe8159716fbbac3b104dde322735' into latest-os-hpxml2
d9b5065734 Squashed 'hpxml-measures/' changes from 7ff812876..9d6c60aa0
88f8b679a5 Merge commit 'b255a941800e2428ce26c96d65e3cefc6d3ee7ad' into latest-os-hpxml2
c7d76540ca Merge commit 'b255a941800e2428ce26c96d65e3cefc6d3ee7ad' into latest-os-hpxml2
b255a94180 Squashed 'hpxml-measures/' changes from f74686d5d..7ff812876
cda1e10552 Merge commit '063d8a3465a7882f6ccee04ee11a088e026ba610' into latest-os-hpxml2
9d271227d7 Merge commit '063d8a3465a7882f6ccee04ee11a088e026ba610' into latest-os-hpxml2
063d8a3465 Squashed 'hpxml-measures/' changes from a3d73fd05..f74686d5d
544384eb7b Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into latest-os-hpxml2
32b2e90e06 Merge pull request #231 from NREL/issue230
e8001ee866 Closes #230.
c81b0074f3 Merge commit 'e88112e95b2c0f5e78b123154367a51c19ef060c' into latest-os-hpxml2
e88112e95b Squashed 'hpxml-measures/' changes from 435cd5ed5..a3d73fd05
647d933639 Merge commit 'e88112e95b2c0f5e78b123154367a51c19ef060c' into latest-os-hpxml2
83a615a1fc Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into latest-os-hpxml2
5f1ddab0a4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into latest-os-hpxml2
2986aba185 Squashed 'hpxml-measures/' changes from 5cfb0142a..435cd5ed5
4d216d48de Merge commit '2986aba1859d9ae93f67aaf484c45c6935f19f65' into latest-os-hpxml2
fa12f801b7 Merge commit '2986aba1859d9ae93f67aaf484c45c6935f19f65' into latest-os-hpxml2
8fe747e1b5 Merge pull request #229 from NREL/hpxml_defaults2
e0460bdbbf Adds HPXML defaults to HEScoreDesign.xml.
b9b078cb55 Merge commit '8d4f339dad27718a248f97a911d85a92a1e2ce94' into hpxml_defaults2
bdc6a84dcb Merge commit '8d4f339dad27718a248f97a911d85a92a1e2ce94' into hpxml_defaults2
8d4f339dad Squashed 'hpxml-measures/' changes from 698f6439f..2a672e6dc
81371f2c23 Squashed 'hpxml-measures/' changes from 666892b04..5cfb0142a
5975239fdd Merge commit '81371f2c23852464f896abd15979100abed162d6' into latest-os-hpxml2
a73d1ca862 Merge commit '81371f2c23852464f896abd15979100abed162d6' into latest-os-hpxml2
b6ef7888bf Merge commit '48f2de1f6dfabff517ba7d7aff4b4fde84363fcd' into latest-os-hpxml2
32c6aa9f5b Merge commit '48f2de1f6dfabff517ba7d7aff4b4fde84363fcd' into latest-os-hpxml2
48f2de1f6d Squashed 'hpxml-measures/' changes from 5cfb0142a..666892b04
bcd440d31c Merge commit '266d9b276c5c515bcc814e77f5450c2c3b0cd3bb' into latest-os-hpxml2
e034bb3132 Merge commit '266d9b276c5c515bcc814e77f5450c2c3b0cd3bb' into latest-os-hpxml2
266d9b276c Squashed 'hpxml-measures/' changes from 73cbc0bb9..5cfb0142a
1a74d84eff Merge commit '8e2b660e60305eee694841135a8e4bf63f683213' into latest-os-hpxml2
e70721ac58 Merge commit '8e2b660e60305eee694841135a8e4bf63f683213' into latest-os-hpxml2
8e2b660e60 Squashed 'hpxml-measures/' changes from 719fa447e..73cbc0bb9
8be46c7325 Merge commit '0da9c17bfa16fc85bc7928769ad2e98aeb9dc7d7' into latest-os-hpxml2
486de948da Merge commit '0da9c17bfa16fc85bc7928769ad2e98aeb9dc7d7' into latest-os-hpxml2
0da9c17bfa Squashed 'hpxml-measures/' changes from 36c875d51..719fa447e
aacc2b3792 Merge commit '11ccb0a8d1c962935580e3dd365b004f416e1757' into latest-os-hpxml2
d245169d24 Merge commit '11ccb0a8d1c962935580e3dd365b004f416e1757' into latest-os-hpxml2
11ccb0a8d1 Squashed 'hpxml-measures/' changes from 180c002c3..36c875d51
0e07bd2892 Merge commit '7c8b783603c308a243f03a45112840e5f36d8b63' into latest-os-hpxml2
e43d947694 Merge commit '7c8b783603c308a243f03a45112840e5f36d8b63' into latest-os-hpxml2
7c8b783603 Squashed 'hpxml-measures/' changes from d6ad4ebb2..180c002c3
ed9efbdebc Merge commit '265843e2077106a8c154da469a0e3de83d2448e1' into latest-os-hpxml2
2ac9e3ef6f Merge commit '265843e2077106a8c154da469a0e3de83d2448e1' into latest-os-hpxml2
265843e207 Squashed 'hpxml-measures/' changes from 698f6439f..d6ad4ebb2
a3a8a35d6e Merge pull request #226 from NREL/skip_validation
3821111df5 Update workflow tests.
05faa6807d Skips the HPXMLtoOS validation during regular runs; now enabled only when using the debug flag, which is turned on for CI runs.
e725c68811 Merge pull request #212 from NREL/infiltration_no_ducts
b3c2f2b20a Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into infiltration_no_ducts
f4e78a5271 Merge pull request #223 from NREL/skylights_windows_screens
0d86631897 Move skylight shading effect from SHGC to ExteriorShading. Make all interior/exterior shading values explicit.
6b7568b075 Merge pull request #222 from NREL/latest-os-hpxml
ed0f5e042d update_measures
0bbb2dec63 Sync.
08dcc09f2b Merge commit 'f228e5996895c3aa9a933035c2bbfc1bd0791b9b' into latest-os-hpxml
f228e59968 Squashed 'hpxml-measures/' changes from 63a4af67e..698f6439f
b8623f1cac Merge commit 'f228e5996895c3aa9a933035c2bbfc1bd0791b9b' into latest-os-hpxml
169b31a215 Merge pull request #221 from NREL/parallelize_ci
035fa67e04 Fix schemas_dir?
9fce463187 Add gem.
bad82b121e Run simulations in parallel on the CI.
4178a95ec9 Merge pull request #220 from NREL/github_actions
246a9b1a67 Oops, sync with README CI badge.
e0f28d3d36 Force another CI run.
cf77d9038e running all tests again
8780dab56c removing circleci config
b9eaa1440e removing branch from badge
b930eb4549 fixing upload plots and badge again
86a3094bb7 fixing artifact upload and adding badge
4563a580ce adding Base.xml back in so plotting works
3a1ab10baf adding plotting
845d348f53 filtering down the tests so they run in a reasonable amount of time
0bd7f62005 adding artifact upload
e945a7358d adding first steps in workflow
14e2f2e33e Merge pull request #218 from NREL/hvac_sizing_improvements
9d9b0656aa Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into hvac_sizing_improvements
c70c030b89 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into hvac_sizing_improvements
4d1c2ddcb4 Merge commit '66e76fb499a90b01f757eb682b7f043efe614b3a' into hvac_sizing_improvements
4d928b18be Merge commit '66e76fb499a90b01f757eb682b7f043efe614b3a' into hvac_sizing_improvements
66e76fb499 Squashed 'hpxml-measures/' changes from 8d8ceb99d..63a4af67e
3809cd5c99 Merge commit '924af89d9a0a46e8600385ee9476a86dd8104ac5' into hvac_sizing_improvements
6228fe4747 Merge commit '924af89d9a0a46e8600385ee9476a86dd8104ac5' into hvac_sizing_improvements
924af89d9a Squashed 'hpxml-measures/' changes from b00cad665..8d8ceb99d
1d7a607430 Merge pull request #217 from NREL/json_output
c4dfbb209d Update output_map.
3b98a7e5ba Merge commit '19cf180afbb59648bd4a907fb4a4a04f70f22271' into json_output
83d3faf843 Merge commit '19cf180afbb59648bd4a907fb4a4a04f70f22271' into json_output
19cf180afb Squashed 'hpxml-measures/' changes from d0b528f98..ad18a1148
1dbfc70129 Merge commit 'eb56e4e6ce1b39a40f855082c9e0dabdfd03200c' into latest-os-hpxml
f75632ba21 Merge commit 'eb56e4e6ce1b39a40f855082c9e0dabdfd03200c' into latest-os-hpxml
eb56e4e6ce Squashed 'hpxml-measures/' changes from b00cad665..d0b528f98
2b32648190 Merge pull request #215 from NREL/adjust-floor-areas-relative-to-cfa
d725377524 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into adjust-floor-areas-relative-to-cfa
32d72cc18e Merge pull request #216 from NREL/latest-os-hpxml
74aa30f327 Merge commit 'd33c2e6f6d8269a2b02ef7792680981528930db5' into latest-os-hpxml
f0c159bb83 Merge commit 'd33c2e6f6d8269a2b02ef7792680981528930db5' into latest-os-hpxml
d33c2e6f6d Squashed 'hpxml-measures/' changes from fb14da08e..b00cad665
4d1a7a1a5f Remove warning exception.
45ba114db8 Merge commit '1326e324e153ef17095fddc7dbcb7a6ba16909c4' into latest-os-hpxml
1326e324e1 Squashed 'hpxml-measures/' changes from 8bbb5ea9b..fb14da08e
141fc07cd2 Merge commit '1326e324e153ef17095fddc7dbcb7a6ba16909c4' into latest-os-hpxml
a9e8179953 Update tests.
7a9c028dee Tny bugfix (doesn't impact results).
bea5cbd244 Merge commit 'b9a6b44a5d99521052edfa5d37cdb65c6888b9b3' into latest-os-hpxml
b9a6b44a5d Squashed 'hpxml-measures/' changes from 0271b6f89..8bbb5ea9b
8825b78095 Merge commit 'b9a6b44a5d99521052edfa5d37cdb65c6888b9b3' into latest-os-hpxml
f64b2925d5 Rename method.
00479bb2dd Adjusts FrameFloor/Slab areas adjacent to conditioned space so that they do not exceed CFA. The HES API already restricts these two areas to being close, so any adjustments will be small. Added test.
e6a99f2aa6 Merge pull request #213 from NREL/exit-code
62ee488827 Add tests.
33a5b03383 Fixes run_simula…
 into ansi_301_2022

# Conflicts:
#	hpxml-measures/HPXMLtoOpenStudio/measure.xml
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations1.csv
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations1_bills.csv
shorowit and others added 25 commits January 31, 2024 14:25
 into ansi_301_2022

# Conflicts:
#	hpxml-measures/HPXMLtoOpenStudio/measure.xml
#	hpxml-measures/docs/source/workflow_inputs.rst
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations2.csv
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations2_bills.csv
 into ansi_301_2022

# Conflicts:
#	workflow/tests/base_results/real_homes.csv
#	workflow/tests/base_results/sample_files1.csv
#	workflow/tests/base_results/sample_files2.csv
de4c1a408d Small tweaks to sensible fractions per ANSI 301-2022 Addendum C.
3e7f85a1f1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022
4f60b2e19c Merge pull request #1604 from NREL/detailed_perf_single_mode
9745b5ebf2 Latest results.
07d9b13779 Latest results.
fff77c0265 Bugfix for cooling only.
093e761dcf Allow, e.g., heating detailed performance data while cooling is defaulted.

git-subtree-dir: hpxml-measures
git-subtree-split: de4c1a408dad754aba5331a8df87035fa25a30a4
de05fb4e43 Latest results.
ea5d35d800 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022
87b63bfbec Merge pull request #1605 from NREL/pipe_lengths
d65f73faf8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into pipe_lengths
1013d3375f Merge pull request #1608 from NREL/vshp_min_compessor_temp
fcd302bda0 Merge pull request #1606 from NREL/ansi_301_2022_freezer
a7eb0f8430 Latest results.
4172da621e Now defaults to -20F for `CompressorLockoutTemperature` for variable-speed air-to-air heat pumps. Consistent with mini-split heat pumps.
454b045bae Update the changelog and docs.
cf18be5974 Update existing validation test to include extra fridge and freezer.
ac2ac083c2 Fix repeated text in docs, update another spot where pipe length calculation gets called.
b4697a5ba3 Latest results.
3f0968e608 Update the docs.
6188d3b091 Add sample file for freezer with temperature dependent schedule.
919c62f79d Update defaults test file.
27664f86b9 Support schedule coefficients for freezers.
39ba2b272e Missed a spot where standard pipe lengths are calculated
189871c2df update Changelog.md, rubocop
1c973d6893 Fix edge cases with both conditioned and unconditioned basements
dba1161968 Latest results.

git-subtree-dir: hpxml-measures
git-subtree-split: de05fb4e432b704cbdb4b463a85be4ddd32a722d
 into ansi_301_2022

# Conflicts:
#	Changelog.md
#	hpxml-measures/BuildResidentialHPXML/measure.xml
#	hpxml-measures/HPXMLtoOpenStudio/measure.xml
#	hpxml-measures/HPXMLtoOpenStudio/resources/hotwater_appliances.rb
#	hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations1.csv
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations1_bills.csv
#	workflow/tests/base_results/real_homes.csv
#	workflow/tests/base_results/sample_files2.csv
ANSI 301-2022: load profile schedules
1e6c86b10c ... and update stochastic schedules too.
2c20f7b6e6 Update docs too
52ea83786a General water use no longer follows fixtures schedule; remove from BuildResidentialScheduleFile measure.
1b22d8e8ab A little EMS program simplification.

git-subtree-dir: hpxml-measures
git-subtree-split: 1e6c86b10c27f84e785122b3e627df001ede0cb9
@shorowit shorowit marked this pull request as ready for review February 7, 2024 23:19
0200043b5a Merge pull request #1571 from NREL/ansi_301_2022
2ac2179df1 Latest results.
343240a853 Fix CI tests

git-subtree-dir: hpxml-measures
git-subtree-split: 0200043b5a9ceeb266837fed4e0fd56e2cdb60ad
@shorowit shorowit merged commit b5390e2 into latest-os-hpxml Feb 8, 2024
0 of 9 checks passed
@shorowit shorowit deleted the ansi_301_2022 branch February 8, 2024 01:46
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.

3 participants