From 3d3b99f0546dc387b77e12488c7503315ba47c8c Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Mon, 11 Mar 2024 12:09:29 -0700 Subject: [PATCH] Output pumping power with current units (instead of preferred units, which could theoretically mismatch) --- src/geophires_x/Outputs.py | 2 +- src/geophires_x/SUTRAOutputs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index 0bddab8e..741af89d 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -430,7 +430,7 @@ def PrintOutputs(self, model: Model): f.write(f" Average Peaking Boiler Heat Production: {np.average(model.surfaceplant.dh_natural_gas_heating.value):10.2f} " + model.surfaceplant.dh_natural_gas_heating.PreferredUnits.value + NL) f.write(f" Minimum Peaking Boiler Heat Production: {np.min(model.surfaceplant.dh_natural_gas_heating.value):10.2f} " + model.surfaceplant.dh_natural_gas_heating.PreferredUnits.value + NL) - f.write(f" Average Pumping Power: {np.average(model.wellbores.PumpingPower.value):10.2f} " + model.wellbores.PumpingPower.PreferredUnits.value + NL) + f.write(f" Average Pumping Power: {np.average(model.wellbores.PumpingPower.value):10.2f} {model.wellbores.PumpingPower.CurrentUnits.value}{NL}") f.write(NL) diff --git a/src/geophires_x/SUTRAOutputs.py b/src/geophires_x/SUTRAOutputs.py index b1b77056..dd9996dc 100644 --- a/src/geophires_x/SUTRAOutputs.py +++ b/src/geophires_x/SUTRAOutputs.py @@ -190,7 +190,7 @@ def PrintOutputs(self, model: Model): f.write(f" Average Annual RTES Heating Production: {np.average(model.surfaceplant.AnnualHeatProduced.value):10.2f} " + model.surfaceplant.AnnualHeatProduced.PreferredUnits.value + NL) f.write(f" Average Annual Auxiliary Heating Production: {np.average(model.surfaceplant.AnnualAuxiliaryHeatProduced.value):10.2f} " + model.surfaceplant.AnnualAuxiliaryHeatProduced.PreferredUnits.value + NL) f.write(f" Average Annual Total Heating Production: {np.average(model.surfaceplant.AnnualTotalHeatProduced.value):10.2f} " + model.surfaceplant.AnnualTotalHeatProduced.PreferredUnits.value + NL) - f.write(f" Average Pumping Power: {np.average(model.wellbores.PumpingPower.value):10.2f} " + model.wellbores.PumpingPower.PreferredUnits.value + NL) + f.write(f" Average Pumping Power: {np.average(model.wellbores.PumpingPower.value):10.2f} {model.wellbores.PumpingPower.CurrentUnits.value}{NL}") f.write(f" Average Annual Electricity Use for Pumping: {np.average(model.surfaceplant.PumpingkWh.value):10.2f} " + model.surfaceplant.PumpingkWh.PreferredUnits.value + NL) f.write(NL) f.write(NL)