Standardize from_input_string naming convention

Author: softwareengineerprogrammer

src/geophires_x/OptionList.py

@@ -31,14 +31,14 @@ class EndUseOptions(GeophiresInputEnum):
     COGENERATION_PARALLEL_EXTRA_ELECTRICITY = 52, "Cogeneration Parallel Cycle, Electricity sales considered as extra income"
 
     @staticmethod
-    def get_end_use_option_from_input_string(input_string:str):
+    def from_input_string(input_string:str):
         """
         :rtype: EndUseOptions
         """
 
-        for option in EndUseOptions:
-            if input_string == str(option.int_value):
-                return option
+        for member in __class__:
+            if input_string == str(member.int_value):
+                return member
 
         raise ValueError(f'Unknown End-Use Option input value: {input_string}')
 
@@ -61,14 +61,14 @@ class PlantType(GeophiresInputEnum):
     INDUSTRIAL = 9, "Industrial"
 
     @staticmethod
-    def get_plant_type_from_input_string(input_string:str):
+    def from_input_string(input_string:str):
         """
         :rtype: PlantType
         """
 
-        for type in PlantType:
-            if input_string == str(type.int_value):
-                return type
+        for member in __class__:
+            if input_string == str(member.int_value):
+                return member
 
         raise ValueError(f'Unknown Power Plant Type input value: {input_string}')
 

src/geophires_x/SurfacePlant.py

@@ -515,13 +515,13 @@ def read_parameters(self, model:Model) -> None:
 
                     # handle special cases
                     if ParameterToModify.Name == 'End-Use Option':
-                        end_use_option = EndUseOptions.get_end_use_option_from_input_string(ParameterReadIn.sValue)
+                        end_use_option = EndUseOptions.from_input_string(ParameterReadIn.sValue)
                         ParameterToModify.value = end_use_option
                         if end_use_option == EndUseOptions.HEAT:
                             self.plant_type.value = PlantType.INDUSTRIAL
 
                     elif ParameterToModify.Name == 'Power Plant Type':
-                        ParameterToModify.value = PlantType.get_plant_type_from_input_string(ParameterReadIn.sValue)
+                        ParameterToModify.value = PlantType.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]:

src/geophires_x/SurfacePlantAGS.py

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

tests/geophires_x_tests/test_options_list.py

@@ -6,10 +6,10 @@
 
 class EndUseOptionsTestCase(BaseTestCase):
     def test_get_end_use_option_from_input_string(self):
-        self.assertEqual(EndUseOptions.get_end_use_option_from_input_string('1'), EndUseOptions.ELECTRICITY)
+        self.assertEqual(EndUseOptions.from_input_string('1'), EndUseOptions.ELECTRICITY)
 
         with self.assertRaises(ValueError):
-            EndUseOptions.get_end_use_option_from_input_string('2034982309')
+            EndUseOptions.from_input_string('2034982309')
 
     def test_get_end_use_option_from_int_val(self):
         self.assertEqual(EndUseOptions.from_int(1), EndUseOptions.ELECTRICITY)