instantiate sbtwellbores and sbteconomics when SBT reservoir specified

Author: malcolm-dsider

src/geophires_x/Model.py

@@ -11,8 +11,8 @@
 from geophires_x.TDPReservoir import TDPReservoir
 from geophires_x.WellBores import WellBores
 from geophires_x.SurfacePlant import SurfacePlant
-#from geophires_x.SBTEconomics import SBTEconomics
-#from geophires_x.SBTWellbores import SBTWellbores
+from geophires_x.SBTEconomics import SBTEconomics
+from geophires_x.SBTWellbores import SBTWellbores
 from geophires_x.SBTReservoir import SBTReservoir
 from geophires_x.SurfacePlantIndustrialHeat import SurfacePlantIndustrialHeat
 from geophires_x.SurfacePlantSubcriticalORC import SurfacePlantSubcriticalOrc
@@ -104,11 +104,9 @@ def __init__(self, enable_geophires_logging_config=True, input_file=None):
                 self.reserv: TOUGH2Reservoir = TOUGH2Reservoir(self)  # Tough2 is called
             elif self.InputParameters['Reservoir Model'].sValue == '7':
                 self.reserv: SUTRAReservoir = SUTRAReservoir(self)  # SUTRA output is created
-            elif self.InputParameters['Reservoir Model'].sValue in ['8', 'SBT']:
+            elif self.InputParameters['Reservoir Model'].sValue == '8':
                 self.logger.info('Setup the SBT elements of the Model and instantiate new attributes as needed')
                 self.reserv: SBTReservoir = SBTReservoir(self)
-                # self.wellbores: SBTWellBores = SBTWellbores(self)
-                # self.economics: SBTEconomics = SBTEconomics(self)
 
         # initialize the default objects
         self.wellbores: WellBores = WellBores(self)
@@ -128,6 +126,9 @@ def __init__(self, enable_geophires_logging_config=True, input_file=None):
                 self.surfaceplant: SurfacePlantSUTRA = SurfacePlantSUTRA(self)
                 self.economics: SUTRAEconomics = SUTRAEconomics(self)
                 self.outputs: SUTRAOutputs = SUTRAOutputs(self, output_file=output_file)
+            if self.InputParameters['Reservoir Model'].sValue == '8':
+                self.wellbores: SBTWellbores = SBTWellbores(self)
+                self.economics: SBTEconomics = SBTEconomics(self)
 
         if 'Is AGS' in self.InputParameters:
             if self.InputParameters['Is AGS'].sValue in ['True', 'true', 'TRUE', 'T', '1']:

src/geophires_x/SBTWellbores.py

@@ -3,9 +3,9 @@
 import numpy as np
 from pint.facets.plain import PlainQuantity
 
-from geophires_x.WellBores import WellBores, RameyCalc, WellPressureDrop, \
-    ProdPressureDropsAndPumpingPowerUsingImpedenceModel, ProdPressureDropAndPumpingPowerUsingIndexes, \
-    calculate_total_drilling_lengths_m
+from geophires_x.WellBores import (WellBores, RameyCalc, WellPressureDrop, \
+    ProdPressureDropsAndPumpingPowerUsingImpedenceModel, ProdPressureDropAndPumpingPowerUsingIndexes)
+from geophires_x.Economics import calculate_total_drilling_lengths_m
 from .Parameter import floatParameter, intParameter, boolParameter, OutputParameter, ReadParameter
 from geophires_x.GeoPHIRESUtils import vapor_pressure_water_kPa, quantity, static_pressure_MPa, \
     heat_capacity_water_J_per_kg_per_K