Merge pull request #4 from softwareengineerprogrammer/malcolm-dsider_…

…main

Fix PR 185 failing tests

src/geophires_x_client/geophires_x_result.py

@@ -145,6 +145,7 @@ class GeophiresXResult:
                 'Fracture area',
                 'Fracture width',
                 'Reservoir volume',
+                'Reservoir hydrostatic pressure',
                 'Average reservoir pressure',
                 'Plant outlet pressure',
                 'Production wellhead pressure',

tests/example1_addons.csv

@@ -4,47 +4,47 @@ SUMMARY OF RESULTS,Average Net Electricity Production,,5.37,MW
 SUMMARY OF RESULTS,Electricity breakeven price,,1.75,cents/kWh
 SUMMARY OF RESULTS,Number of production wells,,2,count
 SUMMARY OF RESULTS,Number of injection wells,,2,count
-SUMMARY OF RESULTS,Flowrate per production well,,55,kg/sec
-SUMMARY OF RESULTS,"Well depth (or total length\, if not vertical)",,3,kilometer
+SUMMARY OF RESULTS,Flowrate per production well,,55.0,kg/sec
+SUMMARY OF RESULTS,"Well depth (or total length\, if not vertical)",,3.0,kilometer
 SUMMARY OF RESULTS,Geothermal gradient,,0.05,degC/m
 SUMMARY OF RESULTS,Total Avoided Carbon Emissions,,470164.97,
 ECONOMIC PARAMETERS,Economic Model,,Fixed Charge Rate (FCR),
-ECONOMIC PARAMETERS,Accrued financing during construction,,0,
+ECONOMIC PARAMETERS,Accrued financing during construction,,0.0,
 ECONOMIC PARAMETERS,Project lifetime,,30,yr
-ECONOMIC PARAMETERS,Capacity factor,,90,%
+ECONOMIC PARAMETERS,Capacity factor,,90.0,%
 ECONOMIC PARAMETERS,Project NPV,,74.96,MUSD
 ECONOMIC PARAMETERS,Project IRR,,20.06,%
 ECONOMIC PARAMETERS,Project VIR=PI=PIR,,3.41,
 ECONOMIC PARAMETERS,Project MOIC,,36.3,
-ECONOMIC PARAMETERS,Fixed Charge Rate (FCR),,5,
+ECONOMIC PARAMETERS,Fixed Charge Rate (FCR),,5.0,
 ECONOMIC PARAMETERS,Project Payback Period,,7.07,yr
 EXTENDED ECONOMICS,"Adjusted Project LCOE (after incentives\, grants\, AddOns\,etc)",,1.75,cents/kWh
-EXTENDED ECONOMICS,"Adjusted Project LCOH (after incentives\, grants\, AddOns\,etc)",,0,USD/MMBTU
+EXTENDED ECONOMICS,"Adjusted Project LCOH (after incentives\, grants\, AddOns\,etc)",,0.0,USD/MMBTU
 EXTENDED ECONOMICS,"Adjusted Project CAPEX (after incentives\, grants\, AddOns\, etc)",,101.06,MUSD
 EXTENDED ECONOMICS,"Adjusted Project OPEX (after incentives\, grants\, AddOns\, etc)",,0.88,MUSD
 EXTENDED ECONOMICS,Project NPV   (including AddOns),,-5.46,MUSD
 EXTENDED ECONOMICS,Project IRR   (including AddOns),,0.06,%
 EXTENDED ECONOMICS,Project VIR=PI=PIR   (including AddOns),,0.95,
-EXTENDED ECONOMICS,Project MOIC  (including AddOns),,1,
-EXTENDED ECONOMICS,Total Add-on CAPEX,,70,MUSD
+EXTENDED ECONOMICS,Project MOIC  (including AddOns),,1.0,
+EXTENDED ECONOMICS,Total Add-on CAPEX,,70.0,MUSD
 EXTENDED ECONOMICS,Total Add-on OPEX,,1.7,MUSD/yr
