WellDrillingCostCorrelation default value fix

Author: softwareengineerprogrammer

src/geophires_x/Economics.py

@@ -991,7 +991,7 @@ def __init__(self, model: Model):
         )
         self.wellcorrelation = self.ParameterDict[self.wellcorrelation.Name] = intParameter(
             "Well Drilling Cost Correlation",
-            DefaultValue=WellDrillingCostCorrelation.VERTICAL_LARGE_INT1,
+            DefaultValue=WellDrillingCostCorrelation.VERTICAL_LARGE_INT1.int_value,
             AllowableRange=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17],
             ValuesEnum=WellDrillingCostCorrelation,
             UnitType=Units.NONE,

src/geophires_x/OptionList.py

@@ -195,6 +195,12 @@ def from_input_string(input_string: str):
 
         raise ValueError(f'Unknown Well Drilling Cost Correlation input value: {input_string}')
 
+    @staticmethod
+    def from_int(int_val):
+        for member in __class__:
+            if member.int_value == int_val:
+                return member
+
 
 class FractureShape(GeophiresInputEnum):
     CIRCULAR_AREA = 1, "Circular fracture with known area"

src/geophires_x/SUTRAEconomics.py

@@ -136,28 +136,13 @@ def __init__(self, model: Model):
         )
         self.wellcorrelation = self.ParameterDict[self.wellcorrelation.Name] = intParameter(
             "Well Drilling Cost Correlation",
-            DefaultValue=WellDrillingCostCorrelation.VERTICAL_LARGE_INT1,
-            AllowableRange=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17],  # Range updated to include all options
+            DefaultValue=WellDrillingCostCorrelation.VERTICAL_LARGE_INT1.int_value,
+            AllowableRange=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17],
+            ValuesEnum=WellDrillingCostCorrelation,
             UnitType=Units.NONE,
             ErrMessage="assume default well drilling cost correlation (10)",
-            ToolTipText="""Select the built-in well drilling and completion cost correlation:
-1. vertical small diameter, baseline;
-2. deviated small diameter, baseline;
-3. vertical large diameter, baseline;
-4. deviated large diameter, baseline;
-5. Simple;
-6. vertical small diameter, intermediate1;
-7. vertical small diameter, intermediate2;
-8. deviated small diameter, intermediate1;
-9. deviated small diameter, intermediate2;
-10. vertical large diameter, intermediate1;
-11. vertical large diameter, intermediate2;
-12. deviated large diameter, intermediate1;
-13. deviated large diameter, intermediate2;
-14. vertical open-hole, small diameter, ideal;
-15. deviated liner, small diameter, ideal;
-16. vertical open-hole, large diameter, ideal;
-17. deviated liner, large diameter, ideal;"""
+            ToolTipText="Select the built-in well drilling and completion cost correlation: " +
+                        '; '.join([f'{it.int_value}: {it.value}' for it in WellDrillingCostCorrelation])
         )
 
         self.timestepsperyear = self.ParameterDict[self.timestepsperyear.Name] = intParameter(

src/geophires_x_schema_generator/geophires-request.json

@@ -1426,7 +1426,7 @@
       "type": "integer",
       "units": null,
       "category": "Economics",
-      "default": "",
+      "default": 10,
       "minimum": 1,
       "maximum": 17,
       "enum_values": [