Merge pull request #72 from softwareengineerprogrammer/missing-percent-unit-fixes

Missing percent unit fixes [v3.9.8]

Author: softwareengineerprogrammer

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.9.7
+current_version = 3.9.8
 commit = True
 tag = True
 

.cookiecutterrc

@@ -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"

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.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

docs/conf.py

@@ -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']

setup.py

@@ -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(

src/geophires_x/Economics.py

@@ -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)"
         )

src/geophires_x/Outputs.py

@@ -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')
@@ -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:

src/geophires_x/Reservoir.py

@@ -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(

src/geophires_x/__init__.py

@@ -1 +1 @@
-__version__ = '3.9.7'
+__version__ = '3.9.8'

tests/example1_addons.csv

@@ -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
@@ -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
@@ -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,