Skip to content

Commit 06a3308

Browse files
bpullutabpulluta
committed
updated tests. Added function to assist with test_csv
1 parent d1ea770 commit 06a3308

19 files changed

+395
-372
lines changed

‎tests/example1_addons.csv

Lines changed: 224 additions & 224 deletions
Large diffs are not rendered by default.

‎tests/examples/example1.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.4.21
7+
GEOPHIRES Version: 3.4.25
88
GEOPHIRES Build Date: 2024-03-05
9-
Simulation Date: 2024-03-12
10-
Simulation Time: 07:20
11-
Calculation Time: 0.618 sec
9+
Simulation Date: 2024-04-16
10+
Simulation Time: 10:32
11+
Calculation Time: 0.962 sec
1212

1313
***SUMMARY OF RESULTS***
1414

@@ -226,17 +226,17 @@ ________________________________________________________________________________
226226
14 5.50 0.94 30.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -41.38
227227
15 5.50 0.94 32.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -40.44
228228
16 5.50 0.94 34.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -39.50
229-
17 5.50 0.94 37.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -38.56
230-
18 5.50 0.94 39.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -37.62
231-
19 5.50 0.94 41.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -36.68
229+
17 5.50 0.94 37.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -38.57
230+
18 5.50 0.94 39.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -37.63
231+
19 5.50 0.94 41.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -36.69
232232
20 5.50 0.94 44.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -35.74
233233
21 5.50 0.94 46.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -34.80
234234
22 5.50 0.94 48.82 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -33.86
235235
23 5.50 0.94 51.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -32.92
236236
24 5.50 0.94 53.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -31.98
237237
25 5.50 0.94 55.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -31.03
238238
26 5.50 0.94 58.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -30.09
239-
27 5.50 0.94 60.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -29.14
239+
27 5.50 0.94 60.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -29.15
240240
28 5.50 0.94 62.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -28.20
241241
29 5.50 0.94 65.19 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -27.26
242242
30 5.50 0.95 67.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -26.31

‎tests/examples/example10_HP.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.4.21
7+
GEOPHIRES Version: 3.4.25
88
GEOPHIRES Build Date: 2024-03-05
9-
Simulation Date: 2024-03-12
10-
Simulation Time: 07:20
11-
Calculation Time: 0.146 sec
9+
Simulation Date: 2024-04-16
10+
Simulation Time: 10:37
11+
Calculation Time: 0.275 sec
1212

1313
***SUMMARY OF RESULTS***
1414

@@ -30,7 +30,7 @@ Simulation Metadata
3030
Accrued financing during construction: 5.00
3131
Project lifetime: 30 yr
3232
Capacity factor: 90.0 %
33-
Project NPV: 5.39 MUSD
33+
Project NPV: 5.38 MUSD
3434
Project IRR: 7.89 %
3535
Project VIR=PI=PIR: 1.17
3636
Project MOIC: 0.98

‎tests/examples/example11_AC.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.4.21
7+
GEOPHIRES Version: 3.4.25
88
GEOPHIRES Build Date: 2024-03-05
9-
Simulation Date: 2024-03-12
10-
Simulation Time: 07:20
11-
Calculation Time: 0.142 sec
9+
Simulation Date: 2024-04-16
10+
Simulation Time: 10:36
11+
Calculation Time: 0.274 sec
1212

1313
***SUMMARY OF RESULTS***
1414

@@ -31,7 +31,7 @@ Simulation Metadata
3131
Accrued financing during construction: 5.00
3232
Project lifetime: 30 yr
3333
Capacity factor: 90.0 %
34-
Project NPV: 1.18 MUSD
34+
Project NPV: 1.17 MUSD
3535
Project IRR: 6.63 %
3636
Project VIR=PI=PIR: 1.04
3737
Project MOIC: 0.80

‎tests/examples/example12_DH.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.4.21
7+
GEOPHIRES Version: 3.4.25
88
GEOPHIRES Build Date: 2024-03-05
9-
Simulation Date: 2024-03-12
10-
Simulation Time: 07:20
11-
Calculation Time: 0.129 sec
9+
Simulation Date: 2024-04-16
10+
Simulation Time: 10:46
11+
Calculation Time: 0.257 sec
1212

1313
***SUMMARY OF RESULTS***
1414

@@ -236,7 +236,7 @@ ________________________________________________________________________________
236236
14 5.50 0.00 0.00 | 2.50 2.08 47.91 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.56 2.08 -17.98
237237
15 5.50 0.00 0.00 | 2.50 2.07 51.54 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.56 2.07 -15.91
238238
16 5.50 0.00 0.00 | 2.50 2.06 55.16 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.56 2.06 -13.85
239-
17 5.50 0.00 0.00 | 2.50 2.06 58.78 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.56 2.06 -11.79
239+
17 5.50 0.00 0.00 | 2.50 2.05 58.78 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.56 2.05 -11.79
240240
18 5.50 0.00 0.00 | 2.50 2.05 62.38 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.56 2.05 -9.75
241241
19 5.50 0.00 0.00 | 2.50 2.04 65.98 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.56 2.04 -7.71
242242
20 5.50 0.00 0.00 | 2.50 2.03 69.57 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.56 2.03 -5.68

‎tests/examples/example13.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.4.21
7+
GEOPHIRES Version: 3.4.25
88
GEOPHIRES Build Date: 2024-03-05
9-
Simulation Date: 2024-03-12
10-
Simulation Time: 07:19
11-
Calculation Time: 0.043 sec
9+
Simulation Date: 2024-04-16
10+
Simulation Time: 10:29
11+
Calculation Time: 0.088 sec
1212

