Update extended economic profile & CSV test result values

Author: softwareengineerprogrammer

tests/example1_addons.csv

@@ -50,7 +50,7 @@ RESOURCE CHARACTERISTICS,Geothermal gradient,,0.05,degC/m
 RESERVOIR PARAMETERS,Reservoir Model,,Multiple Parallel Fractures Model,
 RESERVOIR PARAMETERS,Fracture model,,Square,
 RESERVOIR PARAMETERS,Bottom-hole temperature,,170.0,degC
-RESERVOIR PARAMETERS,Well seperation: fracture height,,900.0,meter
+RESERVOIR PARAMETERS,Well separation: fracture height,,900.0,meter
 RESERVOIR PARAMETERS,Fracture area,,810000.0,m**2
 RESERVOIR PARAMETERS,Reservoir volume,,1000000000,m**3
 RESERVOIR PARAMETERS,Reservoir hydrostatic pressure,,29430.21,kPa
@@ -366,17 +366,17 @@ HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HE
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,28,12.85,%
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,29,13.31,%
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,PERCENTAGE OF TOTAL HEAT MINED,30,13.69,%
-EXTENDED ECONOMIC PROFILE,Electricity Price,1,0.09,cents/kWh
+EXTENDED ECONOMIC PROFILE,Electricity Price,1,0.0,cents/kWh
 EXTENDED ECONOMIC PROFILE,Electricity Price,2,0.09,cents/kWh
 EXTENDED ECONOMIC PROFILE,Electricity Price,3,0.09,cents/kWh
 EXTENDED ECONOMIC PROFILE,Electricity Price,4,0.09,cents/kWh
 EXTENDED ECONOMIC PROFILE,Electricity Price,5,0.09,cents/kWh
 EXTENDED ECONOMIC PROFILE,Electricity Price,6,0.09,cents/kWh
-EXTENDED ECONOMIC PROFILE,Electricity Price,7,0.102,cents/kWh
-EXTENDED ECONOMIC PROFILE,Electricity Price,8,0.114,cents/kWh
-EXTENDED ECONOMIC PROFILE,Electricity Price,9,0.126,cents/kWh
-EXTENDED ECONOMIC PROFILE,Electricity Price,10,0.138,cents/kWh
-EXTENDED ECONOMIC PROFILE,Electricity Price,11,0.15,cents/kWh
+EXTENDED ECONOMIC PROFILE,Electricity Price,7,0.09,cents/kWh
+EXTENDED ECONOMIC PROFILE,Electricity Price,8,0.102,cents/kWh
+EXTENDED ECONOMIC PROFILE,Electricity Price,9,0.114,cents/kWh
+EXTENDED ECONOMIC PROFILE,Electricity Price,10,0.126,cents/kWh
+EXTENDED ECONOMIC PROFILE,Electricity Price,11,0.138,cents/kWh
 EXTENDED ECONOMIC PROFILE,Electricity Price,12,0.15,cents/kWh
 EXTENDED ECONOMIC PROFILE,Electricity Price,13,0.15,cents/kWh
 EXTENDED ECONOMIC PROFILE,Electricity Price,14,0.15,cents/kWh
@@ -426,17 +426,17 @@ EXTENDED ECONOMIC PROFILE,Electricity Revenue,27,0.0039,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Electricity Revenue,28,0.0039,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Electricity Revenue,29,0.0039,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Electricity Revenue,30,0.0039,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Price,1,0.012,cents/kWh
+EXTENDED ECONOMIC PROFILE,Heat Price,1,0.0,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,2,0.012,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,3,0.012,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,4,0.012,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,5,0.012,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,6,0.012,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,7,0.012,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,8,0.012,cents/kWh
-EXTENDED ECONOMIC PROFILE,Heat Price,9,0.022,cents/kWh
-EXTENDED ECONOMIC PROFILE,Heat Price,10,0.032,cents/kWh
-EXTENDED ECONOMIC PROFILE,Heat Price,11,0.036,cents/kWh
+EXTENDED ECONOMIC PROFILE,Heat Price,9,0.012,cents/kWh
+EXTENDED ECONOMIC PROFILE,Heat Price,10,0.022,cents/kWh
+EXTENDED ECONOMIC PROFILE,Heat Price,11,0.032,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,12,0.036,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,13,0.036,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,14,0.036,cents/kWh
@@ -636,17 +636,17 @@ EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,27,94.75,MUSD
 EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,28,103.09,MUSD
 EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,29,111.43,MUSD
 EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,30,119.77,MUSD
