-
Notifications
You must be signed in to change notification settings - Fork 394
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
GHE g-function calculation enhancements #8708
Merged
Myoldmopar
merged 106 commits into
NREL:develop
from
j-c-cook:6651_cpgfunction_thirdparty
Aug 19, 2021
Merged
Changes from 71 commits
Commits
Show all changes
106 commits
Select commit
Hold shift + click to select a range
c127355
Add new feature proposal draft for cpgfunction
e042488
Refactor NFP mark sample IDF and IDD changes
a80388a
Merge branch 'develop' into 6651_cpgfunction_thirdparty
mitchute 9ef0dc9
Merge remote-tracking branch 'origin/develop' into 6651_cpgfunction_t…
327bd8b
Merge branch '6651_cpgfunction_thirdparty' of https://github.com/j-c-…
6ca1152
Merge remote-tracking branch 'upstream/develop' into 6651_cpgfunction…
49df1a0
Append design documentation to NFP
30160c1
Document IDD snippets with the diff language marker
72b63cd
Add diff as markdown language for IDD snippets
69b797d
Refactor diff Documentation placements
9b082d9
Document the design document in regards to dependencies
a416e1a
Modify design document to reflect outlook
40af248
Update design document to reflect current outlook
8c9f71a
Refactor design document to only include "bottom line up front"
063c86c
Add in links to design document
afa9878
Merge branch 'develop' into 6651_cpgfunction_thirdparty
a795a7e
Add cpgfunctionEP-0.1 to the third_party folder
a6779b7
Add cpgfunctionEP subdirectory to E+ CMakeLists for third party
772f055
Comment out cpgfunctionEP tests temporarily
58e74a3
Modify GHE.unit.cc GHE:System object for new field
28257f8
Add copy of GSHPSimgple-GLHE.idf file
f5e1534
Modify GLHE idf file (copy) to call UBHWT calc
0537d0d
Add GHE:CalculationModel name paragraph to IO tex
d958866
Add gFunctionCalcModelName field to IDF listings
b6eddfd
Add TODO note in EngrRef for docs location
e2d4830
Add TODO note again
e8f92b6
Add IDD modifications (memo and A7)
ebd9590
Merge branch 'develop' into 6651_cpgfunction_thirdparty
mitchute ac62527
Merge branch '6651_cpgfunction_thirdparty' of github.com:j-c-cook/Ene…
mitchute 81c566f
Revert "Add IDD modifications (memo and A7)"
mitchute 912f575
modify ghe inputs for new calc options, add cpgfunction build to alt-…
mitchute 1b23a79
Remove cpgfunctionEP-v0.1
7d73957
Add cpgfunction-v0.2
9b1c79f
Merge branch '6651_cpgfunction_thirdparty' of https://github.com/j-c-…
8140303
integrate new cpgfunction version into E+ which is now generating gfu…
mitchute dd8bff1
Merge branch 'develop' into 6651_cpgfunction_thirdparty
4bfc8e5
Increment cpgfunctionEP to version 0.3
b096148
Modify third party cmakelists to reference cpg0.3
6f4cca6
Remove unnecessary find Eigen library linker cmake
d1691cb
Make eigen available for cpgfunctionEP in cmakelists
b8dfbdc
Add Spitler's first version of engr ref
341e04b
integrate latest cpgfunction update, update ghe code to properly swit…
mitchute b2c2902
Merge branch '6651_cpgfunction_thirdparty' of https://github.com/j-c-…
08100b7
Add adaptively discretized number of segments
56563a5
Reformat ghe.cc to pass clang-format test
490aafd
Reformat ghe.cc (again) topass clang format check
f4075b1
Fix call to adaptive discretization (clang-tidy)
09d9fb9
Document heat-exchangers.tex about segments
cf29f98
Document heat-exchangers.tex with new references
ccc2704
Documentation of ghe
8726a2e
Modify g-function all UBHWTCalc->UBHWTcalc
2e9cf84
Merge branch 'develop' into 6651_cpgfunction_thirdparty
mitchute 6d36419
add unit test, correct incorrect key in example file, add new methods…
mitchute 84e6826
clang-format
mitchute a6ce1e4
Add new cpgfunctionEP files
65c3f0c
Bump cpgfunctionEP to next version
87c50be
Modify main cmakelists to reference new version
4a22361
Modify third party cmakelists for new version
c2a539c
Modify time declaration in E+ for call to cpgEP
5101b97
Merge branch '6651_cpgfunction_thirdparty' of https://github.com/j-c-…
397d2e9
Merge branch '6651_cpgfunction_thirdparty' of github.com:j-c-cook/Ene…
mitchute f5c0722
Merge branch 'develop' into 6651_cpgfunction_thirdparty
mitchute 7c16983
Revert "Modify time declaration in E+ for call to cpgEP"
a36f822
Bump cpgfunctionEP to 0.3.2
329bc2b
Rename cpgfunctionEP-0.3.1->cpgfunctionEP-0.3.2
54a4be3
Bump cpgfunction references in cmakelists
b4f6d93
Merge branch '6651_cpgfunction_thirdparty' of github.com:j-c-cook/Ene…
mitchute 7c50a44
update unit test
mitchute 049bd2e
update docs
mitchute 63476cb
update docs
mitchute 5e1ae38
cleanup eol null chars to eliminate build warnings
mitchute 6fc55ff
remove old build flag
mitchute 5aa5359
Remove Cimmino's references to create diff
1b36e77
Add Cimmino's references as plain text
4a1dd8b
Remove CONTRIBUTING.md file
c3e106e
Remove uneccessary hidden . files from eigen
ced1bba
Remove .gitignore file from qdt
b58edcd
Merge branch '6651_cpgfunction_thirdparty' of https://github.com/j-c-…
b68c587
Fix double qoute issue in Cimmino's references
699ac1a
Bump cpgfunctionEP folder name to 0.4
a7f66c0
Bump cpgfunctionEP files to 0.4
0264cd9
Remove local copy of Eigen library
68261e1
Make EP cmake link to bumped cpgfunctionEP folder
4e4c466
Merge branch 'develop' into 6651_cpgfunction_thirdparty
mitchute 2056245
Merge branch '6651_cpgfunction_thirdparty' of github.com:j-c-cook/Ene…
mitchute 872260e
Merge branch 'develop' into 6651_cpgfunction_thirdparty
mitchute f6365b4
Merge remote-tracking branch 'upstream/develop' into 6651_cpgfunction…
Myoldmopar 518286a
Merge branch 'develop' into 6651_cpgfunction_thirdparty
mitchute 33a28cd
Bump Eigen library to 3.3.9
b5b304c
Bump cpgfunctionEP to 0.4.1
32c6dac
Make cmake files link to cpgEP-0.4.1
ec0190a
Merge branch '6651_cpgfunction_thirdparty' of github.com:j-c-cook/Ene…
mitchute 378a254
add -j CLI option and wire it up to the cpgfunction code. add notes a…
mitchute 326a8e7
Revert "Bump Eigen library to 3.3.9"
816e4ed
Bump cpgfunctionEP to 0.5
6440e9d
Make EP's cmake point to cpgfunction-v0.5
f5bfa7f
Merge branch '6651_cpgfunction_thirdparty' of https://github.com/j-c-…
376c7f9
Merge branch 'develop' into 6651_cpgfunction_thirdparty
mitchute aa6b665
Merge branch '6651_cpgfunction_thirdparty' of github.com:j-c-cook/Ene…
Myoldmopar 05668db
Merge remote-tracking branch 'upstream/develop' into 6651_cpgfunction…
Myoldmopar 22f3445
Add clarification in cli usage
Myoldmopar 4d0e9a2
Merge branch 'develop' into 6651_cpgfunction_thirdparty
mitchute b7ff75b
add ghe transition rules
mitchute fed355b
Merge branch '6651_cpgfunction_thirdparty' of github.com:j-c-cook/Ene…
Myoldmopar f8caacd
Merge remote-tracking branch 'upstream/develop' into 6651_cpgfunction…
Myoldmopar 4c9f832
Address Windows build warnings
Myoldmopar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -265,6 +265,9 @@ target_include_directories(project_options SYSTEM INTERFACE "${kiva_SOURCE_DIR}/ | |
add_subdirectory(scripts/dev/generate_embeddable_epJSON_schema) | ||
set_target_properties(generate_embeddedable_epJSON_schema PROPERTIES FOLDER "Internal") | ||
|
||
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/cpgfunctionEP-0.3.2) | ||
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/cpgfunctionEP-0.3.2/include) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. New CMake rules for the new library. |
||
|
||
if(OPENGL_FOUND) | ||
set(BUILD_PENUMBRA_TESTING | ||
OFF | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3026,6 +3026,10 @@ \subsubsection{Inputs}\label{inputs-10-002} | |
|
||
The unique name of the \hyperref[groundheatexchangerresponsefactors]{GroundHeatExchanger:ResponseFactors} object used to define the third-party response factors. If present, the GHE:Vertical:Array and GHE:Vertical:Single objects defined will be ignored. | ||
|
||
\paragraph{Field: g-Function Calculation Method} | ||
|
||
If the GHE:ResponseFactors object is not provided, this input will be relevant to the calculation method used to generate the g-function values. There are two options for this input: ``UHFcalc" or ``UBHWTcalc". The default is UHFcalc, where a g-function is computed with the uniform heat flux boundary condition. The UBHWTcalc option computes the g-function with a uniform borehole wall temperature boundary condition. The g-function computed with a uniform borehole wall temperature boundary condition is expected to be a better approximation of the borehole physics and is also expected to be faster to compute. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. New I/O Ref changes for the new field. |
||
|
||
\paragraph{Field: GHE:Vertical:Array object name} | ||
|
||
The unique name of the \hyperref[groundheatexchangerverticalarray]{GroundHeatExchanger:Vertical:Array} object used to define a rectangular borehole field. If present, the GHE:Vertical:Single objects will be ignored. | ||
|
@@ -3047,7 +3051,8 @@ \subsubsection{Inputs}\label{inputs-10-002} | |
2.5, !- Ground Thermal Conductivity {W/m-K} | ||
2.5E+06, !- Ground Thermal Heat Capacity {J/m3-K} | ||
, !- Response Factors Object Name | ||
GHE-Array; | ||
UBHWTcalc, !- g-Function Calculation Method | ||
GHE-Array; !- GHE:Vertical:Array Object Name | ||
|
||
GroundHeatExchanger:Vertical:Properties, | ||
GHE-1 Props, !- Name | ||
|
@@ -3083,6 +3088,7 @@ \subsubsection{Inputs}\label{inputs-10-002} | |
2.5, !- Ground Thermal Conductivity {W/m-K} | ||
2.5E+06, !- Ground Thermal Heat Capacity {J/m3-K} | ||
, !- Response Factors Object Name | ||
UBHWTcalc, !- g-Function Calculation Method | ||
, !- GHE Array Object Name | ||
GHE-1, !- GHE Borehole Definition 1 | ||
GHE-2, !- GHE Borehole Definition 2 | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whoops, that needs to go away. I'll fix that on the next commit.