-EXTENDED ECONOMICS,Total Add-on Net Elec,,25900,kW/yr
-EXTENDED ECONOMICS,Total Add-on Net Heat,,0,kW/yr
+EXTENDED ECONOMICS,Total Add-on Net Elec,,25900.0,kW/yr
+EXTENDED ECONOMICS,Total Add-on Net Heat,,0.0,kW/yr
 EXTENDED ECONOMICS,Total Add-on Profit,,2.84,MUSD/yr
-EXTENDED ECONOMICS,AddOns Payback Period,,0,yr
+EXTENDED ECONOMICS,AddOns Payback Period,,0.0,yr
 ENGINEERING PARAMETERS,Number of Production Wells,,2,count
 ENGINEERING PARAMETERS,Number of Injection Wells,,2,count
-ENGINEERING PARAMETERS,"Well depth (or total length\, if not vertical)",,3,kilometer
-ENGINEERING PARAMETERS,Water loss rate,,2,
-ENGINEERING PARAMETERS,Pump efficiency,,80,
-ENGINEERING PARAMETERS,Injection temperature,,50,degC
-ENGINEERING PARAMETERS,Average production well temperature drop,,3,degC
-ENGINEERING PARAMETERS,Flowrate per production well,,55,kg/sec
-ENGINEERING PARAMETERS,Injection well casing ID,,7,in
-ENGINEERING PARAMETERS,Production well casing ID,,7,in
+ENGINEERING PARAMETERS,"Well depth (or total length\, if not vertical)",,3.0,kilometer
+ENGINEERING PARAMETERS,Water loss rate,,2.0,
+ENGINEERING PARAMETERS,Pump efficiency,,80.0,
+ENGINEERING PARAMETERS,Injection temperature,,50.0,degC
+ENGINEERING PARAMETERS,Average production well temperature drop,,3.0,degC
+ENGINEERING PARAMETERS,Flowrate per production well,,55.0,kg/sec
+ENGINEERING PARAMETERS,Injection well casing ID,,7.0,in
+ENGINEERING PARAMETERS,Production well casing ID,,7.0,in
 ENGINEERING PARAMETERS,Number of times redrilling,,0,count
 ENGINEERING PARAMETERS,Power plant type,,Supercritical ORC,
-RESOURCE CHARACTERISTICS,Maximum reservoir temperature,,400,degC
+RESOURCE CHARACTERISTICS,Maximum reservoir temperature,,400.0,degC
 RESOURCE CHARACTERISTICS,Number of segments,,1,count
 RESOURCE CHARACTERISTICS,Geothermal gradient,,0.05,degC/m
 RESERVOIR PARAMETERS,Reservoir Model,,Multiple Parallel Fractures Model,
@@ -53,21 +53,21 @@ RESERVOIR PARAMETERS,Bottom-hole temperature,,170.0,degC
 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,Average reservoir pressure,,29430.21,kPa
+RESERVOIR PARAMETERS,Reservoir hydrostatic pressure,,29430.21,kPa
 RESERVOIR PARAMETERS,Plant outlet pressure,,1067.94,kPa
 RESERVOIR PARAMETERS,Production wellhead pressure,,1136.89,kPa
-RESERVOIR PARAMETERS,Productivity Index,,5,kg/sec/bar
-RESERVOIR PARAMETERS,Injectivity Index,,5,kg/sec/bar
-RESERVOIR PARAMETERS,Reservoir density,,2700,kg/m**3
+RESERVOIR PARAMETERS,Productivity Index,,5.0,kg/sec/bar
+RESERVOIR PARAMETERS,Injectivity Index,,5.0,kg/sec/bar
+RESERVOIR PARAMETERS,Reservoir density,,2700.0,kg/m**3
 RESERVOIR PARAMETERS,Reservoir thermal conductivity,,2.7,W/m/K
-RESERVOIR PARAMETERS,Reservoir heat capacity,,1000,J/kg/K
+RESERVOIR PARAMETERS,Reservoir heat capacity,,1000.0,J/kg/K
 RESERVOIR SIMULATION RESULTS,Maximum Production Temperature,,167.2,degC
-RESERVOIR SIMULATION RESULTS,Average Production Temperature,,167,degC
+RESERVOIR SIMULATION RESULTS,Average Production Temperature,,167.0,degC
 RESERVOIR SIMULATION RESULTS,Minimum Production Temperature,,165.2,degC
 RESERVOIR SIMULATION RESULTS,Initial Production Temperature,,165.2,degC
 RESERVOIR SIMULATION RESULTS,Average Reservoir Heat Extraction,,52.38,MW
 RESERVOIR SIMULATION RESULTS,Production Wellbore Heat Transmission Model,,Ramey Model,
-RESERVOIR SIMULATION RESULTS,Average Production Well Temperature Drop,,3,degC
+RESERVOIR SIMULATION RESULTS,Average Production Well Temperature Drop,,3.0,degC
 RESERVOIR SIMULATION RESULTS,Average Injection Well Pump Pressure Drop,,219.1,kPa
 RESERVOIR SIMULATION RESULTS,Average Production Well Pump Pressure Drop,,1248.2,kPa
 RESERVOIR SIMULATION RESULTS,Average Net Electricity Production,,5.37,MW
@@ -96,7 +96,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation
 SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.14,GWh
 SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.21,MW
 SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,4.12,%
-POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1,
+POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
 POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0058,
 POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0074,
 POWER GENERATION PROFILE,THERMAL DRAWDOWN,4,1.0083,
@@ -137,7 +137,7 @@ POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,8,166.87,degC
 POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,9,166.91,degC
 POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,10,166.94,degC
 POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,11,166.97,degC
-POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,12,167,degC
+POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,12,167.0,degC
 POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,13,167.02,degC
 POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,14,167.04,degC
 POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,15,167.06,degC
@@ -248,7 +248,7 @@ POWER GENERATION PROFILE,FIRST LAW EFFICIENCY,29,10.2806,%
 POWER GENERATION PROFILE,FIRST LAW EFFICIENCY,30,10.2814,%
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,1,41.4,GWh/year
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,2,41.9,GWh/year
-HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,3,42,GWh/year
+HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,3,42.0,GWh/year
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,4,42.1,GWh/year
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,ELECTRICITY PROVIDED,5,42.2,GWh/year
 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
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,8,412.7,GWh/year
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,9,412.8,GWh/year
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,10,412.9,GWh/year
-HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,11,413,GWh/year
+HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,11,413.0,GWh/year
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,12,413.1,GWh/year
 HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE,HEAT EXTRACTED,13,413.2,GWh/year
 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
 EXTENDED ECONOMIC PROFILE,Heat Price,28,0.036,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,29,0.036,cents/kWh
 EXTENDED ECONOMIC PROFILE,Heat Price,30,0.036,cents/kWh
-EXTENDED ECONOMIC PROFILE,Heat Revenue,1,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,2,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,3,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,4,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,5,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,6,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,7,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,8,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,9,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,10,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,11,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,12,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,13,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,14,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,15,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,16,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,17,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,18,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,19,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,20,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,21,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,22,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,23,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,24,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,25,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,26,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,27,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,28,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,29,0,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Heat Revenue,30,0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,1,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,2,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,3,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,4,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,5,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,6,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,7,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,8,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,9,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,10,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,11,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,12,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,13,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,14,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,15,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,16,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,17,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,18,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,19,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,20,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,21,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,22,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,23,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,24,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,25,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,26,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,27,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,28,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,29,0.0,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Heat Revenue,30,0.0,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Add-on Revenue,1,1.14,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Add-on Revenue,2,1.14,MUSD/yr
 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
 EXTENDED ECONOMIC PROFILE,Add-on Revenue,28,1.14,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Add-on Revenue,29,1.14,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Add-on Revenue,30,1.14,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,1,-70,MUSD/yr
+EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,1,-70.0,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,2,1.14,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,3,1.14,MUSD/yr
 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
 EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,28,1.14,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,29,1.14,MUSD/yr
 EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,30,1.14,MUSD/yr