-REVENUE & CASHFLOW PROFILE,Electricity Price,1,9.0,cents/kWh
+REVENUE & CASHFLOW PROFILE,Electricity Price,1,0.0,cents/kWh
 REVENUE & CASHFLOW PROFILE,Electricity Price,2,9.0,cents/kWh
 REVENUE & CASHFLOW PROFILE,Electricity Price,3,9.0,cents/kWh
 REVENUE & CASHFLOW PROFILE,Electricity Price,4,9.0,cents/kWh
 REVENUE & CASHFLOW PROFILE,Electricity Price,5,9.0,cents/kWh
 REVENUE & CASHFLOW PROFILE,Electricity Price,6,9.0,cents/kWh
-REVENUE & CASHFLOW PROFILE,Electricity Price,7,10.2,cents/kWh
-REVENUE & CASHFLOW PROFILE,Electricity Price,8,11.4,cents/kWh
-REVENUE & CASHFLOW PROFILE,Electricity Price,9,12.6,cents/kWh
-REVENUE & CASHFLOW PROFILE,Electricity Price,10,13.8,cents/kWh
-REVENUE & CASHFLOW PROFILE,Electricity Price,11,15.0,cents/kWh
+REVENUE & CASHFLOW PROFILE,Electricity Price,7,9.0,cents/kWh
+REVENUE & CASHFLOW PROFILE,Electricity Price,8,10.2,cents/kWh
+REVENUE & CASHFLOW PROFILE,Electricity Price,9,11.4,cents/kWh
+REVENUE & CASHFLOW PROFILE,Electricity Price,10,12.6,cents/kWh
+REVENUE & CASHFLOW PROFILE,Electricity Price,11,13.8,cents/kWh
 REVENUE & CASHFLOW PROFILE,Electricity Price,12,15.0,cents/kWh
 REVENUE & CASHFLOW PROFILE,Electricity Price,13,15.0,cents/kWh
 REVENUE & CASHFLOW PROFILE,Electricity Price,14,15.0,cents/kWh
@@ -726,7 +726,7 @@ REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,27,144.94,MUSD
 REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,28,151.33,MUSD
 REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,29,157.71,MUSD
 REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,30,164.1,MUSD
-REVENUE & CASHFLOW PROFILE,Heat Price,1,2.5,cents/kWh
+REVENUE & CASHFLOW PROFILE,Heat Price,1,0.0,cents/kWh
 REVENUE & CASHFLOW PROFILE,Heat Price,2,2.5,cents/kWh
 REVENUE & CASHFLOW PROFILE,Heat Price,3,2.5,cents/kWh
 REVENUE & CASHFLOW PROFILE,Heat Price,4,2.5,cents/kWh
@@ -816,7 +816,7 @@ REVENUE & CASHFLOW PROFILE,Heat Cumm. Rev.,27,0.0,MUSD
 REVENUE & CASHFLOW PROFILE,Heat Cumm. Rev.,28,0.0,MUSD
 REVENUE & CASHFLOW PROFILE,Heat Cumm. Rev.,29,0.0,MUSD
 REVENUE & CASHFLOW PROFILE,Heat Cumm. Rev.,30,0.0,MUSD
-REVENUE & CASHFLOW PROFILE,Cooling Price,1,2.5,cents/kWh
+REVENUE & CASHFLOW PROFILE,Cooling Price,1,0.0,cents/kWh
 REVENUE & CASHFLOW PROFILE,Cooling Price,2,2.5,cents/kWh
 REVENUE & CASHFLOW PROFILE,Cooling Price,3,2.5,cents/kWh
 REVENUE & CASHFLOW PROFILE,Cooling Price,4,2.5,cents/kWh
@@ -906,20 +906,20 @@ REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,27,0.0,MUSD
 REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,28,0.0,MUSD
 REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,29,0.0,MUSD
 REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,30,0.0,MUSD
