Skip to content

Commit baac859

Browse files
malcolm-dsidermalcolm-dsider
authored
Merge pull request #4 from softwareengineerprogrammer/malcolm-dsider_main
Fix PR 185 failing tests
2 parents 07106c0 + 870d393 commit baac859

File tree

4 files changed

+73
-72
lines changed

4 files changed

+73
-72
lines changed

‎src/geophires_x_client/geophires_x_result.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ class GeophiresXResult:
145145
'Fracture area',
146146
'Fracture width',
147147
'Reservoir volume',
148+
'Reservoir hydrostatic pressure',
148149
'Average reservoir pressure',
149150
'Plant outlet pressure',
150151
'Production wellhead pressure',

‎tests/example1_addons.csv

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,47 @@ SUMMARY OF RESULTS,Average Net Electricity Production,,5.37,MW
44
SUMMARY OF RESULTS,Electricity breakeven price,,1.75,cents/kWh
55
SUMMARY OF RESULTS,Number of production wells,,2,count
66
SUMMARY OF RESULTS,Number of injection wells,,2,count
7-
SUMMARY OF RESULTS,Flowrate per production well,,55,kg/sec
8-
SUMMARY OF RESULTS,"Well depth (or total length\, if not vertical)",,3,kilometer
7+
SUMMARY OF RESULTS,Flowrate per production well,,55.0,kg/sec
8+
SUMMARY OF RESULTS,"Well depth (or total length\, if not vertical)",,3.0,kilometer
99
SUMMARY OF RESULTS,Geothermal gradient,,0.05,degC/m
1010
SUMMARY OF RESULTS,Total Avoided Carbon Emissions,,470164.97,
1111
ECONOMIC PARAMETERS,Economic Model,,Fixed Charge Rate (FCR),
12-
ECONOMIC PARAMETERS,Accrued financing during construction,,0,
12+
ECONOMIC PARAMETERS,Accrued financing during construction,,0.0,
1313
ECONOMIC PARAMETERS,Project lifetime,,30,yr
14-
ECONOMIC PARAMETERS,Capacity factor,,90,%
14+
ECONOMIC PARAMETERS,Capacity factor,,90.0,%
1515
ECONOMIC PARAMETERS,Project NPV,,74.96,MUSD
1616
ECONOMIC PARAMETERS,Project IRR,,20.06,%
1717
ECONOMIC PARAMETERS,Project VIR=PI=PIR,,3.41,
1818
ECONOMIC PARAMETERS,Project MOIC,,36.3,
19-
ECONOMIC PARAMETERS,Fixed Charge Rate (FCR),,5,
19+
ECONOMIC PARAMETERS,Fixed Charge Rate (FCR),,5.0,
2020
ECONOMIC PARAMETERS,Project Payback Period,,7.07,yr
2121
EXTENDED ECONOMICS,"Adjusted Project LCOE (after incentives\, grants\, AddOns\,etc)",,1.75,cents/kWh
22-
EXTENDED ECONOMICS,"Adjusted Project LCOH (after incentives\, grants\, AddOns\,etc)",,0,USD/MMBTU
22+
EXTENDED ECONOMICS,"Adjusted Project LCOH (after incentives\, grants\, AddOns\,etc)",,0.0,USD/MMBTU
2323
EXTENDED ECONOMICS,"Adjusted Project CAPEX (after incentives\, grants\, AddOns\, etc)",,101.06,MUSD
2424
EXTENDED ECONOMICS,"Adjusted Project OPEX (after incentives\, grants\, AddOns\, etc)",,0.88,MUSD
2525
EXTENDED ECONOMICS,Project NPV (including AddOns),,-5.46,MUSD
2626
EXTENDED ECONOMICS,Project IRR (including AddOns),,0.06,%
2727
EXTENDED ECONOMICS,Project VIR=PI=PIR (including AddOns),,0.95,
28-
EXTENDED ECONOMICS,Project MOIC (including AddOns),,1,
29-
EXTENDED ECONOMICS,Total Add-on CAPEX,,70,MUSD
28+
EXTENDED ECONOMICS,Project MOIC (including AddOns),,1.0,
29+
EXTENDED ECONOMICS,Total Add-on CAPEX,,70.0,MUSD
3030
EXTENDED ECONOMICS,Total Add-on OPEX,,1.7,MUSD/yr
31-
EXTENDED ECONOMICS,Total Add-on Net Elec,,25900,kW/yr
32-
EXTENDED ECONOMICS,Total Add-on Net Heat,,0,kW/yr
31+
EXTENDED ECONOMICS,Total Add-on Net Elec,,25900.0,kW/yr
32+
EXTENDED ECONOMICS,Total Add-on Net Heat,,0.0,kW/yr
3333
EXTENDED ECONOMICS,Total Add-on Profit,,2.84,MUSD/yr
34-
EXTENDED ECONOMICS,AddOns Payback Period,,0,yr
34+
EXTENDED ECONOMICS,AddOns Payback Period,,0.0,yr
3535
ENGINEERING PARAMETERS,Number of Production Wells,,2,count
3636
ENGINEERING PARAMETERS,Number of Injection Wells,,2,count
37-
ENGINEERING PARAMETERS,"Well depth (or total length\, if not vertical)",,3,kilometer
38-
ENGINEERING PARAMETERS,Water loss rate,,2,
39-
ENGINEERING PARAMETERS,Pump efficiency,,80,
40-
ENGINEERING PARAMETERS,Injection temperature,,50,degC
41-
ENGINEERING PARAMETERS,Average production well temperature drop,,3,degC
42-
ENGINEERING PARAMETERS,Flowrate per production well,,55,kg/sec
43-
ENGINEERING PARAMETERS,Injection well casing ID,,7,in
44-
ENGINEERING PARAMETERS,Production well casing ID,,7,in
37+
ENGINEERING PARAMETERS,"Well depth (or total length\, if not vertical)",,3.0,kilometer
38+
ENGINEERING PARAMETERS,Water loss rate,,2.0,
39+
ENGINEERING PARAMETERS,Pump efficiency,,80.0,
40+
ENGINEERING PARAMETERS,Injection temperature,,50.0,degC
41+
ENGINEERING PARAMETERS,Average production well temperature drop,,3.0,degC
42+
ENGINEERING PARAMETERS,Flowrate per production well,,55.0,kg/sec
43+
ENGINEERING PARAMETERS,Injection well casing ID,,7.0,in
44+
ENGINEERING PARAMETERS,Production well casing ID,,7.0,in
4545
ENGINEERING PARAMETERS,Number of times redrilling,,0,count
4646
ENGINEERING PARAMETERS,Power plant type,,Supercritical ORC,
47-
RESOURCE CHARACTERISTICS,Maximum reservoir temperature,,400,degC
47+
RESOURCE CHARACTERISTICS,Maximum reservoir temperature,,400.0,degC
4848
RESOURCE CHARACTERISTICS,Number of segments,,1,count
4949
RESOURCE CHARACTERISTICS,Geothermal gradient,,0.05,degC/m
5050
RESERVOIR PARAMETERS,Reservoir Model,,Multiple Parallel Fractures Model,
@@ -53,21 +53,21 @@ RESERVOIR PARAMETERS,Bottom-hole temperature,,170.0,degC
5353
RESERVOIR PARAMETERS,Well separation: fracture height,,900.0,meter
5454
RESERVOIR PARAMETERS,Fracture area,,810000.0,m**2
5555
RESERVOIR PARAMETERS,Reservoir volume,,1000000000,m**3
56-
RESERVOIR PARAMETERS,Average reservoir pressure,,29430.21,kPa
56+
RESERVOIR PARAMETERS,Reservoir hydrostatic pressure,,29430.21,kPa
5757
RESERVOIR PARAMETERS,Plant outlet pressure,,1067.94,kPa
5858
RESERVOIR PARAMETERS,Production wellhead pressure,,1136.89,kPa
59-
RESERVOIR PARAMETERS,Productivity Index,,5,kg/sec/bar
60-
RESERVOIR PARAMETERS,Injectivity Index,,5,kg/sec/bar
61-
RESERVOIR PARAMETERS,Reservoir density,,2700,kg/m**3
59+
RESERVOIR PARAMETERS,Productivity Index,,5.0,kg/sec/bar
60+
RESERVOIR PARAMETERS,Injectivity Index,,5.0,kg/sec/bar
61+
RESERVOIR PARAMETERS,Reservoir density,,2700.0,kg/m**3
6262
RESERVOIR PARAMETERS,Reservoir thermal conductivity,,2.7,W/m/K
63-
RESERVOIR PARAMETERS,Reservoir heat capacity,,1000,J/kg/K
63+
RESERVOIR PARAMETERS,Reservoir heat capacity,,1000.0,J/kg/K
6464
RESERVOIR SIMULATION RESULTS,Maximum Production Temperature,,167.2,degC
65-
RESERVOIR SIMULATION RESULTS,Average Production Temperature,,167,degC
65+
RESERVOIR SIMULATION RESULTS,Average Production Temperature,,167.0,degC
6666
RESERVOIR SIMULATION RESULTS,Minimum Production Temperature,,165.2,degC
6767
RESERVOIR SIMULATION RESULTS,Initial Production Temperature,,165.2,degC
6868
RESERVOIR SIMULATION RESULTS,Average Reservoir Heat Extraction,,52.38,MW
6969
RESERVOIR SIMULATION RESULTS,Production Wellbore Heat Transmission Model,,Ramey Model,
70-
RESERVOIR SIMULATION RESULTS,Average Production Well Temperature Drop,,3,degC
70+
RESERVOIR SIMULATION RESULTS,Average Production Well Temperature Drop,,3.0,degC
7171
RESERVOIR SIMULATION RESULTS,Average Injection Well Pump Pressure Drop,,219.1,kPa
7272
RESERVOIR SIMULATION RESULTS,Average Production Well Pump Pressure Drop,,1248.2,kPa
7373
RESERVOIR SIMULATION RESULTS,Average Net Electricity Production,,5.37,MW
@@ -96,7 +96,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation
9696
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.14,GWh
9797
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.21,MW
9898
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,4.12,%
99-
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1,
99+
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
100100
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0058,
101101
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0074,
102102
POWER GENERATION PROFILE,THERMAL DRAWDOWN,4,1.0083,
@@ -137,7 +137,7 @@ POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,8,166.87,degC
137137
POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,9,166.91,degC
138138
POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,10,166.94,degC
139139
POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,11,166.97,degC
140-
POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,12,167,degC
140+
POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,12,167.0,degC
141141
POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,13,167.02,degC
142142
POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,14,167.04,degC
143143
POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,15,167.06,degC
@@ -248,7 +248,7 @@ POWER GENERATION PROFILE,FIRST LAW EFFICIENCY,29,10.2806,%
248248
POWER GENERATION PROFILE,FIRST LAW EFFICIENCY,30,10.2814,%
249249
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,1,41.4,GWh/year
250250
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,2,41.9,GWh/year
251-
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,3,42,GWh/year
251+
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,3,42.0,GWh/year
252252
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,4,42.1,GWh/year
253253
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,5,42.2,GWh/year
254254
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,6,42.2,GWh/year
@@ -286,7 +286,7 @@ HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,7,412.5
286286
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,8,412.7,GWh/year
287287
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,9,412.8,GWh/year
288288
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,10,412.9,GWh/year
289-
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,11,413,GWh/year
289+
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,11,413.0,GWh/year
290290
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,12,413.1,GWh/year
291291
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,13,413.2,GWh/year
292292
HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,14,413.2,GWh/year
@@ -456,36 +456,36 @@ EXTENDED ECONOMIC PROFILE,Heat Price,27,0.036,cents/kWh
456456
EXTENDED ECONOMIC PROFILE,Heat Price,28,0.036,cents/kWh
457457
EXTENDED ECONOMIC PROFILE,Heat Price,29,0.036,cents/kWh
458458
EXTENDED ECONOMIC PROFILE,Heat Price,30,0.036,cents/kWh
459-
EXTENDED ECONOMIC PROFILE,Heat Revenue,1,0,MUSD/yr
460-
EXTENDED ECONOMIC PROFILE,Heat Revenue,2,0,MUSD/yr
461-
EXTENDED ECONOMIC PROFILE,Heat Revenue,3,0,MUSD/yr
462-
EXTENDED ECONOMIC PROFILE,Heat Revenue,4,0,MUSD/yr
463-
EXTENDED ECONOMIC PROFILE,Heat Revenue,5,0,MUSD/yr
464-
EXTENDED ECONOMIC PROFILE,Heat Revenue,6,0,MUSD/yr
465-
EXTENDED ECONOMIC PROFILE,Heat Revenue,7,0,MUSD/yr
466-
EXTENDED ECONOMIC PROFILE,Heat Revenue,8,0,MUSD/yr
467-
EXTENDED ECONOMIC PROFILE,Heat Revenue,9,0,MUSD/yr
468-
EXTENDED ECONOMIC PROFILE,Heat Revenue,10,0,MUSD/yr
469-
EXTENDED ECONOMIC PROFILE,Heat Revenue,11,0,MUSD/yr
470-
EXTENDED ECONOMIC PROFILE,Heat Revenue,12,0,MUSD/yr
471-
EXTENDED ECONOMIC PROFILE,Heat Revenue,13,0,MUSD/yr
472-
EXTENDED ECONOMIC PROFILE,Heat Revenue,14,0,MUSD/yr
473-
EXTENDED ECONOMIC PROFILE,Heat Revenue,15,0,MUSD/yr
474-
EXTENDED ECONOMIC PROFILE,Heat Revenue,16,0,MUSD/yr
475-
EXTENDED ECONOMIC PROFILE,Heat Revenue,17,0,MUSD/yr
476-
EXTENDED ECONOMIC PROFILE,Heat Revenue,18,0,MUSD/yr
477-
EXTENDED ECONOMIC PROFILE,Heat Revenue,19,0,MUSD/yr
478-
EXTENDED ECONOMIC PROFILE,Heat Revenue,20,0,MUSD/yr
479-
EXTENDED ECONOMIC PROFILE,Heat Revenue,21,0,MUSD/yr
480-
EXTENDED ECONOMIC PROFILE,Heat Revenue,22,0,MUSD/yr
481-
EXTENDED ECONOMIC PROFILE,Heat Revenue,23,0,MUSD/yr
482-
EXTENDED ECONOMIC PROFILE,Heat Revenue,24,0,MUSD/yr
483-
EXTENDED ECONOMIC PROFILE,Heat Revenue,25,0,MUSD/yr
484-
EXTENDED ECONOMIC PROFILE,Heat Revenue,26,0,MUSD/yr
485-
EXTENDED ECONOMIC PROFILE,Heat Revenue,27,0,MUSD/yr
486-
EXTENDED ECONOMIC PROFILE,Heat Revenue,28,0,MUSD/yr
487-
EXTENDED ECONOMIC PROFILE,Heat Revenue,29,0,MUSD/yr
488-
EXTENDED ECONOMIC PROFILE,Heat Revenue,30,0,MUSD/yr
459+
EXTENDED ECONOMIC PROFILE,Heat Revenue,1,0.0,MUSD/yr
460+
EXTENDED ECONOMIC PROFILE,Heat Revenue,2,0.0,MUSD/yr
461+
EXTENDED ECONOMIC PROFILE,Heat Revenue,3,0.0,MUSD/yr
462+
EXTENDED ECONOMIC PROFILE,Heat Revenue,4,0.0,MUSD/yr
463+
EXTENDED ECONOMIC PROFILE,Heat Revenue,5,0.0,MUSD/yr
464+
EXTENDED ECONOMIC PROFILE,Heat Revenue,6,0.0,MUSD/yr
465+
EXTENDED ECONOMIC PROFILE,Heat Revenue,7,0.0,MUSD/yr
466+
EXTENDED ECONOMIC PROFILE,Heat Revenue,8,0.0,MUSD/yr
467+
EXTENDED ECONOMIC PROFILE,Heat Revenue,9,0.0,MUSD/yr
468+
EXTENDED ECONOMIC PROFILE,Heat Revenue,10,0.0,MUSD/yr
469+
EXTENDED ECONOMIC PROFILE,Heat Revenue,11,0.0,MUSD/yr
470+
EXTENDED ECONOMIC PROFILE,Heat Revenue,12,0.0,MUSD/yr
471+
EXTENDED ECONOMIC PROFILE,Heat Revenue,13,0.0,MUSD/yr
472+
EXTENDED ECONOMIC PROFILE,Heat Revenue,14,0.0,MUSD/yr
473+
EXTENDED ECONOMIC PROFILE,Heat Revenue,15,0.0,MUSD/yr
474+
EXTENDED ECONOMIC PROFILE,Heat Revenue,16,0.0,MUSD/yr
475+
EXTENDED ECONOMIC PROFILE,Heat Revenue,17,0.0,MUSD/yr
476+
EXTENDED ECONOMIC PROFILE,Heat Revenue,18,0.0,MUSD/yr
477+
EXTENDED ECONOMIC PROFILE,Heat Revenue,19,0.0,MUSD/yr
478+
EXTENDED ECONOMIC PROFILE,Heat Revenue,20,0.0,MUSD/yr
479+
EXTENDED ECONOMIC PROFILE,Heat Revenue,21,0.0,MUSD/yr
480+
EXTENDED ECONOMIC PROFILE,Heat Revenue,22,0.0,MUSD/yr
481+
EXTENDED ECONOMIC PROFILE,Heat Revenue,23,0.0,MUSD/yr
482+
EXTENDED ECONOMIC PROFILE,Heat Revenue,24,0.0,MUSD/yr
483+
EXTENDED ECONOMIC PROFILE,Heat Revenue,25,0.0,MUSD/yr
484+
EXTENDED ECONOMIC PROFILE,Heat Revenue,26,0.0,MUSD/yr
485+
EXTENDED ECONOMIC PROFILE,Heat Revenue,27,0.0,MUSD/yr
486+
EXTENDED ECONOMIC PROFILE,Heat Revenue,28,0.0,MUSD/yr
487+
EXTENDED ECONOMIC PROFILE,Heat Revenue,29,0.0,MUSD/yr
488+
EXTENDED ECONOMIC PROFILE,Heat Revenue,30,0.0,MUSD/yr
489489
EXTENDED ECONOMIC PROFILE,Add-on Revenue,1,1.14,MUSD/yr
490490
EXTENDED ECONOMIC PROFILE,Add-on Revenue,2,1.14,MUSD/yr
491491
EXTENDED ECONOMIC PROFILE,Add-on Revenue,3,1.14,MUSD/yr
@@ -516,7 +516,7 @@ EXTENDED ECONOMIC PROFILE,Add-on Revenue,27,1.14,MUSD/yr
516516
EXTENDED ECONOMIC PROFILE,Add-on Revenue,28,1.14,MUSD/yr
517517
EXTENDED ECONOMIC PROFILE,Add-on Revenue,29,1.14,MUSD/yr
518518
EXTENDED ECONOMIC PROFILE,Add-on Revenue,30,1.14,MUSD/yr
519-
EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,1,-70,MUSD/yr
519+
EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,1,-70.0,MUSD/yr
520520
EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,2,1.14,MUSD/yr
521521
EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,3,1.14,MUSD/yr
522522
EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,4,1.14,MUSD/yr
@@ -546,7 +546,7 @@ EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,27,1.14,MUSD/yr
546546
EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,28,1.14,MUSD/yr
547547
EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,29,1.14,MUSD/yr
548548
EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,30,1.14,MUSD/yr
549-
EXTENDED ECONOMIC PROFILE,Cumm. AddOn Cash Flow,1,-70,MUSD
549+
EXTENDED ECONOMIC PROFILE,Cumm. AddOn Cash Flow,1,-70.0,MUSD
550550
EXTENDED ECONOMIC PROFILE,Cumm. AddOn Cash Flow,2,-68.86,MUSD
551551
EXTENDED ECONOMIC PROFILE,Cumm. AddOn Cash Flow,3,-67.72,MUSD
552552
EXTENDED ECONOMIC PROFILE,Cumm. AddOn Cash Flow,4,-66.59,MUSD
@@ -673,7 +673,7 @@ REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,4,5.12,MUSD/yr
673673
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,5,5.13,MUSD/yr
674674
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,6,5.13,MUSD/yr
675675
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,7,5.14,MUSD/yr
676-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,6,MUSD/yr
676+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,6.0,MUSD/yr
677677
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,9,6.85,MUSD/yr
678678
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,10,7.71,MUSD/yr
679679
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,11,8.57,MUSD/yr
@@ -696,7 +696,7 @@ REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,27,10.69,MUSD/yr
696696
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,28,10.69,MUSD/yr
697697
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,29,10.69,MUSD/yr
698698
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,30,10.69,MUSD/yr
699-
REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,1,0,MUSD
699+
REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,1,0.0,MUSD
700700
REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,2,3.73,MUSD
701701
REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,3,7.5,MUSD
702702
REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,4,11.28,MUSD
@@ -936,7 +936,7 @@ REVENUE & CASHFLOW PROFILE,Carbon Price,27,0.1,USD/tonne
936936
REVENUE & CASHFLOW PROFILE,Carbon Price,28,0.1,USD/tonne
937937
REVENUE & CASHFLOW PROFILE,Carbon Price,29,0.1,USD/tonne
938938
REVENUE & CASHFLOW PROFILE,Carbon Price,30,0.1,USD/tonne
939-
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,1,0,MUSD/yr
939+
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr
940940
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr
941941
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr
942942
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,4,0.52,MUSD/yr
@@ -966,7 +966,7 @@ REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,27,3.49,MUSD/yr
966966
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,28,3.49,MUSD/yr
967967
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,29,3.49,MUSD/yr
968968
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,30,3.49,MUSD/yr
969-
REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,1,0,MUSD
969+
REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,1,0.0,MUSD
970970
REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,2,0.51,MUSD
971971
REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,3,1.02,MUSD
972972
REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,4,1.54,MUSD
@@ -996,7 +996,7 @@ REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,27,61.61,MUSD
996996
REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,28,65.1,MUSD
997997
REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,29,68.59,MUSD
998998
REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,30,72.08,MUSD
999-
REVENUE & CASHFLOW PROFILE,Project OPEX,1,0,MUSD/yr
999+
REVENUE & CASHFLOW PROFILE,Project OPEX,1,0.0,MUSD/yr
10001000
REVENUE & CASHFLOW PROFILE,Project OPEX,2,-0.82,MUSD/yr
10011001
REVENUE & CASHFLOW PROFILE,Project OPEX,3,-0.82,MUSD/yr
10021002
REVENUE & CASHFLOW PROFILE,Project OPEX,4,-0.82,MUSD/yr
@@ -1033,7 +1033,7 @@ REVENUE & CASHFLOW PROFILE,Project Net Rev.,4,5.12,MUSD/yr
10331033
REVENUE & CASHFLOW PROFILE,Project Net Rev.,5,5.13,MUSD/yr
10341034
REVENUE & CASHFLOW PROFILE,Project Net Rev.,6,5.13,MUSD/yr
10351035
REVENUE & CASHFLOW PROFILE,Project Net Rev.,7,5.14,MUSD/yr
1036-
REVENUE & CASHFLOW PROFILE,Project Net Rev.,8,6,MUSD/yr
1036+
REVENUE & CASHFLOW PROFILE,Project Net Rev.,8,6.0,MUSD/yr
10371037
REVENUE & CASHFLOW PROFILE,Project Net Rev.,9,6.85,MUSD/yr
10381038
REVENUE & CASHFLOW PROFILE,Project Net Rev.,10,7.71,MUSD/yr
10391039
REVENUE & CASHFLOW PROFILE,Project Net Rev.,11,8.57,MUSD/yr

