Include first law efficiency (average) in surface equipment simulation results. WIP - pending unit test updates

Author: softwareengineerprogrammer

src/geophires_x/Outputs.py

@@ -1910,6 +1910,12 @@ def PrintOutputs(self, model: Model):
 
                 f.write(f'      Average Pumping Power:                            {np.average(model.wellbores.PumpingPower.value):10.2f} {model.wellbores.PumpingPower.CurrentUnits.value}{NL}')
 
+                if model.surfaceplant.FirstLawEfficiency is not None:
+                    avg_efficiency = np.average(model.surfaceplant.FirstLawEfficiency.value) * 100
+                    if avg_efficiency > 0:  # 0 is presumed to mean N/A
+                        f.write(
+                        f'      {model.surfaceplant.FirstLawEfficiency.Name}:                             {avg_efficiency:10.2f} {model.surfaceplant.FirstLawEfficiency.CurrentUnits.value}\n')
+
                 f.write(NL)
                 f.write('                            ************************************************************\n')
                 f.write('                            *  HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE  *\n')

src/geophires_x/SurfacePlantSingleFlash.py

@@ -122,7 +122,7 @@ def Calculate(self, model: Model) -> None:
         self.NetElectricityProduced.value = self.ElectricityProduced.value - model.wellbores.PumpingPower.value
         self.FirstLawEfficiency.value = self.NetElectricityProduced.value/HeatExtractedTowardsElectricity
 
-        # Calculate annual electricity, pum;ping, and heat production
+        # Calculate annual electricity, pumping, and heat production
         self.HeatkWhExtracted.value, self.PumpingkWh.value, self.TotalkWhProduced.value, self.NetkWhProduced.value, self.HeatkWhProduced.value = \
         SurfacePlant.annual_electricity_pumping_power(self, self.plant_lifetime.value, self.enduse_option.value,
                                 self.HeatExtracted.value, model.economics.timestepsperyear.value, self.utilization_factor.value,

src/geophires_x_client/geophires_x_result.py

@@ -276,6 +276,7 @@ class GeophiresXResult:
                 'Maximum Peaking Boiler Heat Production',
                 'Average Peaking Boiler Heat Production',
                 'Minimum Peaking Boiler Heat Production',
+                'First Law Efficiency',
                 # AGS/CLGS
                 'Surface Plant Cost',
                 'Initial pumping power/net installed power',