handle acre unit in HIP-RA-X

Author: softwareengineerprogrammer

src/geophires_x/Parameter.py

@@ -14,6 +14,7 @@
 
 from abc import ABC
 
+from pint import UndefinedUnitError
 from pint.facets.plain import PlainQuantity
 
 from geophires_x.OptionList import GeophiresInputEnum
@@ -947,8 +948,13 @@ def LookupUnits(sUnitText: str):
                     return item, uType
 
     # No match was found with the unit text string, so try with the canonical symbol (if different).
-    symbol = _ureg.get_symbol(sUnitText)
-    if symbol != sUnitText: return LookupUnits(symbol)
+    try:
+        symbol = _ureg.get_symbol(sUnitText)
+        if symbol != sUnitText:
+            return LookupUnits(symbol)
+    except UndefinedUnitError as _uue:
+        return sUnitText, uType
+
     return None, None
 
 

src/geophires_x/Units.py

@@ -135,6 +135,7 @@ class AreaUnit(str, Enum):
     FEET2 = "ft**2"
     INCHES2 = "in**2"
     MILES2 = "mi**2"
+    ACRES = 'acre'
 
 
 class VolumeUnit(str, Enum):

tests/hip_ra_x_tests/hip-ra-x-area-acres.txt

@@ -0,0 +1,6 @@
+Reservoir Temperature, 212.5
+Rejection Temperature, 60.0
+Reservoir Porosity, 10.0
+Reservoir Area, 109930 acre
+Reservoir Thickness, 0.25
+Reservoir Life Cycle, 25

tests/hip_ra_x_tests/test_hip_ra_x.py

@@ -474,7 +474,16 @@ def test_hip_ra_input_parameters_init(self):
         with self.assertRaises(ValueError):
             HipRaInputParameters(1)
 
-    def _new_hip_ra_test_instance(self, enable_hip_ra_logging_config=False, pre_re_stash_runner=None) -> HIP_RA_X:
+    def test_area_acre(self):
+        result: HipRaResult = HipRaXClient().get_hip_ra_x_result(
+            HipRaInputParameters(self._get_test_file_path('hip-ra-x-area-acres.txt'))
+        )
+
+        self.assertEqual('km**2', result.result['SUMMARY OF INPUTS']['Reservoir Area']['unit'])
+        self.assertAlmostEqual(444.9, result.result['SUMMARY OF INPUTS']['Reservoir Area']['value'], places=1)
+
+    @staticmethod
+    def _new_hip_ra_test_instance(enable_hip_ra_logging_config=False, pre_re_stash_runner=None) -> HIP_RA_X:
         stash_cwd = Path.cwd()
         stash_sys_argv = sys.argv