Merge pull request #181 from softwareengineerprogrammer/vertical-and-lateral-indirect-costs-2

Include indirect costs in vertical and lateral (non-vertical) section drilling costs [v3.17]

Author: softwareengineerprogrammer

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.16.2
+current_version = 3.17.0
 commit = True
 tag = True
 

.cookiecutterrc

@@ -54,7 +54,7 @@ default_context:
     sphinx_doctest: "no"
     sphinx_theme: "sphinx-py3doc-enhanced-theme"
     test_matrix_separate_coverage: "no"
-    version: 3.16.2
+    version: 3.17.0
     version_manager: "bump2version"
     website: "https://github.com/NREL"
     year_from: "2023"

CHANGELOG.rst

@@ -5,6 +5,11 @@ Changelog
 GEOPHIRES v3 (2023-2026)
 ------------------------
 
+3.17
+^^^^
+
+3.17: `Warn user if ORC is used with production temperature greater than 200 degrees C <https://github.com/NatLabRockies/GEOPHIRES-X/pull/517>`__; `Include indirect costs in vertical and lateral (non-vertical) section drilling costs <https://github.com/softwareengineerprogrammer/GEOPHIRES/pull/181>`__ | `release <https://github.com/NREL/GEOPHIRES-X/releases/tag/v3.17.0>`__
+
 3.16
 ^^^^
 

README.rst

@@ -58,9 +58,9 @@ Free software: `MIT license <LICENSE>`__
     :alt: Supported implementations
     :target: https://pypi.org/project/geophires-x
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.16.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.17.0.svg
     :alt: Commits since latest release
-    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.16.2...main
+    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.17.0...main
 
 .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
     :target: https://softwareengineerprogrammer.github.io/GEOPHIRES

docs/conf.py

@@ -18,7 +18,7 @@
 year = '2025'
 author = 'NREL'
 copyright = f'{year}, {author}'
-version = release = '3.16.2'
+version = release = '3.17.0'
 
 pygments_style = 'trac'
 templates_path = ['./templates']

setup.py

