diff --git a/User Manual/5-input-and-output-files/VSUM.md b/User Manual/5-input-and-output-files/VSUM.md
index a8f9764260556f5a56cd7e7a780e3c7498e5ee64..dc2b8f679daf42cec5b0b8256c2894d9df537c90 100644
--- a/User Manual/5-input-and-output-files/VSUM.md
+++ b/User Manual/5-input-and-output-files/VSUM.md
@@ -39,7 +39,6 @@ The .vsum file includes total / average results for each calculation run in one
| a | [m/s²] | Average acceleration |
| a_pos | [m/s²] | Average acceleration in acceleration phases \* |
| a_neg | [m/s²] | Average deceleration in deceleration phases \* |
-| Acc.Noise | [m/s²] | Acceleration noise |
| pAcc | [%] | Time share of acceleration phases \* |
| pDec | [%] | Time share of deceleration phases \* |
| pCruise | [%] | Time share of cruise phases \* |
diff --git a/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCoreTest/Models/Simulation/AuxTests.cs
index 30f9a61dbba2724ac19a7e8bc21e919ee709394a..e43ec5bbea9d84624e44af3491ff1d50af950f4d 100644
--- a/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -63,7 +63,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var sumWriter = new SummaryDataContainer(fileWriter);
var container = new VehicleContainer(modData,
- (writer, mass, loading) => sumWriter.WriteFullPowertrain(modData, "", "", "", null, null));
+ (writer, mass, loading) => sumWriter.Write(false, modData, "", "", "", null, null));
var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\LongHaul_short.vdri", CycleType.DistanceBased, false);
var mockcycle = new MockDrivingCycle(container, data);
@@ -144,7 +144,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
{
var dataWriter = new MockModalDataContainer();
var container = new VehicleContainer(dataWriter);
- var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach time based short.vdri", CycleType.MeasuredSpeed, false);
+ var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach time based short.vdri",
+ CycleType.MeasuredSpeed, false);
var cycle = new MockDrivingCycle(container, data);
var aux = new EngineAuxiliary(container);
@@ -174,7 +175,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
dataWriter.AddAuxiliary("CONSTANT");
var container = new VehicleContainer(dataWriter);
- var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach time based short.vdri", CycleType.MeasuredSpeed, false);
+ var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach time based short.vdri",
+ CycleType.MeasuredSpeed, false);
// cycle ALT1 is set to values to equal the first few fixed points in the auxiliary file.
// ALT1.aux file: nAuxiliary speed 2358: 0, 0.38, 0.49, 0.64, ...
// ALT1 in cycle file: 0, 0.3724 (=0.38*0.96), 0.4802 (=0.49*0.96), 0.6272 (0.64*0.96), ...
@@ -231,7 +233,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
dataWriter.AddAuxiliary(auxId);
var container = new VehicleContainer(dataWriter);
- var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach time based short.vdri", CycleType.MeasuredSpeed, false);
+ var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach time based short.vdri",
+ CycleType.MeasuredSpeed, false);
// cycle ALT1 is set to values to equal the first few fixed points in the auxiliary file.
// ALT1.aux file: nAuxiliary speed 2358: 0, 0.38, 0.49, 0.64, ...
// ALT1 in cycle file: 0, 0.3724 (=0.38*0.96), 0.4802 (=0.49*0.96), 0.6272 (0.64*0.96), ...
@@ -280,7 +283,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
public void AuxColumnMissing()
{
var container = new VehicleContainer();
- var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach time based short.vdri", CycleType.MeasuredSpeed, false);
+ var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach time based short.vdri",
+ CycleType.MeasuredSpeed, false);
var cycle = new MockDrivingCycle(container, data);
var aux = new EngineAuxiliary(container);
diff --git a/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCoreTest/Reports/SumWriterTest.cs
index edd0ddddc8340e248af71abd7caa5415e579a804..db7f43b901df33dc2e5c995210a0dcd62692b058 100644
--- a/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCoreTest/Reports/SumWriterTest.cs
@@ -71,7 +71,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData.CommitSimulationStep();
}
- sumWriter.WriteFullPowertrain(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>());
+ sumWriter.Write(false, modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>());
modData.Finish(VectoRun.Status.Success);
sumWriter.Finish();
@@ -123,7 +123,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData.CommitSimulationStep();
}
- sumWriter.WriteFullPowertrain(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>());
+ sumWriter.Write(false, modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>());
modData.Finish(VectoRun.Status.Success);
sumWriter.Finish();
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
index d42b7544f8d0124a965c6912e7c01cd262417d71..60b9d4653ef679655a6a1ef810f2c2fed2652bb8 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-20-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,1298.0000,16.8420,46.7112,,44.3053,-8.0548,7788.5978,166.7393,7788.5978,166.7393,7788.5978,166.7393,526.8962,,166.7393,20.0408,,27.2326,1.2447,11.7532,-0.2976,5.3382,3.1099,0.3597,-0.0002,1.9832,0.4488,2.1656,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2937,-0.3215,0.2764,23.4387,22.2822,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+20-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,1298.0000,16.8420,46.7112,,44.3053,-8.0548,7788.5978,166.7393,7788.5978,166.7393,7788.5978,166.7393,526.8962,,166.7393,20.0408,,27.2326,1.2447,11.7532,-0.2976,5.3382,3.1099,0.3597,-0.0002,1.9832,0.4488,2.1656,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2937,-0.3215,23.4387,22.2822,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
index 04597aecd878466e78e29ebf1a07e8edec7aed67..35ff6a13e9320fa4f3e9a44f6cdbff53e6190025 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-10-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,1298.0000,16.8411,46.7086,,0.3797,44.2984,-8.4708,7965.3302,170.5323,7965.3302,170.5323,7965.3302,170.5323,538.8820,,170.5323,20.4967,,27.2303,1.2013,11.7514,-0.3130,5.3376,3.1097,0.3597,-0.0002,2.3629,0.4331,2.1655,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2937,-0.3208,0.2763,23.4387,22.3593,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+10-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,1298.0000,16.8411,46.7086,,0.3797,44.2984,-8.4708,7965.3302,170.5323,7965.3302,170.5323,7965.3302,170.5323,538.8820,,170.5323,20.4967,,27.2303,1.2013,11.7514,-0.3130,5.3376,3.1097,0.3597,-0.0002,2.3629,0.4331,2.1655,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2937,-0.3208,23.4387,22.3593,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
index f5b04b3b10f2ce42faf6fc171171ae2f6911582c..b9de5b789e637b21fa0685d434f6f7cdf82b3e81 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-6-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,1298.0000,16.8075,46.6155,,42.1780,-8.5851,7666.7738,164.4684,7666.7738,164.4684,7666.7738,164.4684,519.7200,,164.4684,19.7678,,27.2489,1.1417,11.1889,-0.3744,5.3555,3.1158,0.3598,0.0000,1.9832,0.4116,1.5459,0.0000,0.0000,8862.0000,0.0000,-0.0002,0.2931,-0.3223,0.2701,23.4387,22.2051,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+6-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,1298.0000,16.8075,46.6155,,42.1780,-8.5851,7666.7738,164.4684,7666.7738,164.4684,7666.7738,164.4684,519.7200,,164.4684,19.7678,,27.2489,1.1417,11.1889,-0.3744,5.3555,3.1158,0.3598,0.0000,1.9832,0.4116,1.5459,0.0000,0.0000,8862.0000,0.0000,-0.0002,0.2931,-0.3223,23.4387,22.2051,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
index 5a82b6859a327177fbd7eae5f0bef815558f2ff6..530a2b4d066b9d187b86577a64d6d131193591b7 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-2-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,1298.0000,16.8075,46.6155,,0.3984,42.1780,-8.9766,7850.1194,168.4015,7850.1194,168.4015,7850.1194,168.4015,532.1489,,168.4015,20.2406,,27.2488,1.0940,11.1889,-0.3915,5.3555,3.1158,0.3598,0.0000,2.3816,0.3945,1.5458,0.0000,0.0000,8862.0000,0.0000,-0.0002,0.2931,-0.3223,0.2701,23.4387,22.2051,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+2-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,1298.0000,16.8075,46.6155,,0.3984,42.1780,-8.9766,7850.1194,168.4015,7850.1194,168.4015,7850.1194,168.4015,532.1489,,168.4015,20.2406,,27.2488,1.0940,11.1889,-0.3915,5.3555,3.1158,0.3598,0.0000,2.3816,0.3945,1.5458,0.0000,0.0000,8862.0000,0.0000,-0.0002,0.2931,-0.3223,23.4387,22.2051,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
index a92e98a3de741f8287b9a50738e5fba9b2eae0d7..28736057bd7da595a52c018671a2af3fcc80a568 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-14-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,1298.0000,16.8070,46.6141,,34.2473,-9.8890,6251.3983,134.1095,6251.3983,134.1095,6251.3983,134.1095,423.7859,,134.1095,16.1189,,20.1200,1.6711,8.5047,-0.5988,2.2254,3.1158,0.3598,0.0000,1.9832,0.6025,1.5778,0.0000,0.0000,8862.0000,0.0000,-0.0003,0.2931,-0.3220,0.2703,23.4387,22.2822,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+14-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,1298.0000,16.8070,46.6141,,34.2473,-9.8890,6251.3983,134.1095,6251.3983,134.1095,6251.3983,134.1095,423.7859,,134.1095,16.1189,,20.1200,1.6711,8.5047,-0.5988,2.2254,3.1158,0.3598,0.0000,1.9832,0.6025,1.5778,0.0000,0.0000,8862.0000,0.0000,-0.0003,0.2931,-0.3220,23.4387,22.2822,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
index be085a8bbfc3fb89bf2da0bb37f41080419df8c7..d74c0e5ad22bbe6f54814efe02cf099e3db657a2 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-18-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,1298.0000,16.8070,46.6141,,0.3984,34.2459,-10.3286,6425.9646,137.8544,6425.9646,137.8544,6425.9646,137.8544,435.6199,,137.8544,16.5690,,20.1200,1.5967,8.5044,-0.6255,2.2254,3.1158,0.3598,0.0000,2.3816,0.5757,1.5776,0.0000,0.0000,8862.0000,0.0000,-0.0003,0.2931,-0.3220,0.2703,23.4387,22.2822,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+18-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,1298.0000,16.8070,46.6141,,0.3984,34.2459,-10.3286,6425.9646,137.8544,6425.9646,137.8544,6425.9646,137.8544,435.6199,,137.8544,16.5690,,20.1200,1.5967,8.5044,-0.6255,2.2254,3.1158,0.3598,0.0000,2.3816,0.5757,1.5776,0.0000,0.0000,8862.0000,0.0000,-0.0003,0.2931,-0.3220,23.4387,22.2822,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
index 3ef90834aed47d7b1c3bfc7718512e41ee3c7536..d17c7437587daaab115c46cc49042023ff42a47c 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-12-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,1298.0000,16.8514,46.7374,,36.0191,-8.8062,6300.2654,134.8014,6300.2654,134.8014,6300.2654,134.8014,425.9725,,134.8014,16.2021,,20.1375,1.8191,8.9748,-0.4721,2.2237,3.1116,0.3596,-0.0002,1.9832,0.6559,2.1232,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2920,-0.3219,0.2750,23.5929,22.2051,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+12-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,1298.0000,16.8514,46.7374,,36.0191,-8.8062,6300.2654,134.8014,6300.2654,134.8014,6300.2654,134.8014,425.9725,,134.8014,16.2021,,20.1375,1.8191,8.9748,-0.4721,2.2237,3.1116,0.3596,-0.0002,1.9832,0.6559,2.1232,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2920,-0.3219,23.5929,22.2051,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
index ccb8f75a46f39b0036a58fcae7a81fce04c8e618..8d0308be2712bec42dff138a8c00d72edeaca56e 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-0-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,1298.0000,16.8509,46.7360,,0.3794,36.0530,-9.2445,6468.1691,138.3981,6468.1691,138.3981,6468.1691,138.3981,437.3380,,138.3981,16.6344,,20.1371,1.7457,8.9732,-0.4982,2.2237,3.1115,0.3596,-0.0002,2.3626,0.6294,2.1232,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2920,-0.3219,0.2750,23.5929,22.2051,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+0-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,1298.0000,16.8509,46.7360,,0.3794,36.0530,-9.2445,6468.1691,138.3981,6468.1691,138.3981,6468.1691,138.3981,437.3380,,138.3981,16.6344,,20.1371,1.7457,8.9732,-0.4982,2.2237,3.1115,0.3596,-0.0002,2.3626,0.6294,2.1232,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2920,-0.3219,23.5929,22.2051,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
index 0fb55eea355777d29e9e383fae8daf93f8a28198..5a8f73bd392d578f50938531c86764ac9095f966 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-8-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,1298.0000,16.8586,46.7574,,29.6019,-9.0517,4856.7669,103.8716,4856.7669,103.8716,4856.7669,103.8716,328.2342,,103.8716,12.4846,,13.7545,2.4128,6.3891,-0.7820,-0.8572,3.1129,0.3598,-0.0002,1.9832,0.8699,2.0922,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2923,-0.3220,0.2735,23.5158,22.2051,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+8-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,1298.0000,16.8586,46.7574,,29.6019,-9.0517,4856.7669,103.8716,4856.7669,103.8716,4856.7669,103.8716,328.2342,,103.8716,12.4846,,13.7545,2.4128,6.3891,-0.7820,-0.8572,3.1129,0.3598,-0.0002,1.9832,0.8699,2.0922,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2923,-0.3220,23.5158,22.2051,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
index 669e72ba022e8310e85fe2399cb0c4f387924f16..9179dc3c71d3b006781bdc2ac73e3067931192a8 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-16-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,1298.0000,16.8563,46.7509,,31.6045,-8.7574,5451.4678,116.6067,5451.4678,116.6067,5451.4678,116.6067,368.4770,,116.6067,14.0152,,16.2774,1.9487,7.4271,-0.5887,0.5292,3.1125,0.3597,-0.0002,1.9832,0.7026,2.1030,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2924,-0.3219,0.2742,23.5158,22.2051,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+16-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,1298.0000,16.8563,46.7509,,31.6045,-8.7574,5451.4678,116.6067,5451.4678,116.6067,5451.4678,116.6067,368.4770,,116.6067,14.0152,,16.2774,1.9487,7.4271,-0.5887,0.5292,3.1125,0.3597,-0.0002,1.9832,0.7026,2.1030,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2924,-0.3219,23.5158,22.2051,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
index 4a9041922d350720e7078dd53f560f898caf2afb..2d99e589af2848c3749206903a2759399787334d 100644
--- a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
+++ b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-4-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,1298.0000,16.8572,46.7534,,30.8156,-8.8161,5221.0961,111.6731,5221.0961,111.6731,5221.0961,111.6731,352.8869,,111.6731,13.4222,,15.2904,2.1110,7.0191,-0.6563,0.0000,3.1127,0.3597,-0.0002,1.9832,0.7611,2.0987,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2924,-0.3219,0.2739,23.5158,22.2051,0.0000,14.4838
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+4-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,1298.0000,16.8572,46.7534,,30.8156,-8.8161,5221.0961,111.6731,5221.0961,111.6731,5221.0961,111.6731,352.8869,,111.6731,13.4222,,15.2904,2.1110,7.0191,-0.6563,0.0000,3.1127,0.3597,-0.0002,1.9832,0.7611,2.0987,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2924,-0.3219,23.5158,22.2051,0.0000,14.4838