Skip to content

Commit 4813685

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
Define ReservoirModel.display_name to output as 'Multiple Parallel Fractures Model (Gringarten)'. Update affected unit tests and regenerate examples with Gringarten (reservoir model display name change only)
1 parent 591efb5 commit 4813685

26 files changed

+141
-114
lines changed

‎src/geophires_x/OptionList.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,23 @@ def from_int(int_val):
135135
if member.int_value == int_val:
136136
return member
137137

138+
@property
139+
def display_name(self) -> str:
140+
"""
141+
Returns a formatted string for display purposes.
142+
Format: "<value> Model <(suffix)>"
143+
"""
144+
val_str = self.value
145+
146+
if '(' in val_str:
147+
index = val_str.find('(')
148+
base_name = val_str[:index].strip()
149+
suffix = val_str[index:].strip()
150+
return f'{base_name} Model {suffix}'
151+
else:
152+
# No suffix is present
153+
return f'{val_str} Model'
154+
138155

139156
class ReservoirVolume(GeophiresInputEnum):
140157
"""

‎src/geophires_x/Outputs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ def PrintOutputs(self, model: Model):
349349
if model.wellbores.IsAGS.value:
350350
f.write('The AGS models contain an intrinsic reservoir model that doesn\'t expose values that can be used in extensive reporting.\n')
351351
else:
352-
f.write(f' Reservoir Model = {str(model.reserv.resoption.value.value)} Model\n')
352+
f.write(f' Reservoir Model = {model.reserv.resoption.value.display_name}\n')
353353
if model.reserv.resoption.value is ReservoirModel.SINGLE_FRACTURE:
354354
f.write(f' m/A Drawdown Parameter: {model.reserv.drawdp.value:.5f} ' + model.reserv.drawdp.CurrentUnits.value + NL)
355355
elif model.reserv.resoption.value is ReservoirModel.ANNUAL_PERCENTAGE:

‎tests/example1_addons.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ENGINEERING PARAMETERS,Power plant type,,Supercritical ORC,
4848
RESOURCE CHARACTERISTICS,Maximum reservoir temperature,,400.0,degC
4949
RESOURCE CHARACTERISTICS,Number of segments,,1,count
5050
RESOURCE CHARACTERISTICS,Geothermal gradient,,50,degC/km
51-
RESERVOIR PARAMETERS,Reservoir Model,,Multiple Parallel Fractures Model,
51+
RESERVOIR PARAMETERS,Reservoir Model,,Multiple Parallel Fractures Model (Gringarten),
5252
RESERVOIR PARAMETERS,Fracture model,,Square,
5353
RESERVOIR PARAMETERS,Bottom-hole temperature,,170.0,degC
5454
RESERVOIR PARAMETERS,Well separation: fracture height,,900.0,meter
@@ -99,7 +99,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,
9999
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
100100
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
101101
SURFACE EQUIPMENT SIMULATION RESULTS,Heat to Power Conversion Efficiency,,10.07,%
102-
Simulation Metadata,GEOPHIRES Version,,3.9.7,
102+
Simulation Metadata,GEOPHIRES Version,,3.9.28,
103103
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
104104
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
105105
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,

‎tests/examples/Fervo_Norbeck_Latimer_2023.out

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.9.7
8-
Simulation Date: 2025-05-15
9-
Simulation Time: 10:13
10-
Calculation Time: 0.432 sec
7+
GEOPHIRES Version: 3.9.28
8+
Simulation Date: 2025-07-02
9+
Simulation Time: 12:19
10+
Calculation Time: 0.481 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -60,14 +60,14 @@ Simulation Metadata
6060

6161
***RESERVOIR PARAMETERS***
6262

63-
Reservoir Model = Multiple Parallel Fractures Model
63+
Reservoir Model = Multiple Parallel Fractures Model (Gringarten)
6464
Bottom-hole temperature: 179.42 degC
6565
Fracture model = Rectangular
6666
Well separation: fracture height: 160.00 meter
6767
Fracture width: 160.00 meter
6868
Fracture area: 25600.00 m**2
6969
Reservoir volume calculated with fracture separation and number of fractures as input
70-
Number of fractures: 100.00
70+
Number of fractures: 100
7171
Fracture separation: 10.00 meter
7272
Reservoir volume: 25344000 m**3
7373
Reservoir impedance: 0.3000 GPa.s/m**3

‎tests/examples/Fervo_Project_Cape-2.out

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.9.7
8-
Simulation Date: 2025-05-15
9-
Simulation Time: 10:13
10-
Calculation Time: 0.650 sec
7+
GEOPHIRES Version: 3.9.28
8+
Simulation Date: 2025-07-02
9+
Simulation Time: 12:19
10+
Calculation Time: 0.722 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -60,14 +60,14 @@ Simulation Metadata
6060

6161
***RESERVOIR PARAMETERS***
6262

63-
Reservoir Model = Multiple Parallel Fractures Model
63+
Reservoir Model = Multiple Parallel Fractures Model (Gringarten)
6464
Bottom-hole temperature: 201.72 degC
6565
Fracture model = Rectangular
6666
Well separation: fracture height: 300.00 meter
6767
Fracture width: 400.00 meter
6868
Fracture area: 120000.00 m**2
6969
Reservoir volume calculated with fracture separation and number of fractures as input
70-
Number of fractures: 80.00
70+
Number of fractures: 80
7171
Fracture separation: 18.00 meter
7272
Reservoir volume: 170640000 m**3
7373
Reservoir impedance: 0.0100 GPa.s/m**3

‎tests/examples/Fervo_Project_Cape-3.out

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.9.7
8-
Simulation Date: 2025-05-15
9-
Simulation Time: 10:13
10-
Calculation Time: 0.868 sec
7+
GEOPHIRES Version: 3.9.28
8+
Simulation Date: 2025-07-02
9+
Simulation Time: 12:19
10+
Calculation Time: 0.956 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -60,14 +60,14 @@ Simulation Metadata
6060

6161
***RESERVOIR PARAMETERS***
6262

63-
Reservoir Model = Multiple Parallel Fractures Model
63+
Reservoir Model = Multiple Parallel Fractures Model (Gringarten)
6464
Bottom-hole temperature: 201.72 degC
6565
Fracture model = Rectangular
6666
Well separation: fracture height: 2000.00 meter
6767
Fracture width: 10000.00 meter
6868
Fracture area: 20000000.00 m**2
6969
Reservoir volume calculated with fracture separation and number of fractures as input
70-
Number of fractures: 149.00
70+
Number of fractures: 149
7171
Fracture separation: 30.00 meter
7272
Reservoir volume: 88800000000 m**3
7373
Reservoir impedance: 0.0010 GPa.s/m**3

‎tests/examples/Fervo_Project_Cape-4.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
Simulation Metadata
66
----------------------
77
GEOPHIRES Version: 3.9.28
8-
Simulation Date: 2025-06-23
9-
Simulation Time: 10:15
10-
Calculation Time: 1.610 sec
8+
Simulation Date: 2025-07-02
9+
Simulation Time: 12:19
10+
Calculation Time: 1.773 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -64,7 +64,7 @@ Simulation Metadata
6464

6565
***RESERVOIR PARAMETERS***
6666

67-
Reservoir Model = Multiple Parallel Fractures Model
67+
Reservoir Model = Multiple Parallel Fractures Model (Gringarten)
6868
Bottom-hole temperature: 201.72 degC
6969
Fracture model = Square
7070
Well separation: fracture height: 165.30 meter

‎tests/examples/Fervo_Project_Cape.out

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.9.7
8-
Simulation Date: 2025-05-15
9-
Simulation Time: 10:13
10-
Calculation Time: 0.655 sec
7+
GEOPHIRES Version: 3.9.28
8+
Simulation Date: 2025-07-02
9+
Simulation Time: 12:19
10+
Calculation Time: 0.720 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -60,14 +60,14 @@ Simulation Metadata
6060

6161
***RESERVOIR PARAMETERS***
6262

63-
Reservoir Model = Multiple Parallel Fractures Model
63+
Reservoir Model = Multiple Parallel Fractures Model (Gringarten)
6464
Bottom-hole temperature: 199.13 degC
6565
Fracture model = Rectangular
6666
Well separation: fracture height: 300.00 meter
6767
Fracture width: 2400.00 meter
6868
Fracture area: 720000.00 m**2
6969
Reservoir volume calculated with fracture separation and number of fractures as input
70-
Number of fractures: 100.00
70+
Number of fractures: 100
7171
Fracture separation: 15.00 meter
7272
Reservoir volume: 1069200000 m**3
7373
Reservoir impedance: 0.0100 GPa.s/m**3

‎tests/examples/example1.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.9.7
8-
Simulation Date: 2025-05-15
9-
Simulation Time: 10:12
10-
Calculation Time: 0.773 sec
7+
GEOPHIRES Version: 3.9.28
8+
Simulation Date: 2025-07-02
9+
Simulation Time: 12:19
10+
Calculation Time: 0.885 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -61,7 +61,7 @@ Simulation Metadata
6161

6262
***RESERVOIR PARAMETERS***
6363

64-
Reservoir Model = Multiple Parallel Fractures Model
64+
Reservoir Model = Multiple Parallel Fractures Model (Gringarten)
6565
Bottom-hole temperature: 170.00 degC
6666
Fracture model = Square
6767
Well separation: fracture height: 900.00 meter

‎tests/examples/example12_DH.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.9.7
8-
Simulation Date: 2025-05-15
9-
Simulation Time: 10:13
10-
Calculation Time: 0.570 sec
7+
GEOPHIRES Version: 3.9.28
8+
Simulation Date: 2025-07-02
9+
Simulation Time: 12:19
10+
Calculation Time: 0.630 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -63,7 +63,7 @@ Simulation Metadata
6363

6464
***RESERVOIR PARAMETERS***
6565

66-
Reservoir Model = Multiple Parallel Fractures Model
66+
Reservoir Model = Multiple Parallel Fractures Model (Gringarten)
6767
Bottom-hole temperature: 93.90 degC
6868
Fracture model = Rectangular
6969
Well separation: fracture height: 300.00 meter

0 commit comments

Comments
 (0)