Change numerical_input_value to semantically better int_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.int_value}: {it.value}' for it in WellDrillingCostCorrelation])
         )
 
         self.DoAddOnCalculations = self.ParameterDict[self.DoAddOnCalculations.Name] = boolParameter(

src/geophires_x/GeoPHIRESUtils.py

@@ -585,8 +585,8 @@ def get_entry(member) -> dict[str, Any]:
                     'value': member.value
                 }
 
-                if hasattr(member, 'numerical_input_value'):
-                    d['numerical_input_value'] = member.numerical_input_value
+                if hasattr(member, 'int_value'):
+                    d['int_value'] = member.int_value
 
                 return d
 

src/geophires_x/OptionList.py

@@ -17,8 +17,8 @@ def __new__(cls, *args, **kwds):
         obj._value_ = args[1]
         return obj
 
-    def __init__(self, numerical_input_value: int, _: str):
-        self.numerical_input_value = numerical_input_value
+    def __init__(self, int_value: int, _: str):
+        self.int_value = int_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.int_value):
                 return option
 
         raise ValueError(f'Unknown End-Use Option input value: {input_string}')
@@ -104,8 +104,8 @@ def __new__(cls, *args, **kwds):
         obj._value_ = args[1]
         return obj
 
-    def __init__(self, numerical_input_value: int, _: str, c2: float, c1: float, c0: float):
-        self.numerical_input_value = numerical_input_value
+    def __init__(self, int_value: int, _: str, c2: float, c1: float, c0: float):
+        self.int_value = int_value
         self._c2 = c2
         self._c1 = c1
         self._c0 = c0

src/geophires_x/SurfacePlant.py

@@ -238,7 +238,7 @@ def __init__(self, model: Model):
             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.int_value}: {it.value}' for it in EndUseOptions])
         )
         self.plant_type = self.ParameterDict[self.plant_type.Name] = intParameter(
             "Power Plant Type",

src/geophires_x_schema_generator/geophires-request.json

@@ -703,42 +703,42 @@
         {
           "name": "ELECTRICITY",
           "value": "Electricity",
-          "numerical_input_value": 1
+          "int_value": 1
         },
         {
           "name": "HEAT",
           "value": "Direct-Use Heat",
-          "numerical_input_value": 2
+          "int_value": 2
         },
         {
           "name": "COGENERATION_TOPPING_EXTRA_HEAT",
           "value": "Cogeneration Topping Cycle, Heat sales considered as extra income",
-          "numerical_input_value": 31
+          "int_value": 31
         },
         {
           "name": "COGENERATION_TOPPING_EXTRA_ELECTRICITY",
           "value": "Cogeneration Topping Cycle, Electricity sales considered as extra income",
-          "numerical_input_value": 32
+          "int_value": 32
         },
         {
           "name": "COGENERATION_BOTTOMING_EXTRA_HEAT",
           "value": "Cogeneration Bottoming Cycle, Heat sales considered as extra income",
-          "numerical_input_value": 41
+          "int_value": 41
         },
         {
           "name": "COGENERATION_BOTTOMING_EXTRA_ELECTRICITY",
           "value": "Cogeneration Bottoming Cycle, Electricity sales considered as extra income",
-          "numerical_input_value": 42
+          "int_value": 42
         },
         {
           "name": "COGENERATION_PARALLEL_EXTRA_HEAT",
           "value": "Cogeneration Parallel Cycle, Heat sales considered as extra income",
-          "numerical_input_value": 51
+          "int_value": 51
         },
         {
           "name": "COGENERATION_PARALLEL_EXTRA_ELECTRICITY",
           "value": "Cogeneration Parallel Cycle, Electricity sales considered as extra income",
-          "numerical_input_value": 52
+          "int_value": 52
         }
       ]
     },