@@ -13,7 +13,7 @@ def read(*names, **kwargs):
 
 setup(
     name='geophires-x',
-    version='3.16.2',
+    version='3.17.0',
     license='MIT',
     description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
     long_description='{}\n{}'.format(

src/geophires_x/Economics.py

@@ -2042,6 +2042,9 @@ def __init__(self, model: Model):
                         f'Provide {self.ccexplfixed.Name} to override the default correlation and set your own cost.'
         )
 
+        wellfield_indirect_costs_default_note = (f'(default: '
+                                                 f'{self.wellfield_indirect_capital_cost_percentage.DefaultValue}%)')
+
         # noinspection SpellCheckingInspection
         self.Cwell = self.OutputParameterDict[self.Cwell.Name] = OutputParameter(
             Name="Wellfield cost",
@@ -2051,7 +2054,7 @@ def __init__(self, model: Model):
             CurrentUnits=CurrencyUnit.MDOLLARS,
             ToolTipText=f'Includes total drilling and completion cost of all injection and production wells and '
                         f'laterals, plus indirect costs '
-                        f'(default: {self.wellfield_indirect_capital_cost_percentage.DefaultValue}%).'
+                        f'{wellfield_indirect_costs_default_note}.'
         )
         self.drilling_and_completion_costs_per_well = self.OutputParameterDict[
             self.drilling_and_completion_costs_per_well.Name] = OutputParameter(
@@ -2060,7 +2063,7 @@ def __init__(self, model: Model):
             PreferredUnits=CurrencyUnit.MDOLLARS,
             CurrentUnits=CurrencyUnit.MDOLLARS,
             ToolTipText='Drilling and completion cost per well, including indirect costs '
-                        f'(default: {self.wellfield_indirect_capital_cost_percentage.DefaultValue}%).'
+                        f'{wellfield_indirect_costs_default_note}.'
         )
 
         # noinspection SpellCheckingInspection
@@ -2514,7 +2517,25 @@ def __init__(self, model: Model):
             Name='Drilling and completion costs per non-vertical section',
             UnitType=Units.CURRENCY,
             PreferredUnits=CurrencyUnit.MDOLLARS,
-            CurrentUnits=CurrencyUnit.MDOLLARS
+            CurrentUnits=CurrencyUnit.MDOLLARS,
+            ToolTipText=f'Drilling and completion costs per non-vertical section (lateral), '
+                        f'including indirect costs {wellfield_indirect_costs_default_note}.'
+        )
+        self.cost_per_vertical_production_well = self.OutputParameterDict[self.cost_per_vertical_production_well.Name] = OutputParameter(
+            Name="Drilling and completion costs per vertical production well",
+            UnitType=Units.CURRENCY,
+            PreferredUnits=CurrencyUnit.MDOLLARS,
+            CurrentUnits=CurrencyUnit.MDOLLARS,
+            ToolTipText=f'Drilling and completion costs per vertical production well section, '
+                        f'including indirect costs {wellfield_indirect_costs_default_note}.'
+        )
+        self.cost_per_vertical_injection_well = self.OutputParameterDict[self.cost_per_vertical_injection_well.Name] = OutputParameter(
+            Name="Drilling and completion costs per vertical injection well",
+            UnitType=Units.CURRENCY,
+            PreferredUnits=CurrencyUnit.MDOLLARS,
+            CurrentUnits=CurrencyUnit.MDOLLARS,
+            ToolTipText=f'Drilling and completion costs per vertical production well section, '
+                        f'including indirect costs {wellfield_indirect_costs_default_note}.'
         )
         self.cost_to_junction_section = self.OutputParameterDict[self.cost_to_junction_section.Name] = OutputParameter(
             Name="Cost of the entire section of a well from bottom of vertical to junction with laterals",
@@ -4101,7 +4122,11 @@ def _calculate_derived_outputs(self, model: Model) -> None:
             self.cost_per_lateral_section.value = (
                 self.cost_lateral_section.quantity().to(self.cost_per_lateral_section.CurrentUnits).magnitude
                 / model.wellbores.numnonverticalsections.value
-            )
+            ) * self._wellfield_indirect_cost_factor
+            self.cost_per_vertical_production_well.value = self.cost_one_production_well.quantity().to(
+                self.cost_per_vertical_production_well.CurrentUnits).magnitude * self._wellfield_indirect_cost_factor
+            self.cost_per_vertical_injection_well.value = self.cost_one_injection_well.quantity().to(
+                self.cost_per_vertical_injection_well.CurrentUnits).magnitude * self._wellfield_indirect_cost_factor
 
         if hasattr(self, 'discountrate'):
             self.real_discount_rate.value = self.discountrate.quantity().to(convertible_unit(

src/geophires_x/Outputs.py

@@ -486,9 +486,15 @@ def PrintOutputs(self, model: Model):
                     f.write(f'         {model.economics.Cwell.display_name}:                 {model.economics.Cwell.value:10.2f} {model.economics.Cwell.CurrentUnits.value}\n')
 
                     if econ.cost_lateral_section.value > 0.0:
-                        f.write(f'             Drilling and completion costs per vertical production well:   {econ.cost_one_production_well.value:10.2f} {econ.cost_one_production_well.CurrentUnits.value}\n')
-                        f.write(f'             Drilling and completion costs per vertical injection well:    {econ.cost_one_injection_well.value:10.2f} {econ.cost_one_injection_well.CurrentUnits.value}\n')
-                        f.write(f'             {econ.cost_per_lateral_section.Name}:       {econ.cost_per_lateral_section.value:10.2f} {econ.cost_lateral_section.CurrentUnits.value}\n')
+                        f.write(f'             {econ.cost_per_vertical_production_well.display_name}:   '
+                                f'{econ.cost_per_vertical_production_well.value:10.2f} '
+                                f'{econ.cost_per_vertical_production_well.CurrentUnits.value}\n')
+                        f.write(f'             {econ.cost_per_vertical_injection_well.display_name}:    '
+                                f'{econ.cost_per_vertical_injection_well.value:10.2f} '
+                                f'{econ.cost_per_vertical_injection_well.CurrentUnits.value}\n')
+                        f.write(f'             {econ.cost_per_lateral_section.display_name}:       '
+                                f'{econ.cost_per_lateral_section.value:10.2f} '
+                                f'{econ.cost_lateral_section.CurrentUnits.value}\n')
                     elif round(econ.cost_one_production_well.value, 4) != round(econ.cost_one_injection_well.value, 4) \
                         and model.economics.cost_one_injection_well.value != -1:
                         f.write(f'             {econ.cost_one_production_well.display_name}:   {econ.cost_one_production_well.value:10.2f} {econ.cost_one_production_well.CurrentUnits.value}\n')

src/geophires_x/__init__.py

@@ -1 +1 @@
-__version__ = '3.16.2'
+__version__ = '3.17.0'

src/geophires_x_schema_generator/geophires-result.json

@@ -435,11 +435,19 @@
           "description": "Cost of One Injection Well",
           "units": "MUSD"
         },
-        "Drilling and completion costs per vertical production well": {},
-        "Drilling and completion costs per vertical injection well": {},
+        "Drilling and completion costs per vertical production well": {
+          "type": "number",
+          "description": "Drilling and completion costs per vertical production well section, including indirect costs (default: 5%).",
+          "units": "MUSD"
+        },
+        "Drilling and completion costs per vertical injection well": {
+          "type": "number",
+          "description": "Drilling and completion costs per vertical production well section, including indirect costs (default: 5%).",
+          "units": "MUSD"
+        },
         "Drilling and completion costs per non-vertical section": {
           "type": "number",
-          "description": "",
+          "description": "Drilling and completion costs per non-vertical section (lateral), including indirect costs (default: 5%).",
           "units": "MUSD"
         },
         "Drilling and completion costs (for redrilling)": {},