Skip to content

Commit 9ef43e0

Browse files
jeffbourdierjeffbourdier
committed
regenerate example output and lookup units by symbol (issue 95)
1 parent d96c3f8 commit 9ef43e0

36 files changed

+448
-369
lines changed

‎src/geophires_x/Parameter.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,10 @@ def LookupUnits(sUnitText: str):
834834
for item in MyEnum:
835835
if item.value == sUnitText:
836836
return item, uType
837+
838+
# No match was found with the unit text string, so try with the canonical symbol (if different).
839+
symbol = _ureg.get_symbol(sUnitText)
840+
if symbol != sUnitText: return LookupUnits(symbol)
837841
return None, None
838842

839843

‎tests/example1_addons.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ENGINEERING PARAMETERS,Number of Production Wells,,2,count
3737
ENGINEERING PARAMETERS,Number of Injection Wells,,2,count
3838
ENGINEERING PARAMETERS,"Well depth (or total length\, if not vertical)",,3.0,kilometer
3939
ENGINEERING PARAMETERS,Water loss rate,,2.0,
40-
ENGINEERING PARAMETERS,Pump efficiency,,80.0,
40+
ENGINEERING PARAMETERS,Pump efficiency,,80.0,%
4141
ENGINEERING PARAMETERS,Injection temperature,,50.0,degC
4242
ENGINEERING PARAMETERS,Average production well temperature drop,,3.0,degC
4343
ENGINEERING PARAMETERS,Flowrate per production well,,55.0,kg/sec
@@ -97,7 +97,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation
9797
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh
9898
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
9999
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
100-
Simulation Metadata,GEOPHIRES Version,,3.6.0,
100+
Simulation Metadata,GEOPHIRES Version,,3.6.3,
101101
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
102102
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
103103
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,

‎tests/examples/Fervo_Norbeck_Latimer_2023.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.6.0
8-
Simulation Date: 2024-10-15
9-
Simulation Time: 13:08
10-
Calculation Time: 0.447 sec
7+
GEOPHIRES Version: 3.6.3
8+
Simulation Date: 2024-11-18
9+
Simulation Time: 16:48
10+
Calculation Time: 1.672 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -40,7 +40,7 @@ Simulation Metadata
4040
Number of Injection Wells: 1
4141
Well depth (or total length, if not vertical): 2.3 kilometer
4242
Water loss rate: 10.0
43-
Pump efficiency: 80.0
43+
Pump efficiency: 80.0 %
4444
Injection temperature: 41.0 degC
4545
Production Wellbore heat transmission calculated with Ramey's model
4646
Average production well temperature drop: 4.1 degC

‎tests/examples/Fervo_Norbeck_Latimer_2023.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Reservoir Model, 1
1515
Reservoir Volume Option, 1,
1616
Reservoir Density, 2800, per the paper phyllite + quartzite + diorite + granodiorite,
17-
Reservoir Depth, 7700 ft, per the paper
17+
Reservoir Depth, 7700 feet, per the paper
1818
Reservoir Heat Capacity, 1000
1919
Reservoir Thermal Conductivity, 2.7
2020
Number of Fractures, 100, per the paper
@@ -31,13 +31,13 @@ Well Geometry Configuration, 4
3131
Has Nonvertical Section, True
3232
Multilaterals Cased, True
3333
Number of Multilateral Sections, 2, Two parallel horizontal sections
34-
Nonvertical Length per Multilateral Section, 3250 ft, per the paper
34+
Nonvertical Length per Multilateral Section, 3250 feet, per the paper
3535
Well Drilling Cost Correlation, 10, per the drill cost paper - works out to $400/ft
3636
Horizontal Well Drilling Cost Correlation, 10, per the drill cost paper - works out to $400/ft
3737
Production Flow Rate per Well, 41.02, =650 gpm per the paper - per the paper the maximum flow rate was 63 L/s but the range was 550-750 gpm
3838
Production Well Diameter, 7, per the paper
3939
Injection Well Diameter, 7, per the paper
40-
Well Separation, 365 ft, per the paper
40+
Well Separation, 365 feet, per the paper
4141
Injection Temperature, 38 degC, per the paper 75 to 125 degF
4242
Injection Wellbore Temperature Gain, 3
4343
Reservoir Impedance, 0.33, per paper, matching pumping power report 500-1000 kW

‎tests/examples/Fervo_Project_Cape-2.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.6.0
8-
Simulation Date: 2024-10-15
9-
Simulation Time: 13:08
10-
Calculation Time: 0.662 sec
7+
GEOPHIRES Version: 3.6.3
8+
Simulation Date: 2024-11-18
9+
Simulation Time: 16:56
10+
Calculation Time: 2.730 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -40,7 +40,7 @@ Simulation Metadata
4040
Number of Injection Wells: 2
4141
Well depth (or total length, if not vertical): 2.6 kilometer
4242
Water loss rate: 2.0
43-
Pump efficiency: 80.0
43+
Pump efficiency: 80.0 %
4444
Injection temperature: 56.7 degC
4545
Production Wellbore heat transmission calculated with Ramey's model
4646
Average production well temperature drop: 2.3 degC