-REVENUE & CASHFLOW PROFILE,Carbon Price,1,0.01,USD/tonne
+REVENUE & CASHFLOW PROFILE,Carbon Price,1,0.0,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,2,0.01,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,3,0.01,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,4,0.01,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,5,0.01,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,6,0.01,USD/tonne
-REVENUE & CASHFLOW PROFILE,Carbon Price,7,0.03,USD/tonne
-REVENUE & CASHFLOW PROFILE,Carbon Price,8,0.04,USD/tonne
+REVENUE & CASHFLOW PROFILE,Carbon Price,7,0.01,USD/tonne
+REVENUE & CASHFLOW PROFILE,Carbon Price,8,0.03,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,9,0.04,USD/tonne
-REVENUE & CASHFLOW PROFILE,Carbon Price,10,0.06,USD/tonne
-REVENUE & CASHFLOW PROFILE,Carbon Price,11,0.07,USD/tonne
+REVENUE & CASHFLOW PROFILE,Carbon Price,10,0.04,USD/tonne
+REVENUE & CASHFLOW PROFILE,Carbon Price,11,0.06,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,12,0.07,USD/tonne
-REVENUE & CASHFLOW PROFILE,Carbon Price,13,0.09,USD/tonne
-REVENUE & CASHFLOW PROFILE,Carbon Price,14,0.1,USD/tonne
+REVENUE & CASHFLOW PROFILE,Carbon Price,13,0.07,USD/tonne
+REVENUE & CASHFLOW PROFILE,Carbon Price,14,0.09,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,15,0.1,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,16,0.1,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,17,0.1,USD/tonne

tests/test_geophires_x_client.py

@@ -221,17 +221,17 @@ def test_extended_economic_profile(self):
                     'Annual Project Cash Flow (MUSD/yr)',
                     'Cumm. Project Cash Flow (MUSD)',
                 ],
-                [1, 0.09, 0.0023, 0.012, 0.0, 1.14, -70.0, -70.0, -101.06, -101.06],
+                [1, 0.0, 0.0023, 0.0, 0.0, 1.14, -70.0, -70.0, -101.06, -101.06],
                 [2, 0.09, 0.0023, 0.012, 0.0, 1.14, 1.14, -68.86, 5.68, -95.38],
                 [3, 0.09, 0.0023, 0.012, 0.0, 1.14, 1.14, -67.72, 5.72, -89.65],
                 [4, 0.09, 0.0023, 0.012, 0.0, 1.14, 1.14, -66.59, 5.74, -83.91],
                 [5, 0.09, 0.0023, 0.012, 0.0, 1.14, 1.14, -65.45, 5.75, -78.17],
                 [6, 0.09, 0.0023, 0.012, 0.0, 1.14, 1.14, -64.31, 5.75, -72.42],
-                [7, 0.102, 0.0026, 0.012, 0.0, 1.14, 1.14, -63.17, 5.76, -66.66],
-                [8, 0.114, 0.003, 0.012, 0.0, 1.14, 1.14, -62.03, 6.27, -60.39],
-                [9, 0.126, 0.0033, 0.022, 0.0, 1.14, 1.14, -60.89, 6.78, -53.61],
-                [10, 0.138, 0.0036, 0.032, 0.0, 1.14, 1.14, -59.75, 7.29, -46.32],
-                [11, 0.15, 0.0039, 0.036, 0.0, 1.14, 1.14, -58.61, 7.8, -38.52],
+                [7, 0.09, 0.0026, 0.012, 0.0, 1.14, 1.14, -63.17, 5.76, -66.66],
+                [8, 0.102, 0.003, 0.012, 0.0, 1.14, 1.14, -62.03, 6.27, -60.39],
+                [9, 0.114, 0.0033, 0.012, 0.0, 1.14, 1.14, -60.89, 6.78, -53.61],
+                [10, 0.126, 0.0036, 0.022, 0.0, 1.14, 1.14, -59.75, 7.29, -46.32],
+                [11, 0.138, 0.0039, 0.032, 0.0, 1.14, 1.14, -58.61, 7.8, -38.52],
                 [12, 0.15, 0.0039, 0.036, 0.0, 1.14, 1.14, -57.47, 8.31, -30.21],
                 [13, 0.15, 0.0039, 0.036, 0.0, 1.14, 1.14, -56.33, 8.32, -21.89],
                 [14, 0.15, 0.0039, 0.036, 0.0, 1.14, 1.14, -55.19, 8.32, -13.57],