Skip to content

Commit dace656

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
Use correct slice integration behavior and update unit tests.
1 parent aabadb8 commit dace656

32 files changed

+344
-346
lines changed

‎src/geophires_x/SurfacePlant.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ def integrate_time_series_slice(
2323
if len(_slice) == 1:
2424
return _slice[0]
2525

26-
# FIXME TEMP - WIP to ensure unit tests are unchanged by refactoring but with original behavior retained
27-
# dx_steps = (len(_slice) - 1) # correct behavior
28-
dx_steps = time_steps_per_year # original behavior
26+
dx_steps = (len(_slice) - 1)
2927

3028
return np.trapz(
3129
_slice,

‎tests/example1_addons.csv‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
Category,Field,Year,Value,Units
22
SUMMARY OF RESULTS,End-Use Option,,Electricity,
33
SUMMARY OF RESULTS,Average Net Electricity Production,,5.39,MW
4-
SUMMARY OF RESULTS,Electricity breakeven price,,1.74,cents/kWh
4+
SUMMARY OF RESULTS,Electricity breakeven price,,1.73,cents/kWh
55
SUMMARY OF RESULTS,Number of production wells,,2,count
66
SUMMARY OF RESULTS,Number of injection wells,,2,count
77
SUMMARY OF RESULTS,Flowrate per production well,,55.0,kg/sec
88
SUMMARY OF RESULTS,Well depth,,3.0,kilometer
99
SUMMARY OF RESULTS,Geothermal gradient,,50,degC/km
10-
SUMMARY OF RESULTS,Total Avoided Carbon Emissions,,472.02,kilotonne
10+
SUMMARY OF RESULTS,Total Avoided Carbon Emissions,,474.67,kilotonne
1111
ECONOMIC PARAMETERS,Economic Model,,Fixed Charge Rate (FCR),
1212
ECONOMIC PARAMETERS,Accrued financing during construction,,0.0,
1313
ECONOMIC PARAMETERS,Project lifetime,,30,yr
1414
ECONOMIC PARAMETERS,Capacity factor,,90.0,%
15-
ECONOMIC PARAMETERS,Project NPV,,65.9,MUSD
16-
ECONOMIC PARAMETERS,Project IRR,,20.11,%
17-
ECONOMIC PARAMETERS,Project VIR=PI=PIR,,3.12,
18-
ECONOMIC PARAMETERS,Project MOIC,,36.27,
15+
ECONOMIC PARAMETERS,Project NPV,,66.12,MUSD
16+
ECONOMIC PARAMETERS,Project IRR,,20.12,%
17+
ECONOMIC PARAMETERS,Project VIR=PI=PIR,,3.13,
18+
ECONOMIC PARAMETERS,Project MOIC,,36.52,
1919
ECONOMIC PARAMETERS,Fixed Charge Rate (FCR),,5.0,
2020
ECONOMIC PARAMETERS,Project Payback Period,,7.05,yr
2121
ECONOMIC PARAMETERS,Estimated Jobs Created,,12,
22-
EXTENDED ECONOMICS,"Adjusted Project LCOE (after incentives\, grants\, AddOns\,etc)",,1.74,cents/kWh
22+
EXTENDED ECONOMICS,"Adjusted Project LCOE (after incentives\, grants\, AddOns\,etc)",,1.73,cents/kWh
2323
EXTENDED ECONOMICS,"Adjusted Project LCOH (after incentives\, grants\, AddOns\,etc)",,0.0,USD/MMBTU
2424
EXTENDED ECONOMICS,"Adjusted Project CAPEX (after incentives\, grants\, AddOns\, etc)",,101.07,MUSD
2525
EXTENDED ECONOMICS,"Adjusted Project OPEX (after incentives\, grants\, AddOns\, etc)",,0.88,MUSD
26-
EXTENDED ECONOMICS,Project NPV (including AddOns),,-13.02,MUSD
26+
EXTENDED ECONOMICS,Project NPV (including AddOns),,-12.88,MUSD
2727
EXTENDED ECONOMICS,Project IRR (including AddOns),,0.06,%
2828
EXTENDED ECONOMICS,Project VIR=PI=PIR (including AddOns),,0.87,
29-
EXTENDED ECONOMICS,Project MOIC (including AddOns),,1.0,
29+
EXTENDED ECONOMICS,Project MOIC (including AddOns),,1.01,
3030
EXTENDED ECONOMICS,Total Add-on CAPEX,,70.0,MUSD
3131
EXTENDED ECONOMICS,Total Add-on OPEX,,1.7,MUSD/yr
3232
EXTENDED ECONOMICS,Total Add-on Net Elec,,25900.0,kW/yr
@@ -94,12 +94,12 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Maximum Net Electricity Generation,,5.42,MW
9494
SURFACE EQUIPMENT SIMULATION RESULTS,Average Net Electricity Generation,,5.39,MW
9595
SURFACE EQUIPMENT SIMULATION RESULTS,Minimum Net Electricity Generation,,5.22,MW
9696
SURFACE EQUIPMENT SIMULATION RESULTS,Initial Net Electricity Generation,,5.22,MW
97-
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation,,43.85,GWh
98-
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh
97+
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation,,44.1,GWh
98+
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.54,GWh
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.7.20,
102+
Simulation Metadata,GEOPHIRES Version,,3.7.21,
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,
@@ -279,7 +279,7 @@ HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,2
279279
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,27,42.7,GWh/year
280280
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,28,42.7,GWh/year
281281
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,29,42.7,GWh/year
282-
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,30,35.6,GWh/year
282+
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,30,42.7,GWh/year
283283
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,1,417.7,GWh/year
284284
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,2,419.8,GWh/year
285285
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,3,420.5,GWh/year
@@ -309,7 +309,7 @@ HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,26,422.
309309
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,27,422.8,GWh/year
310310
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,28,422.8,GWh/year
311311
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,29,422.9,GWh/year
312-
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,30,352.4,GWh/year
312+
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,30,422.9,GWh/year
313313
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,RESERVOIR HEAT CONTENT,1,322.5,10^15 J
314314
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,RESERVOIR HEAT CONTENT,2,320.99,10^15 J
315315
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,RESERVOIR HEAT CONTENT,3,319.47,10^15 J
@@ -339,7 +339,7 @@ HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,RESERVOIR HEAT CONTENT
339339
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,RESERVOIR HEAT CONTENT,27,282.99,10^15 J
340340
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,RESERVOIR HEAT CONTENT,28,281.47,10^15 J
341341
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,RESERVOIR HEAT CONTENT,29,279.95,10^15 J
342-
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,RESERVOIR HEAT CONTENT,30,278.68,10^15 J
342+
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,RESERVOIR HEAT CONTENT,30,278.43,10^15 J
343343
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,1,0.46,%
344344
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,2,0.93,%
345345
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,3,1.4,%
@@ -369,7 +369,7 @@ HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HE
369369
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,27,12.66,%
370370
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,28,13.13,%
371371
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,29,13.6,%
372-
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,30,13.99,%
372+
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,30,14.07,%
373373
EXTENDED ECONOMIC PROFILE,Electricity Price,1,0.0,cents/kWh
374374
EXTENDED ECONOMIC PROFILE,Electricity Price,2,0.09,cents/kWh
375375
EXTENDED ECONOMIC PROFILE,Electricity Price,3,0.09,cents/kWh

‎tests/examples/Fervo_Norbeck_Latimer_2023.out‎

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.20
8-
Simulation Date: 2025-03-04
9-
Simulation Time: 08:31
10-
Calculation Time: 0.447 sec
7+
GEOPHIRES Version: 3.7.21
8+
Simulation Date: 2025-03-05
9+
Simulation Time: 15:05
10+
Calculation Time: 0.461 sec
1111

1212
***SUMMARY OF RESULTS***
1313

1414
End-Use Option: Electricity
1515
Average Net Electricity Production: 2.26 MW
16-
Electricity breakeven price: 26.95 cents/kWh
16+
Electricity breakeven price: 26.75 cents/kWh
1717
Number of production wells: 1
1818
Number of injection wells: 1
1919
Flowrate per production well: 41.0 kg/sec
@@ -27,10 +27,10 @@ Simulation Metadata
2727
Accrued financing during construction: 5.00
2828
Project lifetime: 10 yr
2929
Capacity factor: 90.0 %
30-
Project NPV: -13.17 MUSD
31-
Project IRR: -4.65 %
32-
Project VIR=PI=PIR: 0.53
33-
Project MOIC: -0.19
30+
Project NPV: -13.03 MUSD
31+
Project IRR: -4.40 %
32+
Project VIR=PI=PIR: 0.54
33+
Project MOIC: -0.18
3434
Project Payback Period: N/A
3535
Estimated Jobs Created: 6
3636

@@ -125,8 +125,8 @@ Simulation Metadata
125125
Average Net Electricity Generation: 2.26 MW
126126
Minimum Net Electricity Generation: 1.74 MW
127127
Initial Net Electricity Generation: 2.24 MW
128-
Average Annual Total Electricity Generation: 22.63 GWh
129-
Average Annual Net Electricity Generation: 17.70 GWh
128+
Average Annual Total Electricity Generation: 22.83 GWh
129+
Average Annual Net Electricity Generation: 17.85 GWh
130130
Initial pumping power/net installed power: 28.16 %
131131
Average Pumping Power: 0.63 MW
132132
Heat to Power Conversion Efficiency: 9.95 %
@@ -164,7 +164,7 @@ Simulation Metadata
164164
7 18.4 181.3 5.26 46.44
165165
8 18.1 180.2 4.61 53.05
166166
9 17.1 176.6 3.98 59.52
167-
10 13.6 151.9 3.43 65.09
167+
10 15.1 168.8 3.37 65.70
168168

169169

170170
********************************

‎tests/examples/Fervo_Project_Cape-2.out‎

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.20
8-
Simulation Date: 2025-03-04
9-
Simulation Time: 08:31
10-
Calculation Time: 0.670 sec
7+
GEOPHIRES Version: 3.7.21
8+
Simulation Date: 2025-03-05
9+
Simulation Time: 15:05
10+
Calculation Time: 0.678 sec
1111

1212
***SUMMARY OF RESULTS***
1313

1414
End-Use Option: Electricity
1515
Average Net Electricity Production: 8.90 MW
16-
Electricity breakeven price: 10.19 cents/kWh
16+
Electricity breakeven price: 10.14 cents/kWh
1717
Number of production wells: 1
1818
Number of injection wells: 2
1919
Flowrate per production well: 93.0 kg/sec
@@ -27,10 +27,10 @@ Simulation Metadata
2727
Accrued financing during construction: 5.00
2828
Project lifetime: 15 yr
2929
Capacity factor: 90.0 %
30-
Project NPV: 41.82 MUSD
31-
Project IRR: 17.54 %
32-
Project VIR=PI=PIR: 1.82
33-
Project MOIC: 1.40
30+
Project NPV: 42.33 MUSD
31+
Project IRR: 17.60 %
32+
Project VIR=PI=PIR: 1.83
33+
Project MOIC: 1.42
3434
Project Payback Period: 6.50 yr
3535
Estimated Jobs Created: 19
3636

@@ -123,8 +123,8 @@ Simulation Metadata
123123
Average Net Electricity Generation: 8.90 MW
124124
Minimum Net Electricity Generation: 8.75 MW
125125
Initial Net Electricity Generation: 8.75 MW
126-
Average Annual Total Electricity Generation: 70.80 GWh
127-
Average Annual Net Electricity Generation: 69.67 GWh
126+
Average Annual Total Electricity Generation: 71.28 GWh
127+
Average Annual Net Electricity Generation: 70.14 GWh
128128
Initial pumping power/net installed power: 1.68 %
129129
Average Pumping Power: 0.15 MW
130130
Heat to Power Conversion Efficiency: 16.00 %
@@ -172,7 +172,7 @@ Simulation Metadata
172172
12 70.3 438.9 99.26 16.02
173173
13 70.3 439.0 97.68 17.36
174174
14 70.3 439.0 96.10 18.69
175-
15 63.3 395.1 94.68 19.90
175+
15 70.3 439.0 94.52 20.03
176176

177177

178178
********************************

‎tests/examples/Fervo_Project_Cape-3.out‎

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.20
8-
Simulation Date: 2025-03-04
9-
Simulation Time: 08:31
10-
Calculation Time: 0.891 sec
7+
GEOPHIRES Version: 3.7.21
8+
Simulation Date: 2025-03-05
9+
Simulation Time: 15:05
10+
Calculation Time: 0.945 sec
1111

1212
***SUMMARY OF RESULTS***
1313

1414
End-Use Option: Electricity
1515
Average Net Electricity Production: 404.31 MW
16-
Electricity breakeven price: 2.78 cents/kWh
16+
Electricity breakeven price: 2.77 cents/kWh
1717
Number of production wells: 39
1818
Number of injection wells: 39
1919
Flowrate per production well: 120.0 kg/sec
@@ -27,10 +27,10 @@ Simulation Metadata
2727
Accrued financing during construction: 5.00
2828
Project lifetime: 20 yr
2929
Capacity factor: 90.0 %
30-
Project NPV: 4561.96 MUSD
31-
Project IRR: 43.74 %
32-
Project VIR=PI=PIR: 5.25
33-
Project MOIC: 6.26
30+
Project NPV: 4580.36 MUSD
31+
Project IRR: 43.75 %
32+
Project VIR=PI=PIR: 5.27
33+
Project MOIC: 6.30
3434
Project Payback Period: 3.38 yr
3535
Estimated Jobs Created: 976
3636

@@ -124,8 +124,8 @@ Simulation Metadata
124124
Average Net Electricity Generation: 404.31 MW
125125
Minimum Net Electricity Generation: 398.45 MW
126126
Initial Net Electricity Generation: 398.45 MW
127-
Average Annual Total Electricity Generation: 3593.27 GWh
128-
Average Annual Net Electricity Generation: 3171.75 GWh
127+
Average Annual Total Electricity Generation: 3611.36 GWh
128+
Average Annual Net Electricity Generation: 3187.72 GWh
129129
Initial pumping power/net installed power: 13.50 %
130130
Average Pumping Power: 53.73 MW
131131
Heat to Power Conversion Efficiency: 14.39 %
@@ -183,7 +183,7 @@ Simulation Metadata
183183
17 3193.5 22165.4 25892.94 4.97
184184
18 3193.8 22166.6 25813.14 5.27
185185
19 3194.1 22167.7 25733.34 5.56
186-
20 2875.0 19951.8 25661.51 5.82
186+
20 3194.4 22168.7 25653.53 5.85
187187

188188

189189
********************************

‎tests/examples/Fervo_Project_Cape.out‎

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.20
8-
Simulation Date: 2025-03-04
9-
Simulation Time: 08:32
10-
Calculation Time: 0.666 sec
7+
GEOPHIRES Version: 3.7.21
8+
Simulation Date: 2025-03-05
9+
Simulation Time: 15:05
10+
Calculation Time: 0.692 sec
1111

1212
***SUMMARY OF RESULTS***
1313

1414
End-Use Option: Electricity
1515
Average Net Electricity Production: 88.50 MW
16-
Electricity breakeven price: 8.75 cents/kWh
16+
Electricity breakeven price: 8.72 cents/kWh
1717
Number of production wells: 12
1818
Number of injection wells: 12
1919
Flowrate per production well: 98.0 kg/sec
@@ -27,10 +27,10 @@ Simulation Metadata
2727
Accrued financing during construction: 5.00
2828
Project lifetime: 15 yr
2929
Capacity factor: 90.0 %
30-
Project NPV: 516.24 MUSD
31-
Project IRR: 20.97 %
32-
Project VIR=PI=PIR: 2.07
33-
Project MOIC: 1.87
30+
Project NPV: 520.01 MUSD
31+
Project IRR: 21.00 %
32+
Project VIR=PI=PIR: 2.08
33+
Project MOIC: 1.88
3434
Project Payback Period: 5.67 yr
3535
Estimated Jobs Created: 226
3636

@@ -123,8 +123,8 @@ Simulation Metadata
123123
Average Net Electricity Generation: 88.50 MW
124124
Minimum Net Electricity Generation: 60.25 MW
125125
Initial Net Electricity Generation: 91.64 MW
126-
Average Annual Total Electricity Generation: 833.28 GWh
127-
Average Annual Net Electricity Generation: 693.77 GWh
126+
Average Annual Total Electricity Generation: 837.66 GWh
127+
Average Annual Net Electricity Generation: 697.19 GWh
128128
Initial pumping power/net installed power: 19.31 %
129129
Average Pumping Power: 17.82 MW
130130
Heat to Power Conversion Efficiency: 13.05 %
@@ -172,7 +172,7 @@ Simulation Metadata
172172
12 681.8 5283.6 172.55 57.66
173173
13 640.0 5136.7 154.06 62.20
174174
14 581.8 4928.0 136.32 66.55
175-
15 460.8 4203.2 121.18 70.26
175+
15 512.0 4670.3 119.50 70.68
176176

177177

178178
********************************

0 commit comments

Comments
 (0)