FractureShape values enum

Author: softwareengineerprogrammer

src/geophires_x/OptionList.py

@@ -129,9 +129,9 @@ def from_int(int_val):
 
     @staticmethod
     def from_input_string(input_string:str):
-        for res_vol in ReservoirVolume:
-            if input_string == str(res_vol.int_value):
-                return res_vol
+        for member in __class__:
+            if input_string == str(member.int_value):
+                return member
 
         raise ValueError(f'Unknown Reservoir Volume input value: {input_string}')
 
@@ -172,12 +172,25 @@ def calculate_cost_MUSD(self, meters) -> float:
         return (self._c2 * meters ** 2 + self._c1 * meters + self._c0) * 1E-6
 
 
-class FractureShape(str, Enum):
-    CIRCULAR_AREA = "Circular fracture with known area"
-    CIRCULAR_DIAMETER = "Circular fracture with known diameter"
-    SQUARE = "Square"
-    RECTANGULAR = "Rectangular"
+class FractureShape(GeophiresInputEnum):
+    CIRCULAR_AREA = 1, "Circular fracture with known area"
+    CIRCULAR_DIAMETER = 2, "Circular fracture with known diameter"
+    SQUARE = 3, "Square"
+    RECTANGULAR = 4, "Rectangular"
+
+    @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 Fracture Shape input value: {input_string}')
 
 class WorkingFluid(str, Enum):
     WATER = "water"

src/geophires_x/Reservoir.py

@@ -241,13 +241,13 @@ def __init__(self, model: Model):
 
         self.fracshape = self.ParameterDict[self.fracshape.Name] = intParameter(
             "Fracture Shape",
-            DefaultValue=FractureShape.CIRCULAR_AREA,
+            DefaultValue=FractureShape.CIRCULAR_AREA.int_value,
             AllowableRange=[1, 2, 3, 4],
+            ValuesEnum=FractureShape,
             UnitType=Units.NONE,
             ErrMessage="assume default fracture shape (1)",
-            ToolTipText="Specifies the shape of the (identical) fractures in a fracture-based reservoir: \
-            1: Circular fracture with known area, 2: Circular fracture with known diameter, \
-            3: Square fracture, 4: Rectangular fracture"
+            ToolTipText="Specifies the shape of the (identical) fractures in a fracture-based reservoir: " +
+                        '; '.join([f'{it.int_value}: {it.value}' for it in FractureShape])
         )
 
         self.fracarea = self.ParameterDict[self.fracarea.Name] = floatParameter(

src/geophires_x_schema_generator/geophires-request.json

@@ -252,13 +252,35 @@
       ]
     },
     "Fracture Shape": {
-      "description": "Specifies the shape of the (identical) fractures in a fracture-based reservoir:             1: Circular fracture with known area, 2: Circular fracture with known diameter,             3: Square fracture, 4: Rectangular fracture",
+      "description": "Specifies the shape of the (identical) fractures in a fracture-based reservoir: 1: Circular fracture with known area; 2: Circular fracture with known diameter; 3: Square; 4: Rectangular",
       "type": "integer",
       "units": null,
       "category": "Reservoir",
-      "default": "Circular fracture with known area",
+      "default": 1,
       "minimum": 1,
-      "maximum": 4
+      "maximum": 4,
+      "enum_values": [
+        {
+          "name": "CIRCULAR_AREA",
+          "value": "Circular fracture with known area",
+          "int_value": 1
+        },
+        {
+          "name": "CIRCULAR_DIAMETER",
+          "value": "Circular fracture with known diameter",
+          "int_value": 2
+        },
+        {
+          "name": "SQUARE",
+          "value": "Square",
+          "int_value": 3
+        },
+        {
+          "name": "RECTANGULAR",
+          "value": "Rectangular",
+          "int_value": 4
+        }
+      ]
     },
     "Fracture Area": {
       "description": "Effective heat transfer area per fracture",