Merge pull request NREL#157 from softwareengineerprogrammer/main

Output unit standardization, remove redundant value declarations
malcolm-dsider · Mar 11, 2024 · 07e7eaa · 07e7eaa
2 parents 41793df + dc7ee91
commit 07e7eaa
Show file tree

Hide file tree

Showing 53 changed files with 70 additions and 211 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.4.20
+current_version = 3.4.21
 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.4.20
+    version: 3.4.21
     version_manager: "bump2version"
     website: "https://github.com/NREL"
     year_from: "2023"

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

diff --git a/docs/conf.py b/docs/conf.py
@@ -18,7 +18,7 @@
 year = '2023'
 author = 'NREL'
 copyright = f'{year}, {author}'
-version = release = '3.4.20'
+version = release = '3.4.21'
 
 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.4.20',
+    version='3.4.21',
     license='MIT',
     description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
     long_description='{}\n{}'.format(

diff --git a/src/geophires_x/AGSEconomics.py b/src/geophires_x/AGSEconomics.py
@@ -53,7 +53,6 @@ def __init__(self, model: Model):
 
         self.O_and_M_cost_plant = self.ParameterDict[self.O_and_M_cost_plant.Name] = floatParameter(
             "Operation & Maintenance Cost of Surface Plant",
-            value=0.015,
             DefaultValue=0.015,
             Min=0.0,
             Max=0.2,
@@ -66,7 +65,6 @@ def __init__(self, model: Model):
         self.Direct_use_heat_cost_per_kWth = self.ParameterDict[
             self.Direct_use_heat_cost_per_kWth.Name] = floatParameter(
             "Capital Cost for Surface Plant for Direct-use System",
-            value=100.0,
             DefaultValue=100.0,
             Min=0.0,
             Max=10000.0,
@@ -77,7 +75,7 @@ def __init__(self, model: Model):
             ErrMessage="assume default Capital cost for surface plant for direct-use system (100 $/kWth)"
         )
         self.Power_plant_cost_per_kWe = self.ParameterDict[self.Power_plant_cost_per_kWe.Name] = floatParameter(
-            "Capital Cost for Power Plant for Electricity Generation", value=3000.0,
+            "Capital Cost for Power Plant for Electricity Generation",
             DefaultValue=3000.0,
             Min=0.0,
             Max=10000.0,

diff --git a/src/geophires_x/AGSWellBores.py b/src/geophires_x/AGSWellBores.py
@@ -517,7 +517,6 @@ def __init__(self, model: Model):
 
         self.Fluid = self.ParameterDict[self.Fluid.Name] = intParameter(
             "Heat Transfer Fluid",
-            value=WorkingFluid.WATER,
             DefaultValue=WorkingFluid.WATER,
             AllowableRange=[1, 2],
             UnitType=Units.NONE,
@@ -526,7 +525,6 @@ def __init__(self, model: Model):
         )
         self.Configuration = self.ParameterDict[self.Configuration.Name] = intParameter(
             "Closed-loop Configuration",
-            value=Configuration.COAXIAL,
             DefaultValue=Configuration.COAXIAL,
             AllowableRange=[1, 2],
             UnitType=Units.NONE,
@@ -537,7 +535,6 @@ def __init__(self, model: Model):
         # Input data for subsurface condition
         self.Nonvertical_length = self.ParameterDict[self.Nonvertical_length.Name] = floatParameter(
             "Total Nonvertical Length",
-            value=1000.0,
             DefaultValue=1000.0,
             Min=1000.0,
             Max=20000.0,
@@ -550,7 +547,6 @@ def __init__(self, model: Model):
 
         self.WaterThermalConductivity = self.ParameterDict[self.WaterThermalConductivity.Name] = floatParameter(
             "Water Thermal Conductivity",
-            value=0.6,
             DefaultValue=0.6,
             Min=0.0,
             Max=100.0,
@@ -563,7 +559,6 @@ def __init__(self, model: Model):
 
         self.nonverticalwellborediameter = self.ParameterDict[self.nonverticalwellborediameter.Name] = floatParameter(
             "Nonvertical Wellbore Diameter",
-            value=0.156,
             DefaultValue=0.156,
             Min=0.01,
             Max=100.0,
@@ -575,7 +570,6 @@ def __init__(self, model: Model):
         )
         self.numnonverticalsections = self.ParameterDict[self.numnonverticalsections.Name] = intParameter(
             "Number of Multilateral Sections",
-            value=1,
             DefaultValue=1,
             AllowableRange=list(range(0, 101, 1)),
             UnitType=Units.NONE,
@@ -584,7 +578,6 @@ def __init__(self, model: Model):
         )
         self.time_operation = self.ParameterDict[self.time_operation.Name] = floatParameter(
             "Closed Loop Calculation Start Year",
-            value=0.01,
             DefaultValue=0.01,
             Min=0.01,
             Max=100.0,
@@ -596,7 +589,6 @@ def __init__(self, model: Model):
         )
         self.NonverticalsCased = self.ParameterDict[self.NonverticalsCased.Name] = boolParameter(
             "Multilaterals Cased",
-            value=False,
             DefaultValue=False,
             Required=False,
             Provided=False,

diff --git a/src/geophires_x/CylindricalReservoir.py b/src/geophires_x/CylindricalReservoir.py
@@ -43,7 +43,6 @@ def __init__(self, model: Model):
 
         self.InputDepth = self.ParameterDict[self.InputDepth.Name] = floatParameter(
             "Cylindrical Reservoir Input Depth",
-            value=3.0,
             DefaultValue=3.0,
             Min=0.1,
             Max=15,
@@ -57,7 +56,6 @@ def __init__(self, model: Model):
 
         self.OutputDepth = self.ParameterDict[self.OutputDepth.Name] = floatParameter(
             "Cylindrical Reservoir Output Depth",
-            value=self.InputDepth.value,
             DefaultValue=self.InputDepth.value,
             Min=0.1,
             Max=15,
@@ -70,7 +68,6 @@ def __init__(self, model: Model):
         )
         self.Length = self.ParameterDict[self.Length.Name] = floatParameter(
             "Cylindrical Reservoir Length",
-            value=4.0,
             DefaultValue=4.0,
             Min=0.1,
             Max=10.0,
@@ -83,7 +80,6 @@ def __init__(self, model: Model):
         )
         self.RadiusOfEffect = self.ParameterDict[self.RadiusOfEffect.Name] = floatParameter(
             "Cylindrical Reservoir Radius of Effect",
-            value=30.0,
             DefaultValue=30.0,
             Min=0,
             Max=1000.0,
@@ -96,7 +92,6 @@ def __init__(self, model: Model):
         )
         self.RadiusOfEffectFactor = self.ParameterDict[self.RadiusOfEffectFactor.Name] = floatParameter(
             "Cylindrical Reservoir Radius of Effect Factor",
-            value=1.0,
             DefaultValue=1.0,
             Min=0.0,
             Max=10.0,
@@ -114,7 +109,6 @@ def __init__(self, model: Model):
         # internal values required for calculations
         self.depth = self.ParameterDict[self.depth.Name] = floatParameter(
             "Drilled length",
-            value=0.0,
             DefaultValue=0.0,
             Min=0.0,
             Max=150,
@@ -127,7 +121,6 @@ def __init__(self, model: Model):
         )
         self.waterloss = self.ParameterDict[self.waterloss.Name] = floatParameter(
             "Water Loss Fraction",
-            value=0.0,
             DefaultValue=0.0,
             Min=0.0,
             Max=0.99,