Convert efficiency into its CurrentUnits instead of hardcoding tenth to percent multiplication

Author: softwareengineerprogrammer

src/geophires_x/Outputs.py

@@ -23,7 +23,6 @@
     PlantType
 from geophires_x.GeoPHIRESUtils import UpgradeSymbologyOfUnits, render_default, InsertImagesIntoHTML
 from geophires_x.Parameter import Parameter
-from geophires_x.Units import convertible_unit, Units, PercentUnit
 
 NL = '\n'
 validFilenameChars = "-_.() %s%s" % (string.ascii_letters, string.digits)

src/geophires_x/SurfacePlant.py

@@ -2,6 +2,7 @@
 import os
 import numpy as np
 
+from .GeoPHIRESUtils import quantity
 from .OptionList import EndUseOptions, PlantType
 from .Parameter import floatParameter, intParameter, strParameter, OutputParameter, ReadParameter, \
     coerce_int_params_to_enum_values
@@ -486,7 +487,7 @@ def __init__(self, model: Model):
             Name="First Law Efficiency",
             UnitType=Units.PERCENT,
             PreferredUnits=PercentUnit.PERCENT,
-            CurrentUnits=PercentUnit.PERCENT,
+            CurrentUnits=PercentUnit.PERCENT,  # FIXME default values are actually in tenths, not percent.
             ToolTipText='Net electricity produced divided by heat extracted towards electricity'
         )
         self.heat_to_power_conversion_efficiency = self.OutputParameterDict[self.heat_to_power_conversion_efficiency.Name] = OutputParameter(
@@ -657,6 +658,8 @@ def _calculate_derived_outputs(self, model: Model) -> None:
         """
 
         if self.FirstLawEfficiency is not None:
-            avg_efficiency = np.average(model.surfaceplant.FirstLawEfficiency.value) * 100  # TODO proper unit conversion
+            fle_unit = PercentUnit.TENTH  # See FIXME on self.FirstLawEfficiency re: CurrentUnit being incorrect.
+            avg_efficiency = quantity(np.average(model.surfaceplant.FirstLawEfficiency.value), fle_unit).to(
+                convertible_unit(self.heat_to_power_conversion_efficiency.CurrentUnits)).magnitude
             if avg_efficiency > 0:  # 0 is presumed to mean N/A
                 self.heat_to_power_conversion_efficiency.value = avg_efficiency