Migrate input string parsing to ReservoirModel

Author: softwareengineerprogrammer

src/geophires_x/OptionList.py

@@ -65,6 +65,39 @@ class ReservoirModel(str, Enum):
     TOUGH2_SIMULATOR = "TOUGH2 Simulator"
     SUTRA = "SUTRA"
 
+    @staticmethod
+    def get_reservoir_model_from_input_string(input_string:str):
+        """
+        :rtype: ReservoirModel
+        """
+
+        if input_string == '0':
+            # Simply Cylindrical Model
+            return ReservoirModel.CYLINDRICAL
+        elif input_string == '1':
+            # Multiple parallel fractures model (LANL)
+            return ReservoirModel.MULTIPLE_PARALLEL_FRACTURES
+        elif input_string == '2':
+            # Volumetric block model (1D linear heat sweep model (Stanford))
+            return ReservoirModel.LINEAR_HEAT_SWEEP
+        elif input_string == '3':
+            # Drawdown parameter model (Tester)
+            return ReservoirModel.SINGLE_FRACTURE
+        elif input_string == '4':
+            # Thermal drawdown percentage model (GETEM)
+            return ReservoirModel.ANNUAL_PERCENTAGE
+        elif input_string == '5':
+            # Generic user-provided temperature profile
+            return ReservoirModel.USER_PROVIDED_PROFILE
+        elif input_string == '6':
+            # TOUGH2 is called
+            return ReservoirModel.TOUGH2_SIMULATOR
+        elif input_string == '7':
+            # SUTRA Simulator
+            return ReservoirModel.SUTRA
+
+        raise ValueError(f'Unknown Reservoir Model input value: {input_string}')
+
 
 class ReservoirVolume(str, Enum):
     FRAC_NUM_SEP = "Specify number of fractures and fracture separation"

src/geophires_x/Reservoir.py

@@ -558,30 +558,8 @@ def read_parameters(self, model: Model) -> None:
 
                     # handle special cases
                     if ParameterToModify.Name == "Reservoir Model":
-                        if ParameterReadIn.sValue == '0':
-                            # Simply Cylindrical Model
-                            ParameterToModify.value = ReservoirModel.CYLINDRICAL
-                        elif ParameterReadIn.sValue == '1':
-                            # Multiple parallel fractures model (LANL)
-                            ParameterToModify.value = ReservoirModel.MULTIPLE_PARALLEL_FRACTURES
-                        elif ParameterReadIn.sValue == '2':
-                            # Volumetric block model (1D linear heat sweep model (Stanford))
-                            ParameterToModify.value = ReservoirModel.LINEAR_HEAT_SWEEP
-                        elif ParameterReadIn.sValue == '3':
-                            # Drawdown parameter model (Tester)
-                            ParameterToModify.value = ReservoirModel.SINGLE_FRACTURE
-                        elif ParameterReadIn.sValue == '4':
-                            # Thermal drawdown percentage model (GETEM)
-                            ParameterToModify.value = ReservoirModel.ANNUAL_PERCENTAGE
-                        elif ParameterReadIn.sValue == '5':
-                            # Generic user-provided temperature profile
-                            ParameterToModify.value = ReservoirModel.USER_PROVIDED_PROFILE
-                        elif ParameterReadIn.sValue == '6':
-                            # TOUGH2 is called
-                            ParameterToModify.value = ReservoirModel.TOUGH2_SIMULATOR
-                        elif ParameterReadIn.sValue == '7':
-                            # SUTRA Simulator
-                            ParameterToModify.value = ReservoirModel.SUTRA
+                        ParameterToModify.value = ReservoirModel.get_reservoir_model_from_input_string(
+                            ParameterReadIn.sValue)
 
                     elif ParameterToModify.Name == 'Reservoir Depth':
                         # FIXME TODO only convert if current units are km