From 40a63269549e9f823c898d49c0f2d7d442cf46b7 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 06:58:48 -0800 Subject: [PATCH 01/14] Add LCOC & well depth to result --- src/geophires_x_client/geophires_x_result.py | 2 ++ tests/example1_addons.csv | 1 + tests/geophires-result_example-3.csv | 1 + 3 files changed, 4 insertions(+) diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py index c75f0479..26e9b03a 100644 --- a/src/geophires_x_client/geophires_x_result.py +++ b/src/geophires_x_client/geophires_x_result.py @@ -32,6 +32,7 @@ class GeophiresXResult: 'Average Direct-Use Heat Production', 'Direct-Use heat breakeven price', 'Direct-Use heat breakeven price (LCOH)', + 'Direct-Use Cooling Breakeven Price (LCOC)', 'Annual District Heating Demand', 'Average Cooling Production', 'Average Annual Geothermal Heat Production', @@ -41,6 +42,7 @@ class GeophiresXResult: 'Number of injection wells', 'Flowrate per production well', 'Well depth', + 'Well depth (or total length, if not vertical)', 'Geothermal gradient', 'Segment 1 Geothermal gradient', 'Segment 1 Thickness', diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index c78a3d33..99413d67 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -5,6 +5,7 @@ SUMMARY OF RESULTS,Electricity breakeven price,,8.7,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,Geothermal gradient,,0.05,degC/m ECONOMIC PARAMETERS,Economic Model,,Fixed Charge Rate (FCR), ECONOMIC PARAMETERS,Accrued financing during construction,,0.0, diff --git a/tests/geophires-result_example-3.csv b/tests/geophires-result_example-3.csv index 496a9a2e..a72c4333 100644 --- a/tests/geophires-result_example-3.csv +++ b/tests/geophires-result_example-3.csv @@ -6,6 +6,7 @@ SUMMARY OF RESULTS,Average Direct-Use Heat Production,,11.06,MW SUMMARY OF RESULTS,Number of production wells,,3,count SUMMARY OF RESULTS,Number of injection wells,,3,count SUMMARY OF RESULTS,Flowrate per production well,,70.0,kg/sec +SUMMARY OF RESULTS,"Well depth (or total length\, if not vertical)",,3.1,kilometer SUMMARY OF RESULTS,Geothermal gradient,,0.07,degC/m ECONOMIC PARAMETERS,Accrued financing during construction,,5.0, ECONOMIC PARAMETERS,Project lifetime,,35,yr From 00f91fe17b02ffc548252c9dc910c4fcb3f3d087 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 06:58:53 -0800 Subject: [PATCH 02/14] =?UTF-8?q?Bump=20version:=203.4.14=20=E2=86=92=203.?= =?UTF-8?q?4.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- .cookiecutterrc | 2 +- README.rst | 4 ++-- docs/conf.py | 2 +- setup.py | 2 +- src/geophires_x/__init__.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cc5476aa..265daa59 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.4.14 +current_version = 3.4.15 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index 8db3e13c..6a1ac2e9 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -54,7 +54,7 @@ default_context: sphinx_doctest: "no" sphinx_theme: "sphinx-py3doc-enhanced-theme" test_matrix_separate_coverage: "no" - version: 3.4.14 + version: 3.4.15 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index 9abe380c..d97ed9d4 100644 --- a/README.rst +++ b/README.rst @@ -47,9 +47,9 @@ Free software: `MIT license `__ :alt: Supported implementations :target: https://pypi.org/project/geophires-x -.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.14.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.15.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.14...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.15...main .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat :target: https://nrel.github.io/GEOPHIRES-X diff --git a/docs/conf.py b/docs/conf.py index 591a8d43..4dd88128 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2023' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.4.14' +version = release = '3.4.15' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index cc11d589..52024d96 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.4.14', + version='3.4.15', license='MIT', description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.', long_description='{}\n{}'.format( diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py index a7b95720..e0fb4c59 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.4.14' +__version__ = '3.4.15' From 8c34f3e034881e6dfdac0d028b81125ec8b92b46 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 07:25:18 -0800 Subject: [PATCH 03/14] Update utilization efficiency interpolation https://github.com/NREL/GEOPHIRES-X/issues/140 --- src/geophires_x/GeoPHIRESUtils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/geophires_x/GeoPHIRESUtils.py b/src/geophires_x/GeoPHIRESUtils.py index d1d4b10e..02ff2f2e 100644 --- a/src/geophires_x/GeoPHIRESUtils.py +++ b/src/geophires_x/GeoPHIRESUtils.py @@ -85,7 +85,7 @@ 0.4, 0.4, 0.4, - 0.4, + 0.5, # Extrapolate from fig 2 in https://geothermal-energy-journal.springeropen.com/articles/10.1186/s40517-019-0119-6 ] ) From b1586f586ed639a9d3f69a40c07f54f94cc173ec Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 07:35:45 -0800 Subject: [PATCH 04/14] Mark FIXMEs in Outputs & Parameter --- src/geophires_x/Outputs.py | 4 +++- src/geophires_x/Parameter.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index 703e6c2c..4177792f 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -110,7 +110,7 @@ def PrintOutputs(self, model: Model): f.write("Simulation Metadata\n") f.write("----------------------\n") f.write(f' GEOPHIRES Version: {geophires_x.__version__}\n') - f.write(" GEOPHIRES Build Date: 2022-06-30\n") + f.write(" GEOPHIRES Build Date: 2024-03-05\n") # FIXME TODO https://github.com/NREL/GEOPHIRES-X/issues/139 f.write(" Simulation Date: "+ datetime.datetime.now().strftime("%Y-%m-%d\n")) f.write(" Simulation Time: "+ datetime.datetime.now().strftime("%H:%M\n")) f.write(" Calculation Time: "+"{0:10.3f}".format((time.time()-model.tic)) + " sec\n") @@ -622,6 +622,8 @@ def PrintOutputs(self, model: Model): f.write( "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" + NL) econ = model.economics + + # FIXME incorrect units f.write("Start (" + econ.ElecPrice.PreferredUnits.value + ")(" + econ.ElecRevenue.PreferredUnits.value + diff --git a/src/geophires_x/Parameter.py b/src/geophires_x/Parameter.py index 56d7e33f..bac7d694 100644 --- a/src/geophires_x/Parameter.py +++ b/src/geophires_x/Parameter.py @@ -67,7 +67,7 @@ class OutputParameter(HasQuantity): # set to PreferredUnits by default assuming that the current units are the preferred units - # they will only change if the read function reads a different unit associated with a parameter CurrentUnits: Enum = PreferredUnits - UnitsMatch: bool = True + UnitsMatch: bool = True # FIXME calculate from whether current & preferred match @dataclass From 2cf7c16234552143bce1f9de579327171ca93928 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 09:34:05 -0800 Subject: [PATCH 05/14] Convert output units with pint (WIP) --- src/geophires_x/Economics.py | 7 ++-- src/geophires_x/GEOPHIRES3_newunits.txt | 2 ++ src/geophires_x/GeoPHIRESUtils.py | 7 ++-- src/geophires_x/Outputs.py | 10 ++++-- src/geophires_x/Parameter.py | 23 +++++++----- src/geophires_x/Units.py | 12 +++++++ tests/test_parameter.py | 47 +++++++++++++++++++++++++ 7 files changed, 89 insertions(+), 19 deletions(-) diff --git a/src/geophires_x/Economics.py b/src/geophires_x/Economics.py index 5b924bb4..a02261d4 100644 --- a/src/geophires_x/Economics.py +++ b/src/geophires_x/Economics.py @@ -820,7 +820,6 @@ def __init__(self, model: Model): ) self.DoCarbonCalculations = self.ParameterDict[self.DoCarbonCalculations.Name] = boolParameter( "Do Carbon Price Calculations", - value=False, DefaultValue=False, UnitType=Units.NONE, Required=False, @@ -1301,19 +1300,19 @@ def __init__(self, model: Model): "Electricity Sale Price Model", UnitType=Units.ENERGYCOST, PreferredUnits=EnergyCostUnit.CENTSSPERKWH, - CurrentUnits=EnergyCostUnit.CENTSSPERKWH + CurrentUnits=EnergyCostUnit.DOLLARSPERKWH, # FIXME WIP ) self.HeatPrice = self.OutputParameterDict[self.HeatPrice.Name] = OutputParameter( "Heat Sale Price Model", UnitType=Units.ENERGYCOST, PreferredUnits=EnergyCostUnit.CENTSSPERKWH, - CurrentUnits=EnergyCostUnit.CENTSSPERKWH + CurrentUnits=EnergyCostUnit.CENTSSPERKWH, # FIXME TODO ) self.CoolingPrice = self.OutputParameterDict[self.CoolingPrice.Name] = OutputParameter( "Heat Sale Price Model", UnitType=Units.ENERGYCOST, PreferredUnits=EnergyCostUnit.CENTSSPERKWH, - CurrentUnits=EnergyCostUnit.CENTSSPERKWH + CurrentUnits=EnergyCostUnit.CENTSSPERKWH # FIXME TODO ) self.CarbonPrice = self.OutputParameterDict[self.CarbonPrice.Name] = OutputParameter( "Carbon Price Model", diff --git a/src/geophires_x/GEOPHIRES3_newunits.txt b/src/geophires_x/GEOPHIRES3_newunits.txt index e69de29b..e8afe4c4 100644 --- a/src/geophires_x/GEOPHIRES3_newunits.txt +++ b/src/geophires_x/GEOPHIRES3_newunits.txt @@ -0,0 +1,2 @@ +USD = [currency] +cents = USD / 100 diff --git a/src/geophires_x/GeoPHIRESUtils.py b/src/geophires_x/GeoPHIRESUtils.py index 02ff2f2e..8549e9d4 100644 --- a/src/geophires_x/GeoPHIRESUtils.py +++ b/src/geophires_x/GeoPHIRESUtils.py @@ -10,7 +10,6 @@ from functools import lru_cache from typing import Optional -import pint import scipy from pint.facets.plain import PlainQuantity from scipy.interpolate import interp1d @@ -19,6 +18,7 @@ import CoolProp.CoolProp as CP from geophires_x.Parameter import ParameterEntry +from geophires_x.Units import get_pint_registry _logger = logging.getLogger('root') # TODO use __name__ instead of root @@ -91,8 +91,7 @@ _interp_util_eff_func = interp1d(_T, _UtilEff) -_ureg = pint.get_application_registry() -_ureg.load_definitions(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'GEOPHIRES3_newunits.txt')) +_UREG = get_pint_registry() def quantity(value: float, unit: str) -> PlainQuantity: @@ -100,7 +99,7 @@ def quantity(value: float, unit: str) -> PlainQuantity: :rtype: pint.registry.Quantity - note type annotation uses PlainQuantity due to issues with python 3.8 failing to import the Quantity TypeAlias """ - return _ureg.Quantity(value, unit) + return _UREG.Quantity(value, unit) @lru_cache diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index 4177792f..d3f77a5f 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -5,7 +5,7 @@ import numpy as np from matplotlib import pyplot as plt import geophires_x.Model as Model -from geophires_x.Parameter import ConvertUnitsBack, ConvertOutputUnits, LookupUnits +from geophires_x.Parameter import ConvertUnitsBack, ConvertOutputUnits, LookupUnits, OutputParameter from geophires_x.OptionList import EndUseOptions, EconomicModel, ReservoirModel, FractureShape, ReservoirVolume, \ PlantType @@ -95,9 +95,13 @@ def PrintOutputs(self, model: Model): for obj in [model.reserv, model.wellbores, model.surfaceplant, model.economics]: for key in obj.OutputParameterDict: + output_param:OutputParameter = obj.OutputParameterDict[key] if key in self.ParameterDict: - if self.ParameterDict[key] != obj.OutputParameterDict[key].CurrentUnits: - ConvertOutputUnits(obj.OutputParameterDict[key], self.ParameterDict[key], model) + if self.ParameterDict[key].PreferredUnits != output_param.CurrentUnits: + ConvertOutputUnits(output_param, self.ParameterDict[key].PreferredUnits, model) + elif not output_param.UnitsMatch: + obj.OutputParameterDict[key] = output_param.with_preferred_units() + # write results to output file and screen diff --git a/src/geophires_x/Parameter.py b/src/geophires_x/Parameter.py index bac7d694..624a891c 100644 --- a/src/geophires_x/Parameter.py +++ b/src/geophires_x/Parameter.py @@ -1,23 +1,20 @@ # copyright, 2023, Malcolm I Ross import copy -import os.path +import dataclasses + import sys from array import array from typing import List, Optional, Any from dataclasses import dataclass, field from enum import IntEnum from forex_python.converter import CurrencyRates, CurrencyCodes -import pint from abc import ABC from pint.facets.plain import PlainQuantity - from geophires_x.Units import * -ureg = pint.get_application_registry() -ureg.load_definitions(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'GEOPHIRES3_newunits.txt')) - +ureg = get_pint_registry() class HasQuantity(ABC): @@ -67,7 +64,17 @@ class OutputParameter(HasQuantity): # set to PreferredUnits by default assuming that the current units are the preferred units - # they will only change if the read function reads a different unit associated with a parameter CurrentUnits: Enum = PreferredUnits - UnitsMatch: bool = True # FIXME calculate from whether current & preferred match + + @property + def UnitsMatch(self) -> str: + return self.CurrentUnits == self.PreferredUnits + + def with_preferred_units(self) -> Any: # Any is a proxy for Self + ret: OutputParameter = dataclasses.replace(self) + ret.value = ret.quantity().to(ret.PreferredUnits).magnitude + ret.CurrentUnits = ret.PreferredUnits + return ret + @dataclass @@ -997,7 +1004,7 @@ def ConvertOutputUnits(oparam: OutputParameter, newUnit: Units, model): # so just do the simple factor conversion and exit oparam.value = oparam.value * Factor oparam.CurrentUnits = DefUnit - oparam.UnitsMatch = False + # oparam.UnitsMatch = False return # start the currency conversion process diff --git a/src/geophires_x/Units.py b/src/geophires_x/Units.py index fef9c48f..9ffc017b 100644 --- a/src/geophires_x/Units.py +++ b/src/geophires_x/Units.py @@ -1,6 +1,18 @@ # copyright, 2023, Malcolm I Ross from enum import IntEnum, Enum, auto +import pint +import os + + +_UREG = None +def get_pint_registry(): + global _UREG + if _UREG is None: + _UREG = pint.get_application_registry() + _UREG.load_definitions(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'GEOPHIRES3_newunits.txt')) + + return _UREG class Units(IntEnum): """All possible systems of measure""" diff --git a/tests/test_parameter.py b/tests/test_parameter.py index b405a17a..8f3232f1 100644 --- a/tests/test_parameter.py +++ b/tests/test_parameter.py @@ -5,10 +5,12 @@ from base_test_case import BaseTestCase from geophires_x.Model import Model +from geophires_x.Parameter import OutputParameter from geophires_x.Parameter import Parameter from geophires_x.Parameter import floatParameter from geophires_x.Parameter import listParameter from geophires_x.Parameter import parameter_with_units_converted_back_to_preferred_units +from geophires_x.Units import EnergyCostUnit from geophires_x.Units import LengthUnit from geophires_x.Units import PressureUnit from geophires_x.Units import Units @@ -101,6 +103,51 @@ def test_set_default_value_list(self): self.assertEqual([1, 2, 3], with_val.value) + def test_output_parameter_with_preferred_units(self): + op: OutputParameter = OutputParameter( + Name='Electricity Sale Price Model', + value=[ + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + 0.055, + ], + ToolTipText='This is ToolTip Text', + UnitType=Units.ENERGYCOST, + PreferredUnits=EnergyCostUnit.CENTSSPERKWH, + CurrentUnits=EnergyCostUnit.DOLLARSPERKWH, + ) + + result = op.with_preferred_units() + self.assertIsNotNone(result) + self.assertEqual(5.5, result.value[0]) + def _new_model(self) -> Model: stash_cwd = Path.cwd() stash_sys_argv = sys.argv From 4f2ab6ed73aa0ca40c9df0e24aba70e279f2e0f2 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 09:48:50 -0800 Subject: [PATCH 06/14] Access converted output units for revenue & cashflow profile --- src/geophires_x/Outputs.py | 55 ++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index d3f77a5f..f370576d 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -5,6 +5,7 @@ import numpy as np from matplotlib import pyplot as plt import geophires_x.Model as Model +from geophires_x.Economics import Economics from geophires_x.Parameter import ConvertUnitsBack, ConvertOutputUnits, LookupUnits, OutputParameter from geophires_x.OptionList import EndUseOptions, EconomicModel, ReservoirModel, FractureShape, ReservoirVolume, \ PlantType @@ -87,7 +88,7 @@ def PrintOutputs(self, model: Model): param = obj.ParameterDict[key] if not param.UnitsMatch: ConvertUnitsBack(param, model) - # now we need to loop through all thw output parameters to update their units to + # now we need to loop through all the output parameters to update their units to # whatever units the user has specified. # i.e., they may have specified that all LENGTH results must be in feet, so we need to convert those # from whatever LENGTH unit they are to feet. @@ -625,36 +626,43 @@ def PrintOutputs(self, model: Model): "Year Electricity | Heat | Cooling | Carbon | Project" + NL) f.write( "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" + NL) - econ = model.economics + econ:Economics = model.economics + + def o(output_param: OutputParameter): + # TODO generalize this and/or FIXME make it unnecessary + if output_param.Name in econ.OutputParameterDict: + return econ.OutputParameterDict[output_param.Name] + else: + return o - # FIXME incorrect units f.write("Start (" - + econ.ElecPrice.PreferredUnits.value + - ")(" + econ.ElecRevenue.PreferredUnits.value + - ") (" + econ.ElecCummRevenue.PreferredUnits.value + - ") |(" + econ.HeatPrice.PreferredUnits.value + - ") (" + econ.HeatRevenue.PreferredUnits.value + - ") (" + econ.HeatCummRevenue.PreferredUnits.value + - ") |(" + econ.CoolingPrice.PreferredUnits.value + - ") (" + econ.CoolingRevenue.PreferredUnits.value + - ") (" + econ.CoolingCummRevenue.PreferredUnits.value + - ") |(" + econ.CarbonPrice.PreferredUnits.value + - ") (" + econ.CarbonRevenue.PreferredUnits.value + - ") (" + econ.CarbonCummCashFlow.PreferredUnits.value + - ") |(" + econ.Coam.PreferredUnits.value + - ") (" + econ.TotalRevenue.PreferredUnits.value + - ") (" + econ.TotalCummRevenue.PreferredUnits.value + ")\n") + + o(econ.ElecPrice).CurrentUnits.value + + ")(" + o(econ.ElecRevenue).CurrentUnits.value + + ") (" + o(econ.ElecCummRevenue).CurrentUnits.value + + ") |(" + o(econ.HeatPrice).CurrentUnits.value + + ") (" + o(econ.HeatRevenue).CurrentUnits.value + + ") (" + o(econ.HeatCummRevenue).CurrentUnits.value + + ") |(" + o(econ.CoolingPrice).CurrentUnits.value + + ") (" + o(econ.CoolingRevenue).CurrentUnits.value + + ") (" + o(econ.CoolingCummRevenue).CurrentUnits.value + + ") |(" + o(econ.CarbonPrice).CurrentUnits.value + + ") (" + o(econ.CarbonRevenue).CurrentUnits.value + + ") (" + o(econ.CarbonCummCashFlow).CurrentUnits.value + + ") |(" + o(econ.Coam).CurrentUnits.value + + ") (" + o(econ.TotalRevenue).CurrentUnits.value + + ") (" + o(econ.TotalCummRevenue).CurrentUnits.value + ")\n") f.write( "________________________________________________________________________________________________________________________________________________________________________________________" + NL) # running years... for ii in range(0, ( model.surfaceplant.construction_years.value + model.surfaceplant.plant_lifetime.value - 1), 1): + if ii < model.surfaceplant.construction_years.value: OPEX = 0.0 # zero out the OPEX during construction years else: OPEX = econ.Coam.value f.write( - f"{ii + 1:3.0f} {econ.ElecPrice.value[ii]:5.2f} {econ.ElecRevenue.value[ii]:5.2f} {econ.ElecCummRevenue.value[ii]:5.2f} | {econ.HeatPrice.value[ii]:5.2f} {econ.HeatRevenue.value[ii]:5.2f} {econ.HeatCummRevenue.value[ii]:5.2f} | {econ.CoolingPrice.value[ii]:5.2f} {econ.CoolingRevenue.value[ii]:5.2f} {econ.CoolingCummRevenue.value[ii]:5.2f} | {econ.CarbonPrice.value[ii]:5.2f} {econ.CarbonRevenue.value[ii]:5.2f} {econ.CarbonCummCashFlow.value[ii]:5.2f} | {OPEX:5.2f} {econ.TotalRevenue.value[ii]:5.2f} {econ.TotalCummRevenue.value[ii]:5.2f}\n") + f"{ii + 1:3.0f} {o(econ.ElecPrice).value[ii]:5.2f} {o(econ.ElecRevenue).value[ii]:5.2f} {o(econ.ElecCummRevenue).value[ii]:5.2f} | {o(econ.HeatPrice).value[ii]:5.2f} {o(econ.HeatRevenue).value[ii]:5.2f} {o(econ.HeatCummRevenue).value[ii]:5.2f} | {o(econ.CoolingPrice).value[ii]:5.2f} {o(econ.CoolingRevenue).value[ii]:5.2f} {o(econ.CoolingCummRevenue).value[ii]:5.2f} | {o(econ.CarbonPrice).value[ii]:5.2f} {o(econ.CarbonRevenue).value[ii]:5.2f} {econ.CarbonCummCashFlow.value[ii]:5.2f} | {OPEX:5.2f} {econ.TotalRevenue.value[ii]:5.2f} {econ.TotalCummRevenue.value[ii]:5.2f}\n") f.write(NL) if model.economics.DoAddOnCalculations.value: model.addoutputs.PrintOutputs(model) @@ -662,11 +670,12 @@ def PrintOutputs(self, model: Model): except BaseException as ex: tb = sys.exc_info()[2] - print (str(ex)) - print("Error: GEOPHIRES Failed to write the output file. Exiting....Line %i" % tb.tb_lineno) + msg = "Error: GEOPHIRES Failed to write the output file. Exiting....Line %i" % tb.tb_lineno + print(str(ex)) + print(msg) model.logger.critical(str(ex)) - model.logger.critical("Error: GEOPHIRES Failed to write the output file. Exiting....Line %i" % tb.tb_lineno) - sys.exit() + model.logger.critical(msg) + raise RuntimeError(msg) from ex model.logger.info("Complete "+ str(__class__) + ": " + sys._getframe().f_code.co_name) From 3665b5b62e9b13d8a63ce407a0217f7439fb8b81 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 09:54:29 -0800 Subject: [PATCH 07/14] Fix units for LCOH, LCOC. Update example11_AC.out (other unit tests will be broken and will be updated next) --- src/geophires_x/Economics.py | 6 +-- tests/examples/example11_AC.out | 70 ++++++++++++++++----------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/geophires_x/Economics.py b/src/geophires_x/Economics.py index a02261d4..f8466cc2 100644 --- a/src/geophires_x/Economics.py +++ b/src/geophires_x/Economics.py @@ -1300,19 +1300,19 @@ def __init__(self, model: Model): "Electricity Sale Price Model", UnitType=Units.ENERGYCOST, PreferredUnits=EnergyCostUnit.CENTSSPERKWH, - CurrentUnits=EnergyCostUnit.DOLLARSPERKWH, # FIXME WIP + CurrentUnits=EnergyCostUnit.DOLLARSPERKWH, ) self.HeatPrice = self.OutputParameterDict[self.HeatPrice.Name] = OutputParameter( "Heat Sale Price Model", UnitType=Units.ENERGYCOST, PreferredUnits=EnergyCostUnit.CENTSSPERKWH, - CurrentUnits=EnergyCostUnit.CENTSSPERKWH, # FIXME TODO + CurrentUnits=EnergyCostUnit.DOLLARSPERKWH, ) self.CoolingPrice = self.OutputParameterDict[self.CoolingPrice.Name] = OutputParameter( "Heat Sale Price Model", UnitType=Units.ENERGYCOST, PreferredUnits=EnergyCostUnit.CENTSSPERKWH, - CurrentUnits=EnergyCostUnit.CENTSSPERKWH # FIXME TODO + CurrentUnits=EnergyCostUnit.DOLLARSPERKWH, ) self.CarbonPrice = self.OutputParameterDict[self.CarbonPrice.Name] = OutputParameter( "Carbon Price Model", diff --git a/tests/examples/example11_AC.out b/tests/examples/example11_AC.out index d4d60257..4e378fdd 100644 --- a/tests/examples/example11_AC.out +++ b/tests/examples/example11_AC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 08:43 + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:50 Calculation Time: 0.142 sec ***SUMMARY OF RESULTS*** @@ -34,7 +34,7 @@ Simulation Metadata Project IRR: 6.25 % Project VIR=PI=PIR: 1.00 Project MOIC: 0.75 - Project Payback Period: 14.10 yr + Project Payback Period: 14.10 yr ***ENGINEERING PARAMETERS*** @@ -210,33 +210,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.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 -30.71 0.00 | 0.00 0.00 0.00 | 0.00 -30.71 -30.71 - 2 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.35 2.94 | 0.00 0.00 0.00 | 0.59 2.35 -28.36 - 3 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.35 5.89 | 0.00 0.00 0.00 | 0.59 2.35 -26.01 - 4 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.35 8.83 | 0.00 0.00 0.00 | 0.59 2.35 -23.66 - 5 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.35 11.77 | 0.00 0.00 0.00 | 0.59 2.35 -21.31 - 6 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.35 14.72 | 0.00 0.00 0.00 | 0.59 2.35 -18.96 - 7 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.35 17.66 | 0.00 0.00 0.00 | 0.59 2.35 -16.60 - 8 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.35 20.60 | 0.00 0.00 0.00 | 0.59 2.35 -14.26 - 9 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.35 23.54 | 0.00 0.00 0.00 | 0.59 2.35 -11.91 - 10 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.35 26.48 | 0.00 0.00 0.00 | 0.59 2.35 -9.56 - 11 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.34 29.41 | 0.00 0.00 0.00 | 0.59 2.34 -7.22 - 12 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.33 32.34 | 0.00 0.00 0.00 | 0.59 2.33 -4.89 - 13 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.33 35.26 | 0.00 0.00 0.00 | 0.59 2.33 -2.56 - 14 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.32 38.17 | 0.00 0.00 0.00 | 0.59 2.32 -0.24 - 15 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.31 41.07 | 0.00 0.00 0.00 | 0.59 2.31 2.07 - 16 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.29 43.95 | 0.00 0.00 0.00 | 0.59 2.29 4.36 - 17 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.28 46.83 | 0.00 0.00 0.00 | 0.59 2.28 6.64 - 18 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.27 49.69 | 0.00 0.00 0.00 | 0.59 2.27 8.91 - 19 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.25 52.53 | 0.00 0.00 0.00 | 0.59 2.25 11.16 - 20 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.23 55.36 | 0.00 0.00 0.00 | 0.59 2.23 13.39 - 21 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.22 58.17 | 0.00 0.00 0.00 | 0.59 2.22 15.61 - 22 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.20 60.96 | 0.00 0.00 0.00 | 0.59 2.20 17.81 - 23 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.18 63.73 | 0.00 0.00 0.00 | 0.59 2.18 19.99 - 24 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.16 66.48 | 0.00 0.00 0.00 | 0.59 2.16 22.15 - 25 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.14 69.22 | 0.00 0.00 0.00 | 0.59 2.14 24.30 - 26 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.12 71.94 | 0.00 0.00 0.00 | 0.59 2.12 26.42 - 27 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.10 74.63 | 0.00 0.00 0.00 | 0.59 2.10 28.52 - 28 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.08 77.31 | 0.00 0.00 0.00 | 0.59 2.08 30.61 - 29 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.07 79.97 | 0.00 0.00 0.00 | 0.59 2.07 32.67 - 30 0.06 0.00 0.00 | 0.03 0.00 0.00 | 0.07 2.05 82.61 | 0.00 0.00 0.00 | 0.59 2.05 34.72 + 1 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 -30.71 0.00 | 0.00 0.00 0.00 | 0.00 -30.71 -30.71 + 2 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.35 2.94 | 0.00 0.00 0.00 | 0.59 2.35 -28.36 + 3 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.35 5.89 | 0.00 0.00 0.00 | 0.59 2.35 -26.01 + 4 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.35 8.83 | 0.00 0.00 0.00 | 0.59 2.35 -23.66 + 5 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.35 11.77 | 0.00 0.00 0.00 | 0.59 2.35 -21.31 + 6 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.35 14.72 | 0.00 0.00 0.00 | 0.59 2.35 -18.96 + 7 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.35 17.66 | 0.00 0.00 0.00 | 0.59 2.35 -16.60 + 8 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.35 20.60 | 0.00 0.00 0.00 | 0.59 2.35 -14.26 + 9 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.35 23.54 | 0.00 0.00 0.00 | 0.59 2.35 -11.91 + 10 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.35 26.48 | 0.00 0.00 0.00 | 0.59 2.35 -9.56 + 11 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.34 29.41 | 0.00 0.00 0.00 | 0.59 2.34 -7.22 + 12 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.33 32.34 | 0.00 0.00 0.00 | 0.59 2.33 -4.89 + 13 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.33 35.26 | 0.00 0.00 0.00 | 0.59 2.33 -2.56 + 14 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.32 38.17 | 0.00 0.00 0.00 | 0.59 2.32 -0.24 + 15 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.31 41.07 | 0.00 0.00 0.00 | 0.59 2.31 2.07 + 16 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.29 43.95 | 0.00 0.00 0.00 | 0.59 2.29 4.36 + 17 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.28 46.83 | 0.00 0.00 0.00 | 0.59 2.28 6.64 + 18 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.27 49.69 | 0.00 0.00 0.00 | 0.59 2.27 8.91 + 19 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.25 52.53 | 0.00 0.00 0.00 | 0.59 2.25 11.16 + 20 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.23 55.36 | 0.00 0.00 0.00 | 0.59 2.23 13.39 + 21 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.22 58.17 | 0.00 0.00 0.00 | 0.59 2.22 15.61 + 22 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.20 60.96 | 0.00 0.00 0.00 | 0.59 2.20 17.81 + 23 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.18 63.73 | 0.00 0.00 0.00 | 0.59 2.18 19.99 + 24 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.16 66.48 | 0.00 0.00 0.00 | 0.59 2.16 22.15 + 25 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.14 69.22 | 0.00 0.00 0.00 | 0.59 2.14 24.30 + 26 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.12 71.94 | 0.00 0.00 0.00 | 0.59 2.12 26.42 + 27 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.10 74.63 | 0.00 0.00 0.00 | 0.59 2.10 28.52 + 28 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.08 77.31 | 0.00 0.00 0.00 | 0.59 2.08 30.61 + 29 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.07 79.97 | 0.00 0.00 0.00 | 0.59 2.07 32.67 + 30 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.05 82.61 | 0.00 0.00 0.00 | 0.59 2.05 34.72 From 9b105c3d23fdffc7c515c746dbae55cdf099b76b Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:08:14 -0800 Subject: [PATCH 08/14] Update example outputs with revenue & cashflow profiles with corrected units --- tests/example1_addons.csv | 180 +++++++++--------- ...Closed-Loop_Geothermal_Energy_Recovery.out | 90 ++++----- tests/examples/example1.out | 70 +++---- tests/examples/example10_HP.out | 72 +++---- tests/examples/example12_DH.out | 72 +++---- tests/examples/example13.out | 68 +++---- tests/examples/example1_addons.out | 74 +++---- tests/examples/example2.out | 62 +++--- tests/examples/example3.out | 82 ++++---- tests/examples/example4.out | 70 +++---- tests/examples/example5.out | 72 +++---- tests/examples/example8.out | 72 +++---- tests/examples/example9.out | 70 +++---- tests/examples/example_SHR-1.out | 74 +++---- tests/examples/example_SHR-2.out | 74 +++---- tests/examples/example_multiple_gradients.out | 70 +++---- tests/test_geophires_x_client.py | 5 + 17 files changed, 641 insertions(+), 636 deletions(-) diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index 99413d67..0f4225fb 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -635,36 +635,36 @@ EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,27,-19.32,MUSD EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,28,-15.91,MUSD EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,29,-12.5,MUSD EXTENDED ECONOMIC PROFILE,Cumm. Project Cash Flow,30,-9.09,MUSD -REVENUE & CASHFLOW PROFILE,Electricity Price,1,0.09,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,2,0.09,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,3,0.09,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,4,0.09,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,5,0.09,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,6,0.09,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,7,0.1,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,8,0.11,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,9,0.13,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,10,0.14,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,11,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,12,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,13,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,14,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,15,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,16,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,17,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,18,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,19,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,20,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,21,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,22,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,23,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,24,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,25,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,26,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,27,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,28,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,29,0.15,cents/kWh -REVENUE & CASHFLOW PROFILE,Electricity Price,30,0.15,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,1,9.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,2,9.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,3,9.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,4,9.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,5,9.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,6,9.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,7,10.2,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,8,11.4,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,9,12.6,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,10,13.8,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,11,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,12,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,13,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,14,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,15,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,16,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,17,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,18,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,19,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,20,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,21,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,22,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,23,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,24,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,25,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,26,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,27,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,28,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,29,15.0,cents/kWh +REVENUE & CASHFLOW PROFILE,Electricity Price,30,15.0,cents/kWh REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,1,-32.63,MUSD/yr REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,2,1.58,MUSD/yr REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,3,1.62,MUSD/yr @@ -725,36 +725,36 @@ REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,27,32.85,MUSD REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,28,34.32,MUSD REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,29,35.79,MUSD REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,30,37.26,MUSD -REVENUE & CASHFLOW PROFILE,Heat Price,1,0.01,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,2,0.01,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,3,0.01,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,4,0.01,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,5,0.01,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,6,0.01,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,7,0.01,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,8,0.01,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,9,0.02,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,10,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,11,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,12,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,13,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,14,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,15,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,16,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,17,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,18,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,19,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,20,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,21,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,22,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,23,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,24,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,25,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,26,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,27,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,28,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,29,0.04,cents/kWh -REVENUE & CASHFLOW PROFILE,Heat Price,30,0.04,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,1,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,2,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,3,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,4,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,5,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,6,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,7,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,8,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,9,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,10,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,11,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,12,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,13,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,14,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,15,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,16,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,17,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,18,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,19,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,20,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,21,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,22,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,23,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,24,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,25,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,26,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,27,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,28,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,29,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Heat Price,30,2.5,cents/kWh REVENUE & CASHFLOW PROFILE,Heat Ann. Rev.,1,0.0,MUSD/yr REVENUE & CASHFLOW PROFILE,Heat Ann. Rev.,2,0.0,MUSD/yr REVENUE & CASHFLOW PROFILE,Heat Ann. Rev.,3,0.0,MUSD/yr @@ -815,36 +815,36 @@ REVENUE & CASHFLOW PROFILE,Heat Cumm. Rev.,27,0.0,MUSD REVENUE & CASHFLOW PROFILE,Heat Cumm. Rev.,28,0.0,MUSD REVENUE & CASHFLOW PROFILE,Heat Cumm. Rev.,29,0.0,MUSD REVENUE & CASHFLOW PROFILE,Heat Cumm. Rev.,30,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Cooling Price,1,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,2,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,3,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,4,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,5,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,6,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,7,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,8,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,9,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,10,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,11,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,12,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,13,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,14,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,15,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,16,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,17,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,18,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,19,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,20,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,21,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,22,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,23,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,24,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,25,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,26,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,27,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,28,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,29,0.03,cents/kWh -REVENUE & CASHFLOW PROFILE,Cooling Price,30,0.03,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,1,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,2,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,3,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,4,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,5,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,6,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,7,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,8,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,9,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,10,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,11,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,12,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,13,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,14,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,15,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,16,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,17,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,18,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,19,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,20,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,21,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,22,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,23,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,24,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,25,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,26,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,27,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,28,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,29,2.5,cents/kWh +REVENUE & CASHFLOW PROFILE,Cooling Price,30,2.5,cents/kWh REVENUE & CASHFLOW PROFILE,Cooling Ann. Rev.,1,0.0,MUSD/yr REVENUE & CASHFLOW PROFILE,Cooling Ann. Rev.,2,0.0,MUSD/yr REVENUE & CASHFLOW PROFILE,Cooling Ann. Rev.,3,0.0,MUSD/yr diff --git a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out index a27a1c19..a8d8173f 100644 --- a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out +++ b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 10:52 - Calculation Time: 1.689 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:59 + Calculation Time: 1.652 sec ***SUMMARY OF RESULTS*** @@ -211,43 +211,43 @@ 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.06 -44.08 0.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -44.08 -44.08 - 2 0.06 0.09 0.66 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 0.09 -43.98 - 3 0.06 -0.05 1.19 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.05 -44.03 - 4 0.06 -0.03 1.73 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.03 -44.06 - 5 0.06 -0.06 2.24 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.06 -44.12 - 6 0.06 -0.05 2.75 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.05 -44.18 - 7 0.06 -0.07 3.25 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.07 -44.25 - 8 0.06 -0.07 3.75 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.07 -44.32 - 9 0.06 -0.08 4.24 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.08 -44.40 - 10 0.06 -0.08 4.73 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.08 -44.48 - 11 0.06 -0.09 5.21 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.09 -44.57 - 12 0.06 -0.09 5.70 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.09 -44.65 - 13 0.06 -0.09 6.18 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.09 -44.75 - 14 0.06 -0.09 6.66 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.09 -44.84 - 15 0.06 -0.10 7.13 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -44.94 - 16 0.06 -0.10 7.60 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -45.03 - 17 0.06 -0.10 8.07 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -45.13 - 18 0.06 -0.10 8.54 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -45.23 - 19 0.06 -0.10 9.01 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -45.34 - 20 0.06 -0.10 9.48 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -45.44 - 21 0.06 -0.11 9.94 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -45.55 - 22 0.06 -0.11 10.40 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -45.65 - 23 0.06 -0.11 10.87 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -45.76 - 24 0.06 -0.11 11.33 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -45.87 - 25 0.06 -0.11 11.79 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -45.98 - 26 0.06 -0.11 12.24 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -46.10 - 27 0.06 -0.11 12.70 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -46.21 - 28 0.06 -0.12 13.16 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -46.33 - 29 0.06 -0.11 13.61 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -46.44 - 30 0.06 -0.12 14.06 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -46.56 - 31 0.06 -0.11 14.52 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -46.67 - 32 0.06 -0.12 14.97 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -46.80 - 33 0.06 -0.12 15.42 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -46.91 - 34 0.06 -0.12 15.87 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -47.04 - 35 0.06 -0.12 16.32 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -47.15 - 36 0.06 -0.13 16.77 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.13 -47.28 - 37 0.06 -0.11 17.22 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -47.39 - 38 0.06 -0.13 17.66 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.13 -47.53 - 39 0.06 -0.11 18.12 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -47.64 - 40 0.06 -0.15 18.54 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.15 -47.79 + 1 5.50 -44.08 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -44.08 -44.08 + 2 5.50 0.09 0.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 0.09 -43.98 + 3 5.50 -0.05 1.19 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.05 -44.03 + 4 5.50 -0.03 1.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.03 -44.06 + 5 5.50 -0.06 2.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.06 -44.12 + 6 5.50 -0.05 2.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.05 -44.18 + 7 5.50 -0.07 3.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.07 -44.25 + 8 5.50 -0.07 3.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.07 -44.32 + 9 5.50 -0.08 4.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.08 -44.40 + 10 5.50 -0.08 4.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.08 -44.48 + 11 5.50 -0.09 5.21 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.09 -44.57 + 12 5.50 -0.09 5.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.09 -44.65 + 13 5.50 -0.09 6.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.09 -44.75 + 14 5.50 -0.09 6.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.09 -44.84 + 15 5.50 -0.10 7.13 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -44.94 + 16 5.50 -0.10 7.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -45.03 + 17 5.50 -0.10 8.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -45.13 + 18 5.50 -0.10 8.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -45.23 + 19 5.50 -0.10 9.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -45.34 + 20 5.50 -0.10 9.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.10 -45.44 + 21 5.50 -0.11 9.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -45.55 + 22 5.50 -0.11 10.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -45.65 + 23 5.50 -0.11 10.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -45.76 + 24 5.50 -0.11 11.33 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -45.87 + 25 5.50 -0.11 11.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -45.98 + 26 5.50 -0.11 12.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -46.10 + 27 5.50 -0.11 12.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -46.21 + 28 5.50 -0.12 13.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -46.33 + 29 5.50 -0.11 13.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -46.44 + 30 5.50 -0.12 14.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -46.56 + 31 5.50 -0.11 14.52 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -46.67 + 32 5.50 -0.12 14.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -46.80 + 33 5.50 -0.12 15.42 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -46.91 + 34 5.50 -0.12 15.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -47.04 + 35 5.50 -0.12 16.32 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.12 -47.15 + 36 5.50 -0.13 16.77 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.13 -47.28 + 37 5.50 -0.11 17.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -47.39 + 38 5.50 -0.13 17.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.13 -47.53 + 39 5.50 -0.11 18.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.11 -47.64 + 40 5.50 -0.15 18.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.57 -0.15 -47.79 diff --git a/tests/examples/example1.out b/tests/examples/example1.out index faa07b07..2de3b0c8 100644 --- a/tests/examples/example1.out +++ b/tests/examples/example1.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 10:53 - Calculation Time: 0.628 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:58 + Calculation Time: 0.618 sec ***SUMMARY OF RESULTS*** @@ -210,33 +210,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.06 -54.96 0.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -54.96 -54.96 - 2 0.06 -0.94 0.47 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.94 -55.89 - 3 0.06 -0.91 0.97 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.91 -56.80 - 4 0.06 -0.90 1.48 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.90 -57.71 - 5 0.06 -0.90 2.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.90 -58.60 - 6 0.06 -0.89 2.51 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.89 -59.50 - 7 0.06 -0.89 3.03 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.89 -60.39 - 8 0.06 -0.89 3.55 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.89 -61.28 - 9 0.06 -0.89 4.08 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.89 -62.17 - 10 0.06 -0.89 4.60 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.89 -63.05 - 11 0.06 -0.88 5.13 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -63.94 - 12 0.06 -0.88 5.65 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -64.82 - 13 0.06 -0.88 6.18 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -65.70 - 14 0.06 -0.88 6.71 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -66.59 - 15 0.06 -0.88 7.24 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -67.47 - 16 0.06 -0.88 7.77 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -68.35 - 17 0.06 -0.88 8.30 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -69.23 - 18 0.06 -0.88 8.83 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -70.11 - 19 0.06 -0.88 9.37 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -70.98 - 20 0.06 -0.88 9.90 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -71.86 - 21 0.06 -0.88 10.43 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -72.74 - 22 0.06 -0.88 10.97 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -73.62 - 23 0.06 -0.88 11.50 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -74.49 - 24 0.06 -0.88 12.04 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -75.37 - 25 0.06 -0.88 12.57 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -76.24 - 26 0.06 -0.87 13.11 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.87 -77.12 - 27 0.06 -0.87 13.65 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.87 -77.99 - 28 0.06 -0.87 14.18 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.87 -78.86 - 29 0.06 -0.87 14.72 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.87 -79.74 - 30 0.06 -0.87 15.26 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.87 -80.61 + 1 5.50 -54.96 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -54.96 -54.96 + 2 5.50 -0.94 0.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.94 -55.89 + 3 5.50 -0.91 0.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.91 -56.80 + 4 5.50 -0.90 1.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.90 -57.71 + 5 5.50 -0.90 2.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.90 -58.60 + 6 5.50 -0.89 2.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.89 -59.50 + 7 5.50 -0.89 3.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.89 -60.39 + 8 5.50 -0.89 3.55 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.89 -61.28 + 9 5.50 -0.89 4.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.89 -62.17 + 10 5.50 -0.89 4.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.89 -63.05 + 11 5.50 -0.88 5.13 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -63.94 + 12 5.50 -0.88 5.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -64.82 + 13 5.50 -0.88 6.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -65.70 + 14 5.50 -0.88 6.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -66.59 + 15 5.50 -0.88 7.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -67.47 + 16 5.50 -0.88 7.77 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -68.35 + 17 5.50 -0.88 8.30 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -69.23 + 18 5.50 -0.88 8.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -70.11 + 19 5.50 -0.88 9.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -70.98 + 20 5.50 -0.88 9.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -71.86 + 21 5.50 -0.88 10.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -72.74 + 22 5.50 -0.88 10.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -73.62 + 23 5.50 -0.88 11.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -74.49 + 24 5.50 -0.88 12.04 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -75.37 + 25 5.50 -0.88 12.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.88 -76.24 + 26 5.50 -0.87 13.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.87 -77.12 + 27 5.50 -0.87 13.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.87 -77.99 + 28 5.50 -0.87 14.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.87 -78.86 + 29 5.50 -0.87 14.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.87 -79.74 + 30 5.50 -0.87 15.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.41 -0.87 -80.61 diff --git a/tests/examples/example10_HP.out b/tests/examples/example10_HP.out index f259ab70..f292c2b7 100644 --- a/tests/examples/example10_HP.out +++ b/tests/examples/example10_HP.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 08:43 - Calculation Time: 0.147 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:59 + Calculation Time: 0.142 sec ***SUMMARY OF RESULTS*** @@ -33,7 +33,7 @@ Simulation Metadata Project IRR: 7.45 % Project VIR=PI=PIR: 1.13 Project MOIC: 0.92 - Project Payback Period: 12.64 yr + Project Payback Period: 12.64 yr ***ENGINEERING PARAMETERS*** @@ -205,33 +205,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.06 0.00 0.00 | 0.03 -32.21 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -32.21 -32.21 - 2 0.06 0.00 0.00 | 0.03 2.77 3.40 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -29.44 - 3 0.06 0.00 0.00 | 0.03 2.77 6.80 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -26.67 - 4 0.06 0.00 0.00 | 0.03 2.77 10.19 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -23.89 - 5 0.06 0.00 0.00 | 0.03 2.77 13.59 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -21.12 - 6 0.06 0.00 0.00 | 0.03 2.77 16.99 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -18.35 - 7 0.06 0.00 0.00 | 0.03 2.77 20.39 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -15.58 - 8 0.06 0.00 0.00 | 0.03 2.77 23.78 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -12.80 - 9 0.06 0.00 0.00 | 0.03 2.77 27.18 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -10.03 - 10 0.06 0.00 0.00 | 0.03 2.77 30.57 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -7.27 - 11 0.06 0.00 0.00 | 0.03 2.76 33.95 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.76 -4.51 - 12 0.06 0.00 0.00 | 0.03 2.75 37.33 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.75 -1.75 - 13 0.06 0.00 0.00 | 0.03 2.75 40.70 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.75 0.99 - 14 0.06 0.00 0.00 | 0.03 2.73 44.06 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.73 3.73 - 15 0.06 0.00 0.00 | 0.03 2.72 47.41 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.72 6.45 - 16 0.06 0.00 0.00 | 0.03 2.71 50.74 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.71 9.16 - 17 0.06 0.00 0.00 | 0.03 2.69 54.06 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.69 11.85 - 18 0.06 0.00 0.00 | 0.03 2.68 57.36 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.68 14.52 - 19 0.06 0.00 0.00 | 0.03 2.66 60.64 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.66 17.18 - 20 0.06 0.00 0.00 | 0.03 2.64 63.91 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.64 19.82 - 21 0.06 0.00 0.00 | 0.03 2.62 67.15 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.62 22.44 - 22 0.06 0.00 0.00 | 0.03 2.60 70.37 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.60 25.03 - 23 0.06 0.00 0.00 | 0.03 2.58 73.57 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.58 27.61 - 24 0.06 0.00 0.00 | 0.03 2.56 76.75 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.56 30.17 - 25 0.06 0.00 0.00 | 0.03 2.53 79.91 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.53 32.70 - 26 0.06 0.00 0.00 | 0.03 2.51 83.05 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.51 35.21 - 27 0.06 0.00 0.00 | 0.03 2.49 86.16 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.49 37.70 - 28 0.06 0.00 0.00 | 0.03 2.47 89.25 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.47 40.16 - 29 0.06 0.00 0.00 | 0.03 2.44 92.32 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.44 42.61 - 30 0.06 0.00 0.00 | 0.03 2.42 95.37 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.42 45.03 + 1 5.50 0.00 0.00 | 2.50 -32.21 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -32.21 -32.21 + 2 5.50 0.00 0.00 | 2.50 2.77 3.40 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -29.44 + 3 5.50 0.00 0.00 | 2.50 2.77 6.80 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -26.67 + 4 5.50 0.00 0.00 | 2.50 2.77 10.19 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -23.89 + 5 5.50 0.00 0.00 | 2.50 2.77 13.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -21.12 + 6 5.50 0.00 0.00 | 2.50 2.77 16.99 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -18.35 + 7 5.50 0.00 0.00 | 2.50 2.77 20.39 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -15.58 + 8 5.50 0.00 0.00 | 2.50 2.77 23.78 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -12.80 + 9 5.50 0.00 0.00 | 2.50 2.77 27.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -10.03 + 10 5.50 0.00 0.00 | 2.50 2.77 30.57 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.77 -7.27 + 11 5.50 0.00 0.00 | 2.50 2.76 33.95 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.76 -4.51 + 12 5.50 0.00 0.00 | 2.50 2.75 37.33 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.75 -1.75 + 13 5.50 0.00 0.00 | 2.50 2.75 40.70 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.75 0.99 + 14 5.50 0.00 0.00 | 2.50 2.73 44.06 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.73 3.73 + 15 5.50 0.00 0.00 | 2.50 2.72 47.41 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.72 6.45 + 16 5.50 0.00 0.00 | 2.50 2.71 50.74 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.71 9.16 + 17 5.50 0.00 0.00 | 2.50 2.69 54.06 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.69 11.85 + 18 5.50 0.00 0.00 | 2.50 2.68 57.36 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.68 14.52 + 19 5.50 0.00 0.00 | 2.50 2.66 60.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.66 17.18 + 20 5.50 0.00 0.00 | 2.50 2.64 63.91 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.64 19.82 + 21 5.50 0.00 0.00 | 2.50 2.62 67.15 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.62 22.44 + 22 5.50 0.00 0.00 | 2.50 2.60 70.37 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.60 25.03 + 23 5.50 0.00 0.00 | 2.50 2.58 73.57 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.58 27.61 + 24 5.50 0.00 0.00 | 2.50 2.56 76.75 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.56 30.17 + 25 5.50 0.00 0.00 | 2.50 2.53 79.91 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.53 32.70 + 26 5.50 0.00 0.00 | 2.50 2.51 83.05 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.51 35.21 + 27 5.50 0.00 0.00 | 2.50 2.49 86.16 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.49 37.70 + 28 5.50 0.00 0.00 | 2.50 2.47 89.25 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.47 40.16 + 29 5.50 0.00 0.00 | 2.50 2.44 92.32 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.44 42.61 + 30 5.50 0.00 0.00 | 2.50 2.42 95.37 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.63 2.42 45.03 diff --git a/tests/examples/example12_DH.out b/tests/examples/example12_DH.out index 55224e7a..f0bd3b39 100644 --- a/tests/examples/example12_DH.out +++ b/tests/examples/example12_DH.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 08:43 - Calculation Time: 0.127 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:59 + Calculation Time: 0.126 sec ***SUMMARY OF RESULTS*** @@ -36,7 +36,7 @@ Simulation Metadata Project IRR: 1.73 % Project VIR=PI=PIR: 0.59 Project MOIC: 0.14 - Project Payback Period: 23.71 yr + Project Payback Period: 23.71 yr ***ENGINEERING PARAMETERS*** @@ -219,33 +219,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.06 0.00 0.00 | 0.03 -47.09 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -47.09 -47.09 - 2 0.06 0.00 0.00 | 0.03 2.16 3.73 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.16 -44.93 - 3 0.06 0.00 0.00 | 0.03 2.15 7.46 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.15 -42.78 - 4 0.06 0.00 0.00 | 0.03 2.14 11.18 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.14 -40.64 - 5 0.06 0.00 0.00 | 0.03 2.14 14.89 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.14 -38.50 - 6 0.06 0.00 0.00 | 0.03 2.13 18.59 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.13 -36.37 - 7 0.06 0.00 0.00 | 0.03 2.12 22.28 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.12 -34.25 - 8 0.06 0.00 0.00 | 0.03 2.11 25.97 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.11 -32.14 - 9 0.06 0.00 0.00 | 0.03 2.10 29.64 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.10 -30.03 - 10 0.06 0.00 0.00 | 0.03 2.10 33.31 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.10 -27.94 - 11 0.06 0.00 0.00 | 0.03 2.09 36.98 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.09 -25.85 - 12 0.06 0.00 0.00 | 0.03 2.08 40.63 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.08 -23.77 - 13 0.06 0.00 0.00 | 0.03 2.07 44.28 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.07 -21.70 - 14 0.06 0.00 0.00 | 0.03 2.06 47.91 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.06 -19.63 - 15 0.06 0.00 0.00 | 0.03 2.06 51.54 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.06 -17.58 - 16 0.06 0.00 0.00 | 0.03 2.05 55.16 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.05 -15.53 - 17 0.06 0.00 0.00 | 0.03 2.04 58.78 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.04 -13.49 - 18 0.06 0.00 0.00 | 0.03 2.03 62.38 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.03 -11.45 - 19 0.06 0.00 0.00 | 0.03 2.02 65.98 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.02 -9.43 - 20 0.06 0.00 0.00 | 0.03 2.02 69.57 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.02 -7.41 - 21 0.06 0.00 0.00 | 0.03 2.01 73.15 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.01 -5.41 - 22 0.06 0.00 0.00 | 0.03 2.00 76.73 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.00 -3.40 - 23 0.06 0.00 0.00 | 0.03 1.99 80.29 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.99 -1.41 - 24 0.06 0.00 0.00 | 0.03 1.98 83.85 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.98 0.57 - 25 0.06 0.00 0.00 | 0.03 1.98 87.40 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.98 2.55 - 26 0.06 0.00 0.00 | 0.03 1.97 90.94 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.97 4.52 - 27 0.06 0.00 0.00 | 0.03 1.96 94.47 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.96 6.47 - 28 0.06 0.00 0.00 | 0.03 1.95 98.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.95 8.43 - 29 0.06 0.00 0.00 | 0.03 1.94 101.51 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.94 10.37 - 30 0.06 0.00 0.00 | 0.03 1.94 105.02 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.94 12.30 + 1 5.50 0.00 0.00 | 2.50 -47.09 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -47.09 -47.09 + 2 5.50 0.00 0.00 | 2.50 2.16 3.73 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.16 -44.93 + 3 5.50 0.00 0.00 | 2.50 2.15 7.46 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.15 -42.78 + 4 5.50 0.00 0.00 | 2.50 2.14 11.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.14 -40.64 + 5 5.50 0.00 0.00 | 2.50 2.14 14.89 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.14 -38.50 + 6 5.50 0.00 0.00 | 2.50 2.13 18.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.13 -36.37 + 7 5.50 0.00 0.00 | 2.50 2.12 22.28 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.12 -34.25 + 8 5.50 0.00 0.00 | 2.50 2.11 25.97 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.11 -32.14 + 9 5.50 0.00 0.00 | 2.50 2.10 29.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.10 -30.03 + 10 5.50 0.00 0.00 | 2.50 2.10 33.31 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.10 -27.94 + 11 5.50 0.00 0.00 | 2.50 2.09 36.98 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.09 -25.85 + 12 5.50 0.00 0.00 | 2.50 2.08 40.63 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.08 -23.77 + 13 5.50 0.00 0.00 | 2.50 2.07 44.28 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.07 -21.70 + 14 5.50 0.00 0.00 | 2.50 2.06 47.91 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.06 -19.63 + 15 5.50 0.00 0.00 | 2.50 2.06 51.54 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.06 -17.58 + 16 5.50 0.00 0.00 | 2.50 2.05 55.16 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.05 -15.53 + 17 5.50 0.00 0.00 | 2.50 2.04 58.78 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.04 -13.49 + 18 5.50 0.00 0.00 | 2.50 2.03 62.38 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.03 -11.45 + 19 5.50 0.00 0.00 | 2.50 2.02 65.98 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.02 -9.43 + 20 5.50 0.00 0.00 | 2.50 2.02 69.57 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.02 -7.41 + 21 5.50 0.00 0.00 | 2.50 2.01 73.15 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.01 -5.41 + 22 5.50 0.00 0.00 | 2.50 2.00 76.73 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 2.00 -3.40 + 23 5.50 0.00 0.00 | 2.50 1.99 80.29 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.99 -1.41 + 24 5.50 0.00 0.00 | 2.50 1.98 83.85 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.98 0.57 + 25 5.50 0.00 0.00 | 2.50 1.98 87.40 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.98 2.55 + 26 5.50 0.00 0.00 | 2.50 1.97 90.94 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.97 4.52 + 27 5.50 0.00 0.00 | 2.50 1.96 94.47 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.96 6.47 + 28 5.50 0.00 0.00 | 2.50 1.95 98.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.95 8.43 + 29 5.50 0.00 0.00 | 2.50 1.94 101.51 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.94 10.37 + 30 5.50 0.00 0.00 | 2.50 1.94 105.02 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.57 1.94 12.30 diff --git a/tests/examples/example13.out b/tests/examples/example13.out index 84e86af9..e08276fd 100644 --- a/tests/examples/example13.out +++ b/tests/examples/example13.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 10:53 + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:58 Calculation Time: 0.044 sec ***SUMMARY OF RESULTS*** @@ -217,33 +217,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.06 0.00 0.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -58.11 -58.11 - 2 0.06 -0.72 -0.72 | 0.03 3.30 3.30 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.56 -58.66 - 3 0.06 -0.72 -1.45 | 0.03 3.21 6.50 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.65 -59.32 - 4 0.06 -0.72 -2.17 | 0.03 3.11 9.62 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.74 -60.06 - 5 0.06 -0.72 -2.90 | 0.03 3.02 12.64 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.84 -60.90 - 6 0.06 -0.72 -3.62 | 0.03 2.93 15.56 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.93 -61.83 - 7 0.06 -0.72 -4.34 | 0.03 2.83 18.40 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.02 -62.85 - 8 0.06 -0.72 -5.07 | 0.03 2.74 21.14 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.11 -63.96 - 9 0.06 -0.72 -5.79 | 0.03 2.65 23.79 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.21 -65.17 - 10 0.06 -0.72 -6.51 | 0.03 2.56 26.35 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.30 -66.47 - 11 0.06 -0.72 -7.23 | 0.03 2.46 28.81 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.39 -67.86 - 12 0.06 -0.72 -7.95 | 0.03 2.37 31.18 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.48 -69.34 - 13 0.06 -0.72 -8.67 | 0.03 2.28 33.45 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.58 -70.92 - 14 0.06 -0.72 -9.39 | 0.03 2.18 35.64 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.67 -72.59 - 15 0.06 -0.72 -10.12 | 0.03 2.09 37.73 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.76 -74.35 - 16 0.06 -0.72 -10.83 | 0.03 2.00 39.73 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.85 -76.20 - 17 0.06 -0.72 -11.56 | 0.03 3.09 42.82 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.76 -76.97 - 18 0.06 -0.72 -12.28 | 0.03 3.24 46.06 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.62 -77.59 - 19 0.06 -0.72 -13.01 | 0.03 3.14 49.20 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.71 -78.30 - 20 0.06 -0.72 -13.73 | 0.03 3.05 52.25 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.81 -79.11 - 21 0.06 -0.72 -14.46 | 0.03 2.96 55.21 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.90 -80.01 - 22 0.06 -0.72 -15.18 | 0.03 2.87 58.08 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.99 -81.00 - 23 0.06 -0.72 -15.90 | 0.03 2.77 60.85 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.08 -82.08 - 24 0.06 -0.72 -16.62 | 0.03 2.68 63.53 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.18 -83.26 - 25 0.06 -0.72 -17.35 | 0.03 2.59 66.11 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.27 -84.52 - 26 0.06 -0.72 -18.07 | 0.03 2.49 68.61 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.36 -85.88 - 27 0.06 -0.72 -18.79 | 0.03 2.40 71.01 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.45 -87.34 - 28 0.06 -0.72 -19.51 | 0.03 2.31 73.32 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.55 -88.88 - 29 0.06 -0.72 -20.23 | 0.03 2.22 75.53 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.64 -90.52 - 30 0.06 -0.72 -20.95 | 0.03 2.12 77.65 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.73 -92.25 + 1 5.50 0.00 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -58.11 -58.11 + 2 5.50 -0.72 -0.72 | 2.50 3.30 3.30 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.56 -58.66 + 3 5.50 -0.72 -1.45 | 2.50 3.21 6.50 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.65 -59.32 + 4 5.50 -0.72 -2.17 | 2.50 3.11 9.62 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.74 -60.06 + 5 5.50 -0.72 -2.90 | 2.50 3.02 12.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.84 -60.90 + 6 5.50 -0.72 -3.62 | 2.50 2.93 15.56 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.93 -61.83 + 7 5.50 -0.72 -4.34 | 2.50 2.83 18.40 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.02 -62.85 + 8 5.50 -0.72 -5.07 | 2.50 2.74 21.14 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.11 -63.96 + 9 5.50 -0.72 -5.79 | 2.50 2.65 23.79 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.21 -65.17 + 10 5.50 -0.72 -6.51 | 2.50 2.56 26.35 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.30 -66.47 + 11 5.50 -0.72 -7.23 | 2.50 2.46 28.81 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.39 -67.86 + 12 5.50 -0.72 -7.95 | 2.50 2.37 31.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.48 -69.34 + 13 5.50 -0.72 -8.67 | 2.50 2.28 33.45 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.58 -70.92 + 14 5.50 -0.72 -9.39 | 2.50 2.18 35.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.67 -72.59 + 15 5.50 -0.72 -10.12 | 2.50 2.09 37.73 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.76 -74.35 + 16 5.50 -0.72 -10.83 | 2.50 2.00 39.73 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.85 -76.20 + 17 5.50 -0.72 -11.56 | 2.50 3.09 42.82 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.76 -76.97 + 18 5.50 -0.72 -12.28 | 2.50 3.24 46.06 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.62 -77.59 + 19 5.50 -0.72 -13.01 | 2.50 3.14 49.20 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.71 -78.30 + 20 5.50 -0.72 -13.73 | 2.50 3.05 52.25 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.81 -79.11 + 21 5.50 -0.72 -14.46 | 2.50 2.96 55.21 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.90 -80.01 + 22 5.50 -0.72 -15.18 | 2.50 2.87 58.08 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -0.99 -81.00 + 23 5.50 -0.72 -15.90 | 2.50 2.77 60.85 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.08 -82.08 + 24 5.50 -0.72 -16.62 | 2.50 2.68 63.53 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.18 -83.26 + 25 5.50 -0.72 -17.35 | 2.50 2.59 66.11 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.27 -84.52 + 26 5.50 -0.72 -18.07 | 2.50 2.49 68.61 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.36 -85.88 + 27 5.50 -0.72 -18.79 | 2.50 2.40 71.01 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.45 -87.34 + 28 5.50 -0.72 -19.51 | 2.50 2.31 73.32 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.55 -88.88 + 29 5.50 -0.72 -20.23 | 2.50 2.22 75.53 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.64 -90.52 + 30 5.50 -0.72 -20.95 | 2.50 2.12 77.65 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.13 -1.73 -92.25 diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index e0002741..fb1e2c62 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -4,17 +4,17 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 07:46 - Calculation Time: 0.611 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:58 + Calculation Time: 0.613 sec ***SUMMARY OF RESULTS*** End-Use Option: Electricity Average Net Electricity Production: 1.21 MW - Electricity breakeven price: 8.70 cents/kWh + Electricity breakeven price: 8.70 cents/kWh Number of production wells: 2 Number of injection wells: 2 Flowrate per production well: 55.0 kg/sec @@ -33,7 +33,7 @@ Simulation Metadata Project IRR: 4.49 % Project VIR=PI=PIR: 0.81 Project MOIC: 3.48 - Project Payback Period: 17.70 yr + Project Payback Period: 17.70 yr ***ENGINEERING PARAMETERS*** @@ -210,36 +210,36 @@ 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.09 -32.63 0.00 | 0.01 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -32.63 -32.63 - 2 0.09 1.58 0.78 | 0.01 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.58 -31.05 - 3 0.09 1.62 1.60 | 0.01 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.62 -29.43 - 4 0.09 1.63 2.43 | 0.01 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.63 -27.80 - 5 0.09 1.64 3.27 | 0.01 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.64 -26.15 - 6 0.09 1.65 4.12 | 0.01 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.65 -24.50 - 7 0.10 1.65 4.97 | 0.01 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.65 -22.85 - 8 0.11 1.77 5.94 | 0.01 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.77 -21.08 - 9 0.13 1.89 7.03 | 0.02 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.89 -19.19 - 10 0.14 2.01 8.24 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.01 -17.19 - 11 0.15 2.12 9.56 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.12 -15.06 - 12 0.15 2.24 11.00 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.24 -12.82 - 13 0.15 2.25 12.44 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -10.57 - 14 0.15 2.25 13.89 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -8.33 - 15 0.15 2.25 15.34 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -6.08 - 16 0.15 2.25 16.79 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -3.82 - 17 0.15 2.25 18.24 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -1.57 - 18 0.15 2.26 19.70 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 0.69 - 19 0.15 2.26 21.15 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 2.94 - 20 0.15 2.26 22.61 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 5.20 - 21 0.15 2.26 24.07 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 7.46 - 22 0.15 2.26 25.53 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 9.73 - 23 0.15 2.26 26.99 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 11.99 - 24 0.15 2.26 28.46 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 14.25 - 25 0.15 2.27 29.92 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 16.52 - 26 0.15 2.27 31.39 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 18.79 - 27 0.15 2.27 32.85 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 21.06 - 28 0.15 2.27 34.32 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 23.32 - 29 0.15 2.27 35.79 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 25.59 - 30 0.15 2.27 37.26 | 0.04 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 27.87 + 1 9.00 -32.63 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -32.63 -32.63 + 2 9.00 1.58 0.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.58 -31.05 + 3 9.00 1.62 1.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.62 -29.43 + 4 9.00 1.63 2.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.63 -27.80 + 5 9.00 1.64 3.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.64 -26.15 + 6 9.00 1.65 4.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.65 -24.50 + 7 10.20 1.65 4.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.65 -22.85 + 8 11.40 1.77 5.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.77 -21.08 + 9 12.60 1.89 7.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.89 -19.19 + 10 13.80 2.01 8.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.01 -17.19 + 11 15.00 2.12 9.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.12 -15.06 + 12 15.00 2.24 11.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.24 -12.82 + 13 15.00 2.25 12.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -10.57 + 14 15.00 2.25 13.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -8.33 + 15 15.00 2.25 15.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -6.08 + 16 15.00 2.25 16.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -3.82 + 17 15.00 2.25 18.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -1.57 + 18 15.00 2.26 19.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 0.69 + 19 15.00 2.26 21.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 2.94 + 20 15.00 2.26 22.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 5.20 + 21 15.00 2.26 24.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 7.46 + 22 15.00 2.26 25.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 9.73 + 23 15.00 2.26 26.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 11.99 + 24 15.00 2.26 28.46 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 14.25 + 25 15.00 2.27 29.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 16.52 + 26 15.00 2.27 31.39 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 18.79 + 27 15.00 2.27 32.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 21.06 + 28 15.00 2.27 34.32 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 23.32 + 29 15.00 2.27 35.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 25.59 + 30 15.00 2.27 37.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 27.87 diff --git a/tests/examples/example2.out b/tests/examples/example2.out index 46afd461..0fb35536 100644 --- a/tests/examples/example2.out +++ b/tests/examples/example2.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 08:43 - Calculation Time: 0.216 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:58 + Calculation Time: 0.213 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*** @@ -195,28 +195,28 @@ 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.06 0.00 0.00 | 0.03 -40.91 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -40.91 -40.91 - 2 0.06 0.00 0.00 | 0.03 3.26 4.34 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.26 -37.65 - 3 0.06 0.00 0.00 | 0.03 3.31 8.72 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.31 -34.34 - 4 0.06 0.00 0.00 | 0.03 3.33 13.13 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.33 -31.01 - 5 0.06 0.00 0.00 | 0.03 3.34 17.55 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.34 -27.66 - 6 0.06 0.00 0.00 | 0.03 3.35 21.97 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.35 -24.31 - 7 0.06 0.00 0.00 | 0.03 3.36 26.41 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.36 -20.95 - 8 0.06 0.00 0.00 | 0.03 3.36 30.84 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.36 -17.59 - 9 0.06 0.00 0.00 | 0.03 3.37 35.29 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.37 -14.23 - 10 0.06 0.00 0.00 | 0.03 3.24 39.61 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.24 -10.98 - 11 0.06 0.00 0.00 | 0.03 3.19 43.87 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.19 -7.79 - 12 0.06 0.00 0.00 | 0.03 3.16 48.11 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.16 -4.63 - 13 0.06 0.00 0.00 | 0.03 3.13 52.32 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.13 -1.50 - 14 0.06 0.00 0.00 | 0.03 3.10 56.49 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.10 1.60 - 15 0.06 0.00 0.00 | 0.03 3.06 60.63 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.06 4.66 - 16 0.06 0.00 0.00 | 0.03 3.02 64.73 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.02 7.69 - 17 0.06 0.00 0.00 | 0.03 2.99 68.79 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.99 10.67 - 18 0.06 0.00 0.00 | 0.03 2.95 72.81 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.95 13.62 - 19 0.06 0.00 0.00 | 0.03 2.91 76.80 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.91 16.53 - 20 0.06 0.00 0.00 | 0.03 2.87 80.74 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.87 19.40 - 21 0.06 0.00 0.00 | 0.03 2.83 84.64 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.83 22.22 - 22 0.06 0.00 0.00 | 0.03 2.78 88.50 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.78 25.01 - 23 0.06 0.00 0.00 | 0.03 2.74 92.32 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.74 27.75 - 24 0.06 0.00 0.00 | 0.03 2.70 96.09 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.70 30.44 - 25 0.06 0.00 0.00 | 0.03 2.65 99.82 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.65 33.10 + 1 5.50 0.00 0.00 | 2.50 -40.91 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -40.91 -40.91 + 2 5.50 0.00 0.00 | 2.50 3.26 4.34 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.26 -37.65 + 3 5.50 0.00 0.00 | 2.50 3.31 8.72 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.31 -34.34 + 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 + 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 + 11 5.50 0.00 0.00 | 2.50 3.19 43.87 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.19 -7.79 + 12 5.50 0.00 0.00 | 2.50 3.16 48.11 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 3.16 -4.63 + 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 + 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 + 20 5.50 0.00 0.00 | 2.50 2.87 80.74 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.87 19.40 + 21 5.50 0.00 0.00 | 2.50 2.83 84.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.08 2.83 22.22 + 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 diff --git a/tests/examples/example3.out b/tests/examples/example3.out index 21914785..826b34d2 100644 --- a/tests/examples/example3.out +++ b/tests/examples/example3.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 08:43 - Calculation Time: 0.165 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:58 + Calculation Time: 0.167 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*** @@ -223,38 +223,38 @@ 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.06 0.00 0.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -111.58 -111.58 - 2 0.06 9.09 9.09 | 0.03 2.23 2.23 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -103.49 - 3 0.06 9.09 18.18 | 0.03 2.23 4.47 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -95.40 - 4 0.06 9.09 27.27 | 0.03 2.23 6.70 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -87.31 - 5 0.06 9.09 36.37 | 0.03 2.23 8.93 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -79.21 - 6 0.06 9.09 45.46 | 0.03 2.23 11.16 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -71.12 - 7 0.06 9.09 54.55 | 0.03 2.23 13.40 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -63.03 - 8 0.06 9.09 63.63 | 0.03 2.23 15.63 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -54.95 - 9 0.06 9.08 72.71 | 0.03 2.23 17.86 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.08 -46.87 - 10 0.06 9.07 81.78 | 0.03 2.23 20.09 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.06 -38.81 - 11 0.06 9.05 90.83 | 0.03 2.22 22.31 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.04 -30.77 - 12 0.06 9.02 99.86 | 0.03 2.22 24.52 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.01 -22.76 - 13 0.06 8.99 108.85 | 0.03 2.21 26.73 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.97 -14.79 - 14 0.06 8.96 117.80 | 0.03 2.20 28.93 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.92 -6.87 - 15 0.06 8.91 126.72 | 0.03 2.19 31.11 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.86 1.00 - 16 0.06 8.86 135.58 | 0.03 2.17 33.29 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.80 8.80 - 17 0.06 8.81 144.38 | 0.03 2.16 35.45 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.73 16.53 - 18 0.06 8.75 153.13 | 0.03 2.14 37.59 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.66 24.19 - 19 0.06 8.68 161.81 | 0.03 2.12 39.71 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.58 31.76 - 20 0.06 8.62 170.43 | 0.03 2.11 41.82 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.49 39.25 - 21 0.06 8.55 178.98 | 0.03 2.09 43.91 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.40 46.66 - 22 0.06 8.48 187.46 | 0.03 2.07 45.97 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.31 53.97 - 23 0.06 8.40 195.86 | 0.03 2.05 48.02 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.22 61.19 - 24 0.06 8.33 204.19 | 0.03 2.03 50.05 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.12 68.31 - 25 0.06 8.26 212.45 | 0.03 2.00 52.05 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.03 75.34 - 26 0.06 8.18 220.62 | 0.03 1.98 54.03 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.93 82.27 - 27 0.06 8.10 228.73 | 0.03 1.96 55.99 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.83 89.09 - 28 0.06 8.03 236.76 | 0.03 1.93 57.92 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.73 95.82 - 29 0.06 7.95 244.71 | 0.03 1.91 59.83 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.63 102.45 - 30 0.06 7.88 252.58 | 0.03 1.89 61.72 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.53 108.99 - 31 0.06 7.80 260.38 | 0.03 1.86 63.59 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.43 115.42 - 32 0.06 7.73 268.11 | 0.03 1.84 65.43 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.33 121.75 - 33 0.06 7.65 275.76 | 0.03 1.82 67.24 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.24 127.99 - 34 0.06 7.58 283.34 | 0.03 1.79 69.03 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.14 134.12 - 35 0.06 7.51 290.84 | 0.03 1.77 70.80 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 3.23 6.04 140.17 + 1 5.50 0.00 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -111.58 -111.58 + 2 5.50 9.09 9.09 | 2.50 2.23 2.23 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -103.49 + 3 5.50 9.09 18.18 | 2.50 2.23 4.47 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -95.40 + 4 5.50 9.09 27.27 | 2.50 2.23 6.70 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -87.31 + 5 5.50 9.09 36.37 | 2.50 2.23 8.93 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -79.21 + 6 5.50 9.09 45.46 | 2.50 2.23 11.16 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -71.12 + 7 5.50 9.09 54.55 | 2.50 2.23 13.40 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -63.03 + 8 5.50 9.09 63.63 | 2.50 2.23 15.63 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.09 -54.95 + 9 5.50 9.08 72.71 | 2.50 2.23 17.86 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.08 -46.87 + 10 5.50 9.07 81.78 | 2.50 2.23 20.09 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.06 -38.81 + 11 5.50 9.05 90.83 | 2.50 2.22 22.31 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.04 -30.77 + 12 5.50 9.02 99.86 | 2.50 2.22 24.52 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 8.01 -22.76 + 13 5.50 8.99 108.85 | 2.50 2.21 26.73 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.97 -14.79 + 14 5.50 8.96 117.80 | 2.50 2.20 28.93 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.92 -6.87 + 15 5.50 8.91 126.72 | 2.50 2.19 31.11 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.86 1.00 + 16 5.50 8.86 135.58 | 2.50 2.17 33.29 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.80 8.80 + 17 5.50 8.81 144.38 | 2.50 2.16 35.45 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.73 16.53 + 18 5.50 8.75 153.13 | 2.50 2.14 37.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.66 24.19 + 19 5.50 8.68 161.81 | 2.50 2.12 39.71 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.58 31.76 + 20 5.50 8.62 170.43 | 2.50 2.11 41.82 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.49 39.25 + 21 5.50 8.55 178.98 | 2.50 2.09 43.91 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.40 46.66 + 22 5.50 8.48 187.46 | 2.50 2.07 45.97 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.23 7.31 53.97 + 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 + 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 + 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 + 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 diff --git a/tests/examples/example4.out b/tests/examples/example4.out index 93ac1d0a..8a0e241b 100644 --- a/tests/examples/example4.out +++ b/tests/examples/example4.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 10:53 - Calculation Time: 0.062 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:58 + Calculation Time: 0.061 sec ***SUMMARY OF RESULTS*** @@ -208,33 +208,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.06 -57.71 0.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -57.71 -57.71 - 2 0.06 -1.59 0.23 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.59 -59.30 - 3 0.06 -1.63 0.42 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.63 -60.93 - 4 0.06 -1.66 0.58 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.66 -62.59 - 5 0.06 -1.69 0.71 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.69 -64.28 - 6 0.06 -1.73 0.80 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.73 -66.01 - 7 0.06 -1.76 0.85 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.76 -67.78 - 8 0.06 -1.80 0.87 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.80 -69.57 - 9 0.06 -1.83 0.86 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.83 -71.41 - 10 0.06 -1.87 0.82 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.87 -73.27 - 11 0.06 -1.90 0.74 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.90 -75.17 - 12 0.06 -1.93 0.62 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.93 -77.10 - 13 0.06 -1.96 0.48 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.96 -79.07 - 14 0.06 -2.00 0.30 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.00 -81.06 - 15 0.06 -2.03 0.09 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.03 -83.09 - 16 0.06 -2.06 -0.15 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.06 -85.16 - 17 0.06 -2.10 -0.43 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.10 -87.25 - 18 0.06 -2.13 -0.74 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.13 -89.38 - 19 0.06 -2.16 -1.08 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.16 -91.54 - 20 0.06 -2.19 -1.45 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.19 -93.73 - 21 0.06 -2.22 -1.86 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.22 -95.95 - 22 0.06 -2.25 -2.29 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.25 -98.21 - 23 0.06 -2.29 -2.76 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.29 -100.49 - 24 0.06 -2.32 -3.25 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.32 -102.81 - 25 0.06 -2.35 -3.78 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.35 -105.16 - 26 0.06 -2.38 -4.34 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.38 -107.54 - 27 0.06 -2.41 -4.93 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.41 -109.95 - 28 0.06 -2.44 -5.55 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.44 -112.39 - 29 0.06 -2.47 -6.20 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.47 -114.85 - 30 0.06 -2.50 -6.88 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.50 -117.35 + 1 5.50 -57.71 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -57.71 -57.71 + 2 5.50 -1.59 0.23 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.59 -59.30 + 3 5.50 -1.63 0.42 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.63 -60.93 + 4 5.50 -1.66 0.58 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.66 -62.59 + 5 5.50 -1.69 0.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.69 -64.28 + 6 5.50 -1.73 0.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.73 -66.01 + 7 5.50 -1.76 0.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.76 -67.78 + 8 5.50 -1.80 0.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.80 -69.57 + 9 5.50 -1.83 0.86 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.83 -71.41 + 10 5.50 -1.87 0.82 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.87 -73.27 + 11 5.50 -1.90 0.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.90 -75.17 + 12 5.50 -1.93 0.62 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.93 -77.10 + 13 5.50 -1.96 0.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -1.96 -79.07 + 14 5.50 -2.00 0.30 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.00 -81.06 + 15 5.50 -2.03 0.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.03 -83.09 + 16 5.50 -2.06 -0.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.06 -85.16 + 17 5.50 -2.10 -0.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.10 -87.25 + 18 5.50 -2.13 -0.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.13 -89.38 + 19 5.50 -2.16 -1.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.16 -91.54 + 20 5.50 -2.19 -1.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.19 -93.73 + 21 5.50 -2.22 -1.86 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.22 -95.95 + 22 5.50 -2.25 -2.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.25 -98.21 + 23 5.50 -2.29 -2.76 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.29 -100.49 + 24 5.50 -2.32 -3.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.32 -102.81 + 25 5.50 -2.35 -3.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.35 -105.16 + 26 5.50 -2.38 -4.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.38 -107.54 + 27 5.50 -2.41 -4.93 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.41 -109.95 + 28 5.50 -2.44 -5.55 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.44 -112.39 + 29 5.50 -2.47 -6.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.47 -114.85 + 30 5.50 -2.50 -6.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.82 -2.50 -117.35 diff --git a/tests/examples/example5.out b/tests/examples/example5.out index 38798471..0d5b9d36 100644 --- a/tests/examples/example5.out +++ b/tests/examples/example5.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 08:43 - Calculation Time: 0.062 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:58 + Calculation Time: 0.061 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*** @@ -201,33 +201,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.06 0.00 0.00 | 0.03 -41.38 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -41.38 -41.38 - 2 0.06 0.00 0.00 | 0.03 3.53 4.71 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.53 -37.86 - 3 0.06 0.00 0.00 | 0.03 3.57 9.46 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.57 -34.28 - 4 0.06 0.00 0.00 | 0.03 3.58 14.22 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.58 -30.70 - 5 0.06 0.00 0.00 | 0.03 3.55 18.95 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.55 -27.15 - 6 0.06 0.00 0.00 | 0.03 3.50 23.64 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.50 -23.65 - 7 0.06 0.00 0.00 | 0.03 3.42 28.24 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.42 -20.23 - 8 0.06 0.00 0.00 | 0.03 3.33 32.75 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.33 -16.90 - 9 0.06 0.00 0.00 | 0.03 3.23 37.16 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.23 -13.66 - 10 0.06 0.00 0.00 | 0.03 3.13 41.48 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.13 -10.53 - 11 0.06 0.00 0.00 | 0.03 3.03 45.69 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.03 -7.50 - 12 0.06 0.00 0.00 | 0.03 2.93 49.81 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.93 -4.56 - 13 0.06 0.00 0.00 | 0.03 2.84 53.83 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.84 -1.72 - 14 0.06 0.00 0.00 | 0.03 2.75 57.75 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.75 1.02 - 15 0.06 0.00 0.00 | 0.03 2.66 61.59 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.66 3.68 - 16 0.06 0.00 0.00 | 0.03 2.57 65.34 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.57 6.25 - 17 0.06 0.00 0.00 | 0.03 2.49 69.02 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.49 8.74 - 18 0.06 0.00 0.00 | 0.03 2.41 72.61 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.41 11.16 - 19 0.06 0.00 0.00 | 0.03 2.34 76.13 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.34 13.50 - 20 0.06 0.00 0.00 | 0.03 2.27 79.58 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.27 15.76 - 21 0.06 0.00 0.00 | 0.03 2.20 82.96 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.20 17.96 - 22 0.06 0.00 0.00 | 0.03 2.13 86.27 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.13 20.10 - 23 0.06 0.00 0.00 | 0.03 2.07 89.52 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.07 22.17 - 24 0.06 0.00 0.00 | 0.03 2.01 92.72 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.01 24.18 - 25 0.06 0.00 0.00 | 0.03 1.95 95.85 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.95 26.13 - 26 0.06 0.00 0.00 | 0.03 1.90 98.93 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.90 28.03 - 27 0.06 0.00 0.00 | 0.03 1.85 101.96 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.85 29.88 - 28 0.06 0.00 0.00 | 0.03 1.80 104.93 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.80 31.67 - 29 0.06 0.00 0.00 | 0.03 1.75 107.86 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.75 33.42 - 30 0.06 0.00 0.00 | 0.03 1.70 110.74 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.70 35.12 + 1 5.50 0.00 0.00 | 2.50 -41.38 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -41.38 -41.38 + 2 5.50 0.00 0.00 | 2.50 3.53 4.71 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.53 -37.86 + 3 5.50 0.00 0.00 | 2.50 3.57 9.46 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.57 -34.28 + 4 5.50 0.00 0.00 | 2.50 3.58 14.22 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.58 -30.70 + 5 5.50 0.00 0.00 | 2.50 3.55 18.95 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.55 -27.15 + 6 5.50 0.00 0.00 | 2.50 3.50 23.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.50 -23.65 + 7 5.50 0.00 0.00 | 2.50 3.42 28.24 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.42 -20.23 + 8 5.50 0.00 0.00 | 2.50 3.33 32.75 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.33 -16.90 + 9 5.50 0.00 0.00 | 2.50 3.23 37.16 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.23 -13.66 + 10 5.50 0.00 0.00 | 2.50 3.13 41.48 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.13 -10.53 + 11 5.50 0.00 0.00 | 2.50 3.03 45.69 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 3.03 -7.50 + 12 5.50 0.00 0.00 | 2.50 2.93 49.81 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.93 -4.56 + 13 5.50 0.00 0.00 | 2.50 2.84 53.83 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.84 -1.72 + 14 5.50 0.00 0.00 | 2.50 2.75 57.75 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.75 1.02 + 15 5.50 0.00 0.00 | 2.50 2.66 61.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 2.66 3.68 + 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 + 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 + 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 + 26 5.50 0.00 0.00 | 2.50 1.90 98.93 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.90 28.03 + 27 5.50 0.00 0.00 | 2.50 1.85 101.96 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.85 29.88 + 28 5.50 0.00 0.00 | 2.50 1.80 104.93 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.80 31.67 + 29 5.50 0.00 0.00 | 2.50 1.75 107.86 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.75 33.42 + 30 5.50 0.00 0.00 | 2.50 1.70 110.74 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.18 1.70 35.12 diff --git a/tests/examples/example8.out b/tests/examples/example8.out index d118fb93..c9ef3d5f 100644 --- a/tests/examples/example8.out +++ b/tests/examples/example8.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 08:43 - Calculation Time: 0.613 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:59 + Calculation Time: 0.617 sec ***SUMMARY OF RESULTS*** @@ -33,7 +33,7 @@ Simulation Metadata Project IRR: 0.86 % Project VIR=PI=PIR: 0.52 Project MOIC: 0.08 - Project Payback Period: 26.95 yr + Project Payback Period: 26.95 yr ***ENGINEERING PARAMETERS*** @@ -205,33 +205,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.06 0.00 0.00 | 0.03 -21.06 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -21.06 -21.06 - 2 0.06 0.00 0.00 | 0.03 0.82 1.25 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -20.24 - 3 0.06 0.00 0.00 | 0.03 0.82 2.51 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -19.42 - 4 0.06 0.00 0.00 | 0.03 0.83 3.78 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -18.59 - 5 0.06 0.00 0.00 | 0.03 0.83 5.04 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -17.76 - 6 0.06 0.00 0.00 | 0.03 0.83 6.31 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -16.93 - 7 0.06 0.00 0.00 | 0.03 0.83 7.57 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -16.10 - 8 0.06 0.00 0.00 | 0.03 0.83 8.84 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -15.27 - 9 0.06 0.00 0.00 | 0.03 0.83 10.11 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -14.44 - 10 0.06 0.00 0.00 | 0.03 0.83 11.37 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -13.61 - 11 0.06 0.00 0.00 | 0.03 0.83 12.64 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -12.78 - 12 0.06 0.00 0.00 | 0.03 0.83 13.90 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -11.95 - 13 0.06 0.00 0.00 | 0.03 0.83 15.17 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -11.13 - 14 0.06 0.00 0.00 | 0.03 0.82 16.43 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -10.30 - 15 0.06 0.00 0.00 | 0.03 0.82 17.69 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -9.48 - 16 0.06 0.00 0.00 | 0.03 0.82 18.94 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -8.66 - 17 0.06 0.00 0.00 | 0.03 0.82 20.20 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -7.85 - 18 0.06 0.00 0.00 | 0.03 0.81 21.44 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.81 -7.03 - 19 0.06 0.00 0.00 | 0.03 0.81 22.69 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.81 -6.23 - 20 0.06 0.00 0.00 | 0.03 0.80 23.93 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.80 -5.43 - 21 0.06 0.00 0.00 | 0.03 0.80 25.16 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.80 -4.63 - 22 0.06 0.00 0.00 | 0.03 0.79 26.39 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.79 -3.84 - 23 0.06 0.00 0.00 | 0.03 0.79 27.61 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.79 -3.05 - 24 0.06 0.00 0.00 | 0.03 0.78 28.83 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.78 -2.27 - 25 0.06 0.00 0.00 | 0.03 0.78 30.04 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.78 -1.49 - 26 0.06 0.00 0.00 | 0.03 0.77 31.25 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.77 -0.72 - 27 0.06 0.00 0.00 | 0.03 0.76 32.45 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.76 0.04 - 28 0.06 0.00 0.00 | 0.03 0.76 33.64 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.76 0.80 - 29 0.06 0.00 0.00 | 0.03 0.75 34.83 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.75 1.55 - 30 0.06 0.00 0.00 | 0.03 0.74 36.01 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.74 2.29 + 1 5.50 0.00 0.00 | 2.50 -21.06 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -21.06 -21.06 + 2 5.50 0.00 0.00 | 2.50 0.82 1.25 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -20.24 + 3 5.50 0.00 0.00 | 2.50 0.82 2.51 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -19.42 + 4 5.50 0.00 0.00 | 2.50 0.83 3.78 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -18.59 + 5 5.50 0.00 0.00 | 2.50 0.83 5.04 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -17.76 + 6 5.50 0.00 0.00 | 2.50 0.83 6.31 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -16.93 + 7 5.50 0.00 0.00 | 2.50 0.83 7.57 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -16.10 + 8 5.50 0.00 0.00 | 2.50 0.83 8.84 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -15.27 + 9 5.50 0.00 0.00 | 2.50 0.83 10.11 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -14.44 + 10 5.50 0.00 0.00 | 2.50 0.83 11.37 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -13.61 + 11 5.50 0.00 0.00 | 2.50 0.83 12.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -12.78 + 12 5.50 0.00 0.00 | 2.50 0.83 13.90 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -11.95 + 13 5.50 0.00 0.00 | 2.50 0.83 15.17 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -11.13 + 14 5.50 0.00 0.00 | 2.50 0.82 16.43 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -10.30 + 15 5.50 0.00 0.00 | 2.50 0.82 17.69 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -9.48 + 16 5.50 0.00 0.00 | 2.50 0.82 18.94 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -8.66 + 17 5.50 0.00 0.00 | 2.50 0.82 20.20 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -7.85 + 18 5.50 0.00 0.00 | 2.50 0.81 21.44 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.81 -7.03 + 19 5.50 0.00 0.00 | 2.50 0.81 22.69 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.81 -6.23 + 20 5.50 0.00 0.00 | 2.50 0.80 23.93 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.80 -5.43 + 21 5.50 0.00 0.00 | 2.50 0.80 25.16 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.80 -4.63 + 22 5.50 0.00 0.00 | 2.50 0.79 26.39 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.79 -3.84 + 23 5.50 0.00 0.00 | 2.50 0.79 27.61 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.79 -3.05 + 24 5.50 0.00 0.00 | 2.50 0.78 28.83 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.78 -2.27 + 25 5.50 0.00 0.00 | 2.50 0.78 30.04 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.78 -1.49 + 26 5.50 0.00 0.00 | 2.50 0.77 31.25 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.77 -0.72 + 27 5.50 0.00 0.00 | 2.50 0.76 32.45 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.76 0.04 + 28 5.50 0.00 0.00 | 2.50 0.76 33.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.76 0.80 + 29 5.50 0.00 0.00 | 2.50 0.75 34.83 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.75 1.55 + 30 5.50 0.00 0.00 | 2.50 0.74 36.01 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.74 2.29 diff --git a/tests/examples/example9.out b/tests/examples/example9.out index 8be1d31e..86cd94ac 100644 --- a/tests/examples/example9.out +++ b/tests/examples/example9.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 10:53 - Calculation Time: 0.624 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:59 + Calculation Time: 0.618 sec ***SUMMARY OF RESULTS*** @@ -212,33 +212,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.06 -27.42 0.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -27.42 -27.42 - 2 0.06 -0.28 0.20 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -27.70 - 3 0.06 -0.27 0.41 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -27.97 - 4 0.06 -0.27 0.63 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.24 - 5 0.06 -0.27 0.84 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.51 - 6 0.06 -0.27 1.05 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.78 - 7 0.06 -0.27 1.26 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -29.05 - 8 0.06 -0.27 1.48 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -29.32 - 9 0.06 -0.27 1.69 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -29.59 - 10 0.06 -0.27 1.91 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -29.86 - 11 0.06 -0.27 2.12 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.12 - 12 0.06 -0.27 2.33 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.39 - 13 0.06 -0.27 2.55 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.66 - 14 0.06 -0.27 2.76 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.93 - 15 0.06 -0.27 2.97 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -31.20 - 16 0.06 -0.27 3.18 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -31.47 - 17 0.06 -0.27 3.39 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -31.75 - 18 0.06 -0.27 3.60 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -32.02 - 19 0.06 -0.28 3.81 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -32.30 - 20 0.06 -0.28 4.01 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -32.58 - 21 0.06 -0.28 4.21 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -32.86 - 22 0.06 -0.28 4.41 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -33.14 - 23 0.06 -0.28 4.61 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -33.42 - 24 0.06 -0.29 4.81 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -33.71 - 25 0.06 -0.29 5.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -33.99 - 26 0.06 -0.29 5.20 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -34.28 - 27 0.06 -0.29 5.39 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -34.58 - 28 0.06 -0.29 5.57 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -34.87 - 29 0.06 -0.30 5.76 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -35.17 - 30 0.06 -0.30 5.94 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -35.46 + 1 5.50 -27.42 0.00 | 2.50 0.00 0.00 | 2.50 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 + 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 + 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 + 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 + 20 5.50 -0.28 4.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -32.58 + 21 5.50 -0.28 4.21 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -32.86 + 22 5.50 -0.28 4.41 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -33.14 + 23 5.50 -0.28 4.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -33.42 + 24 5.50 -0.29 4.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -33.71 + 25 5.50 -0.29 5.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -33.99 + 26 5.50 -0.29 5.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -34.28 + 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 diff --git a/tests/examples/example_SHR-1.out b/tests/examples/example_SHR-1.out index cc2a8a1f..c97b9f38 100644 --- a/tests/examples/example_SHR-1.out +++ b/tests/examples/example_SHR-1.out @@ -4,17 +4,17 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 08:44 - Calculation Time: 0.613 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:59 + Calculation Time: 0.612 sec ***SUMMARY OF RESULTS*** End-Use Option: Electricity Average Net Electricity Production: 30.58 MW - Electricity breakeven price: 5.89 cents/kWh + Electricity breakeven price: 5.89 cents/kWh Number of production wells: 2 Number of injection wells: 2 Flowrate per production well: 55.0 kg/sec @@ -33,7 +33,7 @@ Simulation Metadata Project IRR: 7.14 % Project VIR=PI=PIR: 1.10 Project MOIC: 1.28 - Project Payback Period: 13.46 yr + Project Payback Period: 13.46 yr ***ENGINEERING PARAMETERS*** @@ -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.06 -241.92 0.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -241.92 -241.92 - 2 0.06 11.70 13.73 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 11.70 -230.22 - 3 0.07 12.05 27.80 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 12.05 -218.17 - 4 0.08 15.01 44.84 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 15.01 -203.16 - 5 0.10 17.95 64.82 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 17.95 -185.21 - 6 0.10 20.89 87.73 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 20.89 -164.32 - 7 0.10 21.91 111.66 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 21.91 -142.42 - 8 0.10 21.96 135.64 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 21.96 -120.46 - 9 0.10 22.00 159.67 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.00 -98.46 - 10 0.10 22.04 183.73 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.04 -76.42 - 11 0.10 22.07 207.83 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.07 -54.35 - 12 0.10 22.10 231.96 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.10 -32.25 - 13 0.10 22.12 256.11 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.12 -10.12 - 14 0.10 22.15 280.28 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.15 12.02 - 15 0.10 22.17 304.48 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.17 34.19 - 16 0.10 22.19 328.69 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.19 56.38 - 17 0.10 22.21 352.92 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.21 78.59 - 18 0.10 22.22 377.17 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.22 100.81 - 19 0.10 22.24 401.43 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.24 123.05 - 20 0.10 22.25 425.71 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.25 145.30 - 21 0.10 22.27 450.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.27 167.56 - 22 0.10 22.28 474.31 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.28 189.84 - 23 0.10 22.29 498.62 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.29 212.13 - 24 0.10 22.30 522.95 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.30 234.44 - 25 0.10 22.31 547.29 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.31 256.75 - 26 0.10 22.32 571.64 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.32 279.07 - 27 0.10 22.33 596.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.33 301.40 - 28 0.10 22.34 620.37 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.34 323.75 - 29 0.10 22.35 644.74 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.35 346.10 - 30 0.10 22.36 669.13 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.36 368.46 + 1 6.00 -241.92 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -241.92 -241.92 + 2 6.00 11.70 13.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 11.70 -230.22 + 3 7.20 12.05 27.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 12.05 -218.17 + 4 8.40 15.01 44.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 15.01 -203.16 + 5 9.60 17.95 64.82 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 17.95 -185.21 + 6 10.00 20.89 87.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 20.89 -164.32 + 7 10.00 21.91 111.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 21.91 -142.42 + 8 10.00 21.96 135.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 21.96 -120.46 + 9 10.00 22.00 159.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.00 -98.46 + 10 10.00 22.04 183.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.04 -76.42 + 11 10.00 22.07 207.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.07 -54.35 + 12 10.00 22.10 231.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.10 -32.25 + 13 10.00 22.12 256.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.12 -10.12 + 14 10.00 22.15 280.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.15 12.02 + 15 10.00 22.17 304.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.17 34.19 + 16 10.00 22.19 328.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.19 56.38 + 17 10.00 22.21 352.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.21 78.59 + 18 10.00 22.22 377.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.22 100.81 + 19 10.00 22.24 401.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.24 123.05 + 20 10.00 22.25 425.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.25 145.30 + 21 10.00 22.27 450.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.27 167.56 + 22 10.00 22.28 474.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.28 189.84 + 23 10.00 22.29 498.62 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.29 212.13 + 24 10.00 22.30 522.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.30 234.44 + 25 10.00 22.31 547.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.31 256.75 + 26 10.00 22.32 571.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.32 279.07 + 27 10.00 22.33 596.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.33 301.40 + 28 10.00 22.34 620.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.34 323.75 + 29 10.00 22.35 644.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.35 346.10 + 30 10.00 22.36 669.13 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.36 368.46 diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out index f60ce3f7..aa28f9a5 100644 --- a/tests/examples/example_SHR-2.out +++ b/tests/examples/example_SHR-2.out @@ -4,17 +4,17 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 08:43 - Calculation Time: 0.631 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 09:59 + Calculation Time: 0.604 sec ***SUMMARY OF RESULTS*** End-Use Option: Electricity Average Net Electricity Production: 30.58 MW - Electricity breakeven price: 2.15 cents/kWh + Electricity breakeven price: 2.15 cents/kWh Number of production wells: 2 Number of injection wells: 2 Flowrate per production well: 55.0 kg/sec @@ -33,7 +33,7 @@ Simulation Metadata Project IRR: 21.15 % Project VIR=PI=PIR: 3.22 Project MOIC: 5.24 - Project Payback Period: 6.18 yr + Project Payback Period: 6.18 yr ***ENGINEERING PARAMETERS*** @@ -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.06 -88.30 0.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -88.30 -88.30 - 2 0.06 12.98 13.73 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 12.98 -75.32 - 3 0.07 13.34 27.80 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 13.34 -61.98 - 4 0.08 16.30 44.84 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 16.30 -45.69 - 5 0.10 19.24 64.82 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 19.24 -26.45 - 6 0.10 22.17 87.73 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 22.17 -4.28 - 7 0.10 23.19 111.66 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.19 18.91 - 8 0.10 23.24 135.64 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.24 42.15 - 9 0.10 23.29 159.67 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.29 65.44 - 10 0.10 23.32 183.73 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.32 88.76 - 11 0.10 23.36 207.83 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.36 112.12 - 12 0.10 23.38 231.96 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.38 135.50 - 13 0.10 23.41 256.11 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.41 158.91 - 14 0.10 23.43 280.28 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.43 182.34 - 15 0.10 23.45 304.48 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.45 205.80 - 16 0.10 23.47 328.69 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.47 229.27 - 17 0.10 23.49 352.92 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.49 252.76 - 18 0.10 23.51 377.17 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.51 276.27 - 19 0.10 23.52 401.43 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.52 299.79 - 20 0.10 23.54 425.71 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.54 323.33 - 21 0.10 23.55 450.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.55 346.88 - 22 0.10 23.56 474.31 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.56 370.44 - 23 0.10 23.58 498.62 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.58 394.02 - 24 0.10 23.59 522.95 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.59 417.61 - 25 0.10 23.60 547.29 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.60 441.20 - 26 0.10 23.61 571.64 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.61 464.81 - 27 0.10 23.62 596.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.62 488.43 - 28 0.10 23.63 620.37 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.63 512.06 - 29 0.10 23.64 644.74 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.64 535.69 - 30 0.10 23.64 669.13 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.64 559.34 + 1 6.00 -88.30 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -88.30 -88.30 + 2 6.00 12.98 13.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 12.98 -75.32 + 3 7.20 13.34 27.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 13.34 -61.98 + 4 8.40 16.30 44.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 16.30 -45.69 + 5 9.60 19.24 64.82 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 19.24 -26.45 + 6 10.00 22.17 87.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 22.17 -4.28 + 7 10.00 23.19 111.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.19 18.91 + 8 10.00 23.24 135.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.24 42.15 + 9 10.00 23.29 159.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.29 65.44 + 10 10.00 23.32 183.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.32 88.76 + 11 10.00 23.36 207.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.36 112.12 + 12 10.00 23.38 231.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.38 135.50 + 13 10.00 23.41 256.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.41 158.91 + 14 10.00 23.43 280.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.43 182.34 + 15 10.00 23.45 304.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.45 205.80 + 16 10.00 23.47 328.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.47 229.27 + 17 10.00 23.49 352.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.49 252.76 + 18 10.00 23.51 377.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.51 276.27 + 19 10.00 23.52 401.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.52 299.79 + 20 10.00 23.54 425.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.54 323.33 + 21 10.00 23.55 450.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.55 346.88 + 22 10.00 23.56 474.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.56 370.44 + 23 10.00 23.58 498.62 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.58 394.02 + 24 10.00 23.59 522.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.59 417.61 + 25 10.00 23.60 547.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.60 441.20 + 26 10.00 23.61 571.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.61 464.81 + 27 10.00 23.62 596.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.62 488.43 + 28 10.00 23.63 620.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.63 512.06 + 29 10.00 23.64 644.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.64 535.69 + 30 10.00 23.64 669.13 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.74 23.64 559.34 diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out index a7fc441d..409363bc 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.12 - GEOPHIRES Build Date: 2022-06-30 - Simulation Date: 2024-03-04 - Simulation Time: 10:53 - Calculation Time: 0.623 sec + GEOPHIRES Version: 3.4.15 + GEOPHIRES Build Date: 2024-03-05 + Simulation Date: 2024-03-05 + Simulation Time: 10:00 + Calculation Time: 0.618 sec ***SUMMARY OF RESULTS*** @@ -221,33 +221,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.06 -78.41 0.00 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -78.41 -78.41 - 2 0.06 -0.99 0.96 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -79.40 - 3 0.06 -0.99 1.92 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -80.39 - 4 0.06 -0.99 2.88 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -81.38 - 5 0.06 -0.99 3.84 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -82.37 - 6 0.06 -0.99 4.80 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -83.36 - 7 0.06 -0.99 5.76 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -84.35 - 8 0.06 -0.99 6.72 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -85.34 - 9 0.06 -0.99 7.67 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -86.33 - 10 0.06 -0.99 8.63 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -87.33 - 11 0.06 -1.00 9.58 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.00 -88.33 - 12 0.06 -1.00 10.53 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.00 -89.33 - 13 0.06 -1.01 11.46 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.01 -90.34 - 14 0.06 -1.02 12.39 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.02 -91.36 - 15 0.06 -1.04 13.30 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.04 -92.40 - 16 0.06 -1.05 14.20 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.05 -93.45 - 17 0.06 -1.07 15.08 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.07 -94.52 - 18 0.06 -1.09 15.95 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.09 -95.61 - 19 0.06 -1.11 16.79 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.11 -96.72 - 20 0.06 -1.13 17.60 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.13 -97.85 - 21 0.06 -1.16 18.39 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.16 -99.01 - 22 0.06 -1.18 19.16 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.18 -100.19 - 23 0.06 -1.21 19.90 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.21 -101.40 - 24 0.06 -1.24 20.61 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.24 -102.64 - 25 0.06 -1.27 21.29 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.27 -103.91 - 26 0.06 -1.30 21.94 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.30 -105.20 - 27 0.06 -1.33 22.56 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.33 -106.53 - 28 0.06 -1.36 23.15 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.36 -107.89 - 29 0.06 -1.39 23.71 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.39 -109.28 - 30 0.06 -1.42 24.24 | 0.03 0.00 0.00 | 0.03 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.42 -110.71 + 1 5.50 -78.41 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -78.41 -78.41 + 2 5.50 -0.99 0.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -79.40 + 3 5.50 -0.99 1.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -80.39 + 4 5.50 -0.99 2.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -81.38 + 5 5.50 -0.99 3.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -82.37 + 6 5.50 -0.99 4.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -83.36 + 7 5.50 -0.99 5.76 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -84.35 + 8 5.50 -0.99 6.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -85.34 + 9 5.50 -0.99 7.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -86.33 + 10 5.50 -0.99 8.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -0.99 -87.33 + 11 5.50 -1.00 9.58 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.00 -88.33 + 12 5.50 -1.00 10.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.00 -89.33 + 13 5.50 -1.01 11.46 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.01 -90.34 + 14 5.50 -1.02 12.39 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.02 -91.36 + 15 5.50 -1.04 13.30 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.04 -92.40 + 16 5.50 -1.05 14.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.05 -93.45 + 17 5.50 -1.07 15.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.07 -94.52 + 18 5.50 -1.09 15.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.09 -95.61 + 19 5.50 -1.11 16.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.11 -96.72 + 20 5.50 -1.13 17.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.13 -97.85 + 21 5.50 -1.16 18.39 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.16 -99.01 + 22 5.50 -1.18 19.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.18 -100.19 + 23 5.50 -1.21 19.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.21 -101.40 + 24 5.50 -1.24 20.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.24 -102.64 + 25 5.50 -1.27 21.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.27 -103.91 + 26 5.50 -1.30 21.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.30 -105.20 + 27 5.50 -1.33 22.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.33 -106.53 + 28 5.50 -1.36 23.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.36 -107.89 + 29 5.50 -1.39 23.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.39 -109.28 + 30 5.50 -1.42 24.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.95 -1.42 -110.71 diff --git a/tests/test_geophires_x_client.py b/tests/test_geophires_x_client.py index 02130e83..0f6f69ef 100644 --- a/tests/test_geophires_x_client.py +++ b/tests/test_geophires_x_client.py @@ -430,6 +430,11 @@ def test_input_with_non_default_units(self): 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 assert_csv_equal(case_report_file_path, expected_csv_file_path): From 075962ae6c290266aa304f95218a10c5d18499ac Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:12:49 -0800 Subject: [PATCH 09/14] Clean up unit registry naming --- src/geophires_x/GeoPHIRESUtils.py | 6 +++--- src/geophires_x/Parameter.py | 18 +++++++++--------- src/geophires_x/Units.py | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/geophires_x/GeoPHIRESUtils.py b/src/geophires_x/GeoPHIRESUtils.py index 8549e9d4..b5ea1df7 100644 --- a/src/geophires_x/GeoPHIRESUtils.py +++ b/src/geophires_x/GeoPHIRESUtils.py @@ -18,7 +18,7 @@ import CoolProp.CoolProp as CP from geophires_x.Parameter import ParameterEntry -from geophires_x.Units import get_pint_registry +from geophires_x.Units import get_unit_registry _logger = logging.getLogger('root') # TODO use __name__ instead of root @@ -91,7 +91,7 @@ _interp_util_eff_func = interp1d(_T, _UtilEff) -_UREG = get_pint_registry() +_ureg = get_unit_registry() def quantity(value: float, unit: str) -> PlainQuantity: @@ -99,7 +99,7 @@ def quantity(value: float, unit: str) -> PlainQuantity: :rtype: pint.registry.Quantity - note type annotation uses PlainQuantity due to issues with python 3.8 failing to import the Quantity TypeAlias """ - return _UREG.Quantity(value, unit) + return _ureg.Quantity(value, unit) @lru_cache diff --git a/src/geophires_x/Parameter.py b/src/geophires_x/Parameter.py index 624a891c..dced85b4 100644 --- a/src/geophires_x/Parameter.py +++ b/src/geophires_x/Parameter.py @@ -14,7 +14,7 @@ from pint.facets.plain import PlainQuantity from geophires_x.Units import * -ureg = get_pint_registry() +_ureg = get_unit_registry() class HasQuantity(ABC): @@ -23,7 +23,7 @@ def quantity(self) -> PlainQuantity: :rtype: pint.registry.Quantity - note type annotation uses PlainQuantity due to issues with python 3.8 failing to import the Quantity TypeAlias """ - return ureg.Quantity(self.value, str(self.CurrentUnits.value)) + return _ureg.Quantity(self.value, str(self.CurrentUnits.value)) @dataclass @@ -518,8 +518,8 @@ def ConvertUnits(ParamToModify, strUnit: str, model) -> str: try: # Make a Pint Quantity out of the old value: the amount of the unit doesn't matter, # just the units, so I set the amount to 0 - Old_valQ = ureg.Quantity(0.000, str(ParamToModify.CurrentUnits.value)) - New_valQ = ureg.Quantity(float(val), currType) # Make a Pint Quantity out of the new value + Old_valQ = _ureg.Quantity(0.000, str(ParamToModify.CurrentUnits.value)) + New_valQ = _ureg.Quantity(float(val), currType) # Make a Pint Quantity out of the new value except BaseException as ex: print(str(ex)) msg = ( @@ -703,7 +703,7 @@ def parameter_with_units_converted_back_to_preferred_units(param: Parameter, mod if isinstance(param.CurrentUnits, pint.Quantity): currQ = param.CurrentUnits else: - currQ = ureg.Quantity(float(val), currType) # Make a Pint Quantity out of the new value + currQ = _ureg.Quantity(float(val), currType) # Make a Pint Quantity out of the new value except BaseException as ex: print(str(ex)) msg = ( @@ -863,10 +863,10 @@ def ConvertOutputUnits(oparam: OutputParameter, newUnit: Units, model): # this is a simple unit conversion: it could be just units (meters->feet) or simple currency ($->EUR) # or compound Currency (MUSD-EUR) try: - fromQ = ureg.Quantity( + fromQ = _ureg.Quantity( oparam.value, str(oparam.PreferredUnits.value) ) # Make a Pint Quantity out of the value - toQ = ureg.Quantity(0, str(newUnit.value)) # Make a Pint Quantity out of the new value + toQ = _ureg.Quantity(0, str(newUnit.value)) # Make a Pint Quantity out of the new value except BaseException as ex: print(str(ex)) msg = ( @@ -907,10 +907,10 @@ def ConvertOutputUnits(oparam: OutputParameter, newUnit: Units, model): i = 0 for arrayval in oparam.value: try: - fromQ = ureg.Quantity( + fromQ = _ureg.Quantity( oparam.value[i], str(oparam.PreferredUnits.value) ) # Make a Pint Quantity out of from the value - toQ = ureg.Quantity(0, str(newUnit.value)) # Make a Pint Quantity out of the new value + toQ = _ureg.Quantity(0, str(newUnit.value)) # Make a Pint Quantity out of the new value except BaseException as ex: print(str(ex)) msg = ( diff --git a/src/geophires_x/Units.py b/src/geophires_x/Units.py index 9ffc017b..ef904d07 100644 --- a/src/geophires_x/Units.py +++ b/src/geophires_x/Units.py @@ -6,7 +6,7 @@ _UREG = None -def get_pint_registry(): +def get_unit_registry(): global _UREG if _UREG is None: _UREG = pint.get_application_registry() From 16223730ef181a47f5aa1f68f1fb37d60b94b147 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:17:50 -0800 Subject: [PATCH 10/14] Access all r&cf outputs through output dict --- src/geophires_x/Outputs.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index f370576d..0188e549 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -660,9 +660,9 @@ def o(output_param: OutputParameter): if ii < model.surfaceplant.construction_years.value: OPEX = 0.0 # zero out the OPEX during construction years else: - OPEX = econ.Coam.value + OPEX = o(econ.Coam).value f.write( - f"{ii + 1:3.0f} {o(econ.ElecPrice).value[ii]:5.2f} {o(econ.ElecRevenue).value[ii]:5.2f} {o(econ.ElecCummRevenue).value[ii]:5.2f} | {o(econ.HeatPrice).value[ii]:5.2f} {o(econ.HeatRevenue).value[ii]:5.2f} {o(econ.HeatCummRevenue).value[ii]:5.2f} | {o(econ.CoolingPrice).value[ii]:5.2f} {o(econ.CoolingRevenue).value[ii]:5.2f} {o(econ.CoolingCummRevenue).value[ii]:5.2f} | {o(econ.CarbonPrice).value[ii]:5.2f} {o(econ.CarbonRevenue).value[ii]:5.2f} {econ.CarbonCummCashFlow.value[ii]:5.2f} | {OPEX:5.2f} {econ.TotalRevenue.value[ii]:5.2f} {econ.TotalCummRevenue.value[ii]:5.2f}\n") + f"{ii + 1:3.0f} {o(econ.ElecPrice).value[ii]:5.2f} {o(econ.ElecRevenue).value[ii]:5.2f} {o(econ.ElecCummRevenue).value[ii]:5.2f} | {o(econ.HeatPrice).value[ii]:5.2f} {o(econ.HeatRevenue).value[ii]:5.2f} {o(econ.HeatCummRevenue).value[ii]:5.2f} | {o(econ.CoolingPrice).value[ii]:5.2f} {o(econ.CoolingRevenue).value[ii]:5.2f} {o(econ.CoolingCummRevenue).value[ii]:5.2f} | {o(econ.CarbonPrice).value[ii]:5.2f} {o(econ.CarbonRevenue).value[ii]:5.2f} {o(econ.CarbonCummCashFlow).value[ii]:5.2f} | {OPEX:5.2f} {o(econ.TotalRevenue).value[ii]:5.2f} {o(econ.TotalCummRevenue).value[ii]:5.2f}\n") f.write(NL) if model.economics.DoAddOnCalculations.value: model.addoutputs.PrintOutputs(model) @@ -670,14 +670,14 @@ def o(output_param: OutputParameter): except BaseException as ex: tb = sys.exc_info()[2] - msg = "Error: GEOPHIRES Failed to write the output file. Exiting....Line %i" % tb.tb_lineno + msg = "Error: GEOPHIRES Failed to write the output file. Exiting....Line %i" % tb.tb_lineno print(str(ex)) print(msg) model.logger.critical(str(ex)) model.logger.critical(msg) raise RuntimeError(msg) from ex - model.logger.info("Complete "+ str(__class__) + ": " + sys._getframe().f_code.co_name) + model.logger.info(f'Complete {__class__!s}: {sys._getframe().f_code.co_name}') def MakeDistrictHeatingPlot(self, model: Model): """ From 7f6b820ae2baa6660760011e2d08eb44272c412e Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:34:22 -0800 Subject: [PATCH 11/14] Miscellaneous minor tweaks --- src/geophires_x/Outputs.py | 2 +- tests/examples/example_SHR-1.out | 6 +++--- tests/test_parameter.py | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index 0188e549..0bddab8e 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -190,7 +190,7 @@ def PrintOutputs(self, model: Model): payback_period_val = model.economics.ProjectPaybackPeriod.value project_payback_period_display = f'{payback_period_val:10.2f} {model.economics.ProjectPaybackPeriod.PreferredUnits.value}' \ if payback_period_val > 0.0 else 'N/A' - f.write(f' Project Payback Period: {project_payback_period_display}\n') + f.write(f' Project Payback Period: {project_payback_period_display}\n') if model.surfaceplant.enduse_option.value in [EndUseOptions.COGENERATION_TOPPING_EXTRA_HEAT, EndUseOptions.COGENERATION_BOTTOMING_EXTRA_HEAT, diff --git a/tests/examples/example_SHR-1.out b/tests/examples/example_SHR-1.out index c97b9f38..68a8024b 100644 --- a/tests/examples/example_SHR-1.out +++ b/tests/examples/example_SHR-1.out @@ -7,8 +7,8 @@ Simulation Metadata GEOPHIRES Version: 3.4.15 GEOPHIRES Build Date: 2024-03-05 Simulation Date: 2024-03-05 - Simulation Time: 09:59 - Calculation Time: 0.612 sec + Simulation Time: 10:32 + Calculation Time: 0.614 sec ***SUMMARY OF RESULTS*** @@ -33,7 +33,7 @@ Simulation Metadata Project IRR: 7.14 % Project VIR=PI=PIR: 1.10 Project MOIC: 1.28 - Project Payback Period: 13.46 yr + Project Payback Period: 13.46 yr ***ENGINEERING PARAMETERS*** diff --git a/tests/test_parameter.py b/tests/test_parameter.py index 8f3232f1..90f97b2d 100644 --- a/tests/test_parameter.py +++ b/tests/test_parameter.py @@ -147,6 +147,7 @@ def test_output_parameter_with_preferred_units(self): result = op.with_preferred_units() self.assertIsNotNone(result) self.assertEqual(5.5, result.value[0]) + self.assertEqual(5.5, result.value[-1]) def _new_model(self) -> Model: stash_cwd = Path.cwd() From 88e56ab078f45776905ac1eb74d8dba69eb03f7c Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:41:08 -0800 Subject: [PATCH 12/14] =?UTF-8?q?Bump=20version:=203.4.15=20=E2=86=92=203.?= =?UTF-8?q?4.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- .cookiecutterrc | 2 +- README.rst | 4 ++-- docs/conf.py | 2 +- setup.py | 2 +- src/geophires_x/__init__.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 265daa59..ba0d73a3 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.4.15 +current_version = 3.4.16 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index 6a1ac2e9..e7bcca3c 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -54,7 +54,7 @@ default_context: sphinx_doctest: "no" sphinx_theme: "sphinx-py3doc-enhanced-theme" test_matrix_separate_coverage: "no" - version: 3.4.15 + version: 3.4.16 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index d97ed9d4..4ba0390a 100644 --- a/README.rst +++ b/README.rst @@ -47,9 +47,9 @@ Free software: `MIT license `__ :alt: Supported implementations :target: https://pypi.org/project/geophires-x -.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.15.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.16.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.15...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.16...main .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat :target: https://nrel.github.io/GEOPHIRES-X diff --git a/docs/conf.py b/docs/conf.py index 4dd88128..cec3dff4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2023' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.4.15' +version = release = '3.4.16' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index 52024d96..fe70b384 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.4.15', + version='3.4.16', license='MIT', description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.', long_description='{}\n{}'.format( diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py index e0fb4c59..8f1bd468 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.4.15' +__version__ = '3.4.16' From 830c4d0feb191745a9f6681d66e6be984e9cc496 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:12:17 -0800 Subject: [PATCH 13/14] Fix/enable addon & carbon calculations in example1_addons --- src/geophires_x/Economics.py | 1 - tests/example1_addons.csv | 360 ++++++++++++++--------------- tests/examples/example1_addons.out | 77 +++--- tests/examples/example1_addons.txt | 11 +- 4 files changed, 226 insertions(+), 223 deletions(-) diff --git a/src/geophires_x/Economics.py b/src/geophires_x/Economics.py index f8466cc2..7ef6a1fe 100644 --- a/src/geophires_x/Economics.py +++ b/src/geophires_x/Economics.py @@ -811,7 +811,6 @@ def __init__(self, model: Model): ) self.DoAddOnCalculations = self.ParameterDict[self.DoAddOnCalculations.Name] = boolParameter( "Do AddOn Calculations", - value=False, DefaultValue=False, UnitType=Units.NONE, Required=False, diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index 0f4225fb..9315b4a2 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -11,12 +11,12 @@ ECONOMIC PARAMETERS,Economic Model,,Fixed Charge Rate (FCR), ECONOMIC PARAMETERS,Accrued financing during construction,,0.0, ECONOMIC PARAMETERS,Project lifetime,,30,yr ECONOMIC PARAMETERS,Capacity factor,,90.0,% -ECONOMIC PARAMETERS,Project NPV,,-6.25,MUSD -ECONOMIC PARAMETERS,Project IRR,,4.49,% -ECONOMIC PARAMETERS,Project VIR=PI=PIR,,0.81, -ECONOMIC PARAMETERS,Project MOIC,,3.48, +ECONOMIC PARAMETERS,Project NPV,,-0.41,MUSD +ECONOMIC PARAMETERS,Project IRR,,6.15,% +ECONOMIC PARAMETERS,Project VIR=PI=PIR,,0.99, +ECONOMIC PARAMETERS,Project MOIC,,5.47, ECONOMIC PARAMETERS,Fixed Charge Rate (FCR),,5.0, -ECONOMIC PARAMETERS,Project Payback Period,,17.7,yr +ECONOMIC PARAMETERS,Project Payback Period,,15.53,yr EXTENDED ECONOMICS,"Adjusted Project LCOE (after incentives\, grants\, AddOns\,etc)",,8.7,cents/kWh EXTENDED ECONOMICS,"Adjusted Project LCOH (after incentives\, grants\, AddOns\,etc)",,0.0,USD/MMBTU EXTENDED ECONOMICS,"Adjusted Project CAPEX (after incentives\, grants\, AddOns\, etc)",,102.63,MUSD @@ -666,35 +666,35 @@ REVENUE & CASHFLOW PROFILE,Electricity Price,28,15.0,cents/kWh REVENUE & CASHFLOW PROFILE,Electricity Price,29,15.0,cents/kWh REVENUE & CASHFLOW PROFILE,Electricity Price,30,15.0,cents/kWh REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,1,-32.63,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,2,1.58,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,3,1.62,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,4,1.63,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,5,1.64,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,6,1.65,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,7,1.65,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,1.77,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,9,1.89,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,10,2.01,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,11,2.12,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,12,2.24,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,13,2.25,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,14,2.25,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,15,2.25,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,16,2.25,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,17,2.25,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,18,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,19,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,20,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,21,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,22,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,23,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,24,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,25,2.27,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,26,2.27,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,27,2.27,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,28,2.27,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,29,2.27,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,30,2.27,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,2,1.69,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,3,1.73,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,4,1.75,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,5,1.76,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,6,1.76,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,7,1.77,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,1.97,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,9,2.16,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,10,2.36,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,11,2.56,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,12,2.75,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,13,2.84,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,14,2.92,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,15,3.0,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,16,3.05,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,17,3.05,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,18,3.05,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,19,3.05,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,20,3.06,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,21,3.06,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,22,3.06,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,23,3.06,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,24,3.06,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,25,3.07,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,26,3.07,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,27,3.07,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,28,3.07,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,29,3.07,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,30,3.07,MUSD/yr REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,1,0.0,MUSD REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,2,0.78,MUSD REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,3,1.6,MUSD @@ -905,96 +905,96 @@ REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,27,0.0,MUSD REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,28,0.0,MUSD REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,29,0.0,MUSD REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,30,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Price,1,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,2,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,3,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,4,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,5,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,6,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,7,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,8,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,9,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,10,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,11,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,12,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,13,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,14,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,15,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,16,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,17,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,18,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,19,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,20,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,21,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,22,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,23,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,24,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,25,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,26,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,27,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,28,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,29,0.0,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,30,0.0,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,1,0.01,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,2,0.01,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,3,0.01,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,4,0.01,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,5,0.01,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,6,0.01,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,7,0.03,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,8,0.04,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,9,0.04,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,10,0.06,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,11,0.07,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,12,0.07,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,13,0.09,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,14,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,15,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,16,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,17,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,18,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,19,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,20,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,21,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,22,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,23,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,24,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,25,0.1,USD/tonne +REVENUE & CASHFLOW PROFILE,Carbon Price,26,0.1,USD/tonne +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.,2,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,3,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,4,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,5,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,6,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,7,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,8,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,9,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,10,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,11,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,12,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,13,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,14,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,15,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,16,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,17,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,18,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,19,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,20,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,21,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,22,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,23,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,24,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,25,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,26,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,27,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,28,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,29,0.0,MUSD/yr -REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,30,0.0,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,2,0.11,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,3,0.11,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,4,0.11,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,5,0.12,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,6,0.12,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,7,0.12,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,8,0.19,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,9,0.27,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,10,0.35,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,11,0.43,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,12,0.51,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,13,0.59,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,14,0.67,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,15,0.75,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,16,0.79,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,17,0.79,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,18,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,19,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,20,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,21,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,22,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,23,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,24,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,25,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,26,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,27,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,28,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,29,0.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,30,0.8,MUSD/yr REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,1,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,2,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,3,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,4,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,5,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,6,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,7,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,8,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,9,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,10,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,11,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,12,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,13,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,14,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,15,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,16,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,17,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,18,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,19,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,20,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,21,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,22,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,23,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,24,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,25,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,26,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,27,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,28,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,29,0.0,MUSD -REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,30,0.0,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,2,0.11,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,3,0.22,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,4,0.33,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,5,0.45,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,6,0.56,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,7,0.68,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,8,0.87,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,9,1.15,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,10,1.5,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,11,1.93,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,12,2.45,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,13,3.04,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,14,3.71,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,15,4.46,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,16,5.26,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,17,6.05,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,18,6.84,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,19,7.64,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,20,8.44,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,21,9.24,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,22,10.03,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,23,10.83,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,24,11.63,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,25,12.43,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,26,13.24,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,27,14.04,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,28,14.84,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,29,15.64,MUSD +REVENUE & CASHFLOW PROFILE,Carbon Cumm. Rev.,30,16.45,MUSD REVENUE & CASHFLOW PROFILE,Project OPEX,1,0.0,MUSD/yr REVENUE & CASHFLOW PROFILE,Project OPEX,2,-0.8,MUSD/yr REVENUE & CASHFLOW PROFILE,Project OPEX,3,-0.8,MUSD/yr @@ -1026,62 +1026,62 @@ REVENUE & CASHFLOW PROFILE,Project OPEX,28,-0.8,MUSD/yr REVENUE & CASHFLOW PROFILE,Project OPEX,29,-0.8,MUSD/yr REVENUE & CASHFLOW PROFILE,Project OPEX,30,-0.8,MUSD/yr REVENUE & CASHFLOW PROFILE,Project Net Rev.,1,-32.63,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,2,1.58,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,3,1.62,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,4,1.63,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,5,1.64,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,6,1.65,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,7,1.65,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,8,1.77,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,9,1.89,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,10,2.01,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,11,2.12,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,12,2.24,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,13,2.25,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,14,2.25,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,15,2.25,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,16,2.25,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,17,2.25,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,18,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,19,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,20,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,21,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,22,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,23,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,24,2.26,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,25,2.27,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,26,2.27,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,27,2.27,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,28,2.27,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,29,2.27,MUSD/yr -REVENUE & CASHFLOW PROFILE,Project Net Rev.,30,2.27,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,2,1.69,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,3,1.73,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,4,1.75,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,5,1.76,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,6,1.76,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,7,1.77,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,8,1.97,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,9,2.16,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,10,2.36,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,11,2.56,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,12,2.75,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,13,2.84,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,14,2.92,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,15,3.0,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,16,3.05,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,17,3.05,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,18,3.05,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,19,3.05,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,20,3.06,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,21,3.06,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,22,3.06,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,23,3.06,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,24,3.06,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,25,3.07,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,26,3.07,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,27,3.07,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,28,3.07,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,29,3.07,MUSD/yr +REVENUE & CASHFLOW PROFILE,Project Net Rev.,30,3.07,MUSD/yr REVENUE & CASHFLOW PROFILE,Project Net Cashflow,1,-32.63,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,2,-31.05,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,3,-29.43,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,4,-27.8,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,5,-26.15,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,6,-24.5,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,7,-22.85,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,8,-21.08,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,9,-19.19,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,10,-17.19,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,11,-15.06,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,12,-12.82,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,13,-10.57,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,14,-8.33,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,15,-6.08,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,16,-3.82,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,17,-1.57,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,18,0.69,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,19,2.94,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,20,5.2,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,21,7.46,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,22,9.73,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,23,11.99,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,24,14.25,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,25,16.52,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,26,18.79,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,27,21.06,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,28,23.32,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,29,25.59,MUSD -REVENUE & CASHFLOW PROFILE,Project Net Cashflow,30,27.87,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,2,-30.95,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,3,-29.21,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,4,-27.46,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,5,-25.71,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,6,-23.94,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,7,-22.17,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,8,-20.21,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,9,-18.04,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,10,-15.69,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,11,-13.13,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,12,-10.37,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,13,-7.54,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,14,-4.62,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,15,-1.61,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,16,1.43,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,17,4.48,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,18,7.53,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,19,10.58,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,20,13.64,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,21,16.7,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,22,19.76,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,23,22.82,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,24,25.89,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,25,28.95,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,26,32.02,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,27,35.09,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,28,38.16,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,29,41.24,MUSD +REVENUE & CASHFLOW PROFILE,Project Net Cashflow,30,44.31,MUSD diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index fb1e2c62..734ec3f5 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -4,11 +4,11 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.15 + GEOPHIRES Version: 3.4.16 GEOPHIRES Build Date: 2024-03-05 Simulation Date: 2024-03-05 - Simulation Time: 09:58 - Calculation Time: 0.613 sec + Simulation Time: 11:09 + Calculation Time: 0.630 sec ***SUMMARY OF RESULTS*** @@ -20,6 +20,7 @@ Simulation Metadata Flowrate per production well: 55.0 kg/sec Well depth (or total length, if not vertical): 3.0 kilometer Geothermal gradient: 0.0500 degC/m + Total Avoided Carbon Emissions: 106494.47 metric tonnes ***ECONOMIC PARAMETERS*** @@ -29,11 +30,11 @@ Simulation Metadata Accrued financing during construction: 0.00 Project lifetime: 30 yr Capacity factor: 90.0 % - Project NPV: -6.25 MUSD - Project IRR: 4.49 % - Project VIR=PI=PIR: 0.81 - Project MOIC: 3.48 - Project Payback Period: 17.70 yr + Project NPV: -0.41 MUSD + Project IRR: 6.15 % + Project VIR=PI=PIR: 0.99 + Project MOIC: 5.47 + Project Payback Period: 15.53 yr ***ENGINEERING PARAMETERS*** @@ -210,36 +211,36 @@ 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 9.00 -32.63 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -32.63 -32.63 - 2 9.00 1.58 0.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.58 -31.05 - 3 9.00 1.62 1.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.62 -29.43 - 4 9.00 1.63 2.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.63 -27.80 - 5 9.00 1.64 3.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.64 -26.15 - 6 9.00 1.65 4.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.65 -24.50 - 7 10.20 1.65 4.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.65 -22.85 - 8 11.40 1.77 5.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.77 -21.08 - 9 12.60 1.89 7.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 1.89 -19.19 - 10 13.80 2.01 8.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.01 -17.19 - 11 15.00 2.12 9.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.12 -15.06 - 12 15.00 2.24 11.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.24 -12.82 - 13 15.00 2.25 12.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -10.57 - 14 15.00 2.25 13.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -8.33 - 15 15.00 2.25 15.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -6.08 - 16 15.00 2.25 16.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -3.82 - 17 15.00 2.25 18.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.25 -1.57 - 18 15.00 2.26 19.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 0.69 - 19 15.00 2.26 21.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 2.94 - 20 15.00 2.26 22.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 5.20 - 21 15.00 2.26 24.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 7.46 - 22 15.00 2.26 25.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 9.73 - 23 15.00 2.26 26.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 11.99 - 24 15.00 2.26 28.46 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.26 14.25 - 25 15.00 2.27 29.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 16.52 - 26 15.00 2.27 31.39 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 18.79 - 27 15.00 2.27 32.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 21.06 - 28 15.00 2.27 34.32 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 23.32 - 29 15.00 2.27 35.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 25.59 - 30 15.00 2.27 37.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | -0.80 2.27 27.87 + 1 9.00 -32.63 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.00 0.00 | 0.00 -32.63 -32.63 + 2 9.00 1.69 0.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.11 0.11 | -0.80 1.69 -30.95 + 3 9.00 1.73 1.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.11 0.22 | -0.80 1.73 -29.21 + 4 9.00 1.75 2.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.11 0.33 | -0.80 1.75 -27.46 + 5 9.00 1.76 3.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.12 0.45 | -0.80 1.76 -25.71 + 6 9.00 1.76 4.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.12 0.56 | -0.80 1.76 -23.94 + 7 10.20 1.77 4.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.03 0.12 0.68 | -0.80 1.77 -22.17 + 8 11.40 1.97 5.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.04 0.19 0.87 | -0.80 1.97 -20.21 + 9 12.60 2.16 7.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.04 0.27 1.15 | -0.80 2.16 -18.04 + 10 13.80 2.36 8.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.06 0.35 1.50 | -0.80 2.36 -15.69 + 11 15.00 2.56 9.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.07 0.43 1.93 | -0.80 2.56 -13.13 + 12 15.00 2.75 11.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.07 0.51 2.45 | -0.80 2.75 -10.37 + 13 15.00 2.84 12.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.09 0.59 3.04 | -0.80 2.84 -7.54 + 14 15.00 2.92 13.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.67 3.71 | -0.80 2.92 -4.62 + 15 15.00 3.00 15.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.75 4.46 | -0.80 3.00 -1.61 + 16 15.00 3.05 16.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.79 5.26 | -0.80 3.05 1.43 + 17 15.00 3.05 18.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.79 6.05 | -0.80 3.05 4.48 + 18 15.00 3.05 19.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 6.84 | -0.80 3.05 7.53 + 19 15.00 3.05 21.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 7.64 | -0.80 3.05 10.58 + 20 15.00 3.06 22.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 8.44 | -0.80 3.06 13.64 + 21 15.00 3.06 24.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 9.24 | -0.80 3.06 16.70 + 22 15.00 3.06 25.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 10.03 | -0.80 3.06 19.76 + 23 15.00 3.06 26.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 10.83 | -0.80 3.06 22.82 + 24 15.00 3.06 28.46 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 11.63 | -0.80 3.06 25.89 + 25 15.00 3.07 29.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 12.43 | -0.80 3.07 28.95 + 26 15.00 3.07 31.39 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 13.24 | -0.80 3.07 32.02 + 27 15.00 3.07 32.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 14.04 | -0.80 3.07 35.09 + 28 15.00 3.07 34.32 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 14.84 | -0.80 3.07 38.16 + 29 15.00 3.07 35.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 15.64 | -0.80 3.07 41.24 + 30 15.00 3.07 37.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.10 0.80 16.45 | -0.80 3.07 44.31 diff --git a/tests/examples/example1_addons.txt b/tests/examples/example1_addons.txt index 37a58ea3..78e0ad69 100644 --- a/tests/examples/example1_addons.txt +++ b/tests/examples/example1_addons.txt @@ -1,7 +1,10 @@ -Starting CCUS Credit Value,0.015 -Ending CCUS Credit Value, 0.1 -CCUS Escalation Start Year, 5 -CCUS Escalation Rate Per Year, 0.01 +Do AddOn Calculations, True +Do Carbon Price Calculations, True + +Starting Carbon Credit Value,0.015 +Ending Carbon Credit Value, 0.1 +Carbon Escalation Start Year, 5 +Carbon Escalation Rate Per Year, 0.01 Current Grid CO2 production,0.82 Starting Heat Sale Price,0.0123 Ending Heat Sale Price,0.0359 From 81e2ff1c93fc54b5ade3dbede22027ad77280c7d Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:46:04 -0800 Subject: [PATCH 14/14] Use ISO format for dates in input files; update modified dates for files that contain them, based on date of last functional change in git history --- ...eckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.txt | 2 +- ...ckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.txt | 2 +- .../Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.txt | 2 +- .../Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.txt | 2 +- ...Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.txt | 2 +- ...Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.txt | 2 +- tests/examples/SUTRAExample1.txt | 4 ++-- .../Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.txt | 4 ++-- tests/examples/example1.txt | 4 ++-- tests/examples/example12_DH.txt | 4 ++-- tests/examples/example13.txt | 2 +- tests/examples/example2.txt | 4 ++-- tests/examples/example4.txt | 4 ++-- tests/examples/example5.txt | 4 ++-- tests/examples/example8.txt | 4 ++-- tests/examples/example9.txt | 4 ++-- tests/examples/example_multiple_gradients.txt | 4 ++-- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.txt b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.txt index 977d2a6b..10c23e46 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.txt +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.txt @@ -1,5 +1,5 @@ #GEOPHIRES v3.0 Input File -#Last modified on 4/12/2023 +#Last modified on 2024-01-29 #Example Description: Example 1 from "Tabulated Database of Closed-Loop Geothermal Systems Performance for Cloud-Based Technical and Economic Modeling of Heat Production and Electricity Generation" #Koenraad Beckers Yaroslav Vasyliv Gabriela A. Bran-Anleu Mario Martinez Chad Augustine and Mark White #Presented at the 48th Stanford Geothermal Workshop Stanford California February 6-8 2023 diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.txt b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.txt index 2aa059db..205b82ca 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.txt +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.txt @@ -1,5 +1,5 @@ #GEOPHIRES v3.0 Input File -#Last modified on 4/12/2023 +#Last modified on 2023-04-12 #Example Description: Example 1 from "Tabulated Database of Closed-Loop Geothermal Systems Performance for Cloud-Based Technical and Economic Modeling of Heat Production and Electricity Generation" #Koenraad Beckers Yaroslav Vasyliv Gabriela A. Bran-Anleu Mario Martinez Chad Augustine and Mark White #Presented at the 48th Stanford Geothermal Workshop Stanford California February 6-8 2023 diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.txt b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.txt index c45f7b66..8108236c 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.txt +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.txt @@ -1,5 +1,5 @@ #GEOPHIRES v3.0 Input File -#Last modified on 4/12/2023 +#Last modified on 2024-01-29 #Example Description: Example 1 from "Tabulated Database of Closed-Loop Geothermal Systems Performance for Cloud-Based Technical and Economic Modeling of Heat Production and Electricity Generation" #Koenraad Beckers Yaroslav Vasyliv Gabriela A. Bran-Anleu Mario Martinez Chad Augustine and Mark White #Presented at the 48th Stanford Geothermal Workshop Stanford California February 6-8 2023 diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.txt b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.txt index 42bbc232..b78992d3 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.txt +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.txt @@ -1,5 +1,5 @@ #GEOPHIRES v3.0 Input File -#Last modified on 4/12/2023 +#Last modified on 2023-04-12 #Example Description: Example 1 from "Tabulated Database of Closed-Loop Geothermal Systems Performance for Cloud-Based Technical and Economic Modeling of Heat Production and Electricity Generation" #Koenraad Beckers Yaroslav Vasyliv Gabriela A. Bran-Anleu Mario Martinez Chad Augustine and Mark White #Presented at the 48th Stanford Geothermal Workshop Stanford California February 6-8 2023 diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.txt b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.txt index 911b56bb..19e58b33 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.txt +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.txt @@ -1,5 +1,5 @@ #GEOPHIRES v3.0 Input File -#Last modified on 4/12/2023 +#Last modified on 2024-01-29 #Example Description: Example 1 from "Tabulated Database of Closed-Loop Geothermal Systems Performance for Cloud-Based Technical and Economic Modeling of Heat Production and Electricity Generation" #Koenraad Beckers Yaroslav Vasyliv Gabriela A. Bran-Anleu Mario Martinez Chad Augustine and Mark White #Presented at the 48th Stanford Geothermal Workshop Stanford California February 6-8 2023 diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.txt b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.txt index adf7142f..1ecda7d5 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.txt +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.txt @@ -1,5 +1,5 @@ #GEOPHIRES v3.0 Input File -#Last modified on 4/12/2023 +#Last modified on 2023-04-12 #Example Description: Example 1 from "Tabulated Database of Closed-Loop Geothermal Systems Performance for Cloud-Based Technical and Economic Modeling of Heat Production and Electricity Generation" #Koenraad Beckers Yaroslav Vasyliv Gabriela A. Bran-Anleu Mario Martinez Chad Augustine and Mark White #Presented at the 48th Stanford Geothermal Workshop Stanford California February 6-8 2023 diff --git a/tests/examples/SUTRAExample1.txt b/tests/examples/SUTRAExample1.txt index 33eb3854..5eb32aa5 100644 --- a/tests/examples/SUTRAExample1.txt +++ b/tests/examples/SUTRAExample1.txt @@ -1,6 +1,6 @@ GEOPHIRES v3.0 Input File -Created on 11/3/2023 -Last modified on 11/3/2023 +Created on 2023-11-03 +Last modified on 2024-01-18 Reservoir thermal energy storage simulated with SUTRA This example reads in a SUTRA simulation result and calculate techno-economics of seasonal reservoir thermal energy storage. diff --git a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.txt b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.txt index 78da76e7..8ae5a2e6 100644 --- a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.txt +++ b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.txt @@ -1,8 +1,8 @@ ---------------------------------------------------------------------------------------- GEOPHIRES v3.0 Input File Geothermal Electricity Example Problem using Percentage Thermal Drawdown Model (Example X) and closed loops -Oringinally created by NREL on 3/26/2018 as Example 4 -Last modified on 2/26/2023 +Originally created by NREL on 2018-03-26 as Example 4 +Last modified on 2023-09-29 Example X Description: This example problem considers a simple reservoir at 2 km depth with an initial production temperature of 145deg.C. The thermal drawdown diff --git a/tests/examples/example1.txt b/tests/examples/example1.txt index de3a73b7..08deaa35 100644 --- a/tests/examples/example1.txt +++ b/tests/examples/example1.txt @@ -1,6 +1,6 @@ GEOPHIRES v2.0 Input File -Created on 6/11/2018 -Last modified on 6/12/2018 +Created on 2018-06-11 +Last modified on 2024-02-28 Geothermal Electricity Problem using a Multiple Parallel Fractures Model Example 1 Description: This problem considers an EGS reservoir at 3km depth. diff --git a/tests/examples/example12_DH.txt b/tests/examples/example12_DH.txt index 97ffadab..a4027934 100644 --- a/tests/examples/example12_DH.txt +++ b/tests/examples/example12_DH.txt @@ -1,8 +1,8 @@ ---------------------------------------------------------------------------------------- GEOPHIRES v2.0 Input File Geothermal Electricity Example Problem using Percentage Thermal Drawdown Model (Example 4) -Created by Charley Walton on 7/25/2022 -Last modified on 8/12/2022 +Created by Charley Walton on 2022-07-25 +Last modified on 2024-01-04 Description: This example considers Cornell's existing district heating network assesses the performance of a proposed geothermal well. A known heat demand profile for the district diff --git a/tests/examples/example13.txt b/tests/examples/example13.txt index 947dae39..b5957819 100644 --- a/tests/examples/example13.txt +++ b/tests/examples/example13.txt @@ -2,7 +2,7 @@ GEOPHIRES v3.0 Input File Example 13 This example file tests redrilling due to excessive drawdown and use of cogen bottoming cycle as end-use -Created by Koenraad Beckers on 11/20/2023 +Created by Koenraad Beckers on 2023-11-20 ---------------------------------------------------------------------------------------- *** Subsurface technical parameters *** diff --git a/tests/examples/example2.txt b/tests/examples/example2.txt index f521ef57..87acf81c 100644 --- a/tests/examples/example2.txt +++ b/tests/examples/example2.txt @@ -1,6 +1,6 @@ GEOPHIRES v2.0 Input File -Created on 6/11/2018 -Last modified on 6/12/2018 +Created on 2018-06-11 +Last modified on 2018-06-11 Geothermal Direct-Use Example Problem using a Linear Heat Sweep Model. Example 2 Description: This problem considers an EGS reservoir at 3km depth. diff --git a/tests/examples/example4.txt b/tests/examples/example4.txt index c7c3a16b..dd43ded5 100644 --- a/tests/examples/example4.txt +++ b/tests/examples/example4.txt @@ -1,8 +1,8 @@ ---------------------------------------------------------------------------------------- GEOPHIRES v2.0 Input File Geothermal Electricity Example Problem using Percentage Thermal Drawdown Model (Example 4) -Created by NREL on 3/26/2018 -Last modified on 6/12/2018 +Created by NREL on 2018-03-26 +Last modified on 2018-06-12 Example 4 Description: This example problem considers a simple hydrothermal reservoir at 2 km depth with an initial production temperature of 145deg.C. The thermal drawdown diff --git a/tests/examples/example5.txt b/tests/examples/example5.txt index 7f23e2c2..ad35dbdf 100644 --- a/tests/examples/example5.txt +++ b/tests/examples/example5.txt @@ -1,8 +1,8 @@ ---------------------------------------------------------------------------------------- GEOPHIRES v2.0 Input File Geothermal Direct-Use Example Problem using User-Provided Temperature Data (Example 5) -Created by NREL on 3/26/2018 -Last modified on 6/12/2018 +Created by NREL on 3/26/2018-03-26 +Last modified on 2018-06-12 Example 5 Description: This example problem considers an EGS reservoir at 3 km depth with bottom-hole temperature of 150deg.C. The reservoir output temperature is imported from diff --git a/tests/examples/example8.txt b/tests/examples/example8.txt index b196ba82..beda8bd3 100644 --- a/tests/examples/example8.txt +++ b/tests/examples/example8.txt @@ -1,6 +1,6 @@ GEOPHIRES v2.0 Input File -Created on 6/11/2018 -Last modified on 6/12/2018 +Created on 2018-06-11 +Last modified on 2018-06-12 Geothermal Direct-Use Heat using Multiple Parallel Fractures Model (EGS) Example 8 Description: This problem considers an EGS reservoir at 2.8 km depth for direct-use (Cornell conditions). diff --git a/tests/examples/example9.txt b/tests/examples/example9.txt index fa21e50c..4eba7b80 100644 --- a/tests/examples/example9.txt +++ b/tests/examples/example9.txt @@ -1,6 +1,6 @@ GEOPHIRES v2.0 Input File -Created on 6/11/2018 -Last modified on 6/12/2018 +Created on 2018-06-11 +Last modified on 2023-11-20 Geothermal Direct-Use Heat using Multiple Parallel Fractures Model (EGS) Example 9 Description: This problem considers an EGS reservoir at 3.5 km depth for ORC electricity production (Cornell conditions). diff --git a/tests/examples/example_multiple_gradients.txt b/tests/examples/example_multiple_gradients.txt index b8add9f3..bc9ad95a 100644 --- a/tests/examples/example_multiple_gradients.txt +++ b/tests/examples/example_multiple_gradients.txt @@ -1,6 +1,6 @@ GEOPHIRES v3.0 Input File -Created on 11/11/2023 -Last modified on 11/11/2023 +Created on 2023-11-11 +Last modified on 2023-11-11 Unit test for multiple geothermal gradients Description: This problem considers an EGS reservoir at 4km depth with multiple geothermal gradients.