‎tests/examples/Fervo_Project_Cape-2.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Reservoir Model, 1
88
Reservoir Volume Option, 1
99
Reservoir Density, 2800
10-
Reservoir Depth, 8500 ft, -- https://pangea.stanford.edu/ERE/db/GeoConf/papers/SGW/2024/Fercho.pdf
10+
Reservoir Depth, 8500 feet, -- https://pangea.stanford.edu/ERE/db/GeoConf/papers/SGW/2024/Fercho.pdf
1111
Reservoir Heat Capacity, 790
1212
Reservoir Thermal Conductivity, 3.05
1313
Reservoir Porosity, 0.0118
@@ -27,7 +27,7 @@ Number of Production Wells, 1
2727
Production Flow Rate per Well, 93
2828
Production Well Diameter, 7
2929
Injection Well Diameter, 7
30-
Well Separation, 365 ft
30+
Well Separation, 365 feet
3131
Injection Temperature, 60 degC
3232
Injection Wellbore Temperature Gain, 3
3333
Plant Outlet Pressure, 1000 psi
@@ -69,4 +69,4 @@ Well Geometry Configuration, 4
6969
Has Nonvertical Section, True
7070
Multilaterals Cased, True
7171
Number of Multilateral Sections, 3
72-
Nonvertical Length per Multilateral Section, 4700 ft
72+
Nonvertical Length per Multilateral Section, 4700 feet

‎tests/examples/Fervo_Project_Cape-3.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.6.0
8-
Simulation Date: 2024-10-15
9-
Simulation Time: 13:08
10-
Calculation Time: 0.658 sec
7+
GEOPHIRES Version: 3.6.3
8+
Simulation Date: 2024-11-18
9+
Simulation Time: 16:58
10+
Calculation Time: 2.593 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -40,7 +40,7 @@ Simulation Metadata
4040
Number of Injection Wells: 39
4141
Well depth (or total length, if not vertical): 2.6 kilometer
4242
Water loss rate: 2.0
43-
Pump efficiency: 80.0
43+
Pump efficiency: 80.0 %
4444
Injection temperature: 56.7 degC
4545
Production Wellbore heat transmission calculated with Ramey's model
4646
Average production well temperature drop: 1.8 degC

‎tests/examples/Fervo_Project_Cape-3.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Reservoir Model, 1
99
Reservoir Volume Option, 1
1010
Reservoir Density, 2800
11-
Reservoir Depth, 8500 ft, -- https://pangea.stanford.edu/ERE/db/GeoConf/papers/SGW/2024/Fercho.pdf
11+
Reservoir Depth, 8500 feet, -- https://pangea.stanford.edu/ERE/db/GeoConf/papers/SGW/2024/Fercho.pdf
1212
Reservoir Heat Capacity, 790
1313
Reservoir Thermal Conductivity, 3.05
1414
Reservoir Porosity, 0.0118
@@ -28,7 +28,7 @@ Number of Production Wells, 39
2828
Production Flow Rate per Well, 120, -- peak flow reported in paper
2929
Production Well Diameter, 7
3030
Injection Well Diameter, 7
31-
Well Separation, 365 ft
31+
Well Separation, 365 feet
3232
Injection Temperature, 60 degC
3333
Injection Wellbore Temperature Gain, 3
3434
Plant Outlet Pressure, 1000 psi
@@ -69,4 +69,4 @@ Well Geometry Configuration, 4
6969
Has Nonvertical Section, True
7070
Multilaterals Cased, True
7171
Number of Multilateral Sections, 3
72-
Nonvertical Length per Multilateral Section, 4700 ft
72+
Nonvertical Length per Multilateral Section, 4700 feet

‎tests/examples/Fervo_Project_Cape.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.6.0
8-
Simulation Date: 2024-10-15
9-
Simulation Time: 13:08
10-
Calculation Time: 0.657 sec
7+
GEOPHIRES Version: 3.6.3
8+
Simulation Date: 2024-11-18
9+
Simulation Time: 16:54
10+
Calculation Time: 3.061 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -40,7 +40,7 @@ Simulation Metadata
4040
Number of Injection Wells: 12
4141
Well depth (or total length, if not vertical): 2.6 kilometer
4242
Water loss rate: 2.0
43-
Pump efficiency: 80.0
43+
Pump efficiency: 80.0 %
4444
Injection temperature: 56.2 degC
4545
Production Wellbore heat transmission calculated with Ramey's model
4646
Average production well temperature drop: 1.9 degC

‎tests/examples/Fervo_Project_Cape.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Reservoir Model, 1
55
Reservoir Volume Option, 1
66
Reservoir Density, 2800
7-
Reservoir Depth, 8500 ft, -- https://pangea.stanford.edu/ERE/db/GeoConf/papers/SGW/2024/Fercho.pdf
7+
Reservoir Depth, 8500 feet, -- https://pangea.stanford.edu/ERE/db/GeoConf/papers/SGW/2024/Fercho.pdf
88
Reservoir Heat Capacity, 1000
99
Reservoir Thermal Conductivity, 2.7
1010
Number of Fractures, 100
@@ -21,11 +21,11 @@ Well Geometry Configuration, 4
2121
Has Nonvertical Section, True
2222
Multilaterals Cased, True
2323
Number of Multilateral Sections, 2
24-
Nonvertical Length per Multilateral Section, 5000 ft
24+
Nonvertical Length per Multilateral Section, 5000 feet
2525
Production Flow Rate per Well, 98
2626
Production Well Diameter, 8
2727
Injection Well Diameter, 8
28-
Well Separation, 365 ft
28+
Well Separation, 365 feet
2929
Injection Temperature, 60 degC
3030
Injection Wellbore Temperature Gain, 3
3131
Reservoir Impedance, 0.01

0 commit comments

Comments
 (0)