forked from NREL/GEOPHIRES-X
-
Notifications
You must be signed in to change notification settings - Fork 1
2025 Geothermal Drilling Cost Curves Update [v3.8.6] #56
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
Merged
softwareengineerprogrammer
merged 16 commits into
main
from
2025-geothermal-drilling-cost-curves-update-2
Mar 23, 2025
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
b586219
update VERTICAL_LARGE & VERTICAL_SMALL coefficients with 2025 updated…
softwareengineerprogrammer e782004
update deviated (horizontal) baselines to 2025 cost curve
softwareengineerprogrammer 8940d87
update unit tests
softwareengineerprogrammer f36bd89
Cost curve citations
softwareengineerprogrammer f0b0c4f
abbreviate citations
softwareengineerprogrammer 4bbd213
sync extended economic profile test result
softwareengineerprogrammer 694ef95
Bump version: 3.8.4 → 3.8.5
softwareengineerprogrammer bbb426c
changelog entry
softwareengineerprogrammer 3772c17
sync generated schema
softwareengineerprogrammer 216c3f0
Use str, Enum instead of StrEnum (which is only compatible with py3.11+)
softwareengineerprogrammer 2f2d8f1
Bump version: 3.8.5 → 3.8.6
softwareengineerprogrammer e51b5df
3.8.5 -> 3.8.6 changelog entry (bumped version due to compatibility i…
softwareengineerprogrammer 249da9f
improve water properties calculation exception messages
softwareengineerprogrammer 1c9976b
unit test to sanity check baseline cost curve values with paper
softwareengineerprogrammer e6ac4f4
Econmics.TotalCummRevenue naming TODO
softwareengineerprogrammer 255d2ec
Economics.TotalRevenue naming TODO
softwareengineerprogrammer 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 hidden or 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 |
---|---|---|
@@ -1,5 +1,5 @@ | ||
[bumpversion] | ||
current_version = 3.8.4 | ||
current_version = 3.8.6 | ||
commit = True | ||
tag = True | ||
|
||
|
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
|
@@ -252,7 +252,7 @@ def density_water_kg_per_m3(Twater_degC: float, pressure: Optional[PlainQuantity | |
|
||
except (NotImplementedError, ValueError) as e: | ||
raise ValueError(f'Input temperature & pressure ({Twater_degC}, {pressure}) ' | ||
f'are out of range or otherwise could not be used to calculate') from e | ||
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. Changes in utils to water property exception messages are unrelated to drilling cost curves update |
||
f'are out of range or otherwise could not be used to calculate water density.') from e | ||
|
||
|
||
def celsius_to_kelvin(celsius: float) -> float: | ||
|
@@ -298,7 +298,7 @@ def viscosity_water_Pa_sec( | |
|
||
except (NotImplementedError, ValueError) as e: | ||
raise ValueError(f'Input temperature & pressure ({Twater_degC}, {pressure}) ' | ||
f'are out of range or otherwise could not be used to calculate') from e | ||
f'are out of range or otherwise could not be used to calculate water viscosity.') from e | ||
|
||
|
||
@lru_cache | ||
|
@@ -334,7 +334,7 @@ def heat_capacity_water_J_per_kg_per_K( | |
|
||
except (NotImplementedError, ValueError) as e: | ||
raise ValueError(f'Input temperature & pressure ({Twater_degC}, {pressure}) ' | ||
f'are out of range or otherwise could not be used to calculate') from e | ||
f'are out of range or otherwise could not be used to calculate heat capacity of water.') from e | ||
|
||
|
||
@lru_cache | ||
|
This file contains hidden or 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 hidden or 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 |
---|---|---|
@@ -1 +1 @@ | ||
__version__ = '3.8.4' | ||
__version__ = '3.8.6' |
This file contains hidden or 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.
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.
Economics naming TODOs unrelated to main changes