use convertible_unit in conversions

Author: softwareengineerprogrammer

src/geophires_x/Economics.py

@@ -1383,7 +1383,7 @@ def __init__(self, model: Model):
         )
 
         fir_default_unit = PercentUnit.PERCENT
-        fir_default_val = self.discountrate.quantity().to('percent').magnitude  # pint can't handle '%' in python 3.8
+        fir_default_val = self.discountrate.quantity().to(convertible_unit(fir_default_unit)).magnitude  # pint can't handle '%' in python 3.8
         self.FixedInternalRate = self.ParameterDict[self.FixedInternalRate.Name] = floatParameter(
             "Fixed Internal Rate",
             DefaultValue=fir_default_val,

src/geophires_x/GeoPHIRESUtils.py

@@ -18,7 +18,7 @@
 import CoolProp.CoolProp as CP
 
 from geophires_x.Parameter import ParameterEntry, Parameter
-from geophires_x.Units import get_unit_registry
+from geophires_x.Units import get_unit_registry, convertible_unit
 
 _logger = logging.getLogger('root')  # TODO use __name__ instead of root
 
@@ -224,7 +224,7 @@ def quantity(value: float, unit: str) -> PlainQuantity:
     :rtype: pint.registry.Quantity - note type annotation uses PlainQuantity due to issues with python 3.8 failing
         to import the Quantity TypeAlias
     """
-    return _ureg.Quantity(value, unit)
+    return _ureg.Quantity(value, convertible_unit(unit))
 
 
 @lru_cache

src/geophires_x/Parameter.py

@@ -76,7 +76,7 @@ def UnitsMatch(self) -> str:
 
     def with_preferred_units(self) -> Any:  # Any is a proxy for Self
         ret: OutputParameter = dataclasses.replace(self)
-        ret.value = ret.quantity().to(ret.PreferredUnits).magnitude
+        ret.value = ret.quantity().to(convertible_unit(ret.PreferredUnits)).magnitude
         ret.CurrentUnits = ret.PreferredUnits
         return ret
 
@@ -609,7 +609,7 @@ def ConvertUnitsBack(ParamToModify: Parameter, model):
     model.logger.info(f'Init {str(__name__)}: {sys._getframe().f_code.co_name} for {ParamToModify.Name}')
 
     try:
-        ParamToModify.value = _ureg.Quantity(ParamToModify.value, ParamToModify.CurrentUnits.value).to(ParamToModify.PreferredUnits.value).magnitude
+        ParamToModify.value = _ureg.Quantity(ParamToModify.value, convertible_unit(ParamToModify.CurrentUnits)).to(convertible_unit(ParamToModify.PreferredUnits)).magnitude
         ParamToModify.CurrentUnits = ParamToModify.PreferredUnits
     except AttributeError as ae:
         # TODO refactor to check for/convert currency instead of relying on try/except once currency conversion is
@@ -848,7 +848,7 @@ def ConvertOutputUnits(oparam: OutputParameter, newUnit: Units, model):
     """
 
     try:
-        oparam.value = _ureg.Quantity(oparam.value, oparam.CurrentUnits.value).to(newUnit.value).magnitude
+        oparam.value = _ureg.Quantity(oparam.value, oparam.CurrentUnits.value).to(convertible_unit(newUnit.value)).magnitude
         oparam.CurrentUnits = newUnit
         return
     except AttributeError as ae:

src/geophires_x/Units.py

@@ -15,6 +15,13 @@ def get_unit_registry():
 
     return _UREG
 
+
+def convertible_unit(u:str) -> str:
+    if u == Units.PERCENT or u == Units.PERCENT.value:
+        return 'percent'
+
+    return u
+
 class Units(IntEnum):
     """All possible systems of measure"""
     NONE = auto()