‎tests/geophires_monte_carlo_tests/MC_GEOPHIRES_Settings_file-2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ OUTPUT, Average Net Electricity Production
55
OUTPUT, Project NPV
66
OUTPUT, Total capital costs
77
OUTPUT, Average Production Temperature
8-
OUTPUT, Average reservoir pressure
8+
OUTPUT, Reservoir hydrostatic pressure
99
ITERATIONS, 3

‎tests/geophires_monte_carlo_tests/test_geophires_monte_carlo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def test_monte_carlo_result_ordering(self):
8484
'Project NPV',
8585
'Total capital costs',
8686
'Average Production Temperature',
87-
'Average reservoir pressure',
87+
'Reservoir hydrostatic pressure',
8888
]:
8989
self.assertIn(output, result_json_obj)
9090
for stat in ['average', 'maximum', 'mean', 'median', 'minimum', 'standard deviation']:
@@ -102,7 +102,7 @@ def test_monte_carlo_result_ordering(self):
102102
self.assertGreater(avg_prod_tmp, 280)
103103
self.assertLess(avg_prod_tmp, 420)
104104

105-
self.assertGreater(result_json_obj['Average reservoir pressure']['average'], 60000)
105+
self.assertGreater(result_json_obj['Reservoir hydrostatic pressure']['average'], 60000)
106106
self.assertLess(result_json_obj['Total capital costs']['average'], 1000)
107107

108108
self.assertDictEqual(result_json_obj, result.result['output'])

0 commit comments

Comments
 (0)