diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs index 9d00666743739c9211c79c58479a7f17975a2ca0..95662f9e10c8c250de9fe78202537502b9bb58ab 100644 --- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs @@ -183,6 +183,7 @@ namespace TUGraz.VectoCore.OutputData KilogramPerSecond FC_AUXHTR_H { get; } KilogramPerSecond FC_AUXHTR_H_CORR { get; } KilogramPerSecond FC_REESS_SOC_H { get; } + KilogramPerSecond FC_REESS_SOC_CORR_H { get; } KilogramPerSecond FC_FINAL_H { get; } KilogramPerMeter FC_WHR_CORR_KM { get; } KilogramPerMeter FC_BusAux_PS_CORR_KM { get; } @@ -190,6 +191,7 @@ namespace TUGraz.VectoCore.OutputData KilogramPerMeter FC_AUXHTR_KM { get; } KilogramPerMeter FC_AUXHTR_KM_CORR { get; } KilogramPerMeter FC_REESS_SOC_KM { get; } + KilogramPerMeter FC_REESS_SOC_CORR_KM { get; } KilogramPerMeter FC_ESS_CORR_KM { get; } KilogramPerMeter FC_FINAL_KM { get; } diff --git a/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs b/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs index 72a6b7ecf845b7c59390b64b4d71ef81eb6b4bd1..66884b3c4afe6005f83a9e6086547437a72ba099 100644 --- a/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs +++ b/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs @@ -413,10 +413,12 @@ namespace TUGraz.VectoCore.OutputData public KilogramPerSecond FC_WHR_CORR_H => Duration != null ? (FcWHRCorr / Duration) : null; public KilogramPerSecond FC_AUXHTR_H => Duration != null ? (FcAuxHtr / Duration) : null; public KilogramPerSecond FC_AUXHTR_H_CORR => Duration != null ? (FcAuxHtrCorr / Duration) : null; - public KilogramPerSecond FC_REESS_SOC_H => Duration != null ? (FcREESSSoCCorr / Duration) : null; + public KilogramPerSecond FC_REESS_SOC_H => Duration != null ? FcREESSSoc / Duration : null; + public KilogramPerSecond FC_REESS_SOC_CORR_H => Duration != null ? (FcREESSSoCCorr / Duration) : null; public KilogramPerSecond FC_FINAL_H => Duration != null ? FcFinal / Duration : null; - public KilogramPerMeter FC_REESS_SOC_KM => Distance != null ? (FcREESSSoCCorr / Distance) : null; + public KilogramPerMeter FC_REESS_SOC_KM => Distance != null ? FcREESSSoc / Distance : null; + public KilogramPerMeter FC_REESS_SOC_CORR_KM => Distance != null ? (FcREESSSoCCorr / Distance) : null; public KilogramPerMeter FC_ESS_CORR_KM => Distance != null ? (FcEssCorr / Distance) : null; public KilogramPerMeter FC_WHR_CORR_KM => Distance != null ? (FcWHRCorr / Distance) : null; public KilogramPerMeter FC_BusAux_PS_CORR_KM => Distance != null ? (FcBusAuxPsCorr / Distance) : null; diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs index 1be6f7f8b9c403020494041a51e8d16b5db42abc..e3505a8a3122f6355a8b0f0c344b0664f8266470 100644 --- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs @@ -65,6 +65,8 @@ namespace TUGraz.VectoCore.OutputData Fields.FC_BusAux_PS_CORR_H, Fields.FC_BusAux_PS_CORR_KM, Fields.FC_BusAux_ES_CORR_H, Fields.FC_BusAux_ES_CORR_KM, Fields.FCWHR_H_CORR, Fields.FCWHR_KM_CORR, + Fields.FC_HEV_SOC_H, Fields.FC_HEV_SOC_KM, + Fields.FC_HEV_SOC_CORR_H, Fields.FC_HEV_SOC_CORR_KM, Fields.FC_AUXHTR_H, Fields.FC_AUXHTR_KM, Fields.FC_AUXHTR_H_CORR, Fields.FC_AUXHTR_KM_CORR, Fields.FCFINAL_H, Fields.FCFINAL_KM, Fields.FCFINAL_LITERPER100KM, Fields.FCFINAL_LITERPER100TKM, @@ -430,17 +432,18 @@ namespace TUGraz.VectoCore.OutputData row[FcCol(Fields.FC_BusAux_PS_CORR_H, suffix)] = fuelConsumption.FC_BusAux_PS_CORR_H?.ConvertToGrammPerHour(); row[FcCol(Fields.FC_BusAux_ES_CORR_H, suffix)] = fuelConsumption.FC_BusAux_ES_CORR_H?.ConvertToGrammPerHour(); row[FcCol(Fields.FCWHR_H_CORR, suffix)] = fuelConsumption.FC_WHR_CORR_H?.ConvertToGrammPerHour(); - row[FcCol(Fields.FC_HEV_SOC_CORR_H, suffix)] = fuelConsumption.FC_REESS_SOC_H?.ConvertToGrammPerHour(); + row[FcCol(Fields.FC_HEV_SOC_CORR_H, suffix)] = fuelConsumption.FC_REESS_SOC_CORR_H?.ConvertToGrammPerHour(); + row[FcCol(Fields.FC_HEV_SOC_H, suffix)] = fuelConsumption.FC_REESS_SOC_H?.ConvertToGrammPerHour(); row[FcCol(Fields.FC_AUXHTR_H, suffix)] = fuelConsumption.FC_AUXHTR_H?.ConvertToGrammPerHour(); row[FcCol(Fields.FC_AUXHTR_H_CORR, suffix)] = fuelConsumption.FC_AUXHTR_H_CORR?.ConvertToGrammPerHour(); - row[FcCol(Fields.FCFINAL_H, suffix)] = fuelConsumption.FC_FINAL_H?.ConvertToGrammPerHour(); row[FcCol(Fields.FCWHR_KM_CORR, suffix)] = fuelConsumption.FC_WHR_CORR_KM?.ConvertToGrammPerKiloMeter(); row[FcCol(Fields.FC_BusAux_PS_CORR_KM, suffix)] = fuelConsumption.FC_BusAux_PS_CORR_KM?.ConvertToGrammPerKiloMeter(); row[FcCol(Fields.FC_BusAux_ES_CORR_KM, suffix)] = fuelConsumption.FC_BusAux_ES_CORR_KM?.ConvertToGrammPerKiloMeter(); - row[FcCol(Fields.FC_HEV_SOC_CORR_KM, suffix)] = fuelConsumption.FC_REESS_SOC_KM?.ConvertToGrammPerKiloMeter(); + row[FcCol(Fields.FC_HEV_SOC_CORR_KM, suffix)] = fuelConsumption.FC_REESS_SOC_CORR_KM?.ConvertToGrammPerKiloMeter(); + row[FcCol(Fields.FC_HEV_SOC_KM, suffix)] = fuelConsumption.FC_REESS_SOC_KM?.ConvertToGrammPerKiloMeter(); row[FcCol(Fields.FC_AUXHTR_KM, suffix)] = fuelConsumption.FC_AUXHTR_KM?.ConvertToGrammPerKiloMeter(); row[FcCol(Fields.FC_AUXHTR_KM_CORR, suffix)] = fuelConsumption.FC_AUXHTR_KM_CORR?.ConvertToGrammPerKiloMeter(); @@ -1097,6 +1100,8 @@ namespace TUGraz.VectoCore.OutputData public const string FCESS_KM_CORR = "FC-ESS_Corr{0} [g/km]"; public const string FCWHR_H_CORR = "FC-WHR_Corr{0} [g/h]"; public const string FCWHR_KM_CORR = "FC-WHR_Corr{0} [g/km]"; + public const string FC_HEV_SOC_H = "FC-SoC{0} [g/h]"; + public const string FC_HEV_SOC_KM = "FC-SoC{0} [g/km]"; public const string FC_HEV_SOC_CORR_H = "FC-SoC_Corr{0} [g/h]"; public const string FC_HEV_SOC_CORR_KM = "FC-SoC_Corr{0} [g/km]";