diff --git a/VectoCore/VectoCore/OutputData/ModDataPostprocessing/Impl/ConventionalModalDataPostprocessingCorrection.cs b/VectoCore/VectoCore/OutputData/ModDataPostprocessing/Impl/ConventionalModalDataPostprocessingCorrection.cs
index e313e09eefe70474fb73709c83e1b52bf42010e7..d54feb8962ab7b8155317a2a74b09e1f18e0728b 100644
--- a/VectoCore/VectoCore/OutputData/ModDataPostprocessing/Impl/ConventionalModalDataPostprocessingCorrection.cs
+++ b/VectoCore/VectoCore/OutputData/ModDataPostprocessing/Impl/ConventionalModalDataPostprocessingCorrection.cs
@@ -93,7 +93,7 @@ namespace TUGraz.VectoCore.OutputData.ModDataPostprocessing.Impl
{
var em = runData.ElectricMachinesData?.FirstOrDefault(x => x.Item1 != PowertrainPosition.GEN);
- if (em != null) {
+ if (em != null && runData.OVCMode != VectoRunData.OvcHevMode.ChargeDepleting) {
var deltaEReess = modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int) - r.WorkBusAux_elPS_SoC_Corr;
var startSoc = modData.REESSStartSoC();
var endSoc = modData.REESSEndSoC();
@@ -294,13 +294,11 @@ namespace TUGraz.VectoCore.OutputData.ModDataPostprocessing.Impl
ApplyElectricPS_FuelCorrection(modData, runData, r);
} else {
// parallel or serial hybrid
- if (busAux.ElectricalUserInputsConfig.ConnectESToREESS &&
- busAux.ElectricalUserInputsConfig.AlternatorType.IsOneOf(AlternatorType.None,
- AlternatorType.Conventional)) {
- // case C1, C2a
+ if (busAux.ElectricalUserInputsConfig.ConnectESToREESS) {
+ // case C1, C2a, C3a
ApplyElectricPS_Electric(modData, runData, r);
} else {
- // case C2b, C3a, C3b
+ // case C2b, C3b
ApplyElectricPS_FuelCorrection(modData, runData, r);
}
diff --git a/VectoCore/VectoCore/OutputData/ModDataPostprocessing/Impl/SerialHybridModalDataPostprocessingCorrection.cs b/VectoCore/VectoCore/OutputData/ModDataPostprocessing/Impl/SerialHybridModalDataPostprocessingCorrection.cs
index 2a46473c5bd46809ceac69e066ad0e95847abff2..9f5a47f4e18011d2a2275342a6f20f27f42c0861 100644
--- a/VectoCore/VectoCore/OutputData/ModDataPostprocessing/Impl/SerialHybridModalDataPostprocessingCorrection.cs
+++ b/VectoCore/VectoCore/OutputData/ModDataPostprocessing/Impl/SerialHybridModalDataPostprocessingCorrection.cs
@@ -38,21 +38,28 @@ namespace TUGraz.VectoCore.OutputData.ModDataPostprocessing.Impl
protected override void SetReesCorrectionDemand(IModalDataContainer modData, VectoRunData runData,
CorrectedModalData r)
{
- var deltaEReess = modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int);
- var startSoc = modData.REESSStartSoC();
- var endSoc = modData.REESSEndSoC();
- var emEff = 0.0;
- if (endSoc < startSoc) {
- var etaReessChg = modData.WorkREESSChargeInternal().Value() / modData.WorkREESSChargeTerminal().Value();
- emEff = 1.0 / etaReessChg;
- }
- if (endSoc > startSoc) {
- var etaReessDischg = modData.WorkREESSDischargeTerminal().Value() / modData.WorkREESSDischargeInternal().Value();
- emEff = etaReessDischg;
- }
-
- r.DeltaEReessMech = double.IsNaN(emEff) ? 0.SI<WattSecond>() : -deltaEReess * emEff;
- }
+ if (runData.OVCMode != VectoRunData.OvcHevMode.ChargeDepleting) {
+ var deltaEReess = modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int) - r.WorkBusAux_elPS_SoC_Corr;
+ var startSoc = modData.REESSStartSoC();
+ var endSoc = modData.REESSEndSoC();
+ var emEff = 0.0;
+ if (endSoc < startSoc) {
+ var etaReessChg = modData.WorkREESSChargeInternal().Value() /
+ modData.WorkREESSChargeTerminal().Value();
+ emEff = 1.0 / etaReessChg;
+ }
+
+ if (endSoc > startSoc) {
+ var etaReessDischg = modData.WorkREESSDischargeTerminal().Value() /
+ modData.WorkREESSDischargeInternal().Value();
+ emEff = etaReessDischg;
+ }
+
+ r.DeltaEReessMech = double.IsNaN(emEff) ? 0.SI<WattSecond>() : -deltaEReess * emEff;
+ } else {
+ r.DeltaEReessMech = 0.SI<WattSecond>();
+ }
+ }
protected override FuelConsumptionCorrection SetFuelConsumptionCorrection(IModalDataContainer modData, VectoRunData runData,
CorrectedModalData r, IFuelProperties fuel)
diff --git a/VectoCore/VectoCoreTest/Reports/ModDataPostProcessingBus.cs b/VectoCore/VectoCoreTest/Reports/ModDataPostProcessingBus.cs
index 468a94d078e266bf416fa24f70fd42db2339169e..6c29a88a70267a87a80ae92f66f3740db9ce504c 100644
--- a/VectoCore/VectoCoreTest/Reports/ModDataPostProcessingBus.cs
+++ b/VectoCore/VectoCoreTest/Reports/ModDataPostProcessingBus.cs
@@ -162,88 +162,71 @@ namespace TUGraz.VectoCore.Tests.Reports
[
+ TestCase(CD_Mode, NoAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 0, 2006.6667, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C1, no alt, CD Mode - 1 no correction"),
+ TestCase(CD_Mode, NoAlternator, 6000, 4021.5180, -4499.1925, 0.0000, 0.0000, -1.2920758, 180.0000000, 0.0000000, 0, 2021.1751, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C1, no alt, CD Mode - 2 correction under-consumption"),
+ TestCase(CD_Mode, NoAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.0000, 0.9350011, 180.0000000, 0.0000000, 0, 1996.2970, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C1, no alt, CD Mode - 3 correction over-consumption"),
+
TestCase(CS_Mode, NoAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C1, no alt, CS Mode - 1 no correction"),
TestCase(CS_Mode, NoAlternator, 6000, 4021.5180, -4499.1925, 0.0000, -1.2921, 0.0000000, 0.0000000, 0.0000000, -0.0221752, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C1, no alt, CS Mode - 2 correction under-consumption"),
TestCase(CS_Mode, NoAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.9350, 0.0000000, 0.0000000, 0.0000000, 0.0160469, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C1, no alt, CS Mode - 3 correction over-consumption"),
- TestCase(CD_Mode, NoAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 3.0892449, 2006.6667, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C1, no alt, CD Mode - 1 no correction"),
- TestCase(CD_Mode, NoAlternator, 6000, 4021.5180, -4499.1925, 0.0000, 0.0000, -1.2920758, 180.0000000, 0.0000000, 3.0892449, 2021.1751, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C1, no alt, CD Mode - 2 correction under-consumption"),
- TestCase(CD_Mode, NoAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.0000, 0.9350011, 180.0000000, 0.0000000, 3.0892449, 1996.2970, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C1, no alt, CD Mode - 3 correction over-consumption"),
+ TestCase(CD_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 0.0000000, 2006.6667, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2a, conv alt, CD Mode - 1 no correction"),
+ TestCase(CD_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, 0.0000, 0.0000, -1.2920758, 180.0000000, 0.0000000, 0.0000000, 2021.1751, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2a, conv alt, CD Mode - 2 correction under-consumption"),
+ TestCase(CD_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.0000, 0.9350011, 180.0000000, 0.0000000, 0.0000000, 1996.2970, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2a, conv alt, CD Mode - 3 correction over-consumption"),
TestCase(CS_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2a, conv alt, CS Mode - 1 no correction"),
TestCase(CS_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, 0.0000, -1.2921, 0.0000000, 0.0000000, 0.0000000, -0.0221752, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2a, conv alt, CS Mode - 2 correction under-consumption"),
TestCase(CS_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.9350, 0.0000000, 0.0000000, 0.0000000, 0.0160469, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2a, conv alt, CS Mode - 3 correction over-consumption"),
- TestCase(CD_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 3.0892449, 2006.6667, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2a, conv alt, CD Mode - 1 no correction"),
- TestCase(CD_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, 0.0000, 0.0000, -1.2920758, 180.0000000, 0.0000000, 3.0892449, 2021.1751, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2a, conv alt, CD Mode - 2 correction under-consumption"),
- TestCase(CD_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.0000, 0.9350011, 180.0000000, 0.0000000, 3.0892449, 1996.2970, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2a, conv alt, CD Mode - 3 correction over-consumption"),
+ TestCase(CD_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 0.0000000, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2b, conv alt, CD Mode - 1 no correction"),
+ TestCase(CD_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 180.0000000, -0.0276873, 0.0000000, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2b, conv alt, CD Mode - 2 correction under-consumption"),
+ TestCase(CD_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 180.0000000, 0.0200357, 0.0000000, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2b, conv alt, CD Mode - 3 correction over-consumption"),
TestCase(CS_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, NaN, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2b, conv alt, CS Mode - 1 no correction"),
TestCase(CS_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 0.0000000, -0.0276873, 0.0000000, NaN, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2b, conv alt, CS Mode - 2 correction under-consumption"),
TestCase(CS_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 0.0000000, 0.0200357, 0.0000000, NaN, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2b, conv alt, CS Mode - 3 correction over-consumption"),
- TestCase(CD_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 3.0892449, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2b, conv alt, CD Mode - 1 no correction"),
- TestCase(CD_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 180.0000000, -0.0276873, 3.0892449, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2b, conv alt, CD Mode - 2 correction under-consumption"),
- TestCase(CD_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 180.0000000, 0.0200357, 3.0892449, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C2b, conv alt, CD Mode - 3 correction over-consumption"),
+ TestCase(CD_Mode, SmartAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 0.0000000, 2006.6667, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CD Mode - 1 no correction"),
+ TestCase(CD_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, 0.0000, 0.0000, -1.2920758, 180.0000000, 0.0000000, 0.0000000, 2021.1751, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CD Mode - 2 correction under-consumption"),
+ TestCase(CD_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.0000, 0.9350011, 180.0000000, 0.0000000, 0.0000000, 1996.2970, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CD Mode - 3 correction over-consumption"),
TestCase(CS_Mode, SmartAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CS Mode - 1 no correction"),
- TestCase(CS_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 0.0000000, -0.0276873, 0.0000000, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CS Mode - 2 correction under-consumption"),
- TestCase(CS_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 0.0000000, 0.0200357, 0.0000000, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CS Mode - 3 correction over-consumption"),
+ TestCase(CS_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, 0.0000, -1.2921, 0.0000000, 0.0000000, 0.0000000, -0.0221752, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CS Mode - 2 correction under-consumption"),
+ TestCase(CS_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.9350, 0.0000000, 0.0000000, 0.0000000, 0.0160469, NaN, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CS Mode - 3 correction over-consumption"),
- TestCase(CD_Mode, SmartAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 3.0892449, 2006.6667, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CD Mode - 1 no correction"),
- TestCase(CD_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 180.0000000, -0.0276873, 3.0892449, 2006.6667, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CD Mode - 2 correction under-consumption"),
- TestCase(CD_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 180.0000000, 0.0200357, 3.0892449, 2006.6667, P_HEV, true, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3a, smart alt, CD Mode - 3 correction over-consumption"),
+ TestCase(CD_Mode, SmartAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 0.0000000, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3b, smart alt, CD Mode - 1 no correction"),
+ TestCase(CD_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 180.0000000, -0.0276873, 0.0000000, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3b, smart alt, CD Mode - 2 correction under-consumption"),
+ TestCase(CD_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 180.0000000, 0.0200357, 0.0000000, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3b, smart alt, CD Mode - 3 correction over-consumption"),
TestCase(CS_Mode, SmartAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, NaN, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3b, smart alt, CS Mode - 1 no correction"),
TestCase(CS_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 0.0000000, -0.0276873, 0.0000000, NaN, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3b, smart alt, CS Mode - 2 correction under-consumption"),
TestCase(CS_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 0.0000000, 0.0200357, 0.0000000, NaN, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3b, smart alt, CS Mode - 3 correction over-consumption"),
- TestCase(CD_Mode, SmartAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 3.0892449, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3b, smart alt, CD Mode - 1 no correction"),
- TestCase(CD_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 180.0000000, -0.0276873, 3.0892449, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3b, smart alt, CD Mode - 2 correction under-consumption"),
- TestCase(CD_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 180.0000000, 0.0200357, 3.0892449, 2006.6667, P_HEV, false, TestName = "Test Busaux ElectricPS P-HEV correction, Case C3b, smart alt, CD Mode - 3 correction over-consumption"),
-
// ----
+ TestCase(CD_Mode, NoAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 0.0000000, 2006.6667, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CD Mode - 1 no correction"),
+ TestCase(CD_Mode, NoAlternator, 6000, 4021.5180, -4499.1925, 0.0000, 0.0000, -1.2920758, 180.0000000, 0.0000000, 0.0000000, 2021.1751, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CD Mode - 2 correction under-consumption"),
+ TestCase(CD_Mode, NoAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.0000, 0.9350011, 180.0000000, 0.0000000, 0.0000000, 1996.2970, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CD Mode - 3 correction over-consumption"),
+
TestCase(CS_Mode, NoAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CS Mode - 1 no correction"),
- TestCase(CS_Mode, NoAlternator, 6000, 4021.5180, -4499.1925, 0.0000, -1.2921, 0.0000000, 0.0000000, 0.0000000, -0.0221752, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CS Mode - 2 correction under-consumption"),
- TestCase(CS_Mode, NoAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.9350, 0.0000000, 0.0000000, 0.0000000, 0.0160469, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CS Mode - 3 correction over-consumption"),
+ TestCase(CS_Mode, NoAlternator, 6000, 4021.5180, -4499.1925, 0.0000, -1.2921, 0.0000000, 0.0000000, 0.0000000, -0.2176128, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CS Mode - 2 correction under-consumption"),
+ TestCase(CS_Mode, NoAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.9350, 0.0000000, 0.0000000, 0.0000000, 0.1574739, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CS Mode - 3 correction over-consumption"),
- TestCase(CD_Mode, NoAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 3.0892449, 2006.6667, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CD Mode - 1 no correction"),
- TestCase(CD_Mode, NoAlternator, 6000, 4021.5180, -4499.1925, 0.0000, 0.0000, -1.2920758, 180.0000000, 0.0000000, 3.0892449, 2021.1751, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CD Mode - 2 correction under-consumption"),
- TestCase(CD_Mode, NoAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.0000, 0.9350011, 180.0000000, 0.0000000, 3.0892449, 1996.2970, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C1, no alt, CD Mode - 3 correction over-consumption"),
+ TestCase(CD_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 0.0000000, 2006.6667, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CD Mode - 1 no correction"),
+ TestCase(CD_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, 0.0000, 0.0000, -1.2920758, 180.0000000, 0.0000000, 0.0000000, 2021.1751, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CD Mode - 2 correction under-consumption"),
+ TestCase(CD_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.0000, 0.9350011, 180.0000000, 0.0000000, 0.0000000, 1996.2970, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CD Mode - 3 correction over-consumption"),
TestCase(CS_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CS Mode - 1 no correction"),
- TestCase(CS_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, 0.0000, -1.2921, 0.0000000, 0.0000000, 0.0000000, -0.0221752, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CS Mode - 2 correction under-consumption"),
- TestCase(CS_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.9350, 0.0000000, 0.0000000, 0.0000000, 0.0160469, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CS Mode - 3 correction over-consumption"),
+ TestCase(CS_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, 0.0000, -1.2921, 0.0000000, 0.0000000, 0.0000000, -0.2176128, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CS Mode - 2 correction under-consumption"),
+ TestCase(CS_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.9350, 0.0000000, 0.0000000, 0.0000000, 0.1574739, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CS Mode - 3 correction over-consumption"),
- TestCase(CD_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 3.0892449, 2006.6667, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CD Mode - 1 no correction"),
- TestCase(CD_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, 0.0000, 0.0000, -1.2920758, 180.0000000, 0.0000000, 3.0892449, 2021.1751, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CD Mode - 2 correction under-consumption"),
- TestCase(CD_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 0.0000, 0.0000, 0.9350011, 180.0000000, 0.0000000, 3.0892449, 1996.2970, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2a, conv alt, CD Mode - 3 correction over-consumption"),
+ TestCase(CD_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 0.0000000, 2006.6667, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2b, conv alt, CD Mode - 1 no correction"),
+ TestCase(CD_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 180.0000000, -0.0276873, 0.0000000, 2006.6667, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2b, conv alt, CD Mode - 2 correction under-consumption"),
+ TestCase(CD_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 180.0000000, 0.0200357, 0.0000000, 2006.6667, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2b, conv alt, CD Mode - 3 correction over-consumption"),
TestCase(CS_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, NaN, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2b, conv alt, CS Mode - 1 no correction"),
TestCase(CS_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 0.0000000, -0.0276873, 0.0000000, NaN, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2b, conv alt, CS Mode - 2 correction under-consumption"),
TestCase(CS_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 0.0000000, 0.0200357, 0.0000000, NaN, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2b, conv alt, CS Mode - 3 correction over-consumption"),
- TestCase(CD_Mode, ConvAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 3.0892449, 2006.6667, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2b, conv alt, CD Mode - 1 no correction"),
- TestCase(CD_Mode, ConvAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 180.0000000, -0.0276873, 3.0892449, 2006.6667, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2b, conv alt, CD Mode - 2 correction under-consumption"),
- TestCase(CD_Mode, ConvAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 180.0000000, 0.0200357, 3.0892449, 2006.6667, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C2b, conv alt, CD Mode - 3 correction over-consumption"),
-
- TestCase(CS_Mode, SmartAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3a, smart alt, CS Mode - 1 no correction"),
- TestCase(CS_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 0.0000000, -0.0276873, 0.0000000, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3a, smart alt, CS Mode - 2 correction under-consumption"),
- TestCase(CS_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 0.0000000, 0.0200357, 0.0000000, NaN, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3a, smart alt, CS Mode - 3 correction over-consumption"),
-
- TestCase(CD_Mode, SmartAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 3.0892449, 2006.6667, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3a, smart alt, CD Mode - 1 no correction"),
- TestCase(CD_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 180.0000000, -0.0276873, 3.0892449, 2006.6667, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3a, smart alt, CD Mode - 2 correction under-consumption"),
- TestCase(CD_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 180.0000000, 0.0200357, 3.0892449, 2006.6667, S_HEV, true, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3a, smart alt, CD Mode - 3 correction over-consumption"),
-
- TestCase(CS_Mode, SmartAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 0.0000000, 0.0000000, 0.0000000, NaN, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3b, smart alt, CS Mode - 1 no correction"),
- TestCase(CS_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 0.0000000, -0.0276873, 0.0000000, NaN, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3b, smart alt, CS Mode - 2 correction under-consumption"),
- TestCase(CS_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 0.0000000, 0.0200357, 0.0000000, NaN, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3b, smart alt, CS Mode - 3 correction over-consumption"),
-
- TestCase(CD_Mode, SmartAlternator, 12962, 8520.7105, 0.0000, 0.0000, 0.0000, 0.0000000, 180.0000000, 0.0000000, 3.0892449, 2006.6667, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3b, smart alt, CD Mode - 1 no correction"),
- TestCase(CD_Mode, SmartAlternator, 6000, 4021.5180, -4499.1925, -1.8458, 0.0000, 0.0000000, 180.0000000, -0.0276873, 3.0892449, 2006.6667, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3b, smart alt, CD Mode - 2 correction under-consumption"),
- TestCase(CD_Mode, SmartAlternator, 18000, 11776.5180, 3255.8075, 1.3357, 0.0000, 0.0000000, 180.0000000, 0.0200357, 3.0892449, 2006.6667, S_HEV, false, TestName = "Test Busaux ElectricPS S-HEV correction, Case C3b, smart alt, CD Mode - 3 correction over-consumption"),
-
-
]
public void TestBusAuxElectricCompressorPostProcessing_Hybrid(
VectoRunData.OvcHevMode ovcMode,
@@ -640,7 +623,7 @@ namespace TUGraz.VectoCore.Tests.Reports
var genField = string.Format(ModalResultField.P_EM_electricMotor_el_.GetCaption(),
PowertrainPosition.GEN);
m.Setup(x =>
- x.TimeIntegral<WattSecond>(genField, null)).Returns(5.SI(Unit.SI.Kilo.Watt.Hour).Cast<WattSecond>());
+ x.TimeIntegral<WattSecond>(genField, null)).Returns(200.SI(Unit.SI.Kilo.Watt.Hour).Cast<WattSecond>());
//m.Setup(x => x.TimeIntegral<Kilogram>())
}