softwareengineerprogrammer · softwareengineerprogrammer · Apr 8, 2025 · Apr 8, 2025 · Apr 8, 2025 · Apr 8, 2025
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.8.14
+current_version = 3.8.18
 commit = True
 tag = True
 

diff --git 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.8.14
+    version: 3.8.18
     version_manager: "bump2version"
     website: "https://github.com/NREL"
     year_from: "2023"

diff --git a/README.rst b/README.rst
@@ -56,9 +56,9 @@ Free software: `MIT license <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.8.14.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.8.18.svg
     :alt: Commits since latest release
-    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.8.14...main
+    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.8.18...main
 
 .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
     :target: https://nrel.github.io/GEOPHIRES-X

diff --git a/References/Beckers 2013 GEOPHIRES v1.pdf b/References/Beckers 2013 GEOPHIRES v1.pdf
diff --git a/References/Beckers 2016 Dissertation.pdf b/References/Beckers 2016 Dissertation.pdf
diff --git a/References/Beckers 2018 Introducing GEOPHIRES v2.pdf b/References/Beckers 2018 Introducing GEOPHIRES v2.pdf
diff --git a/References/Beckers 2019 GEOPHIRES v2.pdf b/References/Beckers 2019 GEOPHIRES v2.pdf
diff --git a/References/Beckers-et-al_2023_Tabulated-Database-CLGS.pdf b/References/Beckers-et-al_2023_Tabulated-Database-CLGS.pdf
diff --git a/References/Drill cost correlation converting to per foot cost.xlsx b/References/Drill cost correlation converting to per foot cost.xlsx
diff --git a/References/GEOPHIRES v2.0 User Manual.pdf b/References/GEOPHIRES v2.0 User Manual.pdf
diff --git a/References/Garg-Combs_2011_HIP-RA-Reexamination.pdf b/References/Garg-Combs_2011_HIP-RA-Reexamination.pdf
diff --git a/References/GeoVision report.pdf b/References/GeoVision report.pdf
diff --git a/References/JEDI.md b/References/JEDI.md
diff --git a/References/JPSE2023.pdf b/References/JPSE2023.pdf
diff --git a/References/LACETable.txt b/References/LACETable.txt
diff --git a/References/Muffler-Cataldi_1978_ HIP-RA.pdf b/References/Muffler-Cataldi_1978_ HIP-RA.pdf
diff --git a/References/US-EIA_2013_LCOE-and-LACE-supplement.pdf b/References/US-EIA_2013_LCOE-and-LACE-supplement.pdf
diff --git a/References/Wanju-et-al_2021_CLGS-Energy-Recovery.pdf b/References/Wanju-et-al_2021_CLGS-Energy-Recovery.pdf
diff --git a/References/fervo_references.md b/References/fervo_references.md
diff --git a/References/geophires-architecture-diagram_2024-11-20.png b/References/geophires-architecture-diagram_2024-11-20.png
diff --git a/References/references.md b/References/references.md
@@ -0,0 +1,32 @@
+
+# GEOPHIRES
+* [GEOPHIRES v2.0 User Manual.pdf](https://github.com/NREL/GEOPHIRES-X/blob/fb5caadfa419c3bd05de656a33700d085fbc0432/References/GEOPHIRES%20v2.0%20User%20Manual.pdf)
+* [Beckers 2013 GEOPHIRES v1.pdf](https://github.com/NREL/GEOPHIRES-X/blob/fb5caadfa419c3bd05de656a33700d085fbc0432/References/Beckers%202013%20GEOPHIRES%20v1.pdf)
+* [Beckers 2016 Dissertation.pdf](https://github.com/NREL/GEOPHIRES-X/blob/fb5caadfa419c3bd05de656a33700d085fbc0432/References/Beckers%202016%20Dissertation.pdf)
+* [Beckers 2018 Introducing GEOPHIRES v2.pdf](https://github.com/NREL/GEOPHIRES-X/blob/fb5caadfa419c3bd05de656a33700d085fbc0432/References/Beckers%202018%20Introducing%20GEOPHIRES%20v2.pdf)
+* [Beckers 2019 GEOPHIRES v2.pdf](https://github.com/NREL/GEOPHIRES-X/blob/fb5caadfa419c3bd05de656a33700d085fbc0432/References/Beckers%202019%20GEOPHIRES%20v2.pdf)
+
+# Reference
+* [GeoVision report.pdf](https://github.com/NREL/GEOPHIRES-X/blob/ea5c67d43fe77c83a64208d8e2ab92a9abea3742/References/GeoVision%20report.pdf)
+* [US-EIA_2013_LCOE-and-LACE-supplement.pdf](https://github.com/NREL/GEOPHIRES-X/blob/7adc9598944a78487e5071ca23a06bfd17248c16/References/US-EIA_2013_LCOE-and-LACE-supplement.pdf)
+* [LACETable.txt](https://github.com/NREL/GEOPHIRES-X/blob/fb5caadfa419c3bd05de656a33700d085fbc0432/References/LACETable.txt)
+* [Drill cost correlation converting to per foot cost.xlsx](https://github.com/NREL/GEOPHIRES-X/blob/aae93f36ca5e01f4b700ddb5a59d0ec600aed3d4/References/Drill%20cost%20correlation%20converting%20to%20per%20foot%20cost.xlsx)
+
+# Fervo
+* [fervo_energy_white_paper.pdf](https://github.com/NREL/GEOPHIRES-X/blob/703c967b0b1fe9f6d619b1e786686ba07fb0fe59/References/fervo_energy_white_paper.pdf)
+* [fervo_drilling costs.pdf](https://github.com/softwareengineerprogrammer/GEOPHIRES-X/blob/62ecc37385cc89dcac36a3684c258e454bcc0241/References/fervo_drilling%20costs.pdf)
+
+# JEDI
+* [JEDI.pdf](https://github.com/NREL/GEOPHIRES-X/blob/a7d1ff2e0d47e957c19c3b6dec28fece16905dcb/References/JEDI.pdf)
+* [01d-jedi-geothermal-model-rel-gt12-23-16.xlsm](https://github.com/NREL/GEOPHIRES-X/raw/a7d1ff2e0d47e957c19c3b6dec28fece16905dcb/References/01d-jedi-geothermal-model-rel-gt12-23-16.xlsm)
+
+# HIP-RA
+* [Muffler-Cataldi_1978_ HIP-RA.pdf](https://github.com/NREL/GEOPHIRES-X/blob/7adc9598944a78487e5071ca23a06bfd17248c16/References/Muffler-Cataldi_1978_%20HIP-RA.pdf)
+* [Garg-Combs_2011_HIP-RA-Reexamination.pdf](https://github.com/NREL/GEOPHIRES-X/blob/7adc9598944a78487e5071ca23a06bfd17248c16/References/Garg-Combs_2011_HIP-RA-Reexamination.pdf)
+
+# CLGS
+* [Beckers-et-al_2023_Tabulated-Database-CLGS.pdf](https://github.com/NREL/GEOPHIRES-X/blob/7adc9598944a78487e5071ca23a06bfd17248c16/References/Beckers-et-al_2023_Tabulated-Database-CLGS.pdf)
+* [Wanju-et-al_2021_CLGS-Energy-Recovery.pdf](https://github.com/NREL/GEOPHIRES-X/blob/7adc9598944a78487e5071ca23a06bfd17248c16/References/Wanju-et-al_2021_CLGS-Energy-Recovery.pdf)
+
+# S-DAC-GT
+* [JPSE2023.pdf](https://github.com/NREL/GEOPHIRES-X/blob/ea5c67d43fe77c83a64208d8e2ab92a9abea3742/References/JPSE2023.pdf)
diff --git a/docs/conf.py b/docs/conf.py
@@ -18,7 +18,7 @@
 year = '2025'
 author = 'NREL'
 copyright = f'{year}, {author}'
-version = release = '3.8.14'
+version = release = '3.8.18'
 
 pygments_style = 'trac'
 templates_path = ['./templates']

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@ def read(*names, **kwargs):
 
 setup(
     name='geophires-x',
-    version='3.8.14',
+    version='3.8.18',
     license='MIT',
     description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
     long_description='{}\n{}'.format(
@@ -80,6 +80,7 @@ def read(*names, **kwargs):
         'coolprop',
         'rich',
         'pylocker',
+        'nrel-pysam',
     ],
     extras_require={
         # eg:

diff --git a/src/geophires_x/.gitignore b/src/geophires_x/.gitignore
@@ -134,3 +134,5 @@ Examples\Test2.json
 /Preliminary_Corpus Christi GRA_093019.xlsx
 /temperature.txt
 all_messages_conf.log
+
+!sam_economics/Generic_400_MWe/*.json