diff --git a/src/geophires_x/Economics.py b/src/geophires_x/Economics.py index fe6a9cf5..079a19ea 100644 --- a/src/geophires_x/Economics.py +++ b/src/geophires_x/Economics.py @@ -796,14 +796,28 @@ def __init__(self, model: Model): ) self.wellcorrelation = self.ParameterDict[self.wellcorrelation.Name] = intParameter( "Well Drilling Cost Correlation", - DefaultValue=WellDrillingCostCorrelation.VERTICAL_SMALL, - AllowableRange=[1, 2, 3, 4, 5], + DefaultValue=WellDrillingCostCorrelation.VERTICAL_LARGE_INT1, + AllowableRange=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], UnitType=Units.NONE, - ErrMessage="assume default well drilling cost correlation (1)", - ToolTipText="Select the built-in horizontal well drilling and completion cost correlation." + - " 1: vertical open-hole, small diameter; 2: deviated liner, small diameter;" + - " 3: vertical open-hole, large diameter; 4: deviated liner, large diameter;" + - " 5: Simple - user specified cost per meter" + ErrMessage="assume default well drilling cost correlation (10)", + ToolTipText="""Select the built-in well drilling and completion cost correlation: +1. vertical small diameter, baseline; +2. deviated small diameter, baseline; +3. vertical large diameter, baseline; +4. deviated large diameter, baseline; +5. Simple; +6. vertical small diameter, intermediate1; +7. vertical small diameter, intermediate2; +8. deviated small diameter, intermediate1; +9. deviated small diameter, intermediate2; +10. vertical large diameter, intermediate1; +11. vertical large diameter, intermediate2; +12. deviated large diameter, intermediate1; +13. deviated large diameter, intermediate2; +14. vertical open-hole, small diameter, ideal; +15. deviated liner, small diameter, ideal; +16. vertical open-hole, large diameter, ideal; +17. deviated liner, large diameter, ideal;""" ) self.DoAddOnCalculations = self.ParameterDict[self.DoAddOnCalculations.Name] = boolParameter( "Do AddOn Calculations", @@ -1645,13 +1659,39 @@ def read_parameters(self, model: Model) -> None: if ParameterReadIn.sValue == '1': ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_SMALL elif ParameterReadIn.sValue == '2': - self.wellcorrelation.value = WellDrillingCostCorrelation.DEVIATED_SMALL + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_SMALL elif ParameterReadIn.sValue == '3': - self.wellcorrelation.value = WellDrillingCostCorrelation.VERTICAL_LARGE + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_LARGE elif ParameterReadIn.sValue == '4': - self.wellcorrelation.value = WellDrillingCostCorrelation.DEVIATED_LARGE + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_LARGE + elif ParameterReadIn.sValue == '5': + ParameterToModify.value = WellDrillingCostCorrelation.SIMPLE + elif ParameterReadIn.sValue == '6': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_SMALL_INT1 + elif ParameterReadIn.sValue == '7': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_SMALL_INT2 + elif ParameterReadIn.sValue == '8': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_SMALL_INT1 + elif ParameterReadIn.sValue == '9': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_SMALL_INT2 + elif ParameterReadIn.sValue == '10': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_LARGE_INT1 + elif ParameterReadIn.sValue == '11': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_LARGE_INT2 + elif ParameterReadIn.sValue == '12': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_LARGE_INT1 + elif ParameterReadIn.sValue == '13': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_LARGE_INT2 + elif ParameterReadIn.sValue == '14': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_SMALL_IDEAL + elif ParameterReadIn.sValue == '15': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_SMALL_IDEAL + elif ParameterReadIn.sValue == '16': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_LARGE_IDEAL + elif ParameterReadIn.sValue == '17': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_LARGE_IDEAL else: - self.wellcorrelation.value = WellDrillingCostCorrelation.SIMPLE + ParameterToModify.value = WellDrillingCostCorrelation.SIMPLE # Assuming 'SIMPLE' is still a valid option elif ParameterToModify.Name == "Reservoir Stimulation Capital Cost Adjustment Factor": if self.ccstimfixed.Valid and ParameterToModify.Valid: print("Warning: Provided reservoir stimulation cost adjustment factor not considered" + @@ -2055,18 +2095,37 @@ def Calculate(self, model: Model) -> None: 'm').magnitude * 1E-6 elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_SMALL: - self.C1well = ((0.3021 * checkdepth_m ** 2 + 584.9112 * checkdepth_m + 751368.) - * 1E-6) # well drilling and completion cost in M$/well - - elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_SMALL: - self.C1well = (0.2898 * checkdepth_m ** 2 + 822.1507 * checkdepth_m + 680563.) * 1E-6 - + self.C1well = (0.30212 * checkdepth_m ** 2 + 584.91124 * checkdepth_m + 751368.47270) * 1E-6 elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_LARGE: - self.C1well = (0.2818 * checkdepth_m ** 2 + 1275.5213 * checkdepth_m + 632315.) * 1E-6 - + self.C1well = (0.28180 * checkdepth_m ** 2 + 1275.52130 * checkdepth_m + 632315.12640) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_SMALL: + self.C1well = (0.28977 * checkdepth_m ** 2 + 882.15067 * checkdepth_m + 680562.50150) * 1E-6 elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_LARGE: - self.C1well = (0.2553 * checkdepth_m ** 2 + 1716.7157 * checkdepth_m + 500867.) * 1E-6 - + self.C1well = (0.25528 * checkdepth_m ** 2 + 1716.71568 * checkdepth_m + 500866.89110) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_SMALL_INT1: + self.C1well = (0.13710 * checkdepth_m ** 2 + 129.61033 * checkdepth_m + 1205587.57100) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_LARGE_INT1: + self.C1well = (0.18927 * checkdepth_m ** 2 + 293.45174 * checkdepth_m + 1326526.31300) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_SMALL_INT1: + self.C1well = (0.15340 * checkdepth_m ** 2 + 120.31700 * checkdepth_m + 1431801.54400) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_LARGE_INT1: + self.C1well = (0.19950 * checkdepth_m ** 2 + 296.13011 * checkdepth_m + 1697867.70900) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_SMALL_INT2: + self.C1well = (0.00804 * checkdepth_m ** 2 + 455.60507 * checkdepth_m + 921007.68680) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_LARGE_INT2: + self.C1well = (0.00315 * checkdepth_m ** 2 + 782.69676 * checkdepth_m + 983620.25270) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_SMALL_INT2: + self.C1well = (0.00854 * checkdepth_m ** 2 + 506.08357 * checkdepth_m + 1057330.39000) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_LARGE_INT2: + self.C1well = (0.00380 * checkdepth_m ** 2 + 838.90249 * checkdepth_m + 1181947.04400) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_SMALL_IDEAL: + self.C1well = (0.00252 * checkdepth_m ** 2 + 439.44503 * checkdepth_m + 590611.90110) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_LARGE_IDEAL: + self.C1well = (-0.00240 * checkdepth_m ** 2 + 752.93946 * checkdepth_m + 524337.65380) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_SMALL_IDEAL: + self.C1well = (0.00719 * checkdepth_m ** 2 + 455.85233 * checkdepth_m + 753377.73080) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_LARGE_IDEAL: + self.C1well = (0.00376 * checkdepth_m ** 2 + 762.52696 * checkdepth_m + 765103.07690) * 1E-6 # account for adjustment factor self.C1well = self.ccwelladjfactor.value * self.C1well diff --git a/src/geophires_x/OptionList.py b/src/geophires_x/OptionList.py index 157224e8..f6d19063 100644 --- a/src/geophires_x/OptionList.py +++ b/src/geophires_x/OptionList.py @@ -51,12 +51,29 @@ class ReservoirVolume(str, Enum): class WellDrillingCostCorrelation(str, Enum): - VERTICAL_SMALL = "vertical open-hole, small diameter" - DEVIATED_SMALL = "deviated liner, small diameter" - VERTICAL_LARGE = "vertical open-hole, large diameter" - DEVIATED_LARGE = "deviated liner, large diameter" + """Note: order must be retained since input is read as an int""" + + VERTICAL_SMALL = "vertical small diameter, baseline" + DEVIATED_SMALL = "deviated small diameter, baseline" + VERTICAL_LARGE = "vertical large diameter, baseline" + DEVIATED_LARGE = "deviated large diameter, baseline" + SIMPLE = "Simple" + VERTICAL_SMALL_INT1 = "vertical small diameter, intermediate1" + VERTICAL_SMALL_INT2 = "vertical small diameter, intermediate2" + DEVIATED_SMALL_INT1 = "deviated small diameter, intermediate1" + DEVIATED_SMALL_INT2 = "deviated small diameter, intermediate2" + VERTICAL_LARGE_INT1 = "vertical large diameter, intermediate1" + VERTICAL_LARGE_INT2 = "vertical large diameter, intermediate2" + DEVIATED_LARGE_INT1 = "deviated large diameter, intermediate1" + DEVIATED_LARGE_INT2 = "deviated large diameter, intermediate2" + VERTICAL_SMALL_IDEAL = "vertical open-hole, small diameter, ideal" + DEVIATED_SMALL_IDEAL = "deviated liner, small diameter, ideal" + VERTICAL_LARGE_IDEAL = "vertical open-hole, large diameter, ideal" + DEVIATED_LARGE_IDEAL = "deviated liner, large diameter, ideal" + + class FractureShape(str, Enum): CIRCULAR_AREA = "Circular fracture with known area" diff --git a/src/geophires_x/SUTRAEconomics.py b/src/geophires_x/SUTRAEconomics.py index ba3b60e7..5df76624 100644 --- a/src/geophires_x/SUTRAEconomics.py +++ b/src/geophires_x/SUTRAEconomics.py @@ -136,15 +136,28 @@ def __init__(self, model: Model): ) self.wellcorrelation = self.ParameterDict[self.wellcorrelation.Name] = intParameter( "Well Drilling Cost Correlation", - value=WellDrillingCostCorrelation.VERTICAL_SMALL, - DefaultValue=WellDrillingCostCorrelation.VERTICAL_SMALL, - AllowableRange=[1, 2, 3, 4, 5], + DefaultValue=WellDrillingCostCorrelation.VERTICAL_LARGE_INT1, + AllowableRange=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], # Range updated to include all options UnitType=Units.NONE, - ErrMessage="assume default well drilling cost correlation (1)", - ToolTipText="Select the built-in horizontal well drilling and completion cost correlation." - + " 1: vertical open-hole, small diameter; 2: deviated liner, small diameter;" - + " 3: vertical open-hole, large diameter; 4: deviated liner, large diameter;" - + " 5: Simple - user specified cost per meter", + ErrMessage="assume default well drilling cost correlation (10)", + ToolTipText="""Select the built-in well drilling and completion cost correlation: +1. vertical small diameter, baseline; +2. deviated small diameter, baseline; +3. vertical large diameter, baseline; +4. deviated large diameter, baseline; +5. Simple; +6. vertical small diameter, intermediate1; +7. vertical small diameter, intermediate2; +8. deviated small diameter, intermediate1; +9. deviated small diameter, intermediate2; +10. vertical large diameter, intermediate1; +11. vertical large diameter, intermediate2; +12. deviated large diameter, intermediate1; +13. deviated large diameter, intermediate2; +14. vertical open-hole, small diameter, ideal; +15. deviated liner, small diameter, ideal; +16. vertical open-hole, large diameter, ideal; +17. deviated liner, large diameter, ideal;""" ) self.timestepsperyear = self.ParameterDict[self.timestepsperyear.Name] = intParameter( @@ -352,13 +365,39 @@ def read_parameters(self, model: Model) -> None: if ParameterReadIn.sValue == '1': ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_SMALL elif ParameterReadIn.sValue == '2': - self.wellcorrelation.value = WellDrillingCostCorrelation.DEVIATED_SMALL + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_SMALL elif ParameterReadIn.sValue == '3': - self.wellcorrelation.value = WellDrillingCostCorrelation.VERTICAL_LARGE + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_LARGE elif ParameterReadIn.sValue == '4': - self.wellcorrelation.value = WellDrillingCostCorrelation.DEVIATED_LARGE + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_LARGE + elif ParameterReadIn.sValue == '5': + ParameterToModify.value = WellDrillingCostCorrelation.SIMPLE + elif ParameterReadIn.sValue == '6': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_SMALL_INT1 + elif ParameterReadIn.sValue == '7': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_SMALL_INT2 + elif ParameterReadIn.sValue == '8': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_SMALL_INT1 + elif ParameterReadIn.sValue == '9': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_SMALL_INT2 + elif ParameterReadIn.sValue == '10': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_LARGE_INT1 + elif ParameterReadIn.sValue == '11': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_LARGE_INT2 + elif ParameterReadIn.sValue == '12': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_LARGE_INT1 + elif ParameterReadIn.sValue == '13': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_LARGE_INT2 + elif ParameterReadIn.sValue == '14': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_SMALL_IDEAL + elif ParameterReadIn.sValue == '15': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_SMALL_IDEAL + elif ParameterReadIn.sValue == '16': + ParameterToModify.value = WellDrillingCostCorrelation.VERTICAL_LARGE_IDEAL + elif ParameterReadIn.sValue == '17': + ParameterToModify.value = WellDrillingCostCorrelation.DEVIATED_LARGE_IDEAL else: - self.wellcorrelation.value = WellDrillingCostCorrelation.SIMPLE + ParameterToModify.value = WellDrillingCostCorrelation.SIMPLE # Assuming 'SIMPLE' is still a valid option else: model.logger.info("No parameters read because no content provided") @@ -396,21 +435,37 @@ def Calculate(self, model: Model) -> None: "Warning: simple user-specified cost per meter used for drilling depth < 500 or > 7000 m" ) if self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_SMALL: - self.C1well = ( - 0.3021 * model.reserv.depth.value**2 + 584.9112 * model.reserv.depth.value + 751368.0 - ) * 1e-6 # well drilling and completion cost in M$/well - elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_SMALL: - self.C1well = ( - 0.2898 * model.reserv.depth.value**2 + 822.1507 * model.reserv.depth.value + 680563.0 - ) * 1e-6 + self.C1well = (0.30212 * model.reserv.depth.value ** 2 + 584.91124 * model.reserv.depth.value + 751368.47270) * 1E-6 elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_LARGE: - self.C1well = ( - 0.2818 * model.reserv.depth.value**2 + 1275.5213 * model.reserv.depth.value + 632315.0 - ) * 1e-6 + self.C1well = (0.28180 * model.reserv.depth.value ** 2 + 1275.52130 * model.reserv.depth.value + 632315.12640) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_SMALL: + self.C1well = (0.28977 * model.reserv.depth.value ** 2 + 882.15067 * model.reserv.depth.value + 680562.50150) * 1E-6 elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_LARGE: - self.C1well = ( - 0.2553 * model.reserv.depth.value**2 + 1716.7157 * model.reserv.depth.value + 500867.0 - ) * 1e-6 + self.C1well = (0.25528 * model.reserv.depth.value ** 2 + 1716.71568 * model.reserv.depth.value + 500866.89110) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_SMALL_INT1: + self.C1well = (0.13710 * model.reserv.depth.value ** 2 + 129.61033 * model.reserv.depth.value + 1205587.57100) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_LARGE_INT1: + self.C1well = (0.18927 * model.reserv.depth.value ** 2 + 293.45174 * model.reserv.depth.value + 1326526.31300) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_SMALL_INT1: + self.C1well = (0.15340 * model.reserv.depth.value ** 2 + 120.31700 * model.reserv.depth.value + 1431801.54400) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_LARGE_INT1: + self.C1well = (0.19950 * model.reserv.depth.value ** 2 + 296.13011 * model.reserv.depth.value + 1697867.70900) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_SMALL_INT2: + self.C1well = (0.00804 * model.reserv.depth.value ** 2 + 455.60507 * model.reserv.depth.value + 921007.68680) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_LARGE_INT2: + self.C1well = (0.00315 * model.reserv.depth.value ** 2 + 782.69676 * model.reserv.depth.value + 983620.25270) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_SMALL_INT2: + self.C1well = (0.00854 * model.reserv.depth.value ** 2 + 506.08357 * model.reserv.depth.value + 1057330.39000) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_LARGE_INT2: + self.C1well = (0.00380 * model.reserv.depth.value ** 2 + 838.90249 * model.reserv.depth.value + 1181947.04400) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_SMALL_IDEAL: + self.C1well = (0.00252 * model.reserv.depth.value ** 2 + 439.44503 * model.reserv.depth.value + 590611.90110) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.VERTICAL_LARGE_IDEAL: + self.C1well = (-0.00240 * model.reserv.depth.value ** 2 + 752.93946 * model.reserv.depth.value + 524337.65380) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_SMALL_IDEAL: + self.C1well = (0.00719 * model.reserv.depth.value ** 2 + 455.85233 * model.reserv.depth.value + 753377.73080) * 1E-6 + elif self.wellcorrelation.value == WellDrillingCostCorrelation.DEVIATED_LARGE_IDEAL: + self.C1well = (0.00376 * model.reserv.depth.value ** 2 + 762.52696 * model.reserv.depth.value + 765103.07690) * 1E-6 self.C1well = self.C1well * self.ccwelladjfactor.value self.Cwell.value = self.C1well * (model.wellbores.nprod.value + model.wellbores.ninj.value) diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json index 166a7198..08cb6a32 100644 --- a/src/geophires_x_schema_generator/geophires-request.json +++ b/src/geophires_x_schema_generator/geophires-request.json @@ -731,7 +731,7 @@ "category": "Economics" }, "Well Drilling Cost Correlation": { - "description": "Select the built-in horizontal well drilling and completion cost correlation. 1: vertical open-hole, small diameter; 2: deviated liner, small diameter; 3: vertical open-hole, large diameter; 4: deviated liner, large diameter; 5: Simple - user specified cost per meter", + "description": "Select the built-in horizontal well drilling and completion cost correlation. 1. vertical small diameter, baseline; 2. deviated small diameter, baseline; 3. vertical large diameter, baseline; 4. deviated large diameter, baseline; 5. Simple; 6. vertical small diameter, intermediate1; 7. vertical small diameter, intermediate2; 8. deviated small diameter, intermediate1; 9. deviated small diameter, intermediate2; 10. vertical large diameter, intermediate1; 11. vertical large diameter, intermediate2; 12. deviated large diameter, intermediate1; 13. deviated large diameter, intermediate2; 14. vertical open-hole, small diameter, ideal; 15. deviated liner, small diameter, ideal; 16. vertical open-hole, large diameter, ideal; 17. deviated liner, large diameter, ideal", "type": "integer", "units": null, "category": "Economics" diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index a341e556..632881f0 100644 --- a/tests/example1_addons.csv +++ b/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.0,kg/sec -SUMMARY OF RESULTS,"Well depth (or total length\, if not vertical)",,3.0,kilometer +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,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.0, +ECONOMIC PARAMETERS,Accrued financing during construction,,0, ECONOMIC PARAMETERS,Project lifetime,,30,yr -ECONOMIC PARAMETERS,Capacity factor,,90.0,% +ECONOMIC PARAMETERS,Capacity factor,,90,% 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.0, +ECONOMIC PARAMETERS,Fixed Charge Rate (FCR),,5, 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.0,USD/MMBTU +EXTENDED ECONOMICS,"Adjusted Project LCOH (after incentives\, grants\, AddOns\,etc)",,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.0, -EXTENDED ECONOMICS,Total Add-on CAPEX,,70.0,MUSD +EXTENDED ECONOMICS,Project MOIC (including AddOns),,1, +EXTENDED ECONOMICS,Total Add-on CAPEX,,70,MUSD EXTENDED ECONOMICS,Total Add-on OPEX,,1.7,MUSD/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 Net Elec,,25900,kW/yr +EXTENDED ECONOMICS,Total Add-on Net Heat,,0,kW/yr EXTENDED ECONOMICS,Total Add-on Profit,,2.84,MUSD/yr -EXTENDED ECONOMICS,AddOns Payback Period,,0.0,yr +EXTENDED ECONOMICS,AddOns Payback Period,,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.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,"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,Number of times redrilling,,0,count ENGINEERING PARAMETERS,Power plant type,,Supercritical ORC, -RESOURCE CHARACTERISTICS,Maximum reservoir temperature,,400.0,degC +RESOURCE CHARACTERISTICS,Maximum reservoir temperature,,400,degC RESOURCE CHARACTERISTICS,Number of segments,,1,count RESOURCE CHARACTERISTICS,Geothermal gradient,,0.05,degC/m RESERVOIR PARAMETERS,Reservoir Model,,Multiple Parallel Fractures Model, @@ -56,18 +56,18 @@ RESERVOIR PARAMETERS,Reservoir volume,,1000000000,m**3 RESERVOIR PARAMETERS,Average reservoir 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.0,kg/sec/bar -RESERVOIR PARAMETERS,Injectivity Index,,5.0,kg/sec/bar -RESERVOIR PARAMETERS,Reservoir density,,2700.0,kg/m**3 +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,Reservoir thermal conductivity,,2.7,W/m/K -RESERVOIR PARAMETERS,Reservoir heat capacity,,1000.0,J/kg/K +RESERVOIR PARAMETERS,Reservoir heat capacity,,1000,J/kg/K RESERVOIR SIMULATION RESULTS,Maximum Production Temperature,,167.2,degC -RESERVOIR SIMULATION RESULTS,Average Production Temperature,,167.0,degC +RESERVOIR SIMULATION RESULTS,Average Production Temperature,,167,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.0,degC +RESERVOIR SIMULATION RESULTS,Average Production Well Temperature Drop,,3,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.0, +POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1, 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.0,degC +POWER GENERATION PROFILE,GEOFLUID TEMPERATURE,12,167,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.0,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,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.0,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,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.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,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,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.0,MUSD/yr +EXTENDED ECONOMIC PROFILE,Annual AddOn Cash Flow,1,-70,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.0,MUSD +EXTENDED ECONOMIC PROFILE,Cumm. AddOn Cash Flow,1,-70,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 @@ -609,7 +609,7 @@ EXTENDED ECONOMIC PROFILE,Annual Project Cash Flow,30,8.34,MUSD/yr EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,1,-101.06,MUSD EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,2,-95.38,MUSD EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,3,-89.65,MUSD -EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,4,-83.91,MUSD +EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,4,-83.92,MUSD EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,5,-78.17,MUSD EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,6,-72.42,MUSD EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,7,-66.66,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.0,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,6,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.0,MUSD +REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,1,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.0,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,1,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.0,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,1,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.0,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project OPEX,1,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.0,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,8,6,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 @@ -1066,7 +1066,7 @@ REVENUE & CASHFLOW PROFILE,Project Net Cashflow,7,-0.39,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,8,5.6,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,9,12.46,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,10,20.17,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,11,28.75,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,11,28.74,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,12,38.18,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,13,47.96,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,14,58.1,MUSD diff --git a/tests/examples/example1.out b/tests/examples/example1.out index dfc9de8a..53a59680 100644 --- a/tests/examples/example1.out +++ b/tests/examples/example1.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.21 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-12 - Simulation Time: 07:20 - Calculation Time: 0.618 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:32 + Calculation Time: 0.962 sec ***SUMMARY OF RESULTS*** @@ -226,9 +226,9 @@ ________________________________________________________________________________ 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 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 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 - 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 - 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 - 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 + 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 + 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 + 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 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 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 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 @@ -236,7 +236,7 @@ ________________________________________________________________________________ 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 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 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 - 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 + 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 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 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 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 diff --git a/tests/examples/example10_HP.out b/tests/examples/example10_HP.out index dc0bb9c6..93d5a899 100644 --- a/tests/examples/example10_HP.out +++ b/tests/examples/example10_HP.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.21 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-12 - Simulation Time: 07:20 - Calculation Time: 0.146 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:37 + Calculation Time: 0.275 sec ***SUMMARY OF RESULTS*** @@ -30,7 +30,7 @@ Simulation Metadata Accrued financing during construction: 5.00 Project lifetime: 30 yr Capacity factor: 90.0 % - Project NPV: 5.39 MUSD + Project NPV: 5.38 MUSD Project IRR: 7.89 % Project VIR=PI=PIR: 1.17 Project MOIC: 0.98 diff --git a/tests/examples/example11_AC.out b/tests/examples/example11_AC.out index d55a6900..fbfbee7f 100644 --- a/tests/examples/example11_AC.out +++ b/tests/examples/example11_AC.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.21 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-12 - Simulation Time: 07:20 - Calculation Time: 0.142 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:36 + Calculation Time: 0.274 sec ***SUMMARY OF RESULTS*** @@ -31,7 +31,7 @@ Simulation Metadata Accrued financing during construction: 5.00 Project lifetime: 30 yr Capacity factor: 90.0 % - Project NPV: 1.18 MUSD + Project NPV: 1.17 MUSD Project IRR: 6.63 % Project VIR=PI=PIR: 1.04 Project MOIC: 0.80 diff --git a/tests/examples/example12_DH.out b/tests/examples/example12_DH.out index b9a61056..42358884 100644 --- a/tests/examples/example12_DH.out +++ b/tests/examples/example12_DH.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.21 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-12 - Simulation Time: 07:20 - Calculation Time: 0.129 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:46 + Calculation Time: 0.257 sec ***SUMMARY OF RESULTS*** @@ -236,7 +236,7 @@ ________________________________________________________________________________ 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 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 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 - 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 + 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 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 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 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 diff --git a/tests/examples/example13.out b/tests/examples/example13.out index e6817697..5a3f89f3 100644 --- a/tests/examples/example13.out +++ b/tests/examples/example13.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.21 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-12 - Simulation Time: 07:19 - Calculation Time: 0.043 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:29 + Calculation Time: 0.088 sec ***SUMMARY OF RESULTS*** @@ -32,7 +32,7 @@ Simulation Metadata Project lifetime: 30 yr Capacity factor: 80.0 % Project NPV: -45.14 MUSD - Project IRR: -6.57 % + Project IRR: -6.58 % Project VIR=PI=PIR: 0.20 Project MOIC: -0.23 Project Payback Period: N/A @@ -220,15 +220,15 @@ ________________________________________________________________________________ 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 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 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 - 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 + 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 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 - 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 + 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 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 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 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 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 - 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 - 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 + 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 + 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 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 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 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 diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index bd769704..3ffc3c81 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.22 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-04-11 - Simulation Time: 14:48 - Calculation Time: 1.448 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:26 + Calculation Time: 0.937 sec ***SUMMARY OF RESULTS*** @@ -221,7 +221,7 @@ ________________________________________________________________________________ 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 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 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 - 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 + 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 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 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 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 1 0.000 0.0023 0.000 0.0000 1.14 -70.00 -70.00 -101.06 -101.06 2 0.090 0.0023 0.012 0.0000 1.14 1.14 -68.86 5.68 -95.38 3 0.090 0.0023 0.012 0.0000 1.14 1.14 -67.72 5.72 -89.65 - 4 0.090 0.0023 0.012 0.0000 1.14 1.14 -66.59 5.74 -83.91 + 4 0.090 0.0023 0.012 0.0000 1.14 1.14 -66.59 5.74 -83.92 5 0.090 0.0023 0.012 0.0000 1.14 1.14 -65.45 5.75 -78.17 6 0.090 0.0023 0.012 0.0000 1.14 1.14 -64.31 5.75 -72.42 7 0.090 0.0026 0.012 0.0000 1.14 1.14 -63.17 5.76 -66.66 diff --git a/tests/examples/example1_addons.txt b/tests/examples/example1_addons.txt index 78e0ad69..d05b6148 100644 --- a/tests/examples/example1_addons.txt +++ b/tests/examples/example1_addons.txt @@ -59,7 +59,8 @@ Water Loss Fraction,.02, ---[-] Productivity Index,5, ---[kg/s/bar] Injectivity Index,5, ---[kg/s/bar] Injection Temperature,50, ---[deg.C] -Maximum Drawdown,1, ---[-] no redrilling considered +Maximum Drawdown,1, ---[-] no redrilling considered, +Well Drilling Cost Correlation,1, ---[-] Use built-in correlations Reservoir Heat Capacity,1000, ---[J/kg/K] Reservoir Density,2700, ---[kg/m^3] Reservoir Thermal Conductivity,2.7, ---[W/m/K] diff --git a/tests/examples/example2.out b/tests/examples/example2.out index 4d45b115..6040223a 100644 --- a/tests/examples/example2.out +++ b/tests/examples/example2.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.15 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-05 - Simulation Time: 09:58 - Calculation Time: 0.213 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:33 + Calculation Time: 0.365 sec ***SUMMARY OF RESULTS*** @@ -33,7 +33,7 @@ Simulation Metadata Project IRR: 5.77 % Project VIR=PI=PIR: 0.96 Project MOIC: 0.51 - Project Payback Period: 13.48 yr + Project Payback Period: 13.48 yr ***ENGINEERING PARAMETERS*** @@ -201,7 +201,7 @@ ________________________________________________________________________________ 4 5.50 0.00 0.00 | 2.50 3.33 13.13 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.33 -31.01 5 5.50 0.00 0.00 | 2.50 3.34 17.55 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.34 -27.66 6 5.50 0.00 0.00 | 2.50 3.35 21.97 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.35 -24.31 - 7 5.50 0.00 0.00 | 2.50 3.36 26.41 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.36 -20.95 + 7 5.50 0.00 0.00 | 2.50 3.36 26.41 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.36 -20.96 8 5.50 0.00 0.00 | 2.50 3.36 30.84 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.36 -17.59 9 5.50 0.00 0.00 | 2.50 3.37 35.29 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.37 -14.23 10 5.50 0.00 0.00 | 2.50 3.24 39.61 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.24 -10.98 @@ -210,7 +210,7 @@ ________________________________________________________________________________ 13 5.50 0.00 0.00 | 2.50 3.13 52.32 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.13 -1.50 14 5.50 0.00 0.00 | 2.50 3.10 56.49 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.10 1.60 15 5.50 0.00 0.00 | 2.50 3.06 60.63 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.06 4.66 - 16 5.50 0.00 0.00 | 2.50 3.02 64.73 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.02 7.69 + 16 5.50 0.00 0.00 | 2.50 3.02 64.73 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.02 7.68 17 5.50 0.00 0.00 | 2.50 2.99 68.79 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.99 10.67 18 5.50 0.00 0.00 | 2.50 2.95 72.81 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.95 13.62 19 5.50 0.00 0.00 | 2.50 2.91 76.80 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.91 16.53 @@ -219,4 +219,4 @@ ________________________________________________________________________________ 22 5.50 0.00 0.00 | 2.50 2.78 88.50 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.78 25.01 23 5.50 0.00 0.00 | 2.50 2.74 92.32 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.74 27.75 24 5.50 0.00 0.00 | 2.50 2.70 96.09 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.70 30.44 - 25 5.50 0.00 0.00 | 2.50 2.65 99.82 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.65 33.10 + 25 5.50 0.00 0.00 | 2.50 2.65 99.82 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.65 33.09 diff --git a/tests/examples/example3.out b/tests/examples/example3.out index c092d6c6..6f5e29f7 100644 --- a/tests/examples/example3.out +++ b/tests/examples/example3.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.15 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-05 - Simulation Time: 09:58 - Calculation Time: 0.167 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:34 + Calculation Time: 0.333 sec ***SUMMARY OF RESULTS*** @@ -34,7 +34,7 @@ Simulation Metadata Project IRR: 6.01 % Project VIR=PI=PIR: 0.97 Project MOIC: 0.65 - Project Payback Period: 14.87 yr + Project Payback Period: 14.87 yr CHP: Percent cost allocation for electrical plant: 93.66% ***ENGINEERING PARAMETERS*** @@ -248,13 +248,13 @@ ________________________________________________________________________________ 23 5.50 8.40 195.86 | 2.50 2.05 48.02 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.22 61.19 24 5.50 8.33 204.19 | 2.50 2.03 50.05 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.12 68.31 25 5.50 8.26 212.45 | 2.50 2.00 52.05 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.03 75.34 - 26 5.50 8.18 220.62 | 2.50 1.98 54.03 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.93 82.27 + 26 5.50 8.18 220.62 | 2.50 1.98 54.03 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.93 82.26 27 5.50 8.10 228.73 | 2.50 1.96 55.99 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.83 89.09 28 5.50 8.03 236.76 | 2.50 1.93 57.92 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.73 95.82 29 5.50 7.95 244.71 | 2.50 1.91 59.83 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.63 102.45 - 30 5.50 7.88 252.58 | 2.50 1.89 61.72 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.53 108.99 + 30 5.50 7.88 252.58 | 2.50 1.89 61.72 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.53 108.98 31 5.50 7.80 260.38 | 2.50 1.86 63.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.43 115.42 32 5.50 7.73 268.11 | 2.50 1.84 65.43 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.33 121.75 - 33 5.50 7.65 275.76 | 2.50 1.82 67.24 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.24 127.99 + 33 5.50 7.65 275.76 | 2.50 1.82 67.24 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.24 127.98 34 5.50 7.58 283.34 | 2.50 1.79 69.03 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.14 134.12 - 35 5.50 7.51 290.84 | 2.50 1.77 70.80 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.04 140.17 + 35 5.50 7.51 290.84 | 2.50 1.77 70.80 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.04 140.16 diff --git a/tests/examples/example4.out b/tests/examples/example4.out index 2476f091..ba1d083d 100644 --- a/tests/examples/example4.out +++ b/tests/examples/example4.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.21 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-12 - Simulation Time: 07:19 - Calculation Time: 0.061 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:30 + Calculation Time: 0.127 sec ***SUMMARY OF RESULTS*** @@ -214,7 +214,7 @@ ________________________________________________________________________________ 4 5.50 1.66 10.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.66 -50.30 5 5.50 1.63 13.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.63 -48.67 6 5.50 1.59 17.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.59 -47.08 - 7 5.50 1.56 20.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.56 -45.52 + 7 5.50 1.56 20.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.56 -45.53 8 5.50 1.52 23.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.52 -44.00 9 5.50 1.49 27.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.49 -42.52 10 5.50 1.45 30.49 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.45 -41.07 @@ -232,7 +232,7 @@ ________________________________________________________________________________ 22 5.50 1.05 66.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.05 -26.30 23 5.50 1.02 69.62 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.02 -25.29 24 5.50 0.98 72.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.98 -24.31 - 25 5.50 0.95 75.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.95 -23.35 + 25 5.50 0.95 75.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.95 -23.36 26 5.50 0.92 77.86 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.92 -22.44 27 5.50 0.89 80.55 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.89 -21.55 28 5.50 0.86 83.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.86 -20.69 diff --git a/tests/examples/example5.out b/tests/examples/example5.out index 9a61725e..745d1288 100644 --- a/tests/examples/example5.out +++ b/tests/examples/example5.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.15 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-05 - Simulation Time: 09:58 - Calculation Time: 0.061 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:31 + Calculation Time: 0.124 sec ***SUMMARY OF RESULTS*** @@ -32,7 +32,7 @@ Simulation Metadata Project IRR: 5.64 % Project VIR=PI=PIR: 0.95 Project MOIC: 0.47 - Project Payback Period: 13.63 yr + Project Payback Period: 13.63 yr ***ENGINEERING PARAMETERS*** @@ -219,10 +219,10 @@ ________________________________________________________________________________ 16 5.50 0.00 0.00 | 2.50 2.57 65.34 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.57 6.25 17 5.50 0.00 0.00 | 2.50 2.49 69.02 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.49 8.74 18 5.50 0.00 0.00 | 2.50 2.41 72.61 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.41 11.16 - 19 5.50 0.00 0.00 | 2.50 2.34 76.13 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.34 13.50 + 19 5.50 0.00 0.00 | 2.50 2.34 76.13 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.34 13.49 20 5.50 0.00 0.00 | 2.50 2.27 79.58 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.27 15.76 21 5.50 0.00 0.00 | 2.50 2.20 82.96 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.20 17.96 - 22 5.50 0.00 0.00 | 2.50 2.13 86.27 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.13 20.10 + 22 5.50 0.00 0.00 | 2.50 2.13 86.27 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.13 20.09 23 5.50 0.00 0.00 | 2.50 2.07 89.52 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.07 22.17 24 5.50 0.00 0.00 | 2.50 2.01 92.72 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.01 24.18 25 5.50 0.00 0.00 | 2.50 1.95 95.85 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.95 26.13 diff --git a/tests/examples/example9.out b/tests/examples/example9.out index 85074888..fd793375 100644 --- a/tests/examples/example9.out +++ b/tests/examples/example9.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.15 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-05 - Simulation Time: 09:59 - Calculation Time: 0.618 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:49 + Calculation Time: 0.949 sec ***SUMMARY OF RESULTS*** @@ -29,11 +29,11 @@ Simulation Metadata Accrued financing during construction: 0.00 Project lifetime: 30 yr Capacity factor: 90.0 % - Project NPV: -31.10 MUSD + Project NPV: -31.11 MUSD Project IRR: 0.00 % Project VIR=PI=PIR: -0.13 Project MOIC: -0.85 - Project Payback Period: N/A + Project Payback Period: N/A ***ENGINEERING PARAMETERS*** @@ -215,19 +215,19 @@ ________________________________________________________________________________ 1 0.00 -27.42 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -27.42 -27.42 2 5.50 -0.28 0.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -27.70 3 5.50 -0.27 0.41 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -27.97 - 4 5.50 -0.27 0.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.24 - 5 5.50 -0.27 0.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.51 + 4 5.50 -0.27 0.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.25 + 5 5.50 -0.27 0.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.52 6 5.50 -0.27 1.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.78 7 5.50 -0.27 1.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -29.05 8 5.50 -0.27 1.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -29.32 9 5.50 -0.27 1.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -29.59 10 5.50 -0.27 1.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -29.86 - 11 5.50 -0.27 2.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.12 + 11 5.50 -0.27 2.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.13 12 5.50 -0.27 2.33 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.39 13 5.50 -0.27 2.55 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.66 14 5.50 -0.27 2.76 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.93 15 5.50 -0.27 2.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -31.20 - 16 5.50 -0.27 3.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -31.47 + 16 5.50 -0.27 3.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -31.48 17 5.50 -0.27 3.39 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -31.75 18 5.50 -0.27 3.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -32.02 19 5.50 -0.28 3.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -32.30 @@ -241,4 +241,4 @@ ________________________________________________________________________________ 27 5.50 -0.29 5.39 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -34.58 28 5.50 -0.29 5.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -34.87 29 5.50 -0.30 5.76 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -35.17 - 30 5.50 -0.30 5.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -35.46 + 30 5.50 -0.30 5.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -35.47 diff --git a/tests/examples/example_ITC.out b/tests/examples/example_ITC.out index 90297325..3b2d0b6a 100644 --- a/tests/examples/example_ITC.out +++ b/tests/examples/example_ITC.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.22 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-04-12 - Simulation Time: 05:01 - Calculation Time: 0.622 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:38 + Calculation Time: 0.929 sec ***SUMMARY OF RESULTS*** @@ -214,9 +214,9 @@ ________________________________________________________________________________ 3 5.50 4.93 15.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 4.93 -50.00 4 5.50 4.96 23.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 4.96 -45.05 5 5.50 4.97 31.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 4.97 -40.08 - 6 5.50 4.98 39.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 4.98 -35.09 + 6 5.50 4.98 39.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 4.98 -35.10 7 5.50 4.99 47.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 4.99 -30.11 - 8 5.50 5.00 55.98 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.00 -25.11 + 8 5.50 4.99 55.98 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 4.99 -25.11 9 5.50 5.00 64.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.00 -20.11 10 5.50 5.00 72.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.00 -15.11 11 5.50 5.01 80.13 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.01 -10.10 @@ -225,17 +225,17 @@ ________________________________________________________________________________ 14 5.50 5.02 104.30 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 4.95 15 5.50 5.02 112.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 9.97 16 5.50 5.02 120.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 14.99 - 17 5.50 5.02 128.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 20.02 + 17 5.50 5.02 128.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 20.01 18 5.50 5.03 136.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 25.04 19 5.50 5.03 144.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 30.07 20 5.50 5.03 152.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 35.10 21 5.50 5.03 160.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 40.13 - 22 5.50 5.03 168.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 45.17 + 22 5.50 5.03 168.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 45.16 23 5.50 5.03 176.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 50.20 24 5.50 5.04 185.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 55.24 25 5.50 5.04 193.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 60.27 26 5.50 5.04 201.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 65.31 27 5.50 5.04 209.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 70.35 28 5.50 5.04 217.36 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 75.39 - 29 5.50 5.04 225.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 80.44 + 29 5.50 5.04 225.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 80.43 30 5.50 5.04 233.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 85.48 diff --git a/tests/examples/example_PTC.out b/tests/examples/example_PTC.out index ccaa1c2b..0c95a3ff 100644 --- a/tests/examples/example_PTC.out +++ b/tests/examples/example_PTC.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.22 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-04-12 - Simulation Time: 05:07 - Calculation Time: 0.635 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:36 + Calculation Time: 0.971 sec ***SUMMARY OF RESULTS*** @@ -28,7 +28,7 @@ Simulation Metadata Accrued financing during construction: 0.00 Project lifetime: 30 yr Capacity factor: 90.0 % - Project NPV: 5.73 MUSD + Project NPV: 5.72 MUSD Project IRR: 6.85 % Project VIR=PI=PIR: 1.05 Project MOIC: 0.53 @@ -98,7 +98,7 @@ Simulation Metadata Field gathering system costs: 2.64 MUSD Total surface equipment costs: 62.45 MUSD Exploration costs: 9.97 MUSD - Total capital costs: 119.57 MUSD + Total capital costs: 119.58 MUSD ***OPERATING AND MAINTENANCE COSTS (M$/yr)*** @@ -208,7 +208,7 @@ Year Electricity | Heat | Since Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | OPEX Net Rev. Net Cashflow Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/tonne) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -119.57 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -119.57 -119.57 + 1 0.00 -119.58 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -119.58 -119.58 2 10.50 12.04 15.08 | 7.50 0.00 0.00 | 7.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 12.04 -107.54 3 10.62 12.36 30.48 | 7.62 0.00 0.00 | 7.62 0.00 0.00 | 0.00 0.00 0.00 | 3.04 12.36 -95.18 4 10.75 12.60 46.12 | 7.75 0.00 0.00 | 7.75 0.00 0.00 | 0.00 0.00 0.00 | 3.04 12.60 -82.58 @@ -221,20 +221,20 @@ ________________________________________________________________________________ 11 11.74 14.15 161.76 | 8.74 0.00 0.00 | 8.74 0.00 0.00 | 0.00 0.00 0.00 | 3.04 14.15 11.75 12 5.50 5.01 169.82 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.01 16.76 13 5.50 5.02 177.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 21.78 - 14 5.50 5.02 185.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 26.80 - 15 5.50 5.02 194.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 31.82 + 14 5.50 5.02 185.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 26.79 + 15 5.50 5.02 194.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 31.81 16 5.50 5.02 202.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 36.84 17 5.50 5.02 210.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.02 41.86 18 5.50 5.03 218.21 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 46.89 19 5.50 5.03 226.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 51.92 20 5.50 5.03 234.36 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 56.95 21 5.50 5.03 242.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 61.98 - 22 5.50 5.03 250.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 67.02 + 22 5.50 5.03 250.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 67.01 23 5.50 5.03 258.59 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.03 72.05 - 24 5.50 5.04 266.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 77.09 + 24 5.50 5.04 266.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 77.08 25 5.50 5.04 274.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 82.12 26 5.50 5.04 282.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 87.16 27 5.50 5.04 290.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 92.20 28 5.50 5.04 299.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 97.24 - 29 5.50 5.04 307.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 102.29 + 29 5.50 5.04 307.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 102.28 30 5.50 5.04 315.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.04 107.33 diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out index 992a9931..04110a88 100644 --- a/tests/examples/example_SHR-2.out +++ b/tests/examples/example_SHR-2.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.22 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-04-10 - Simulation Time: 14:59 - Calculation Time: 1.435 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:45 + Calculation Time: 0.957 sec ***SUMMARY OF RESULTS*** @@ -29,7 +29,7 @@ Simulation Metadata Accrued financing during construction: 0.00 Project lifetime: 30 yr Capacity factor: 90.0 % - Project NPV: 115.21 MUSD + Project NPV: 115.20 MUSD Project IRR: 11.74 % Project VIR=PI=PIR: 1.72 Project MOIC: 2.42 @@ -89,14 +89,14 @@ Simulation Metadata ***CAPITAL COSTS (M$)*** - Drilling and completion costs: 92.95 MUSD + Drilling and completion costs: 92.96 MUSD Drilling and completion costs per well: 23.24 MUSD Stimulation costs: 3.02 MUSD Surface power plant costs: 44.77 MUSD Field gathering system costs: 1.93 MUSD Total surface equipment costs: 46.70 MUSD Exploration costs: 18.39 MUSD - Total capital costs: 161.06 MUSD + Total capital costs: 161.07 MUSD Annualized capital costs: 8.05 MUSD @@ -206,33 +206,33 @@ Year Electricity | Heat | Since Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | OPEX Net Rev. Net Cashflow Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/tonne) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -161.06 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -161.06 -161.06 - 2 6.00 12.37 13.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 12.37 -148.69 - 3 6.00 12.72 27.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 12.72 -135.97 - 4 7.20 15.68 44.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 15.68 -120.29 + 1 0.00 -161.07 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -161.07 -161.07 + 2 6.00 12.37 13.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 12.37 -148.70 + 3 6.00 12.72 27.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 12.72 -135.98 + 4 7.20 15.68 44.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 15.68 -120.30 5 8.40 18.62 64.82 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 18.62 -101.67 - 6 9.60 21.56 87.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 21.56 -80.11 + 6 9.60 21.56 87.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 21.56 -80.12 7 10.00 22.58 111.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.58 -57.54 8 10.00 22.63 135.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.63 -34.91 9 10.00 22.67 159.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.67 -12.24 10 10.00 22.71 183.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.71 10.47 11 10.00 22.74 207.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.74 33.21 12 10.00 22.77 231.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.77 55.98 - 13 10.00 22.80 256.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.80 78.78 - 14 10.00 22.82 280.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.82 101.60 - 15 10.00 22.84 304.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.84 124.44 - 16 10.00 22.86 328.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.86 147.30 + 13 10.00 22.80 256.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.80 78.77 + 14 10.00 22.82 280.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.82 101.59 + 15 10.00 22.84 304.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.84 124.43 + 16 10.00 22.86 328.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.86 147.29 17 10.00 22.88 352.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.88 170.17 18 10.00 22.89 377.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.89 193.06 19 10.00 22.91 401.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.91 215.97 - 20 10.00 22.92 425.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.92 238.90 - 21 10.00 22.94 450.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.94 261.83 - 22 10.00 22.95 474.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.95 284.78 - 23 10.00 22.96 498.62 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.96 307.74 + 20 10.00 22.92 425.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.92 238.89 + 21 10.00 22.94 450.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.94 261.82 + 22 10.00 22.95 474.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.95 284.77 + 23 10.00 22.96 498.62 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.96 307.73 24 10.00 22.97 522.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.97 330.71 - 25 10.00 22.98 547.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.98 353.70 - 26 10.00 22.99 571.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.99 376.69 + 25 10.00 22.98 547.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.98 353.69 + 26 10.00 22.99 571.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 22.99 376.68 27 10.00 23.00 596.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 23.00 399.69 - 28 10.00 23.01 620.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 23.01 422.71 - 29 10.00 23.02 644.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 23.02 445.73 - 30 10.00 23.03 669.13 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 23.03 468.76 + 28 10.00 23.01 620.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 23.01 422.70 + 29 10.00 23.02 644.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 23.02 445.72 + 30 10.00 23.03 669.13 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.36 23.03 468.75 diff --git a/tests/examples/example_SHR-2.txt b/tests/examples/example_SHR-2.txt index 220c11f6..3fe5fb58 100644 --- a/tests/examples/example_SHR-2.txt +++ b/tests/examples/example_SHR-2.txt @@ -33,6 +33,7 @@ Reservoir Thermal Conductivity, 2.7 End-Use Option, 1 Economic Model, 1 Power Plant Type, 3 +Well Drilling Cost Correlation, 1 Circulation Pump Efficiency, .8 Utilization Factor, .9 Surface Temperature, 20 diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out index 29505dbb..7ed46c4b 100644 --- a/tests/examples/example_multiple_gradients.out +++ b/tests/examples/example_multiple_gradients.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.21 + GEOPHIRES Version: 3.4.25 GEOPHIRES Build Date: 2024-03-05 - Simulation Date: 2024-03-12 - Simulation Time: 07:20 - Calculation Time: 0.606 sec + Simulation Date: 2024-04-16 + Simulation Time: 10:47 + Calculation Time: 0.953 sec ***SUMMARY OF RESULTS*** @@ -35,7 +35,7 @@ Simulation Metadata Accrued financing during construction: 0.00 Project lifetime: 30 yr Capacity factor: 90.0 % - Project NPV: -54.78 MUSD + Project NPV: -54.79 MUSD Project IRR: -3.21 % Project VIR=PI=PIR: 0.28 Project MOIC: -0.23 @@ -227,7 +227,7 @@ ________________________________________________________________________________ 4 5.50 1.68 10.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -71.21 5 5.50 1.68 14.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -69.53 6 5.50 1.68 18.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -67.85 - 7 5.50 1.68 21.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -66.16 + 7 5.50 1.68 21.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -66.17 8 5.50 1.68 25.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -64.48 9 5.50 1.68 28.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -62.80 10 5.50 1.68 32.49 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -61.12 @@ -235,8 +235,8 @@ ________________________________________________________________________________ 12 5.50 1.67 39.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.67 -57.78 13 5.50 1.66 43.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.66 -56.12 14 5.50 1.65 46.86 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.65 -54.47 - 15 5.50 1.64 50.42 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.64 -52.83 - 16 5.50 1.62 53.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.62 -51.21 + 15 5.50 1.64 50.42 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.64 -52.84 + 16 5.50 1.62 53.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.62 -51.22 17 5.50 1.60 57.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.60 -49.61 18 5.50 1.58 61.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.58 -48.03 19 5.50 1.56 64.49 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.56 -46.47 @@ -244,10 +244,10 @@ ________________________________________________________________________________ 21 5.50 1.51 71.39 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.51 -43.43 22 5.50 1.48 74.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.48 -41.95 23 5.50 1.45 78.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.45 -40.50 - 24 5.50 1.42 81.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.42 -39.07 + 24 5.50 1.42 81.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.42 -39.08 25 5.50 1.39 84.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.39 -37.68 26 5.50 1.36 88.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.36 -36.32 27 5.50 1.33 91.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.33 -34.99 - 28 5.50 1.30 94.62 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.30 -33.69 + 28 5.50 1.30 94.62 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.30 -33.70 29 5.50 1.26 97.82 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.26 -32.43 30 5.50 1.23 100.98 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.23 -31.20 diff --git a/tests/test_geophires_x_client.py b/tests/test_geophires_x_client.py index 0e1281cd..22326d36 100644 --- a/tests/test_geophires_x_client.py +++ b/tests/test_geophires_x_client.py @@ -236,7 +236,7 @@ def test_extended_economic_profile(self): [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], + [4, 0.09, 0.0023, 0.012, 0.0, 1.14, 1.14, -66.59, 5.74, -83.92], [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.09, 0.0026, 0.012, 0.0, 1.14, 1.14, -63.17, 5.76, -66.66], @@ -440,26 +440,47 @@ def test_input_with_non_default_units(self): self.assertDictEqual(result_default_units, result_non_default_units) def test_csv(self): - """ - TODO make this less tedious to update when expected result values change - - Current easiest method to update: - 1. set breakpoint on line with `as_csv = result.as_csv()` - 2. debug test, hit break point - 3. copy value of `as_csv` to example1_addons.csv - """ + def assertFileContentsEqual(expected_file_path, actual_file_path, tol=0.01): + with open(expected_file_path, encoding='utf-8') as ef: + expected_lines = ef.readlines() + with open(actual_file_path, encoding='utf-8') as af: + actual_lines = af.readlines() + + self.assertEqual(len(expected_lines), len(actual_lines), 'The number of lines in the files do not match.') + + for line_index, (expected_line, actual_line) in enumerate(zip(expected_lines, actual_lines), start=1): + expected_parts = expected_line.strip().split(',') + actual_parts = actual_line.strip().split(',') + self.assertEqual( + len(expected_parts), + len(actual_parts), + f'The number of columns in line {line_index} does not match.', + ) + for col_index, (expected, actual) in enumerate(zip(expected_parts, actual_parts), start=1): + try: + expected_float = float(expected) + actual_float = float(actual) + self.assertTrue( + abs(expected_float - actual_float) < tol, + f'Float values differ at line {line_index}, column {col_index}: {expected} != {actual}', + ) + except ValueError: + self.assertEqual( + expected, + actual, + f'String values differ at line {line_index}, column {col_index}: {expected} != {actual}', + ) def assert_csv_equal(case_report_file_path, expected_csv_file_path): test_result_path = self._get_test_file_path(case_report_file_path) result = GeophiresXResult(test_result_path) - as_csv = result.as_csv() self.assertIsNotNone(as_csv) result_file = Path(tempfile.gettempdir(), f'test_csv-result_{uuid.uuid1()!s}.csv') with open(result_file, 'w', newline='', encoding='utf-8') as rf: rf.write(as_csv) - self.assertFileContentsEqual(self._get_test_file_path(expected_csv_file_path), result_file) + assertFileContentsEqual(self._get_test_file_path(expected_csv_file_path), result_file) for case in [ ('examples/example1_addons.out', 'example1_addons.csv'),