-EXTENDED ECONOMIC PROFILE,Cumm. AddOn Cash Flow,1,-70,MUSD
+EXTENDED ECONOMIC PROFILE,Cumm. AddOn Cash Flow,1,-70.0,MUSD
 EXTENDED ECONOMIC PROFILE,Cumm. AddOn Cash Flow,2,-68.86,MUSD
 EXTENDED ECONOMIC PROFILE,Cumm. AddOn Cash Flow,3,-67.72,MUSD
 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
 REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,5,5.13,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,6,5.13,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,7,5.14,MUSD/yr
-REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,6,MUSD/yr
+REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,6.0,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,9,6.85,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,10,7.71,MUSD/yr
 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
 REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,28,10.69,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,29,10.69,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,30,10.69,MUSD/yr
-REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,1,0,MUSD
+REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,1,0.0,MUSD
 REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,2,3.73,MUSD
 REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,3,7.5,MUSD
 REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,4,11.28,MUSD
@@ -936,7 +936,7 @@ REVENUE & CASHFLOW PROFILE,Carbon Price,27,0.1,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,28,0.1,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,29,0.1,USD/tonne
 REVENUE & CASHFLOW PROFILE,Carbon Price,30,0.1,USD/tonne
-REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,1,0,MUSD/yr
+REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr
 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
 REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,28,3.49,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,29,3.49,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,30,3.49,MUSD/yr
-REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,1,0,MUSD
+REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,1,0.0,MUSD
 REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,2,0.51,MUSD
 REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,3,1.02,MUSD
 REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,4,1.54,MUSD
@@ -996,7 +996,7 @@ REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,27,61.61,MUSD
 REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,28,65.1,MUSD
 REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,29,68.59,MUSD
 REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,30,72.08,MUSD
-REVENUE & CASHFLOW PROFILE,Project OPEX,1,0,MUSD/yr
+REVENUE & CASHFLOW PROFILE,Project OPEX,1,0.0,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Project OPEX,2,-0.82,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Project OPEX,3,-0.82,MUSD/yr
 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
 REVENUE & CASHFLOW PROFILE,Project Net Rev.,5,5.13,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Project Net Rev.,6,5.13,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Project Net Rev.,7,5.14,MUSD/yr
-REVENUE & CASHFLOW PROFILE,Project Net Rev.,8,6,MUSD/yr
+REVENUE & CASHFLOW PROFILE,Project Net Rev.,8,6.0,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Project Net Rev.,9,6.85,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Project Net Rev.,10,7.71,MUSD/yr
 REVENUE & CASHFLOW PROFILE,Project Net Rev.,11,8.57,MUSD/yr

tests/geophires_monte_carlo_tests/MC_GEOPHIRES_Settings_file-2.txt

@@ -5,5 +5,5 @@ OUTPUT, Average Net Electricity Production
 OUTPUT, Project NPV
 OUTPUT, Total capital costs
 OUTPUT, Average Production Temperature
-OUTPUT, Average reservoir pressure
+OUTPUT, Reservoir hydrostatic pressure
 ITERATIONS, 3

tests/geophires_monte_carlo_tests/test_geophires_monte_carlo.py

@@ -84,7 +84,7 @@ def test_monte_carlo_result_ordering(self):
                 'Project NPV',
                 'Total capital costs',
                 'Average Production Temperature',
-                'Average reservoir pressure',
+                'Reservoir hydrostatic pressure',
             ]:
                 self.assertIn(output, result_json_obj)
                 for stat in ['average', 'maximum', 'mean', 'median', 'minimum', 'standard deviation']:
@@ -102,7 +102,7 @@ def test_monte_carlo_result_ordering(self):
             self.assertGreater(avg_prod_tmp, 280)
             self.assertLess(avg_prod_tmp, 420)
 
-            self.assertGreater(result_json_obj['Average reservoir pressure']['average'], 60000)
+            self.assertGreater(result_json_obj['Reservoir hydrostatic pressure']['average'], 60000)
             self.assertLess(result_json_obj['Total capital costs']['average'], 1000)
 
             self.assertDictEqual(result_json_obj, result.result['output'])