Skip to content

Commit 9f440e3

Browse files
read in SBT reservoir model parameter in model but dont execute
1 parent ab7a25a commit 9f440e3

File tree

2 files changed

+47
-0
lines changed

2 files changed

+47
-0
lines changed

src/geophires_x/Model.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
from geophires_x.TDPReservoir import TDPReservoir
1212
from geophires_x.WellBores import WellBores
1313
from geophires_x.SurfacePlant import SurfacePlant
14+
#from geophires_x.SBTEconomics import SBTEconomics
15+
#from geophires_x.SBTWellbores import SBTWellbores
16+
from geophires_x.SBTReservoir import SBTReservoir
1417
from geophires_x.SurfacePlantIndustrialHeat import SurfacePlantIndustrialHeat
1518
from geophires_x.SurfacePlantSubcriticalORC import SurfacePlantSubcriticalOrc
1619
from geophires_x.SurfacePlantSupercriticalORC import SurfacePlantSupercriticalOrc
@@ -101,6 +104,11 @@ def __init__(self, enable_geophires_logging_config=True, input_file=None):
101104
self.reserv: TOUGH2Reservoir = TOUGH2Reservoir(self) # Tough2 is called
102105
elif self.InputParameters['Reservoir Model'].sValue == '7':
103106
self.reserv: SUTRAReservoir = SUTRAReservoir(self) # SUTRA output is created
107+
elif self.InputParameters['Reservoir Model'].sValue in ['8', 'SBT']:
108+
self.logger.info('Setup the SBT elements of the Model and instantiate new attributes as needed')
109+
self.reserv: SBTReservoir = SBTReservoir(self)
110+
# self.wellbores: SBTWellBores = SBTWellbores(self)
111+
# self.economics: SBTEconomics = SBTEconomics(self)
104112

105113
# initialize the default objects
106114
self.wellbores: WellBores = WellBores(self)

src/geophires_x/OptionList.py

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ class ReservoirModel(GeophiresInputEnum):
114114
USER_PROVIDED_PROFILE = 5, "User-Provided Temperature Profile"
115115
TOUGH2_SIMULATOR = 6, "TOUGH2 Simulator"
116116
SUTRA = 7, "SUTRA"
117+
SBT = 8, "SBT"
117118

118119
@staticmethod
119120
def get_reservoir_model_from_input_string(input_string:str):
@@ -252,6 +253,7 @@ class Configuration(GeophiresInputEnum):
252253
COAXIAL = 2, "coaxial"
253254
VERTICAL = 3, "vertical"
254255
L = 4, "L"
256+
EAVORLOOP = 5, "EavorLoop"
255257

256258
@staticmethod
257259
def from_int(int_val):
@@ -266,3 +268,40 @@ def from_input_string(input_string: str):
266268
return member
267269

268270
raise ValueError(f'Unknown Configuration input value: {input_string}')
271+
272+
273+
class FlowrateModel(GeophiresInputEnum):
274+
USER_SUPPLIED = 1, "user supplied"
275+
FILE_SUPPLIED = 2, "file supplied"
276+
277+
@staticmethod
278+
def from_int(int_val):
279+
for member in __class__:
280+
if member.int_value == int_val:
281+
return member
282+
283+
@staticmethod
284+
def from_input_string(input_string: str):
285+
for member in __class__:
286+
if input_string == str(member.int_value):
287+
return member
288+
289+
raise ValueError(f'Unknown Flow Rate Model input value: {input_string}')
290+
291+
class InjectionTemperatureModel(GeophiresInputEnum):
292+
USER_SUPPLIED = 1, "user supplied"
293+
FILE_SUPPLIED = 2, "file supplied"
294+
295+
@staticmethod
296+
def from_int(int_val):
297+
for member in __class__:
298+
if member.int_value == int_val:
299+
return member
300+
301+
@staticmethod
302+
def from_input_string(input_string: str):
303+
for member in __class__:
304+
if input_string == str(member.int_value):
305+
return member
306+
307+
raise ValueError(f'Unknown Injection Temperature Model input value: {input_string}')

0 commit comments

Comments
 (0)