-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed 'resources/hpxml-measures/' changes from 53efebbd9494..c2cec…
…15fe48a c2cec15fe48a Merge pull request #1749 from NREL/slab_wing_insulation fec6dc8d7299 Latest results. 535b72801bd4 Misc bugfixes and cleanup. 3944b04da96c Merge branch 'master' into slab_wing_insulation c5ef7c66cae6 Latest results. 368f10612854 Debug attempt to address nil comparison and Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into slab_wing_insulation a9e37ff37b70 Removing redundant statement in line 4334 of hvac_sizing.rb. 2ec49599cbd0 Adding further conditions to utilizing exterior horizontal insulation in ACCA Manual J calculations for HVAC sizing, and adjusting the conditions to independently account for insulations encountered in the soil path. 383a9ff6e55f Adding exterior horizontal insulation R-value to the total soil path R-value for HVAC sizing calculations. 1c6a574ac061 Merge branch 'slab_wing_insulation' of https://github.com/NREL/OpenStudio-HPXML into slab_wing_insulation 738e135a3c72 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into slab_wing_insulation b05daf0da0f4 Merge branch 'master' into slab_wing_insulation 4be66fdaf6c0 Test commit. 584eff2d03df Changelog updated. 3d1c454e8737 Latest results. 9de6227d3c7c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into slab_wing_insulation 29f81af2be94 Debug commit: object name fixed for test_validation.rb line 1012 32574cc549ea _hpxml_bldg changed to hpxml_bldg in test_validation.rb line 1011 55b98ee665cc Temporary commit. 035413a8d203 Temporary commit. 3f2f20804a53 Merge branch 'master' into slab_wing_insulation 635a0fb024bf Debug commit. a022f4bfb5a5 Temporary commit 9d938da36dde Latest results. ce9f2db44256 Revert additional HPXML changes. d2f37f369be9 Remove empty elements from sample HPXML files and misc cleanup. 8b6aec152d3e Change measure arguments to be optional. faa903a0a2ef Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into slab_wing_insulation c013b49cc107 Fix tests and docs. bbb825dd7bd0 Merge branch 'master' into slab_wing_insulation 0044ff9a4a73 Temporary commit. dce6d0fec1bc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into slab_wing_insulation 8d61af234ab5 Documentation comment added per review comment. 2b7c80f3815d Comments added with TODO identifying added parameters. b91866fa685d Merge branch 'master' into slab_wing_insulation 321669751114 Merge branch 'slab_wing_insulation' of https://github.com/NREL/OpenStudio-HPXML into slab_wing_insulation 4635e7e30272 Partially addressed review comments. test_slabs modification remaining. 7d23178aa6a2 Update BuildResidentialHPXML/measure.rb 4cbb7b05e61f Temporary commit. c0b9d48656db Fix bad merge conflict resolution. 39a00a9a1113 Debug commit. 6071e6de0bc4 Update measure.xml ee3ae7f35479 Merge branch 'master' into slab_wing_insulation 8d014a6cc1eb Documentation updated. a757bfe90873 Latest results. edf286cfa12c Fix docs error. 9cbf3b1780f3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into slab_wing_insulation 12a824d1c2c8 Fix CI failures. f351532fdc4d Debug commit. abd82e106b37 Merge branch 'master' into slab_wing_insulation 68151b4cf7b8 Merged latest master. e0dc8f8d1d61 Debug commit. 8a227a06f334 Updates. 1f6118eb143b Debug commit. 1a82461cf24f Documentation image update. Debug ongoing. d79922c8aaf6 debug commit 5f5353397fe9 temporary commit 8053f3b9c0e3 Merge branch 'master' into slab_wing_insulation 699ef040eee5 temporary commit 3ffbadbfc98f Schema update git-subtree-dir: resources/hpxml-measures git-subtree-split: c2cec15fe48a61ed2d78a504bb758f4028d2833f
- Loading branch information
1 parent
b01646b
commit c36b76c
Showing
27 changed files
with
927 additions
and
128 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
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.