From 2abc5568f2f2f803e75326b004a933f8b2482d87 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 27 May 2020 17:02:33 +0200
Subject: [PATCH] use generated electric power in vsum instead of consumed, as
mechanical power
---
VectoCore/VectoCore/OutputData/IModalDataContainer.cs | 5 +++++
VectoCore/VectoCore/OutputData/SummaryDataContainer.cs | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
index 8246a337ee..9449c9c060 100644
--- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
@@ -385,6 +385,11 @@ namespace TUGraz.VectoCore.OutputData
return data.TimeIntegral<WattSecond>(ModalResultField.P_busAux_PS_generated_alwaysOn);
}
+ public static WattSecond EnergyBusAuxESGeneratedMech(this IModalDataContainer data)
+ {
+ return data.TimeIntegral<WattSecond>(ModalResultField.P_busAux_ES_sum_mech);
+ }
+
public static WattSecond EnergyBusAuxESGenerated(this IModalDataContainer data)
{
return data.TimeIntegral<WattSecond>(ModalResultField.P_busAux_ES_generated);
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index 0b76274857..f2ee8b3a9c 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -686,7 +686,7 @@ namespace TUGraz.VectoCore.OutputData
row[Fields.E_PS_CompressorOff] = modData.EnergyPneumaticCompressorPowerOff().ConvertToKiloWattHour();
row[Fields.E_PS_CompressorOn] = modData.EnergyPneumaticCompressorOn().ConvertToKiloWattHour();
- row[Fields.E_BusAux_ES_generated] = modData.EnergyBusAuxESGenerated().ConvertToKiloWattHour();
+ row[Fields.E_BusAux_ES_generated] = modData.EnergyBusAuxESGeneratedMech().ConvertToKiloWattHour();
row[Fields.E_BusAux_ES_consumed] = modData.EnergyBusAuxESConsumed().ConvertToKiloWattHour();
row[Fields.Delta_E_BusAux_Battery] = (runData.BusAuxiliaries.ElectricalUserInputsConfig.SmartElectrical
? modData.DeltaSOCBusAuxBattery() * runData.BusAuxiliaries.ElectricalUserInputsConfig.ElectricStorageCapacity
--
GitLab