From b7827193c46c9d4b0d7fbffab3800fb3bd83e163 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Thu, 27 Feb 2025 12:05:25 -0800 Subject: [PATCH 01/20] Address https://github.com/NREL/GEOPHIRES-X/issues/141?title=Derive+CCUS+profile+from+revenue+&+cashflow+profile --- src/geophires_x_client/geophires_x_result.py | 95 ++++++++++++++----- tests/example1_addons.csv | 92 +++++++++++++++++- tests/examples/example1_addons.out | 8 +- ...ut => result_with_ccus_profile_legacy.out} | 0 tests/test_geophires_x_client.py | 24 ++++- 5 files changed, 188 insertions(+), 31 deletions(-) rename tests/{result_with_ccus_profile.out => result_with_ccus_profile_legacy.out} (100%) diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py index cbaec5c4c..abc3ab2ab 100644 --- a/src/geophires_x_client/geophires_x_result.py +++ b/src/geophires_x_client/geophires_x_result.py @@ -6,6 +6,7 @@ from io import StringIO from pathlib import Path from types import MappingProxyType +from typing import ClassVar from .common import _get_logger from .geophires_input_parameters import EndUseOption @@ -542,27 +543,29 @@ def _get_heat_electricity_extraction_generation_profile(self): profile_lines = self._get_profile_lines('HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE') return self._get_data_from_profile_lines(profile_lines) + _REVENUE_AND_CASHFLOW_PROFILE_HEADERS: ClassVar[list[str]] = [ + 'Year Since Start', + 'Electricity Price (cents/kWh)', + 'Electricity Ann. Rev. (MUSD/yr)', + 'Electricity Cumm. Rev. (MUSD)', + 'Heat Price (cents/kWh)', + 'Heat Ann. Rev. (MUSD/yr)', + 'Heat Cumm. Rev. (MUSD)', + 'Cooling Price (cents/kWh)', + 'Cooling Ann. Rev. (MUSD/yr)', + 'Cooling Cumm. Rev. (MUSD)', + 'Carbon Price (USD/tonne)', + 'Carbon Ann. Rev. (MUSD/yr)', + 'Carbon Cumm. Rev. (MUSD)', + 'Project OPEX (MUSD/yr)', + 'Project Net Rev. (MUSD/yr)', + 'Project Net Cashflow (MUSD)', + ] + def _get_revenue_and_cashflow_profile(self): def extract_table_header(lines: list) -> list: # Tried various regexy approaches to extract this programmatically but landed on hard-coding. - return [ - 'Year Since Start', - 'Electricity Price (cents/kWh)', - 'Electricity Ann. Rev. (MUSD/yr)', - 'Electricity Cumm. Rev. (MUSD)', - 'Heat Price (cents/kWh)', - 'Heat Ann. Rev. (MUSD/yr)', - 'Heat Cumm. Rev. (MUSD)', - 'Cooling Price (cents/kWh)', - 'Cooling Ann. Rev. (MUSD/yr)', - 'Cooling Cumm. Rev. (MUSD)', - 'Carbon Price (USD/tonne)', - 'Carbon Ann. Rev. (MUSD/yr)', - 'Carbon Cumm. Rev. (MUSD)', - 'Project OPEX (MUSD/yr)', - 'Project Net Rev. (MUSD/yr)', - 'Project Net Cashflow (MUSD)', - ] + return GeophiresXResult._REVENUE_AND_CASHFLOW_PROFILE_HEADERS try: lines = self._get_profile_lines('REVENUE & CASHFLOW PROFILE') @@ -622,11 +625,57 @@ def extract_table_header(lines: list) -> list: return None def _get_ccus_profile(self): - """ - FIXME TODO - transform from revenue & cashflow if present (CCUS profile replaced by revenue & cashflow - profile in 49ff3a1213ac778ed53120626807e9a680d1ddcf) - """ + profile_legacy = self._get_ccus_profile_legacy() + if profile_legacy is not None: + return profile_legacy + + revenue_and_cashflow_profile = self._get_revenue_and_cashflow_profile() + if revenue_and_cashflow_profile is None: + return None + + carbon_price_field_name = 'Carbon Price (USD/tonne)' + headers = [ + 'Year Since Start', + # 'Carbon Avoided (pound)', # Present in legacy CCUS profile but not in Revenue & Cashflow + carbon_price_field_name, # Legacy field name: 'CCUS Price (USD/lb)' + 'Carbon Ann. Rev. (MUSD/yr)', # Legacy field name: 'CCUS Revenue (MUSD/yr)' + # 'CCUS Annual Cash Flow (MUSD/yr)', # Present in legacy CCUS profile but not in Revenue & Cashflow + 'Carbon Cumm. Rev. (MUSD)', # # Legacy field name: 'CCUS Cumm. Cash Flow (MUSD)' + # 'Project Annual Cash Flow (MUSD/yr)', # Present in legacy CCUS profile but not in Revenue & Cashflow + # 'Project Cumm. Cash Flow (MUSD)', # Present in legacy CCUS profile but not in Revenue & Cashflow + ] + + carbon_price_index = revenue_and_cashflow_profile[0].index(carbon_price_field_name) + has_ccus_profile_in_revenue_and_cashflow = ( + len(revenue_and_cashflow_profile) > 1 + and carbon_price_field_name in revenue_and_cashflow_profile[0] + # Treat all-zero values as not having CCUS profile + and any(it != 0 for it in [x[carbon_price_index] for x in revenue_and_cashflow_profile[1:]]) + ) + + if not has_ccus_profile_in_revenue_and_cashflow: + return None + try: + profile = [headers] + + headers_with_rcp_index = [ + (header, GeophiresXResult._REVENUE_AND_CASHFLOW_PROFILE_HEADERS.index(header)) for header in headers + ] + + for i in range(1, len(revenue_and_cashflow_profile)): + ccus_entry = [] + for j in range(len(headers_with_rcp_index)): + rcp_index = headers_with_rcp_index[j][1] + ccus_entry.append(revenue_and_cashflow_profile[i][rcp_index]) + profile.append(ccus_entry) + + return profile + except BaseException as e: + self._logger.debug(f'Failed to get CCUS profile: {e}') + return None + + def _get_ccus_profile_legacy(self): def extract_table_header(lines: list) -> list: # Tried various regexy approaches to extract this programmatically but landed on hard-coding. return [ @@ -646,7 +695,7 @@ def extract_table_header(lines: list) -> list: profile.extend(self._extract_addons_style_table_data(lines)) return profile except BaseException as e: - self._logger.debug(f'Failed to get CCUS profile: {e}') + self._logger.debug(f'Failed to get legacy CCUS profile: {e}') return None def _extract_addons_style_table_data(self, lines: list): diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index 9eb380972..9da76c998 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -99,7 +99,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,, SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,% SURFACE EQUIPMENT SIMULATION RESULTS,Heat to Power Conversion Efficiency,,10.07,% -Simulation Metadata,GEOPHIRES Version,,3.7.1, +Simulation Metadata,GEOPHIRES Version,,3.7.16, POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0, POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056, POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073, @@ -1090,3 +1090,93 @@ REVENUE & CASHFLOW PROFILE,Project Net Cashflow,27,197.51,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,28,208.24,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,29,218.97,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,30,229.7,MUSD +CCUS PROFILE,Carbon Price,1,0.0,USD/tonne +CCUS PROFILE,Carbon Price,2,0.01,USD/tonne +CCUS PROFILE,Carbon Price,3,0.01,USD/tonne +CCUS PROFILE,Carbon Price,4,0.01,USD/tonne +CCUS PROFILE,Carbon Price,5,0.01,USD/tonne +CCUS PROFILE,Carbon Price,6,0.01,USD/tonne +CCUS PROFILE,Carbon Price,7,0.01,USD/tonne +CCUS PROFILE,Carbon Price,8,0.03,USD/tonne +CCUS PROFILE,Carbon Price,9,0.04,USD/tonne +CCUS PROFILE,Carbon Price,10,0.04,USD/tonne +CCUS PROFILE,Carbon Price,11,0.06,USD/tonne +CCUS PROFILE,Carbon Price,12,0.07,USD/tonne +CCUS PROFILE,Carbon Price,13,0.07,USD/tonne +CCUS PROFILE,Carbon Price,14,0.09,USD/tonne +CCUS PROFILE,Carbon Price,15,0.1,USD/tonne +CCUS PROFILE,Carbon Price,16,0.1,USD/tonne +CCUS PROFILE,Carbon Price,17,0.1,USD/tonne +CCUS PROFILE,Carbon Price,18,0.1,USD/tonne +CCUS PROFILE,Carbon Price,19,0.1,USD/tonne +CCUS PROFILE,Carbon Price,20,0.1,USD/tonne +CCUS PROFILE,Carbon Price,21,0.1,USD/tonne +CCUS PROFILE,Carbon Price,22,0.1,USD/tonne +CCUS PROFILE,Carbon Price,23,0.1,USD/tonne +CCUS PROFILE,Carbon Price,24,0.1,USD/tonne +CCUS PROFILE,Carbon Price,25,0.1,USD/tonne +CCUS PROFILE,Carbon Price,26,0.1,USD/tonne +CCUS PROFILE,Carbon Price,27,0.1,USD/tonne +CCUS PROFILE,Carbon Price,28,0.1,USD/tonne +CCUS PROFILE,Carbon Price,29,0.1,USD/tonne +CCUS PROFILE,Carbon Price,30,0.1,USD/tonne +CCUS PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,4,0.52,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,5,0.52,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,6,0.52,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,7,0.52,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,8,0.87,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,9,1.22,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,10,1.57,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,11,1.92,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,12,2.27,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,13,2.62,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,14,2.97,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,15,3.32,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,16,3.49,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,17,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,18,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,19,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,20,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,21,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,22,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,23,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,24,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,25,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,26,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,27,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,28,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,29,3.5,MUSD/yr +CCUS PROFILE,Carbon Ann. Rev.,30,3.5,MUSD/yr +CCUS PROFILE,Carbon Cumm. Rev.,1,0.0,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,2,0.51,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,3,1.03,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,4,1.55,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,5,2.07,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,6,2.59,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,7,3.11,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,8,3.98,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,9,5.2,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,10,6.77,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,11,8.69,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,12,10.95,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,13,13.57,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,14,16.54,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,15,19.86,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,16,23.35,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,17,26.85,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,18,30.34,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,19,33.84,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,20,37.34,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,21,40.84,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,22,44.34,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,23,47.84,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,24,51.34,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,25,54.84,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,26,58.34,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,27,61.85,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,28,65.35,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,29,68.85,MUSD +CCUS PROFILE,Carbon Cumm. Rev.,30,72.36,MUSD diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index f74024453..afc76cd88 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.779 sec + GEOPHIRES Version: 3.7.16 + Simulation Date: 2025-02-27 + Simulation Time: 11:53 + Calculation Time: 0.786 sec ***SUMMARY OF RESULTS*** diff --git a/tests/result_with_ccus_profile.out b/tests/result_with_ccus_profile_legacy.out similarity index 100% rename from tests/result_with_ccus_profile.out rename to tests/result_with_ccus_profile_legacy.out diff --git a/tests/test_geophires_x_client.py b/tests/test_geophires_x_client.py index d3e2cfc23..15746f8b1 100644 --- a/tests/test_geophires_x_client.py +++ b/tests/test_geophires_x_client.py @@ -346,9 +346,27 @@ def test_revenue_and_cashflow_profile(self): ) def test_ccus_profile(self): - test_result_path = self._get_test_file_path('result_with_ccus_profile.out') + result_example1 = GeophiresXResult(self._get_test_file_path('examples/example1.out')) + self.assertTrue('CCUS PROFILE' not in result_example1.result) + + result_addons = GeophiresXResult(self._get_test_file_path('examples/example1_addons.out')) + ccus_profile = result_addons.result['CCUS PROFILE'] + self.assertIsNotNone(ccus_profile) + self.assertListEqual( + ccus_profile[0], + ['Year Since Start', 'Carbon Price (USD/tonne)', 'Carbon Ann. Rev. (MUSD/yr)', 'Carbon Cumm. Rev. (MUSD)'], + ) + + self.assertListEqual(ccus_profile[1], [1, 0.0, 0.0, 0.0]) + + self.assertListEqual(ccus_profile[2], [2, 0.01, 0.51, 0.51]) + + self.assertListEqual(ccus_profile[30], [30, 0.1, 3.5, 72.36]) + + def test_ccus_profile_legacy(self): + test_result_path = self._get_test_file_path('result_with_ccus_profile_legacy.out') result = GeophiresXResult(test_result_path) - ccus_profile = result.result['CCUS PROFILE'] + ccus_profile_legacy = result.result['CCUS PROFILE'] self.assertListEqual( [ @@ -394,7 +412,7 @@ def test_ccus_profile(self): [30, 8035085.158, 0.1, 0.8, 0.8, 16.45, 3.07, 44.31], [31, 6703146.945, 0.1, 0.67, 0.67, 17.12, 2.7, 47.01], ], - ccus_profile, + ccus_profile_legacy, ) def test_non_vertical_section_cost(self): From 03fe26c85349f3a57746c49adbb1ae359b259e2a Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Thu, 27 Feb 2025 12:05:42 -0800 Subject: [PATCH 02/20] =?UTF-8?q?Bump=20version:=203.7.16=20=E2=86=92=203.?= =?UTF-8?q?7.17?= 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 e2d7d4445..9dd202fd1 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.16 +current_version = 3.7.17 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index ba4716559..e36ef9a71 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.7.16 + version: 3.7.17 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index 8ecffc5d8..40811e6f6 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,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.7.16.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.17.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.16...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.17...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 c6aa0309c..c7cae601d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2025' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.7.16' +version = release = '3.7.17' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index f47a74903..c50df076f 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.7.16', + version='3.7.17', 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 687f883de..80209f623 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.7.16' +__version__ = '3.7.17' From c55417162bedeb828cc3fcfd79ec264d12960c70 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 08:58:33 -0800 Subject: [PATCH 03/20] Remove 'Do CCUS Calculations' from SUTRAEconomics - has no effect as a result of apparent oversight in https://github.com/NREL/GEOPHIRES-X/commit/49ff3a1213ac778ed53120626807e9a680d1ddcf --- src/geophires_x/SUTRAEconomics.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/geophires_x/SUTRAEconomics.py b/src/geophires_x/SUTRAEconomics.py index f2211cf49..b866f8fc3 100644 --- a/src/geophires_x/SUTRAEconomics.py +++ b/src/geophires_x/SUTRAEconomics.py @@ -153,15 +153,6 @@ def __init__(self, model: Model): ErrMessage="assume default: no economics calculations", ToolTipText="Set to true if you want the add-on economics calculations to be made", ) - self.DoCCUSCalculations = self.ParameterDict[self.DoCCUSCalculations.Name] = boolParameter( - "Do CCUS Calculations", - value=False, - DefaultValue=False, - UnitType=Units.NONE, - Required=False, - ErrMessage="assume default: no CCUS calculations", - ToolTipText="Set to true if you want the CCUS economics calculations to be made", - ) self.DoSDACGTCalculations = self.ParameterDict[self.DoSDACGTCalculations.Name] = boolParameter( "Do S-DAC-GT Calculations", value=False, From 822739eb5d1043de550bdacfa4ded3f3f2b5c3c1 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 09:03:38 -0800 Subject: [PATCH 04/20] Remove EconomicsCCUS and OutputsCCUS which have been unused since refactoring in https://github.com/NREL/GEOPHIRES-X/commit/49ff3a1213ac778ed53120626807e9a680d1ddcf. Includes schema regeneration which removes CCUS-only parameters, switches construction years to surface plant category from economics. --- src/geophires_x/EconomicsCCUS.py | 428 ------------------ src/geophires_x/OutputsCCUS.py | 74 --- src/geophires_x_schema_generator/__init__.py | 2 - .../geophires-request.json | 47 +- 4 files changed, 1 insertion(+), 550 deletions(-) delete mode 100644 src/geophires_x/EconomicsCCUS.py delete mode 100644 src/geophires_x/OutputsCCUS.py diff --git a/src/geophires_x/EconomicsCCUS.py b/src/geophires_x/EconomicsCCUS.py deleted file mode 100644 index cb7178f99..000000000 --- a/src/geophires_x/EconomicsCCUS.py +++ /dev/null @@ -1,428 +0,0 @@ -import sys -import os -import math -import numpy_financial as npf -from geophires_x.Economics import BuildPricingModel, Economics -from geophires_x.OptionList import EndUseOptions -from geophires_x.Parameter import intParameter, floatParameter, OutputParameter -from geophires_x.Units import * - - -class EconomicsCCUS(Economics): - def __init__(self, model): - """ - The __init__ function is called automatically when a class is instantiated. - It initializes the attributes of an object, and sets default values for certain arguments - that can be overridden by user input. - The __init__ function is used to set up all the parameters in the CCUS Economics. - Set up all the Parameters that will be predefined by this class using the different types of parameter classes. - Setting up includes giving it a name, a default value, The Unit Type (length, volume, temperature, etc.) and - Unit Name of that value, sets it as required (or not), sets allowable range, the error message if that range - is exceeded, the ToolTip Text, and the name of teh class that created it. - This includes setting up temporary variables that will be available to all the class but noy read in by user, - or used for Output - This also includes all Parameters that are calculated and then published using the Printouts function. - If you choose to subclass this master class, you can do so before or after you create your own parameters. - If you do, you can also choose to call this method from you class, which will effectively add and set - all these parameters to your class. - set up the parameters using the Parameter Constructors (intParameter, floatParameter, strParameter, etc.); - initialize with their name, default value, and valid range (if int or float). Optionally, you can specify: - Required (is it required to run? default value = False), ErrMessage (what GEOPHIRES will report if the - value provided is invalid, "assume default value (see manual)"), ToolTipText (when there is a GUI, - this is the text that the user will see, "This is ToolTip Text"), - UnitType (the type of units associated with this parameter (length, temperature, density, etc), Units.NONE), - CurrentUnits (what the units are for this parameter (meters, celcius, gm/cc, etc., Units:NONE), - and PreferredUnits (usually equal to CurrentUnits, but these are the units that the calculations assume - when running, Units.NONE - :param model: The container class of the application, giving access to everything else, including the logger - :type model: :class:`~geophires_x.Model.Model` - :return: None - """ - model.logger.info("Init " + str(__class__) + ": " + sys._getframe().f_code.co_name) - super().__init__(model) # initialize the parent parameters and variables - sclass = str(__class__).replace("", "") - self.MyPath = os.path.abspath(__file__) - - self.FixedInternalRate = self.ParameterDict[self.FixedInternalRate.Name] = floatParameter( - "Fixed Internal Rate", - DefaultValue=6.25, - Min=0.0, - Max=100.0, - UnitType=Units.PERCENT, - PreferredUnits=PercentUnit.PERCENT, - CurrentUnits=PercentUnit.PERCENT, - ErrMessage="assume default for fixed internal rate (6.25%)", - ToolTipText="Fixed Internal Rate (used in NPV calculation)" - ) - self.ConstructionYears = self.ParameterDict[self.ConstructionYears.Name] = intParameter( - "Construction Years", - DefaultValue=1, - AllowableRange=list(range(1, 15, 1)), - UnitType=Units.NONE, - ErrMessage="assume default number of years in construction (1)", - ToolTipText="Number of years spent in construction (assumes whole years, no fractions)" - ) - self.CCUSEndPrice = self.ParameterDict[self.CCUSEndPrice.Name] = floatParameter( - "Ending CCUS Credit Value", - DefaultValue=0.0, - Min=0, - Max=1000, - UnitType=Units.COSTPERMASS, - PreferredUnits=CostPerMassUnit.DOLLARSPERLB, - CurrentUnits=CostPerMassUnit.DOLLARSPERLB - ) - self.CCUSEscalationStart = self.ParameterDict[self.CCUSEscalationStart.Name] = intParameter( - "CCUS Escalation Start Year", - DefaultValue=0, - AllowableRange=list(range(0, 101, 1)), - UnitType=Units.TIME, - PreferredUnits=TimeUnit.YEAR, - CurrentUnits=TimeUnit.YEAR, - ErrMessage="assume default CCUS escalation delay time (5 years)", - ToolTipText="Number of years after start of project before start of CCUS incentives" - ) - self.CCUSEscalationRate = self.ParameterDict[self.CCUSEscalationRate.Name] = floatParameter( - "CCUS Escalation Rate Per Year", - DefaultValue=0.0, - Min=0.0, - Max=100.0, - UnitType=Units.COSTPERMASS, - PreferredUnits=CostPerMassUnit.DOLLARSPERMT, - CurrentUnits=CostPerMassUnit.DOLLARSPERMT, - ErrMessage="assume no CCUS credit escalation (0.0)", - ToolTipText="additional value per year of price after escalation starts" - ) - self.CCUSStartPrice = self.ParameterDict[self.CCUSStartPrice.Name] = floatParameter( - "Starting CCUS Credit Value", - DefaultValue=0.0, - Min=0, - Max=1000, - UnitType=Units.COSTPERMASS, - PreferredUnits=CostPerMassUnit.DOLLARSPERMT, - CurrentUnits=CostPerMassUnit.DOLLARSPERMT - ) - self.CCUSGridCO2 = self.ParameterDict[self.CCUSGridCO2.Name] = floatParameter( - "Current Grid CO2 production", - DefaultValue=0.0, - Min=0, - Max=50000, - UnitType=Units.CO2PRODUCTION, - PreferredUnits=CO2ProductionUnit.LBSPERKWH, - CurrentUnits=CO2ProductionUnit.LBSPERKWH - ) - self.HeatStartPrice = self.ParameterDict[self.HeatStartPrice.Name] = floatParameter( - "Starting Heat Sale Price", - DefaultValue=0.025, - Min=0, - Max=100, - UnitType=Units.ENERGYCOST, - PreferredUnits=EnergyCostUnit.DOLLARSPERKWH, - CurrentUnits=EnergyCostUnit.DOLLARSPERKWH - ) - self.HeatEndPrice = self.ParameterDict[self.HeatEndPrice.Name] = floatParameter( - "Ending Heat Sale Price", - DefaultValue=0.025, - Min=0, - Max=100, - UnitType=Units.ENERGYCOST, - PreferredUnits=EnergyCostUnit.DOLLARSPERKWH, - CurrentUnits=EnergyCostUnit.DOLLARSPERKWH - ) - self.HeatEscalationStart = self.ParameterDict[self.HeatEscalationStart.Name] = intParameter( - "Heat Escalation Start Year", - DefaultValue=5, - AllowableRange=list(range(0, 101, 1)), - UnitType=Units.TIME, - PreferredUnits=TimeUnit.YEAR, - CurrentUnits=TimeUnit.YEAR, - ErrMessage="assume default heat escalation delay time (5 years)", - ToolTipText="Number of years after start of project before start of escalation" - ) - self.HeatEscalationRate = self.ParameterDict[self.HeatEscalationRate.Name] = floatParameter( - "Heat Escalation Rate Per Year", - DefaultValue=0.0, - Min=0.0, - Max=100.0, - UnitType=Units.ENERGYCOST, - PreferredUnits=EnergyCostUnit.DOLLARSPERKWH, - CurrentUnits=EnergyCostUnit.DOLLARSPERKWH, - ErrMessage="assume no heat price escalation (0.0)", - ToolTipText="additional cost per year of price after escalation starts" - ) - self.ElecStartPrice = self.ParameterDict[self.ElecStartPrice.Name] = floatParameter( - "Starting Electricity Sale Price", - DefaultValue=0.055, - Min=0, - Max=100, - UnitType=Units.ENERGYCOST, - PreferredUnits=EnergyCostUnit.DOLLARSPERKWH, - CurrentUnits=EnergyCostUnit.DOLLARSPERKWH - ) - self.ElecEndPrice = self.ParameterDict[self.ElecEndPrice.Name] = floatParameter( - "Ending Electricity Sale Price", - DefaultValue=0.055, - Min=0, - Max=100, - UnitType=Units.ENERGYCOST, - PreferredUnits=EnergyCostUnit.DOLLARSPERKWH, - CurrentUnits=EnergyCostUnit.DOLLARSPERKWH - ) - self.ElecEscalationStart = self.ParameterDict[self.ElecEscalationStart.Name] = intParameter( - "Electricity Escalation Start Year", - DefaultValue=5, - AllowableRange=list(range(0, 101, 1)), - UnitType=Units.TIME, - PreferredUnits=TimeUnit.YEAR, - CurrentUnits=TimeUnit.YEAR, - ErrMessage="assume default electricity escalation delay time (5 years)", - ToolTipText="Number of years after start of project before start of escalation" - ) - self.ElecEscalationRate = self.ParameterDict[self.ElecEscalationRate.Name] = floatParameter( - "Electricity Escalation Rate Per Year", - DefaultValue=0.0, - Min=0.0, - Max=100.0, - UnitType=Units.ENERGYCOST, - PreferredUnits=EnergyCostUnit.DOLLARSPERKWH, - CurrentUnits=EnergyCostUnit.DOLLARSPERKWH, - ErrMessage="assume no electricity price escalation (0.0)", - ToolTipText="additional cost per year of price after escalation starts" - ) - - # local variables that need initialization - - # results - self.ProjectNPV = self.OutputParameterDict[self.ProjectNPV.Name] = OutputParameter( - "Project Net Present Value", - UnitType=Units.CURRENCY, - PreferredUnits=CurrencyUnit.MDOLLARS, - CurrentUnits=CurrencyUnit.MDOLLARS - ) - self.ProjectIRR = self.OutputParameterDict[self.ProjectIRR.Name] = OutputParameter( - "Project Internal Rate of Return", - UnitType=Units.PERCENT, - PreferredUnits=PercentUnit.PERCENT, - CurrentUnits=PercentUnit.PERCENT - ) - self.ProjectVIR = self.OutputParameterDict[self.ProjectVIR.Name] = OutputParameter( - "Project Value Investment Ratio", - UnitType=Units.PERCENT, - PreferredUnits=PercentUnit.TENTH, - CurrentUnits=PercentUnit.TENTH - ) - self.ProjectMOIC = self.OutputParameterDict[self.ProjectMOIC.Name] = OutputParameter( - "Project Multiple of Invested Capital", - UnitType=Units.PERCENT, - PreferredUnits=PercentUnit.TENTH, - CurrentUnits=PercentUnit.TENTH - ) - self.ProjectCashFlow = self.OutputParameterDict[self.ProjectCashFlow.Name] = OutputParameter( - "Annual Project Cash Flow", - value=[0.0], - UnitType=Units.CURRENCYFREQUENCY, - PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR, - CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR - ) - self.ProjectCummCashFlow = self.OutputParameterDict[self.ProjectCummCashFlow.Name] = OutputParameter( - "Cumulative Project Cash Flow", - value=[0.0], - UnitType=Units.CURRENCY, - PreferredUnits=CurrencyUnit.MDOLLARS, - CurrentUnits=CurrencyUnit.MDOLLARS - ) - self.CCUSPrice = self.OutputParameterDict[self.CCUSPrice.Name] = OutputParameter( - "CCUS Incentive Model", - value=[0.0], - UnitType=Units.COSTPERMASS, - PreferredUnits=CostPerMassUnit.DOLLARSPERLB, - CurrentUnits=CostPerMassUnit.DOLLARSPERLB - ) - self.CCUSRevenue = self.OutputParameterDict[self.CCUSRevenue.Name] = OutputParameter( - "Annual Revenue Generated from CCUS", - value=[0.0], - UnitType=Units.CURRENCYFREQUENCY, - PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR, - CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR - ) - self.CCUSCashFlow = self.OutputParameterDict[self.CCUSCashFlow.Name] = OutputParameter( - "Annual Cash Flow", - value=[0.0], - UnitType=Units.CURRENCYFREQUENCY, - PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR, - CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR - ) - self.CCUSCummCashFlow = self.OutputParameterDict[self.CCUSCummCashFlow.Name] = OutputParameter( - "Cumulative Cash Flow", - value=[0.0], - UnitType=Units.CURRENCY, - PreferredUnits=CurrencyUnit.MDOLLARS, - CurrentUnits=CurrencyUnit.MDOLLARS - ) - self.CarbonThatWouldHaveBeenProducedAnnually = self.OutputParameterDict[ - self.CarbonThatWouldHaveBeenProducedAnnually.Name] = OutputParameter( - "Annual Saved Carbon Production", - value=[0.0], - UnitType=Units.MASS, - PreferredUnits=MassUnit.LB, - CurrentUnits=MassUnit.LB - ) - self.CarbonThatWouldHaveBeenProducedTotal = self.OutputParameterDict[ - self.CarbonThatWouldHaveBeenProducedTotal.Name] = OutputParameter( - "Annual Saved Carbon Production", - UnitType=Units.MASS, - PreferredUnits=MassUnit.LB, - CurrentUnits=MassUnit.LB - ) - self.CCUSOnElecPrice = self.OutputParameterDict[self.CCUSOnElecPrice.Name] = OutputParameter( - "CCUS Electricity Sale Price Model", - value=[0.055], - UnitType=Units.ENERGYCOST, - PreferredUnits=EnergyCostUnit.CENTSSPERKWH, - CurrentUnits=EnergyCostUnit.CENTSSPERKWH - ) - self.CCUSOnHeatPrice = self.OutputParameterDict[self.CCUSOnHeatPrice.Name] = OutputParameter( - "CCUS Heat Sale Price Model", - value=[0.025], - UnitType=Units.ENERGYCOST, - PreferredUnits=EnergyCostUnit.CENTSSPERKWH, - CurrentUnits=EnergyCostUnit.CENTSSPERKWH - ) - - model.logger.info("Complete " + str(__class__) + ": " + sys._getframe().f_code.co_name) - - def read_parameters(self, model) -> None: - """ - The read_parameters function reads in the parameters from a dictionary and stores them in the parameters. - It also handles special cases that need to be handled after a value has been read in and checked. - If you choose to subclass this master class, you can also choose to override this method (or not), and if you do - :param model: The container class of the application, giving access to everything else, including the logger - :type model: :class:`~geophires_x.Model.Model` - :return: None - """ - model.logger.info("Init " + str(__class__) + ": " + sys._getframe().f_code.co_name) - super().read_parameters(model) # read the parameters for the parent. - # if we call super, we don't need to deal with setting the parameters here, just deal with the special cases - # for the variables in this class - # because the call to the super.readparameters will set all the variables, including the ones that are specific - # to this class - - # Deal with all the parameter values that the user has provided that relate to this extension. - # super.read_parameter will have already dealt with all the regular values, but anything unusual may not - # be dealt with, so check. - # In this case, all the values are array values, and weren't correctly dealt with, - # so below is where we process them. - - model.logger.info("complete " + str(__class__) + ": " + sys._getframe().f_code.co_name) - - def Calculate(self, model) -> None: - """ - The Calculate function is where all the calculations are done. - This function can be called multiple times, and will only recalculate what has changed each time it is called. - This is where all the calculations are made using all the values that have been set. - If you subclass this class, you can choose to run these calculations before (or after) your calculations, - but that assumes you have set all the values that are required for these calculations - If you choose to subclass this master class, you can also choose to override this method (or not), - and if you do, do it before or after you call you own version of this method. If you do, you can also choose - to call this method from you class, which can effectively run the calculations of the superclass, making all - thr values available to your methods. but you had better have set all the parameters! - :param model: The container class of the application, giving access to everything else, including the logger - :type model: :class:`~geophires_x.Model.Model` - :return: Nothing, but it does make calculations and set values in the model - """ - model.logger.info("Init " + str(__class__) + ": " + sys._getframe().f_code.co_name) - - self.CCUSRevenue.value = [0.0] * model.surfaceplant.plant_lifetime.value - self.CCUSCashFlow.value = [0.0] * model.surfaceplant.plant_lifetime.value - self.CCUSCummCashFlow.value = [0.0] * model.surfaceplant.plant_lifetime.value - self.CarbonThatWouldHaveBeenProducedAnnually.value = [0.0] * model.surfaceplant.plant_lifetime.value - self.CarbonThatWouldHaveBeenProducedTotal.value = 0.0 - ProjectCapCostPerYear = model.economics.CCap.value / self.ConstructionYears.value - - # Calculate carbon price models - self.CCUSPrice.value = BuildPricingModel(model.surfaceplant.plant_lifetime.value, self.CCUSEscalationStart.value, - self.CCUSStartPrice.value, self.CCUSEndPrice.value, - self.CCUSEscalationStart.value, self.CCUSEscalationRate.value) - self.CCUSOnElecPrice.value = BuildPricingModel(model.surfaceplant.plant_lifetime.value, 0, - self.ElecStartPrice.value, self.ElecEndPrice.value, - self.ElecEscalationStart.value, self.ElecEscalationRate.value) - self.CCUSOnHeatPrice.value = BuildPricingModel(model.surfaceplant.plant_lifetime.value, 0, - self.HeatStartPrice.value, self.HeatEndPrice.value, - self.HeatEscalationStart.value, self.HeatEscalationRate.value) - - # Figure out how much energy is being produced each year, and the amount of carbon that would have been - # produced if that energy had been made using the grid average carbon production. - # That then gives us the revenue, since we have a carbon price model - # We can also get annual cash flow from it. - self.ProjectCashFlow.value = [0.0] * model.surfaceplant.plant_lifetime.value - self.ProjectCummCashFlow.value = [0.0] * model.surfaceplant.plant_lifetime.value - for i in range(0, model.surfaceplant.plant_lifetime.value, 1): - dElectricalEnergy = 0.0 - ProjectElectricalEnergy = 0.0 - dHeatEnergy = 0.0 - ProjectHeatEnergy = 0.0 - dBothEnergy = 0.0 - if model.surfaceplant.enduse_option.value == EndUseOptions.ELECTRICITY: # This option has no heat component - ProjectElectricalEnergy = model.surfaceplant.NetkWhProduced.value[i] - dElectricalEnergy = model.surfaceplant.NetkWhProduced.value[i] - elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT: # has heat component but no electricity - ProjectHeatEnergy = model.surfaceplant.HeatkWhProduced.value[i] - dHeatEnergy = model.surfaceplant.HeatkWhProduced.value[i] - else: # everything else has a component of both - ProjectElectricalEnergy = model.surfaceplant.NetkWhProduced.value[i] - ProjectHeatEnergy = model.surfaceplant.HeatkWhProduced.value[i] - dElectricalEnergy = model.surfaceplant.NetkWhProduced.value[i] - dHeatEnergy = model.surfaceplant.HeatkWhProduced.value[i] - - dBothEnergy = dElectricalEnergy + dHeatEnergy - self.CarbonThatWouldHaveBeenProducedAnnually.value[i] = dBothEnergy * self.CCUSGridCO2.value - self.CarbonThatWouldHaveBeenProducedTotal.value = self.CarbonThatWouldHaveBeenProducedTotal.value + \ - self.CarbonThatWouldHaveBeenProducedAnnually.value[i] - self.CCUSRevenue.value[i] = (self.CarbonThatWouldHaveBeenProducedAnnually.value[i] * self.CCUSPrice.value[ - i]) / 1_000_000.0 # CCUS (from both heat and elec) based on total, not net energy; in $M - self.CCUSCashFlow.value[i] = self.CCUSRevenue.value[i] - self.ProjectCashFlow.value[i] = (self.CCUSRevenue.value[i] + (((ProjectElectricalEnergy * - self.CCUSOnElecPrice.value[i]) + - (ProjectHeatEnergy * self.CCUSOnHeatPrice.value[i])) / 1_000_000.0) - - model.economics.Coam.value) # MUSD - - # Calculate the Carbon credit cumulative cash flows - i = 0 - for val in self.CCUSCashFlow.value: - if i == 0: - self.CCUSCummCashFlow.value[0] = val - else: - self.CCUSCummCashFlow.value[i] = self.CCUSCummCashFlow.value[i - 1] + val - i = i + 1 - - # now insert the cost of construction into the front of the array that will be used to calculate NPV = the convention is that the upfront CAPEX is negative - self.ProjectCummCashFlow.value = [0.0] * model.surfaceplant.plant_lifetime.value - for i in range(0, self.ConstructionYears.value, 1): - self.ProjectCashFlow.value.insert(0, -1.0 * ProjectCapCostPerYear) - self.ProjectCummCashFlow.value.insert(0, -1.0 * ProjectCapCostPerYear) - - # Calculate the Project cumulative cash flows and payback period - i = 0 - for val in self.ProjectCashFlow.value: - if i == 0: - self.ProjectCummCashFlow.value[0] = val - else: - self.ProjectCummCashFlow.value[i] = self.ProjectCummCashFlow.value[i - 1] + val - i = i + 1 - - # Calculate more financial values using numpy financials - self.ProjectNPV.value = npf.npv(self.FixedInternalRate.value / 100, self.ProjectCashFlow.value) - self.ProjectIRR.value = npf.irr(self.ProjectCashFlow.value) - if math.isnan(self.ProjectIRR.value): - self.ProjectIRR.value = 0.0 - self.ProjectVIR.value = 1.0 + (self.ProjectNPV.value / model.economics.CCap.value) - - # Calculate MOIC which depends on CumCashFlow - self.ProjectMOIC.value = self.ProjectCummCashFlow.value[len(self.ProjectCummCashFlow.value) - 1] / ( - model.economics.CCap.value + (model.economics.Coam.value * model.surfaceplant.plant_lifetime.value)) - - self._calculate_derived_outputs(model) - model.logger.info(f'complete {str(__class__)}: {sys._getframe().f_code.co_name}') - - def __str__(self): - return "EconomicsCCUS" diff --git a/src/geophires_x/OutputsCCUS.py b/src/geophires_x/OutputsCCUS.py deleted file mode 100644 index 60935240e..000000000 --- a/src/geophires_x/OutputsCCUS.py +++ /dev/null @@ -1,74 +0,0 @@ -import sys -from geophires_x.Outputs import Outputs -import numpy as np - -NL = "\n" - - -class OutputsCCUS(Outputs): - """ - Class to handles output of the CCUS values - """ - def PrintOutputs(self, model): - """ - The PrintOutputs function prints the results of the CCUS to a text file and to the screen. - :param model: Model: The container class of the application, giving access to everything else, including the logger - :type model: :class:`~geophires_x.Model.Model` - :return: Nothing - """ - model.logger.info(f'Init {__class__!s}: sys._getframe().f_code.co_name') - - self._convert_units(model) - - if np.sum(model.ccuseconomics.CCUSRevenue.value) == 0: - return # don't bother if we have nothing to report. - - # now do CCUS output, which will append to the original output - # write results to output file and screen - try: - with open(self.output_file, 'a', encoding='UTF-8') as f: - f.write(NL) - f.write(NL) - f.write(" ***CCUS ECONOMICS***" + NL) - f.write(NL) - f.write(NL) - f.write(f" Total Avoided Carbon Production: {model.ccuseconomics.CarbonThatWouldHaveBeenProducedTotal.value:10.2f} " + model.ccuseconomics.CarbonThatWouldHaveBeenProducedTotal.PreferredUnits.value + NL) - f.write(f" Project NPV (including carbon credit): {model.ccuseconomics.ProjectNPV.value:10.2f} " + model.ccuseconomics.ProjectNPV.PreferredUnits.value + NL) - f.write(f" Project IRR (including carbon credit): {model.ccuseconomics.ProjectIRR.value:10.2f} " + model.ccuseconomics.ProjectIRR.PreferredUnits.value + NL) - f.write(f" Project VIR=IR=PIR (including carbon credit): {model.ccuseconomics.ProjectVIR.value:10.2f}" + NL) - f.write(f" {model.economics.ProjectMOIC.Name} (including carbon credit): {model.ccuseconomics.ProjectMOIC.value:10.2f}" + NL) - f.write(NL) - f.write(NL) - f.write(" ******************" + NL) - f.write(" * CCUS PROFILE *" + NL) - f.write(" ******************" + NL) - f.write("Year Carbon CCUS CCUS Annual CCUS Cumm. Project Annual Project Cumm." + NL) - f.write("Since Avoided Price Revenue Cash Flow Cash Flow Cash Flow Cash Flow" + NL) - f.write("Start ("+model.ccuseconomics.CarbonThatWouldHaveBeenProducedAnnually.PreferredUnits.value + - ") ("+model.ccuseconomics.CCUSPrice.PreferredUnits.value + - ") ("+model.ccuseconomics.CCUSRevenue.PreferredUnits.value + - ") ("+model.ccuseconomics.CCUSCashFlow.PreferredUnits.value + - ") ("+model.ccuseconomics.CCUSCummCashFlow.PreferredUnits.value + - ") ("+model.ccuseconomics.ProjectCashFlow.PreferredUnits.value + - ") ("+model.ccuseconomics.ProjectCummCashFlow.PreferredUnits.value + ")" + NL) - i = 0 - for i in range(0, model.surfaceplant.construction_years.value, 1): - # construction years... - f.write(f" {i+1:3.0f} {model.ccuseconomics.ProjectCashFlow.value[i]:5.2f} {model.ccuseconomics.ProjectCummCashFlow.value[i]:5.2f}" + NL) - i = i + 1 - - ii = 0 - for ii in range(0, model.surfaceplant.plant_lifetime.value, 1): - # running years... - f.write(f" {ii+1+model.surfaceplant.construction_years.value:3.0f} {model.ccuseconomics.CarbonThatWouldHaveBeenProducedAnnually.value[ii]:5.3f} {model.ccuseconomics.CCUSPrice.value[ii]:5.3f} {model.ccuseconomics.CCUSRevenue.value[ii]:5.2f} {model.ccuseconomics.CCUSCashFlow.value[ii]:5.2f} {model.ccuseconomics.CCUSCummCashFlow.value[ii]:5.2f} {model.ccuseconomics.ProjectCashFlow.value[ii + model.surfaceplant.construction_years.value]:5.2f} {model.ccuseconomics.ProjectCummCashFlow.value[ii + model.surfaceplant.construction_years.value]:5.2f}" + NL) - ii = ii + 1 - - except BaseException as ex: - tb = sys.exc_info()[2] - print(str(ex)) - print("Error: GEOPHIRES failed to Failed to write the output file. Exiting....Line %i" % tb.tb_lineno) - model.logger.critical(str(ex)) - model.logger.critical("Error: GEOPHIRES failed to Failed to write the output file. Exiting....Line %i" % tb.tb_lineno) - sys.exit() - - model.logger.info("Complete " + str(__class__) + ": " + sys._getframe().f_code.co_name) diff --git a/src/geophires_x_schema_generator/__init__.py b/src/geophires_x_schema_generator/__init__.py index fbac2671f..9c90e48ea 100644 --- a/src/geophires_x_schema_generator/__init__.py +++ b/src/geophires_x_schema_generator/__init__.py @@ -18,7 +18,6 @@ from geophires_x.AGSWellBores import AGSWellBores from geophires_x.CylindricalReservoir import CylindricalReservoir from geophires_x.EconomicsAddOns import EconomicsAddOns -from geophires_x.EconomicsCCUS import EconomicsCCUS from geophires_x.GeoPHIRESUtils import json_dumpse from geophires_x.Parameter import Parameter from geophires_x.SurfacePlantAGS import SurfacePlantAGS @@ -73,7 +72,6 @@ def get_parameter_sources(self) -> list: (AGSEconomics(dummy_model), 'Economics'), (SBTEconomics(dummy_model), 'Economics'), (SUTRAEconomics(dummy_model), 'Economics'), - (EconomicsCCUS(dummy_model), 'Economics'), (EconomicsAddOns(dummy_model), 'Economics'), ] diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json index 53204fd73..f3756688b 100644 --- a/src/geophires_x_schema_generator/geophires-request.json +++ b/src/geophires_x_schema_generator/geophires-request.json @@ -1247,7 +1247,7 @@ "description": "Number of years spent in construction (assumes whole years, no fractions)", "type": "integer", "units": null, - "category": "Economics", + "category": "Surface Plant", "default": 1, "minimum": 1, "maximum": 14 @@ -2216,51 +2216,6 @@ "minimum": 0.0, "maximum": 10000.0 }, - "Do CCUS Calculations": { - "description": "Set to true if you want the CCUS economics calculations to be made", - "type": "boolean", - "units": null, - "category": "Economics", - "default": false, - "minimum": null, - "maximum": null - }, - "Ending CCUS Credit Value": { - "description": "", - "type": "number", - "units": "USD/lb", - "category": "Economics", - "default": 0.0, - "minimum": 0, - "maximum": 1000 - }, - "CCUS Escalation Start Year": { - "description": "Number of years after start of project before start of CCUS incentives", - "type": "integer", - "units": "yr", - "category": "Economics", - "default": 0, - "minimum": 0, - "maximum": 100 - }, - "CCUS Escalation Rate Per Year": { - "description": "additional value per year of price after escalation starts", - "type": "number", - "units": "USD/mt", - "category": "Economics", - "default": 0.0, - "minimum": 0.0, - "maximum": 100.0 - }, - "Starting CCUS Credit Value": { - "description": "", - "type": "number", - "units": "USD/mt", - "category": "Economics", - "default": 0.0, - "minimum": 0, - "maximum": 1000 - }, "AddOn Nickname": { "description": "", "type": "array", From 2d6b1fbe2c31b93a5e554d3bd20e1a72fe566977 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 09:25:38 -0800 Subject: [PATCH 05/20] Add-ons parameters tooltip text including pattern for specifying multiple add-ons. --- src/geophires_x/EconomicsAddOns.py | 25 +++++++++++++------ .../geophires-request.json | 12 ++++----- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/geophires_x/EconomicsAddOns.py b/src/geophires_x/EconomicsAddOns.py index 64fff9898..264b8b993 100644 --- a/src/geophires_x/EconomicsAddOns.py +++ b/src/geophires_x/EconomicsAddOns.py @@ -46,11 +46,15 @@ def __init__(self, model: Model): self.MyClass = sclass.replace("\'>", "") self.MyPath = os.path.abspath(__file__) + def multi_addon_tooltip_text(param_name: str) -> str: + return f'If using multiple add-ons, suffix with a number e.g. \'{param_name} 1\', \'{param_name} 2\', etc.' + self.AddOnNickname = self.ParameterDict[self.AddOnNickname.Name] = listParameter( "AddOn Nickname", UnitType=Units.NONE, Min=0.0, - Max=1000.0 + Max=1000.0, + ToolTipText=multi_addon_tooltip_text("AddOn Nickname") ) self.AddOnCAPEX = self.ParameterDict[self.AddOnCAPEX.Name] = listParameter( "AddOn CAPEX", @@ -58,7 +62,8 @@ def __init__(self, model: Model): Max=1000.0, UnitType=Units.CURRENCY, PreferredUnits=CurrencyUnit.MDOLLARS, - CurrentUnits=CurrencyUnit.MDOLLARS + CurrentUnits=CurrencyUnit.MDOLLARS, + ToolTipText=multi_addon_tooltip_text("AddOn CAPEX") ) self.AddOnOPEXPerYear = self.ParameterDict[self.AddOnOPEXPerYear.Name] = listParameter( "AddOn OPEX", @@ -66,7 +71,8 @@ def __init__(self, model: Model): Max=1000.0, UnitType=Units.CURRENCYFREQUENCY, PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR, - CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR + CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR, + ToolTipText=f'Annual operating cost. {multi_addon_tooltip_text("AddOn OPEX")}' ) self.AddOnElecGainedPerYear = self.ParameterDict[self.AddOnElecGainedPerYear.Name] = listParameter( "AddOn Electricity Gained", @@ -74,7 +80,8 @@ def __init__(self, model: Model): Max=1000.0, UnitType=Units.ENERGYFREQUENCY, PreferredUnits=EnergyFrequencyUnit.KWPERYEAR, - CurrentUnits=EnergyFrequencyUnit.KWPERYEAR + CurrentUnits=EnergyFrequencyUnit.KWPERYEAR, + ToolTipText=f'Annual electricity gained. {multi_addon_tooltip_text("AddOn Electricity Gained")}' ) self.AddOnHeatGainedPerYear = self.ParameterDict[self.AddOnHeatGainedPerYear.Name] = listParameter( "AddOn Heat Gained", @@ -82,7 +89,8 @@ def __init__(self, model: Model): Max=1000.0, UnitType=Units.ENERGYFREQUENCY, PreferredUnits=EnergyFrequencyUnit.KWPERYEAR, - CurrentUnits=EnergyFrequencyUnit.KWPERYEAR + CurrentUnits=EnergyFrequencyUnit.KWPERYEAR, + ToolTipText=f'Annual heat gained. {multi_addon_tooltip_text("AddOn Heat Gained")}' ) self.AddOnProfitGainedPerYear = self.ParameterDict[self.AddOnProfitGainedPerYear.Name] = listParameter( "AddOn Profit Gained", @@ -90,7 +98,8 @@ def __init__(self, model: Model): Max=1000.0, UnitType=Units.CURRENCYFREQUENCY, PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR, - CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR + CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR, + ToolTipText=f'Annual profit gained. {multi_addon_tooltip_text("AddOn Profit Gained")}' ) # local variables that need initialization @@ -99,7 +108,7 @@ def __init__(self, model: Model): "AddOn CAPEX Total", UnitType=Units.CURRENCY, PreferredUnits=CurrencyUnit.MDOLLARS, - CurrentUnits=CurrencyUnit.MDOLLARS + CurrentUnits=CurrencyUnit.MDOLLARS, ) self.AddOnOPEXTotalPerYear = self.OutputParameterDict[self.AddOnOPEXTotalPerYear.Name] = OutputParameter( "AddOn OPEX Total Per Year", @@ -242,7 +251,7 @@ def read_parameters(self, model: Model) -> None: if key.startswith("AddOn Profit Gained"): val = float(model.InputParameters[key].sValue) self.AddOnProfitGainedPerYear.value.append(val) # this assumes they put the values in the file in consecutive fashion - 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 Calculate(self, model: Model) -> None: """ diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json index f3756688b..cb7a72609 100644 --- a/src/geophires_x_schema_generator/geophires-request.json +++ b/src/geophires_x_schema_generator/geophires-request.json @@ -2217,7 +2217,7 @@ "maximum": 10000.0 }, "AddOn Nickname": { - "description": "", + "description": "If using multiple add-ons, suffix with a number e.g. 'AddOn Nickname 1', 'AddOn Nickname 2', etc.", "type": "array", "units": null, "category": "Economics", @@ -2226,7 +2226,7 @@ "maximum": 1000.0 }, "AddOn CAPEX": { - "description": "", + "description": "If using multiple add-ons, suffix with a number e.g. 'AddOn CAPEX 1', 'AddOn CAPEX 2', etc.", "type": "array", "units": "MUSD", "category": "Economics", @@ -2235,7 +2235,7 @@ "maximum": 1000.0 }, "AddOn OPEX": { - "description": "", + "description": "Annual operating cost. If using multiple add-ons, suffix with a number e.g. 'AddOn OPEX 1', 'AddOn OPEX 2', etc.", "type": "array", "units": "MUSD/yr", "category": "Economics", @@ -2244,7 +2244,7 @@ "maximum": 1000.0 }, "AddOn Electricity Gained": { - "description": "", + "description": "Annual electricity gained. If using multiple add-ons, suffix with a number e.g. 'AddOn Electricity Gained 1', 'AddOn Electricity Gained 2', etc.", "type": "array", "units": "kW/yr", "category": "Economics", @@ -2253,7 +2253,7 @@ "maximum": 1000.0 }, "AddOn Heat Gained": { - "description": "", + "description": "Annual heat gained. If using multiple add-ons, suffix with a number e.g. 'AddOn Heat Gained 1', 'AddOn Heat Gained 2', etc.", "type": "array", "units": "kW/yr", "category": "Economics", @@ -2262,7 +2262,7 @@ "maximum": 1000.0 }, "AddOn Profit Gained": { - "description": "", + "description": "Annual profit gained. If using multiple add-ons, suffix with a number e.g. 'AddOn Profit Gained 1', 'AddOn Profit Gained 2', etc.", "type": "array", "units": "MUSD/yr", "category": "Economics", From 8789be8d84521f33b19d9e2efbf066270e30dfbb Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 09:33:03 -0800 Subject: [PATCH 06/20] Organize example1_addons input params sections --- tests/examples/example1_addons.txt | 61 ++++++++++++++++++------------ 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/tests/examples/example1_addons.txt b/tests/examples/example1_addons.txt index f588e0003..827d3f9d9 100644 --- a/tests/examples/example1_addons.txt +++ b/tests/examples/example1_addons.txt @@ -1,26 +1,8 @@ -# Example 1 with Addons +# Example 1 with Add-ons +# ***ADD-ONS PARAMETERS*** +# ************************ 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 -Heat Escalation Start Year,7 -Heat Escalation Rate Per Year,0.01 -Starting Electricity Sale Price,0.09 -Ending Electricity Sale Price,0.15 -Electricity Escalation Start Year,5 -Electricity Escalation Rate Per Year,0.012 -Annual License Etc,0 -Flat License Etc,0 -Other Incentives,2.112 -Tax Relief Per Year,2.212 -One-time Grants Etc,20.212 AddOn Nickname 1, Desalinization AddOn CAPEX 1, 10 AddOn OPEX 1, 0.1 @@ -39,6 +21,26 @@ AddOn OPEX 3, 0.6 AddOn Electricity Gained 3, 0.0 AddOn Heat Gained 3, 0 AddOn Profit Gained 3, 0 + +# ***CARBON PRICE PARAMETERS*** +# ***************************** +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 +Heat Escalation Start Year,7 +Heat Escalation Rate Per Year,0.01 +Starting Electricity Sale Price,0.09 +Ending Electricity Sale Price,0.15 +Electricity Escalation Start Year,5 +Electricity Escalation Rate Per Year,0.012 + +# ***RESERVOIR PARAMETERS*** +# ************************** Reservoir Model,1, ---Multiple Fractures reservoir model Reservoir Depth,3, ---[km] Number of Segments,1, ---[-] @@ -58,14 +60,18 @@ Reservoir Volume Option,3, ---[-] Reservoir Volume,1000000000, ---[m^3] Number of Fractures,20, ---[-] Water Loss Fraction,.02, ---[-] +Reservoir Heat Capacity,1000, ---[J/kg/K] +Reservoir Density,2700, ---[kg/m^3] +Reservoir Thermal Conductivity,2.7, ---[W/m/K] + +# ***WELLBORES PARAMETERS*** +# ************************** Productivity Index,5, ---[kg/s/bar] Injectivity Index,5, ---[kg/s/bar] Injection Temperature,50, ---[deg.C] Maximum Drawdown,1, ---[-] no redrilling considered, Well Drilling Cost Correlation,1, ---[-] Use built-in correlations -Reservoir Heat Capacity,1000, ---[J/kg/K] -Reservoir Density,2700, ---[kg/m^3] -Reservoir Thermal Conductivity,2.7, ---[W/m/K] + # ***SURFACE TECHNICAL PARAMETERS*** # ********************************** @@ -83,9 +89,14 @@ Plant Lifetime,30, ---[years] Fixed Charge Rate,.05, ---[-] between 0 and 1 Inflation Rate During Construction,0, ---[-] +Annual License Etc, 0, -- FIXME TODO change to correct parameter name: "Annual License Fees Etc" +Flat License Etc, 0, -- FIXME TODO change to correct parameter name: "One-time Flat License Fees Etc" +Other Incentives, 2.112 +Tax Relief Per Year, 2.212 +One-time Grants Etc,20.212 + # ***Simulation Parameters*** # *************************** - Print Output to Console,1, ---[-] Should be 0 (don't print results) or 1 (print results) Time steps per year,6, ---[1/year] Units:Total Saved Carbon Production, kilotonne, From 45cb184ccd52c7ffe3cafda78b582a5311635d41 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 09:35:27 -0800 Subject: [PATCH 07/20] Address FIXME re: example1_addons incorrect parameter names in input file. Has no effect on output since the values are the same as the default values. --- tests/examples/example1_addons.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/examples/example1_addons.txt b/tests/examples/example1_addons.txt index 827d3f9d9..2f41e8c82 100644 --- a/tests/examples/example1_addons.txt +++ b/tests/examples/example1_addons.txt @@ -89,8 +89,8 @@ Plant Lifetime,30, ---[years] Fixed Charge Rate,.05, ---[-] between 0 and 1 Inflation Rate During Construction,0, ---[-] -Annual License Etc, 0, -- FIXME TODO change to correct parameter name: "Annual License Fees Etc" -Flat License Etc, 0, -- FIXME TODO change to correct parameter name: "One-time Flat License Fees Etc" +Annual License Fees Etc, 0 +One-time Flat License Fees Etc, 0 Other Incentives, 2.112 Tax Relief Per Year, 2.212 One-time Grants Etc,20.212 From dcd2ff623a9dd6a0f92965498ea68b3e9eb2134c Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 09:36:49 -0800 Subject: [PATCH 08/20] =?UTF-8?q?Bump=20version:=203.7.17=20=E2=86=92=203.?= =?UTF-8?q?7.18?= 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 9dd202fd1..d5e854f3c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.17 +current_version = 3.7.18 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index e36ef9a71..3ac872c3b 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.7.17 + version: 3.7.18 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index 40811e6f6..9720773f6 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,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.7.17.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.18.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.17...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.18...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 c7cae601d..385857157 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2025' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.7.17' +version = release = '3.7.18' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index c50df076f..d3ecfc9ad 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.7.17', + version='3.7.18', 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 80209f623..f7a500783 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.7.17' +__version__ = '3.7.18' From 1048fe178ea7fa1729b054052270422074b44052 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 09:39:42 -0800 Subject: [PATCH 09/20] Use consistent title styling: 'Add-Ons' --- README.rst | 2 +- tests/examples/example1_addons.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 9720773f6..12107a8d5 100644 --- a/README.rst +++ b/README.rst @@ -334,7 +334,7 @@ Example-specific web interface deeplinks are listed in the Link column. - `example1.txt `__ - `.out `__ - `link `__ - * - Example 1 with Addons + * - Example 1 with Add-Ons - `example1_addons.txt `__ - `.out `__ - `link `__ diff --git a/tests/examples/example1_addons.txt b/tests/examples/example1_addons.txt index 2f41e8c82..cc4a77d98 100644 --- a/tests/examples/example1_addons.txt +++ b/tests/examples/example1_addons.txt @@ -1,4 +1,4 @@ -# Example 1 with Add-ons +# Example 1 with Add-Ons # ***ADD-ONS PARAMETERS*** # ************************ From 657a8afc98f103b50c5d9e31f849111d719d72b8 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 09:56:25 -0800 Subject: [PATCH 10/20] Update tooltips to mention option to specify multiple add-ons with array instead of multiple parameter names --- src/geophires_x/EconomicsAddOns.py | 4 +++- .../geophires-request.json | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/geophires_x/EconomicsAddOns.py b/src/geophires_x/EconomicsAddOns.py index 264b8b993..2fc7df89f 100644 --- a/src/geophires_x/EconomicsAddOns.py +++ b/src/geophires_x/EconomicsAddOns.py @@ -47,7 +47,9 @@ def __init__(self, model: Model): self.MyPath = os.path.abspath(__file__) def multi_addon_tooltip_text(param_name: str) -> str: - return f'If using multiple add-ons, suffix with a number e.g. \'{param_name} 1\', \'{param_name} 2\', etc.' + return (f'If using multiple add-ons: either (1) specify this value as an array or ' + f'(2) use multiple parameters suffixed with a number ' + f'e.g. \'{param_name} 1\', \'{param_name} 2\', etc.') self.AddOnNickname = self.ParameterDict[self.AddOnNickname.Name] = listParameter( "AddOn Nickname", diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json index cb7a72609..aab03ec76 100644 --- a/src/geophires_x_schema_generator/geophires-request.json +++ b/src/geophires_x_schema_generator/geophires-request.json @@ -2217,7 +2217,7 @@ "maximum": 10000.0 }, "AddOn Nickname": { - "description": "If using multiple add-ons, suffix with a number e.g. 'AddOn Nickname 1', 'AddOn Nickname 2', etc.", + "description": "If using multiple add-ons: either (1) specify this value as an array or (2) use multiple parameters suffixed with a number e.g. 'AddOn Nickname 1', 'AddOn Nickname 2', etc.", "type": "array", "units": null, "category": "Economics", @@ -2226,7 +2226,7 @@ "maximum": 1000.0 }, "AddOn CAPEX": { - "description": "If using multiple add-ons, suffix with a number e.g. 'AddOn CAPEX 1', 'AddOn CAPEX 2', etc.", + "description": "If using multiple add-ons: either (1) specify this value as an array or (2) use multiple parameters suffixed with a number e.g. 'AddOn CAPEX 1', 'AddOn CAPEX 2', etc.", "type": "array", "units": "MUSD", "category": "Economics", @@ -2235,7 +2235,7 @@ "maximum": 1000.0 }, "AddOn OPEX": { - "description": "Annual operating cost. If using multiple add-ons, suffix with a number e.g. 'AddOn OPEX 1', 'AddOn OPEX 2', etc.", + "description": "Annual operating cost. If using multiple add-ons: either (1) specify this value as an array or (2) use multiple parameters suffixed with a number e.g. 'AddOn OPEX 1', 'AddOn OPEX 2', etc.", "type": "array", "units": "MUSD/yr", "category": "Economics", @@ -2244,7 +2244,7 @@ "maximum": 1000.0 }, "AddOn Electricity Gained": { - "description": "Annual electricity gained. If using multiple add-ons, suffix with a number e.g. 'AddOn Electricity Gained 1', 'AddOn Electricity Gained 2', etc.", + "description": "Annual electricity gained. If using multiple add-ons: either (1) specify this value as an array or (2) use multiple parameters suffixed with a number e.g. 'AddOn Electricity Gained 1', 'AddOn Electricity Gained 2', etc.", "type": "array", "units": "kW/yr", "category": "Economics", @@ -2253,7 +2253,7 @@ "maximum": 1000.0 }, "AddOn Heat Gained": { - "description": "Annual heat gained. If using multiple add-ons, suffix with a number e.g. 'AddOn Heat Gained 1', 'AddOn Heat Gained 2', etc.", + "description": "Annual heat gained. If using multiple add-ons: either (1) specify this value as an array or (2) use multiple parameters suffixed with a number e.g. 'AddOn Heat Gained 1', 'AddOn Heat Gained 2', etc.", "type": "array", "units": "kW/yr", "category": "Economics", @@ -2262,7 +2262,7 @@ "maximum": 1000.0 }, "AddOn Profit Gained": { - "description": "Annual profit gained. If using multiple add-ons, suffix with a number e.g. 'AddOn Profit Gained 1', 'AddOn Profit Gained 2', etc.", + "description": "Annual profit gained. If using multiple add-ons: either (1) specify this value as an array or (2) use multiple parameters suffixed with a number e.g. 'AddOn Profit Gained 1', 'AddOn Profit Gained 2', etc.", "type": "array", "units": "MUSD/yr", "category": "Economics", From 10a26fab7fdc8406ac72820b5712612eb70dd4b0 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:19:24 -0800 Subject: [PATCH 11/20] WIP - prepare to change 'CCUS PROFILE' to 'CARBON REVENUE PROFILE' --- src/geophires_x_client/geophires_x_result.py | 80 ++++++++++++-------- tests/test_geophires_x_client.py | 4 +- 2 files changed, 50 insertions(+), 34 deletions(-) diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py index abc3ab2ab..672692ff5 100644 --- a/src/geophires_x_client/geophires_x_result.py +++ b/src/geophires_x_client/geophires_x_result.py @@ -323,6 +323,28 @@ class GeophiresXResult: 'Reservoir Model', ) + _REVENUE_AND_CASHFLOW_PROFILE_HEADERS: ClassVar[list[str]] = [ + 'Year Since Start', + 'Electricity Price (cents/kWh)', + 'Electricity Ann. Rev. (MUSD/yr)', + 'Electricity Cumm. Rev. (MUSD)', + 'Heat Price (cents/kWh)', + 'Heat Ann. Rev. (MUSD/yr)', + 'Heat Cumm. Rev. (MUSD)', + 'Cooling Price (cents/kWh)', + 'Cooling Ann. Rev. (MUSD/yr)', + 'Cooling Cumm. Rev. (MUSD)', + 'Carbon Price (USD/tonne)', + 'Carbon Ann. Rev. (MUSD/yr)', + 'Carbon Cumm. Rev. (MUSD)', + 'Project OPEX (MUSD/yr)', + 'Project Net Rev. (MUSD/yr)', + 'Project Net Cashflow (MUSD)', + ] + + CCUS_PROFILE_LEGACY_NAME: ClassVar[str] = 'CCUS PROFILE' + CARBON_REVENUE_PROFILE_NAME: ClassVar[str] = 'CCUS PROFILE' # FIXME WIP change to 'CARBON REVENUE PROFILE' + def __init__(self, output_file_path, logger_name=None): if logger_name is None: logger_name = __name__ @@ -369,9 +391,11 @@ def __init__(self, output_file_path, logger_name=None): if revenue_and_cashflow_profile is not None: self.result['REVENUE & CASHFLOW PROFILE'] = revenue_and_cashflow_profile - ccus_profile = self._get_ccus_profile() - if ccus_profile is not None: - self.result['CCUS PROFILE'] = ccus_profile + carbon_revenue_or_ccus_profile_key, carbon_revenue_or_ccus_profile = ( + self._get_carbon_revenue_or_ccus_legacy_profile() + ) + if carbon_revenue_or_ccus_profile is not None: + self.result[carbon_revenue_or_ccus_profile_key] = carbon_revenue_or_ccus_profile sdacgt_profile = self._get_sdacgt_profile() if sdacgt_profile is not None: @@ -428,8 +452,10 @@ def __init__(self, v_u): 'POWER GENERATION PROFILE', 'HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE', 'EXTENDED ECONOMIC PROFILE', - 'CCUS PROFILE', 'REVENUE & CASHFLOW PROFILE', + GeophiresXResult.CARBON_REVENUE_PROFILE_NAME, + GeophiresXResult.CCUS_PROFILE_LEGACY_NAME, + 'S-DAC-GT PROFILE', ): raise RuntimeError('unexpected category') @@ -543,25 +569,6 @@ def _get_heat_electricity_extraction_generation_profile(self): profile_lines = self._get_profile_lines('HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE') return self._get_data_from_profile_lines(profile_lines) - _REVENUE_AND_CASHFLOW_PROFILE_HEADERS: ClassVar[list[str]] = [ - 'Year Since Start', - 'Electricity Price (cents/kWh)', - 'Electricity Ann. Rev. (MUSD/yr)', - 'Electricity Cumm. Rev. (MUSD)', - 'Heat Price (cents/kWh)', - 'Heat Ann. Rev. (MUSD/yr)', - 'Heat Cumm. Rev. (MUSD)', - 'Cooling Price (cents/kWh)', - 'Cooling Ann. Rev. (MUSD/yr)', - 'Cooling Cumm. Rev. (MUSD)', - 'Carbon Price (USD/tonne)', - 'Carbon Ann. Rev. (MUSD/yr)', - 'Carbon Cumm. Rev. (MUSD)', - 'Project OPEX (MUSD/yr)', - 'Project Net Rev. (MUSD/yr)', - 'Project Net Cashflow (MUSD)', - ] - def _get_revenue_and_cashflow_profile(self): def extract_table_header(lines: list) -> list: # Tried various regexy approaches to extract this programmatically but landed on hard-coding. @@ -624,14 +631,23 @@ def extract_table_header(lines: list) -> list: self._logger.debug(f'Failed to get S-DAC-GT profile: {e}') return None - def _get_ccus_profile(self): + def _get_carbon_revenue_or_ccus_legacy_profile(self) -> tuple: + """ + :return: tuple[profile key name, profile] + """ + profile_legacy = self._get_ccus_profile_legacy() if profile_legacy is not None: - return profile_legacy + # Earlier versions of GEOPHIRES referred to the profile containing carbon revenue as the 'CCUS PROFILE'; + # the name was changed to 'CARBON REVENUE PROFILE' for technical accuracy, as it does not include data + # for capture or storage, only revenue according to carbon avoided given a carbon price. However, we still + # check for and parse CCUS profile if it is present in order to retain backwards compatibility in terms + # of the client being able to read results from previous GEOPHIRES versions. + return GeophiresXResult.CCUS_PROFILE_LEGACY_NAME, profile_legacy revenue_and_cashflow_profile = self._get_revenue_and_cashflow_profile() if revenue_and_cashflow_profile is None: - return None + return None, None carbon_price_field_name = 'Carbon Price (USD/tonne)' headers = [ @@ -654,7 +670,7 @@ def _get_ccus_profile(self): ) if not has_ccus_profile_in_revenue_and_cashflow: - return None + return None, None try: profile = [headers] @@ -670,10 +686,10 @@ def _get_ccus_profile(self): ccus_entry.append(revenue_and_cashflow_profile[i][rcp_index]) profile.append(ccus_entry) - return profile + return GeophiresXResult.CARBON_REVENUE_PROFILE_NAME, profile except BaseException as e: - self._logger.debug(f'Failed to get CCUS profile: {e}') - return None + self._logger.debug(f'Failed to get {GeophiresXResult.CARBON_REVENUE_PROFILE_NAME}: {e}') + return None, None def _get_ccus_profile_legacy(self): def extract_table_header(lines: list) -> list: @@ -690,12 +706,12 @@ def extract_table_header(lines: list) -> list: ] try: - lines = self._get_profile_lines('CCUS PROFILE') + lines = self._get_profile_lines(GeophiresXResult.CCUS_PROFILE_LEGACY_NAME) profile = [extract_table_header(lines)] profile.extend(self._extract_addons_style_table_data(lines)) return profile except BaseException as e: - self._logger.debug(f'Failed to get legacy CCUS profile: {e}') + self._logger.debug(f'Failed to get legacy {GeophiresXResult.CCUS_PROFILE_LEGACY_NAME}: {e}') return None def _extract_addons_style_table_data(self, lines: list): diff --git a/tests/test_geophires_x_client.py b/tests/test_geophires_x_client.py index 15746f8b1..edc9de711 100644 --- a/tests/test_geophires_x_client.py +++ b/tests/test_geophires_x_client.py @@ -345,9 +345,9 @@ def test_revenue_and_cashflow_profile(self): rcf_profile, ) - def test_ccus_profile(self): + def test_carbon_revenue_profile(self): result_example1 = GeophiresXResult(self._get_test_file_path('examples/example1.out')) - self.assertTrue('CCUS PROFILE' not in result_example1.result) + self.assertTrue(GeophiresXResult.CARBON_REVENUE_PROFILE_NAME not in result_example1.result) result_addons = GeophiresXResult(self._get_test_file_path('examples/example1_addons.out')) ccus_profile = result_addons.result['CCUS PROFILE'] From c64523f5f645839ce4a9be286f6bd6c8913d2fff Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:25:44 -0800 Subject: [PATCH 12/20] Change 'CCUS PROFILE' to 'CARBON REVENUE PROFILE' --- src/geophires_x_client/geophires_x_result.py | 2 +- tests/example1_addons.csv | 182 +++++++++---------- tests/examples/S-DAC-GT.out | 8 +- tests/examples/example1_addons.out | 8 +- tests/test_geophires_x_client.py | 2 +- 5 files changed, 101 insertions(+), 101 deletions(-) diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py index 672692ff5..44403dc4c 100644 --- a/src/geophires_x_client/geophires_x_result.py +++ b/src/geophires_x_client/geophires_x_result.py @@ -343,7 +343,7 @@ class GeophiresXResult: ] CCUS_PROFILE_LEGACY_NAME: ClassVar[str] = 'CCUS PROFILE' - CARBON_REVENUE_PROFILE_NAME: ClassVar[str] = 'CCUS PROFILE' # FIXME WIP change to 'CARBON REVENUE PROFILE' + CARBON_REVENUE_PROFILE_NAME: ClassVar[str] = 'CARBON REVENUE PROFILE' def __init__(self, output_file_path, logger_name=None): if logger_name is None: diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index 9da76c998..7a4a92615 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -99,7 +99,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,, SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,% SURFACE EQUIPMENT SIMULATION RESULTS,Heat to Power Conversion Efficiency,,10.07,% -Simulation Metadata,GEOPHIRES Version,,3.7.16, +Simulation Metadata,GEOPHIRES Version,,3.7.18, POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0, POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056, POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073, @@ -1090,93 +1090,93 @@ REVENUE & CASHFLOW PROFILE,Project Net Cashflow,27,197.51,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,28,208.24,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,29,218.97,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,30,229.7,MUSD -CCUS PROFILE,Carbon Price,1,0.0,USD/tonne -CCUS PROFILE,Carbon Price,2,0.01,USD/tonne -CCUS PROFILE,Carbon Price,3,0.01,USD/tonne -CCUS PROFILE,Carbon Price,4,0.01,USD/tonne -CCUS PROFILE,Carbon Price,5,0.01,USD/tonne -CCUS PROFILE,Carbon Price,6,0.01,USD/tonne -CCUS PROFILE,Carbon Price,7,0.01,USD/tonne -CCUS PROFILE,Carbon Price,8,0.03,USD/tonne -CCUS PROFILE,Carbon Price,9,0.04,USD/tonne -CCUS PROFILE,Carbon Price,10,0.04,USD/tonne -CCUS PROFILE,Carbon Price,11,0.06,USD/tonne -CCUS PROFILE,Carbon Price,12,0.07,USD/tonne -CCUS PROFILE,Carbon Price,13,0.07,USD/tonne -CCUS PROFILE,Carbon Price,14,0.09,USD/tonne -CCUS PROFILE,Carbon Price,15,0.1,USD/tonne -CCUS PROFILE,Carbon Price,16,0.1,USD/tonne -CCUS PROFILE,Carbon Price,17,0.1,USD/tonne -CCUS PROFILE,Carbon Price,18,0.1,USD/tonne -CCUS PROFILE,Carbon Price,19,0.1,USD/tonne -CCUS PROFILE,Carbon Price,20,0.1,USD/tonne -CCUS PROFILE,Carbon Price,21,0.1,USD/tonne -CCUS PROFILE,Carbon Price,22,0.1,USD/tonne -CCUS PROFILE,Carbon Price,23,0.1,USD/tonne -CCUS PROFILE,Carbon Price,24,0.1,USD/tonne -CCUS PROFILE,Carbon Price,25,0.1,USD/tonne -CCUS PROFILE,Carbon Price,26,0.1,USD/tonne -CCUS PROFILE,Carbon Price,27,0.1,USD/tonne -CCUS PROFILE,Carbon Price,28,0.1,USD/tonne -CCUS PROFILE,Carbon Price,29,0.1,USD/tonne -CCUS PROFILE,Carbon Price,30,0.1,USD/tonne -CCUS PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,4,0.52,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,5,0.52,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,6,0.52,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,7,0.52,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,8,0.87,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,9,1.22,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,10,1.57,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,11,1.92,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,12,2.27,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,13,2.62,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,14,2.97,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,15,3.32,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,16,3.49,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,17,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,18,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,19,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,20,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,21,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,22,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,23,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,24,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,25,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,26,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,27,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,28,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,29,3.5,MUSD/yr -CCUS PROFILE,Carbon Ann. Rev.,30,3.5,MUSD/yr -CCUS PROFILE,Carbon Cumm. Rev.,1,0.0,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,2,0.51,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,3,1.03,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,4,1.55,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,5,2.07,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,6,2.59,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,7,3.11,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,8,3.98,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,9,5.2,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,10,6.77,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,11,8.69,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,12,10.95,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,13,13.57,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,14,16.54,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,15,19.86,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,16,23.35,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,17,26.85,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,18,30.34,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,19,33.84,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,20,37.34,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,21,40.84,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,22,44.34,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,23,47.84,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,24,51.34,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,25,54.84,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,26,58.34,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,27,61.85,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,28,65.35,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,29,68.85,MUSD -CCUS PROFILE,Carbon Cumm. Rev.,30,72.36,MUSD +CARBON REVENUE PROFILE,Carbon Price,1,0.0,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,2,0.01,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,3,0.01,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,4,0.01,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,5,0.01,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,6,0.01,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,7,0.01,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,8,0.03,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,9,0.04,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,10,0.04,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,11,0.06,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,12,0.07,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,13,0.07,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,14,0.09,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,15,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,16,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,17,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,18,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,19,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,20,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,21,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,22,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,23,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,24,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,25,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,26,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,27,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,28,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,29,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,30,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,4,0.52,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,5,0.52,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,6,0.52,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,7,0.52,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,8,0.87,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,9,1.22,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,10,1.57,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,11,1.92,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,12,2.27,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,13,2.62,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,14,2.97,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,15,3.32,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,16,3.49,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,17,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,18,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,19,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,20,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,21,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,22,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,23,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,24,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,25,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,26,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,27,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,28,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,29,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Ann. Rev.,30,3.5,MUSD/yr +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,1,0.0,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,2,0.51,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,3,1.03,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,4,1.55,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,5,2.07,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,6,2.59,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,7,3.11,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,8,3.98,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,9,5.2,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,10,6.77,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,11,8.69,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,12,10.95,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,13,13.57,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,14,16.54,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,15,19.86,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,16,23.35,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,17,26.85,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,18,30.34,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,19,33.84,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,20,37.34,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,21,40.84,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,22,44.34,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,23,47.84,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,24,51.34,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,25,54.84,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,26,58.34,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,27,61.85,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,28,65.35,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,29,68.85,MUSD +CARBON REVENUE PROFILE,Carbon Cumm. Rev.,30,72.36,MUSD diff --git a/tests/examples/S-DAC-GT.out b/tests/examples/S-DAC-GT.out index 7161cd7d3..36412f3c0 100644 --- a/tests/examples/S-DAC-GT.out +++ b/tests/examples/S-DAC-GT.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.15 - Simulation Date: 2025-02-27 - Simulation Time: 10:36 - Calculation Time: 0.100 sec + GEOPHIRES Version: 3.7.18 + Simulation Date: 2025-02-28 + Simulation Time: 10:21 + Calculation Time: 0.099 sec ***SUMMARY OF RESULTS*** diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index afc76cd88..ab4fa74bd 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.16 - Simulation Date: 2025-02-27 - Simulation Time: 11:53 - Calculation Time: 0.786 sec + GEOPHIRES Version: 3.7.18 + Simulation Date: 2025-02-28 + Simulation Time: 10:21 + Calculation Time: 0.780 sec ***SUMMARY OF RESULTS*** diff --git a/tests/test_geophires_x_client.py b/tests/test_geophires_x_client.py index edc9de711..70183ad8c 100644 --- a/tests/test_geophires_x_client.py +++ b/tests/test_geophires_x_client.py @@ -350,7 +350,7 @@ def test_carbon_revenue_profile(self): self.assertTrue(GeophiresXResult.CARBON_REVENUE_PROFILE_NAME not in result_example1.result) result_addons = GeophiresXResult(self._get_test_file_path('examples/example1_addons.out')) - ccus_profile = result_addons.result['CCUS PROFILE'] + ccus_profile = result_addons.result['CARBON REVENUE PROFILE'] self.assertIsNotNone(ccus_profile) self.assertListEqual( ccus_profile[0], From a710ba6de27cd2c4f05ed32474ef1066f4dba8e0 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:25:47 -0800 Subject: [PATCH 13/20] =?UTF-8?q?Bump=20version:=203.7.18=20=E2=86=92=203.?= =?UTF-8?q?7.19?= 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 d5e854f3c..d918300b3 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.18 +current_version = 3.7.19 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index 3ac872c3b..bf33ebf03 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.7.18 + version: 3.7.19 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index 12107a8d5..0b60b42be 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,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.7.18.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.19.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.18...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.19...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 385857157..9365c7a78 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2025' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.7.18' +version = release = '3.7.19' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index d3ecfc9ad..63cd179ee 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.7.18', + version='3.7.19', 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 f7a500783..418ca5b20 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.7.18' +__version__ = '3.7.19' From abb867ad75d761896634c8517e36b8126ae04c42 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:45:24 -0800 Subject: [PATCH 14/20] more example1_addons.txt parameter categories organization --- tests/examples/example1_addons.txt | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/examples/example1_addons.txt b/tests/examples/example1_addons.txt index cc4a77d98..ece7ed4e2 100644 --- a/tests/examples/example1_addons.txt +++ b/tests/examples/example1_addons.txt @@ -29,15 +29,6 @@ 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 -Heat Escalation Start Year,7 -Heat Escalation Rate Per Year,0.01 -Starting Electricity Sale Price,0.09 -Ending Electricity Sale Price,0.15 -Electricity Escalation Start Year,5 -Electricity Escalation Rate Per Year,0.012 # ***RESERVOIR PARAMETERS*** # ************************** @@ -83,8 +74,8 @@ Utilization Factor,.9, ---[-] between .1 and 1 Surface Temperature,20, ---[deg.C] Ambient Temperature,20, ---[deg.C] -# ***FINANCIAL PARAMETERS*** -# ************************** +# ***FINANCIAL & ECONOMIC PARAMETERS*** +# ************************************* Plant Lifetime,30, ---[years] Fixed Charge Rate,.05, ---[-] between 0 and 1 Inflation Rate During Construction,0, ---[-] @@ -95,6 +86,16 @@ Other Incentives, 2.112 Tax Relief Per Year, 2.212 One-time Grants Etc,20.212 +Current Grid CO2 production,0.82 +Starting Heat Sale Price,0.0123 +Ending Heat Sale Price,0.0359 +Heat Escalation Start Year,7 +Heat Escalation Rate Per Year,0.01 +Starting Electricity Sale Price,0.09 +Ending Electricity Sale Price,0.15 +Electricity Escalation Start Year,5 +Electricity Escalation Rate Per Year,0.012 + # ***Simulation Parameters*** # *************************** Print Output to Console,1, ---[-] Should be 0 (don't print results) or 1 (print results) From 34f73b8a2c91cacba88914a631eab1d658e40b6c Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 11:44:03 -0800 Subject: [PATCH 15/20] Fix revenue profile carbon price units - it was incorrectly designated as USD/tonne but the values are in USD/lb --- src/geophires_x/Economics.py | 4 +- src/geophires_x/Outputs.py | 2 +- src/geophires_x_client/geophires_x_result.py | 10 +- tests/example1_addons.csv | 122 +++++++++--------- ...3_Tabulated_Database_Coaxial_sCO2_heat.out | 8 +- ..._Tabulated_Database_Coaxial_water_heat.out | 8 +- ...023_Tabulated_Database_Uloop_sCO2_elec.out | 8 +- ...023_Tabulated_Database_Uloop_sCO2_heat.out | 8 +- ...23_Tabulated_Database_Uloop_water_elec.out | 8 +- ...23_Tabulated_Database_Uloop_water_heat.out | 8 +- tests/examples/Fervo_Norbeck_Latimer_2023.out | 12 +- tests/examples/Fervo_Project_Cape-2.out | 12 +- tests/examples/Fervo_Project_Cape-3.out | 8 +- tests/examples/Fervo_Project_Cape.out | 12 +- tests/examples/S-DAC-GT.out | 8 +- tests/examples/SUTRAExample1.out | 10 +- ...Closed-Loop_Geothermal_Energy_Recovery.out | 10 +- tests/examples/example1.out | 10 +- tests/examples/example10_HP.out | 10 +- tests/examples/example11_AC.out | 10 +- tests/examples/example12_DH.out | 10 +- tests/examples/example13.out | 10 +- tests/examples/example1_addons.out | 8 +- tests/examples/example1_outputunits.out | 10 +- tests/examples/example2.out | 12 +- tests/examples/example3.out | 8 +- tests/examples/example4.out | 10 +- tests/examples/example5.out | 12 +- tests/examples/example8.out | 12 +- tests/examples/example9.out | 12 +- tests/examples/example_ITC.out | 10 +- tests/examples/example_PTC.out | 10 +- tests/examples/example_SBT_Hi_T.out | 10 +- tests/examples/example_SBT_Lo_T.out | 10 +- tests/examples/example_SHR-1.out | 10 +- tests/examples/example_SHR-2.out | 10 +- .../examples/example_multiple_gradients-2.out | 10 +- tests/examples/example_multiple_gradients.out | 10 +- tests/examples/example_overpressure.out | 10 +- tests/examples/example_overpressure2.out | 10 +- tests/test_geophires_x_client.py | 4 +- 41 files changed, 248 insertions(+), 248 deletions(-) diff --git a/src/geophires_x/Economics.py b/src/geophires_x/Economics.py index 2b92739bc..36880dca0 100644 --- a/src/geophires_x/Economics.py +++ b/src/geophires_x/Economics.py @@ -1523,8 +1523,8 @@ def __init__(self, model: Model): self.CarbonPrice = self.OutputParameterDict[self.CarbonPrice.Name] = OutputParameter( "Carbon Price Model", UnitType=Units.COSTPERMASS, - PreferredUnits=CostPerMassUnit.DOLLARSPERTONNE, - CurrentUnits=CostPerMassUnit.DOLLARSPERTONNE + PreferredUnits=CostPerMassUnit.DOLLARSPERLB, + CurrentUnits=CostPerMassUnit.DOLLARSPERLB ) self.LCOC = self.OutputParameterDict[self.LCOC.Name] = OutputParameter( diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index 9c1a032be..cf1dd4288 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -2091,7 +2091,7 @@ def o(output_param: OutputParameter): ') (' + o(econ.CoolingRevenue).CurrentUnits.value + ') (' + o(econ.CoolingCummRevenue).CurrentUnits.value + ') |(' + o(econ.CarbonPrice).CurrentUnits.value + - ') (' + o(econ.CarbonRevenue).CurrentUnits.value + + ') (' + o(econ.CarbonRevenue).CurrentUnits.value + ') (' + o(econ.CarbonCummCashFlow).CurrentUnits.value + ') |(' + o(econ.Coam).CurrentUnits.value + ') (' + o(econ.TotalRevenue).CurrentUnits.value + diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py index 44403dc4c..64c101952 100644 --- a/src/geophires_x_client/geophires_x_result.py +++ b/src/geophires_x_client/geophires_x_result.py @@ -334,7 +334,7 @@ class GeophiresXResult: 'Cooling Price (cents/kWh)', 'Cooling Ann. Rev. (MUSD/yr)', 'Cooling Cumm. Rev. (MUSD)', - 'Carbon Price (USD/tonne)', + 'Carbon Price (USD/lb)', 'Carbon Ann. Rev. (MUSD/yr)', 'Carbon Cumm. Rev. (MUSD)', 'Project OPEX (MUSD/yr)', @@ -344,6 +344,7 @@ class GeophiresXResult: CCUS_PROFILE_LEGACY_NAME: ClassVar[str] = 'CCUS PROFILE' CARBON_REVENUE_PROFILE_NAME: ClassVar[str] = 'CARBON REVENUE PROFILE' + _CARBON_PRICE_FIELD_NAME = 'Carbon Price (USD/lb)' def __init__(self, output_file_path, logger_name=None): if logger_name is None: @@ -649,11 +650,10 @@ def _get_carbon_revenue_or_ccus_legacy_profile(self) -> tuple: if revenue_and_cashflow_profile is None: return None, None - carbon_price_field_name = 'Carbon Price (USD/tonne)' headers = [ 'Year Since Start', # 'Carbon Avoided (pound)', # Present in legacy CCUS profile but not in Revenue & Cashflow - carbon_price_field_name, # Legacy field name: 'CCUS Price (USD/lb)' + GeophiresXResult._CARBON_PRICE_FIELD_NAME, # Legacy field name: 'CCUS Price (USD/lb)' 'Carbon Ann. Rev. (MUSD/yr)', # Legacy field name: 'CCUS Revenue (MUSD/yr)' # 'CCUS Annual Cash Flow (MUSD/yr)', # Present in legacy CCUS profile but not in Revenue & Cashflow 'Carbon Cumm. Rev. (MUSD)', # # Legacy field name: 'CCUS Cumm. Cash Flow (MUSD)' @@ -661,10 +661,10 @@ def _get_carbon_revenue_or_ccus_legacy_profile(self) -> tuple: # 'Project Cumm. Cash Flow (MUSD)', # Present in legacy CCUS profile but not in Revenue & Cashflow ] - carbon_price_index = revenue_and_cashflow_profile[0].index(carbon_price_field_name) + carbon_price_index = revenue_and_cashflow_profile[0].index(GeophiresXResult._CARBON_PRICE_FIELD_NAME) has_ccus_profile_in_revenue_and_cashflow = ( len(revenue_and_cashflow_profile) > 1 - and carbon_price_field_name in revenue_and_cashflow_profile[0] + and GeophiresXResult._CARBON_PRICE_FIELD_NAME in revenue_and_cashflow_profile[0] # Treat all-zero values as not having CCUS profile and any(it != 0 for it in [x[carbon_price_index] for x in revenue_and_cashflow_profile[1:]]) ) diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index 7a4a92615..d63e19722 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -99,7 +99,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,, SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,% SURFACE EQUIPMENT SIMULATION RESULTS,Heat to Power Conversion Efficiency,,10.07,% -Simulation Metadata,GEOPHIRES Version,,3.7.18, +Simulation Metadata,GEOPHIRES Version,,3.7.19, POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0, POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056, POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073, @@ -910,36 +910,36 @@ 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.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.01,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,8,0.03,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,9,0.04,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,10,0.04,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,11,0.06,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,12,0.07,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,13,0.07,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,14,0.09,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,15,0.1,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,16,0.1,USD/tonne -REVENUE & CASHFLOW PROFILE,Carbon Price,17,0.1,USD/tonne -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 Price,1,0.0,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,2,0.01,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,3,0.01,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,4,0.01,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,5,0.01,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,6,0.01,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,7,0.01,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,8,0.03,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,9,0.04,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,10,0.04,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,11,0.06,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,12,0.07,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,13,0.07,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,14,0.09,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,15,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,16,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,17,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,18,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,19,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,20,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,21,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,22,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,23,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,24,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,25,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,26,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,27,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,28,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,29,0.1,USD/lb +REVENUE & CASHFLOW PROFILE,Carbon Price,30,0.1,USD/lb REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr @@ -1090,36 +1090,36 @@ REVENUE & CASHFLOW PROFILE,Project Net Cashflow,27,197.51,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,28,208.24,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,29,218.97,MUSD REVENUE & CASHFLOW PROFILE,Project Net Cashflow,30,229.7,MUSD -CARBON REVENUE PROFILE,Carbon Price,1,0.0,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,2,0.01,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,3,0.01,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,4,0.01,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,5,0.01,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,6,0.01,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,7,0.01,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,8,0.03,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,9,0.04,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,10,0.04,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,11,0.06,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,12,0.07,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,13,0.07,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,14,0.09,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,15,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,16,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,17,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,18,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,19,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,20,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,21,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,22,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,23,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,24,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,25,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,26,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,27,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,28,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,29,0.1,USD/tonne -CARBON REVENUE PROFILE,Carbon Price,30,0.1,USD/tonne +CARBON REVENUE PROFILE,Carbon Price,1,0.0,USD/lb +CARBON REVENUE PROFILE,Carbon Price,2,0.01,USD/lb +CARBON REVENUE PROFILE,Carbon Price,3,0.01,USD/lb +CARBON REVENUE PROFILE,Carbon Price,4,0.01,USD/lb +CARBON REVENUE PROFILE,Carbon Price,5,0.01,USD/lb +CARBON REVENUE PROFILE,Carbon Price,6,0.01,USD/lb +CARBON REVENUE PROFILE,Carbon Price,7,0.01,USD/lb +CARBON REVENUE PROFILE,Carbon Price,8,0.03,USD/lb +CARBON REVENUE PROFILE,Carbon Price,9,0.04,USD/lb +CARBON REVENUE PROFILE,Carbon Price,10,0.04,USD/lb +CARBON REVENUE PROFILE,Carbon Price,11,0.06,USD/lb +CARBON REVENUE PROFILE,Carbon Price,12,0.07,USD/lb +CARBON REVENUE PROFILE,Carbon Price,13,0.07,USD/lb +CARBON REVENUE PROFILE,Carbon Price,14,0.09,USD/lb +CARBON REVENUE PROFILE,Carbon Price,15,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,16,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,17,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,18,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,19,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,20,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,21,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,22,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,23,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,24,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,25,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,26,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,27,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,28,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,29,0.1,USD/lb +CARBON REVENUE PROFILE,Carbon Price,30,0.1,USD/lb CARBON REVENUE PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr CARBON REVENUE PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr CARBON REVENUE PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.out index 9119098c1..15a8e2ab7 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.out +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.0 - Simulation Date: 2024-10-15 - Simulation Time: 13:07 - Calculation Time: 0.783 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.841 sec ***AGS/CLGS STYLE OUTPUT*** diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.out index 2491e87f1..8d2122370 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.out +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.0 - Simulation Date: 2024-10-15 - Simulation Time: 13:07 - Calculation Time: 0.721 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.798 sec ***AGS/CLGS STYLE OUTPUT*** diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.out index e5d4c283f..08cf69217 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.out +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.0 - Simulation Date: 2024-10-15 - Simulation Time: 13:08 - Calculation Time: 0.800 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:35 + Calculation Time: 0.925 sec ***AGS/CLGS STYLE OUTPUT*** diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.out index 8d0502649..8944fc88f 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.out +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.0 - Simulation Date: 2024-10-15 - Simulation Time: 13:08 - Calculation Time: 0.822 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:34 + Calculation Time: 0.919 sec ***AGS/CLGS STYLE OUTPUT*** diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.out index 0ae64f282..d0b0dc927 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.out +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.0 - Simulation Date: 2024-10-15 - Simulation Time: 13:07 - Calculation Time: 0.792 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.858 sec ***AGS/CLGS STYLE OUTPUT*** diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.out b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.out index 3219c3da5..b22fd193a 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.out +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.0 - Simulation Date: 2024-10-15 - Simulation Time: 13:08 - Calculation Time: 0.856 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:35 + Calculation Time: 0.997 sec ***AGS/CLGS STYLE OUTPUT*** diff --git a/tests/examples/Fervo_Norbeck_Latimer_2023.out b/tests/examples/Fervo_Norbeck_Latimer_2023.out index 4d8f51520..53e7e2436 100644 --- a/tests/examples/Fervo_Norbeck_Latimer_2023.out +++ b/tests/examples/Fervo_Norbeck_Latimer_2023.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.5 - Simulation Date: 2025-01-31 - Simulation Time: 11:14 - Calculation Time: 0.437 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:34 + Calculation Time: 0.459 sec ***SUMMARY OF RESULTS*** @@ -70,7 +70,7 @@ Simulation Metadata Number of fractures: 100.00 Fracture separation: 10.00 meter Reservoir volume: 25344000 m**3 - Reservoir impedance: 0.30 GPa.s/m**3 + Reservoir impedance: 0.3000 GPa.s/m**3 Reservoir density: 2800.00 kg/m**3 Reservoir thermal conductivity: 2.70 W/m/K Reservoir heat capacity: 1000.00 J/kg/K @@ -172,7 +172,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -28.12 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -28.12 -28.12 2 15.00 1.94 2.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 1.94 -26.18 diff --git a/tests/examples/Fervo_Project_Cape-2.out b/tests/examples/Fervo_Project_Cape-2.out index f08e99ae6..06f8f71a5 100644 --- a/tests/examples/Fervo_Project_Cape-2.out +++ b/tests/examples/Fervo_Project_Cape-2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:48 - Calculation Time: 0.684 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:34 + Calculation Time: 0.685 sec ***SUMMARY OF RESULTS*** @@ -70,7 +70,7 @@ Simulation Metadata Number of fractures: 108.00 Fracture separation: 30.00 meter Reservoir volume: 385200000 m**3 - Reservoir impedance: 0.01 GPa.s/m**3 + Reservoir impedance: 0.0100 GPa.s/m**3 Reservoir density: 2800.00 kg/m**3 Reservoir thermal conductivity: 3.05 W/m/K Reservoir heat capacity: 790.00 J/kg/K @@ -180,7 +180,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -50.77 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -50.77 -50.77 2 15.00 8.75 10.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 8.75 -42.02 diff --git a/tests/examples/Fervo_Project_Cape-3.out b/tests/examples/Fervo_Project_Cape-3.out index 20f2009d8..0d0489177 100644 --- a/tests/examples/Fervo_Project_Cape-3.out +++ b/tests/examples/Fervo_Project_Cape-3.out @@ -4,9 +4,9 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.12 - Simulation Date: 2025-02-17 - Simulation Time: 10:42 + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:34 Calculation Time: 0.890 sec ***SUMMARY OF RESULTS*** @@ -191,7 +191,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -1072.95 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -1072.95 -1072.95 2 15.00 447.20 474.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 447.20 -625.75 diff --git a/tests/examples/Fervo_Project_Cape.out b/tests/examples/Fervo_Project_Cape.out index ad4650e94..b215bddde 100644 --- a/tests/examples/Fervo_Project_Cape.out +++ b/tests/examples/Fervo_Project_Cape.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:48 - Calculation Time: 0.672 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:35 + Calculation Time: 0.678 sec ***SUMMARY OF RESULTS*** @@ -70,7 +70,7 @@ Simulation Metadata Number of fractures: 100.00 Fracture separation: 15.00 meter Reservoir volume: 1069200000 m**3 - Reservoir impedance: 0.01 GPa.s/m**3 + Reservoir impedance: 0.0100 GPa.s/m**3 Reservoir density: 2800.00 kg/m**3 Reservoir thermal conductivity: 2.70 W/m/K Reservoir heat capacity: 1000.00 J/kg/K @@ -180,7 +180,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -482.83 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -482.83 -482.83 2 15.00 99.57 109.30 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 99.57 -383.26 diff --git a/tests/examples/S-DAC-GT.out b/tests/examples/S-DAC-GT.out index 36412f3c0..3ce7041ea 100644 --- a/tests/examples/S-DAC-GT.out +++ b/tests/examples/S-DAC-GT.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.18 + GEOPHIRES Version: 3.7.19 Simulation Date: 2025-02-28 - Simulation Time: 10:21 - Calculation Time: 0.099 sec + Simulation Time: 11:35 + Calculation Time: 0.102 sec ***SUMMARY OF RESULTS*** @@ -211,7 +211,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -102.56 -102.56 2 5.50 5.15 5.15 | 2.50 -0.06 -0.06 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.19 1.90 -100.66 diff --git a/tests/examples/SUTRAExample1.out b/tests/examples/SUTRAExample1.out index 41af6ef77..f99877c4d 100644 --- a/tests/examples/SUTRAExample1.out +++ b/tests/examples/SUTRAExample1.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.3 - Simulation Date: 2024-11-11 - Simulation Time: 15:22 - Calculation Time: 2.100 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:32 + Calculation Time: 0.524 sec ***SUMMARY OF RESULTS*** @@ -31,7 +31,7 @@ Simulation Metadata Number of Production Wells: 1 Number of Injection Wells: 1 - Well Depth: 0.6 kilometer + Well depth: 0.6 kilometer Pump efficiency: 80.0 % Lifetime Average Well Flow Rate: 16.2 kg/sec Injection well casing ID: 7.800 in 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 81f58d91b..c60846b6d 100644 --- a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out +++ b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.5 - Simulation Date: 2025-01-31 - Simulation Time: 11:36 - Calculation Time: 1.595 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:34 + Calculation Time: 1.654 sec ***SUMMARY OF RESULTS*** @@ -212,7 +212,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -82.72 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -82.72 -82.72 2 5.50 -0.36 0.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.36 -83.08 diff --git a/tests/examples/example1.out b/tests/examples/example1.out index f22f32dba..f6f288eff 100644 --- a/tests/examples/example1.out +++ b/tests/examples/example1.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.829 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.802 sec ***SUMMARY OF RESULTS*** @@ -209,7 +209,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -53.39 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -53.39 -53.39 2 5.50 0.89 2.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.89 -52.50 diff --git a/tests/examples/example10_HP.out b/tests/examples/example10_HP.out index 92ca08955..c9928ec88 100644 --- a/tests/examples/example10_HP.out +++ b/tests/examples/example10_HP.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.2 - Simulation Date: 2025-01-22 - Simulation Time: 11:01 - Calculation Time: 0.101 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.102 sec ***SUMMARY OF RESULTS*** @@ -203,7 +203,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 0.00 0.00 | 0.00 -31.11 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -31.11 -31.11 2 5.50 0.00 0.00 | 2.50 2.84 3.46 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -28.26 diff --git a/tests/examples/example11_AC.out b/tests/examples/example11_AC.out index 1042b14f6..bbaf6d44b 100644 --- a/tests/examples/example11_AC.out +++ b/tests/examples/example11_AC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.2 - Simulation Date: 2025-01-22 - Simulation Time: 11:01 - Calculation Time: 0.099 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.101 sec ***SUMMARY OF RESULTS*** @@ -208,7 +208,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -29.74 0.00 | 0.00 0.00 0.00 | 0.00 -29.74 -29.74 2 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 3.00 | 0.00 0.00 0.00 | 0.58 2.41 -27.33 diff --git a/tests/examples/example12_DH.out b/tests/examples/example12_DH.out index 20888defe..98af4ed66 100644 --- a/tests/examples/example12_DH.out +++ b/tests/examples/example12_DH.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.2 - Simulation Date: 2025-01-22 - Simulation Time: 11:01 - Calculation Time: 0.567 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:35 + Calculation Time: 0.587 sec ***SUMMARY OF RESULTS*** @@ -199,7 +199,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 0.00 0.00 | 0.00 -63.64 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -63.64 -63.64 2 5.50 0.00 0.00 | 5.00 4.19 5.65 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.19 -59.45 diff --git a/tests/examples/example13.out b/tests/examples/example13.out index 6bf27ffac..a85f3d2fe 100644 --- a/tests/examples/example13.out +++ b/tests/examples/example13.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.035 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:32 + Calculation Time: 0.036 sec ***SUMMARY OF RESULTS*** @@ -215,7 +215,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -56.49 -56.49 2 5.50 1.24 1.24 | 2.50 3.39 3.39 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.14 1.49 -55.00 diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index ab4fa74bd..454960343 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.18 + GEOPHIRES Version: 3.7.19 Simulation Date: 2025-02-28 - Simulation Time: 10:21 - Calculation Time: 0.780 sec + Simulation Time: 11:32 + Calculation Time: 0.796 sec ***SUMMARY OF RESULTS*** @@ -210,7 +210,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -31.07 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -31.07 -31.07 2 9.00 5.07 3.74 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.51 0.51 | -0.82 5.07 -26.00 diff --git a/tests/examples/example1_outputunits.out b/tests/examples/example1_outputunits.out index 23469bd74..921cd03d2 100644 --- a/tests/examples/example1_outputunits.out +++ b/tests/examples/example1_outputunits.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.778 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.810 sec ***SUMMARY OF RESULTS*** @@ -209,7 +209,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -46.85 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -46.85 -46.85 2 5.50 0.95 2.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.95 -45.91 diff --git a/tests/examples/example2.out b/tests/examples/example2.out index 1621bb3bf..1cfd80d05 100644 --- a/tests/examples/example2.out +++ b/tests/examples/example2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.2 - Simulation Date: 2025-01-22 - Simulation Time: 11:01 - Calculation Time: 0.208 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.213 sec ***SUMMARY OF RESULTS*** @@ -68,7 +68,7 @@ Simulation Metadata Number of fractures: 30.47 Fracture separation: 60.00 meter Reservoir volume: 125000000 m**3 - Reservoir impedance: 0.20 GPa.s/m**3 + Reservoir impedance: 0.2000 GPa.s/m**3 Reservoir density: 3000.00 kg/m**3 Reservoir thermal conductivity: 3.20 W/m/K Reservoir heat capacity: 975.00 J/kg/K @@ -192,7 +192,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 0.00 0.00 | 0.00 -41.15 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -41.15 -41.15 2 5.50 0.00 0.00 | 2.50 3.36 4.46 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.36 -37.78 diff --git a/tests/examples/example3.out b/tests/examples/example3.out index fe25911a9..db81c6031 100644 --- a/tests/examples/example3.out +++ b/tests/examples/example3.out @@ -4,9 +4,9 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:47 + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 Calculation Time: 0.117 sec ***SUMMARY OF RESULTS*** @@ -221,7 +221,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -111.71 -111.71 2 5.50 9.09 9.09 | 2.50 2.30 2.30 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.25 8.14 -103.57 diff --git a/tests/examples/example4.out b/tests/examples/example4.out index 16b7924ec..9e96c1bfa 100644 --- a/tests/examples/example4.out +++ b/tests/examples/example4.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.049 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:32 + Calculation Time: 0.048 sec ***SUMMARY OF RESULTS*** @@ -207,7 +207,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -55.40 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -55.40 -55.40 2 5.50 1.73 3.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.73 -53.67 diff --git a/tests/examples/example5.out b/tests/examples/example5.out index 8b8d0bf7e..1a450bf9c 100644 --- a/tests/examples/example5.out +++ b/tests/examples/example5.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.2 - Simulation Date: 2025-01-22 - Simulation Time: 11:01 - Calculation Time: 0.047 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:32 + Calculation Time: 0.048 sec ***SUMMARY OF RESULTS*** @@ -65,7 +65,7 @@ Simulation Metadata They are only used for calculating remaining heat content. Reservoir volume provided as input Reservoir volume: 1000000000 m**3 - Reservoir impedance: 0.05 GPa.s/m**3 + Reservoir impedance: 0.0500 GPa.s/m**3 Reservoir density: 2700.00 kg/m**3 Reservoir thermal conductivity: 3.00 W/m/K Reservoir heat capacity: 1050.00 J/kg/K @@ -198,7 +198,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 0.00 0.00 | 0.00 -41.59 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -41.59 -41.59 2 5.50 0.00 0.00 | 2.50 3.62 4.82 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.62 -37.97 diff --git a/tests/examples/example8.out b/tests/examples/example8.out index 719c89548..d040532c1 100644 --- a/tests/examples/example8.out +++ b/tests/examples/example8.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.2 - Simulation Date: 2025-01-22 - Simulation Time: 11:01 - Calculation Time: 0.772 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:35 + Calculation Time: 0.797 sec ***SUMMARY OF RESULTS*** @@ -68,7 +68,7 @@ Simulation Metadata Number of fractures: 5.00 Fracture separation: 100.00 meter Reservoir volume: 196000000 m**3 - Reservoir impedance: 0.05 GPa.s/m**3 + Reservoir impedance: 0.0500 GPa.s/m**3 Reservoir density: 2730.00 kg/m**3 Reservoir thermal conductivity: 2.83 W/m/K Reservoir heat capacity: 825.00 J/kg/K @@ -202,7 +202,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 0.00 0.00 | 0.00 -21.13 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -21.13 -21.13 2 5.50 0.00 0.00 | 2.50 0.84 1.28 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.84 -20.29 diff --git a/tests/examples/example9.out b/tests/examples/example9.out index d7b8c3edf..844172abf 100644 --- a/tests/examples/example9.out +++ b/tests/examples/example9.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:48 - Calculation Time: 0.796 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:35 + Calculation Time: 0.821 sec ***SUMMARY OF RESULTS*** @@ -70,7 +70,7 @@ Simulation Metadata Number of fractures: 5.00 Fracture separation: 100.00 meter Reservoir volume: 196000000 m**3 - Reservoir impedance: 0.05 GPa.s/m**3 + Reservoir impedance: 0.0500 GPa.s/m**3 Reservoir density: 2730.00 kg/m**3 Reservoir thermal conductivity: 2.83 W/m/K Reservoir heat capacity: 825.00 J/kg/K @@ -211,7 +211,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -27.43 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -27.43 -27.43 2 5.50 -0.28 0.21 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -27.71 diff --git a/tests/examples/example_ITC.out b/tests/examples/example_ITC.out index 5a99f1a1a..b429e3673 100644 --- a/tests/examples/example_ITC.out +++ b/tests/examples/example_ITC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:48 - Calculation Time: 0.812 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:34 + Calculation Time: 0.808 sec ***SUMMARY OF RESULTS*** @@ -208,7 +208,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -59.76 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -59.76 -59.76 2 5.50 4.97 8.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 4.97 -54.79 diff --git a/tests/examples/example_PTC.out b/tests/examples/example_PTC.out index 325f2fe89..c75fedaa0 100644 --- a/tests/examples/example_PTC.out +++ b/tests/examples/example_PTC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.772 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.807 sec ***SUMMARY OF RESULTS*** @@ -207,7 +207,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -119.52 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -119.52 -119.52 2 10.50 12.26 15.31 | 7.50 0.00 0.00 | 7.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 12.26 -107.26 diff --git a/tests/examples/example_SBT_Hi_T.out b/tests/examples/example_SBT_Hi_T.out index d862c8c30..c1685cf47 100644 --- a/tests/examples/example_SBT_Hi_T.out +++ b/tests/examples/example_SBT_Hi_T.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.5 - Simulation Date: 2025-01-31 - Simulation Time: 11:36 - Calculation Time: 8.431 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:34 + Calculation Time: 73.745 sec ***SUMMARY OF RESULTS*** @@ -191,7 +191,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -158.59 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -158.59 -158.59 2 19.00 21.93 25.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 21.93 -136.66 diff --git a/tests/examples/example_SBT_Lo_T.out b/tests/examples/example_SBT_Lo_T.out index 4f1504639..f3a03b8b7 100644 --- a/tests/examples/example_SBT_Lo_T.out +++ b/tests/examples/example_SBT_Lo_T.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.5 - Simulation Date: 2025-01-31 - Simulation Time: 11:36 - Calculation Time: 1.399 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 15.849 sec ***SUMMARY OF RESULTS*** @@ -191,7 +191,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -38.57 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -38.57 -38.57 2 19.00 -0.64 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -39.21 diff --git a/tests/examples/example_SHR-1.out b/tests/examples/example_SHR-1.out index 9c9c32f7f..274459731 100644 --- a/tests/examples/example_SHR-1.out +++ b/tests/examples/example_SHR-1.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:48 - Calculation Time: 0.810 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:34 + Calculation Time: 0.819 sec ***SUMMARY OF RESULTS*** @@ -206,7 +206,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -242.22 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -242.22 -242.22 2 6.00 11.83 13.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 11.83 -230.39 diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out index c6557dab0..394843b85 100644 --- a/tests/examples/example_SHR-2.out +++ b/tests/examples/example_SHR-2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:48 - Calculation Time: 0.543 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:34 + Calculation Time: 0.546 sec ***SUMMARY OF RESULTS*** @@ -186,7 +186,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -417.39 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -417.39 -417.39 2 6.00 44.26 50.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 44.26 -373.14 diff --git a/tests/examples/example_multiple_gradients-2.out b/tests/examples/example_multiple_gradients-2.out index 09b2eb29c..648455b2d 100644 --- a/tests/examples/example_multiple_gradients-2.out +++ b/tests/examples/example_multiple_gradients-2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:48 - Calculation Time: 0.797 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:35 + Calculation Time: 0.827 sec ***SUMMARY OF RESULTS*** @@ -220,7 +220,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -76.24 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -76.24 -76.24 2 5.50 1.70 3.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -74.54 diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out index 575fed0b7..a8557d1c5 100644 --- a/tests/examples/example_multiple_gradients.out +++ b/tests/examples/example_multiple_gradients.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:48 - Calculation Time: 0.831 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:35 + Calculation Time: 1.111 sec ***SUMMARY OF RESULTS*** @@ -220,7 +220,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -76.24 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -76.24 -76.24 2 5.50 1.70 3.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -74.54 diff --git a/tests/examples/example_overpressure.out b/tests/examples/example_overpressure.out index 8931f95d6..5437a9f4a 100644 --- a/tests/examples/example_overpressure.out +++ b/tests/examples/example_overpressure.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.901 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.801 sec ***SUMMARY OF RESULTS*** @@ -210,7 +210,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -48.50 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -48.50 -48.50 2 9.00 2.65 4.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.65 -45.85 diff --git a/tests/examples/example_overpressure2.out b/tests/examples/example_overpressure2.out index 6159684b0..b4ede63a5 100644 --- a/tests/examples/example_overpressure2.out +++ b/tests/examples/example_overpressure2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.950 sec + GEOPHIRES Version: 3.7.19 + Simulation Date: 2025-02-28 + Simulation Time: 11:33 + Calculation Time: 0.841 sec ***SUMMARY OF RESULTS*** @@ -210,7 +210,7 @@ Simulation Metadata ******************************** Year Electricity | Heat | Cooling | Carbon | Project 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) +Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ 1 0.00 -48.25 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -48.25 -48.25 2 9.00 2.65 4.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.65 -45.60 diff --git a/tests/test_geophires_x_client.py b/tests/test_geophires_x_client.py index 70183ad8c..1286af608 100644 --- a/tests/test_geophires_x_client.py +++ b/tests/test_geophires_x_client.py @@ -293,7 +293,7 @@ def test_revenue_and_cashflow_profile(self): 'Cooling Price (cents/kWh)', 'Cooling Ann. Rev. (MUSD/yr)', 'Cooling Cumm. Rev. (MUSD)', - 'Carbon Price (USD/tonne)', + 'Carbon Price (USD/lb)', 'Carbon Ann. Rev. (MUSD/yr)', 'Carbon Cumm. Rev. (MUSD)', 'Project OPEX (MUSD/yr)', @@ -354,7 +354,7 @@ def test_carbon_revenue_profile(self): self.assertIsNotNone(ccus_profile) self.assertListEqual( ccus_profile[0], - ['Year Since Start', 'Carbon Price (USD/tonne)', 'Carbon Ann. Rev. (MUSD/yr)', 'Carbon Cumm. Rev. (MUSD)'], + ['Year Since Start', 'Carbon Price (USD/lb)', 'Carbon Ann. Rev. (MUSD/yr)', 'Carbon Cumm. Rev. (MUSD)'], ) self.assertListEqual(ccus_profile[1], [1, 0.0, 0.0, 0.0]) From a512b03a602cdb5bfdc3f8ebedbf29a83326cece Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 11:44:09 -0800 Subject: [PATCH 16/20] =?UTF-8?q?Bump=20version:=203.7.19=20=E2=86=92=203.?= =?UTF-8?q?7.20?= 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 d918300b3..abebfcc38 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.19 +current_version = 3.7.20 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index bf33ebf03..ae5f57f93 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.7.19 + version: 3.7.20 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index 0b60b42be..f7265723a 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,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.7.19.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.20.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.19...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.20...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 9365c7a78..79a80a3bb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2025' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.7.19' +version = release = '3.7.20' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index 63cd179ee..5175a18bb 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.7.19', + version='3.7.20', 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 418ca5b20..19e125a69 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.7.19' +__version__ = '3.7.20' From 6a42b2514089099700d77c220a32232171047e93 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:17:05 -0800 Subject: [PATCH 17/20] type annotation --- src/geophires_x_client/geophires_x_result.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py index 64c101952..a20a2c698 100644 --- a/src/geophires_x_client/geophires_x_result.py +++ b/src/geophires_x_client/geophires_x_result.py @@ -344,7 +344,7 @@ class GeophiresXResult: CCUS_PROFILE_LEGACY_NAME: ClassVar[str] = 'CCUS PROFILE' CARBON_REVENUE_PROFILE_NAME: ClassVar[str] = 'CARBON REVENUE PROFILE' - _CARBON_PRICE_FIELD_NAME = 'Carbon Price (USD/lb)' + _CARBON_PRICE_FIELD_NAME: ClassVar[str] = 'Carbon Price (USD/lb)' def __init__(self, output_file_path, logger_name=None): if logger_name is None: From f0cb15eb03f360f6c0cbdaf53410dee27acff684 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:19:37 -0800 Subject: [PATCH 18/20] S-DAC Economics: throw runtime error if range check fails instead of sys.exit; FIXME TODO re: https://github.com/NREL/GEOPHIRES-X/issues/341?title=S-DAC+does+not+calculate+carbon+revenue --- src/geophires_x/EconomicsS_DAC_GT.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/geophires_x/EconomicsS_DAC_GT.py b/src/geophires_x/EconomicsS_DAC_GT.py index 3aab8d591..26e6f1275 100644 --- a/src/geophires_x/EconomicsS_DAC_GT.py +++ b/src/geophires_x/EconomicsS_DAC_GT.py @@ -41,7 +41,7 @@ def __init__(self, model: Model): :type model: :class:`~geophires_x.Model.Model` :return: Nothing, and is used to initialize the class """ - model.logger.info("Init " + str(__class__) + ": " + sys._getframe().f_code.co_name) + model.logger.info(f"Init {str(__class__)}: {sys._getframe().f_code.co_name}") # These dictionaries contains a list of all the parameters set in this object, stored as "Parameter" and # OutputParameter Objects. This will allow us later to access them in a user interface and get that list, @@ -335,7 +335,7 @@ def __init__(self, model: Model): CurrentUnits=CostPerMassUnit.DOLLARSPERTONNE ) - model.logger.info("Complete " + str(__class__) + ": " + sys._getframe().f_code.co_name) + model.logger.info(f"Complete {str(__class__)}: {sys._getframe().f_code.co_name}") def __str__(self): return "EconomicsS_DAC_GT" @@ -349,7 +349,7 @@ def read_parameters(self, model: Model) -> None: :type model: :class:`~geophires_x.Model.Model` :return: None """ - model.logger.info("Init " + str(__class__) + ": " + sys._getframe().f_code.co_name) + model.logger.info(f"Init {str(__class__)}: {sys._getframe().f_code.co_name}") # Deal with all the parameter values that the user has provided. They should really only provide values # that they want to change from the default values, but they can provide a value that is already set because it @@ -374,7 +374,7 @@ def read_parameters(self, model: Model) -> None: # none in this case so far else: model.logger.info("No parameters read becuase no content provided") - model.logger.info("read parameters complete " + str(__class__) + ": " + sys._getframe().f_code.co_name) + model.logger.info(f"read parameters complete {str(__class__)}: {sys._getframe().f_code.co_name}") def calculate_CRF(self, wacc: float, num_years: float) -> float: """ @@ -579,9 +579,10 @@ def Calculate(self, model: Model) -> None: # Ensure parameters are within range. If not, exit function without completing calculation or generating charts err_state, err_message = self.range_check() if err_state: - model.logger.fatal(err_message + " Exiting....") - print(err_message + " Exiting....") - sys.exit() + msg = f'{err_message}. Exiting...' + model.logger.fatal(msg) + print(msg) + raise RuntimeError(err_message) # Calculate initial CRF value based on default inputs self.CRF = self.calculate_CRF(self.wacc.value, model.surfaceplant.plant_lifetime.value) @@ -666,6 +667,7 @@ def Calculate(self, model: Model) -> None: model.surfaceplant.HeatkWhProduced.value[i] = (model.surfaceplant.HeatkWhProduced.value[i] - (self.CarbonExtractedAnnually.value[i] * self.therm.value)) + # FIXME TODO https://github.com/NREL/GEOPHIRES-X/issues/341?title=S-DAC+does+not+calculate+carbon+revenue # Build a revenue generation model for the carbon capture, assuming the capture is being sequestered and that # there is some sort of credit involved for doing that sequestering # note that there may already be values in the CarbonRevenue array, so we need to @@ -674,8 +676,8 @@ def Calculate(self, model: Model) -> None: #for i in range(0, total_duration, 1): # model.sdacgteconomics.CarbonRevenue.value[i] = (model.sdacgteconomics.CarbonRevenue.value[i] + # (self.CarbonExtractedAnnually.value[i] * model.economics.CarbonPrice.value[i])) -# if i > 0: -# model.economics.CarbonCummCashFlow.value[i] = model.economics.CarbonCummCashFlow.value[i - 1] + model.economics.CarbonRevenue.value[i] + # if i > 0: + # model.economics.CarbonCummCashFlow.value[i] = model.economics.CarbonCummCashFlow.value[i - 1] + model.economics.CarbonRevenue.value[i] self._calculate_derived_outputs(model) model.logger.info(f'Complete {str(__class__)}: {sys._getframe().f_code.co_name}') From 164f49a83e9fbf3df5853b4ced9d0f017a77986d Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 4 Mar 2025 08:40:28 -0800 Subject: [PATCH 19/20] Fix issue with revenue profile electricity annual revenue being erroneously replaced with total revenue --- src/geophires_x/Economics.py | 6 +- src/geophires_x/SBTEconomics.py | 6 +- tests/example1_addons.csv | 62 ++++++------- tests/examples/Fervo_Norbeck_Latimer_2023.out | 28 +++--- tests/examples/Fervo_Project_Cape-2.out | 38 ++++---- tests/examples/Fervo_Project_Cape-3.out | 48 +++++----- tests/examples/Fervo_Project_Cape.out | 38 ++++---- ...Closed-Loop_Geothermal_Energy_Recovery.out | 88 +++++++++---------- tests/examples/example1.out | 68 +++++++------- tests/examples/example10_HP.out | 66 +++++++------- tests/examples/example11_AC.out | 68 +++++++------- tests/examples/example12_DH.out | 48 +++++----- tests/examples/example1_addons.out | 68 +++++++------- tests/examples/example1_outputunits.out | 68 +++++++------- tests/examples/example2.out | 58 ++++++------ tests/examples/example4.out | 68 +++++++------- tests/examples/example5.out | 68 +++++++------- tests/examples/example8.out | 68 +++++++------- tests/examples/example9.out | 68 +++++++------- tests/examples/example_ITC.out | 68 +++++++------- tests/examples/example_PTC.out | 68 +++++++------- tests/examples/example_SBT_Hi_T.out | 68 +++++++------- tests/examples/example_SBT_Lo_T.out | 68 +++++++------- tests/examples/example_SHR-1.out | 68 +++++++------- tests/examples/example_SHR-2.out | 48 +++++----- .../examples/example_multiple_gradients-2.out | 68 +++++++------- tests/examples/example_multiple_gradients.out | 68 +++++++------- tests/examples/example_overpressure.out | 68 +++++++------- tests/examples/example_overpressure2.out | 68 +++++++------- 29 files changed, 845 insertions(+), 845 deletions(-) diff --git a/src/geophires_x/Economics.py b/src/geophires_x/Economics.py index 36880dca0..b6ac89629 100644 --- a/src/geophires_x/Economics.py +++ b/src/geophires_x/Economics.py @@ -2804,19 +2804,19 @@ def Calculate(self, model: Model) -> None: self.ElecRevenue.value, self.ElecCummRevenue.value = CalculateRevenue( model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value, model.surfaceplant.NetkWhProduced.value, self.ElecPrice.value) - self.TotalRevenue.value = self.ElecRevenue.value + self.TotalRevenue.value = self.ElecRevenue.value.copy() #self.TotalCummRevenue.value = self.ElecCummRevenue.value elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT and model.surfaceplant.plant_type.value not in [PlantType.ABSORPTION_CHILLER]: self.HeatRevenue.value, self.HeatCummRevenue.value = CalculateRevenue( model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value, model.surfaceplant.HeatkWhProduced.value, self.HeatPrice.value) - self.TotalRevenue.value = self.HeatRevenue.value + self.TotalRevenue.value = self.HeatRevenue.value.copy() #self.TotalCummRevenue.value = self.HeatCummRevenue.value elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT and model.surfaceplant.plant_type.value in [PlantType.ABSORPTION_CHILLER]: self.CoolingRevenue.value, self.CoolingCummRevenue.value = CalculateRevenue( model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value, model.surfaceplant.cooling_kWh_Produced.value, self.CoolingPrice.value) - self.TotalRevenue.value = self.CoolingRevenue.value + self.TotalRevenue.value = self.CoolingRevenue.value.copy() #self.TotalCummRevenue.value = self.CoolingCummRevenue.value elif model.surfaceplant.enduse_option.value in [EndUseOptions.COGENERATION_TOPPING_EXTRA_HEAT, EndUseOptions.COGENERATION_TOPPING_EXTRA_ELECTRICITY, diff --git a/src/geophires_x/SBTEconomics.py b/src/geophires_x/SBTEconomics.py index 7c7104444..1fa493d77 100644 --- a/src/geophires_x/SBTEconomics.py +++ b/src/geophires_x/SBTEconomics.py @@ -755,19 +755,19 @@ def Calculate(self, model: Model) -> None: self.ElecRevenue.value, self.ElecCummRevenue.value = CalculateRevenue( model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value, model.surfaceplant.NetkWhProduced.value, self.ElecPrice.value) - self.TotalRevenue.value = self.ElecRevenue.value + self.TotalRevenue.value = self.ElecRevenue.value.copy() #self.TotalCummRevenue.value = self.ElecCummRevenue.value elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT and model.surfaceplant.plant_type.value not in [PlantType.ABSORPTION_CHILLER]: self.HeatRevenue.value, self.HeatCummRevenue.value = CalculateRevenue( model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value, model.surfaceplant.HeatkWhProduced.value, self.HeatPrice.value) - self.TotalRevenue.value = self.HeatRevenue.value + self.TotalRevenue.value = self.HeatRevenue.value.copy() #self.TotalCummRevenue.value = self.HeatCummRevenue.value elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT and model.surfaceplant.plant_type.value in [PlantType.ABSORPTION_CHILLER]: self.CoolingRevenue.value, self.CoolingCummRevenue.value = CalculateRevenue( model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value, model.surfaceplant.cooling_kWh_Produced.value, self.CoolingPrice.value) - self.TotalRevenue.value = self.CoolingRevenue.value + self.TotalRevenue.value = self.CoolingRevenue.value.copy() #self.TotalCummRevenue.value = self.CoolingCummRevenue.value elif model.surfaceplant.enduse_option.value in [EndUseOptions.COGENERATION_TOPPING_EXTRA_HEAT, EndUseOptions.COGENERATION_TOPPING_EXTRA_ELECTRICITY, diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index d63e19722..bcc177806 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -99,7 +99,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,, SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,% SURFACE EQUIPMENT SIMULATION RESULTS,Heat to Power Conversion Efficiency,,10.07,% -Simulation Metadata,GEOPHIRES Version,,3.7.19, +Simulation Metadata,GEOPHIRES Version,,3.7.20, POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0, POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056, POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073, @@ -670,36 +670,36 @@ 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,-31.07,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,2,5.07,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,3,5.12,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,4,5.13,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,5,5.14,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,6,5.15,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,7,5.15,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,6.02,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,9,6.88,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,10,7.74,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,11,8.6,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,12,9.47,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,13,9.82,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,14,10.17,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,15,10.52,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,16,10.7,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,17,10.71,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,18,10.71,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,19,10.71,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,20,10.71,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,21,10.72,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,22,10.72,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,23,10.72,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,24,10.72,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,25,10.72,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,26,10.73,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,27,10.73,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,28,10.73,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,29,10.73,MUSD/yr -REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,30,10.73,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,1,0.0,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,2,3.74,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,3,3.78,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,4,3.8,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,5,3.81,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,6,3.81,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,7,3.82,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,4.33,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,9,4.84,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,10,5.36,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,11,5.87,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,12,6.38,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,13,6.39,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,14,6.39,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,15,6.39,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,16,6.39,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,17,6.39,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,18,6.4,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,19,6.4,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,20,6.4,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,21,6.4,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,22,6.4,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,23,6.4,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,24,6.4,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,25,6.41,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,26,6.41,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,27,6.41,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,28,6.41,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,29,6.41,MUSD/yr +REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,30,6.41,MUSD/yr REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,1,0.0,MUSD REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,2,3.74,MUSD REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,3,7.53,MUSD diff --git a/tests/examples/Fervo_Norbeck_Latimer_2023.out b/tests/examples/Fervo_Norbeck_Latimer_2023.out index 53e7e2436..ca8c5d701 100644 --- a/tests/examples/Fervo_Norbeck_Latimer_2023.out +++ b/tests/examples/Fervo_Norbeck_Latimer_2023.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:34 - Calculation Time: 0.459 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.447 sec ***SUMMARY OF RESULTS*** @@ -174,13 +174,13 @@ 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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -28.12 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -28.12 -28.12 - 2 15.00 1.94 2.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 1.94 -26.18 - 3 15.00 1.97 5.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 1.97 -24.21 - 4 15.41 2.06 8.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.06 -22.15 - 5 15.81 2.14 11.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.14 -20.00 - 6 16.22 2.22 14.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.22 -17.78 - 7 16.62 2.30 17.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.30 -15.48 - 8 17.03 2.37 20.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.37 -13.12 - 9 17.43 2.39 23.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.39 -10.73 - 10 17.84 2.29 26.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.29 -8.44 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -28.12 -28.12 + 2 15.00 2.70 2.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 1.94 -26.18 + 3 15.00 2.74 5.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 1.97 -24.21 + 4 15.41 2.83 8.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.06 -22.15 + 5 15.81 2.91 11.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.14 -20.00 + 6 16.22 2.99 14.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.22 -17.78 + 7 16.62 3.06 17.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.30 -15.48 + 8 17.03 3.13 20.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.37 -13.12 + 9 17.43 3.15 23.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.39 -10.73 + 10 17.84 3.05 26.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.29 -8.44 diff --git a/tests/examples/Fervo_Project_Cape-2.out b/tests/examples/Fervo_Project_Cape-2.out index 06f8f71a5..54f9d02f3 100644 --- a/tests/examples/Fervo_Project_Cape-2.out +++ b/tests/examples/Fervo_Project_Cape-2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:34 - Calculation Time: 0.685 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.670 sec ***SUMMARY OF RESULTS*** @@ -182,18 +182,18 @@ 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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -50.77 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -50.77 -50.77 - 2 15.00 8.75 10.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 8.75 -42.02 - 3 15.00 8.81 20.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 8.81 -33.21 - 4 15.41 9.11 31.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 9.11 -24.10 - 5 15.81 9.40 42.77 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 9.40 -14.70 - 6 16.22 9.70 54.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 9.70 -5.00 - 7 16.62 9.99 65.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 9.99 4.98 - 8 17.03 10.28 77.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 10.28 15.26 - 9 17.43 10.56 89.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 10.56 25.83 - 10 17.84 10.85 102.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 10.85 36.68 - 11 18.24 11.14 115.33 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 11.14 47.82 - 12 18.65 11.43 128.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 11.43 59.25 - 13 19.05 11.72 141.82 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 11.72 70.97 - 14 19.46 12.00 155.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 12.00 82.97 - 15 19.86 12.29 169.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 12.29 95.26 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -50.77 -50.77 + 2 15.00 10.43 10.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 8.75 -42.02 + 3 15.00 10.48 20.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 8.81 -33.21 + 4 15.41 10.78 31.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 9.11 -24.10 + 5 15.81 11.08 42.77 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 9.40 -14.70 + 6 16.22 11.37 54.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 9.70 -5.00 + 7 16.62 11.66 65.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 9.99 4.98 + 8 17.03 11.95 77.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 10.28 15.26 + 9 17.43 12.24 89.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 10.56 25.83 + 10 17.84 12.53 102.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 10.85 36.68 + 11 18.24 12.82 115.33 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 11.14 47.82 + 12 18.65 13.10 128.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 11.43 59.25 + 13 19.05 13.39 141.82 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 11.72 70.97 + 14 19.46 13.68 155.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 12.00 82.97 + 15 19.86 13.97 169.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.67 12.29 95.26 diff --git a/tests/examples/Fervo_Project_Cape-3.out b/tests/examples/Fervo_Project_Cape-3.out index 0d0489177..d43fd33bf 100644 --- a/tests/examples/Fervo_Project_Cape-3.out +++ b/tests/examples/Fervo_Project_Cape-3.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:34 - Calculation Time: 0.890 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.891 sec ***SUMMARY OF RESULTS*** @@ -193,23 +193,23 @@ 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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -1072.95 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -1072.95 -1072.95 - 2 15.00 447.20 474.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 447.20 -625.75 - 3 15.00 449.39 950.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 449.39 -176.36 - 4 15.41 462.97 1440.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 462.97 286.61 - 5 15.81 476.29 1943.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 476.29 762.90 - 6 16.22 489.50 2460.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 489.50 1252.40 - 7 16.62 502.65 2989.77 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 502.65 1755.05 - 8 17.03 515.77 3532.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 515.77 2270.82 - 9 17.43 528.86 4088.32 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 528.86 2799.68 - 10 17.84 541.93 4657.21 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 541.93 3341.61 - 11 18.24 554.99 5239.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 554.99 3896.60 - 12 18.65 568.04 5834.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 568.04 4464.64 - 13 19.05 581.08 6442.21 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 581.08 5045.72 - 14 19.46 594.12 7063.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 594.12 5639.84 - 15 19.86 607.15 7697.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 607.15 6246.98 - 16 20.27 620.17 8344.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 620.17 6867.16 - 17 20.67 633.20 9004.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 633.20 7500.35 - 18 21.08 646.22 9677.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 646.22 8146.57 - 19 21.49 659.23 10364.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 659.23 8805.81 - 20 21.89 672.25 11063.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 672.25 9478.06 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -1072.95 -1072.95 + 2 15.00 474.16 474.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 447.20 -625.75 + 3 15.00 476.35 950.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 449.39 -176.36 + 4 15.41 489.93 1440.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 462.97 286.61 + 5 15.81 503.25 1943.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 476.29 762.90 + 6 16.22 516.46 2460.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 489.50 1252.40 + 7 16.62 529.61 2989.77 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 502.65 1755.05 + 8 17.03 542.73 3532.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 515.77 2270.82 + 9 17.43 555.82 4088.32 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 528.86 2799.68 + 10 17.84 568.89 4657.21 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 541.93 3341.61 + 11 18.24 581.95 5239.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 554.99 3896.60 + 12 18.65 595.00 5834.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 568.04 4464.64 + 13 19.05 608.04 6442.21 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 581.08 5045.72 + 14 19.46 621.08 7063.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 594.12 5639.84 + 15 19.86 634.11 7697.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 607.15 6246.98 + 16 20.27 647.14 8344.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 620.17 6867.16 + 17 20.67 660.16 9004.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 633.20 7500.35 + 18 21.08 673.18 9677.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 646.22 8146.57 + 19 21.49 686.20 10364.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 659.23 8805.81 + 20 21.89 699.21 11063.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 26.96 672.25 9478.06 diff --git a/tests/examples/Fervo_Project_Cape.out b/tests/examples/Fervo_Project_Cape.out index b215bddde..57f667653 100644 --- a/tests/examples/Fervo_Project_Cape.out +++ b/tests/examples/Fervo_Project_Cape.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:35 - Calculation Time: 0.678 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:32 + Calculation Time: 0.666 sec ***SUMMARY OF RESULTS*** @@ -182,18 +182,18 @@ 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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -482.83 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -482.83 -482.83 - 2 15.00 99.57 109.30 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 99.57 -383.26 - 3 15.00 100.24 219.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 100.24 -283.02 - 4 15.41 103.43 332.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 103.43 -179.58 - 5 15.81 106.54 448.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 106.54 -73.05 - 6 16.22 109.61 568.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 109.61 36.57 - 7 16.62 112.66 690.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 112.66 149.23 - 8 17.03 115.65 815.86 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 115.65 264.88 - 9 17.43 118.48 944.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 118.48 383.35 - 10 17.84 120.89 1074.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 120.89 504.25 - 11 18.24 122.44 1206.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 122.44 626.69 - 12 18.65 122.47 1339.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 122.47 749.16 - 13 19.05 120.18 1469.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 120.18 869.34 - 14 19.46 114.80 1593.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 114.80 984.14 - 15 19.86 105.83 1709.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 105.83 1089.97 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -482.83 -482.83 + 2 15.00 109.30 109.30 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 99.57 -383.26 + 3 15.00 109.98 219.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 100.24 -283.02 + 4 15.41 113.17 332.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 103.43 -179.58 + 5 15.81 116.28 448.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 106.54 -73.05 + 6 16.22 119.35 568.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 109.61 36.57 + 7 16.62 122.39 690.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 112.66 149.23 + 8 17.03 125.39 815.86 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 115.65 264.88 + 9 17.43 128.21 944.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 118.48 383.35 + 10 17.84 130.63 1074.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 120.89 504.25 + 11 18.24 132.18 1206.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 122.44 626.69 + 12 18.65 132.21 1339.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 122.47 749.16 + 13 19.05 129.91 1469.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 120.18 869.34 + 14 19.46 124.54 1593.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 114.80 984.14 + 15 19.86 115.57 1709.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 9.74 105.83 1089.97 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 c60846b6d..085c3fbec 100644 --- a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out +++ b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:34 - Calculation Time: 1.654 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 1.612 sec ***SUMMARY OF RESULTS*** @@ -214,43 +214,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -82.72 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -82.72 -82.72 - 2 5.50 -0.36 0.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.36 -83.08 - 3 5.50 -0.50 1.19 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.50 -83.59 - 4 5.50 -0.49 1.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.49 -84.07 - 5 5.50 -0.52 2.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.52 -84.60 - 6 5.50 -0.51 2.76 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.51 -85.11 - 7 5.50 -0.53 3.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.53 -85.64 - 8 5.50 -0.53 3.76 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.53 -86.17 - 9 5.50 -0.54 4.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.54 -86.70 - 10 5.50 -0.54 4.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.54 -87.24 - 11 5.50 -0.55 5.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.55 -87.79 - 12 5.50 -0.54 5.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.54 -88.33 - 13 5.50 -0.55 6.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.55 -88.88 - 14 5.50 -0.55 6.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.55 -89.43 - 15 5.50 -0.55 7.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.55 -89.98 - 16 5.50 -0.55 7.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.55 -90.54 - 17 5.50 -0.56 8.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.56 -91.09 - 18 5.50 -0.56 8.55 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.56 -91.65 - 19 5.50 -0.56 9.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.56 -92.21 - 20 5.50 -0.56 9.49 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.56 -92.78 - 21 5.50 -0.56 9.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.56 -93.34 - 22 5.50 -0.57 10.41 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -93.90 - 23 5.50 -0.57 10.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -94.47 - 24 5.50 -0.57 11.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -95.04 - 25 5.50 -0.57 11.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -95.61 - 26 5.50 -0.57 12.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -96.18 - 27 5.50 -0.57 12.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -96.75 - 28 5.50 -0.57 13.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -97.32 - 29 5.50 -0.57 13.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -97.89 - 30 5.50 -0.58 14.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.58 -98.47 - 31 5.50 -0.57 14.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -99.04 - 32 5.50 -0.58 14.98 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.58 -99.62 - 33 5.50 -0.57 15.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -100.19 - 34 5.50 -0.58 15.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.58 -100.77 - 35 5.50 -0.57 16.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -101.35 - 36 5.50 -0.59 16.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.59 -101.93 - 37 5.50 -0.57 17.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -102.51 - 38 5.50 -0.59 17.68 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.59 -103.10 - 39 5.50 -0.57 18.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -103.66 - 40 5.50 -0.61 18.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.61 -104.27 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -82.72 -82.72 + 2 5.50 0.67 0.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.36 -83.08 + 3 5.50 0.52 1.19 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.50 -83.59 + 4 5.50 0.54 1.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.49 -84.07 + 5 5.50 0.51 2.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.52 -84.60 + 6 5.50 0.52 2.76 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.51 -85.11 + 7 5.50 0.50 3.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.53 -85.64 + 8 5.50 0.50 3.76 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.53 -86.17 + 9 5.50 0.49 4.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.54 -86.70 + 10 5.50 0.49 4.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.54 -87.24 + 11 5.50 0.48 5.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.55 -87.79 + 12 5.50 0.49 5.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.54 -88.33 + 13 5.50 0.48 6.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.55 -88.88 + 14 5.50 0.48 6.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.55 -89.43 + 15 5.50 0.47 7.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.55 -89.98 + 16 5.50 0.47 7.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.55 -90.54 + 17 5.50 0.47 8.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.56 -91.09 + 18 5.50 0.47 8.55 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.56 -91.65 + 19 5.50 0.47 9.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.56 -92.21 + 20 5.50 0.47 9.49 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.56 -92.78 + 21 5.50 0.46 9.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.56 -93.34 + 22 5.50 0.46 10.41 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -93.90 + 23 5.50 0.46 10.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -94.47 + 24 5.50 0.46 11.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -95.04 + 25 5.50 0.46 11.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -95.61 + 26 5.50 0.46 12.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -96.18 + 27 5.50 0.46 12.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -96.75 + 28 5.50 0.45 13.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -97.32 + 29 5.50 0.46 13.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -97.89 + 30 5.50 0.45 14.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.58 -98.47 + 31 5.50 0.46 14.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -99.04 + 32 5.50 0.45 14.98 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.58 -99.62 + 33 5.50 0.46 15.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -100.19 + 34 5.50 0.45 15.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.58 -100.77 + 35 5.50 0.45 16.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -101.35 + 36 5.50 0.44 16.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.59 -101.93 + 37 5.50 0.46 17.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -102.51 + 38 5.50 0.44 17.68 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.59 -103.10 + 39 5.50 0.46 18.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.57 -103.66 + 40 5.50 0.42 18.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.03 -0.61 -104.27 diff --git a/tests/examples/example1.out b/tests/examples/example1.out index f6f288eff..916c28d0b 100644 --- a/tests/examples/example1.out +++ b/tests/examples/example1.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 0.802 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.806 sec ***SUMMARY OF RESULTS*** @@ -211,33 +211,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -53.39 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -53.39 -53.39 - 2 5.50 0.89 2.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.89 -52.50 - 3 5.50 0.92 4.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.92 -51.59 - 4 5.50 0.92 6.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.92 -50.66 - 5 5.50 0.93 9.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.93 -49.73 - 6 5.50 0.93 11.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.93 -48.80 - 7 5.50 0.94 13.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -47.87 - 8 5.50 0.94 16.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -46.93 - 9 5.50 0.94 18.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -45.99 - 10 5.50 0.94 20.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -45.05 - 11 5.50 0.94 23.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -44.11 - 12 5.50 0.94 25.58 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -43.16 - 13 5.50 0.94 27.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -42.22 - 14 5.50 0.94 30.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -41.28 - 15 5.50 0.95 32.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -40.33 - 16 5.50 0.95 34.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -39.38 - 17 5.50 0.95 37.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -38.44 - 18 5.50 0.95 39.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -37.49 - 19 5.50 0.95 41.98 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -36.54 - 20 5.50 0.95 44.32 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -35.59 - 21 5.50 0.95 46.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -34.64 - 22 5.50 0.95 49.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -33.69 - 23 5.50 0.95 51.36 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -32.74 - 24 5.50 0.95 53.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -31.79 - 25 5.50 0.95 56.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -30.84 - 26 5.50 0.95 58.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -29.89 - 27 5.50 0.95 60.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -28.93 - 28 5.50 0.95 63.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -27.98 - 29 5.50 0.95 65.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -27.03 - 30 5.50 0.95 67.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -26.07 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -53.39 -53.39 + 2 5.50 2.29 2.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.89 -52.50 + 3 5.50 2.31 4.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.92 -51.59 + 4 5.50 2.32 6.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.92 -50.66 + 5 5.50 2.32 9.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.93 -49.73 + 6 5.50 2.33 11.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.93 -48.80 + 7 5.50 2.33 13.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -47.87 + 8 5.50 2.33 16.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -46.93 + 9 5.50 2.33 18.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -45.99 + 10 5.50 2.34 20.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -45.05 + 11 5.50 2.34 23.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -44.11 + 12 5.50 2.34 25.58 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -43.16 + 13 5.50 2.34 27.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -42.22 + 14 5.50 2.34 30.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.94 -41.28 + 15 5.50 2.34 32.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -40.33 + 16 5.50 2.34 34.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -39.38 + 17 5.50 2.34 37.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -38.44 + 18 5.50 2.34 39.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -37.49 + 19 5.50 2.34 41.98 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -36.54 + 20 5.50 2.34 44.32 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -35.59 + 21 5.50 2.35 46.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -34.64 + 22 5.50 2.35 49.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -33.69 + 23 5.50 2.35 51.36 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -32.74 + 24 5.50 2.35 53.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -31.79 + 25 5.50 2.35 56.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -30.84 + 26 5.50 2.35 58.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -29.89 + 27 5.50 2.35 60.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -28.93 + 28 5.50 2.35 63.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -27.98 + 29 5.50 2.35 65.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -27.03 + 30 5.50 2.35 67.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.40 0.95 -26.07 diff --git a/tests/examples/example10_HP.out b/tests/examples/example10_HP.out index c9928ec88..f4a3d0722 100644 --- a/tests/examples/example10_HP.out +++ b/tests/examples/example10_HP.out @@ -4,9 +4,9 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 Calculation Time: 0.102 sec ***SUMMARY OF RESULTS*** @@ -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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 0.00 0.00 | 0.00 -31.11 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -31.11 -31.11 - 2 5.50 0.00 0.00 | 2.50 2.84 3.46 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -28.26 - 3 5.50 0.00 0.00 | 2.50 2.84 6.92 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -25.42 - 4 5.50 0.00 0.00 | 2.50 2.84 10.38 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -22.58 - 5 5.50 0.00 0.00 | 2.50 2.84 13.84 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -19.73 - 6 5.50 0.00 0.00 | 2.50 2.84 17.30 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -16.89 - 7 5.50 0.00 0.00 | 2.50 2.84 20.75 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -14.05 - 8 5.50 0.00 0.00 | 2.50 2.84 24.21 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -11.20 - 9 5.50 0.00 0.00 | 2.50 2.84 27.67 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -8.37 - 10 5.50 0.00 0.00 | 2.50 2.84 31.12 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -5.53 - 11 5.50 0.00 0.00 | 2.50 2.83 34.56 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.83 -2.70 - 12 5.50 0.00 0.00 | 2.50 2.82 38.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.82 0.12 - 13 5.50 0.00 0.00 | 2.50 2.81 41.43 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.81 2.93 - 14 5.50 0.00 0.00 | 2.50 2.80 44.84 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.80 5.73 - 15 5.50 0.00 0.00 | 2.50 2.78 48.24 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.78 8.51 - 16 5.50 0.00 0.00 | 2.50 2.77 51.63 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.77 11.28 - 17 5.50 0.00 0.00 | 2.50 2.75 55.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.75 14.03 - 18 5.50 0.00 0.00 | 2.50 2.73 58.34 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.73 16.77 - 19 5.50 0.00 0.00 | 2.50 2.71 61.67 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.71 19.48 - 20 5.50 0.00 0.00 | 2.50 2.69 64.98 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.69 22.17 - 21 5.50 0.00 0.00 | 2.50 2.67 68.27 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.67 24.85 - 22 5.50 0.00 0.00 | 2.50 2.65 71.54 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.65 27.50 - 23 5.50 0.00 0.00 | 2.50 2.63 74.78 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.63 30.12 - 24 5.50 0.00 0.00 | 2.50 2.60 78.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.60 32.73 - 25 5.50 0.00 0.00 | 2.50 2.58 81.19 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.58 35.31 - 26 5.50 0.00 0.00 | 2.50 2.56 84.37 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.56 37.86 - 27 5.50 0.00 0.00 | 2.50 2.53 87.51 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.53 40.39 - 28 5.50 0.00 0.00 | 2.50 2.51 90.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.51 42.90 - 29 5.50 0.00 0.00 | 2.50 2.48 93.74 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.48 45.39 - 30 5.50 0.00 0.00 | 2.50 2.46 96.81 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.46 47.85 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -31.11 -31.11 + 2 5.50 0.00 0.00 | 2.50 3.46 3.46 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -28.26 + 3 5.50 0.00 0.00 | 2.50 3.46 6.92 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -25.42 + 4 5.50 0.00 0.00 | 2.50 3.46 10.38 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -22.58 + 5 5.50 0.00 0.00 | 2.50 3.46 13.84 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -19.73 + 6 5.50 0.00 0.00 | 2.50 3.46 17.30 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -16.89 + 7 5.50 0.00 0.00 | 2.50 3.46 20.75 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -14.05 + 8 5.50 0.00 0.00 | 2.50 3.46 24.21 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -11.20 + 9 5.50 0.00 0.00 | 2.50 3.46 27.67 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -8.37 + 10 5.50 0.00 0.00 | 2.50 3.45 31.12 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.84 -5.53 + 11 5.50 0.00 0.00 | 2.50 3.45 34.56 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.83 -2.70 + 12 5.50 0.00 0.00 | 2.50 3.44 38.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.82 0.12 + 13 5.50 0.00 0.00 | 2.50 3.43 41.43 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.81 2.93 + 14 5.50 0.00 0.00 | 2.50 3.41 44.84 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.80 5.73 + 15 5.50 0.00 0.00 | 2.50 3.40 48.24 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.78 8.51 + 16 5.50 0.00 0.00 | 2.50 3.38 51.63 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.77 11.28 + 17 5.50 0.00 0.00 | 2.50 3.37 55.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.75 14.03 + 18 5.50 0.00 0.00 | 2.50 3.35 58.34 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.73 16.77 + 19 5.50 0.00 0.00 | 2.50 3.33 61.67 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.71 19.48 + 20 5.50 0.00 0.00 | 2.50 3.31 64.98 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.69 22.17 + 21 5.50 0.00 0.00 | 2.50 3.29 68.27 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.67 24.85 + 22 5.50 0.00 0.00 | 2.50 3.27 71.54 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.65 27.50 + 23 5.50 0.00 0.00 | 2.50 3.24 74.78 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.63 30.12 + 24 5.50 0.00 0.00 | 2.50 3.22 78.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.60 32.73 + 25 5.50 0.00 0.00 | 2.50 3.20 81.19 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.58 35.31 + 26 5.50 0.00 0.00 | 2.50 3.17 84.37 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.56 37.86 + 27 5.50 0.00 0.00 | 2.50 3.15 87.51 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.53 40.39 + 28 5.50 0.00 0.00 | 2.50 3.12 90.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.51 42.90 + 29 5.50 0.00 0.00 | 2.50 3.10 93.74 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.48 45.39 + 30 5.50 0.00 0.00 | 2.50 3.08 96.81 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.62 2.46 47.85 diff --git a/tests/examples/example11_AC.out b/tests/examples/example11_AC.out index bbaf6d44b..a02931ed0 100644 --- a/tests/examples/example11_AC.out +++ b/tests/examples/example11_AC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 0.101 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.102 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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -29.74 0.00 | 0.00 0.00 0.00 | 0.00 -29.74 -29.74 - 2 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 3.00 | 0.00 0.00 0.00 | 0.58 2.41 -27.33 - 3 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 5.99 | 0.00 0.00 0.00 | 0.58 2.41 -24.91 - 4 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 8.99 | 0.00 0.00 0.00 | 0.58 2.41 -22.50 - 5 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 11.99 | 0.00 0.00 0.00 | 0.58 2.41 -20.08 - 6 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 14.98 | 0.00 0.00 0.00 | 0.58 2.41 -17.67 - 7 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 17.98 | 0.00 0.00 0.00 | 0.58 2.41 -15.26 - 8 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 20.97 | 0.00 0.00 0.00 | 0.58 2.41 -12.85 - 9 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 23.97 | 0.00 0.00 0.00 | 0.58 2.41 -10.44 - 10 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 26.96 | 0.00 0.00 0.00 | 0.58 2.41 -8.03 - 11 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.40 29.94 | 0.00 0.00 0.00 | 0.58 2.40 -5.63 - 12 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.39 32.92 | 0.00 0.00 0.00 | 0.58 2.39 -3.23 - 13 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.39 35.88 | 0.00 0.00 0.00 | 0.58 2.39 -0.85 - 14 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.37 38.84 | 0.00 0.00 0.00 | 0.58 2.37 1.53 - 15 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.36 41.79 | 0.00 0.00 0.00 | 0.58 2.36 3.89 - 16 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.35 44.72 | 0.00 0.00 0.00 | 0.58 2.35 6.24 - 17 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.33 47.64 | 0.00 0.00 0.00 | 0.58 2.33 8.57 - 18 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.32 50.54 | 0.00 0.00 0.00 | 0.58 2.32 10.89 - 19 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.30 53.42 | 0.00 0.00 0.00 | 0.58 2.30 13.19 - 20 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.28 56.29 | 0.00 0.00 0.00 | 0.58 2.28 15.48 - 21 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.26 59.14 | 0.00 0.00 0.00 | 0.58 2.26 17.74 - 22 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.25 61.96 | 0.00 0.00 0.00 | 0.58 2.25 19.99 - 23 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.23 64.77 | 0.00 0.00 0.00 | 0.58 2.23 22.21 - 24 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.21 67.56 | 0.00 0.00 0.00 | 0.58 2.21 24.42 - 25 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.19 70.33 | 0.00 0.00 0.00 | 0.58 2.19 26.60 - 26 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.16 73.08 | 0.00 0.00 0.00 | 0.58 2.16 28.77 - 27 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.14 75.80 | 0.00 0.00 0.00 | 0.58 2.14 30.91 - 28 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.12 78.51 | 0.00 0.00 0.00 | 0.58 2.12 33.03 - 29 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.10 81.20 | 0.00 0.00 0.00 | 0.58 2.10 35.14 - 30 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.08 83.86 | 0.00 0.00 0.00 | 0.58 2.08 37.22 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -29.74 -29.74 + 2 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 3.00 3.00 | 0.00 0.00 0.00 | 0.58 2.41 -27.33 + 3 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 3.00 5.99 | 0.00 0.00 0.00 | 0.58 2.41 -24.91 + 4 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 3.00 8.99 | 0.00 0.00 0.00 | 0.58 2.41 -22.50 + 5 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 3.00 11.99 | 0.00 0.00 0.00 | 0.58 2.41 -20.08 + 6 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 3.00 14.98 | 0.00 0.00 0.00 | 0.58 2.41 -17.67 + 7 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 3.00 17.98 | 0.00 0.00 0.00 | 0.58 2.41 -15.26 + 8 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.99 20.97 | 0.00 0.00 0.00 | 0.58 2.41 -12.85 + 9 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.99 23.97 | 0.00 0.00 0.00 | 0.58 2.41 -10.44 + 10 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.99 26.96 | 0.00 0.00 0.00 | 0.58 2.41 -8.03 + 11 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.98 29.94 | 0.00 0.00 0.00 | 0.58 2.40 -5.63 + 12 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.98 32.92 | 0.00 0.00 0.00 | 0.58 2.39 -3.23 + 13 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.97 35.88 | 0.00 0.00 0.00 | 0.58 2.39 -0.85 + 14 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.96 38.84 | 0.00 0.00 0.00 | 0.58 2.37 1.53 + 15 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.95 41.79 | 0.00 0.00 0.00 | 0.58 2.36 3.89 + 16 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.93 44.72 | 0.00 0.00 0.00 | 0.58 2.35 6.24 + 17 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.92 47.64 | 0.00 0.00 0.00 | 0.58 2.33 8.57 + 18 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.90 50.54 | 0.00 0.00 0.00 | 0.58 2.32 10.89 + 19 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.88 53.42 | 0.00 0.00 0.00 | 0.58 2.30 13.19 + 20 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.87 56.29 | 0.00 0.00 0.00 | 0.58 2.28 15.48 + 21 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.85 59.14 | 0.00 0.00 0.00 | 0.58 2.26 17.74 + 22 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.83 61.96 | 0.00 0.00 0.00 | 0.58 2.25 19.99 + 23 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.81 64.77 | 0.00 0.00 0.00 | 0.58 2.23 22.21 + 24 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.79 67.56 | 0.00 0.00 0.00 | 0.58 2.21 24.42 + 25 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.77 70.33 | 0.00 0.00 0.00 | 0.58 2.19 26.60 + 26 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.75 73.08 | 0.00 0.00 0.00 | 0.58 2.16 28.77 + 27 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.73 75.80 | 0.00 0.00 0.00 | 0.58 2.14 30.91 + 28 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.71 78.51 | 0.00 0.00 0.00 | 0.58 2.12 33.03 + 29 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.69 81.20 | 0.00 0.00 0.00 | 0.58 2.10 35.14 + 30 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.66 83.86 | 0.00 0.00 0.00 | 0.58 2.08 37.22 diff --git a/tests/examples/example12_DH.out b/tests/examples/example12_DH.out index 98af4ed66..21c3d9993 100644 --- a/tests/examples/example12_DH.out +++ b/tests/examples/example12_DH.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:35 - Calculation Time: 0.587 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.590 sec ***SUMMARY OF RESULTS*** @@ -201,23 +201,23 @@ 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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 0.00 0.00 | 0.00 -63.64 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -63.64 -63.64 - 2 5.50 0.00 0.00 | 5.00 4.19 5.65 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.19 -59.45 - 3 5.50 0.00 0.00 | 5.00 4.23 11.34 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.23 -55.22 - 4 5.50 0.00 0.00 | 5.00 4.24 17.03 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.24 -50.99 - 5 5.50 0.00 0.00 | 5.00 4.24 22.74 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.24 -46.74 - 6 5.50 0.00 0.00 | 5.00 4.24 28.44 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.24 -42.50 - 7 5.50 0.00 0.00 | 5.00 4.23 34.13 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.23 -38.27 - 8 5.50 0.00 0.00 | 5.00 4.22 39.80 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.22 -34.05 - 9 5.50 0.00 0.00 | 5.00 4.19 45.45 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.19 -29.86 - 10 5.50 0.00 0.00 | 5.00 4.16 51.07 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.16 -25.70 - 11 5.50 0.00 0.00 | 5.00 4.12 56.65 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.12 -21.58 - 12 5.50 0.00 0.00 | 5.00 4.08 62.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.08 -17.50 - 13 5.50 0.00 0.00 | 5.00 4.03 67.67 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.03 -13.48 - 14 5.50 0.00 0.00 | 5.00 3.97 73.10 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.97 -9.50 - 15 5.50 0.00 0.00 | 5.00 3.91 78.47 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.91 -5.59 - 16 5.50 0.00 0.00 | 5.00 3.85 83.78 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.85 -1.74 - 17 5.50 0.00 0.00 | 5.00 3.78 89.01 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.78 2.03 - 18 5.50 0.00 0.00 | 5.00 3.70 94.17 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.70 5.73 - 19 5.50 0.00 0.00 | 5.00 3.62 99.25 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.62 9.35 - 20 5.50 0.00 0.00 | 5.00 3.53 104.25 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.53 12.89 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -63.64 -63.64 + 2 5.50 0.00 0.00 | 5.00 5.65 5.65 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.19 -59.45 + 3 5.50 0.00 0.00 | 5.00 5.68 11.34 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.23 -55.22 + 4 5.50 0.00 0.00 | 5.00 5.70 17.03 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.24 -50.99 + 5 5.50 0.00 0.00 | 5.00 5.70 22.74 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.24 -46.74 + 6 5.50 0.00 0.00 | 5.00 5.70 28.44 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.24 -42.50 + 7 5.50 0.00 0.00 | 5.00 5.69 34.13 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.23 -38.27 + 8 5.50 0.00 0.00 | 5.00 5.67 39.80 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.22 -34.05 + 9 5.50 0.00 0.00 | 5.00 5.65 45.45 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.19 -29.86 + 10 5.50 0.00 0.00 | 5.00 5.62 51.07 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.16 -25.70 + 11 5.50 0.00 0.00 | 5.00 5.58 56.65 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.12 -21.58 + 12 5.50 0.00 0.00 | 5.00 5.54 62.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.08 -17.50 + 13 5.50 0.00 0.00 | 5.00 5.49 67.67 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 4.03 -13.48 + 14 5.50 0.00 0.00 | 5.00 5.43 73.10 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.97 -9.50 + 15 5.50 0.00 0.00 | 5.00 5.37 78.47 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.91 -5.59 + 16 5.50 0.00 0.00 | 5.00 5.31 83.78 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.85 -1.74 + 17 5.50 0.00 0.00 | 5.00 5.24 89.01 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.78 2.03 + 18 5.50 0.00 0.00 | 5.00 5.16 94.17 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.70 5.73 + 19 5.50 0.00 0.00 | 5.00 5.08 99.25 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.62 9.35 + 20 5.50 0.00 0.00 | 5.00 4.99 104.25 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.46 3.53 12.89 diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index 454960343..dbbbf8aa5 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:32 - Calculation Time: 0.796 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.797 sec ***SUMMARY OF RESULTS*** @@ -212,36 +212,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -31.07 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -31.07 -31.07 - 2 9.00 5.07 3.74 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.51 0.51 | -0.82 5.07 -26.00 - 3 9.00 5.12 7.53 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.52 1.03 | -0.82 5.12 -20.88 - 4 9.00 5.13 11.33 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.52 1.55 | -0.82 5.13 -15.74 - 5 9.00 5.14 15.14 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.52 2.07 | -0.82 5.14 -10.60 - 6 9.00 5.15 18.95 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.52 2.59 | -0.82 5.15 -5.45 - 7 9.00 5.15 22.76 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.52 3.11 | -0.82 5.15 -0.30 - 8 10.20 6.02 27.09 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.03 0.87 3.98 | -0.82 6.02 5.72 - 9 11.40 6.88 31.94 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.04 1.22 5.20 | -0.82 6.88 12.60 - 10 12.60 7.74 37.29 | 2.23 0.00 0.00 | 2.50 0.00 0.00 | 0.04 1.57 6.77 | -0.82 7.74 20.34 - 11 13.80 8.60 43.16 | 3.23 0.00 0.00 | 2.50 0.00 0.00 | 0.06 1.92 8.69 | -0.82 8.60 28.94 - 12 15.00 9.47 49.54 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.07 2.27 10.95 | -0.82 9.47 38.41 - 13 15.00 9.82 55.93 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.07 2.62 13.57 | -0.82 9.82 48.22 - 14 15.00 10.17 62.31 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.09 2.97 16.54 | -0.82 10.17 58.40 - 15 15.00 10.52 68.70 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.32 19.86 | -0.82 10.52 68.92 - 16 15.00 10.70 75.10 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.49 23.35 | -0.82 10.70 79.62 - 17 15.00 10.71 81.49 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 26.85 | -0.82 10.71 90.33 - 18 15.00 10.71 87.89 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 30.34 | -0.82 10.71 101.04 - 19 15.00 10.71 94.28 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 33.84 | -0.82 10.71 111.75 - 20 15.00 10.71 100.68 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 37.34 | -0.82 10.71 122.46 - 21 15.00 10.72 107.08 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 40.84 | -0.82 10.72 133.18 - 22 15.00 10.72 113.48 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 44.34 | -0.82 10.72 143.89 - 23 15.00 10.72 119.89 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 47.84 | -0.82 10.72 154.61 - 24 15.00 10.72 126.29 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 51.34 | -0.82 10.72 165.34 - 25 15.00 10.72 132.70 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 54.84 | -0.82 10.72 176.06 - 26 15.00 10.73 139.10 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 58.34 | -0.82 10.73 186.78 - 27 15.00 10.73 145.51 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 61.85 | -0.82 10.73 197.51 - 28 15.00 10.73 151.92 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 65.35 | -0.82 10.73 208.24 - 29 15.00 10.73 158.33 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 68.85 | -0.82 10.73 218.97 - 30 15.00 10.73 164.74 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 72.36 | -0.82 10.73 229.70 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -31.07 -31.07 + 2 9.00 3.74 3.74 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.51 0.51 | -0.82 5.07 -26.00 + 3 9.00 3.78 7.53 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.52 1.03 | -0.82 5.12 -20.88 + 4 9.00 3.80 11.33 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.52 1.55 | -0.82 5.13 -15.74 + 5 9.00 3.81 15.14 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.52 2.07 | -0.82 5.14 -10.60 + 6 9.00 3.81 18.95 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.52 2.59 | -0.82 5.15 -5.45 + 7 9.00 3.82 22.76 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.01 0.52 3.11 | -0.82 5.15 -0.30 + 8 10.20 4.33 27.09 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.03 0.87 3.98 | -0.82 6.02 5.72 + 9 11.40 4.84 31.94 | 1.23 0.00 0.00 | 2.50 0.00 0.00 | 0.04 1.22 5.20 | -0.82 6.88 12.60 + 10 12.60 5.36 37.29 | 2.23 0.00 0.00 | 2.50 0.00 0.00 | 0.04 1.57 6.77 | -0.82 7.74 20.34 + 11 13.80 5.87 43.16 | 3.23 0.00 0.00 | 2.50 0.00 0.00 | 0.06 1.92 8.69 | -0.82 8.60 28.94 + 12 15.00 6.38 49.54 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.07 2.27 10.95 | -0.82 9.47 38.41 + 13 15.00 6.39 55.93 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.07 2.62 13.57 | -0.82 9.82 48.22 + 14 15.00 6.39 62.31 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.09 2.97 16.54 | -0.82 10.17 58.40 + 15 15.00 6.39 68.70 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.32 19.86 | -0.82 10.52 68.92 + 16 15.00 6.39 75.10 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.49 23.35 | -0.82 10.70 79.62 + 17 15.00 6.39 81.49 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 26.85 | -0.82 10.71 90.33 + 18 15.00 6.40 87.89 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 30.34 | -0.82 10.71 101.04 + 19 15.00 6.40 94.28 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 33.84 | -0.82 10.71 111.75 + 20 15.00 6.40 100.68 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 37.34 | -0.82 10.71 122.46 + 21 15.00 6.40 107.08 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 40.84 | -0.82 10.72 133.18 + 22 15.00 6.40 113.48 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 44.34 | -0.82 10.72 143.89 + 23 15.00 6.40 119.89 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 47.84 | -0.82 10.72 154.61 + 24 15.00 6.40 126.29 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 51.34 | -0.82 10.72 165.34 + 25 15.00 6.41 132.70 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 54.84 | -0.82 10.72 176.06 + 26 15.00 6.41 139.10 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 58.34 | -0.82 10.73 186.78 + 27 15.00 6.41 145.51 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 61.85 | -0.82 10.73 197.51 + 28 15.00 6.41 151.92 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 65.35 | -0.82 10.73 208.24 + 29 15.00 6.41 158.33 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 68.85 | -0.82 10.73 218.97 + 30 15.00 6.41 164.74 | 3.59 0.00 0.00 | 2.50 0.00 0.00 | 0.10 3.50 72.36 | -0.82 10.73 229.70 diff --git a/tests/examples/example1_outputunits.out b/tests/examples/example1_outputunits.out index 921cd03d2..461b4917f 100644 --- a/tests/examples/example1_outputunits.out +++ b/tests/examples/example1_outputunits.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 0.810 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.801 sec ***SUMMARY OF RESULTS*** @@ -211,33 +211,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -46.85 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -46.85 -46.85 - 2 5.50 0.95 2.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.95 -45.91 - 3 5.50 0.97 4.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.97 -44.94 - 4 5.50 0.98 6.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.98 -43.96 - 5 5.50 0.98 9.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.98 -42.97 - 6 5.50 0.99 11.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.99 -41.99 - 7 5.50 0.99 13.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.99 -41.00 - 8 5.50 0.99 16.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.99 -40.00 - 9 5.50 0.99 18.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.99 -39.01 - 10 5.50 1.00 20.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -38.01 - 11 5.50 1.00 23.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -37.02 - 12 5.50 1.00 25.58 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -36.02 - 13 5.50 1.00 27.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -35.02 - 14 5.50 1.00 30.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -34.02 - 15 5.50 1.00 32.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -33.02 - 16 5.50 1.00 34.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -32.02 - 17 5.50 1.00 37.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -31.01 - 18 5.50 1.00 39.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -30.01 - 19 5.50 1.00 41.98 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -29.01 - 20 5.50 1.00 44.32 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -28.00 - 21 5.50 1.00 46.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -27.00 - 22 5.50 1.01 49.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -25.99 - 23 5.50 1.01 51.36 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -24.99 - 24 5.50 1.01 53.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -23.98 - 25 5.50 1.01 56.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -22.97 - 26 5.50 1.01 58.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -21.97 - 27 5.50 1.01 60.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -20.96 - 28 5.50 1.01 63.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -19.95 - 29 5.50 1.01 65.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -18.94 - 30 5.50 1.01 67.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -17.93 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -46.85 -46.85 + 2 5.50 2.29 2.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.95 -45.91 + 3 5.50 2.31 4.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.97 -44.94 + 4 5.50 2.32 6.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.98 -43.96 + 5 5.50 2.32 9.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.98 -42.97 + 6 5.50 2.33 11.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.99 -41.99 + 7 5.50 2.33 13.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.99 -41.00 + 8 5.50 2.33 16.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.99 -40.00 + 9 5.50 2.33 18.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 0.99 -39.01 + 10 5.50 2.34 20.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -38.01 + 11 5.50 2.34 23.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -37.02 + 12 5.50 2.34 25.58 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -36.02 + 13 5.50 2.34 27.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -35.02 + 14 5.50 2.34 30.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -34.02 + 15 5.50 2.34 32.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -33.02 + 16 5.50 2.34 34.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -32.02 + 17 5.50 2.34 37.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -31.01 + 18 5.50 2.34 39.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -30.01 + 19 5.50 2.34 41.98 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -29.01 + 20 5.50 2.34 44.32 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -28.00 + 21 5.50 2.35 46.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.00 -27.00 + 22 5.50 2.35 49.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -25.99 + 23 5.50 2.35 51.36 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -24.99 + 24 5.50 2.35 53.71 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -23.98 + 25 5.50 2.35 56.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -22.97 + 26 5.50 2.35 58.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -21.97 + 27 5.50 2.35 60.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -20.96 + 28 5.50 2.35 63.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -19.95 + 29 5.50 2.35 65.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -18.94 + 30 5.50 2.35 67.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.34 1.01 -17.93 diff --git a/tests/examples/example2.out b/tests/examples/example2.out index 1cfd80d05..fb9102634 100644 --- a/tests/examples/example2.out +++ b/tests/examples/example2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 0.213 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.214 sec ***SUMMARY OF RESULTS*** @@ -194,28 +194,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 0.00 0.00 | 0.00 -41.15 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -41.15 -41.15 - 2 5.50 0.00 0.00 | 2.50 3.36 4.46 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.36 -37.78 - 3 5.50 0.00 0.00 | 2.50 3.41 8.97 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.41 -34.37 - 4 5.50 0.00 0.00 | 2.50 3.43 13.50 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.43 -30.94 - 5 5.50 0.00 0.00 | 2.50 3.45 18.04 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.45 -27.49 - 6 5.50 0.00 0.00 | 2.50 3.45 22.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.45 -24.04 - 7 5.50 0.00 0.00 | 2.50 3.46 27.15 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.46 -20.58 - 8 5.50 0.00 0.00 | 2.50 3.46 31.71 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.46 -17.11 - 9 5.50 0.00 0.00 | 2.50 3.44 36.25 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.44 -13.67 - 10 5.50 0.00 0.00 | 2.50 3.30 40.65 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.30 -10.37 - 11 5.50 0.00 0.00 | 2.50 3.27 45.01 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.27 -7.10 - 12 5.50 0.00 0.00 | 2.50 3.23 49.34 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.23 -3.87 - 13 5.50 0.00 0.00 | 2.50 3.20 53.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.20 -0.67 - 14 5.50 0.00 0.00 | 2.50 3.16 57.89 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.16 2.49 - 15 5.50 0.00 0.00 | 2.50 3.12 62.11 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.12 5.61 - 16 5.50 0.00 0.00 | 2.50 3.08 66.29 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.08 8.70 - 17 5.50 0.00 0.00 | 2.50 3.04 70.43 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.04 11.74 - 18 5.50 0.00 0.00 | 2.50 3.00 74.53 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.00 14.74 - 19 5.50 0.00 0.00 | 2.50 2.96 78.58 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.96 17.70 - 20 5.50 0.00 0.00 | 2.50 2.91 82.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.91 20.61 - 21 5.50 0.00 0.00 | 2.50 2.87 86.56 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.87 23.48 - 22 5.50 0.00 0.00 | 2.50 2.82 90.48 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.82 26.30 - 23 5.50 0.00 0.00 | 2.50 2.78 94.35 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.78 29.08 - 24 5.50 0.00 0.00 | 2.50 2.73 98.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.73 31.81 - 25 5.50 0.00 0.00 | 2.50 2.68 101.96 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.68 34.49 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -41.15 -41.15 + 2 5.50 0.00 0.00 | 2.50 4.46 4.46 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.36 -37.78 + 3 5.50 0.00 0.00 | 2.50 4.51 8.97 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.41 -34.37 + 4 5.50 0.00 0.00 | 2.50 4.53 13.50 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.43 -30.94 + 5 5.50 0.00 0.00 | 2.50 4.54 18.04 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.45 -27.49 + 6 5.50 0.00 0.00 | 2.50 4.55 22.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.45 -24.04 + 7 5.50 0.00 0.00 | 2.50 4.56 27.15 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.46 -20.58 + 8 5.50 0.00 0.00 | 2.50 4.56 31.71 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.46 -17.11 + 9 5.50 0.00 0.00 | 2.50 4.54 36.25 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.44 -13.67 + 10 5.50 0.00 0.00 | 2.50 4.40 40.65 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.30 -10.37 + 11 5.50 0.00 0.00 | 2.50 4.36 45.01 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.27 -7.10 + 12 5.50 0.00 0.00 | 2.50 4.33 49.34 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.23 -3.87 + 13 5.50 0.00 0.00 | 2.50 4.29 53.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.20 -0.67 + 14 5.50 0.00 0.00 | 2.50 4.26 57.89 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.16 2.49 + 15 5.50 0.00 0.00 | 2.50 4.22 62.11 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.12 5.61 + 16 5.50 0.00 0.00 | 2.50 4.18 66.29 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.08 8.70 + 17 5.50 0.00 0.00 | 2.50 4.14 70.43 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.04 11.74 + 18 5.50 0.00 0.00 | 2.50 4.10 74.53 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 3.00 14.74 + 19 5.50 0.00 0.00 | 2.50 4.05 78.58 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.96 17.70 + 20 5.50 0.00 0.00 | 2.50 4.01 82.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.91 20.61 + 21 5.50 0.00 0.00 | 2.50 3.97 86.56 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.87 23.48 + 22 5.50 0.00 0.00 | 2.50 3.92 90.48 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.82 26.30 + 23 5.50 0.00 0.00 | 2.50 3.87 94.35 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.78 29.08 + 24 5.50 0.00 0.00 | 2.50 3.83 98.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.73 31.81 + 25 5.50 0.00 0.00 | 2.50 3.78 101.96 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.10 2.68 34.49 diff --git a/tests/examples/example4.out b/tests/examples/example4.out index 9e96c1bfa..417952b5f 100644 --- a/tests/examples/example4.out +++ b/tests/examples/example4.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:32 - Calculation Time: 0.048 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.049 sec ***SUMMARY OF RESULTS*** @@ -209,33 +209,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -55.40 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -55.40 -55.40 - 2 5.50 1.73 3.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.73 -53.67 - 3 5.50 1.70 7.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.70 -51.97 - 4 5.50 1.66 10.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.66 -50.31 - 5 5.50 1.62 13.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.62 -48.68 - 6 5.50 1.59 17.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.59 -47.09 - 7 5.50 1.55 20.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.55 -45.54 - 8 5.50 1.52 23.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.52 -44.02 - 9 5.50 1.48 27.23 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.48 -42.54 - 10 5.50 1.45 30.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.45 -41.09 - 11 5.50 1.41 33.68 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.41 -39.68 - 12 5.50 1.38 36.86 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.38 -38.30 - 13 5.50 1.34 40.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.34 -36.95 - 14 5.50 1.31 43.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.31 -35.64 - 15 5.50 1.28 46.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.28 -34.37 - 16 5.50 1.24 49.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.24 -33.12 - 17 5.50 1.21 52.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.21 -31.91 - 18 5.50 1.18 55.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.18 -30.74 - 19 5.50 1.14 58.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.14 -29.59 - 20 5.50 1.11 61.04 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.11 -28.48 - 21 5.50 1.08 63.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.08 -27.41 - 22 5.50 1.04 66.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.04 -26.36 - 23 5.50 1.01 69.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.01 -25.35 - 24 5.50 0.98 72.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.98 -24.37 - 25 5.50 0.95 75.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.95 -23.42 - 26 5.50 0.92 77.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.92 -22.51 - 27 5.50 0.88 80.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.88 -21.63 - 28 5.50 0.85 83.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.85 -20.77 - 29 5.50 0.82 85.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.82 -19.95 - 30 5.50 0.79 88.33 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.79 -19.16 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -55.40 -55.40 + 2 5.50 3.53 3.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.73 -53.67 + 3 5.50 3.49 7.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.70 -51.97 + 4 5.50 3.46 10.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.66 -50.31 + 5 5.50 3.42 13.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.62 -48.68 + 6 5.50 3.39 17.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.59 -47.09 + 7 5.50 3.35 20.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.55 -45.54 + 8 5.50 3.31 23.95 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.52 -44.02 + 9 5.50 3.28 27.23 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.48 -42.54 + 10 5.50 3.24 30.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.45 -41.09 + 11 5.50 3.21 33.68 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.41 -39.68 + 12 5.50 3.18 36.86 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.38 -38.30 + 13 5.50 3.14 40.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.34 -36.95 + 14 5.50 3.11 43.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.31 -35.64 + 15 5.50 3.07 46.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.28 -34.37 + 16 5.50 3.04 49.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.24 -33.12 + 17 5.50 3.01 52.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.21 -31.91 + 18 5.50 2.97 55.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.18 -30.74 + 19 5.50 2.94 58.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.14 -29.59 + 20 5.50 2.91 61.04 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.11 -28.48 + 21 5.50 2.87 63.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.08 -27.41 + 22 5.50 2.84 66.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.04 -26.36 + 23 5.50 2.81 69.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 1.01 -25.35 + 24 5.50 2.78 72.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.98 -24.37 + 25 5.50 2.74 75.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.95 -23.42 + 26 5.50 2.71 77.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.92 -22.51 + 27 5.50 2.68 80.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.88 -21.63 + 28 5.50 2.65 83.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.85 -20.77 + 29 5.50 2.62 85.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.82 -19.95 + 30 5.50 2.59 88.33 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.80 0.79 -19.16 diff --git a/tests/examples/example5.out b/tests/examples/example5.out index 1a450bf9c..1aefdbbe5 100644 --- a/tests/examples/example5.out +++ b/tests/examples/example5.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:32 - Calculation Time: 0.048 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.049 sec ***SUMMARY OF RESULTS*** @@ -200,33 +200,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 0.00 0.00 | 0.00 -41.59 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -41.59 -41.59 - 2 5.50 0.00 0.00 | 2.50 3.62 4.82 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.62 -37.97 - 3 5.50 0.00 0.00 | 2.50 3.66 9.68 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.66 -34.31 - 4 5.50 0.00 0.00 | 2.50 3.67 14.55 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.67 -30.64 - 5 5.50 0.00 0.00 | 2.50 3.65 19.40 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.65 -26.99 - 6 5.50 0.00 0.00 | 2.50 3.59 24.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.59 -23.40 - 7 5.50 0.00 0.00 | 2.50 3.51 28.89 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.51 -19.89 - 8 5.50 0.00 0.00 | 2.50 3.42 33.51 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.42 -16.47 - 9 5.50 0.00 0.00 | 2.50 3.32 38.02 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.32 -13.16 - 10 5.50 0.00 0.00 | 2.50 3.21 42.44 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.21 -9.94 - 11 5.50 0.00 0.00 | 2.50 3.11 46.75 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.11 -6.83 - 12 5.50 0.00 0.00 | 2.50 3.01 50.96 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.01 -3.82 - 13 5.50 0.00 0.00 | 2.50 2.91 55.07 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.91 -0.91 - 14 5.50 0.00 0.00 | 2.50 2.82 59.09 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.82 1.91 - 15 5.50 0.00 0.00 | 2.50 2.73 63.01 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.73 4.64 - 16 5.50 0.00 0.00 | 2.50 2.64 66.85 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.64 7.28 - 17 5.50 0.00 0.00 | 2.50 2.56 70.61 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.56 9.84 - 18 5.50 0.00 0.00 | 2.50 2.48 74.28 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.48 12.31 - 19 5.50 0.00 0.00 | 2.50 2.40 77.88 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.40 14.71 - 20 5.50 0.00 0.00 | 2.50 2.33 81.41 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.33 17.04 - 21 5.50 0.00 0.00 | 2.50 2.26 84.87 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.26 19.30 - 22 5.50 0.00 0.00 | 2.50 2.19 88.26 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.19 21.49 - 23 5.50 0.00 0.00 | 2.50 2.13 91.58 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.13 23.62 - 24 5.50 0.00 0.00 | 2.50 2.07 94.85 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.07 25.69 - 25 5.50 0.00 0.00 | 2.50 2.01 98.06 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.01 27.70 - 26 5.50 0.00 0.00 | 2.50 1.95 101.21 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 1.95 29.65 - 27 5.50 0.00 0.00 | 2.50 1.90 104.30 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 1.90 31.54 - 28 5.50 0.00 0.00 | 2.50 1.85 107.35 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 1.85 33.39 - 29 5.50 0.00 0.00 | 2.50 1.80 110.34 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 1.80 35.19 - 30 5.50 0.00 0.00 | 2.50 1.75 113.29 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 1.75 36.93 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -41.59 -41.59 + 2 5.50 0.00 0.00 | 2.50 4.82 4.82 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.62 -37.97 + 3 5.50 0.00 0.00 | 2.50 4.86 9.68 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.66 -34.31 + 4 5.50 0.00 0.00 | 2.50 4.87 14.55 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.67 -30.64 + 5 5.50 0.00 0.00 | 2.50 4.84 19.40 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.65 -26.99 + 6 5.50 0.00 0.00 | 2.50 4.79 24.18 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.59 -23.40 + 7 5.50 0.00 0.00 | 2.50 4.71 28.89 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.51 -19.89 + 8 5.50 0.00 0.00 | 2.50 4.62 33.51 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.42 -16.47 + 9 5.50 0.00 0.00 | 2.50 4.52 38.02 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.32 -13.16 + 10 5.50 0.00 0.00 | 2.50 4.41 42.44 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.21 -9.94 + 11 5.50 0.00 0.00 | 2.50 4.31 46.75 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.11 -6.83 + 12 5.50 0.00 0.00 | 2.50 4.21 50.96 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 3.01 -3.82 + 13 5.50 0.00 0.00 | 2.50 4.11 55.07 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.91 -0.91 + 14 5.50 0.00 0.00 | 2.50 4.02 59.09 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.82 1.91 + 15 5.50 0.00 0.00 | 2.50 3.93 63.01 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.73 4.64 + 16 5.50 0.00 0.00 | 2.50 3.84 66.85 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.64 7.28 + 17 5.50 0.00 0.00 | 2.50 3.76 70.61 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.56 9.84 + 18 5.50 0.00 0.00 | 2.50 3.68 74.28 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.48 12.31 + 19 5.50 0.00 0.00 | 2.50 3.60 77.88 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.40 14.71 + 20 5.50 0.00 0.00 | 2.50 3.53 81.41 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.33 17.04 + 21 5.50 0.00 0.00 | 2.50 3.46 84.87 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.26 19.30 + 22 5.50 0.00 0.00 | 2.50 3.39 88.26 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.19 21.49 + 23 5.50 0.00 0.00 | 2.50 3.33 91.58 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.13 23.62 + 24 5.50 0.00 0.00 | 2.50 3.27 94.85 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.07 25.69 + 25 5.50 0.00 0.00 | 2.50 3.21 98.06 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 2.01 27.70 + 26 5.50 0.00 0.00 | 2.50 3.15 101.21 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 1.95 29.65 + 27 5.50 0.00 0.00 | 2.50 3.10 104.30 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 1.90 31.54 + 28 5.50 0.00 0.00 | 2.50 3.04 107.35 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 1.85 33.39 + 29 5.50 0.00 0.00 | 2.50 2.99 110.34 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 1.80 35.19 + 30 5.50 0.00 0.00 | 2.50 2.95 113.29 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.20 1.75 36.93 diff --git a/tests/examples/example8.out b/tests/examples/example8.out index d040532c1..57c048d3c 100644 --- a/tests/examples/example8.out +++ b/tests/examples/example8.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:35 - Calculation Time: 0.797 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:32 + Calculation Time: 0.801 sec ***SUMMARY OF RESULTS*** @@ -204,33 +204,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 0.00 0.00 | 0.00 -21.13 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -21.13 -21.13 - 2 5.50 0.00 0.00 | 2.50 0.84 1.28 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.84 -20.29 - 3 5.50 0.00 0.00 | 2.50 0.85 2.56 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -19.44 - 4 5.50 0.00 0.00 | 2.50 0.85 3.85 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -18.59 - 5 5.50 0.00 0.00 | 2.50 0.85 5.14 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -17.74 - 6 5.50 0.00 0.00 | 2.50 0.85 6.43 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -16.88 - 7 5.50 0.00 0.00 | 2.50 0.85 7.73 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -16.03 - 8 5.50 0.00 0.00 | 2.50 0.85 9.02 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -15.18 - 9 5.50 0.00 0.00 | 2.50 0.85 10.31 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -14.32 - 10 5.50 0.00 0.00 | 2.50 0.85 11.60 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -13.47 - 11 5.50 0.00 0.00 | 2.50 0.85 12.90 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -12.61 - 12 5.50 0.00 0.00 | 2.50 0.85 14.19 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -11.76 - 13 5.50 0.00 0.00 | 2.50 0.85 15.47 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -10.91 - 14 5.50 0.00 0.00 | 2.50 0.85 16.76 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -10.06 - 15 5.50 0.00 0.00 | 2.50 0.84 18.04 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.84 -9.22 - 16 5.50 0.00 0.00 | 2.50 0.84 19.32 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.84 -8.38 - 17 5.50 0.00 0.00 | 2.50 0.84 20.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.84 -7.54 - 18 5.50 0.00 0.00 | 2.50 0.83 21.86 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -6.71 - 19 5.50 0.00 0.00 | 2.50 0.83 23.13 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -5.88 - 20 5.50 0.00 0.00 | 2.50 0.82 24.39 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -5.06 - 21 5.50 0.00 0.00 | 2.50 0.82 25.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -4.24 - 22 5.50 0.00 0.00 | 2.50 0.81 26.89 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.81 -3.43 - 23 5.50 0.00 0.00 | 2.50 0.81 28.14 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.81 -2.62 - 24 5.50 0.00 0.00 | 2.50 0.80 29.37 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.80 -1.82 - 25 5.50 0.00 0.00 | 2.50 0.79 30.60 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.79 -1.03 - 26 5.50 0.00 0.00 | 2.50 0.79 31.83 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.79 -0.25 - 27 5.50 0.00 0.00 | 2.50 0.78 33.05 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.78 0.53 - 28 5.50 0.00 0.00 | 2.50 0.77 34.26 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.77 1.31 - 29 5.50 0.00 0.00 | 2.50 0.77 35.46 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.77 2.07 - 30 5.50 0.00 0.00 | 2.50 0.76 36.66 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.76 2.83 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -21.13 -21.13 + 2 5.50 0.00 0.00 | 2.50 1.28 1.28 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.84 -20.29 + 3 5.50 0.00 0.00 | 2.50 1.29 2.56 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -19.44 + 4 5.50 0.00 0.00 | 2.50 1.29 3.85 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -18.59 + 5 5.50 0.00 0.00 | 2.50 1.29 5.14 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -17.74 + 6 5.50 0.00 0.00 | 2.50 1.29 6.43 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -16.88 + 7 5.50 0.00 0.00 | 2.50 1.29 7.73 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -16.03 + 8 5.50 0.00 0.00 | 2.50 1.29 9.02 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -15.18 + 9 5.50 0.00 0.00 | 2.50 1.29 10.31 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -14.32 + 10 5.50 0.00 0.00 | 2.50 1.29 11.60 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -13.47 + 11 5.50 0.00 0.00 | 2.50 1.29 12.90 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -12.61 + 12 5.50 0.00 0.00 | 2.50 1.29 14.19 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -11.76 + 13 5.50 0.00 0.00 | 2.50 1.29 15.47 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -10.91 + 14 5.50 0.00 0.00 | 2.50 1.29 16.76 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.85 -10.06 + 15 5.50 0.00 0.00 | 2.50 1.28 18.04 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.84 -9.22 + 16 5.50 0.00 0.00 | 2.50 1.28 19.32 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.84 -8.38 + 17 5.50 0.00 0.00 | 2.50 1.27 20.59 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.84 -7.54 + 18 5.50 0.00 0.00 | 2.50 1.27 21.86 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -6.71 + 19 5.50 0.00 0.00 | 2.50 1.27 23.13 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.83 -5.88 + 20 5.50 0.00 0.00 | 2.50 1.26 24.39 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -5.06 + 21 5.50 0.00 0.00 | 2.50 1.25 25.64 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.82 -4.24 + 22 5.50 0.00 0.00 | 2.50 1.25 26.89 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.81 -3.43 + 23 5.50 0.00 0.00 | 2.50 1.24 28.14 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.81 -2.62 + 24 5.50 0.00 0.00 | 2.50 1.24 29.37 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.80 -1.82 + 25 5.50 0.00 0.00 | 2.50 1.23 30.60 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.79 -1.03 + 26 5.50 0.00 0.00 | 2.50 1.22 31.83 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.79 -0.25 + 27 5.50 0.00 0.00 | 2.50 1.22 33.05 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.78 0.53 + 28 5.50 0.00 0.00 | 2.50 1.21 34.26 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.77 1.31 + 29 5.50 0.00 0.00 | 2.50 1.20 35.46 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.77 2.07 + 30 5.50 0.00 0.00 | 2.50 1.20 36.66 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.44 0.76 2.83 diff --git a/tests/examples/example9.out b/tests/examples/example9.out index 844172abf..6456f4f69 100644 --- a/tests/examples/example9.out +++ b/tests/examples/example9.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:35 - Calculation Time: 0.821 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:32 + Calculation Time: 0.797 sec ***SUMMARY OF RESULTS*** @@ -213,33 +213,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -27.43 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -27.43 -27.43 - 2 5.50 -0.28 0.21 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -27.71 - 3 5.50 -0.27 0.42 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -27.98 - 4 5.50 -0.27 0.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.25 - 5 5.50 -0.27 0.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.52 - 6 5.50 -0.27 1.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.79 - 7 5.50 -0.27 1.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -29.06 - 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.33 - 9 5.50 -0.27 1.70 | 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.13 - 12 5.50 -0.27 2.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.40 - 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.67 - 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.94 - 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.21 - 16 5.50 -0.27 3.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -31.48 - 17 5.50 -0.27 3.39 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -31.76 - 18 5.50 -0.28 3.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -32.03 - 19 5.50 -0.28 3.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -32.31 - 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.59 - 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.87 - 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.15 - 23 5.50 -0.29 4.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -33.44 - 24 5.50 -0.29 4.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -33.73 - 25 5.50 -0.29 4.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -34.02 - 26 5.50 -0.29 5.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -34.31 - 27 5.50 -0.30 5.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -34.61 - 28 5.50 -0.30 5.55 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -34.90 - 29 5.50 -0.30 5.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -35.20 - 30 5.50 -0.30 5.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -35.51 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -27.43 -27.43 + 2 5.50 0.21 0.21 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -27.71 + 3 5.50 0.21 0.42 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -27.98 + 4 5.50 0.21 0.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.25 + 5 5.50 0.21 0.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -28.52 + 6 5.50 0.21 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.79 + 7 5.50 0.21 1.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -29.06 + 8 5.50 0.21 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.33 + 9 5.50 0.21 1.70 | 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.21 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.21 2.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.13 + 12 5.50 0.21 2.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -30.40 + 13 5.50 0.21 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.67 + 14 5.50 0.21 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.94 + 15 5.50 0.21 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.21 + 16 5.50 0.21 3.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.27 -31.48 + 17 5.50 0.21 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.76 + 18 5.50 0.21 3.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -32.03 + 19 5.50 0.20 3.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.28 -32.31 + 20 5.50 0.20 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.59 + 21 5.50 0.20 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.87 + 22 5.50 0.20 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.15 + 23 5.50 0.20 4.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -33.44 + 24 5.50 0.19 4.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -33.73 + 25 5.50 0.19 4.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -34.02 + 26 5.50 0.19 5.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.29 -34.31 + 27 5.50 0.19 5.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -34.61 + 28 5.50 0.18 5.55 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -34.90 + 29 5.50 0.18 5.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -35.20 + 30 5.50 0.18 5.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.48 -0.30 -35.51 diff --git a/tests/examples/example_ITC.out b/tests/examples/example_ITC.out index b429e3673..4444c3f82 100644 --- a/tests/examples/example_ITC.out +++ b/tests/examples/example_ITC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:34 - Calculation Time: 0.808 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.797 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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -59.76 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -59.76 -59.76 - 2 5.50 4.97 8.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 4.97 -54.79 - 3 5.50 5.05 16.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.05 -49.74 - 4 5.50 5.07 24.23 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.07 -44.67 - 5 5.50 5.09 32.36 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.09 -39.58 - 6 5.50 5.10 40.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.10 -34.49 - 7 5.50 5.10 48.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.10 -29.39 - 8 5.50 5.11 56.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.11 -24.28 - 9 5.50 5.11 64.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.11 -19.16 - 10 5.50 5.12 73.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.12 -14.04 - 11 5.50 5.12 81.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.12 -8.92 - 12 5.50 5.13 89.46 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 -3.79 - 13 5.50 5.13 97.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 1.34 - 14 5.50 5.13 105.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 6.47 - 15 5.50 5.13 113.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 11.60 - 16 5.50 5.14 122.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 16.74 - 17 5.50 5.14 130.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 21.88 - 18 5.50 5.14 138.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 27.02 - 19 5.50 5.14 146.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 32.16 - 20 5.50 5.14 154.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 37.30 - 21 5.50 5.15 163.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 42.45 - 22 5.50 5.15 171.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 47.59 - 23 5.50 5.15 179.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 52.74 - 24 5.50 5.15 187.68 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 57.89 - 25 5.50 5.15 195.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 63.04 - 26 5.50 5.15 204.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 68.19 - 27 5.50 5.15 212.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 73.35 - 28 5.50 5.15 220.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 78.50 - 29 5.50 5.16 228.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.16 83.66 - 30 5.50 5.16 236.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.16 88.81 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -59.76 -59.76 + 2 5.50 8.02 8.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 4.97 -54.79 + 3 5.50 8.09 16.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.05 -49.74 + 4 5.50 8.12 24.23 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.07 -44.67 + 5 5.50 8.13 32.36 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.09 -39.58 + 6 5.50 8.14 40.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.10 -34.49 + 7 5.50 8.15 48.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.10 -29.39 + 8 5.50 8.15 56.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.11 -24.28 + 9 5.50 8.16 64.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.11 -19.16 + 10 5.50 8.16 73.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.12 -14.04 + 11 5.50 8.17 81.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.12 -8.92 + 12 5.50 8.17 89.46 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 -3.79 + 13 5.50 8.17 97.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 1.34 + 14 5.50 8.18 105.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 6.47 + 15 5.50 8.18 113.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 11.60 + 16 5.50 8.18 122.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 16.74 + 17 5.50 8.18 130.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 21.88 + 18 5.50 8.18 138.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 27.02 + 19 5.50 8.19 146.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 32.16 + 20 5.50 8.19 154.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 37.30 + 21 5.50 8.19 163.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 42.45 + 22 5.50 8.19 171.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 47.59 + 23 5.50 8.19 179.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 52.74 + 24 5.50 8.19 187.68 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 57.89 + 25 5.50 8.20 195.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 63.04 + 26 5.50 8.20 204.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 68.19 + 27 5.50 8.20 212.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 73.35 + 28 5.50 8.20 220.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 78.50 + 29 5.50 8.20 228.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.16 83.66 + 30 5.50 8.20 236.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.16 88.81 diff --git a/tests/examples/example_PTC.out b/tests/examples/example_PTC.out index c75fedaa0..e7008fac6 100644 --- a/tests/examples/example_PTC.out +++ b/tests/examples/example_PTC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 0.807 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.804 sec ***SUMMARY OF RESULTS*** @@ -209,33 +209,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -119.52 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -119.52 -119.52 - 2 10.50 12.26 15.31 | 7.50 0.00 0.00 | 7.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 12.26 -107.26 - 3 10.62 12.59 30.94 | 7.62 0.00 0.00 | 7.62 0.00 0.00 | 0.00 0.00 0.00 | 3.04 12.59 -94.68 - 4 10.75 12.82 46.81 | 7.75 0.00 0.00 | 7.75 0.00 0.00 | 0.00 0.00 0.00 | 3.04 12.82 -81.85 - 5 10.88 13.05 62.90 | 7.88 0.00 0.00 | 7.88 0.00 0.00 | 0.00 0.00 0.00 | 3.04 13.05 -68.81 - 6 11.02 13.26 79.20 | 8.02 0.00 0.00 | 8.02 0.00 0.00 | 0.00 0.00 0.00 | 3.04 13.26 -55.54 - 7 11.16 13.48 95.73 | 8.16 0.00 0.00 | 8.16 0.00 0.00 | 0.00 0.00 0.00 | 3.04 13.48 -42.06 - 8 11.30 13.71 112.48 | 8.30 0.00 0.00 | 8.30 0.00 0.00 | 0.00 0.00 0.00 | 3.04 13.71 -28.35 - 9 11.44 13.93 129.46 | 8.44 0.00 0.00 | 8.44 0.00 0.00 | 0.00 0.00 0.00 | 3.04 13.93 -14.42 - 10 11.59 14.16 146.67 | 8.59 0.00 0.00 | 8.59 0.00 0.00 | 0.00 0.00 0.00 | 3.04 14.16 -0.26 - 11 11.74 14.40 164.11 | 8.74 0.00 0.00 | 8.74 0.00 0.00 | 0.00 0.00 0.00 | 3.04 14.40 14.14 - 12 5.50 5.13 172.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 19.26 - 13 5.50 5.13 180.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 24.39 - 14 5.50 5.13 188.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 29.52 - 15 5.50 5.13 196.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 34.66 - 16 5.50 5.14 204.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 39.79 - 17 5.50 5.14 213.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 44.93 - 18 5.50 5.14 221.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 50.07 - 19 5.50 5.14 229.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 55.21 - 20 5.50 5.14 237.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 60.36 - 21 5.50 5.15 245.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 65.50 - 22 5.50 5.15 254.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 70.65 - 23 5.50 5.15 262.30 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 75.80 - 24 5.50 5.15 270.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 80.95 - 25 5.50 5.15 278.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 86.10 - 26 5.50 5.15 286.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 91.25 - 27 5.50 5.15 295.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 96.40 - 28 5.50 5.15 303.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 101.56 - 29 5.50 5.16 311.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.16 106.71 - 30 5.50 5.16 319.68 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.16 111.87 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -119.52 -119.52 + 2 10.50 15.31 15.31 | 7.50 0.00 0.00 | 7.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 12.26 -107.26 + 3 10.62 15.63 30.94 | 7.62 0.00 0.00 | 7.62 0.00 0.00 | 0.00 0.00 0.00 | 3.04 12.59 -94.68 + 4 10.75 15.87 46.81 | 7.75 0.00 0.00 | 7.75 0.00 0.00 | 0.00 0.00 0.00 | 3.04 12.82 -81.85 + 5 10.88 16.09 62.90 | 7.88 0.00 0.00 | 7.88 0.00 0.00 | 0.00 0.00 0.00 | 3.04 13.05 -68.81 + 6 11.02 16.31 79.20 | 8.02 0.00 0.00 | 8.02 0.00 0.00 | 0.00 0.00 0.00 | 3.04 13.26 -55.54 + 7 11.16 16.53 95.73 | 8.16 0.00 0.00 | 8.16 0.00 0.00 | 0.00 0.00 0.00 | 3.04 13.48 -42.06 + 8 11.30 16.75 112.48 | 8.30 0.00 0.00 | 8.30 0.00 0.00 | 0.00 0.00 0.00 | 3.04 13.71 -28.35 + 9 11.44 16.98 129.46 | 8.44 0.00 0.00 | 8.44 0.00 0.00 | 0.00 0.00 0.00 | 3.04 13.93 -14.42 + 10 11.59 17.21 146.67 | 8.59 0.00 0.00 | 8.59 0.00 0.00 | 0.00 0.00 0.00 | 3.04 14.16 -0.26 + 11 11.74 17.44 164.11 | 8.74 0.00 0.00 | 8.74 0.00 0.00 | 0.00 0.00 0.00 | 3.04 14.40 14.14 + 12 5.50 8.17 172.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 19.26 + 13 5.50 8.17 180.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 24.39 + 14 5.50 8.18 188.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 29.52 + 15 5.50 8.18 196.81 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.13 34.66 + 16 5.50 8.18 204.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 39.79 + 17 5.50 8.18 213.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 44.93 + 18 5.50 8.18 221.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 50.07 + 19 5.50 8.19 229.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 55.21 + 20 5.50 8.19 237.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.14 60.36 + 21 5.50 8.19 245.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 65.50 + 22 5.50 8.19 254.11 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 70.65 + 23 5.50 8.19 262.30 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 75.80 + 24 5.50 8.19 270.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 80.95 + 25 5.50 8.20 278.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 86.10 + 26 5.50 8.20 286.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 91.25 + 27 5.50 8.20 295.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 96.40 + 28 5.50 8.20 303.28 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.15 101.56 + 29 5.50 8.20 311.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.16 106.71 + 30 5.50 8.20 319.68 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.04 5.16 111.87 diff --git a/tests/examples/example_SBT_Hi_T.out b/tests/examples/example_SBT_Hi_T.out index c1685cf47..5505f1ef2 100644 --- a/tests/examples/example_SBT_Hi_T.out +++ b/tests/examples/example_SBT_Hi_T.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:34 - Calculation Time: 73.745 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:38 + Calculation Time: 51.588 sec ***SUMMARY OF RESULTS*** @@ -193,33 +193,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -158.59 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -158.59 -158.59 - 2 19.00 21.93 25.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 21.93 -136.66 - 3 19.00 13.93 42.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 13.93 -122.73 - 4 19.00 13.09 59.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 13.09 -109.64 - 5 19.00 12.56 75.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 12.56 -97.08 - 6 19.00 12.16 90.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 12.16 -84.92 - 7 19.00 11.86 105.77 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 11.86 -73.06 - 8 19.00 11.60 120.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 11.60 -61.46 - 9 19.00 11.38 135.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 11.38 -50.08 - 10 19.00 11.20 150.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 11.20 -38.89 - 11 19.00 11.03 164.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 11.03 -27.85 - 12 19.00 10.88 178.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.88 -16.97 - 13 19.00 10.75 192.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.75 -6.23 - 14 19.00 10.61 206.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.61 4.39 - 15 19.00 10.50 220.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.50 14.88 - 16 19.00 10.39 234.46 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.39 25.27 - 17 19.00 10.28 248.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.28 35.56 - 18 19.00 10.19 261.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.19 45.75 - 19 19.00 10.10 275.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.10 55.84 - 20 19.00 10.01 288.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.01 65.85 - 21 19.00 9.92 301.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.92 75.77 - 22 19.00 9.84 315.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.84 85.61 - 23 19.00 9.77 328.19 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.77 95.38 - 24 19.00 9.69 341.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.69 105.07 - 25 19.00 9.62 354.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.62 114.69 - 26 19.00 9.54 367.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.54 124.23 - 27 19.00 9.48 380.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.48 133.71 - 28 19.00 9.41 392.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.41 143.12 - 29 19.00 9.35 405.52 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.35 152.47 - 30 19.00 9.29 418.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.29 161.76 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -158.59 -158.59 + 2 19.00 25.31 25.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 21.93 -136.66 + 3 19.00 17.30 42.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 13.93 -122.73 + 4 19.00 16.47 59.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 13.09 -109.64 + 5 19.00 15.93 75.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 12.56 -97.08 + 6 19.00 15.54 90.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 12.16 -84.92 + 7 19.00 15.23 105.77 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 11.86 -73.06 + 8 19.00 14.97 120.74 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 11.60 -61.46 + 9 19.00 14.75 135.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 11.38 -50.08 + 10 19.00 14.57 150.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 11.20 -38.89 + 11 19.00 14.41 164.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 11.03 -27.85 + 12 19.00 14.26 178.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.88 -16.97 + 13 19.00 14.12 192.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.75 -6.23 + 14 19.00 13.99 206.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.61 4.39 + 15 19.00 13.87 220.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.50 14.88 + 16 19.00 13.76 234.46 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.39 25.27 + 17 19.00 13.66 248.12 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.28 35.56 + 18 19.00 13.56 261.69 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.19 45.75 + 19 19.00 13.47 275.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.10 55.84 + 20 19.00 13.38 288.53 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 10.01 65.85 + 21 19.00 13.30 301.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.92 75.77 + 22 19.00 13.22 315.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.84 85.61 + 23 19.00 13.14 328.19 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.77 95.38 + 24 19.00 13.07 341.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.69 105.07 + 25 19.00 12.99 354.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.62 114.69 + 26 19.00 12.92 367.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.54 124.23 + 27 19.00 12.85 380.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.48 133.71 + 28 19.00 12.79 392.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.41 143.12 + 29 19.00 12.72 405.52 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.35 152.47 + 30 19.00 12.66 418.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 3.37 9.29 161.76 diff --git a/tests/examples/example_SBT_Lo_T.out b/tests/examples/example_SBT_Lo_T.out index f3a03b8b7..ad01e7221 100644 --- a/tests/examples/example_SBT_Lo_T.out +++ b/tests/examples/example_SBT_Lo_T.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 15.849 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:37 + Calculation Time: 22.627 sec ***SUMMARY OF RESULTS*** @@ -193,33 +193,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -38.57 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -38.57 -38.57 - 2 19.00 -0.64 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -39.21 - 3 19.00 -0.64 0.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -39.86 - 4 19.00 -0.64 0.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -40.50 - 5 19.00 -0.64 0.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -41.14 - 6 19.00 -0.64 0.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -41.78 - 7 19.00 -0.64 0.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -42.42 - 8 19.00 -0.64 0.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -43.07 - 9 19.00 -0.64 0.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -43.71 - 10 19.00 -0.64 0.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -44.35 - 11 19.00 -0.64 0.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -44.99 - 12 19.00 -0.64 0.04 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -45.63 - 13 19.00 -0.64 0.04 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -46.28 - 14 19.00 -0.64 0.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -46.92 - 15 19.00 -0.64 0.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -47.56 - 16 19.00 -0.64 0.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -48.20 - 17 19.00 -0.64 0.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -48.84 - 18 19.00 -0.64 0.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -49.48 - 19 19.00 -0.64 0.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -50.13 - 20 19.00 -0.64 0.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -50.77 - 21 19.00 -0.64 0.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -51.41 - 22 19.00 -0.64 0.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -52.05 - 23 19.00 -0.64 0.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -52.69 - 24 19.00 -0.64 0.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -53.34 - 25 19.00 -0.64 0.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -53.98 - 26 19.00 -0.64 0.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -54.62 - 27 19.00 -0.64 0.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -55.26 - 28 19.00 -0.64 0.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -55.90 - 29 19.00 -0.64 0.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -56.55 - 30 19.00 -0.64 0.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -57.19 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -38.57 -38.57 + 2 19.00 0.00 0.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -39.21 + 3 19.00 0.00 0.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -39.86 + 4 19.00 0.00 0.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -40.50 + 5 19.00 0.00 0.01 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -41.14 + 6 19.00 0.00 0.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -41.78 + 7 19.00 0.00 0.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -42.42 + 8 19.00 0.00 0.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -43.07 + 9 19.00 0.00 0.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -43.71 + 10 19.00 0.00 0.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -44.35 + 11 19.00 0.00 0.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -44.99 + 12 19.00 0.00 0.04 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -45.63 + 13 19.00 0.00 0.04 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -46.28 + 14 19.00 0.00 0.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -46.92 + 15 19.00 0.00 0.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -47.56 + 16 19.00 0.00 0.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -48.20 + 17 19.00 0.00 0.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -48.84 + 18 19.00 0.00 0.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -49.48 + 19 19.00 0.00 0.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -50.13 + 20 19.00 0.00 0.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -50.77 + 21 19.00 0.00 0.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -51.41 + 22 19.00 0.00 0.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -52.05 + 23 19.00 0.00 0.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -52.69 + 24 19.00 0.00 0.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -53.34 + 25 19.00 0.00 0.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -53.98 + 26 19.00 0.00 0.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -54.62 + 27 19.00 0.00 0.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -55.26 + 28 19.00 0.00 0.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -55.90 + 29 19.00 0.00 0.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -56.55 + 30 19.00 0.00 0.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.65 -0.64 -57.19 diff --git a/tests/examples/example_SHR-1.out b/tests/examples/example_SHR-1.out index 274459731..50942e527 100644 --- a/tests/examples/example_SHR-1.out +++ b/tests/examples/example_SHR-1.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:34 - Calculation Time: 0.819 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.795 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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -242.22 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -242.22 -242.22 - 2 6.00 11.83 13.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 11.83 -230.39 - 3 6.00 12.17 28.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 12.17 -218.22 - 4 7.20 15.15 45.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 15.15 -203.07 - 5 8.40 18.11 65.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 18.11 -184.96 - 6 9.60 21.06 88.49 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 21.06 -163.90 - 7 10.00 22.09 112.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.09 -141.82 - 8 10.00 22.14 136.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.14 -119.68 - 9 10.00 22.18 161.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.18 -97.50 - 10 10.00 22.21 185.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.21 -75.29 - 11 10.00 22.24 209.52 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.24 -53.05 - 12 10.00 22.27 233.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.27 -30.78 - 13 10.00 22.29 258.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.29 -8.48 - 14 10.00 22.32 282.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.32 13.84 - 15 10.00 22.34 306.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.34 36.17 - 16 10.00 22.36 331.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.36 58.53 - 17 10.00 22.37 355.68 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.37 80.90 - 18 10.00 22.39 380.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.39 103.29 - 19 10.00 22.40 404.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.40 125.69 - 20 10.00 22.42 428.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.42 148.10 - 21 10.00 22.43 453.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.43 170.53 - 22 10.00 22.44 477.93 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.44 192.97 - 23 10.00 22.45 502.42 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.45 215.43 - 24 10.00 22.46 526.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.46 237.89 - 25 10.00 22.47 551.42 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.47 260.36 - 26 10.00 22.48 575.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.48 282.85 - 27 10.00 22.49 600.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.49 305.34 - 28 10.00 22.50 625.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.50 327.84 - 29 10.00 22.51 649.55 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.51 350.35 - 30 10.00 22.52 674.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.52 372.87 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -242.22 -242.22 + 2 6.00 13.87 13.87 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 11.83 -230.39 + 3 6.00 14.20 28.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 12.17 -218.22 + 4 7.20 17.18 45.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 15.15 -203.07 + 5 8.40 20.14 65.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 18.11 -184.96 + 6 9.60 23.10 88.49 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 21.06 -163.90 + 7 10.00 24.12 112.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.09 -141.82 + 8 10.00 24.17 136.79 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.14 -119.68 + 9 10.00 24.21 161.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.18 -97.50 + 10 10.00 24.25 185.24 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.21 -75.29 + 11 10.00 24.28 209.52 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.24 -53.05 + 12 10.00 24.31 233.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.27 -30.78 + 13 10.00 24.33 258.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.29 -8.48 + 14 10.00 24.35 282.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.32 13.84 + 15 10.00 24.37 306.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.34 36.17 + 16 10.00 24.39 331.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.36 58.53 + 17 10.00 24.41 355.68 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.37 80.90 + 18 10.00 24.42 380.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.39 103.29 + 19 10.00 24.44 404.54 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.40 125.69 + 20 10.00 24.45 428.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.42 148.10 + 21 10.00 24.46 453.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.43 170.53 + 22 10.00 24.48 477.93 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.44 192.97 + 23 10.00 24.49 502.42 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.45 215.43 + 24 10.00 24.50 526.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.46 237.89 + 25 10.00 24.51 551.42 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.47 260.36 + 26 10.00 24.52 575.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.48 282.85 + 27 10.00 24.53 600.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.49 305.34 + 28 10.00 24.54 625.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.50 327.84 + 29 10.00 24.54 649.55 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.51 350.35 + 30 10.00 24.55 674.10 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 2.03 22.52 372.87 diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out index 394843b85..68df85975 100644 --- a/tests/examples/example_SHR-2.out +++ b/tests/examples/example_SHR-2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:34 - Calculation Time: 0.546 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.537 sec ***SUMMARY OF RESULTS*** @@ -188,23 +188,23 @@ 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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -417.39 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -417.39 -417.39 - 2 6.00 44.26 50.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 44.26 -373.14 - 3 6.00 45.15 101.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 45.15 -327.98 - 4 7.20 55.72 162.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 55.72 -272.27 - 5 8.40 66.23 234.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 66.23 -206.04 - 6 9.60 76.73 317.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 76.73 -129.31 - 7 10.00 80.33 403.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.33 -48.98 - 8 10.00 80.45 490.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.45 31.47 - 9 10.00 80.56 576.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.56 112.02 - 10 10.00 80.64 663.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.64 192.67 - 11 10.00 80.72 749.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.72 273.39 - 12 10.00 80.79 836.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.79 354.18 - 13 10.00 80.85 923.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.85 435.02 - 14 10.00 80.90 1009.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.90 515.93 - 15 10.00 80.95 1096.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.95 596.88 - 16 10.00 81.00 1183.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 81.00 677.88 - 17 10.00 81.04 1270.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 81.04 758.92 - 18 10.00 81.08 1357.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 81.08 840.00 - 19 10.00 81.11 1444.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 81.11 921.11 - 20 10.00 81.15 1531.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 81.15 1002.26 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -417.39 -417.39 + 2 6.00 50.14 50.14 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 44.26 -373.14 + 3 6.00 51.04 101.18 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 45.15 -327.98 + 4 7.20 61.60 162.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 55.72 -272.27 + 5 8.40 72.12 234.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 66.23 -206.04 + 6 9.60 82.61 317.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 76.73 -129.31 + 7 10.00 86.21 403.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.33 -48.98 + 8 10.00 86.34 490.06 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.45 31.47 + 9 10.00 86.44 576.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.56 112.02 + 10 10.00 86.53 663.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.64 192.67 + 11 10.00 86.61 749.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.72 273.39 + 12 10.00 86.67 836.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.79 354.18 + 13 10.00 86.73 923.05 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.85 435.02 + 14 10.00 86.79 1009.84 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.90 515.93 + 15 10.00 86.84 1096.67 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 80.95 596.88 + 16 10.00 86.88 1183.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 81.00 677.88 + 17 10.00 86.93 1270.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 81.04 758.92 + 18 10.00 86.96 1357.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 81.08 840.00 + 19 10.00 87.00 1444.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 81.11 921.11 + 20 10.00 87.03 1531.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 5.89 81.15 1002.26 diff --git a/tests/examples/example_multiple_gradients-2.out b/tests/examples/example_multiple_gradients-2.out index 648455b2d..fc8180437 100644 --- a/tests/examples/example_multiple_gradients-2.out +++ b/tests/examples/example_multiple_gradients-2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:35 - Calculation Time: 0.827 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:32 + Calculation Time: 0.800 sec ***SUMMARY OF RESULTS*** @@ -222,33 +222,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -76.24 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -76.24 -76.24 - 2 5.50 1.70 3.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -74.54 - 3 5.50 1.70 7.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -72.84 - 4 5.50 1.70 10.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -71.14 - 5 5.50 1.70 14.52 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -69.44 - 6 5.50 1.70 18.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -67.74 - 7 5.50 1.70 21.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -66.04 - 8 5.50 1.70 25.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -64.33 - 9 5.50 1.70 29.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -62.64 - 10 5.50 1.70 32.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -60.94 - 11 5.50 1.69 36.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.69 -59.25 - 12 5.50 1.68 39.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -57.57 - 13 5.50 1.67 43.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.67 -55.90 - 14 5.50 1.66 47.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.66 -54.24 - 15 5.50 1.64 50.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.64 -52.60 - 16 5.50 1.62 54.19 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.62 -50.97 - 17 5.50 1.60 57.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.60 -49.37 - 18 5.50 1.58 61.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.58 -47.79 - 19 5.50 1.55 64.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.55 -46.24 - 20 5.50 1.53 68.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.53 -44.72 - 21 5.50 1.50 71.58 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.50 -43.22 - 22 5.50 1.47 74.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.47 -41.75 - 23 5.50 1.43 78.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.43 -40.32 - 24 5.50 1.40 81.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.40 -38.92 - 25 5.50 1.37 84.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.37 -37.55 - 26 5.50 1.33 88.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.33 -36.22 - 27 5.50 1.30 91.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.30 -34.92 - 28 5.50 1.26 94.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.26 -33.66 - 29 5.50 1.23 97.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.23 -32.43 - 30 5.50 1.19 100.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.19 -31.23 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -76.24 -76.24 + 2 5.50 3.63 3.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -74.54 + 3 5.50 3.63 7.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -72.84 + 4 5.50 3.63 10.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -71.14 + 5 5.50 3.63 14.52 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -69.44 + 6 5.50 3.63 18.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -67.74 + 7 5.50 3.63 21.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -66.04 + 8 5.50 3.63 25.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -64.33 + 9 5.50 3.63 29.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -62.64 + 10 5.50 3.62 32.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -60.94 + 11 5.50 3.62 36.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.69 -59.25 + 12 5.50 3.61 39.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -57.57 + 13 5.50 3.60 43.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.67 -55.90 + 14 5.50 3.59 47.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.66 -54.24 + 15 5.50 3.57 50.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.64 -52.60 + 16 5.50 3.55 54.19 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.62 -50.97 + 17 5.50 3.53 57.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.60 -49.37 + 18 5.50 3.51 61.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.58 -47.79 + 19 5.50 3.48 64.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.55 -46.24 + 20 5.50 3.45 68.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.53 -44.72 + 21 5.50 3.42 71.58 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.50 -43.22 + 22 5.50 3.39 74.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.47 -41.75 + 23 5.50 3.36 78.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.43 -40.32 + 24 5.50 3.33 81.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.40 -38.92 + 25 5.50 3.30 84.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.37 -37.55 + 26 5.50 3.26 88.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.33 -36.22 + 27 5.50 3.23 91.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.30 -34.92 + 28 5.50 3.19 94.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.26 -33.66 + 29 5.50 3.16 97.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.23 -32.43 + 30 5.50 3.12 100.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.19 -31.23 diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out index a8557d1c5..da351f723 100644 --- a/tests/examples/example_multiple_gradients.out +++ b/tests/examples/example_multiple_gradients.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:35 - Calculation Time: 1.111 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.807 sec ***SUMMARY OF RESULTS*** @@ -222,33 +222,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -76.24 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -76.24 -76.24 - 2 5.50 1.70 3.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -74.54 - 3 5.50 1.70 7.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -72.84 - 4 5.50 1.70 10.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -71.14 - 5 5.50 1.70 14.52 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -69.44 - 6 5.50 1.70 18.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -67.74 - 7 5.50 1.70 21.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -66.04 - 8 5.50 1.70 25.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -64.33 - 9 5.50 1.70 29.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -62.64 - 10 5.50 1.70 32.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -60.94 - 11 5.50 1.69 36.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.69 -59.25 - 12 5.50 1.68 39.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -57.57 - 13 5.50 1.67 43.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.67 -55.90 - 14 5.50 1.66 47.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.66 -54.24 - 15 5.50 1.64 50.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.64 -52.60 - 16 5.50 1.62 54.19 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.62 -50.97 - 17 5.50 1.60 57.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.60 -49.37 - 18 5.50 1.58 61.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.58 -47.79 - 19 5.50 1.55 64.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.55 -46.24 - 20 5.50 1.53 68.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.53 -44.72 - 21 5.50 1.50 71.58 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.50 -43.22 - 22 5.50 1.47 74.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.47 -41.75 - 23 5.50 1.43 78.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.43 -40.32 - 24 5.50 1.40 81.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.40 -38.92 - 25 5.50 1.37 84.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.37 -37.55 - 26 5.50 1.33 88.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.33 -36.22 - 27 5.50 1.30 91.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.30 -34.92 - 28 5.50 1.26 94.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.26 -33.66 - 29 5.50 1.23 97.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.23 -32.43 - 30 5.50 1.19 100.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.19 -31.23 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -76.24 -76.24 + 2 5.50 3.63 3.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -74.54 + 3 5.50 3.63 7.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -72.84 + 4 5.50 3.63 10.89 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -71.14 + 5 5.50 3.63 14.52 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -69.44 + 6 5.50 3.63 18.15 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -67.74 + 7 5.50 3.63 21.78 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -66.04 + 8 5.50 3.63 25.40 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -64.33 + 9 5.50 3.63 29.03 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -62.64 + 10 5.50 3.62 32.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.70 -60.94 + 11 5.50 3.62 36.27 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.69 -59.25 + 12 5.50 3.61 39.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.68 -57.57 + 13 5.50 3.60 43.48 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.67 -55.90 + 14 5.50 3.59 47.07 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.66 -54.24 + 15 5.50 3.57 50.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.64 -52.60 + 16 5.50 3.55 54.19 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.62 -50.97 + 17 5.50 3.53 57.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.60 -49.37 + 18 5.50 3.51 61.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.58 -47.79 + 19 5.50 3.48 64.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.55 -46.24 + 20 5.50 3.45 68.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.53 -44.72 + 21 5.50 3.42 71.58 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.50 -43.22 + 22 5.50 3.39 74.97 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.47 -41.75 + 23 5.50 3.36 78.34 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.43 -40.32 + 24 5.50 3.33 81.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.40 -38.92 + 25 5.50 3.30 84.96 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.37 -37.55 + 26 5.50 3.26 88.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.33 -36.22 + 27 5.50 3.23 91.45 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.30 -34.92 + 28 5.50 3.19 94.64 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.26 -33.66 + 29 5.50 3.16 97.80 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.23 -32.43 + 30 5.50 3.12 100.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.93 1.19 -31.23 diff --git a/tests/examples/example_overpressure.out b/tests/examples/example_overpressure.out index 5437a9f4a..2d4c7e5b3 100644 --- a/tests/examples/example_overpressure.out +++ b/tests/examples/example_overpressure.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 0.801 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.796 sec ***SUMMARY OF RESULTS*** @@ -212,36 +212,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -48.50 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -48.50 -48.50 - 2 9.00 2.65 4.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.65 -45.85 - 3 9.00 2.67 8.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.67 -43.19 - 4 9.00 2.65 12.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.65 -40.53 - 5 9.00 2.63 16.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.63 -37.90 - 6 9.00 2.61 20.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.61 -35.28 - 7 9.00 2.59 24.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.59 -32.69 - 8 10.20 3.10 28.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 3.10 -29.59 - 9 11.40 3.61 33.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 3.61 -25.98 - 10 12.60 4.11 39.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.11 -21.87 - 11 13.80 4.54 45.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.54 -17.34 - 12 15.00 4.87 51.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.87 -12.47 - 13 15.00 4.83 57.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.83 -7.64 - 14 15.00 4.79 64.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.79 -2.85 - 15 15.00 4.75 70.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.75 1.89 - 16 15.00 4.71 76.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.71 6.60 - 17 15.00 4.67 82.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.67 11.26 - 18 15.00 4.62 88.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.62 15.89 - 19 15.00 4.58 94.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.58 20.47 - 20 15.00 4.54 100.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.54 25.01 - 21 15.00 4.50 106.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.50 29.52 - 22 15.00 4.46 112.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.46 33.97 - 23 15.00 4.42 118.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.42 38.39 - 24 15.00 4.38 124.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.38 42.77 - 25 15.00 4.33 129.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.33 47.10 - 26 15.00 4.29 135.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.29 51.39 - 27 15.00 4.25 141.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.25 55.64 - 28 15.00 4.21 146.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.21 59.85 - 29 15.00 4.16 152.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.16 64.01 - 30 15.00 4.12 158.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.12 68.13 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -48.50 -48.50 + 2 9.00 4.08 4.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.65 -45.85 + 3 9.00 4.09 8.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.67 -43.19 + 4 9.00 4.08 12.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.65 -40.53 + 5 9.00 4.06 16.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.63 -37.90 + 6 9.00 4.04 20.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.61 -35.28 + 7 9.00 4.02 24.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 2.59 -32.69 + 8 10.20 4.53 28.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 3.10 -29.59 + 9 11.40 5.04 33.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 3.61 -25.98 + 10 12.60 5.53 39.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.11 -21.87 + 11 13.80 5.96 45.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.54 -17.34 + 12 15.00 6.29 51.73 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.87 -12.47 + 13 15.00 6.25 57.99 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.83 -7.64 + 14 15.00 6.21 64.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.79 -2.85 + 15 15.00 6.17 70.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.75 1.89 + 16 15.00 6.13 76.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.71 6.60 + 17 15.00 6.09 82.60 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.67 11.26 + 18 15.00 6.05 88.65 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.62 15.89 + 19 15.00 6.01 94.66 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.58 20.47 + 20 15.00 5.97 100.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.54 25.01 + 21 15.00 5.93 106.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.50 29.52 + 22 15.00 5.89 112.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.46 33.97 + 23 15.00 5.84 118.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.42 38.39 + 24 15.00 5.80 124.09 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.38 42.77 + 25 15.00 5.76 129.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.33 47.10 + 26 15.00 5.72 135.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.29 51.39 + 27 15.00 5.68 141.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.25 55.64 + 28 15.00 5.63 146.88 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.21 59.85 + 29 15.00 5.59 152.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.16 64.01 + 30 15.00 5.55 158.02 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.43 4.12 68.13 *************************************** diff --git a/tests/examples/example_overpressure2.out b/tests/examples/example_overpressure2.out index b4ede63a5..60c5d1bd8 100644 --- a/tests/examples/example_overpressure2.out +++ b/tests/examples/example_overpressure2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 0.841 sec + GEOPHIRES Version: 3.7.20 + Simulation Date: 2025-03-04 + Simulation Time: 08:31 + Calculation Time: 0.795 sec ***SUMMARY OF RESULTS*** @@ -212,36 +212,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/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD) ________________________________________________________________________________________________________________________________________________________________________________________ - 1 0.00 -48.25 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -48.25 -48.25 - 2 9.00 2.65 4.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.65 -45.60 - 3 9.00 2.67 8.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.67 -42.93 - 4 9.00 2.66 12.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.66 -40.27 - 5 9.00 2.64 16.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.64 -37.64 - 6 9.00 2.62 20.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.62 -35.02 - 7 9.00 2.60 24.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.60 -32.42 - 8 10.20 3.11 28.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 3.11 -29.32 - 9 11.40 3.61 33.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 3.61 -25.71 - 10 12.60 4.11 39.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.11 -21.60 - 11 13.80 4.60 45.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.60 -17.00 - 12 15.00 5.08 52.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 5.08 -11.92 - 13 15.00 5.04 58.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 5.04 -6.87 - 14 15.00 5.00 64.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 5.00 -1.87 - 15 15.00 4.96 71.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.96 3.09 - 16 15.00 4.92 77.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.92 8.01 - 17 15.00 4.88 83.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.88 12.90 - 18 15.00 4.84 90.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.84 17.74 - 19 15.00 4.80 96.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.80 22.53 - 20 15.00 4.76 102.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.76 27.29 - 21 15.00 4.72 108.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.72 32.01 - 22 15.00 4.67 114.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.67 36.68 - 23 15.00 4.63 120.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.63 41.32 - 24 15.00 4.59 126.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.59 45.91 - 25 15.00 4.55 132.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.55 50.46 - 26 15.00 4.51 138.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.51 54.97 - 27 15.00 4.46 144.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.46 59.43 - 28 15.00 4.42 150.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.42 63.85 - 29 15.00 4.38 156.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.38 68.23 - 30 15.00 4.34 162.13 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.34 72.57 + 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -48.25 -48.25 + 2 9.00 4.08 4.08 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.65 -45.60 + 3 9.00 4.09 8.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.67 -42.93 + 4 9.00 4.08 12.25 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.66 -40.27 + 5 9.00 4.06 16.31 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.64 -37.64 + 6 9.00 4.04 20.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.62 -35.02 + 7 9.00 4.02 24.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 2.60 -32.42 + 8 10.20 4.53 28.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 3.11 -29.32 + 9 11.40 5.04 33.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 3.61 -25.71 + 10 12.60 5.53 39.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.11 -21.60 + 11 13.80 6.02 45.50 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.60 -17.00 + 12 15.00 6.51 52.00 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 5.08 -11.92 + 13 15.00 6.47 58.47 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 5.04 -6.87 + 14 15.00 6.43 64.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 5.00 -1.87 + 15 15.00 6.39 71.29 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.96 3.09 + 16 15.00 6.35 77.63 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.92 8.01 + 17 15.00 6.31 83.94 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.88 12.90 + 18 15.00 6.26 90.20 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.84 17.74 + 19 15.00 6.22 96.43 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.80 22.53 + 20 15.00 6.18 102.61 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.76 27.29 + 21 15.00 6.14 108.75 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.72 32.01 + 22 15.00 6.10 114.85 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.67 36.68 + 23 15.00 6.06 120.91 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.63 41.32 + 24 15.00 6.02 126.92 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.59 45.91 + 25 15.00 5.97 132.90 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.55 50.46 + 26 15.00 5.93 138.83 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.51 54.97 + 27 15.00 5.89 144.72 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.46 59.43 + 28 15.00 5.85 150.57 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.42 63.85 + 29 15.00 5.80 156.37 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.38 68.23 + 30 15.00 5.76 162.13 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 1.42 4.34 72.57 *************************************** From ff392e7639ff9d9a0b20e5bea662cab6af958fdc Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 4 Mar 2025 08:54:53 -0800 Subject: [PATCH 20/20] =?UTF-8?q?Bump=20version:=203.7.20=20=E2=86=92=203.?= =?UTF-8?q?7.21?= 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 abebfcc38..999dbcb50 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.20 +current_version = 3.7.21 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index ae5f57f93..acbfd9b3d 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.7.20 + version: 3.7.21 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index f7265723a..822677c1c 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,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.7.20.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.21.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.20...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.21...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 79a80a3bb..0fd15de85 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2025' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.7.20' +version = release = '3.7.21' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index 5175a18bb..84a64d828 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.7.20', + version='3.7.21', 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 19e125a69..7eac7d0ca 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.7.20' +__version__ = '3.7.21'