diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs index a12c526af71560d3491015c7cf42219ecee47811..a598007435f06832e39ef7cd09dca96ac4a404dd 100644 --- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs @@ -377,11 +377,7 @@ namespace TUGraz.VectoCore.OutputData workBusAuxPSCorr = (kAir * deltaAir).Cast<WattSecond>(); var workBusAuxES = modData.EnergyBusAuxESConsumed() - modData.EnergyBusAuxESGenerated(); - var workBatterySOC = runData.BusAuxiliaries.ElectricalUserInputsConfig.SmartElectrical - ? modData.DeltaSOCBusAuxBattery() * runData.BusAuxiliaries.ElectricalUserInputsConfig.ElectricStorageCapacity - : 0.SI<WattSecond>(); - - workBusAuxESMech = (workBusAuxES + workBatterySOC) / + workBusAuxESMech = workBusAuxES / runData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorMap.GetEfficiency(0.RPMtoRad(), 0.SI<Ampere>()) / runData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorGearEfficiency; diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs index 44daed40a15c32055c7ac933b10a5e8b0dad4e75..c13e1a3fa9184c8aa89e60253e8be9a8eb0efa67 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs @@ -237,11 +237,8 @@ namespace TUGraz.VectoCore.OutputData.XML var workBusAuxPSCorr = (kAir * deltaAir).Cast<WattSecond>(); var workBusAuxES = data.EnergyBusAuxESConsumed() - data.EnergyBusAuxESGenerated(); - var workBatterySOC = runData.BusAuxiliaries?.ElectricalUserInputsConfig.SmartElectrical ?? false - ? data.DeltaSOCBusAuxBattery() * runData.BusAuxiliaries.ElectricalUserInputsConfig.ElectricStorageCapacity - : 0.SI<WattSecond>(); - - var workBusAuxESMech = (workBusAuxES + workBatterySOC) / + + var workBusAuxESMech = workBusAuxES / runData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorMap.GetEfficiency(0.RPMtoRad(), 0.SI<Ampere>()) / runData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorGearEfficiency; return workBusAuxPSCorr + workBusAuxESMech;