From 6f9211d9434061e0a578a89d156f58622dd6aa4f Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:15:44 -0700 Subject: [PATCH 1/6] Add project NPV, IRR, VIR=PI=PIR, MOIC fields to result parsing --- src/geophires_x_client/geophires_x_result.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py index 1adf1959..18dfb645 100644 --- a/src/geophires_x_client/geophires_x_result.py +++ b/src/geophires_x_client/geophires_x_result.py @@ -35,6 +35,10 @@ class GeophiresXResult: 'Accrued financing during construction', 'Project lifetime', 'Capacity factor', + 'Project NPV', + 'Project IRR', + 'Project VIR=PI=PIR', + 'Project MOIC', ], 'ENGINEERING PARAMETERS': [ 'Number of Production Wells', From ee3a1d2497ef46156f767db26e7bace9b8962b31 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:23:03 -0700 Subject: [PATCH 2/6] Fix version identifier in __init__.py and .cookiecutterrc (apparently template patching diverged from what bump2version expects) --- .cookiecutterrc | 2 +- src/geophires_x/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cookiecutterrc b/.cookiecutterrc index 56ce2fb5..adebac3a 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.2.0" + version: 3.2.0 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py index 11731085..573cf70b 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = "3.2.0" +__version__ = '3.2.0' From b28f766c8e55b4513be651fb57e5a52e88a3a22f Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:23:08 -0700 Subject: [PATCH 3/6] =?UTF-8?q?Bump=20version:=203.2.0=20=E2=86=92=203.2.1?= 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 7848f88b..e0a9337e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.2.0 +current_version = 3.2.1 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index adebac3a..ccf79b63 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.2.0 + version: 3.2.1 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index c432ddb0..044b4478 100644 --- a/README.rst +++ b/README.rst @@ -47,9 +47,9 @@ Free software: `MIT license `_ :alt: Supported implementations :target: https://pypi.org/project/geophires-x -.. |commits-since| image:: https://img.shields.io/github/commits-since/NREL/python-geophires-x/v3.2.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/NREL/python-geophires-x/v3.2.1.svg :alt: Commits since latest release - :target: https://github.com/NREL/python-geophires-x/compare/v3.2.0...main + :target: https://github.com/NREL/python-geophires-x/compare/v3.2.1...main .. |docs| image:: https://readthedocs.org/projects/python-geophires-x/badge/?style=flat :target: https://nrel.github.io/python-geophires-x diff --git a/docs/conf.py b/docs/conf.py index b0de0308..c72ac2b3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2023' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.2.0' +version = release = '3.2.1' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index 67b4da27..c66624e8 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.2.0', + version='3.2.1', 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 573cf70b..b50da94d 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.2.0' +__version__ = '3.2.1' From 623a2145688016eb06949f1ff263ce159a5ea4f0 Mon Sep 17 00:00:00 2001 From: kfbeckers Date: Fri, 3 Nov 2023 12:06:45 -0600 Subject: [PATCH 4/6] fixes bug to calculate O&M costs when redrilling wells --- src/geophires_x/Economics.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/geophires_x/Economics.py b/src/geophires_x/Economics.py index 4ac9208d..55f72b55 100644 --- a/src/geophires_x/Economics.py +++ b/src/geophires_x/Economics.py @@ -2053,8 +2053,8 @@ def Calculate(self, model: Model) -> None: if model.wellbores.redrill.value > 0: # account for well redrilling - model.Coam.value = model.Coam.value + \ - (self.Cwell.value + model.reserv.Cstim.value) * model.wellbores.redrill.value / model.surfaceplant.plantlifetime.value + self.Coam.value = self.Coam.value + \ + (self.Cwell.value + self.Cstim.value) * model.wellbores.redrill.value / model.surfaceplant.plantlifetime.value # The Reservoir depth measure was arbitrarily changed to meters despite being defined in the docs as kilometers. # For display consistency sake, we need to convert it back From 27b7d8b851d686f8f26ced28bcb98f5978fdb04d Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Sun, 5 Nov 2023 11:31:41 -0800 Subject: [PATCH 5/6] Prevent docs deployment from running for PRs (https://github.com/NREL/python-geophires-x/issues/31) --- .github/workflows/github-actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 37cb52f6..1166b8dc 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -130,6 +130,7 @@ jobs: deploy_docs: name: Deploy docs to GitHub Pages + if: github.ref == 'refs/heads/main' environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} From 38a73d177ef196234d439c357a277e57704040dd Mon Sep 17 00:00:00 2001 From: Jonathan Pezzino <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Sun, 5 Nov 2023 11:38:53 -0800 Subject: [PATCH 6/6] Document deploy_docs condition Document deploy_docs condition in github-actions.yml to test https://github.com/softwareengineerprogrammer/python-geophires-x-nrel/commit/27b7d8b851d686f8f26ced28bcb98f5978fdb04d (https://github.com/NREL/python-geophires-x/issues/31) --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 1166b8dc..23850ecc 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -130,7 +130,7 @@ jobs: deploy_docs: name: Deploy docs to GitHub Pages - if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' # Prevent from running on PRs, tags environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }}