WorkingFluid enum values

Author: softwareengineerprogrammer

src/geophires_x/OptionList.py

@@ -6,6 +6,8 @@
 class GeophiresInputEnum(str, Enum):
     """
     Input enums have a name, integer input value, and string value
+
+    TODO implement from_int/from_input_string here instead of child classes
     """
 
     def __new__(cls, *args, **kwds):
@@ -236,8 +238,22 @@ def from_input_string(input_string: str):
 
 
 
-class Configuration(str, Enum):
-    ULOOP = "utube"
-    COAXIAL = "coaxial"
-    VERTICAL = "vertical"
-    L = "L"
+class Configuration(GeophiresInputEnum):
+    ULOOP = 1, "utube"
+    COAXIAL = 2, "coaxial"
+    VERTICAL = 3, "vertical"
+    L = 4, "L"
+
+    @staticmethod
+    def from_int(int_val):
+        for member in __class__:
+            if member.int_value == int_val:
+                return member
+
+    @staticmethod
+    def from_input_string(input_string: str):
+        for member in __class__:
+            if input_string == str(member.int_value):
+                return member
+
+        raise ValueError(f'Unknown Configuration input value: {input_string}')

src/geophires_x/WellBores.py

@@ -888,20 +888,24 @@ def __init__(self, model: Model):
         # This is a alias for "Well Geometry Configuration" - putting it here for backwards compatibility
         self.Configuration = self.ParameterDict[self.Configuration.Name] = intParameter(
             "Closed-loop Configuration",
-            DefaultValue=Configuration.VERTICAL,
+            DefaultValue=Configuration.VERTICAL.int_value,
             AllowableRange=[1, 2, 3, 4],
+            ValuesEnum=Configuration,
             UnitType=Units.NONE,
             Required=True,
-            ErrMessage="assume simple vertical well (3)"
+            ErrMessage="assume simple vertical well (3)",
+            ToolTipText = '; '.join([f'{it.int_value}: {it.value}' for it in Configuration])
         )
         # This is a alias for "Closed-loop Configuration" - putting it here for backwards compatibility
         self.Configuration = self.ParameterDict[self.Configuration.Name] = intParameter(
             "Well Geometry Configuration",
-            DefaultValue=Configuration.VERTICAL,
+            DefaultValue=Configuration.VERTICAL.int_value,
             AllowableRange=[1, 2, 3, 4],
+            ValuesEnum=Configuration,
             UnitType=Units.NONE,
             Required=True,
-            ErrMessage="assume simple vertical well (3)"
+            ErrMessage="assume simple vertical well (3)",
+            ToolTipText='; '.join([f'{it.int_value}: {it.value}' for it in Configuration])
         )
 
         self.WaterThermalConductivity = self.ParameterDict[self.WaterThermalConductivity.Name] = floatParameter(
@@ -1169,16 +1173,7 @@ def read_parameters(self, model: Model) -> None:
                             self.usebuiltinppwellheadcorrelation = False
                     elif (ParameterToModify.Name == "Closed-loop Configuration" or
                           ParameterToModify.Name == "Well Geometry Configuration"):  # These two are alias of each other
-                        if ParameterReadIn.sValue == str(1):
-                            self.Configuration.value = Configuration.ULOOP
-                        elif ParameterReadIn.sValue == str(2):
-                            self.Configuration.value = Configuration.COAXIAL
-                        elif ParameterReadIn.sValue == str(3):
-                            self.Configuration.value = Configuration.VERTICAL
-                        elif ParameterReadIn.sValue == str(4):
-                            self.Configuration.value = Configuration.L
-                        else:
-                            raise ValueError(f'Invalid Configuration: {self.Configuration.value}')
+                        self.Configuration.value = Configuration.from_input_string(ParameterReadIn.sValue)
         else:
             model.logger.info("No parameters read because no content provided")
 

src/geophires_x_schema_generator/geophires-request.json

@@ -697,22 +697,66 @@
       "maximum": 1.8e+30
     },
     "Closed-loop Configuration": {
-      "description": "",
+      "description": "1: utube; 2: coaxial; 3: vertical; 4: L",
       "type": "integer",
       "units": null,
       "category": "Well Bores",
-      "default": "vertical",
+      "default": 3,
       "minimum": 1,
-      "maximum": 4
+      "maximum": 4,
+      "enum_values": [
+        {
+          "name": "ULOOP",
+          "value": "utube",
+          "int_value": 1
+        },
+        {
+          "name": "COAXIAL",
+          "value": "coaxial",
+          "int_value": 2
+        },
+        {
+          "name": "VERTICAL",
+          "value": "vertical",
+          "int_value": 3
+        },
+        {
+          "name": "L",
+          "value": "L",
+          "int_value": 4
+        }
+      ]
     },
     "Well Geometry Configuration": {
-      "description": "",
+      "description": "1: utube; 2: coaxial; 3: vertical; 4: L",
       "type": "integer",
       "units": null,
       "category": "Well Bores",
-      "default": "vertical",
+      "default": 3,
       "minimum": 1,
-      "maximum": 4
+      "maximum": 4,
+      "enum_values": [
+        {
+          "name": "ULOOP",
+          "value": "utube",
+          "int_value": 1
+        },
+        {
+          "name": "COAXIAL",
+          "value": "coaxial",
+          "int_value": 2
+        },
+        {
+          "name": "VERTICAL",
+          "value": "vertical",
+          "int_value": 3
+        },
+        {
+          "name": "L",
+          "value": "L",
+          "int_value": 4
+        }
+      ]
     },
     "Water Thermal Conductivity": {
       "description": "Water Thermal Conductivity",