ReservoirVolume values enum

Author: softwareengineerprogrammer

src/geophires_x/OptionList.py

@@ -115,11 +115,25 @@ def from_int(int_val):
                 return member
 
 
-class ReservoirVolume(str, Enum):
-    FRAC_NUM_SEP = "Specify number of fractures and fracture separation"
-    RES_VOL_FRAC_SEP = "Specify reservoir volume and fracture separation"
-    RES_VOL_FRAC_NUM = "Specify reservoir volume and number of fractures"
-    RES_VOL_ONLY = "Specify reservoir volume only"
+class ReservoirVolume(GeophiresInputEnum):
+    FRAC_NUM_SEP = 1, "Specify number of fractures and fracture separation"
+    RES_VOL_FRAC_SEP = 2, "Specify reservoir volume and fracture separation"
+    RES_VOL_FRAC_NUM = 3, "Specify reservoir volume and number of fractures"
+    RES_VOL_ONLY = 4, "Specify reservoir volume only"
+
+    @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 res_vol in ReservoirVolume:
+            if input_string == str(res_vol.int_value):
+                return res_vol
+
+        raise ValueError(f'Unknown Reservoir Volume input value: {input_string}')
 
 
 class WellDrillingCostCorrelation(GeophiresInputEnum):

src/geophires_x/Reservoir.py

@@ -223,8 +223,9 @@ def __init__(self, model: Model):
 
         self.resvoloption = self.ParameterDict[self.resvoloption.Name] = intParameter(
             "Reservoir Volume Option",
-            DefaultValue=ReservoirVolume.RES_VOL_FRAC_NUM,
+            DefaultValue=ReservoirVolume.RES_VOL_FRAC_NUM.int_value,
             AllowableRange=[1, 2, 3, 4],
+            ValuesEnum=ReservoirVolume,
             Required=True,
             UnitType=Units.NONE,
             ErrMessage="assume default reservoir volume option",
@@ -567,14 +568,7 @@ def read_parameters(self, model: Model) -> None:
                         ParameterToModify.CurrentUnits = LengthUnit.METERS
 
                     elif ParameterToModify.Name == "Reservoir Volume Option":
-                        if ParameterReadIn.sValue == '1':
-                            ParameterToModify.value = ReservoirVolume.FRAC_NUM_SEP
-                        elif ParameterReadIn.sValue == '2':
-                            ParameterToModify.value = ReservoirVolume.RES_VOL_FRAC_SEP
-                        elif ParameterReadIn.sValue == '3':
-                            ParameterToModify.value = ReservoirVolume.RES_VOL_FRAC_NUM
-                        else:
-                            ParameterToModify.value = ReservoirVolume.RES_VOL_ONLY
+                        ParameterToModify.value = ReservoirVolume.from_input_string(ParameterReadIn.sValue)
 
                         if ParameterToModify.value == ReservoirVolume.RES_VOL_ONLY and ParameterToModify.value in [
                             ReservoirModel.MULTIPLE_PARALLEL_FRACTURES, ReservoirModel.LINEAR_HEAT_SWEEP]:

src/geophires_x_schema_generator/geophires-request.json

@@ -225,9 +225,31 @@
       "type": "integer",
       "units": null,
       "category": "Reservoir",
-      "default": "Specify reservoir volume and number of fractures",
+      "default": 3,
       "minimum": 1,
-      "maximum": 4
+      "maximum": 4,
+      "enum_values": [
+        {
+          "name": "FRAC_NUM_SEP",
+          "value": "Specify number of fractures and fracture separation",
+          "int_value": 1
+        },
+        {
+          "name": "RES_VOL_FRAC_SEP",
+          "value": "Specify reservoir volume and fracture separation",
+          "int_value": 2
+        },
+        {
+          "name": "RES_VOL_FRAC_NUM",
+          "value": "Specify reservoir volume and number of fractures",
+          "int_value": 3
+        },
+        {
+          "name": "RES_VOL_ONLY",
+          "value": "Specify reservoir volume only",
+          "int_value": 4
+        }
+      ]
     },
     "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",