1313
***SUMMARY OF RESULTS***
1414

@@ -32,7 +32,7 @@ Simulation Metadata
3232
Project lifetime: 30 yr
3333
Capacity factor: 80.0 %
3434
Project NPV: -45.14 MUSD
35-
Project IRR: -6.57 %
35+
Project IRR: -6.58 %
3636
Project VIR=PI=PIR: 0.20
3737
Project MOIC: -0.23
3838
Project Payback Period: N/A
@@ -220,15 +220,15 @@ ________________________________________________________________________________
220220
1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -56.29 -56.29
221221
2 5.50 1.22 1.22 | 2.50 3.30 3.30 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 1.40 -54.89
222222
3 5.50 1.22 2.44 | 2.50 3.21 6.50 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 1.31 -53.58
223-
4 5.50 1.22 3.65 | 2.50 3.11 9.62 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 1.21 -52.36
223+
4 5.50 1.22 3.65 | 2.50 3.11 9.62 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 1.21 -52.37
224224
5 5.50 1.21 4.87 | 2.50 3.02 12.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 1.12 -51.25
225-
6 5.50 1.21 6.08 | 2.50 2.93 15.56 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 1.02 -50.22
225+
6 5.50 1.21 6.08 | 2.50 2.93 15.56 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 1.02 -50.23
226226
7 5.50 1.21 7.28 | 2.50 2.83 18.40 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.93 -49.30
227227
8 5.50 1.20 8.49 | 2.50 2.74 21.14 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.83 -48.47
228228
9 5.50 1.20 9.69 | 2.50 2.65 23.79 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.74 -47.73
229229
10 5.50 1.20 10.89 | 2.50 2.56 26.35 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.64 -47.09
230-
11 5.50 1.20 12.09 | 2.50 2.46 28.81 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.54 -46.54
231-
12 5.50 1.19 13.28 | 2.50 2.37 31.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.45 -46.09
230+
11 5.50 1.20 12.09 | 2.50 2.46 28.81 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.54 -46.55
231+
12 5.50 1.19 13.28 | 2.50 2.37 31.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.45 -46.10
232232
13 5.50 1.19 14.47 | 2.50 2.28 33.45 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.35 -45.74
233233
14 5.50 1.19 15.66 | 2.50 2.18 35.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.26 -45.48
234234
15 5.50 1.19 16.85 | 2.50 2.09 37.73 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.11 0.16 -45.32

‎tests/examples/example1_addons.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.4.22
7+
GEOPHIRES Version: 3.4.25
88
GEOPHIRES Build Date: 2024-03-05
9-
Simulation Date: 2024-04-11
10-
Simulation Time: 14:48
11-
Calculation Time: 1.448 sec
9+
Simulation Date: 2024-04-16
10+
Simulation Time: 10:26
11+
Calculation Time: 0.937 sec
1212

1313
***SUMMARY OF RESULTS***
1414

@@ -221,7 +221,7 @@ ________________________________________________________________________________
221221
8 10.20 6.00 26.98 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.03 0.87 3.96 | -0.82 6.00 5.60
222222
9 11.40 6.85 31.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.04 1.21 5.18 | -0.82 6.85 12.46
223223
10 12.60 7.71 37.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.04 1.56 6.74 | -0.82 7.71 20.17
224-
11 13.80 8.57 42.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.06 1.91 8.65 | -0.82 8.57 28.75
224+
11 13.80 8.57 42.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.06 1.91 8.65 | -0.82 8.57 28.74
225225
12 15.00 9.43 49.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.07 2.26 10.91 | -0.82 9.43 38.18
226226
13 15.00 9.78 55.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.07 2.61 13.52 | -0.82 9.78 47.96
227227
14 15.00 10.14 62.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.09 2.96 16.47 | -0.82 10.14 58.10
@@ -271,7 +271,7 @@ Start (cents/kWh)(MUSD/yr) (cents/kWh)(MUSD/yr) (MUSD/yr) (MUSD/yr) (MUSD
271271
1 0.000 0.0023 0.000 0.0000 1.14 -70.00 -70.00 -101.06 -101.06
272272
2 0.090 0.0023 0.012 0.0000 1.14 1.14 -68.86 5.68 -95.38
273273
3 0.090 0.0023 0.012 0.0000 1.14 1.14 -67.72 5.72 -89.65
274-
4 0.090 0.0023 0.012 0.0000 1.14 1.14 -66.59 5.74 -83.91
274+
4 0.090 0.0023 0.012 0.0000 1.14 1.14 -66.59 5.74 -83.92
275275
5 0.090 0.0023 0.012 0.0000 1.14 1.14 -65.45 5.75 -78.17
276276
6 0.090 0.0023 0.012 0.0000 1.14 1.14 -64.31 5.75 -72.42
277277
7 0.090 0.0026 0.012 0.0000 1.14 1.14 -63.17 5.76 -66.66

‎tests/examples/example1_addons.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ Water Loss Fraction,.02, ---[-]
5959
Productivity Index,5, ---[kg/s/bar]
6060
Injectivity Index,5, ---[kg/s/bar]
6161
Injection Temperature,50, ---[deg.C]
62-
Maximum Drawdown,1, ---[-] no redrilling considered
62+
Maximum Drawdown,1, ---[-] no redrilling considered,
63+
Well Drilling Cost Correlation,1, ---[-] Use built-in correlations
6364
Reservoir Heat Capacity,1000, ---[J/kg/K]
6465
Reservoir Density,2700, ---[kg/m^3]
6566
Reservoir Thermal Conductivity,2.7, ---[W/m/K]

0 commit comments

Comments
 (0)