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

Geothermal loop & soil properties #1126

Closed
wants to merge 39 commits into from

Conversation

joseph-robertson
Copy link
Contributor

@joseph-robertson joseph-robertson commented Aug 24, 2023

Pull Request Description

Test NREL/OpenStudio-HPXML#1391.

New BuildResidentialHPXML measure arguments we can start assigning values to:

  • site_soil_and_moisture_type
  • site_ground_conductivity (not new - we weren't previously assigning values in options_lookup.tsv)
  • site_ground_diffusivity
  • geothermal_loop_configuration
  • geothermal_loop_borefield_configuration
  • geothermal_loop_loop_flow
  • geothermal_loop_boreholes_count
  • geothermal_loop_boreholes_length
  • geothermal_loop_boreholes_spacing
  • geothermal_loop_boreholes_diameter
  • geothermal_loop_grout_type
  • geothermal_loop_pipe_type
  • geothermal_loop_pipe_diameter
  • geothermal_loop_pipe_shank_spacing

All are optional except for geothermal_loop_configuration.

Checklist

Not all may apply:

…772f8

bb238b772f8 Latest results.
b63a4baa359 Merge branch 'gshp-sample-files' into geothermal_loop
279a9deee31 Latest results.
dc14dd53968 Update new sample files.
04c71ce8413 Skip unmet hours check for 1ton.
b97b603d06e Refine conductivity and diffusivity defaults.
9aac13c4f19 Merge branch 'gshp-sample-files' into geothermal_loop
3cc3b0f9d39 Add sample files for a range of gshp sizes.
09ecc1bea50 Merge branch 'master' into geothermal_loop
15dfc750654 Merge pull request #1458 from NREL/soil-moisture-types
13e84e04e35 Update the changelog. [ci skip]
8be8ca48b42 Latest results.
ffaeee86933 Reduce the number of new sample files.
9fae5e11505 Update epvalidator and add error message test.
9afc6780489 Latest results.
0682f2d3bd9 Fix site defaults test.
dbc369f9067 Update the docs.
94e68c4f709 Update defaults for mixed moisture type.
907dfec4dd4 Allow mixed moisture type in build measure.
ec9ee2d97b7 Merge branch 'geothermal_loop' into soil-moisture-types
c05e69e3bd1 Merge branch 'master' into geothermal_loop
8fbb35ceb8d Latest results.
225de1f58e6 Generate whole set of soil/moisture sample files for testing.
49939722d72 Updates for active length adjustments.
12639ffcdf2 Add tests for defaults.
26224203512 Update argument descriptions in build measure.
4550f9caef7 Latest results.
da27f7f302f Try wet clay sample file instead.
c4430fafc29 Merge branch 'geothermal_loop' into soil-moisture-types
da0c3b073a6 Update the docs and sample files.
4884771d072 Update defaults based on a more comprehensive source.
9f9485c684a Update build measure for additional soil types.
9a1d22e1e84 Merge branch 'master' into geothermal_loop
0d37c63629a Fix footnotes in docs.
7dff9235be1 Latest results.
7353f725b91 Update the docs.
fd1c8e28cb8 Update sample files for combos of soil and moisture types.
298749113db Update defaulting to use soil and moisture type.
25bc8717517 Add build arguments for soil and moisture type.
8c0fcf2c9c1 Latest results.
02c3a89d410 Reorganize new geothermal loop sample files.
3e60c224cac Add test for invalid borefield config.
2de40bbe7e5 Latest results.
ee7020c07de Update tests and sample files.
35ef1e4f5fb Update comment in util rb.
16061f2718c Remove trench kw from build measure arguments.
ae8266b249b Update the docs.
ce6cefab8d1 Update depth max in hvac_sizing.
15f9bb02f8c Update the changelog. [ci skip]
806ba6a9548 Update the frac_glycol assumed value to 0.2.
546c95ec37b Merge branch 'master' into geothermal_loop
9372edb0d41 Latest results.
0cde439bbdb Merge branch 'master' into geothermal_loop
29c5dc1cbe2 Merge pull request #1412 from NREL/g_function_library
b6222b9a2fa Minor update in epvalidator. [ci skip]
6e5f9446a46 Update the changelog. [ci skip]
f6187d0715a Merge branch 'g_function_library' of github.com:NREL/OpenStudio-HPXML into g_function_library
7e42335631a Consolidate borehole and filename maps, and write new test.
73cac55ae75 Update test and avoid overwriting json keys.
41c66345a36 Latest results.
b9ab339cfda Update a comment. [ci skip]
08f95692bfb Allow C config with 7 or 9 boreholes.
495c2ca2e71 Zoned rectangle has no valid m_n.
8ab56cd64e0 Add key2 for C, Open, U.
60a151706d4 temporary commit for debugging
57dabfe0681 Merge branch 'geothermal_loop' into g_function_library
1a4af66fd03 Update the linear interpolation test.
495a079201f Refactor the download_g_functions method.
e29ed39023d Latest results.
42a803834e2 Merge branch 'g_function_library' of https://github.com/NREL/OpenStudio-HPXML into g_function_library
5b71f1412d7 try2
2822a2cb327 Latest results.
4a68777db45 Merge branch 'geothermal_loop' into g_function_library
210e020e401 Merge branch 'master' into geothermal_loop
69f37d35bec Further downselecting JSONs.
59e7479de8f Latest results.
234c8a37f21 Latest results.
4f5bb0ec64f Merge branch 'geothermal_loop' into g_function_library
d431413c27e Merge branch 'master' into geothermal_loop
95fdc8896e3 Latest results.
bacc0e9bc22 try 1
04dff85cadb Latest results.
32d5b98c3b5 Test for bore depth outside of valid range.
067ac61fc58 Update g function method with optional n_x_m arg we can use for testing.
c50f167bb7b Latest results.
1794659438a Merge branch 'geothermal_loop' into g_function_library
91b4ab855cf Merge branch 'master' into geothermal_loop
93610481acf Update hvac tests for checking against direct lookup and interpolation example.
5c96a448376 Update g_function downselect to include more configurations.
840119c0116 Latest results.
ee5e46f4bf3 Latest results.
dae2ad07356 Merge branch 'geothermal_loop' into g_function_library
ea5f54212b7 Merge branch 'master' into geothermal_loop
ab99f473af7 Stub an hvac test for checking geothermal loop and gfunction values.
3a3e17da754 New geothermal loop sample file with all fields defined.
2d162b31e73 Add a validation test for invalid bore holes with a configuration.
2c564dfada6 Merge branch 'master' into g_function_library
5b4cdc5d505 Use already existing interp2 method.
ea7dd6d5065 Merge branch 'g_function_library' of github.com:NREL/OpenStudio-HPXML into g_function_library
95bc5ca6b00 Defaults test needs valid bore length.
3ed3a1be6f1 Latest results.
cad89b207b3 Update the docs for constraints on borehole length.
4fc1bd7e730 Try allowing variable spacing, depth, diameter by using linear interpolation.
f0879e79c06 Latest results.
6633d9bb2d7 Finish the map for g function json file names.
f66afd1919f Updates to the build measure.
85e64fbd695 Update defaults test and epvalidator.
6764c36ffbd Update the docs.
6b4177cbcb2 Make the leap to using g function library.
2c864755ec8 Default bore spacing to 5 m.
16892a6ee38 Update gitignore for full gfunction zip just in case.
38c6b01135e Add example processed gfunction json files.
c3e42e32e1e Add g_functions util for processing contents.
149c957dbc5 Add new task for downloading gfunction zip.
fdc4e4143a1 Latest results.
2517f8c5a87 Another hpxml constants update.
2096f4463cf Update defaults test and other minor edits.
b96bb57d78e Add borefield config sample hpxml file.
bc908f5c1b0 Update translator resources for borefield config arg.
71da38a2f7d Add borefield config arg to build measure.
fbe83f1fd20 Minor typo in docs. [ci skip]
10c048ff2b2 Add units for diffusivity in build measure.
9e6f27e0fb2 Typo in docs. [ci skip]
4db5f0cd465 Add a defaults test for geothermal loops.
2a3a6abb8d5 Updates for vertical and grout type.
3a3c7d1a138 Typos in epvalidator.
9564143fb38 Latest results.
c0fcdbc00da Updates to docs.
e67bba00032 Updates to epvalidator.
c7271cc2f02 Add loop before anything else in defaults resource.
65af2416f5d Update the docs.
1e190b28ad5 Sample files for testing individual loop arguments.
7725cac5c3f Updates for shank spacing.
e1c508c8a0e Latest results.
a8afefd65ad Update build description, hvac sizing, and docs.
8409a550abe Update the docs.
59f2479f686 Update hpxml inputs json and sample files.
a8338fe3163 Update translator measure, resource files, and epvalidator.
4ac46f79e27 Add more geothermal loop arguments to build measure.
66b96360999 Regenerate sample files.
708cf6d5d61 Default geothermal sizing properties only if loop exists.
b99479fbffa Add a ground loop sample file with hardset properties.
a5d62bf6213 Allow ground loop to be hardsized.
0c460bea2df Add some geothermal loop args to build measure.
844ecd6e5e5 Merge branch 'master' into geothermal_loop
1831be7a579 Merge branch 'master' into geothermal_loop
9aa87785a77 Update ground conductivity is zero validation test.
e16630f8a95 Merge branch 'master' into geothermal_loop
adf65845195 Minor fixes to epvalidator.
8784ec639cd Move ground conductivity over to new soil element.
82bd1c76daa Merge branch 'master' into geothermal_loop
8276e7e2d60 Demonstrate loop properties defaulted in resource file.
ab6bd542431 Typo.
4e93fb13b19 Demonstrate new geothermal loop fields in existing shared ground loop sample file.
5ce9ecb4632 Update epvalidator for the new geothermal loop fields.
b183354cdb0 Stub new geothermal loop classes in hpxml resource file.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: bb238b772f898841a3249e91b0f032237bf4aaf9
GitHub Action and others added 4 commits August 25, 2023 01:11
…1236b

ff35611236b Merge branch 'ground_temperatures' into geothermal_loop
3a70bf49778 Merge branch 'gshp_fanpump_adjust' into ground_temperatures
adc9580a56a Latest results.
600f955ba2d Latest results.
21e90626902 Latest results.
3a961906f77 Update expected cop values in gshp unit tests.
c8ebfc19b35 Merge branch 'ground_temperatures' into geothermal_loop
9195f577570 Add a weather test for checking all iecc zones.
0f05b454314 Add hvac_sizing call to get undisturbed ground temperature.
7c7096ac7fa Add ground temperatures csv table.
6c42705d051 Add method for getting undisturbed ground temperature from table.
cfbf0c72bd2 Merge branch 'master' into gshp_fanpump_adjust
eafe7187bc6 Latest results.
1700de73239 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
8eaad369637 Merge branch 'gshp_fanpump_adjust' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
823c299f9ff Same result, but equations are simplified and more readable
0b45c71ef08 Latest results.
0bedf67a04f Use the new adjustments, not the old ones. Oops.
03d571f21ea Updates to fan/pump adjustment. Now gives reasonable values, slightly different from the old adjustment. Still needs a little cleanup before review.
d0693044310 Merge branch 'gshp_fanpump_adjust' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
6ed5ff552b6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
44a23717a59 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
265c88f1900 Moving to a size independent calculation
194a2d4161b Initial attempt at adjustment. Moved the fan/pump adjust code to right before we need the values, rewrote fan/pump adjustment to account for sizing. Still need to double check pump adjustment is being applied correctly.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: ff35611236bbfb38d3cd026e3f58e63a19c4f625
n_buildings_represented: 139647020 # American Community Survey 2021 5-year, B25001, does not include territories

upgrades:
- upgrade_name: GSHP
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is one option for testing the new GSHP changes. Per NREL/OpenStudio-HPXML#1472 (comment), we decided that the preferred approach is to instead create new TSV file(s). So, this YML can probably be removed.

resources/options_lookup.tsv Outdated Show resolved Hide resolved
@joseph-robertson joseph-robertson changed the base branch from develop to geothermal_loop_baseline September 7, 2023 21:50
joseph-robertson and others added 17 commits September 7, 2023 14:52
…9e4fa

17388c9e4fa Latest results.
c096685b107 Merge branch 'ground_temperatures' into geothermal_loop
f409f236afc Update a few enclosure and weather tests.
5f8486ba585 Latest results.
244e0862482 Merge pull request #1481 from NREL/geothermal_loop2
c49b1724e1b Merge branch 'ground_temperatures' of github.com:NREL/OpenStudio-HPXML into ground_temperatures
75e61c7ff5b Pull undisturbed adj into existing ground temp method.
5eb2120a804 Latest results.
4d5632e13b2 Undisturbed ground temps vary by TMY.
6304889e311 Missed a size method.
7a57f41aced Refactor methods around g function jsons, etc.
1c822ef8126 Update min and max error, test, and docs.
339aa359268 Updates for soil and moisture type arguments, docs, etc.
e220b458d39 Add new loop config argument, update docs and tests.
35d3f03a9fd Latest results.
aca6d092604 Update the docs.
9ca09f6c6d6 Revert geothermal loop default and fix tests.
8b61136d3dd Combine grout and pipe type choices into one.
0ad85a9288f Update bore config argument to default to none.
d8c115076cb Rename some sample files and regenerate.
614b0e9c4e1 Update docs and remove temporary sample files.
d309d85cf80 Misc cleanup around unit conversions, comments.
d092b147454 Add comment where default values come from.
6b5f7b73120 Check that geothermal loop is connected to heat pump.
37e937cf6ee Remove extra line in epvalidator.
a092aa5f671 Deprecate old ground conductivity field.
1982a5d1b68 Move geothermal loop line in epvalidator.
eb233f1541f Change pipe_size to pipe_diameter.
d80694e7d55 Use grout and pipe type in build measure.
b5af3087918 Simplify code in hpxml defaults.
42ef6acaf62 Delete loop idref on heat pump.
9319b0dc353 Simplify soil type constants.
6cee7f513a7 Add a readme for g_functions files.
b55a59cca06 Move borefield config arg to the top.
cd5eb1a81df Set g function ref ratio as radius over length.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 17388c9e4faf8c36f95a1642acf99dac4f804502
…b820f

e95bc7b820f Merge branch 'ground_temperatures' into geothermal_loop
c2da0583c14 Regenerate sample files.
61c4f64f8d9 Update the changelog. [ci skip]
d99b85c045a Merge branch 'ground_temperatures' into geothermal_loop
d3eb3c47860 Comment about the ground temperature regression coefficients
3a91f49246e Merge branch 'master' into ground_temperatures
6f5c45653f3 Merge pull request #1386 from NREL/gshp_fanpump_adjust
babbf2ea6c7 Update Changelog.md
6b672401179 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
060e044e954 Merge pull request #1433 from NREL/split-battery-losses
2655f9aead6 Update the changelog and docs. [ci skip]
fef59282714 Latest results.
1e685c3428a Merge branch 'master' into split-battery-losses
207443e18d5 Go with the exponent approach for splitting losses.
caa342429f9 Another try [ci skip]
76d97c6c2cd Another try [ci skip]
3ef801f026b Another requirement? [ci skip]
a7bf56a81f3 Fix RTD
5acc1633023 Be helpful and search additional locations (and be backwards compatible)
a5dcd1a14ca Latest results.
5389a6f3881 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into split-battery-losses
055b52aed20 Merge pull request #1500 from NREL/epw_path_bugfix
d72dafae3f0 Clean up Location.get_epw_path method.
0215e468ad8 Fix possible simulation error related to EPW path.
17dea007d5c Update hvac_sizing and validation tests.
0f81e69186f Prevent bore autosizing from leading to errors.
1af2523d2d6 Pass runner through hpxml_defaults to hvac_sizing.
a1a011cb028 Check boreholes between 1 and 10 in epvalidator.
33d166c18e8 Add more validation tests.
cf142ef401a Add min/max bore depths to epvalidator.
17388c9e4fa Latest results.
c096685b107 Merge branch 'ground_temperatures' into geothermal_loop
f409f236afc Update a few enclosure and weather tests.
5f8486ba585 Latest results.
244e0862482 Merge pull request #1481 from NREL/geothermal_loop2
c49b1724e1b Merge branch 'ground_temperatures' of github.com:NREL/OpenStudio-HPXML into ground_temperatures
75e61c7ff5b Pull undisturbed adj into existing ground temp method.
5eb2120a804 Latest results.
4d5632e13b2 Undisturbed ground temps vary by TMY.
6304889e311 Missed a size method.
7a57f41aced Refactor methods around g function jsons, etc.
1c822ef8126 Update min and max error, test, and docs.
1bbfaf6d711 Change split in charge and discharge inefficiencies.
339aa359268 Updates for soil and moisture type arguments, docs, etc.
e220b458d39 Add new loop config argument, update docs and tests.
35d3f03a9fd Latest results.
aca6d092604 Update the docs.
9ca09f6c6d6 Revert geothermal loop default and fix tests.
8b61136d3dd Combine grout and pipe type choices into one.
0ad85a9288f Update bore config argument to default to none.
d8c115076cb Rename some sample files and regenerate.
614b0e9c4e1 Update docs and remove temporary sample files.
d309d85cf80 Misc cleanup around unit conversions, comments.
d092b147454 Add comment where default values come from.
6b5f7b73120 Check that geothermal loop is connected to heat pump.
37e937cf6ee Remove extra line in epvalidator.
a092aa5f671 Deprecate old ground conductivity field.
1982a5d1b68 Move geothermal loop line in epvalidator.
eb233f1541f Change pipe_size to pipe_diameter.
d80694e7d55 Use grout and pipe type in build measure.
b5af3087918 Simplify code in hpxml defaults.
42ef6acaf62 Delete loop idref on heat pump.
9319b0dc353 Simplify soil type constants.
6cee7f513a7 Add a readme for g_functions files.
b55a59cca06 Move borefield config arg to the top.
cd5eb1a81df Set g function ref ratio as radius over length.
ff35611236b Merge branch 'ground_temperatures' into geothermal_loop
3a70bf49778 Merge branch 'gshp_fanpump_adjust' into ground_temperatures
adc9580a56a Latest results.
600f955ba2d Latest results.
21e90626902 Latest results.
3a961906f77 Update expected cop values in gshp unit tests.
c8ebfc19b35 Merge branch 'ground_temperatures' into geothermal_loop
9195f577570 Add a weather test for checking all iecc zones.
0f05b454314 Add hvac_sizing call to get undisturbed ground temperature.
7c7096ac7fa Add ground temperatures csv table.
6c42705d051 Add method for getting undisturbed ground temperature from table.
cfbf0c72bd2 Merge branch 'master' into gshp_fanpump_adjust
9123259c058 Merge branch 'master' into split-battery-losses
bb238b772f8 Latest results.
b63a4baa359 Merge branch 'gshp-sample-files' into geothermal_loop
279a9deee31 Latest results.
dc14dd53968 Update new sample files.
04c71ce8413 Skip unmet hours check for 1ton.
b97b603d06e Refine conductivity and diffusivity defaults.
9aac13c4f19 Merge branch 'gshp-sample-files' into geothermal_loop
3cc3b0f9d39 Add sample files for a range of gshp sizes.
09ecc1bea50 Merge branch 'master' into geothermal_loop
15dfc750654 Merge pull request #1458 from NREL/soil-moisture-types
13e84e04e35 Update the changelog. [ci skip]
8be8ca48b42 Latest results.
ffaeee86933 Reduce the number of new sample files.
9fae5e11505 Update epvalidator and add error message test.
9afc6780489 Latest results.
0682f2d3bd9 Fix site defaults test.
dbc369f9067 Update the docs.
94e68c4f709 Update defaults for mixed moisture type.
907dfec4dd4 Allow mixed moisture type in build measure.
ec9ee2d97b7 Merge branch 'geothermal_loop' into soil-moisture-types
c05e69e3bd1 Merge branch 'master' into geothermal_loop
b177298065d Latest results.
b9b3bc3ec19 Merge branch 'master' into split-battery-losses
8fbb35ceb8d Latest results.
225de1f58e6 Generate whole set of soil/moisture sample files for testing.
49939722d72 Updates for active length adjustments.
12639ffcdf2 Add tests for defaults.
26224203512 Update argument descriptions in build measure.
4550f9caef7 Latest results.
da27f7f302f Try wet clay sample file instead.
c4430fafc29 Merge branch 'geothermal_loop' into soil-moisture-types
da0c3b073a6 Update the docs and sample files.
4884771d072 Update defaults based on a more comprehensive source.
9f9485c684a Update build measure for additional soil types.
9a1d22e1e84 Merge branch 'master' into geothermal_loop
0d37c63629a Fix footnotes in docs.
7dff9235be1 Latest results.
7353f725b91 Update the docs.
fd1c8e28cb8 Update sample files for combos of soil and moisture types.
298749113db Update defaulting to use soil and moisture type.
25bc8717517 Add build arguments for soil and moisture type.
8c0fcf2c9c1 Latest results.
02c3a89d410 Reorganize new geothermal loop sample files.
3e60c224cac Add test for invalid borefield config.
2de40bbe7e5 Latest results.
ee7020c07de Update tests and sample files.
35ef1e4f5fb Update comment in util rb.
16061f2718c Remove trench kw from build measure arguments.
ae8266b249b Update the docs.
ce6cefab8d1 Update depth max in hvac_sizing.
15f9bb02f8c Update the changelog. [ci skip]
806ba6a9548 Update the frac_glycol assumed value to 0.2.
546c95ec37b Merge branch 'master' into geothermal_loop
9372edb0d41 Latest results.
0cde439bbdb Merge branch 'master' into geothermal_loop
29c5dc1cbe2 Merge pull request #1412 from NREL/g_function_library
b6222b9a2fa Minor update in epvalidator. [ci skip]
6e5f9446a46 Update the changelog. [ci skip]
f6187d0715a Merge branch 'g_function_library' of github.com:NREL/OpenStudio-HPXML into g_function_library
7e42335631a Consolidate borehole and filename maps, and write new test.
73cac55ae75 Update test and avoid overwriting json keys.
41c66345a36 Latest results.
b9ab339cfda Update a comment. [ci skip]
08f95692bfb Allow C config with 7 or 9 boreholes.
495c2ca2e71 Zoned rectangle has no valid m_n.
8ab56cd64e0 Add key2 for C, Open, U.
60a151706d4 temporary commit for debugging
57dabfe0681 Merge branch 'geothermal_loop' into g_function_library
1a4af66fd03 Update the linear interpolation test.
495a079201f Refactor the download_g_functions method.
e29ed39023d Latest results.
42a803834e2 Merge branch 'g_function_library' of https://github.com/NREL/OpenStudio-HPXML into g_function_library
5b71f1412d7 try2
2822a2cb327 Latest results.
4a68777db45 Merge branch 'geothermal_loop' into g_function_library
210e020e401 Merge branch 'master' into geothermal_loop
69f37d35bec Further downselecting JSONs.
59e7479de8f Latest results.
234c8a37f21 Latest results.
4f5bb0ec64f Merge branch 'geothermal_loop' into g_function_library
d431413c27e Merge branch 'master' into geothermal_loop
95fdc8896e3 Latest results.
bacc0e9bc22 try 1
f0ccd0d42d0 Latest results.
b7dffa88aab Merge branch 'master' into split-battery-losses
037d48753fb Add a sensor for discharge.
04dff85cadb Latest results.
32d5b98c3b5 Test for bore depth outside of valid range.
067ac61fc58 Update g function method with optional n_x_m arg we can use for testing.
c50f167bb7b Latest results.
1794659438a Merge branch 'geothermal_loop' into g_function_library
91b4ab855cf Merge branch 'master' into geothermal_loop
93610481acf Update hvac tests for checking against direct lookup and interpolation example.
5c96a448376 Update g_function downselect to include more configurations.
eafe7187bc6 Latest results.
1700de73239 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
8eaad369637 Merge branch 'gshp_fanpump_adjust' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
823c299f9ff Same result, but equations are simplified and more readable
0b45c71ef08 Latest results.
0bedf67a04f Use the new adjustments, not the old ones. Oops.
840119c0116 Latest results.
ee5e46f4bf3 Latest results.
dae2ad07356 Merge branch 'geothermal_loop' into g_function_library
ea5f54212b7 Merge branch 'master' into geothermal_loop
ab99f473af7 Stub an hvac test for checking geothermal loop and gfunction values.
3a3e17da754 New geothermal loop sample file with all fields defined.
2d162b31e73 Add a validation test for invalid bore holes with a configuration.
2c564dfada6 Merge branch 'master' into g_function_library
5b4cdc5d505 Use already existing interp2 method.
03d571f21ea Updates to fan/pump adjustment. Now gives reasonable values, slightly different from the old adjustment. Still needs a little cleanup before review.
d0693044310 Merge branch 'gshp_fanpump_adjust' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
6ed5ff552b6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
ea7dd6d5065 Merge branch 'g_function_library' of github.com:NREL/OpenStudio-HPXML into g_function_library
95bc5ca6b00 Defaults test needs valid bore length.
3ed3a1be6f1 Latest results.
cad89b207b3 Update the docs for constraints on borehole length.
4fc1bd7e730 Try allowing variable spacing, depth, diameter by using linear interpolation.
f0879e79c06 Latest results.
6633d9bb2d7 Finish the map for g function json file names.
f66afd1919f Updates to the build measure.
85e64fbd695 Update defaults test and epvalidator.
6764c36ffbd Update the docs.
6b4177cbcb2 Make the leap to using g function library.
2c864755ec8 Default bore spacing to 5 m.
16892a6ee38 Update gitignore for full gfunction zip just in case.
38c6b01135e Add example processed gfunction json files.
c3e42e32e1e Add g_functions util for processing contents.
149c957dbc5 Add new task for downloading gfunction zip.
44a23717a59 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust
265c88f1900 Moving to a size independent calculation
fdc4e4143a1 Latest results.
2517f8c5a87 Another hpxml constants update.
2096f4463cf Update defaults test and other minor edits.
b96bb57d78e Add borefield config sample hpxml file.
bc908f5c1b0 Update translator resources for borefield config arg.
71da38a2f7d Add borefield config arg to build measure.
fbe83f1fd20 Minor typo in docs. [ci skip]
10c048ff2b2 Add units for diffusivity in build measure.
9e6f27e0fb2 Typo in docs. [ci skip]
4db5f0cd465 Add a defaults test for geothermal loops.
2a3a6abb8d5 Updates for vertical and grout type.
3a3c7d1a138 Typos in epvalidator.
9564143fb38 Latest results.
c0fcdbc00da Updates to docs.
e67bba00032 Updates to epvalidator.
c7271cc2f02 Add loop before anything else in defaults resource.
65af2416f5d Update the docs.
1e190b28ad5 Sample files for testing individual loop arguments.
7725cac5c3f Updates for shank spacing.
e1c508c8a0e Latest results.
a8afefd65ad Update build description, hvac sizing, and docs.
8409a550abe Update the docs.
59f2479f686 Update hpxml inputs json and sample files.
a8338fe3163 Update translator measure, resource files, and epvalidator.
4ac46f79e27 Add more geothermal loop arguments to build measure.
66b96360999 Regenerate sample files.
708cf6d5d61 Default geothermal sizing properties only if loop exists.
b99479fbffa Add a ground loop sample file with hardset properties.
a5d62bf6213 Allow ground loop to be hardsized.
0c460bea2df Add some geothermal loop args to build measure.
844ecd6e5e5 Merge branch 'master' into geothermal_loop
1831be7a579 Merge branch 'master' into geothermal_loop
9aa87785a77 Update ground conductivity is zero validation test.
e16630f8a95 Merge branch 'master' into geothermal_loop
adf65845195 Minor fixes to epvalidator.
8784ec639cd Move ground conductivity over to new soil element.
82bd1c76daa Merge branch 'master' into geothermal_loop
8276e7e2d60 Demonstrate loop properties defaulted in resource file.
ab6bd542431 Typo.
4e93fb13b19 Demonstrate new geothermal loop fields in existing shared ground loop sample file.
5ce9ecb4632 Update epvalidator for the new geothermal loop fields.
b183354cdb0 Stub new geothermal loop classes in hpxml resource file.
194a2d4161b Initial attempt at adjustment. Moved the fan/pump adjust code to right before we need the values, rewrote fan/pump adjustment to account for sizing. Still need to double check pump adjustment is being applied correctly.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: e95bc7b820fd37d2f0b4296b5bfe510f36536b08
joseph-robertson and others added 13 commits October 10, 2023 13:30
…84997

774cfe84997 Merge branch 'master' into geothermal_loop
5889de415f7 Update unit tests.
47b8ad5752c Merge branch 'master' into geothermal_loop
0f813a83fe1 Hotfix for recirc energy when multiple water heaters.
51f9d2fde58 Merge pull request #1537 from NREL/ground_temperatures2
c45fa9de0fb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ground_temperatures2
6598ab6059d Merge pull request #1539 from NREL/fix_system_use
053e9130f24 Fix CI failures.
54280437497 Run update_measures.
fb2bf8fb803 Merge branch 'ground_temperatures2' of github.com:NREL/OpenStudio-HPXML into ground_temperatures2
4063887f5d0 Accept nearest station in xing lookup.
9d9ad3647d7 Add comment [ci skip]
1043ac2d1b9 Fix comment [ci skip]
2b0d89bf4ba Fix possible incorrect value for system use, bug introduced in #1456. Adds error-checking to prevent this going forward. Some other minor misc cleanup.
30dcc2a2c37 Latest results.
b9fc6283fb1 Update tests after ground temps merge.
eddd67c3fd6 Merge branch 'ground_temperatures2' into geothermal_loop
d4ed83b6688 Merge branch 'ground_temperatures2' of github.com:NREL/OpenStudio-HPXML into ground_temperatures2
54d28d2ce6b Skip deep ground temp calcs if no gshp.
b00bb924031 Add test for defaulting xing values.
3a783ad4a25 Respond to review.
23f6e542ea5 Latest results.
afb8897b984 Merge branch 'ground_temperatures2' into geothermal_loop
657841620bd Merge branch 'master' into geothermal_loop
71ac84dff44 Merge branch 'master' into ground_temperatures2
98ace8d4ac0 Update the changelog. [ci skip]
9cd53e49d11 Merge pull request #1538 from NREL/misc_cleanup
e24568fd749 Latest results.
951dc933449 Misc cleanup.
092d4981415 Latest results.
3370a534320 Convert new csv to utf8.
cde1f9aaab2 Get the units right.
27148f692cf Missed a return.
533d2926d78 Update the changelog.
4a6174d571f Assign deep ground variables and use throughout.
1fbc7087565 Add deep temperature lookup based on xing model.
6c91ec33ac5 Revert shallow and deep ground temperature conflation.
4127a5dcb4a Merge pull request #1536 from NREL/split_workflow_tests
00b8d21b992 Remove old files. [ci skip]
fd88b9696ce Latest results.
004c05172b3 Fix CI failure
d2a87c7e3aa Update pull_request_template.md [ci skip]
ab259ce187a Split workflow tests, so they can be parallelized on the CI for faster turnaround time.
3eeec58b57e Latest results.
818aacae4a6 Found it.
7c753dee8eb Update a few more new tests.
9e0ff5a8566 Update new test.
35a675fcda8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geothermal_loop
bf03e5528fe Latest results.
cde46756a7e Merge branch 'master' into geothermal_loop
b003c807fb7 Latest results.
36d9f8e3295 Merge branch 'master' into geothermal_loop
d37d8ae23cb Latest results.
8e0cad7f6e3 Update sizing test after pulling ground temp changes in.
a5479a8a61f Merge branch 'ground_temperatures' into geothermal_loop
76cf5f3d170 Latest results.
1857230bca4 Merge branch 'geothermal_loop' of github.com:NREL/OpenStudio-HPXML into geothermal_loop
abe4907462b Update sizing test after pulling ground temp changes in.
9f05cd44a4e Latest results.
2e2f406d1c9 Add shank spacing back into sample file.
f2cb78bba6b Merge branch 'ground_temperatures' into geothermal_loop
f92b988895d Latest results.
4356113a546 Remove shank spacing from build measure.
e95bc7b820f Merge branch 'ground_temperatures' into geothermal_loop
c2da0583c14 Regenerate sample files.
d99b85c045a Merge branch 'ground_temperatures' into geothermal_loop
17dea007d5c Update hvac_sizing and validation tests.
0f81e69186f Prevent bore autosizing from leading to errors.
1af2523d2d6 Pass runner through hpxml_defaults to hvac_sizing.
a1a011cb028 Check boreholes between 1 and 10 in epvalidator.
33d166c18e8 Add more validation tests.
cf142ef401a Add min/max bore depths to epvalidator.
17388c9e4fa Latest results.
c096685b107 Merge branch 'ground_temperatures' into geothermal_loop
244e0862482 Merge pull request #1481 from NREL/geothermal_loop2
6304889e311 Missed a size method.
7a57f41aced Refactor methods around g function jsons, etc.
1c822ef8126 Update min and max error, test, and docs.
339aa359268 Updates for soil and moisture type arguments, docs, etc.
e220b458d39 Add new loop config argument, update docs and tests.
35d3f03a9fd Latest results.
aca6d092604 Update the docs.
9ca09f6c6d6 Revert geothermal loop default and fix tests.
8b61136d3dd Combine grout and pipe type choices into one.
0ad85a9288f Update bore config argument to default to none.
d8c115076cb Rename some sample files and regenerate.
614b0e9c4e1 Update docs and remove temporary sample files.
d309d85cf80 Misc cleanup around unit conversions, comments.
d092b147454 Add comment where default values come from.
6b5f7b73120 Check that geothermal loop is connected to heat pump.
37e937cf6ee Remove extra line in epvalidator.
a092aa5f671 Deprecate old ground conductivity field.
1982a5d1b68 Move geothermal loop line in epvalidator.
eb233f1541f Change pipe_size to pipe_diameter.
d80694e7d55 Use grout and pipe type in build measure.
b5af3087918 Simplify code in hpxml defaults.
42ef6acaf62 Delete loop idref on heat pump.
9319b0dc353 Simplify soil type constants.
6cee7f513a7 Add a readme for g_functions files.
b55a59cca06 Move borefield config arg to the top.
cd5eb1a81df Set g function ref ratio as radius over length.
ff35611236b Merge branch 'ground_temperatures' into geothermal_loop
600f955ba2d Latest results.
c8ebfc19b35 Merge branch 'ground_temperatures' into geothermal_loop
bb238b772f8 Latest results.
b63a4baa359 Merge branch 'gshp-sample-files' into geothermal_loop
279a9deee31 Latest results.
dc14dd53968 Update new sample files.
04c71ce8413 Skip unmet hours check for 1ton.
b97b603d06e Refine conductivity and diffusivity defaults.
9aac13c4f19 Merge branch 'gshp-sample-files' into geothermal_loop
3cc3b0f9d39 Add sample files for a range of gshp sizes.
09ecc1bea50 Merge branch 'master' into geothermal_loop
15dfc750654 Merge pull request #1458 from NREL/soil-moisture-types
13e84e04e35 Update the changelog. [ci skip]
8be8ca48b42 Latest results.
ffaeee86933 Reduce the number of new sample files.
9fae5e11505 Update epvalidator and add error message test.
9afc6780489 Latest results.
0682f2d3bd9 Fix site defaults test.
dbc369f9067 Update the docs.
94e68c4f709 Update defaults for mixed moisture type.
907dfec4dd4 Allow mixed moisture type in build measure.
ec9ee2d97b7 Merge branch 'geothermal_loop' into soil-moisture-types
c05e69e3bd1 Merge branch 'master' into geothermal_loop
8fbb35ceb8d Latest results.
225de1f58e6 Generate whole set of soil/moisture sample files for testing.
49939722d72 Updates for active length adjustments.
12639ffcdf2 Add tests for defaults.
26224203512 Update argument descriptions in build measure.
4550f9caef7 Latest results.
da27f7f302f Try wet clay sample file instead.
c4430fafc29 Merge branch 'geothermal_loop' into soil-moisture-types
da0c3b073a6 Update the docs and sample files.
4884771d072 Update defaults based on a more comprehensive source.
9f9485c684a Update build measure for additional soil types.
9a1d22e1e84 Merge branch 'master' into geothermal_loop
0d37c63629a Fix footnotes in docs.
7dff9235be1 Latest results.
7353f725b91 Update the docs.
fd1c8e28cb8 Update sample files for combos of soil and moisture types.
298749113db Update defaulting to use soil and moisture type.
25bc8717517 Add build arguments for soil and moisture type.
8c0fcf2c9c1 Latest results.
02c3a89d410 Reorganize new geothermal loop sample files.
3e60c224cac Add test for invalid borefield config.
2de40bbe7e5 Latest results.
ee7020c07de Update tests and sample files.
35ef1e4f5fb Update comment in util rb.
16061f2718c Remove trench kw from build measure arguments.
ae8266b249b Update the docs.
ce6cefab8d1 Update depth max in hvac_sizing.
15f9bb02f8c Update the changelog. [ci skip]
806ba6a9548 Update the frac_glycol assumed value to 0.2.
546c95ec37b Merge branch 'master' into geothermal_loop
9372edb0d41 Latest results.
0cde439bbdb Merge branch 'master' into geothermal_loop
29c5dc1cbe2 Merge pull request #1412 from NREL/g_function_library
b6222b9a2fa Minor update in epvalidator. [ci skip]
6e5f9446a46 Update the changelog. [ci skip]
f6187d0715a Merge branch 'g_function_library' of github.com:NREL/OpenStudio-HPXML into g_function_library
7e42335631a Consolidate borehole and filename maps, and write new test.
73cac55ae75 Update test and avoid overwriting json keys.
41c66345a36 Latest results.
b9ab339cfda Update a comment. [ci skip]
08f95692bfb Allow C config with 7 or 9 boreholes.
495c2ca2e71 Zoned rectangle has no valid m_n.
8ab56cd64e0 Add key2 for C, Open, U.
60a151706d4 temporary commit for debugging
57dabfe0681 Merge branch 'geothermal_loop' into g_function_library
1a4af66fd03 Update the linear interpolation test.
495a079201f Refactor the download_g_functions method.
e29ed39023d Latest results.
42a803834e2 Merge branch 'g_function_library' of https://github.com/NREL/OpenStudio-HPXML into g_function_library
5b71f1412d7 try2
2822a2cb327 Latest results.
4a68777db45 Merge branch 'geothermal_loop' into g_function_library
210e020e401 Merge branch 'master' into geothermal_loop
69f37d35bec Further downselecting JSONs.
59e7479de8f Latest results.
234c8a37f21 Latest results.
4f5bb0ec64f Merge branch 'geothermal_loop' into g_function_library
d431413c27e Merge branch 'master' into geothermal_loop
95fdc8896e3 Latest results.
bacc0e9bc22 try 1
04dff85cadb Latest results.
32d5b98c3b5 Test for bore depth outside of valid range.
067ac61fc58 Update g function method with optional n_x_m arg we can use for testing.
c50f167bb7b Latest results.
1794659438a Merge branch 'geothermal_loop' into g_function_library
91b4ab855cf Merge branch 'master' into geothermal_loop
93610481acf Update hvac tests for checking against direct lookup and interpolation example.
5c96a448376 Update g_function downselect to include more configurations.
840119c0116 Latest results.
ee5e46f4bf3 Latest results.
dae2ad07356 Merge branch 'geothermal_loop' into g_function_library
ea5f54212b7 Merge branch 'master' into geothermal_loop
ab99f473af7 Stub an hvac test for checking geothermal loop and gfunction values.
3a3e17da754 New geothermal loop sample file with all fields defined.
2d162b31e73 Add a validation test for invalid bore holes with a configuration.
2c564dfada6 Merge branch 'master' into g_function_library
5b4cdc5d505 Use already existing interp2 method.
ea7dd6d5065 Merge branch 'g_function_library' of github.com:NREL/OpenStudio-HPXML into g_function_library
95bc5ca6b00 Defaults test needs valid bore length.
3ed3a1be6f1 Latest results.
cad89b207b3 Update the docs for constraints on borehole length.
4fc1bd7e730 Try allowing variable spacing, depth, diameter by using linear interpolation.
f0879e79c06 Latest results.
6633d9bb2d7 Finish the map for g function json file names.
f66afd1919f Updates to the build measure.
85e64fbd695 Update defaults test and epvalidator.
6764c36ffbd Update the docs.
6b4177cbcb2 Make the leap to using g function library.
2c864755ec8 Default bore spacing to 5 m.
16892a6ee38 Update gitignore for full gfunction zip just in case.
38c6b01135e Add example processed gfunction json files.
c3e42e32e1e Add g_functions util for processing contents.
149c957dbc5 Add new task for downloading gfunction zip.
fdc4e4143a1 Latest results.
2517f8c5a87 Another hpxml constants update.
2096f4463cf Update defaults test and other minor edits.
b96bb57d78e Add borefield config sample hpxml file.
bc908f5c1b0 Update translator resources for borefield config arg.
71da38a2f7d Add borefield config arg to build measure.
fbe83f1fd20 Minor typo in docs. [ci skip]
10c048ff2b2 Add units for diffusivity in build measure.
9e6f27e0fb2 Typo in docs. [ci skip]
4db5f0cd465 Add a defaults test for geothermal loops.
2a3a6abb8d5 Updates for vertical and grout type.
3a3c7d1a138 Typos in epvalidator.
9564143fb38 Latest results.
c0fcdbc00da Updates to docs.
e67bba00032 Updates to epvalidator.
c7271cc2f02 Add loop before anything else in defaults resource.
65af2416f5d Update the docs.
1e190b28ad5 Sample files for testing individual loop arguments.
7725cac5c3f Updates for shank spacing.
e1c508c8a0e Latest results.
a8afefd65ad Update build description, hvac sizing, and docs.
8409a550abe Update the docs.
59f2479f686 Update hpxml inputs json and sample files.
a8338fe3163 Update translator measure, resource files, and epvalidator.
4ac46f79e27 Add more geothermal loop arguments to build measure.
66b96360999 Regenerate sample files.
708cf6d5d61 Default geothermal sizing properties only if loop exists.
b99479fbffa Add a ground loop sample file with hardset properties.
a5d62bf6213 Allow ground loop to be hardsized.
0c460bea2df Add some geothermal loop args to build measure.
844ecd6e5e5 Merge branch 'master' into geothermal_loop
1831be7a579 Merge branch 'master' into geothermal_loop
9aa87785a77 Update ground conductivity is zero validation test.
e16630f8a95 Merge branch 'master' into geothermal_loop
adf65845195 Minor fixes to epvalidator.
8784ec639cd Move ground conductivity over to new soil element.
82bd1c76daa Merge branch 'master' into geothermal_loop
8276e7e2d60 Demonstrate loop properties defaulted in resource file.
ab6bd542431 Typo.
4e93fb13b19 Demonstrate new geothermal loop fields in existing shared ground loop sample file.
5ce9ecb4632 Update epvalidator for the new geothermal loop fields.
b183354cdb0 Stub new geothermal loop classes in hpxml resource file.

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

Successfully merging this pull request may close these issues.

2 participants