diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 0e2916d8b..3d1555938 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.15.3 +current_version = 3.16.0 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index 033f8f968..20fa66cff 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.15.3 + version: 3.16.0 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 791701a07..43838b7bd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,11 @@ Changelog GEOPHIRES v3 (2023-2026) ------------------------ +3.16 +^^^^ + +3.16: `Fix Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat and CLGS Pump Power unit display `__ | `release `__ + 3.15 ^^^^ diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 619a74725..e9ab149b8 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -79,6 +79,7 @@ Run commands in a terminal with View → Tool Windows → Terminal 2. Install package dependencies (from ``setup.py``):: pip install -e . + pip install -e ".[development]" (PyCharm may prompt you to install dependencies, making this step unnecessary to run on the command line) diff --git a/README.rst b/README.rst index d2e8f954f..c81d15c00 100644 --- a/README.rst +++ b/README.rst @@ -58,9 +58,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.15.3.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.16.0.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.15.3...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.16.0...main .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat :target: https://softwareengineerprogrammer.github.io/GEOPHIRES diff --git a/docs/conf.py b/docs/conf.py index 5513f6159..a3efec9f7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2025' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.15.3' +version = release = '3.16.0' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index e6989a316..f95a5b473 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.15.3', + version='3.16.0', license='MIT', description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.', long_description='{}\n{}'.format( @@ -96,6 +96,7 @@ def read(*names, **kwargs): 'bumpversion', 'sphinx_py3doc_enhanced_theme', 'opencv-python', # generate_fervo_project_red_2026_docs + 'jinja2', # generate_fervo_project_cape_5_md ], }, ) diff --git a/src/geophires_x/AGSOutputs.py b/src/geophires_x/AGSOutputs.py index c06e06e86..81eb5086e 100644 --- a/src/geophires_x/AGSOutputs.py +++ b/src/geophires_x/AGSOutputs.py @@ -134,12 +134,16 @@ def PrintOutputs(self, model: Model): f.write(' * POWER GENERATION PROFILE *\n') f.write(' ******************************\n') if model.surfaceplant.enduse_option.value == EndUseOptions.ELECTRICITY: # only electricity + pump_units = f'({model.wellbores.PumpingPower.CurrentUnits.value})' + net_units = f'({model.surfaceplant.NetElectricityProduced.CurrentUnits.value})' f.write( ' YEAR THERMAL GEOFLUID PUMP NET FIRST LAW\n') f.write( ' DRAWDOWN TEMPERATURE POWER POWER EFFICIENCY\n') f.write( - " (" + model.wellbores.ProducedTemperature.CurrentUnits.value + ") (" + model.wellbores.PumpingPower.CurrentUnits.value + ") (" + model.surfaceplant.NetElectricityProduced.CurrentUnits.value + ") (%)\n") + ' ' + f'({model.wellbores.ProducedTemperature.CurrentUnits.value})' + f'{pump_units:>19}{net_units:>18}' + f'{"(%)":>21}' + NL) for i in range(0, model.surfaceplant.plant_lifetime.value): f.write( ' {0:2.0f} {1:8.4f} {2:8.2f} {3:8.4f} {4:8.4f} {5:8.4f}'.format( @@ -153,7 +157,10 @@ def PrintOutputs(self, model: Model): elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT: # only direct-use f.write(' YEAR THERMAL GEOFLUID PUMP NET\n') f.write(' DRAWDOWN TEMPERATURE POWER HEAT\n') - f.write(' (deg C) (MW) (MW)\n') + pump_units = f'({model.wellbores.PumpingPower.CurrentUnits.value})' + heat_units = f'({model.surfaceplant.HeatProduced.CurrentUnits.value})' + f.write(' (deg C)' + f'{pump_units:>20}{heat_units:>19}' + NL) for i in range(0, model.surfaceplant.plant_lifetime.value - 1): f.write( ' {0:2.0f} {1:8.4f} {2:8.2f} {3:8.4f} {4:8.4f}'.format( diff --git a/src/geophires_x/SurfacePlantAGS.py b/src/geophires_x/SurfacePlantAGS.py index 036a03837..5d242f2ff 100644 --- a/src/geophires_x/SurfacePlantAGS.py +++ b/src/geophires_x/SurfacePlantAGS.py @@ -732,7 +732,13 @@ def Calculate(self, model: Model) -> None: # Now transfer the results to the GEOPHIRES-X arrays: Deep Copy the Arrays model.wellbores.ProducedTemperature.value = self.Linear_production_temperature.copy() self.TenteringPP.value = model.wellbores.ProducedTemperature.value + # Annual_pumping_power is pumping energy per year, not power (see calculatepumpingpower), so relabel + # the parameter to match - otherwise AGS outputs report kWh/yr under a MW heading. Preferred and + # current units are set together to keep UnitsMatch true and avoid a bogus conversion in Outputs. model.wellbores.PumpingPower.value = self.Annual_pumping_power.copy() + model.wellbores.PumpingPower.UnitType = Units.ENERGYFREQUENCY + model.wellbores.PumpingPower.PreferredUnits = EnergyFrequencyUnit.KWhPERYEAR + model.wellbores.PumpingPower.CurrentUnits = EnergyFrequencyUnit.KWhPERYEAR self.HeatExtracted.value = self.Instantaneous_heat_production.copy() # convert to MW because that is what GEOPHIRES expects self.HeatExtracted.value = self.HeatExtracted.value / 1000.0 diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py index 1394f3dcd..0c9d57a9e 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.15.3' +__version__ = '3.16.0' 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 15a8e2ab7..43b1a2c04 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.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 0.841 sec + GEOPHIRES Version: 3.15.3 + Simulation Date: 2026-08-21 + Simulation Time: 10:35 + Calculation Time: 0.655 sec ***AGS/CLGS STYLE OUTPUT*** @@ -15,71 +15,71 @@ Simulation Metadata ### Configuration ### End-Use: Direct-Use Heat Fluid: sCO2 - Design: utube - Flow rate: 40.0 kg/sec - Lateral Length: 1000 meter + Design: coaxial + Flow rate: 20.0 kg/sec + Lateral Length: 9000 meter Vertical Depth: 3 kilometer Geothermal Gradient: 60.0000 degC/km Wellbore Diameter: 8.5000 in Injection Temperature: 60.0 degC Thermal Conductivity: 3.00 W/m/K ### Reservoir Simulation Results ### - Average Production Temperature: 71.2 degC - Average Production Pressure: 209.9 bar - Average Heat Production: 1005.1 kW - First Year Heat Production: 11692.1 kWh + Average Production Temperature: 100.7 degC + Average Production Pressure: 178.7 bar + Average Heat Production: 2335.6 kW + First Year Heat Production: 24363.9 kWh ### Cost Results ### - Total CAPEX: 7.1 MUSD - Drilling Cost: 7.0 MUSD - Surface Plant Cost: 0.1 MUSD - OPEX: 2.1 KUSD/yr - LCOH: 54.1 USD/MWh + Total CAPEX: 12.3 MUSD + Drilling Cost: 12.0 MUSD + Surface Plant Cost: 0.3 MUSD + OPEX: 87.1 KUSD/yr + LCOH: 44.7 USD/MWh ****************************** * POWER GENERATION PROFILE * ****************************** YEAR THERMAL GEOFLUID PUMP NET DRAWDOWN TEMPERATURE POWER HEAT - (deg C) (MW) (MW) - 0 1.0000 75.99 0.0000 1.2751 - 1 0.9726 73.91 0.0000 1.2751 - 2 0.9613 73.05 0.0000 1.1921 - 3 0.9553 72.59 0.0000 1.1471 - 4 0.9513 72.29 0.0000 1.1169 - 5 0.9484 72.06 0.0000 1.0946 - 6 0.9460 71.89 0.0000 1.0771 - 7 0.9441 71.74 0.0000 1.0627 - 8 0.9425 71.62 0.0000 1.0505 - 9 0.9411 71.51 0.0000 1.0401 - 10 0.9398 71.42 0.0000 1.0309 - 11 0.9387 71.33 0.0000 1.0227 - 12 0.9377 71.26 0.0000 1.0154 - 13 0.9368 71.19 0.0000 1.0088 - 14 0.9360 71.13 0.0000 1.0027 - 15 0.9352 71.07 0.0000 0.9971 - 16 0.9345 71.02 0.0000 0.9919 - 17 0.9339 70.97 0.0000 0.9871 - 18 0.9333 70.92 0.0000 0.9826 - 19 0.9327 70.88 0.0000 0.9784 - 20 0.9322 70.83 0.0000 0.9744 - 21 0.9317 70.80 0.0000 0.9707 - 22 0.9312 70.76 0.0000 0.9672 - 23 0.9307 70.72 0.0000 0.9638 - 24 0.9303 70.69 0.0000 0.9606 - 25 0.9299 70.66 0.0000 0.9576 - 26 0.9295 70.63 0.0000 0.9547 - 27 0.9291 70.60 0.0000 0.9520 - 28 0.9287 70.57 0.0000 0.9493 - 29 0.9284 70.55 0.0000 0.9468 - 30 0.9280 70.52 0.0000 0.9443 - 31 0.9277 70.50 0.0000 0.9420 - 32 0.9274 70.47 0.0000 0.9397 - 33 0.9271 70.45 0.0000 0.9375 - 34 0.9268 70.43 0.0000 0.9354 - 35 0.9265 70.41 0.0000 0.9333 - 36 0.9263 70.39 0.0000 0.9314 - 37 0.9260 70.37 0.0000 0.9295 - 38 0.9257 70.35 0.0000 0.9276 + (deg C) (kWh/yr) (MW) + 0 1.0000 114.62 716921.3623 2.5881 + 1 0.9529 109.23 749310.6883 2.5881 + 2 0.9312 106.74 766280.7608 2.4949 + 3 0.9192 105.37 777623.1487 2.4413 + 4 0.9111 104.43 786196.0597 2.4033 + 5 0.9050 103.73 793115.4335 2.3743 + 6 0.9001 103.17 798920.6551 2.3512 + 7 0.8960 102.70 803916.8224 2.3322 + 8 0.8925 102.31 808302.9248 2.3160 + 9 0.8895 101.96 812213.7138 2.3020 + 10 0.8868 101.65 815740.5951 2.2897 + 11 0.8844 101.38 818953.2001 2.2787 + 12 0.8823 101.13 821902.9333 2.2687 + 13 0.8803 100.90 824629.5202 2.2597 + 14 0.8785 100.70 827164.6278 2.2512 + 15 0.8768 100.50 829533.3714 2.2431 + 16 0.8752 100.32 831755.6140 2.2356 + 17 0.8738 100.16 833848.7646 2.2286 + 18 0.8724 100.00 835812.8709 2.2220 + 19 0.8711 99.85 837659.6213 2.2159 + 20 0.8699 99.72 839415.0455 2.2101 + 21 0.8688 99.58 841088.7467 2.2047 + 22 0.8677 99.46 842685.5764 2.1995 + 23 0.8667 99.34 844213.8943 2.1947 + 24 0.8657 99.23 845679.7912 2.1900 + 25 0.8647 99.12 847086.8475 2.1855 + 26 0.8638 99.02 848439.9439 2.1813 + 27 0.8630 98.92 849743.8783 2.1772 + 28 0.8622 98.82 851001.3439 2.1733 + 29 0.8614 98.73 852215.3651 2.1696 + 30 0.8606 98.64 853389.8692 2.1660 + 31 0.8598 98.56 854525.8714 2.1625 + 32 0.8591 98.48 855626.9695 2.1591 + 33 0.8584 98.40 856695.1340 2.1559 + 34 0.8578 98.32 857731.5317 2.1528 + 35 0.8571 98.25 858738.6142 2.1498 + 36 0.8565 98.18 859718.5891 2.1468 + 37 0.8559 98.11 860671.6539 2.1440 + 38 0.8553 98.04 861599.6483 2.1412 *************************************************************** * HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE * @@ -87,42 +87,42 @@ Simulation Metadata YEAR HEAT HEAT RESERVOIR CUM PERCENTAGE OF PROVIDED EXTRACTED HEAT CONTENT TOTAL HEAT MINED (GWh/year) (GWh/year) (10^15 J) (%) - 1 9.5 10.5 3.75 1.00 - 2 8.5 9.5 3.72 1.90 - 3 8.1 9.0 3.69 2.76 - 4 7.9 8.8 3.66 3.59 - 5 7.7 8.6 3.62 4.41 - 6 7.6 8.5 3.59 5.21 - 7 7.5 8.4 3.56 6.01 - 8 7.4 8.3 3.53 6.79 - 9 7.4 8.2 3.50 7.57 - 10 7.3 8.1 3.48 8.34 - 11 7.3 8.1 3.45 9.11 - 12 7.2 8.0 3.42 9.87 - 13 7.2 8.0 3.39 10.62 - 14 7.1 7.9 3.36 11.38 - 15 7.1 7.9 3.33 12.12 - 16 7.1 7.8 3.30 12.87 - 17 7.0 7.8 3.28 13.61 - 18 7.0 7.8 3.25 14.35 - 19 7.0 7.7 3.22 15.08 - 20 6.9 7.7 3.19 15.82 - 21 6.9 7.7 3.16 16.55 - 22 6.9 7.7 3.14 17.27 - 23 6.9 7.6 3.11 18.00 - 24 6.9 7.6 3.08 18.72 - 25 6.8 7.6 3.05 19.44 - 26 6.8 7.6 3.03 20.16 - 27 6.8 7.6 3.00 20.88 - 28 6.8 7.5 2.97 21.60 - 29 6.8 7.5 2.95 22.31 - 30 6.8 7.5 2.92 23.02 - 31 6.7 7.5 2.89 23.73 - 32 6.7 7.5 2.86 24.44 - 33 6.7 7.5 2.84 25.15 - 34 6.7 7.4 2.81 25.86 - 35 6.7 7.4 2.78 26.56 - 36 6.7 7.4 2.76 27.26 - 37 6.7 7.4 2.73 27.97 - 38 6.6 7.4 2.70 28.67 - 39 6.6 7.4 2.68 29.37 + 1 19.7 21.9 3.71 2.08 + 2 18.6 20.6 3.64 4.04 + 3 18.1 20.1 3.57 5.95 + 4 17.8 19.7 3.49 7.82 + 5 17.5 19.5 3.42 9.67 + 6 17.3 19.3 3.36 11.50 + 7 17.2 19.1 3.29 13.31 + 8 17.1 19.0 3.22 15.11 + 9 17.0 18.9 3.15 16.90 + 10 16.9 18.8 3.08 18.69 + 11 16.8 18.7 3.02 20.46 + 12 16.7 18.6 2.95 22.22 + 13 16.7 18.5 2.88 23.98 + 14 16.6 18.4 2.82 25.73 + 15 16.5 18.4 2.75 27.48 + 16 16.5 18.3 2.68 29.22 + 17 16.4 18.3 2.62 30.95 + 18 16.4 18.2 2.55 32.68 + 19 16.4 18.2 2.49 34.41 + 20 16.3 18.1 2.42 36.13 + 21 16.3 18.1 2.36 37.85 + 22 16.2 18.0 2.29 39.56 + 23 16.2 18.0 2.23 41.27 + 24 16.2 18.0 2.16 42.98 + 25 16.1 17.9 2.10 44.68 + 26 16.1 17.9 2.03 46.38 + 27 16.1 17.9 1.97 48.08 + 28 16.1 17.8 1.90 49.77 + 29 16.0 17.8 1.84 51.46 + 30 16.0 17.8 1.78 53.15 + 31 16.0 17.7 1.71 54.84 + 32 15.9 17.7 1.65 56.52 + 33 15.9 17.7 1.58 58.20 + 34 15.9 17.7 1.52 59.88 + 35 15.9 17.6 1.46 61.55 + 36 15.9 17.6 1.39 63.22 + 37 15.8 17.6 1.33 64.90 + 38 15.8 17.6 1.27 66.56 + 39 15.8 17.6 1.20 68.23 diff --git a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.txt b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.txt index 336545e27..9393b8be7 100644 --- a/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.txt +++ b/tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.txt @@ -1,23 +1,25 @@ -# Example 1 from "Tabulated Database of Closed-Loop Geothermal Systems Performance for Cloud-Based Technical and +# Example from "Tabulated Database of Closed-Loop Geothermal Systems Performance for Cloud-Based Technical and # Economic Modeling of Heat Production and Electricity Generation" # Koenraad Beckers Yaroslav Vasyliv Gabriela A. Bran-Anleu Mario Martinez Chad Augustine and Mark White # Presented at the 48th Stanford Geothermal Workshop Stanford California February 6-8 2023 # https://www.nrel.gov/docs/fy23osti/84979.pdf # -# This configuration is water filled U-loop with 1 lateral for direct-use heat. +# This configuration is sCO2-filled coaxial with 1 lateral for direct-use heat. Is AGS, True -Closed-loop Configuration, 1 +Closed-loop Configuration, 2, -- Coaxial End-Use Option, 2, -----direct heat -Economic Model, 4, -----CLGS Heat Transfer Fluid, 2, ----sCO2 -Production Flow Rate per Well, 40, ---- kg/s for water / 40 kg/s for sCO2 +Number of Production Wells, 1, ---- 1 production well accounts for the full configuration - 1 up, one down, and a horizontal section +Number of Injection Wells, 0, ---- No injectors in a closed coaxial +Production Flow Rate per Well, 20, ---- kg/s; coaxial CLGS database is unpopulated above ~20 kg/s at 8.5 inch/9,000 m All-in Vertical Drilling Costs, 1000.0 All-in Nonvertical Drilling Costs, 1000.0 +Exploration Capital Cost, 0 Cylindrical Reservoir Input Depth, 3000 meter, Reservoir Depth, 3.0, -----kilometers Gradient 1, 0.06, ----deg.c/m -Total Horizontal Length, 9000, ----- m +Nonvertical Length per Multilateral Section, 9000, ----- m Production Well Diameter,8.5, --- [inch] Injection Temperature, 60.0, -----deg.C Plant Lifetime, 40, --- years 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 8d2122370..aa32609e8 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.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 0.798 sec + GEOPHIRES Version: 3.15.3 + Simulation Date: 2026-08-21 + Simulation Time: 10:35 + Calculation Time: 0.681 sec ***AGS/CLGS STYLE OUTPUT*** @@ -40,7 +40,7 @@ Simulation Metadata ****************************** YEAR THERMAL GEOFLUID PUMP NET DRAWDOWN TEMPERATURE POWER HEAT - (deg C) (MW) (MW) + (deg C) (kWh/yr) (MW) 0 1.0000 122.13 1288510.4233 4.5874 1 0.9442 115.31 1311820.8920 4.5874 2 0.9205 112.41 1321092.1452 4.3165 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 08cf69217..957ebe389 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.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:35 - Calculation Time: 0.925 sec + GEOPHIRES Version: 3.15.3 + Simulation Date: 2026-08-21 + Simulation Time: 10:35 + Calculation Time: 1.088 sec ***AGS/CLGS STYLE OUTPUT*** @@ -42,7 +42,7 @@ Simulation Metadata ****************************** YEAR THERMAL GEOFLUID PUMP NET FIRST LAW DRAWDOWN TEMPERATURE POWER POWER EFFICIENCY - (degC) (MW) (MW) (%) + (degC) (kWh/yr) (MW) (%) 1 1.0000 108.39 0.0000 0.2930 9.5729 2 0.9536 108.39 0.0000 0.2930 9.5729 3 0.9332 105.79 0.0000 0.2729 8.9163 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 8944fc88f..9542d5c66 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.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:34 - Calculation Time: 0.919 sec + GEOPHIRES Version: 3.15.3 + Simulation Date: 2026-08-21 + Simulation Time: 10:35 + Calculation Time: 0.760 sec ***AGS/CLGS STYLE OUTPUT*** @@ -40,7 +40,7 @@ Simulation Metadata ****************************** YEAR THERMAL GEOFLUID PUMP NET DRAWDOWN TEMPERATURE POWER HEAT - (deg C) (MW) (MW) + (deg C) (kWh/yr) (MW) 0 1.0000 108.39 0.0000 3.5857 1 0.9536 103.36 0.0000 3.5857 2 0.9332 101.15 0.0000 3.4148 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 d0b0dc927..b4d511823 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.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:33 - Calculation Time: 0.858 sec + GEOPHIRES Version: 3.15.3 + Simulation Date: 2026-08-21 + Simulation Time: 10:35 + Calculation Time: 0.752 sec ***AGS/CLGS STYLE OUTPUT*** @@ -42,7 +42,7 @@ Simulation Metadata ****************************** YEAR THERMAL GEOFLUID PUMP NET FIRST LAW DRAWDOWN TEMPERATURE POWER POWER EFFICIENCY - (degC) (MW) (MW) (%) + (degC) (kWh/yr) (MW) (%) 1 1.0000 122.04 0.0000 0.4143 10.5760 2 0.9497 122.04 0.0000 0.4143 10.5760 3 0.9277 118.86 0.0000 0.3841 9.8066 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 b22fd193a..bd2423a2a 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.7.19 - Simulation Date: 2025-02-28 - Simulation Time: 11:35 - Calculation Time: 0.997 sec + GEOPHIRES Version: 3.15.3 + Simulation Date: 2026-08-21 + Simulation Time: 10:35 + Calculation Time: 0.722 sec ***AGS/CLGS STYLE OUTPUT*** @@ -40,7 +40,7 @@ Simulation Metadata ****************************** YEAR THERMAL GEOFLUID PUMP NET DRAWDOWN TEMPERATURE POWER HEAT - (deg C) (MW) (MW) + (deg C) (kWh/yr) (MW) 0 1.0000 122.04 0.0000 4.6663 1 0.9497 115.90 0.0000 4.6663 2 0.9277 113.21 0.0000 4.4253