Unprotect numerical_input_value

Author: softwareengineerprogrammer

src/geophires_x/Economics.py

@@ -994,7 +994,7 @@ def __init__(self, model: Model):
             UnitType=Units.NONE,
             ErrMessage="assume default well drilling cost correlation (10)",
             ToolTipText="Select the built-in well drilling and completion cost correlation: " +
-                        '; '.join([f'{it._numerical_input_value}: {it.value}' for it in WellDrillingCostCorrelation])
+                        '; '.join([f'{it.numerical_input_value}: {it.value}' for it in WellDrillingCostCorrelation])
         )
 
         self.DoAddOnCalculations = self.ParameterDict[self.DoAddOnCalculations.Name] = boolParameter(

src/geophires_x/OptionList.py

@@ -18,7 +18,7 @@ def __new__(cls, *args, **kwds):
         return obj
 
     def __init__(self, numerical_input_value: int, _: str):
-        self._numerical_input_value = numerical_input_value
+        self.numerical_input_value = numerical_input_value
 
     def __eq__(self, other):
         return str(self) == str(other)
@@ -30,7 +30,7 @@ def get_end_use_option_from_input_string(input_string:str):
         """
 
         for option in EndUseOptions:
-            if input_string == str(option._numerical_input_value):
+            if input_string == str(option.numerical_input_value):
                 return option
 
         raise ValueError(f'Unknown End-Use Option input value: {input_string}')
@@ -105,7 +105,7 @@ def __new__(cls, *args, **kwds):
         return obj
 
     def __init__(self, numerical_input_value: int, _: str, c2: float, c1: float, c0: float):
-        self._numerical_input_value = numerical_input_value
+        self.numerical_input_value = numerical_input_value
         self._c2 = c2
         self._c1 = c1
         self._c0 = c0

src/geophires_x/SurfacePlant.py

@@ -234,10 +234,11 @@ def __init__(self, model: Model):
             "End-Use Option",
             value=EndUseOptions.ELECTRICITY,
             AllowableRange=[1, 2, 31, 32, 41, 42, 51, 52],
+            values_enum=EndUseOptions,
             UnitType=Units.NONE,
             ErrMessage="assume default end-use option (1: electricity only)",
             ToolTipText="Select the end-use application of the geofluid heat: " +
-                        '; '.join([f'{it._numerical_input_value}: {it.value}' for it in EndUseOptions])
+                        '; '.join([f'{it.numerical_input_value}: {it.value}' for it in EndUseOptions])
         )
         self.plant_type = self.ParameterDict[self.plant_type.Name] = intParameter(
             "Power Plant Type",