Skip to content

Commit e1d3c51

Browse files
Fix incorrect tooltip text for 'Drilling and completion costs per well' (was erroneously copy-paste-duplicated from 'Wellfield cost'). Use parameterized default indirect cost in relevant tooltip texts (leftover TODOs from NREL#383)
1 parent de18867 commit e1d3c51

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

src/geophires_x/Economics.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1714,7 +1714,7 @@ def __init__(self, model: Model):
17141714
)
17151715

17161716
stimulation_contingency_and_indirect_costs_tooltip = (
1717-
f'plus 15% contingency ' # TODO https://github.com/NREL/GEOPHIRES-X/issues/383
1717+
f'plus 15% contingency ' # TODO https://github.com/NREL/GEOPHIRES-X/issues/383
17181718
f'plus {self.stimulation_indirect_capital_cost_percentage.quantity().to(convertible_unit("%")).magnitude}% '
17191719
f'indirect costs'
17201720
)
@@ -1759,21 +1759,18 @@ def __init__(self, model: Model):
17591759
UnitType=Units.CURRENCY,
17601760
PreferredUnits=CurrencyUnit.MDOLLARS,
17611761
CurrentUnits=CurrencyUnit.MDOLLARS,
1762-
1763-
# TODO https://github.com/NREL/GEOPHIRES-X/issues/383?title=Parameterize+indirect+cost+factor
1764-
ToolTipText="Includes total drilling and completion cost of all injection and production wells and "
1765-
"laterals, plus 5% indirect costs."
1762+
ToolTipText=f'Includes total drilling and completion cost of all injection and production wells and '
1763+
f'laterals, plus indirect costs '
1764+
f'(default: {self.wellfield_indirect_capital_cost_percentage.DefaultValue}%).'
17661765
)
17671766
self.drilling_and_completion_costs_per_well = self.OutputParameterDict[
17681767
self.drilling_and_completion_costs_per_well.Name] = OutputParameter(
17691768
Name='Drilling and completion costs per well',
17701769
UnitType=Units.CURRENCY,
17711770
PreferredUnits=CurrencyUnit.MDOLLARS,
17721771
CurrentUnits=CurrencyUnit.MDOLLARS,
1773-
1774-
# TODO https://github.com/NREL/GEOPHIRES-X/issues/383?title=Parameterize+indirect+cost+factor
1775-
ToolTipText='Includes total drilling and completion cost per well, '
1776-
'including injection and production wells and laterals, plus 5% indirect costs.'
1772+
ToolTipText='Drilling and completion cost per well, including indirect costs '
1773+
f'(default: {self.wellfield_indirect_capital_cost_percentage.DefaultValue}%).'
17771774
)
17781775
self.Coamwell = self.OutputParameterDict[self.Coamwell.Name] = OutputParameter(
17791776
Name="O&M Wellfield cost",

src/geophires_x_schema_generator/geophires-result.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,12 @@
342342
"properties": {
343343
"Drilling and completion costs": {
344344
"type": "number",
345-
"description": "Wellfield cost. Includes total drilling and completion cost of all injection and production wells and laterals, plus 5% indirect costs.",
345+
"description": "Wellfield cost. Includes total drilling and completion cost of all injection and production wells and laterals, plus indirect costs (default: 5%).",
346346
"units": "MUSD"
347347
},
348348
"Drilling and completion costs per well": {
349349
"type": "number",
350-
"description": "Includes total drilling and completion cost per well, including injection and production wells and laterals, plus 5% indirect costs.",
350+
"description": "Drilling and completion cost per well, including indirect costs (default: 5%).",
351351
"units": "MUSD"
352352
},
353353
"Drilling and completion costs per production well": {},

0 commit comments

Comments
 (0)