Skip to content

Missing percent unit fixes [v3.9.8] #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 21, 2025
Merged

Missing percent unit fixes [v3.9.8] #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7681bcd
fix missing percent unit for accrued financing during construction ht…
softwareengineerprogrammer May 15, 2025
dea6ddf
Fix missing percent unit for Water loss rate output
softwareengineerprogrammer May 15, 2025
362690b
Only display 1 decimal place of water loss rate (consistent with prev…
softwareengineerprogrammer May 15, 2025
ab2d0a4
Set Inflation Rate During Construction CurrentUnits correctly instead…
softwareengineerprogrammer May 15, 2025
8df5ed1
Previous commit erroneously claimed original behavior only displayed …
softwareengineerprogrammer May 15, 2025
d5a0f0c
Bump version: 3.9.7 → 3.9.8
softwareengineerprogrammer May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.9.7
current_version = 3.9.8
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion .cookiecutterrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ default_context:
sphinx_doctest: "no"
sphinx_theme: "sphinx-py3doc-enhanced-theme"
test_matrix_separate_coverage: "no"
version: 3.9.7
version: 3.9.8
version_manager: "bump2version"
website: "https://github.com/NREL"
year_from: "2023"
Expand Down
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.7.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.9.8.svg
:alt: Commits since latest release
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.7...main
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.8...main

.. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
:target: https://nrel.github.io/GEOPHIRES-X
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
year = '2025'
author = 'NREL'
copyright = f'{year}, {author}'
version = release = '3.9.7'
version = release = '3.9.8'

pygments_style = 'trac'
templates_path = ['./templates']
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def read(*names, **kwargs):

setup(
name='geophires-x',
version='3.9.7',
version='3.9.8',
license='MIT',
description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
long_description='{}\n{}'.format(
Expand Down
2 changes: 1 addition & 1 deletion src/geophires_x/Economics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ def __init__(self, model: Model):
Min=0.0,
Max=1.0,
UnitType=Units.PERCENT,
PreferredUnits=PercentUnit.TENTH,
PreferredUnits=PercentUnit.PERCENT,
CurrentUnits=PercentUnit.TENTH,
ErrMessage="assume default inflation rate during construction (0)"
)
Expand Down
5 changes: 2 additions & 3 deletions src/geophires_x/Outputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,7 @@ def PrintOutputs(self, model: Model):
label = Outputs._field_label(field.Name, 49)
f.write(f' {label}{field.value:10.2f} {field.CurrentUnits.value}\n')

# FIXME TODO unit is missing https://github.com/NREL/GEOPHIRES-X/issues/382
f.write(f' Accrued financing during construction: {model.economics.inflrateconstruction.value*100:10.2f} {model.economics.inflrateconstruction.CurrentUnits.value}\n')
f.write(f' Accrued financing during construction: {econ.inflrateconstruction.value:10.2f} {econ.inflrateconstruction.CurrentUnits.value}\n')

f.write(f' Project lifetime: {model.surfaceplant.plant_lifetime.value:10.0f} {model.surfaceplant.plant_lifetime.CurrentUnits.value}\n')
f.write(f' Capacity factor: {model.surfaceplant.utilization_factor.value * 100:10.1f} %\n')
Expand Down Expand Up @@ -307,7 +306,7 @@ def PrintOutputs(self, model: Model):
f.write(f' Number of Production Wells: {model.wellbores.nprod.value:10.0f}' + NL)
f.write(f' Number of Injection Wells: {model.wellbores.ninj.value:10.0f}' + NL)
f.write(f' {Outputs._field_label(Outputs.VERTICAL_WELL_DEPTH_OUTPUT_NAME, 49)}{model.reserv.depth.value:10.1f} ' + model.reserv.depth.CurrentUnits.value + NL)
f.write(f' Water loss rate: {model.reserv.waterloss.value*100:10.1f} ' + model.reserv.waterloss.CurrentUnits.value + NL)
f.write(f' Water loss rate: {model.reserv.waterloss.value:10.1f} {model.reserv.waterloss.CurrentUnits.value}\n')
f.write(f' Pump efficiency: {model.surfaceplant.pump_efficiency.value:10.1f} ' + model.surfaceplant.pump_efficiency.CurrentUnits.value + NL)
f.write(f' Injection temperature: {model.wellbores.Tinj.value:10.1f} ' + model.wellbores.Tinj.CurrentUnits.value + NL)
if model.wellbores.rameyoptionprod.value:
Expand Down
6 changes: 4 additions & 2 deletions src/geophires_x/Reservoir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,16 +320,18 @@ def __init__(self, model: Model):
ToolTipText="Geothermal reservoir volume"
)

# noinspection SpellCheckingInspection
self.waterloss = self.ParameterDict[self.waterloss.Name] = floatParameter(
"Water Loss Fraction",
DefaultValue=0.0,
Min=0.0,
Max=0.99,
UnitType=Units.PERCENT,
PreferredUnits=PercentUnit.TENTH,
CurrentUnits=PercentUnit.TENTH,
PreferredUnits=PercentUnit.PERCENT,
ErrMessage="assume default water loss fraction (0)",
ToolTipText="Fraction of water lost in the reservoir defined as (total geofluid lost)/(total geofluid produced)."
ToolTipText="Fraction of water lost in the reservoir defined as "
"(total geofluid lost)/(total geofluid produced)."
)

self.cprock = self.ParameterDict[self.cprock.Name] = floatParameter(
Expand Down
2 changes: 1 addition & 1 deletion src/geophires_x/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.9.7'
__version__ = '3.9.8'
6 changes: 3 additions & 3 deletions tests/example1_addons.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SUMMARY OF RESULTS,Well depth,,3.0,kilometer
SUMMARY OF RESULTS,Geothermal gradient,,50,degC/km
SUMMARY OF RESULTS,Total Avoided Carbon Emissions,,474.67,kilotonne
ECONOMIC PARAMETERS,Economic Model,,Fixed Charge Rate (FCR),
ECONOMIC PARAMETERS,Accrued financing during construction,,0.0,
ECONOMIC PARAMETERS,Accrued financing during construction,,0.0,%
ECONOMIC PARAMETERS,Project lifetime,,30,yr
ECONOMIC PARAMETERS,Capacity factor,,90.0,%
ECONOMIC PARAMETERS,Project NPV,,72.08,MUSD
Expand All @@ -36,7 +36,7 @@ EXTENDED ECONOMICS,AddOns Payback Period,,0.0,yr
ENGINEERING PARAMETERS,Number of Production Wells,,2,count
ENGINEERING PARAMETERS,Number of Injection Wells,,2,count
ENGINEERING PARAMETERS,Well depth,,3.0,kilometer
ENGINEERING PARAMETERS,Water loss rate,,2.0,
ENGINEERING PARAMETERS,Water loss rate,,2.0,%
ENGINEERING PARAMETERS,Pump efficiency,,80.0,%
ENGINEERING PARAMETERS,Injection temperature,,50.0,degC
ENGINEERING PARAMETERS,Average production well temperature drop,,3.0,degC
Expand Down Expand Up @@ -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.8.4,
Simulation Metadata,GEOPHIRES Version,,3.9.7,
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,
Expand Down
16 changes: 8 additions & 8 deletions tests/examples/Fervo_Norbeck_Latimer_2023.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.7.23
Simulation Date: 2025-03-10
Simulation Time: 10:42
Calculation Time: 0.434 sec
GEOPHIRES Version: 3.9.7
Simulation Date: 2025-05-15
Simulation Time: 10:13
Calculation Time: 0.432 sec

***SUMMARY OF RESULTS***

Expand All @@ -23,23 +23,23 @@ Simulation Metadata

***ECONOMIC PARAMETERS***

Economic Model = BICYCLE
Accrued financing during construction: 5.00
Economic Model = BICYCLE
Accrued financing during construction: 5.00 %
Project lifetime: 10 yr
Capacity factor: 90.0 %
Project NPV: -13.03 MUSD
Project IRR: -4.40 %
Project VIR=PI=PIR: 0.54
Project MOIC: -0.18
Project Payback Period: N/A
Project Payback Period: N/A
Estimated Jobs Created: 6

***ENGINEERING PARAMETERS***

Number of Production Wells: 1
Number of Injection Wells: 1
Well depth: 2.3 kilometer
Water loss rate: 10.0
Water loss rate: 10.0 %
Pump efficiency: 80.0 %
Injection temperature: 41.0 degC
Production Wellbore heat transmission calculated with Ramey's model
Expand Down
14 changes: 7 additions & 7 deletions tests/examples/Fervo_Project_Cape-2.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.8.9
Simulation Date: 2025-03-26
Simulation Time: 09:57
GEOPHIRES Version: 3.9.7
Simulation Date: 2025-05-15
Simulation Time: 10:13
Calculation Time: 0.650 sec

***SUMMARY OF RESULTS***
Expand All @@ -23,23 +23,23 @@ Simulation Metadata

***ECONOMIC PARAMETERS***

Economic Model = BICYCLE
Accrued financing during construction: 5.00
Economic Model = BICYCLE
Accrued financing during construction: 5.00 %
Project lifetime: 15 yr
Capacity factor: 90.0 %
Project NPV: 42.34 MUSD
Project IRR: 17.60 %
Project VIR=PI=PIR: 1.83
Project MOIC: 1.42
Project Payback Period: 6.50 yr
Project Payback Period: 6.50 yr
Estimated Jobs Created: 19

***ENGINEERING PARAMETERS***

Number of Production Wells: 1
Number of Injection Wells: 2
Well depth: 2.6 kilometer
Water loss rate: 2.0
Water loss rate: 2.0 %
Pump efficiency: 80.0 %
Injection temperature: 56.7 degC
Production Wellbore heat transmission calculated with Ramey's model
Expand Down
16 changes: 8 additions & 8 deletions tests/examples/Fervo_Project_Cape-3.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.7.23
Simulation Date: 2025-03-10
Simulation Time: 10:42
Calculation Time: 0.871 sec
GEOPHIRES Version: 3.9.7
Simulation Date: 2025-05-15
Simulation Time: 10:13
Calculation Time: 0.868 sec

***SUMMARY OF RESULTS***

Expand All @@ -23,23 +23,23 @@ Simulation Metadata

***ECONOMIC PARAMETERS***

Economic Model = BICYCLE
Accrued financing during construction: 5.00
Economic Model = BICYCLE
Accrued financing during construction: 5.00 %
Project lifetime: 20 yr
Capacity factor: 90.0 %
Project NPV: 4580.36 MUSD
Project IRR: 43.75 %
Project VIR=PI=PIR: 5.27
Project MOIC: 6.30
Project Payback Period: 3.38 yr
Project Payback Period: 3.38 yr
Estimated Jobs Created: 976

***ENGINEERING PARAMETERS***

Number of Production Wells: 39
Number of Injection Wells: 39
Well depth: 2.6 kilometer
Water loss rate: 5.0
Water loss rate: 5.0 %
Pump efficiency: 80.0 %
Injection temperature: 56.7 degC
Production Wellbore heat transmission calculated with Ramey's model
Expand Down
16 changes: 8 additions & 8 deletions tests/examples/Fervo_Project_Cape.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.7.23
Simulation Date: 2025-03-10
Simulation Time: 10:42
Calculation Time: 0.678 sec
GEOPHIRES Version: 3.9.7
Simulation Date: 2025-05-15
Simulation Time: 10:13
Calculation Time: 0.655 sec

***SUMMARY OF RESULTS***

Expand All @@ -23,23 +23,23 @@ Simulation Metadata

***ECONOMIC PARAMETERS***

Economic Model = BICYCLE
Accrued financing during construction: 5.00
Economic Model = BICYCLE
Accrued financing during construction: 5.00 %
Project lifetime: 15 yr
Capacity factor: 90.0 %
Project NPV: 520.01 MUSD
Project IRR: 21.00 %
Project VIR=PI=PIR: 2.08
Project MOIC: 1.88
Project Payback Period: 5.67 yr
Project Payback Period: 5.67 yr
Estimated Jobs Created: 226

***ENGINEERING PARAMETERS***

Number of Production Wells: 12
Number of Injection Wells: 12
Well depth: 2.6 kilometer
Water loss rate: 2.0
Water loss rate: 2.0 %
Pump efficiency: 80.0 %
Injection temperature: 56.2 degC
Production Wellbore heat transmission calculated with Ramey's model
Expand Down
16 changes: 8 additions & 8 deletions tests/examples/S-DAC-GT.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.7.23
Simulation Date: 2025-03-10
Simulation Time: 10:42
Calculation Time: 0.107 sec
GEOPHIRES Version: 3.9.7
Simulation Date: 2025-05-15
Simulation Time: 10:13
Calculation Time: 0.099 sec

***SUMMARY OF RESULTS***

Expand All @@ -25,23 +25,23 @@ Simulation Metadata

***ECONOMIC PARAMETERS***

Economic Model = BICYCLE
Accrued financing during construction: 0.00
Economic Model = BICYCLE
Accrued financing during construction: 0.00 %
Project lifetime: 30 yr
Capacity factor: 90.0 %
Project NPV: -82.17 MUSD
Project IRR: -5.86 %
Project VIR=PI=PIR: 0.20
Project MOIC: -0.30
Project Payback Period: N/A
Project Payback Period: N/A
CHP: Percent cost allocation for electrical plant: 92.25 %

***ENGINEERING PARAMETERS***

Number of Production Wells: 3
Number of Injection Wells: 3
Well depth: 3.1 kilometer
Water loss rate: 2.0
Water loss rate: 2.0 %
Pump efficiency: 80.0 %
Injection temperature: 70.0 degC
User-provided production well temperature drop
Expand Down
14 changes: 7 additions & 7 deletions tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.8.4
Simulation Date: 2025-03-19
Simulation Time: 10:30
Calculation Time: 1.614 sec
GEOPHIRES Version: 3.9.7
Simulation Date: 2025-05-15
Simulation Time: 09:22
Calculation Time: 1.580 sec

***SUMMARY OF RESULTS***

Expand All @@ -23,15 +23,15 @@ Simulation Metadata

***ECONOMIC PARAMETERS***

Economic Model = BICYCLE
Accrued financing during construction: 0.00
Economic Model = BICYCLE
Accrued financing during construction: 0.00 %
Project lifetime: 40 yr
Capacity factor: 90.0 %
Project NPV: -74.72 MUSD
Project IRR: 0.00 %
Project VIR=PI=PIR: -0.08
Project MOIC: -0.82
Project Payback Period: N/A
Project Payback Period: N/A
Estimated Jobs Created: 2

***ENGINEERING PARAMETERS***
Expand Down
Loading