PlantType parsing in enum

Author: softwareengineerprogrammer

src/geophires_x/OptionList.py

@@ -53,6 +53,33 @@ class PlantType(str, Enum):
     RTES = "Reservoir Thermal Energy Storage"  # 8
     INDUSTRIAL = "Industrial"  # 9
 
+    @staticmethod
+    def get_plant_type_from_input_string(input_string:str):
+        """
+        :rtype: PlantType
+        """
+
+        if input_string == str(1):
+            return PlantType.SUB_CRITICAL_ORC
+        elif input_string == str(2):
+            return PlantType.SUPER_CRITICAL_ORC
+        elif input_string == str(3):
+            return PlantType.SINGLE_FLASH
+        elif input_string == str(4):
+            return PlantType.DOUBLE_FLASH
+        elif input_string == str(5):
+            return PlantType.ABSORPTION_CHILLER
+        elif input_string == str(6):
+            return PlantType.HEAT_PUMP
+        elif input_string == str(7):
+            return PlantType.DISTRICT_HEATING
+        elif input_string == str(8):
+            return PlantType.RTES
+        else:
+            return PlantType.INDUSTRIAL
+
+        raise ValueError(f'Unknown End-Use Option input value: {input_string}')
+
 
 class EconomicModel(str, Enum):
     CLGS = "Simple (CLGS)"

src/geophires_x/SurfacePlant.py

@@ -519,24 +519,7 @@ def read_parameters(self, model:Model) -> None:
                             self.plant_type.value = PlantType.INDUSTRIAL
 
                     elif ParameterToModify.Name == 'Power Plant Type':
-                        if ParameterReadIn.sValue == str(1):
-                            ParameterToModify.value = PlantType.SUB_CRITICAL_ORC
-                        elif ParameterReadIn.sValue == str(2):
-                            ParameterToModify.value = PlantType.SUPER_CRITICAL_ORC
-                        elif ParameterReadIn.sValue == str(3):
-                            ParameterToModify.value = PlantType.SINGLE_FLASH
-                        elif ParameterReadIn.sValue == str(4):
-                            ParameterToModify.value = PlantType.DOUBLE_FLASH
-                        elif ParameterReadIn.sValue == str(5):
-                            ParameterToModify.value = PlantType.ABSORPTION_CHILLER
-                        elif ParameterReadIn.sValue == str(6):
-                            ParameterToModify.value = PlantType.HEAT_PUMP
-                        elif ParameterReadIn.sValue == str(7):
-                            ParameterToModify.value = PlantType.DISTRICT_HEATING
-                        elif ParameterReadIn.sValue == str(8):
-                            ParameterToModify.value = PlantType.RTES
-                        else:
-                            ParameterToModify.value = PlantType.INDUSTRIAL
+                        ParameterToModify.value = PlantType.get_plant_type_from_input_string(ParameterReadIn.sValue)
                         if self.enduse_option.value == EndUseOptions.ELECTRICITY:
                             # simple single- or double-flash power plant assumes no production well pumping
                             if ParameterToModify.value in [PlantType.SINGLE_FLASH, PlantType.DOUBLE_FLASH]: