Skip to content

Commit f0b0c4f

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
abbreviate citations
1 parent f36bd89 commit f0b0c4f

File tree

4 files changed

+42
-48
lines changed

4 files changed

+42
-48
lines changed

‎src/geophires_x/Economics.py

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -997,18 +997,6 @@ def __init__(self, model: Model):
997997
CurrentUnits=PercentUnit.TENTH,
998998
ErrMessage="assume default inflation rate during construction (0)"
999999
)
1000-
1001-
1002-
def cost_corr_footnote_symbol(c: _WellDrillingCostCorrelationCitation) -> str:
1003-
if c == _WellDrillingCostCorrelationCitation.NREL_COST_CURVE_2025:
1004-
return '*'
1005-
1006-
if c == _WellDrillingCostCorrelationCitation.SIMPLE:
1007-
return '†'
1008-
1009-
if c == _WellDrillingCostCorrelationCitation.GEOVISION:
1010-
return '‡'
1011-
10121000
self.wellcorrelation = self.ParameterDict[self.wellcorrelation.Name] = intParameter(
10131001
"Well Drilling Cost Correlation",
10141002
DefaultValue=WellDrillingCostCorrelation.VERTICAL_LARGE_INT1.int_value,
@@ -1017,16 +1005,15 @@ def cost_corr_footnote_symbol(c: _WellDrillingCostCorrelationCitation) -> str:
10171005
UnitType=Units.NONE,
10181006
ErrMessage="assume default well drilling cost correlation (10)",
10191007
ToolTipText="Select the built-in well drilling and completion cost correlation: " +
1020-
'; '.join([f'{it.int_value}: {it.value}{cost_corr_footnote_symbol(it.citation)}'
1008+
'; '.join([f'{it.int_value}: {it.value}'
10211009
for it in WellDrillingCostCorrelation]) +
1022-
f'. | Citations: '
1023-
f'* {_WellDrillingCostCorrelationCitation.NREL_COST_CURVE_2025.value}. '
1024-
f'† {_WellDrillingCostCorrelationCitation.SIMPLE.value}. '
1025-
f'‡ {_WellDrillingCostCorrelationCitation.GEOVISION.value}.'
1010+
f'. '
1011+
f'Baseline correlations (1-4) are from '
1012+
f'{_WellDrillingCostCorrelationCitation.NREL_COST_CURVE_2025}.'
1013+
f' Intermediate and ideal correlations (6-17) are from '
1014+
f'{_WellDrillingCostCorrelationCitation.GEOVISION}.'
10261015

10271016
)
1028-
1029-
10301017
self.DoAddOnCalculations = self.ParameterDict[self.DoAddOnCalculations.Name] = boolParameter(
10311018
"Do AddOn Calculations",
10321019
DefaultValue=False,

‎src/geophires_x/OptionList.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,22 @@ def from_input_string(input_string: str):
157157

158158

159159
class _WellDrillingCostCorrelationCitation(StrEnum):
160-
NREL_COST_CURVE_2025 = ('Akindipe, D. and Witter. E. 2025. '
161-
'"2025 Geothermal Drilling Cost Curves Update". '
162-
'https://pangea.stanford.edu/ERE/db/GeoConf/papers/SGW/2025/Akindipe.pdf?t=1740084555')
160+
"""
161+
Values are abbreviated citations used in tooltip text.
162+
Commented full citations could be used in future documentation.
163+
"""
164+
165+
NREL_COST_CURVE_2025 = 'NREL\'s 2025 cost curve update'
166+
# ('Akindipe, D. and Witter. E. 2025. '
167+
# '"2025 Geothermal Drilling Cost Curves Update". '
168+
# 'https://pangea.stanford.edu/ERE/db/GeoConf/papers/SGW/2025/Akindipe.pdf?t=1740084555')
169+
163170
SIMPLE = 'Based on Fervo Project Cape cost per meter (~$1846/m)'
164-
GEOVISION = ('DOE 2019. '
165-
'"GeoVision" p. 163. '
166-
'https://www.energy.gov/sites/prod/files/2019/06/f63/GeoVision-full-report-opt.pdf')
171+
172+
GEOVISION = 'GeoVision'
173+
# ('DOE 2019. '
174+
# '"GeoVision" p. 163. '
175+
# 'https://www.energy.gov/sites/prod/files/2019/06/f63/GeoVision-full-report-opt.pdf')
167176

168177

169178
class WellDrillingCostCorrelation(GeophiresInputEnum):

‎src/geophires_x_schema_generator/geophires-request.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1671,7 +1671,7 @@
16711671
"maximum": 1.0
16721672
},
16731673
"Well Drilling Cost Correlation": {
1674-
"description": "Select the built-in well drilling and completion cost correlation: 1: vertical small diameter, baseline*; 2: deviated small diameter, baseline*; 3: vertical large diameter, baseline*; 4: deviated large diameter, baseline*; 5: Simple (per-meter cost)\u2020; 6: vertical small diameter, intermediate1\u2021; 7: vertical small diameter, intermediate2\u2021; 8: deviated small diameter, intermediate1\u2021; 9: deviated small diameter, intermediate2\u2021; 10: vertical large diameter, intermediate1\u2021; 11: vertical large diameter, intermediate2\u2021; 12: deviated large diameter, intermediate1\u2021; 13: deviated large diameter, intermediate2\u2021; 14: vertical open-hole, small diameter, ideal\u2021; 15: deviated liner, small diameter, ideal\u2021; 16: vertical open-hole, large diameter, ideal\u2021; 17: deviated liner, large diameter, ideal\u2021. * Akindipe, D. and Witter. E. 2025. \"2025 Geothermal Drilling Cost Curves Update\". https://pangea.stanford.edu/ERE/db/GeoConf/papers/SGW/2025/Akindipe.pdf?t=1740084555. \u2020 Based on Fervo Project Cape cost per meter (~$1846/m). \u2021 DOE 2019. \"GeoVision\" p. 163. https://www.energy.gov/sites/prod/files/2019/06/f63/GeoVision-full-report-opt.pdf.",
1674+
"description": "Select the built-in well drilling and completion cost correlation: 1: vertical small diameter, baseline; 2: deviated small diameter, baseline; 3: vertical large diameter, baseline; 4: deviated large diameter, baseline; 5: Simple (per-meter cost); 6: vertical small diameter, intermediate1; 7: vertical small diameter, intermediate2; 8: deviated small diameter, intermediate1; 9: deviated small diameter, intermediate2; 10: vertical large diameter, intermediate1; 11: vertical large diameter, intermediate2; 12: deviated large diameter, intermediate1; 13: deviated large diameter, intermediate2; 14: vertical open-hole, small diameter, ideal; 15: deviated liner, small diameter, ideal; 16: vertical open-hole, large diameter, ideal; 17: deviated liner, large diameter, ideal. Baseline correlations (1-4) are from NREL's 2025 cost curve update. Intermediate and ideal correlations (6-17) are from GeoVision.",
16751675
"type": "integer",
16761676
"units": null,
16771677
"category": "Economics",

‎tests/geophires_x_tests/test_economics.py

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,29 +80,27 @@ def test_well_drilling_cost_correlation_tooltip_text(self):
8080
ec = self._new_model().economics
8181
self.assertEqual(
8282
ec.wellcorrelation.ToolTipText,
83+
# noinspection SqlNoDataSourceInspection
8384
'Select the built-in well drilling and completion cost correlation: '
84-
'1: vertical small diameter, baseline*; '
85-
'2: deviated small diameter, baseline*; '
86-
'3: vertical large diameter, baseline*; '
87-
'4: deviated large diameter, baseline*; '
88-
'5: Simple (per-meter cost)†; '
89-
'6: vertical small diameter, intermediate1‡; '
90-
'7: vertical small diameter, intermediate2‡; '
91-
'8: deviated small diameter, intermediate1‡; '
92-
'9: deviated small diameter, intermediate2‡; '
93-
'10: vertical large diameter, intermediate1‡; '
94-
'11: vertical large diameter, intermediate2‡; '
95-
'12: deviated large diameter, intermediate1‡; '
96-
'13: deviated large diameter, intermediate2‡; '
97-
'14: vertical open-hole, small diameter, ideal‡; '
98-
'15: deviated liner, small diameter, ideal‡; '
99-
'16: vertical open-hole, large diameter, ideal‡; '
100-
'17: deviated liner, large diameter, ideal‡. '
101-
'* Akindipe, D. and Witter. E. 2025. "2025 Geothermal Drilling Cost Curves Update". '
102-
'https://pangea.stanford.edu/ERE/db/GeoConf/papers/SGW/2025/Akindipe.pdf?t=1740084555. '
103-
'† Based on Fervo Project Cape cost per meter (~$1846/m). '
104-
'‡ DOE 2019. "GeoVision" p. 163. '
105-
'https://www.energy.gov/sites/prod/files/2019/06/f63/GeoVision-full-report-opt.pdf.',
85+
'1: vertical small diameter, baseline; '
86+
'2: deviated small diameter, baseline; '
87+
'3: vertical large diameter, baseline; '
88+
'4: deviated large diameter, baseline; '
89+
'5: Simple (per-meter cost); '
90+
'6: vertical small diameter, intermediate1; '
91+
'7: vertical small diameter, intermediate2; '
92+
'8: deviated small diameter, intermediate1; '
93+
'9: deviated small diameter, intermediate2; '
94+
'10: vertical large diameter, intermediate1; '
95+
'11: vertical large diameter, intermediate2; '
96+
'12: deviated large diameter, intermediate1; '
97+
'13: deviated large diameter, intermediate2; '
98+
'14: vertical open-hole, small diameter, ideal; '
99+
'15: deviated liner, small diameter, ideal; '
100+
'16: vertical open-hole, large diameter, ideal; '
101+
'17: deviated liner, large diameter, ideal. '
102+
"Baseline correlations (1-4) are from NREL's 2025 cost curve update. "
103+
'Intermediate and ideal correlations (6-17) are from GeoVision.',
106104
)
107105

108106
def _new_model(self) -> Model:

0 commit comments

Comments
 (0)