Parse EndUseOptions from string in enum method

Author: softwareengineerprogrammer

src/geophires_x/OptionList.py

@@ -12,6 +12,32 @@ class EndUseOptions(str, Enum):
     COGENERATION_PARALLEL_EXTRA_HEAT = "Cogeneration Parallel Cycle, Heat sales considered as extra income"  # 51
     COGENERATION_PARALLEL_EXTRA_ELECTRICITY = "Cogeneration Parallel Cycle, Electricity sales considered as extra income"  # 52
 
+    @staticmethod
+    def get_end_use_option_from_input_string(input_string:str):
+        """
+        :rtype: EndUseOptions
+        """
+
+        if input_string == str(1):
+            return EndUseOptions.ELECTRICITY
+        elif input_string == str(2):
+            return EndUseOptions.HEAT
+            self.plant_type.value = PlantType.INDUSTRIAL
+        elif input_string == str(31):
+            return EndUseOptions.COGENERATION_TOPPING_EXTRA_HEAT
+        elif input_string == str(32):
+            return EndUseOptions.COGENERATION_TOPPING_EXTRA_ELECTRICITY
+        elif input_string == str(41):
+            return EndUseOptions.COGENERATION_BOTTOMING_EXTRA_HEAT
+        elif input_string == str(42):
+            return EndUseOptions.COGENERATION_BOTTOMING_EXTRA_ELECTRICITY
+        elif input_string == str(51):
+            return EndUseOptions.COGENERATION_PARALLEL_EXTRA_HEAT
+        elif input_string == str(52):
+            return EndUseOptions.COGENERATION_PARALLEL_EXTRA_ELECTRICITY
+
+        raise ValueError(f'Unknown End-Use Option value: {input_string}')
+
 
 class PlantType(str, Enum):
     SUB_CRITICAL_ORC = "Subcritical ORC" # 1

src/geophires_x/SurfacePlant.py

@@ -519,23 +519,10 @@ def read_parameters(self, model:Model) -> None:
 
                     # handle special cases
                     if ParameterToModify.Name == 'End-Use Option':
-                        if ParameterReadIn.sValue == str(1):
-                            ParameterToModify.value = EndUseOptions.ELECTRICITY
-                        elif ParameterReadIn.sValue == str(2):
-                            ParameterToModify.value = EndUseOptions.HEAT
+                        end_use_option = EndUseOptions.get_end_use_option_from_input_string(ParameterReadIn.sValue)
+                        ParameterToModify.value = end_use_option
+                        if end_use_option == EndUseOptions.HEAT:
                             self.plant_type.value = PlantType.INDUSTRIAL
-                        elif ParameterReadIn.sValue == str(31):
-                            ParameterToModify.value = EndUseOptions.COGENERATION_TOPPING_EXTRA_HEAT
-                        elif ParameterReadIn.sValue == str(32):
-                            ParameterToModify.value = EndUseOptions.COGENERATION_TOPPING_EXTRA_ELECTRICITY
-                        elif ParameterReadIn.sValue == str(41):
-                            ParameterToModify.value = EndUseOptions.COGENERATION_BOTTOMING_EXTRA_HEAT
-                        elif ParameterReadIn.sValue == str(42):
-                            ParameterToModify.value = EndUseOptions.COGENERATION_BOTTOMING_EXTRA_ELECTRICITY
-                        elif ParameterReadIn.sValue == str(51):
-                            ParameterToModify.value = EndUseOptions.COGENERATION_PARALLEL_EXTRA_HEAT
-                        elif ParameterReadIn.sValue == str(52):
-                            ParameterToModify.value = EndUseOptions.COGENERATION_PARALLEL_EXTRA_ELECTRICITY
 
                     elif ParameterToModify.Name == 'Power Plant Type':
                         if ParameterReadIn.sValue == str(1):

src/geophires_x/SurfacePlantAGS.py

@@ -298,10 +298,8 @@ def read_parameters(self, model: Model) -> None:
 
                     # handle special cases
                     if ParameterToModify.Name == "End-Use Option":
-                        if ParameterReadIn.sValue == '1':
-                            ParameterToModify.value = EndUseOptions.ELECTRICITY
-                        elif ParameterReadIn.sValue == '2':
-                            ParameterToModify.value = EndUseOptions.HEAT
+                        ParameterToModify.value = EndUseOptions.get_end_use_option_from_input_string(ParameterReadIn.sValue)
+
         else:
             model.logger.info("No parameters read because no content provided")