Latest OS-HPXML #1187
Merged
Latest OS-HPXML #1187
Conversation
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
…af84e52 59683af84e52 Merge pull request #1570 from NREL/grout_conductivity e60afa7a1831 Latest results. c6975335ff75 Allow warning for sample file 6bf6989b9f84 Fix for a few more unit tests. Hopefully all passing? 047531ba9206 Make sure we don't go above/below our min/max number of boreholes. b17f9b981d68 Fix failing test (update grout k assumption) c58b51a93745 Update tests with new default conductivity values. We'll probably still have a few failing tests as results change when running the model, I'll do those next. 329b490cba86 Update grout conductivity values bbe7db13612f Merge pull request #1472 from NREL/gshp_curve_update 90df35f2e64c Update Changelog.md [ci skip] 250626502905 Latest results. 6e29447f6da8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_curve_update 62b24ec63346 Merge pull request #1391 from NREL/geothermal_loop 7347e1efb429 Latest results. 1f78126a8b26 Move Changelog items to v1.8 [ci skip] 1bb05ddbdb47 Merge branch 'geothermal_loop' of https://github.com/NREL/OpenStudio-HPXML into geothermal_loop bee16722c222 Improve handling for when bore depth or # bores (but not both) are defaulted. Simplify docs related to soil inputs. 3b4861279a60 Latest results. 12331d4817b1 Fix CI error 2d757197ed82 Minor cleanup. Prevent multiple GSHPs from being connected to a geothermal loop and add test. 9451af5c4953 Fix incorrect previous conflict resolution. 21d6b12e4ea4 Merge branch 'geothermal_loop' of https://github.com/NREL/OpenStudio-HPXML into gshp_curve_update c4b735e4e4b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geothermal_loop 5166661435a3 Oops, wrong base branch. Rebase off 'geothermal loop' 061edda37ea7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_curve_update 95796d47556a Remove old curve values, clean up comments 64e6acc56b22 Merge pull request #1568 from NREL/schematron_constraints ca535913255e Fix CI d1475a75b969 Add/update tests. Bugfixes. e72ddd62db75 Forgot to commit updated docs [ci skip] 9a4a9da50215 Add more schematron value constraints where the HPXML schema doesn't have them. Clarify in docs as to whether numeric ranges are inclusive or exclusive. 438ad8b58a57 Merge pull request #1567 from NREL/fix_allow_increased_fixed_capacities 73471ed27166 Merge branch 'master' into geothermal_loop 2670d42c3294 Reference valid configs in build measure. f19751133b70 Update Changelog.md [ci skip] 1843fe5e448d Fixes error if using AllowIncreasedFixedCapacities=true w/ HP detailed performance data. a77a6e575327 Merge pull request #1566 from NREL/low_cooling_shr 6a272b2e34a3 Error-checking for unrealistically low HVAC SensibleHeatFraction values (less than or equal to 0.5). 87f4819600f9 Merge branch 'master' into geothermal_loop 43bd6eec4887 Merge pull request #1563 from NREL/remove_sizing_method c2b3177bf2f7 Method was deprecated in NREL/OpenStudio-HPXML@b2b89b8. 52090cb1d68e Latest results. fd16adb374aa Merge branch 'geothermal_loop' into gshp_curve_update d825962e4882 Merge branch 'master' into geothermal_loop 7161daa586ad Latest results. aac78ef8bc79 Update sizing tests since pipe diameter affects bore length. f53e30728be2 Change default pipe diameter from 3/4in to 1-1/4in. c15a7bec61fd Merge branch 'master' into geothermal_loop d9d8e7466a5b Fix typo in docs. [ci skip] a97d11b48e84 Latest results. 04f499d46d05 Merge branch 'geothermal_loop' of github.com:NREL/OpenStudio-HPXML into geothermal_loop 54e1dd0436c6 Update conductivity/diffusivity defaulting to preserve 1.0/0.0208 relationship. 202a041e017a Latest results. df577b88ca10 Remove old ground conductivity lines in epvalidator. 90ec46ae1ada Move g_functions directory under the data directory. d0c1d559d8c5 Merge branch 'master' into geothermal_loop 0c18e95a44fc Few more updates in docs. 70de9a74aabe Latest results. d164a0f7c007 Update documentation on "auto" option for BoreholesOrTrenches/Length a9afb26479f7 Allow boreholes count default when rectangle config provided. 45666a943945 Merge branch 'master' into geothermal_loop 7897cb03aa82 Merge branch 'gshp_curve_update' of https://github.com/NREL/OpenStudio-HPXML into gshp_curve_update 7457278eb2b8 New heating coefficients! Results in a 5-10% decrease in heating COP, still making sure this is the final set we want to run with but MUCH closer to our existing results. 13e68a818655 Latest results. 067d8e77fa36 Update some autosize TODOs in docs. c0a51e0c9288 Some cleanup and refactoring. dd1a9e878548 Merge branch 'geothermal_loop' into gshp_curve_update 70379b36649f Merge branch 'master' into geothermal_loop dd67d3b821cd Fix test after moving a method. dac12db4b94a More default tests around loop flow, num bore holes, bore length. 7f2ddf7074ca Fix new validation test. 94b2e6fa432f Forgot to save file. aedc6816e08d Move some new gshp related methods from hvac to hvacsizing. d46e043d36c2 Add new validation test for unattached gshp. 60986f3b6204 Add defaults test for thermally enhanced pipe type. ab3de917828c Update the docs. 9372b98b566c Simplify conductivity and diffisivity defaulting. 0df5e8b0a3f8 Remove line in epvalidator. 6774db261144 Comment on why frac_glycol was changed. b400b5596fd7 Latest results. deb2f339231c Move some inputs from tasks.rb to workflow/hpxml_inputs.json. [ci skip] 949dab7ddedb Update measure.xml 2eb1f7b4c0ef Minor updates to sample files, changelog, and EPvalidator.xml. ef916b41d84f Latest results. 76d79cc1a203 Merge branch 'master' into geothermal_loop 774cfe849978 Merge branch 'master' into geothermal_loop 47b8ad5752cd Merge branch 'master' into geothermal_loop 30dcc2a2c37f Latest results. b9fc6283fb13 Update tests after ground temps merge. eddd67c3fd67 Merge branch 'ground_temperatures2' into geothermal_loop afb8897b984c Merge branch 'ground_temperatures2' into geothermal_loop 657841620bd2 Merge branch 'master' into geothermal_loop 3eeec58b57e1 Latest results. 818aacae4a67 Found it. 7c753dee8ebc Update a few more new tests. 9e0ff5a85660 Update new test. 35a675fcda87 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geothermal_loop bf03e5528fe8 Latest results. cde46756a7e6 Merge branch 'master' into geothermal_loop b003c807fb7c Latest results. 36d9f8e3295a Merge branch 'master' into geothermal_loop d37d8ae23cb1 Latest results. 8e0cad7f6e3a Update sizing test after pulling ground temp changes in. a5479a8a61f8 Merge branch 'ground_temperatures' into geothermal_loop 76cf5f3d170a Latest results. 1857230bca4d Merge branch 'geothermal_loop' of github.com:NREL/OpenStudio-HPXML into geothermal_loop abe4907462b3 Update sizing test after pulling ground temp changes in. 9f05cd44a4ea Latest results. 2e2f406d1c9c Add shank spacing back into sample file. f2cb78bba6b8 Merge branch 'ground_temperatures' into geothermal_loop f92b988895df Latest results. 4356113a5465 Remove shank spacing from build measure. 938d53a52fd6 Latest results. 8878d231edaf Merge branch 'geothermal_loop' into gshp_curve_update e95bc7b820fd Merge branch 'ground_temperatures' into geothermal_loop c2da0583c14c Regenerate sample files. d99b85c045ac Merge branch 'ground_temperatures' into geothermal_loop 17dea007d5ca Update hvac_sizing and validation tests. 0f81e69186fa Prevent bore autosizing from leading to errors. 1af2523d2d6d Pass runner through hpxml_defaults to hvac_sizing. a1a011cb0288 Check boreholes between 1 and 10 in epvalidator. 33d166c18e8f Add more validation tests. cf142ef401aa Add min/max bore depths to epvalidator. 17388c9e4faf Latest results. c096685b1078 Merge branch 'ground_temperatures' into geothermal_loop 244e08624828 Merge pull request #1481 from NREL/geothermal_loop2 6304889e3113 Missed a size method. 7a57f41aced6 Refactor methods around g function jsons, etc. 1c822ef8126d Update min and max error, test, and docs. 339aa359268f Updates for soil and moisture type arguments, docs, etc. e220b458d39d Add new loop config argument, update docs and tests. 35d3f03a9fdd Latest results. aca6d0926042 Update the docs. 9ca09f6c6d6c Revert geothermal loop default and fix tests. 8b61136d3dd1 Combine grout and pipe type choices into one. 0ad85a9288fb Update bore config argument to default to none. d8c115076cba Rename some sample files and regenerate. 614b0e9c4e15 Update docs and remove temporary sample files. d309d85cf800 Misc cleanup around unit conversions, comments. d092b1474543 Add comment where default values come from. 6b5f7b731205 Check that geothermal loop is connected to heat pump. 37e937cf6eee Remove extra line in epvalidator. a092aa5f671f Deprecate old ground conductivity field. 1982a5d1b684 Move geothermal loop line in epvalidator. eb233f1541f7 Change pipe_size to pipe_diameter. d80694e7d55e Use grout and pipe type in build measure. b5af3087918c Simplify code in hpxml defaults. 42ef6acaf62b Delete loop idref on heat pump. 9319b0dc3534 Simplify soil type constants. 6cee7f513a74 Add a readme for g_functions files. b55a59cca06b Move borefield config arg to the top. cd5eb1a81df9 Set g function ref ratio as radius over length. aefc7ce4654f Merge branch 'geothermal_loop' into gshp_curve_update ff35611236bb Merge branch 'ground_temperatures' into geothermal_loop 600f955ba2da Latest results. 944a4d205555 Latest results. 93f97c23a13f Merge branch 'geothermal_loop' into gshp_curve_update c8ebfc19b357 Merge branch 'ground_temperatures' into geothermal_loop 998411affd83 Latest results. e0ac2d2963e6 Slight update to curves to try to match rated conditions (might be slightly > 2% off because of how you make the performance maps), but way closer than 50% off. Also actually added rated conditions rather than default to help with warnings adbb0794b7ff Use new curves for both heating and cooling, rather than a weird mix 0d7f020ded67 Add new curves based on latest ClimateMaster TS product bb238b772f89 Latest results. b63a4baa3599 Merge branch 'gshp-sample-files' into geothermal_loop 279a9deee31e Latest results. dc14dd53968a Update new sample files. 04c71ce84131 Skip unmet hours check for 1ton. b97b603d06e1 Refine conductivity and diffusivity defaults. 9aac13c4f19b Merge branch 'gshp-sample-files' into geothermal_loop 3cc3b0f9d39d Add sample files for a range of gshp sizes. 09ecc1bea502 Merge branch 'master' into geothermal_loop 15dfc7506546 Merge pull request #1458 from NREL/soil-moisture-types 13e84e04e351 Update the changelog. [ci skip] 8be8ca48b420 Latest results. ffaeee86933e Reduce the number of new sample files. 9fae5e115054 Update epvalidator and add error message test. 9afc67804899 Latest results. 0682f2d3bd93 Fix site defaults test. dbc369f90678 Update the docs. 94e68c4f7091 Update defaults for mixed moisture type. 907dfec4dd43 Allow mixed moisture type in build measure. ec9ee2d97b74 Merge branch 'geothermal_loop' into soil-moisture-types c05e69e3bd11 Merge branch 'master' into geothermal_loop 8fbb35ceb8d5 Latest results. 225de1f58e6a Generate whole set of soil/moisture sample files for testing. 49939722d728 Updates for active length adjustments. 12639ffcdf2e Add tests for defaults. 26224203512b Update argument descriptions in build measure. 4550f9caef7c Latest results. da27f7f302fb Try wet clay sample file instead. c4430fafc296 Merge branch 'geothermal_loop' into soil-moisture-types da0c3b073a62 Update the docs and sample files. 4884771d072b Update defaults based on a more comprehensive source. 9f9485c684a1 Update build measure for additional soil types. 9a1d22e1e841 Merge branch 'master' into geothermal_loop 0d37c63629ae Fix footnotes in docs. 7dff9235be18 Latest results. 7353f725b919 Update the docs. fd1c8e28cb85 Update sample files for combos of soil and moisture types. 298749113db5 Update defaulting to use soil and moisture type. 25bc87175178 Add build arguments for soil and moisture type. 8c0fcf2c9c1f Latest results. 02c3a89d4107 Reorganize new geothermal loop sample files. 3e60c224cac9 Add test for invalid borefield config. 2de40bbe7e54 Latest results. ee7020c07dec Update tests and sample files. 35ef1e4f5fbe Update comment in util rb. 16061f2718cf Remove trench kw from build measure arguments. ae8266b249bf Update the docs. ce6cefab8d1c Update depth max in hvac_sizing. 15f9bb02f8c3 Update the changelog. [ci skip] 806ba6a9548f Update the frac_glycol assumed value to 0.2. 546c95ec37b2 Merge branch 'master' into geothermal_loop 9372edb0d413 Latest results. 0cde439bbdb7 Merge branch 'master' into geothermal_loop 29c5dc1cbe2d Merge pull request #1412 from NREL/g_function_library b6222b9a2fa7 Minor update in epvalidator. [ci skip] 6e5f9446a46c Update the changelog. [ci skip] f6187d0715af Merge branch 'g_function_library' of github.com:NREL/OpenStudio-HPXML into g_function_library 7e42335631a0 Consolidate borehole and filename maps, and write new test. 73cac55ae75b Update test and avoid overwriting json keys. 41c66345a362 Latest results. b9ab339cfda1 Update a comment. [ci skip] 08f95692bfba Allow C config with 7 or 9 boreholes. 495c2ca2e714 Zoned rectangle has no valid m_n. 8ab56cd64e03 Add key2 for C, Open, U. 60a151706d4f temporary commit for debugging 57dabfe06812 Merge branch 'geothermal_loop' into g_function_library 1a4af66fd03c Update the linear interpolation test. 495a079201fd Refactor the download_g_functions method. e29ed39023d8 Latest results. 42a803834e2a Merge branch 'g_function_library' of https://github.com/NREL/OpenStudio-HPXML into g_function_library 5b71f1412d78 try2 2822a2cb327c Latest results. 4a68777db453 Merge branch 'geothermal_loop' into g_function_library 210e020e4018 Merge branch 'master' into geothermal_loop 69f37d35becb Further downselecting JSONs. 59e7479de8f4 Latest results. 234c8a37f211 Latest results. 4f5bb0ec64ff Merge branch 'geothermal_loop' into g_function_library d431413c27ec Merge branch 'master' into geothermal_loop 95fdc8896e38 Latest results. bacc0e9bc228 try 1 04dff85cadb8 Latest results. 32d5b98c3b56 Test for bore depth outside of valid range. 067ac61fc581 Update g function method with optional n_x_m arg we can use for testing. c50f167bb7b0 Latest results. 1794659438a6 Merge branch 'geothermal_loop' into g_function_library 91b4ab855cf3 Merge branch 'master' into geothermal_loop 93610481acfc Update hvac tests for checking against direct lookup and interpolation example. 5c96a4483768 Update g_function downselect to include more configurations. 840119c01166 Latest results. ee5e46f4bf3d Latest results. dae2ad073565 Merge branch 'geothermal_loop' into g_function_library ea5f54212b71 Merge branch 'master' into geothermal_loop ab99f473af78 Stub an hvac test for checking geothermal loop and gfunction values. 3a3e17da754d New geothermal loop sample file with all fields defined. 2d162b31e732 Add a validation test for invalid bore holes with a configuration. 2c564dfada63 Merge branch 'master' into g_function_library 5b4cdc5d5053 Use already existing interp2 method. ea7dd6d50659 Merge branch 'g_function_library' of github.com:NREL/OpenStudio-HPXML into g_function_library 95bc5ca6b00a Defaults test needs valid bore length. 3ed3a1be6f17 Latest results. cad89b207b3f Update the docs for constraints on borehole length. 4fc1bd7e7305 Try allowing variable spacing, depth, diameter by using linear interpolation. f0879e79c063 Latest results. 6633d9bb2d73 Finish the map for g function json file names. f66afd1919f7 Updates to the build measure. 85e64fbd695b Update defaults test and epvalidator. 6764c36ffbdb Update the docs. 6b4177cbcb27 Make the leap to using g function library. 2c864755ec8c Default bore spacing to 5 m. 16892a6ee383 Update gitignore for full gfunction zip just in case. 38c6b01135e6 Add example processed gfunction json files. c3e42e32e1e5 Add g_functions util for processing contents. 149c957dbc5d Add new task for downloading gfunction zip. fdc4e4143a15 Latest results. 2517f8c5a870 Another hpxml constants update. 2096f4463cfe Update defaults test and other minor edits. b96bb57d78e1 Add borefield config sample hpxml file. bc908f5c1b00 Update translator resources for borefield config arg. 71da38a2f7da Add borefield config arg to build measure. fbe83f1fd20a Minor typo in docs. [ci skip] 10c048ff2b2a Add units for diffusivity in build measure. 9e6f27e0fb2e Typo in docs. [ci skip] 4db5f0cd465b Add a defaults test for geothermal loops. 2a3a6abb8d59 Updates for vertical and grout type. 3a3c7d1a1384 Typos in epvalidator. 9564143fb384 Latest results. c0fcdbc00da5 Updates to docs. e67bba00032b Updates to epvalidator. c7271cc2f022 Add loop before anything else in defaults resource. 65af2416f5d7 Update the docs. 1e190b28ad5b Sample files for testing individual loop arguments. 7725cac5c3f4 Updates for shank spacing. e1c508c8a0ec Latest results. a8afefd65ad0 Update build description, hvac sizing, and docs. 8409a550abe4 Update the docs. 59f2479f686e Update hpxml inputs json and sample files. a8338fe3163c Update translator measure, resource files, and epvalidator. 4ac46f79e272 Add more geothermal loop arguments to build measure. 66b963609996 Regenerate sample files. 708cf6d5d614 Default geothermal sizing properties only if loop exists. b99479fbffa5 Add a ground loop sample file with hardset properties. a5d62bf62138 Allow ground loop to be hardsized. 0c460bea2df6 Add some geothermal loop args to build measure. 844ecd6e5e5a Merge branch 'master' into geothermal_loop 1831be7a5799 Merge branch 'master' into geothermal_loop 9aa87785a77e Update ground conductivity is zero validation test. e16630f8a959 Merge branch 'master' into geothermal_loop adf658451950 Minor fixes to epvalidator. 8784ec639cde Move ground conductivity over to new soil element. 82bd1c76daae Merge branch 'master' into geothermal_loop 8276e7e2d605 Demonstrate loop properties defaulted in resource file. ab6bd542431a Typo. 4e93fb13b19d Demonstrate new geothermal loop fields in existing shared ground loop sample file. 5ce9ecb46329 Update epvalidator for the new geothermal loop fields. b183354cdb07 Stub new geothermal loop classes in hpxml resource file. git-subtree-dir: resources/hpxml-measures git-subtree-split: 59683af84e526fae4a3988147bae3a3a84ee1f75
shorowit
reviewed
Dec 20, 2023
measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.osw
Outdated
Show resolved
Hide resolved
…3d389bd c9e7f3d389bd Merge pull request #1574 from NREL/geothermal_loop_config 3dd1707320fc Throw a warning, and skip adding geothermal loop, if no gshp. 96c0bd1cab8c Update workflow/hpxml_inputs.json. 47b312551f44 Update build measure readme and measure xml. 30bd5bfa4560 Make geothermal_loop_configuration optional. git-subtree-dir: resources/hpxml-measures git-subtree-split: c9e7f3d389bde29342b8bb5a1f1ad178cc78237f
|
Thanks, @joseph-robertson ! Good to have the geothermal heat pump models revamped after at least a decade! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Description
Pulls in:
AllowIncreasedFixedCapacities=true w/ HP detailed performance data OpenStudio-HPXML#1567Checked means that something in resstock was changed or updated as a result of pulling in.
Checklist
Not all may apply:
If related to resstock-estimation, checklist includes data dictionary, source report, options saturation, options_lookup.openstudio tasks.rb update_measureshas been run