add SBT units and update ranges of existing parameters

Author: malcolm-dsider

src/geophires_x/Reservoir.py

@@ -50,7 +50,7 @@ def __init__(self, model: Model):
         self.resoption = self.ParameterDict[self.resoption.Name] = intParameter(
             "Reservoir Model",
             DefaultValue=ReservoirModel.ANNUAL_PERCENTAGE.int_value,
-            AllowableRange=[0, 1, 2, 3, 4, 5, 6, 7],
+            AllowableRange=[0, 1, 2, 3, 4, 5, 6, 7, 8],
             ValuesEnum=ReservoirModel,
             Required=True,
             ErrMessage="run default reservoir model (Thermal Drawdown Percentage Model)",

src/geophires_x/Units.py

@@ -19,6 +19,7 @@ class Units(IntEnum):
     NONE = auto()
     CHOICE = auto()
     LENGTH = auto()
+    ANGLE = auto()
     AREA = auto()
     VOLUME = auto()
     MASS = auto()
@@ -60,6 +61,13 @@ class Units(IntEnum):
     POWERPERUNITVOLUME = auto()
     DECAY_RATE=auto()
     INFLATION_RATE=auto()
+    DYNAMIC_VISCOSITY = auto()
+
+
+class AngleUnit(str, Enum):
+    """Temperature Units"""
+    DEGREES = "degrees"
+    RADIANS = "radians"
 
 
 class TemperatureUnit(str, Enum):
@@ -351,3 +359,8 @@ class Decay_RateUnit(str,Enum):
 class Inflation_RateUnit(str,Enum):
     """Decay rate Units"""
     KPASCALPERYEAR = "kPa/yr"
+
+
+class Dynamic_ViscosityUnit(str,Enum):
+    """Decay rate Units"""
+    PASCALSEC = "PaSec"

src/geophires_x/WellBores.py

@@ -889,7 +889,7 @@ def __init__(self, model: Model):
         self.Configuration = self.ParameterDict[self.Configuration.Name] = intParameter(
             "Closed-loop Configuration",
             DefaultValue=Configuration.VERTICAL.int_value,
-            AllowableRange=[1, 2, 3, 4],
+            AllowableRange=[1, 2, 3, 4, 5],
             ValuesEnum=Configuration,
             UnitType=Units.NONE,
             Required=True,
@@ -900,7 +900,7 @@ def __init__(self, model: Model):
         self.Configuration = self.ParameterDict[self.Configuration.Name] = intParameter(
             "Well Geometry Configuration",
             DefaultValue=Configuration.VERTICAL.int_value,
-            AllowableRange=[1, 2, 3, 4],
+            AllowableRange=[1, 2, 3, 4, 5],
             ValuesEnum=Configuration,
             UnitType=Units.NONE,
             Required=True,