diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vsum b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vsum
index 650450f6bda30aa27adaeea9970c18e650e5f9dc..6b6d338f51cc22f5fe777cf257339af6f826023a 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vsum
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vsum
@@ -1,10 +1,10 @@
-Job [-],Input File [-],Cycle [-],time [s],distance [km],speed [km/h],∆altitude [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [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/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [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 [%]
-1,12t Delivery Truck.vecto,Long_Haul.vdri,5245,108.1818,74.25249,0.4157933,1.36807084861729,1.71919436802467,0.323441670835018,2.58087303572231,0.291388893230922,68.828245691688,-0.295060687814728,13939.92,187.7368,-,-,14048.65,189.2011,597.8755,-,189.2011,-,22.74052,53.3331431698079,-0.951296060530201,100.278930181362,-0.429887029885625,-53.7217975638455,-21.602133366182,-0.00594433389811052,8.54700596796142E-08,-6.28296870787938,-1.38598551041136,-16.8502154708157,0,0,7750,0,-4.545636E-10,0.432781,-0.5312394,0.2062322,0.0528122,0.04080076,0.8602479,0.04613918
-1,12t Delivery Truck.vecto,Long_Haul.vdri,5275,108.1819,73.83029,0.4122985,1.37589584870471,1.7290277009209,0.32529167085886,2.59563494059775,0.293055559922424,76.5622784120409,-0.614272283445602,15413,208.7625,-,-,15533.22,210.3909,664.8351,160.2012,210.3909,6.09334,25.28736,61.6186144348343,-1.91622710570057,112.185005173199,-0.900079526437653,-53.1544755984918,-31.7773630401368,-0.0114676845291009,-1.97346089407802E-07,-6.31890561183294,-2.80780499515848,-17.2149103430079,0,0,7750,4150,-4.519783E-10,0.4081375,-0.4746179,0.1942435,0.05800948,0.05023697,0.8458768,0.04587678
-1,12t Delivery Truck.vecto,Long_Haul.vdri,5275,108.1819,73.83029,0.4122985,1.37589584870471,1.7290277009209,0.32529167085886,2.59563494059775,0.293055559922424,76.5622784120409,-0.614272283445602,15413,208.7625,-,-,15533.22,210.3909,664.8351,160.2012,210.3909,6.09334,25.28736,61.6186144348343,-1.91622710570057,112.185005173199,-0.900079526437653,-53.1544755984918,-31.7773630401368,-0.0114676845291009,-1.97346089407802E-07,-6.31890561183294,-2.80780499515848,-17.2149103430079,0,0,7750,4150,-4.519783E-10,0.4081375,-0.4746179,0.1942435,0.05800948,0.05023697,0.8458768,0.04587678
-1,12t Delivery Truck.vecto,Regional_Delivery.vdri,1614,25.8284,57.60981,-0.02431984,0.445643341243267,0.573866653839747,0.086080000748237,0.675702400803566,0.0896666680028041,50.7909131905911,-0.797100853631931,10468.67,181.7169,-,-,10474.96,181.8259,574.5698,-,181.8259,-,21.85407,38.7421929767676,-2.22326468906216,22.7712594137817,-0.357366882711649,-10.5392731322911,-5.12026773493323,0.00982296626605805,-9.36206844117906E-08,-1.87095907131831,-0.996763668929537,-3.89645460828311,0,0,7750,0,-1.181753E-09,0.4412237,-0.4665618,0.3421181,0.1356877,0.1363073,0.6592317,0.06877323
-1,12t Delivery Truck.vecto,Regional_Delivery.vdri,1601,25.82833,58.07744,-0.02466047,0.442053896735112,0.56924443172084,0.0853866674088769,0.670259940326214,0.08894444576982,57.1183613138151,-1.31937498487137,11644,200.4909,-,-,11650.98,200.6112,633.9313,212.4513,200.6112,8.080701,24.11192,45.2564961777524,-3.48985577706971,25.4018045731717,-0.586755375216405,-10.5381488821988,-6.86437743980024,-0.00891033948502607,-1.69340314136611E-08,-1.85588938858774,-1.5520164164135,-3.99571019759609,0,0,7750,2983.89,-1.191348E-09,0.4123022,-0.4458131,0.3330745,0.1599001,0.1505309,0.6202374,0.06933167
-1,12t Delivery Truck.vecto,Regional_Delivery.vdri,1596,25.82822,58.25913,-0.02519032,0.440673341155052,0.567466653982798,0.0851200007398923,0.668166686296463,0.088666667987903,59.7485341806347,-1.43185722428306,12153.25,208.6068,-,-,12160.54,208.7319,659.593,158.9381,208.7319,6.045294,25.08797,48.2545329701648,-4.11557962622185,26.4885168200814,-0.634790036098825,-10.6201652208182,-7.53199708029628,0.016459057985598,4.77504606048266E-08,-1.85009335676829,-1.82457363429169,-4.04335998408496,0,0,7750,4150,1.792621E-09,0.4045506,-0.4171267,0.3388702,0.1785714,0.1735589,0.5783208,0.06954888
-1,12t Delivery Truck.vecto,Urban_Delivery.vdri,3368,27.80735,29.72282,-0.05254004,0.826095570723216,1.23493338240518,0.174013337459829,1.30175874736574,0.140333338909679,25.1396036124622,-0.948524291315193,5488.629,184.6605,-,-,5438.134,182.9616,578.1586,-,182.9616,-,21.99057,17.7081874708226,-4.22752134668448,23.5194958241036,-0.887397170319325,-5.6845096131651,-5.51247593332082,0.00780685773504148,2.38746094206969E-07,-3.67713422351413,-3.95508108212037,-3.81072937223646,0,0,7750,0,-2.477628E-10,0.4752795,-0.5695276,0.4568766,0.1980404,0.1725059,0.442696,0.1867577
-1,12t Delivery Truck.vecto,Urban_Delivery.vdri,3310,27.808,30.24435,-0.0495902,0.811869459350904,1.21366671489345,0.1710166707221,1.27934128675196,0.137916672146983,30.4334581804059,-1.16748940845631,6470.452,213.9392,-,-,6410.924,211.971,669.8283,224.4816,211.971,8.538279,25.47728,22.8231003207788,-6.46084705161626,27.9818740492066,-1.07344165055288,-5.8964291196102,-7.39037906715646,0.0122275942189784,-7.76761832336585E-08,-3.6138106531567,-5.94038992801384,-4.07968345087022,0,0,7750,2983.89,6.122531E-10,0.5035743,-0.5390744,0.4479906,0.2042296,0.1930514,0.4126888,0.1900302
-1,12t Delivery Truck.vecto,Urban_Delivery.vdri,3338,27.80793,29.99057,-0.04992481,0.818737237254779,1.22393338196807,0.172463337423073,1.29016350911723,0.139083338860008,32.0389942091836,-1.24704237898322,6760.725,225.4283,-,-,6698.526,223.3544,705.7999,170.0723,223.3544,6.46879,26.84548,24.5009796861328,-7.27165439083808,29.7072674084041,-1.15628540584611,-5.91822867834686,-8.10917532677452,0.0240152537522711,1.55775083435906E-07,-3.6443806526396,-6.74243954350486,-4.16080814222081,0,0,7750,4150,-1.785639E-10,0.4881508,-0.5538294,0.4431113,0.2055123,0.1842421,0.4218095,0.1884362
+Job [-],Input File [-],Cycle [-],time [s],distance [km],speed [km/h],∆altitude [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [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/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [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 [%]
+1,12t Delivery Truck.vecto,Long_Haul.vdri,5245,108.1818,74.25249,0.4157933,1.36807084861729,1.71919436802467,0.323441670835018,2.58087303572231,0.291388893230922,68.828245691688,-0.295060687814728,13939.92,187.7368,-,-,14048.65,189.2011,597.8755,-,189.2011,-,22.74052,53.3331431698079,-0.951296060530201,100.278930181362,-0.429887029885625,-53.7217975638455,-21.602133366182,-0.00594433389811052,8.54700596796142E-08,-6.28296870787938,-1.38598551041136,-16.8502154708157,0,0,7750,0,-4.545636E-10,0.432781,-0.5312394,0.0528122,0.04080076,0.8602479,0.04613918
+1,12t Delivery Truck.vecto,Long_Haul.vdri,5275,108.1819,73.83029,0.4122985,1.37589584870471,1.7290277009209,0.32529167085886,2.59563494059775,0.293055559922424,76.5622784120409,-0.614272283445602,15413,208.7625,-,-,15533.22,210.3909,664.8351,160.2012,210.3909,6.09334,25.28736,61.6186144348343,-1.91622710570057,112.185005173199,-0.900079526437653,-53.1544755984918,-31.7773630401368,-0.0114676845291009,-1.97346089407802E-07,-6.31890561183294,-2.80780499515848,-17.2149103430079,0,0,7750,4150,-4.519783E-10,0.4081375,-0.4746179,0.05800948,0.05023697,0.8458768,0.04587678
+1,12t Delivery Truck.vecto,Long_Haul.vdri,5275,108.1819,73.83029,0.4122985,1.37589584870471,1.7290277009209,0.32529167085886,2.59563494059775,0.293055559922424,76.5622784120409,-0.614272283445602,15413,208.7625,-,-,15533.22,210.3909,664.8351,160.2012,210.3909,6.09334,25.28736,61.6186144348343,-1.91622710570057,112.185005173199,-0.900079526437653,-53.1544755984918,-31.7773630401368,-0.0114676845291009,-1.97346089407802E-07,-6.31890561183294,-2.80780499515848,-17.2149103430079,0,0,7750,4150,-4.519783E-10,0.4081375,-0.4746179,0.05800948,0.05023697,0.8458768,0.04587678
+1,12t Delivery Truck.vecto,Regional_Delivery.vdri,1614,25.8284,57.60981,-0.02431984,0.445643341243267,0.573866653839747,0.086080000748237,0.675702400803566,0.0896666680028041,50.7909131905911,-0.797100853631931,10468.67,181.7169,-,-,10474.96,181.8259,574.5698,-,181.8259,-,21.85407,38.7421929767676,-2.22326468906216,22.7712594137817,-0.357366882711649,-10.5392731322911,-5.12026773493323,0.00982296626605805,-9.36206844117906E-08,-1.87095907131831,-0.996763668929537,-3.89645460828311,0,0,7750,0,-1.181753E-09,0.4412237,-0.4665618,0.1356877,0.1363073,0.6592317,0.06877323
+1,12t Delivery Truck.vecto,Regional_Delivery.vdri,1601,25.82833,58.07744,-0.02466047,0.442053896735112,0.56924443172084,0.0853866674088769,0.670259940326214,0.08894444576982,57.1183613138151,-1.31937498487137,11644,200.4909,-,-,11650.98,200.6112,633.9313,212.4513,200.6112,8.080701,24.11192,45.2564961777524,-3.48985577706971,25.4018045731717,-0.586755375216405,-10.5381488821988,-6.86437743980024,-0.00891033948502607,-1.69340314136611E-08,-1.85588938858774,-1.5520164164135,-3.99571019759609,0,0,7750,2983.89,-1.191348E-09,0.4123022,-0.4458131,0.1599001,0.1505309,0.6202374,0.06933167
+1,12t Delivery Truck.vecto,Regional_Delivery.vdri,1596,25.82822,58.25913,-0.02519032,0.440673341155052,0.567466653982798,0.0851200007398923,0.668166686296463,0.088666667987903,59.7485341806347,-1.43185722428306,12153.25,208.6068,-,-,12160.54,208.7319,659.593,158.9381,208.7319,6.045294,25.08797,48.2545329701648,-4.11557962622185,26.4885168200814,-0.634790036098825,-10.6201652208182,-7.53199708029628,0.016459057985598,4.77504606048266E-08,-1.85009335676829,-1.82457363429169,-4.04335998408496,0,0,7750,4150,1.792621E-09,0.4045506,-0.4171267,0.1785714,0.1735589,0.5783208,0.06954888
+1,12t Delivery Truck.vecto,Urban_Delivery.vdri,3368,27.80735,29.72282,-0.05254004,0.826095570723216,1.23493338240518,0.174013337459829,1.30175874736574,0.140333338909679,25.1396036124622,-0.948524291315193,5488.629,184.6605,-,-,5438.134,182.9616,578.1586,-,182.9616,-,21.99057,17.7081874708226,-4.22752134668448,23.5194958241036,-0.887397170319325,-5.6845096131651,-5.51247593332082,0.00780685773504148,2.38746094206969E-07,-3.67713422351413,-3.95508108212037,-3.81072937223646,0,0,7750,0,-2.477628E-10,0.4752795,-0.5695276,0.1980404,0.1725059,0.442696,0.1867577
+1,12t Delivery Truck.vecto,Urban_Delivery.vdri,3310,27.808,30.24435,-0.0495902,0.811869459350904,1.21366671489345,0.1710166707221,1.27934128675196,0.137916672146983,30.4334581804059,-1.16748940845631,6470.452,213.9392,-,-,6410.924,211.971,669.8283,224.4816,211.971,8.538279,25.47728,22.8231003207788,-6.46084705161626,27.9818740492066,-1.07344165055288,-5.8964291196102,-7.39037906715646,0.0122275942189784,-7.76761832336585E-08,-3.6138106531567,-5.94038992801384,-4.07968345087022,0,0,7750,2983.89,6.122531E-10,0.5035743,-0.5390744,0.2042296,0.1930514,0.4126888,0.1900302
+1,12t Delivery Truck.vecto,Urban_Delivery.vdri,3338,27.80793,29.99057,-0.04992481,0.818737237254779,1.22393338196807,0.172463337423073,1.29016350911723,0.139083338860008,32.0389942091836,-1.24704237898322,6760.725,225.4283,-,-,6698.526,223.3544,705.7999,170.0723,223.3544,6.46879,26.84548,24.5009796861328,-7.27165439083808,29.7072674084041,-1.15628540584611,-5.91822867834686,-8.10917532677452,0.0240152537522711,1.55775083435906E-07,-3.6443806526396,-6.74243954350486,-4.16080814222081,0,0,7750,4150,-1.785639E-10,0.4881508,-0.5538294,0.2055123,0.1842421,0.4218095,0.1884362
diff --git a/User Manual/5-input-and-output-files/VSUM.md b/User Manual/5-input-and-output-files/VSUM.md
index a8f9764260556f5a56cd7e7a780e3c7498e5ee64..49c43770395e4e26250fdc80dea52d4e77c09d73 100644
--- a/User Manual/5-input-and-output-files/VSUM.md
+++ b/User Manual/5-input-and-output-files/VSUM.md
@@ -3,59 +3,45 @@ The .vsum file includes total / average results for each calculation run in one
***Quantities:***
-| Name | Unit | Description |
-|---------------|-------------------------------|------------------------------------------------------------------------------------------------------------------------------|
-| Job | [-] | Job number in the format "x-y" (where x = file number and y = cycle number) |
-| Input File | [-] | Name of the input file |
-| Cycle | [-] | Name of the cycle file |
-| Status | [-] | The result status of the run (Success, Aborted) |
-| time | [s] | Total simulation time |
-| distance | [km] | Total traveled distance |
-| speed | [km/h] | Average vehicle speed |
-| altitudeDelta | [m] | Altitude difference between start and end of cycle |
-| Ppos | [kW] | Average positive engine power |
-| PwheelPos | [kW] | Average positive wheel power |
-| Pneg | [kW] | Average negative engine power |
-| FC-Final | [g/km], [l/100km], [l/100tkm] | Average fuel consumption. Final value after all corrections. |
-| FC-Map | [g/h], [g/km] | Fuel consumption interpolated from [Fuel Map](#fuel-consumption-calculation). |
-| FC-AUXc | [g/h], [g/km] | Fuel consumption after [Auxiliary-Start/Stop Correction](#fuel-consumption-calculation). (Based on FC-Map.) |
-| FC-WHTCc | [g/h], [g/km] | Fuel consumption after [WHTC Correction](#fuel-consumption-calculation). (Based on FC-AUXc.) |
-| CO2 | [g/km], [g/tkm] | Average CO~2~ emissions. |
-| Pbrake | [kW] | Average brake power (not including engine drag) |
-| EposICE | [kWh] | Total positive engine work |
-| EnegICE | [kWh] | Total negative engine work (engine brake) |
-| Eair | [kWh] | Total work of air resistance |
-| Eroll | [kWh] | Total work of rolling resistance |
-| Egrad | [kWh] | Total work of gradient resistance |
-| Eacc | [kWh] | Total work from accelerations (<0) / decelerations (>0) |
-| Eaux | [kWh] | Total energy demand of auxiliaries |
-| Eaux_xxx | [kWh] | Energy demand of auxiliary with ID xxx. See also [Aux Dialog](#auxiliary-dialog) and [Driving Cycle](#driving-cycles). |
-| Ebrake | [kWh] | Total work dissipated in mechanical braking (sum of service brakes, retader and additional engine exhaust brakes) |
-| Etransm | [kWh] | Total work of transmission losses |
-| Eretarder | [kWh] | Total retarder losses |
-| Etorqueconv | [kWh] | Total torque converter losses |
-| Mass | [kg] | Vehicle mass (equals **Curb Weight Vehicle** plus **Curb Weight Extra Trailer/Body**, see [Vehicle Editor](#vehicle-editor)) |
-| Loading | [kg] | Vehicle loading (see [Vehicle Editor](#vehicle-editor)) |
-| 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 \* |
-| pStop | [%] | Time share of stop phases \* |
-
-\*Definition of phases:
-: Acceleration Phase: a~3s~ > 0.125 \[m/s^2^\]
-: Deceleration Phase: a~3s~ < -0.125 \[m/s^2^\]
-: Cruise Phase: -0.125 ≤ a~3s~ ≤ 0.125 \[m/s^2^\]
-: Stop Phase: v < 0.1 \[m/s\]
-
-*a~3s~ = 3-seconds-averaged acceleration*
-
-
-Definition of work (E...):
-: sign > 0: positive work applied to the vehicle (e.g. from engine, from kinetic energy)
-: sign < 0: losses
-: The sum of EposICE, EnegICE, Eair, Eroll, Egrad, Eacc, Eaux, Ebrake, Etransm and Eretarder is zero (besides small rounding error for long driving cycles)
+| Name | Unit | Description |
+|-----------------------|--------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Job | [-] | Job number in the format "X-Y" (with X as filenumber, and Y as cycle number) |
+| Input File | [-] | Name of the input job file (.vecto) |
+| Cycle | [-] | Name of the cycle file (or cycle name in declaration mode) |
+| Status | [-] | The result status of the run (Success, Aborted) |
+| Mass | [kg] | Vehicle mass (**Curb Weight Vehicle** + **Curb Weight Extra Trailer/Body**, see [Vehicle Editor](#vehicle-editor)) |
+| Loading | [kg] | Vehicle loading (see [Vehicle Editor](#vehicle-editor)) |
+| time | [s] | Total simulation time |
+| distance | [km] | Total traveled distance |
+| speed | [km/h] | Average vehicle speed |
+| altitudeDelta | [m] | Altitude difference between start and end of cycle |
+| FC-Map | [g/h], [g/km] | Average fuel consumption before all corrections, interpolated from [Fuel Map](#fuel-consumption-calculation), based on torque and engine speed. |
+| FC-AUXc | [g/h], [g/km] | Average fuel consumption after [Auxiliary-Start/Stop Correction](#fuel-consumption-calculation) (Based on FC-Map) |
+| FC-WHTCc | [g/h], [g/km] | Average fuel consumption after [WHTC Correction](#fuel-consumption-calculation) (Based on FC-AUXc) |
+| FC-AAUX | [g/h], [g/km] | Average fuel consumption after Smart Auxiliary Correction (*still in development*) (Based on FC-WHTCc) |
+| FC-Final | [g/h], [g/km], [l/100km], [l/100tkm] | Final average fuel consumption after ALL corrections. Value for calculation of CO~2~ value. Output for [l/100tkm] is empty when Loading = 0[kg]. |
+| CO2 | [g/km], [g/tkm] | Average CO~2~ emissions (based on FC-Final value). Output for [l/100tkm] is empty when Loading = 0[kg]. |
+| P_wheel_in_pos | [kW] | Average positive power at the wheels |
+| P_brake_loss | [kW] | Average brake power losses (not including engine drag) |
+| P_eng_out_pos | [kW] | Average positive engine power (all non-negative values averaged over the whole cycle duration) |
+| P_eng_out_neg | [kW] | Average negative engine power (all non-positive values averaged over the whole cycle duration) |
+| E_aux_xxx | [kWh] | Total energy demand of auxiliary with ID xxx. See also [Aux Dialog](#auxiliary-dialog) and [Driving Cycle](#driving-cycles). In Declaration Mode the following auxiliaries always exists: E_aux_FAN (Fan), E_aux_PS (Pneumatic System), E_aux_STP (Steering Pump), E_aux_ES (Electrical System), E_aux_AC (Air Condition) |
+| E_aux_sum | [kWh] | Total energy demand of all auxiliaries |
+| E_air | [kWh] | Total work of air resistance |
+| E_roll | [kWh] | Total work of rolling resistance |
+| E_grad | [kWh] | Total work of gradient resistance |
+| E_inertia | [kWh] | Total work of gearbox and engine inertia |
+| E_brake | [kWh] | Total work dissipated in mechanical braking (sum of service brakes, retader and additional engine exhaust brakes) |
+| E_gbx_axl_loss | [kWh] | Total transmission energy losses at gearbox and axlegear |
+| E_ret_loss | [kWh] | Total retarder energy loss |
+| E_tc_loss | [kWh] | Total torque converter energy loss |
+| E_eng_out_pos | [kWh] | Total positive engine work |
+| E_eng_out_neg | [kWh] | Total negative engine work (engine drag) |
+| a | [m/s^2^] | Average acceleration |
+| a_pos | [m/s^2^] | Average acceleration in acceleration phases (a~3s~ \> 0.125 \[m/s^2^\], a~3s~ = 3-seconds-averaged acceleration) |
+| a_neg | [m/s^2^] | Average deceleration in deceleration phases (a~3s~ \< 0.125 \[m/s^2^\], a~3s~ = 3-seconds-averaged acceleration) |
+| AccelerationTimeShare | [%] | Time share of acceleration phases (a~3s~ \> 0.125 \[m/s^2^\], a~3s~ = 3-seconds-averaged acceleration) |
+| DecelerationTimeShare | [%] | Time share of deceleration phases (a~3s~ \< 0.125 \[m/s^2^\], a~3s~ = 3-seconds-averaged acceleration) |
+| CruiseTimeShare | [%] | Time share of cruise phases (-0.125 ≤ a~3s~ ≤ 0.125 \[m/s^2^\]) |
+| StopTimeShare | [%] | Time share of stop phases (v \< 0.1 \[m/s\]) |
diff --git a/User Manual/help.html b/User Manual/help.html
index 1fea0389b2d4873b102f53107c083d9091eca315..7e417af306ddee6e9c733996795b4c908e4309bc 100644
--- a/User Manual/help.html
+++ b/User Manual/help.html
@@ -3301,9 +3301,9 @@ Auxiliary speed [rpm],Mechanical power [kW],Supply power [kW]
<p><strong><em>Quantities:</em></strong></p>
<table>
<colgroup>
-<col width="9%"></col>
-<col width="18%"></col>
-<col width="72%"></col>
+<col width="6%"></col>
+<col width="10%"></col>
+<col width="83%"></col>
</colgroup>
<thead>
<tr class="header">
@@ -3316,17 +3316,27 @@ Auxiliary speed [rpm],Mechanical power [kW],Supply power [kW]
<tr class="odd">
<td align="left">Job</td>
<td align="left">[-]</td>
-<td align="left">Job number in the format “x-y” (where x = file number and y = cycle number)</td>
+<td align="left">Job number in the format “X-Y” (with X as filenumber, and Y as cycle number)</td>
</tr>
<tr class="even">
<td align="left">Input File</td>
<td align="left">[-]</td>
-<td align="left">Name of the input file</td>
+<td align="left">Name of the input job file (.vecto)</td>
</tr>
<tr class="odd">
<td align="left">Cycle</td>
<td align="left">[-]</td>
-<td align="left">Name of the cycle file</td>
+<td align="left">Name of the cycle file (or cycle name in declaration mode)</td>
+</tr>
+<tr class="even">
+<td align="left">Mass</td>
+<td align="left">[kg]</td>
+<td align="left">Vehicle mass (<strong>Curb Weight Vehicle</strong> + <strong>Curb Weight Extra Trailer/Body</strong>, see <a href="#vehicle-editor">Vehicle Editor</a>)</td>
+</tr>
+<tr class="odd">
+<td align="left">Loading</td>
+<td align="left">[kg]</td>
+<td align="left">Vehicle loading (see <a href="#vehicle-editor">Vehicle Editor</a>)</td>
</tr>
<tr class="even">
<td align="left">Status</td>
@@ -3354,183 +3364,152 @@ Auxiliary speed [rpm],Mechanical power [kW],Supply power [kW]
<td align="left">Altitude difference between start and end of cycle</td>
</tr>
<tr class="odd">
-<td align="left">Ppos</td>
-<td align="left">[kW]</td>
-<td align="left">Average positive engine power</td>
-</tr>
-<tr class="even">
-<td align="left">PwheelPos</td>
-<td align="left">[kW]</td>
-<td align="left">Average positive wheel power</td>
-</tr>
-<tr class="odd">
-<td align="left">Pneg</td>
-<td align="left">[kW]</td>
-<td align="left">Average negative engine power</td>
-</tr>
-<tr class="even">
-<td align="left">FC-Final</td>
-<td align="left">[g/km], [l/100km], [l/100tkm]</td>
-<td align="left">Average fuel consumption. Final value after all corrections.</td>
-</tr>
-<tr class="odd">
<td align="left">FC-Map</td>
<td align="left">[g/h], [g/km]</td>
-<td align="left">Fuel consumption interpolated from <a href="#fuel-consumption-calculation">Fuel Map</a>.</td>
+<td align="left">Average fuel consumption before all corrections, interpolated from <a href="#fuel-consumption-calculation">Fuel Map</a>, based on torque and engine speed.</td>
</tr>
<tr class="even">
<td align="left">FC-AUXc</td>
<td align="left">[g/h], [g/km]</td>
-<td align="left">Fuel consumption after <a href="#fuel-consumption-calculation">Auxiliary-Start/Stop Correction</a>. (Based on FC-Map.)</td>
+<td align="left">Average fuel consumption after <a href="#fuel-consumption-calculation">Auxiliary-Start/Stop Correction</a> (Based on FC-Map)</td>
</tr>
<tr class="odd">
<td align="left">FC-WHTCc</td>
<td align="left">[g/h], [g/km]</td>
-<td align="left">Fuel consumption after <a href="#fuel-consumption-calculation">WHTC Correction</a>. (Based on FC-AUXc.)</td>
+<td align="left">Average fuel consumption after <a href="#fuel-consumption-calculation">WHTC Correction</a> (Based on FC-AUXc)</td>
+</tr>
+<tr class="even">
+<td align="left">FC-AAUX</td>
+<td align="left">[g/h], [g/km]</td>
+<td align="left">Average fuel consumption after Smart Auxiliary Correction (<em>still in development</em>) (Based on FC-WHTCc)</td>
+</tr>
+<tr class="odd">
+<td align="left">FC-Final</td>
+<td align="left">[g/h], [g/km], [l/100km], [l/100tkm]</td>
+<td align="left">Final average fuel consumption after ALL corrections. Value for calculation of CO<sub>2</sub> value. Output for [l/100tkm] is empty when Loading = 0[kg].</td>
</tr>
<tr class="even">
<td align="left">CO2</td>
<td align="left">[g/km], [g/tkm]</td>
-<td align="left">Average CO<sub>2</sub> emissions.</td>
+<td align="left">Average CO<sub>2</sub> emissions (based on FC-Final value). Output for [l/100tkm] is empty when Loading = 0[kg].</td>
</tr>
<tr class="odd">
-<td align="left">Pbrake</td>
+<td align="left">P_wheel_in_pos</td>
<td align="left">[kW]</td>
-<td align="left">Average brake power (not including engine drag)</td>
+<td align="left">Average positive power at the wheels</td>
</tr>
<tr class="even">
-<td align="left">EposICE</td>
-<td align="left">[kWh]</td>
-<td align="left">Total positive engine work</td>
+<td align="left">P_brake_loss</td>
+<td align="left">[kW]</td>
+<td align="left">Average brake power losses (not including engine drag)</td>
</tr>
<tr class="odd">
-<td align="left">EnegICE</td>
-<td align="left">[kWh]</td>
-<td align="left">Total negative engine work (engine brake)</td>
+<td align="left">P_eng_out_pos</td>
+<td align="left">[kW]</td>
+<td align="left">Average positive engine power (all non-negative values averaged over the whole cycle duration)</td>
</tr>
<tr class="even">
-<td align="left">Eair</td>
-<td align="left">[kWh]</td>
-<td align="left">Total work of air resistance</td>
+<td align="left">P_eng_out_neg</td>
+<td align="left">[kW]</td>
+<td align="left">Average negative engine power (all non-positive values averaged over the whole cycle duration)</td>
</tr>
<tr class="odd">
-<td align="left">Eroll</td>
+<td align="left">E_aux_xxx</td>
<td align="left">[kWh]</td>
-<td align="left">Total work of rolling resistance</td>
+<td align="left">Total energy demand of auxiliary with ID xxx. See also <a href="#auxiliary-dialog">Aux Dialog</a> and <a href="#driving-cycles">Driving Cycle</a>. In Declaration Mode the following auxiliaries always exists: E_aux_FAN (Fan), E_aux_PS (Pneumatic System), E_aux_STP (Steering Pump), E_aux_ES (Electrical System), E_aux_AC (Air Condition)</td>
</tr>
<tr class="even">
-<td align="left">Egrad</td>
+<td align="left">E_aux_sum</td>
<td align="left">[kWh]</td>
-<td align="left">Total work of gradient resistance</td>
+<td align="left">Total energy demand of all auxiliaries</td>
</tr>
<tr class="odd">
-<td align="left">Eacc</td>
+<td align="left">E_air</td>
<td align="left">[kWh]</td>
-<td align="left">Total work from accelerations (<0) / decelerations (>0)</td>
+<td align="left">Total work of air resistance</td>
</tr>
<tr class="even">
-<td align="left">Eaux</td>
+<td align="left">E_roll</td>
<td align="left">[kWh]</td>
-<td align="left">Total energy demand of auxiliaries</td>
+<td align="left">Total work of rolling resistance</td>
</tr>
<tr class="odd">
-<td align="left">Eaux_xxx</td>
+<td align="left">E_grad</td>
<td align="left">[kWh]</td>
-<td align="left">Energy demand of auxiliary with ID xxx. See also <a href="#auxiliary-dialog">Aux Dialog</a> and <a href="#driving-cycles">Driving Cycle</a>.</td>
+<td align="left">Total work of gradient resistance</td>
</tr>
<tr class="even">
-<td align="left">Ebrake</td>
+<td align="left">E_inertia</td>
<td align="left">[kWh]</td>
-<td align="left">Total work dissipated in mechanical braking (sum of service brakes, retader and additional engine exhaust brakes)</td>
+<td align="left">Total work of gearbox and engine inertia</td>
</tr>
<tr class="odd">
-<td align="left">Etransm</td>
+<td align="left">E_brake</td>
<td align="left">[kWh]</td>
-<td align="left">Total work of transmission losses</td>
+<td align="left">Total work dissipated in mechanical braking (sum of service brakes, retader and additional engine exhaust brakes)</td>
</tr>
<tr class="even">
-<td align="left">Eretarder</td>
+<td align="left">E_gbx_axl_loss</td>
<td align="left">[kWh]</td>
-<td align="left">Total retarder losses</td>
+<td align="left">Total transmission energy losses at gearbox and axlegear</td>
</tr>
<tr class="odd">
-<td align="left">Etorqueconv</td>
+<td align="left">E_ret_loss</td>
<td align="left">[kWh]</td>
-<td align="left">Total torque converter losses</td>
+<td align="left">Total retarder energy loss</td>
</tr>
<tr class="even">
-<td align="left">Mass</td>
-<td align="left">[kg]</td>
-<td align="left">Vehicle mass (equals <strong>Curb Weight Vehicle</strong> plus <strong>Curb Weight Extra Trailer/Body</strong>, see <a href="#vehicle-editor">Vehicle Editor</a>)</td>
+<td align="left">E_tc_loss</td>
+<td align="left">[kWh]</td>
+<td align="left">Total torque converter energy loss</td>
</tr>
<tr class="odd">
-<td align="left">Loading</td>
-<td align="left">[kg]</td>
-<td align="left">Vehicle loading (see <a href="#vehicle-editor">Vehicle Editor</a>)</td>
+<td align="left">E_eng_out_pos</td>
+<td align="left">[kWh]</td>
+<td align="left">Total positive engine work</td>
</tr>
<tr class="even">
-<td align="left">a</td>
-<td align="left">[m/s²]</td>
-<td align="left">Average acceleration</td>
+<td align="left">E_eng_out_neg</td>
+<td align="left">[kWh]</td>
+<td align="left">Total negative engine work (engine drag)</td>
</tr>
<tr class="odd">
-<td align="left">a_pos</td>
-<td align="left">[m/s²]</td>
-<td align="left">Average acceleration in acceleration phases *</td>
+<td align="left">a</td>
+<td align="left">[m/s<sup>2</sup>]</td>
+<td align="left">Average acceleration</td>
</tr>
<tr class="even">
-<td align="left">a_neg</td>
-<td align="left">[m/s²]</td>
-<td align="left">Average deceleration in deceleration phases *</td>
+<td align="left">a_pos</td>
+<td align="left">[m/s<sup>2</sup>]</td>
+<td align="left">Average acceleration in acceleration phases (a<sub>3s</sub> > 0.125 [m/s<sup>2</sup>], a<sub>3s</sub> = 3-seconds-averaged acceleration)</td>
</tr>
<tr class="odd">
-<td align="left">Acc.Noise</td>
-<td align="left">[m/s²]</td>
-<td align="left">Acceleration noise</td>
+<td align="left">a_neg</td>
+<td align="left">[m/s<sup>2</sup>]</td>
+<td align="left">Average deceleration in deceleration phases (a<sub>3s</sub> < 0.125 [m/s<sup>2</sup>], a<sub>3s</sub> = 3-seconds-averaged acceleration)</td>
</tr>
<tr class="even">
-<td align="left">pAcc</td>
+<td align="left">AccelerationTimeShare</td>
<td align="left">[%]</td>
-<td align="left">Time share of acceleration phases *</td>
+<td align="left">Time share of acceleration phases (a<sub>3s</sub> > 0.125 [m/s<sup>2</sup>], a<sub>3s</sub> = 3-seconds-averaged acceleration)</td>
</tr>
<tr class="odd">
-<td align="left">pDec</td>
+<td align="left">DecelerationTimeShare</td>
<td align="left">[%]</td>
-<td align="left">Time share of deceleration phases *</td>
+<td align="left">Time share of deceleration phases (a<sub>3s</sub> < 0.125 [m/s<sup>2</sup>], a<sub>3s</sub> = 3-seconds-averaged acceleration)</td>
</tr>
<tr class="even">
-<td align="left">pCruise</td>
+<td align="left">CruiseTimeShare</td>
<td align="left">[%]</td>
-<td align="left">Time share of cruise phases *</td>
+<td align="left">Time share of cruise phases (-0.125 ≤ a<sub>3s</sub> ≤ 0.125 [m/s<sup>2</sup>])</td>
</tr>
<tr class="odd">
-<td align="left">pStop</td>
+<td align="left">StopTimeShare</td>
<td align="left">[%]</td>
-<td align="left">Time share of stop phases *</td>
+<td align="left">Time share of stop phases (v < 0.1 [m/s])</td>
</tr>
</tbody>
</table>
-<dl>
-<dt>*Definition of phases:</dt>
-<dd>Acceleration Phase: a<sub>3s</sub> > 0.125 [m/s<sup>2</sup>]
-</dd>
-<dd>Deceleration Phase: a<sub>3s</sub> < -0.125 [m/s<sup>2</sup>]
-</dd>
-<dd>Cruise Phase: -0.125 ≤ a<sub>3s</sub> ≤ 0.125 [m/s<sup>2</sup>]
-</dd>
-<dd>Stop Phase: v < 0.1 [m/s]
-</dd>
-</dl>
-<p><em>a<sub>3s</sub> = 3-seconds-averaged acceleration</em></p>
-<dl>
-<dt>Definition of work (E…):</dt>
-<dd>sign > 0: positive work applied to the vehicle (e.g. from engine, from kinetic energy)
-</dd>
-<dd>sign < 0: losses
-</dd>
-<dd>The sum of EposICE, EnegICE, Eair, Eroll, Egrad, Eacc, Eaux, Ebrake, Etransm and Eretarder is zero (besides small rounding error for long driving cycles)
-</dd>
-</dl>
</div>
<div id="application-files" class="section level2">
<h2>Application Files</h2>
@@ -3904,7 +3883,7 @@ Auxiliary speed [rpm],Mechanical power [kW],Supply power [kW]
</div>
<div id="FOOTER">
<a target="mainframe" href="mailto:vecto@jrc.ec.europa.eu">Contact</a>
-<a style="text-align:right; float:right" href="javascript:$('div').show().not('.vecto2').not('.vecto3').css({'padding-left':'0px'}).filter('#CONTENT,#TOC,#HEADER,#FOOTER,#MathJax_Message').hide();">Print View</a>
+<span style="text-align:right; float:right">Print View: <a href="javascript:$('div').show().not('.vecto2').not('.vecto3').css({'padding-left':'0px'}).filter('#CONTENT,#TOC,#HEADER,#FOOTER,#MathJax_Message').hide();">All</a>, <a href="javascript:$('div').not('.vecto2').not('.vecto3').css({'padding-left':'0px'}).filter('#TOC,#HEADER,#FOOTER,#MathJax_Message').hide();$('#CONTENT').css({'display':'inline'});">Current</a>
</div>
</body>
</html>
diff --git a/User Manual/includes/footer.html b/User Manual/includes/footer.html
index 24488efb91c0c99e09f4ff6abad44426115c2785..ce4cf4d509c527a6b426b641265b7abc4d903cb3 100644
--- a/User Manual/includes/footer.html
+++ b/User Manual/includes/footer.html
@@ -1,4 +1,4 @@
<div id="FOOTER">
<a target="mainframe" href="mailto:vecto@jrc.ec.europa.eu">Contact</a>
-<a style="text-align:right; float:right" href="javascript:$('div').show().not('.vecto2').not('.vecto3').css({'padding-left':'0px'}).filter('#CONTENT,#TOC,#HEADER,#FOOTER,#MathJax_Message').hide();">Print View</a>
+<span style="text-align:right; float:right">Print View: <a href="javascript:$('div').show().not('.vecto2').not('.vecto3').css({'padding-left':'0px'}).filter('#CONTENT,#TOC,#HEADER,#FOOTER,#MathJax_Message').hide();">All</a>, <a href="javascript:$('div').not('.vecto2').not('.vecto3').css({'padding-left':'0px'}).filter('#TOC,#HEADER,#FOOTER,#MathJax_Message').hide();$('#CONTENT').css({'display':'inline'});">Current</a>
</div>
\ No newline at end of file
diff --git a/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index d5acc21e4cd5b1376b862d4aa6979a473977e2eb..dd143650d495a6a2c2e52ecbea0909cd1e7c2189 100644
--- a/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -69,7 +69,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
driverdata.AccelerationCurve = AccelerationCurveData.ReadFromStream(segment.AccelerationFile);
var engineData = dao.CreateEngineData(InputDataProvider.EngineInputData);
-
var gearboxData = dao.CreateGearboxData(InputDataProvider.GearboxInputData, engineData);
var axlegearData = dao.CreateAxleGearData(InputDataProvider.AxleGearInputData);
var retarderData = dao.CreateRetarderData(InputDataProvider.RetarderInputData, InputDataProvider.VehicleInputData);
@@ -102,7 +101,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
var simulationRunData = new VectoRunData {
Loading = loading.Key,
VehicleData = dao.CreateVehicleData(InputDataProvider.VehicleInputData, mission, loading.Value),
- EngineData = engineData,
+ EngineData = engineData.Copy(),
GearboxData = gearboxData,
AxleGearData = axlegearData,
Aux = dao.CreateAuxiliaryData(InputDataProvider.AuxiliaryInputData(), mission.MissionType,
diff --git a/VectoCore/Models/Simulation/Data/ModalResult.cs b/VectoCore/Models/Simulation/Data/ModalResult.cs
index b215dd5dc2859dc613b0fd67d3910e68e7e1b7bc..7bb96ec9f4db0913ba1e843a40a2cc5e4863fbae 100644
--- a/VectoCore/Models/Simulation/Data/ModalResult.cs
+++ b/VectoCore/Models/Simulation/Data/ModalResult.cs
@@ -50,7 +50,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
public const string ShowUnit = "showUnit";
}
-
public ModalResults()
{
foreach (var value in EnumHelper.GetValues<ModalResultField>()) {
@@ -189,6 +188,16 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
/// </summary>
[ModalResultField(typeof(SI), name: "FC-WHTCc", caption: "FC-WHTCc [g/h]", outputFactor: 3600 * 1000)] FCWHTCc,
+ /// <summary>
+ /// [g/h] Fuel consumption after smart auxiliary correction.
+ /// </summary>
+ [ModalResultField(typeof(SI), name: "FC-AAUX", caption: "FC-AAUX [g/h]", outputFactor: 3600 * 1000)] FCAAUX,
+
+ /// <summary>
+ /// [g/h] Fuel consumption after WHTC Correction. (Based on FC-AUXc.)
+ /// </summary>
+ [ModalResultField(typeof(SI), name: "FC-Final", caption: "FC-Final [g/h]", outputFactor: 3600 * 1000)] FCFinal,
+
/// <summary>
/// [km] Travelled distance.
/// </summary>
@@ -286,7 +295,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
[ModalResultField(typeof(SI), caption: "P_eng_fcmap [kW]", outputFactor: 1e-3)] P_eng_fcmap,
-
/// <summary>
/// [kW] Power demand of Auxiliary with ID xxx. See also Aux Dialog and Driving Cycle.
/// </summary>
@@ -320,7 +328,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
[ModalResultField(typeof(SI), name: "ds [m]")] simulationDistance
}
-
[AttributeUsage(AttributeTargets.Field)]
public class ModalResultFieldAttribute : Attribute
{
diff --git a/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs b/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
index 48bfc16afc31a6076008a7a0e67ba0c9f993bff2..4b96073226c7e4d99c9a9a30c305efb7d013691f 100644
--- a/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
+++ b/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
@@ -127,7 +127,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
modContainer.WriteModalResults = WriteModalResults;
var current = i++;
var builder = new PowertrainBuilder(modContainer, (writer, mass, loading) =>
- SumData.Write(d.IsEngineOnly, modContainer, d.JobName, string.Format("{0}-{1}", JobNumber, current),
+ SumData.Write(modContainer, d.JobName, string.Format("{0}-{1}", JobNumber, current),
d.Cycle.Name + Constants.FileExtensions.CycleFile, mass, loading));
VectoRun run;
diff --git a/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs b/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
index d6ccb2d1ecbabca074176145a25cf19bfa2bc5ad..c1dfcbeefb20f04a4e489bcc0c64827dc652fcaf 100644
--- a/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
+++ b/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
@@ -71,6 +72,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
WHTCRural = 1;
}
+ public CombustionEngineData Copy()
+ {
+ return new CombustionEngineData {
+ Displacement = Displacement,
+ IdleSpeed = IdleSpeed,
+ Inertia = Inertia,
+ WHTCUrban = WHTCUrban,
+ WHTCRural = WHTCRural,
+ WHTCMotorway = WHTCMotorway,
+ ConsumptionMap = ConsumptionMap,
+ FullLoadCurve = FullLoadCurve,
+ WHTCCorrectionFactor = WHTCCorrectionFactor,
+ };
+ }
+
#region Equality Member
protected bool Equals(CombustionEngineData other)
diff --git a/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index a52c3823c693f31e70a76a29b39aa129ace02c5a..01221911493fc9c044ebbca584aa20c1595638be 100644
--- a/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -327,12 +327,19 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
try {
var fc = ModelData.ConsumptionMap.GetFuelConsumption(CurrentState.EngineTorque, avgEngineSpeed,
allowExtrapolation: (DataBus.ExecutionMode != ExecutionMode.Declaration));
- container[ModalResultField.FCMap] = fc;
//todo (MK, 2015-11-11): calculate aux start stop correction when start stop functionality is implemented in v3
- var fcaux = fc;
- container[ModalResultField.FCAUXc] = fcaux;
- container[ModalResultField.FCWHTCc] = fcaux * ModelData.WHTCCorrectionFactor;
+ var fcAux = fc;
+
+ var fcWHTC = fcAux * ModelData.WHTCCorrectionFactor;
+ var fcAAUX = fcWHTC;
+ var fcFinal = fcAAUX;
+
+ container[ModalResultField.FCMap] = fc;
+ container[ModalResultField.FCAUXc] = fcAux;
+ container[ModalResultField.FCWHTCc] = fcWHTC;
+ container[ModalResultField.FCAAUX] = fcAAUX;
+ container[ModalResultField.FCFinal] = fcFinal;
if (ModelData.ConsumptionMap.Extrapolated) {
Log.Warn("FuelMap Extrapolated: n_eng_avg: {0} Tq: {1}, FC: {2}", avgEngineSpeed.ConvertTo().Rounds.Per.Minute,
@@ -342,6 +349,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
Log.Warn("FuelMap: {0} n_eng_avg: {1} Tq: {2}", ex.Message, avgEngineSpeed.ConvertTo().Rounds.Per.Minute,
CurrentState.EngineTorque);
container[ModalResultField.FCMap] = null;
+ container[ModalResultField.FCAUXc] = null;
+ container[ModalResultField.FCWHTCc] = null;
+ container[ModalResultField.FCAAUX] = null;
+ container[ModalResultField.FCFinal] = null;
}
}
@@ -442,11 +453,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public NewtonMeter FullDragTorque { get; set; }
-
// ReSharper disable once InconsistentNaming
}
-
protected class CombustionEngineIdleController : LoggingObject, ICombustionEngineIdleController
{
protected readonly double PeDropSlope = -0.75;
@@ -503,7 +512,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return retVal;
}
-
nextAngularSpeed = prevEngineSpeed + deltaAngularSpeed;
if (nextAngularSpeed < Engine.ModelData.IdleSpeed) {
nextAngularSpeed = Engine.ModelData.IdleSpeed;
@@ -541,7 +549,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
do {
nextAngularSpeed -= searchInterval * delta.Sign();
-
var response = (ResponseDryRun)RequestPort.Request(absTime, dt, torque, nextAngularSpeed, true);
delta = response.DeltaDragLoad;
debug.Add(new { engineSpeed = nextAngularSpeed, searchInterval, delta });
diff --git a/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/OutputData/IModalDataContainer.cs
index a52ac84014ff02d7a750c1712cfb9843e0df90d4..df18a017a4dd4473c21c2ef87c104cee5453864c 100644
--- a/VectoCore/OutputData/IModalDataContainer.cs
+++ b/VectoCore/OutputData/IModalDataContainer.cs
@@ -79,7 +79,6 @@ namespace TUGraz.VectoCore.OutputData
VectoRun.Status RunStatus { get; }
-
/// <summary>
/// Finishes the writing of the DataWriter.
/// </summary>
@@ -91,7 +90,6 @@ namespace TUGraz.VectoCore.OutputData
IEnumerable<T> GetValues<T>(DataColumn col);
-
Dictionary<string, DataColumn> Auxiliaries { get; set; }
void AddAuxiliary(string id);
@@ -140,7 +138,7 @@ namespace TUGraz.VectoCore.OutputData
return self ?? defaultValue;
}
- public static MeterPerSquareSecond AccelerationsPositive3SecondAverage(this IModalDataContainer data)
+ public static MeterPerSquareSecond AccelerationsPositive(this IModalDataContainer data)
{
try {
var acceleration3SecondAverage = AccelerationPer3Seconds(data);
@@ -150,18 +148,7 @@ namespace TUGraz.VectoCore.OutputData
}
}
- public static MeterPerSquareSecond AccelerationNoise(this IModalDataContainer data)
- {
- var avg = data.AccelerationAverage();
- var accelerationAverages = AccelerationPerSecond(data).ToList();
- if (accelerationAverages.Any()) {
- var sqareAvg = accelerationAverages.Select(x => (x - avg) * (x - avg)).Sum() / accelerationAverages.Count;
- return sqareAvg.Sqrt().Cast<MeterPerSquareSecond>();
- }
- return null;
- }
-
- public static MeterPerSquareSecond AverageAccelerations3SecondNegative(this IModalDataContainer data)
+ public static MeterPerSquareSecond AccelerationsNegative(this IModalDataContainer data)
{
var acceleration3SecondAverage = AccelerationPer3Seconds(data).ToList();
if (acceleration3SecondAverage.Any()) {
@@ -170,7 +157,7 @@ namespace TUGraz.VectoCore.OutputData
return null;
}
- public static Scalar PercentAccelerationTime(this IModalDataContainer data)
+ public static Scalar AccelerationTimeShare(this IModalDataContainer data)
{
var acceleration3SecondAverage = AccelerationPer3Seconds(data).ToList();
if (acceleration3SecondAverage.Any()) {
@@ -179,7 +166,7 @@ namespace TUGraz.VectoCore.OutputData
return null;
}
- public static Scalar PercentDecelerationTime(this IModalDataContainer data)
+ public static Scalar DecelerationTimeShare(this IModalDataContainer data)
{
var acceleration3SecondAverage = AccelerationPer3Seconds(data).ToList();
if (acceleration3SecondAverage.Any()) {
@@ -188,7 +175,7 @@ namespace TUGraz.VectoCore.OutputData
return null;
}
- public static Scalar PercentCruiseTime(this IModalDataContainer data)
+ public static Scalar CruiseTimeShare(this IModalDataContainer data)
{
var acceleration3SecondAverage = AccelerationPer3Seconds(data).ToList();
if (acceleration3SecondAverage.Any()) {
@@ -198,7 +185,7 @@ namespace TUGraz.VectoCore.OutputData
return null;
}
- public static Scalar PercentStopTime(this IModalDataContainer data)
+ public static Scalar StopTimeShare(this IModalDataContainer data)
{
var stopTime = data.GetValues<MeterPerSecond>(ModalResultField.v_act)
.Zip(data.SimulationIntervals(), (v, dt) => new { v, dt })
@@ -310,7 +297,7 @@ namespace TUGraz.VectoCore.OutputData
return data.TimeIntegral<WattSecond>(ModalResultField.P_wheel_in, x => x > 0) / data.Duration();
}
- public static KilogramPerMeter FuelConsumptionWHTCCorrected(this IModalDataContainer data)
+ public static KilogramPerMeter FuelConsumptionWHTC(this IModalDataContainer data)
{
var distance = data.Distance();
if (distance == null || distance.IsEqual(0)) {
@@ -319,12 +306,12 @@ namespace TUGraz.VectoCore.OutputData
return data.TimeIntegral<Kilogram>(ModalResultField.FCWHTCc) / distance;
}
- public static KilogramPerSecond FuelConsumptionWHTCCorrectedPerSecond(this IModalDataContainer data)
+ public static KilogramPerSecond FuelConsumptionWHTCPerSecond(this IModalDataContainer data)
{
return data.TimeIntegral<Kilogram>(ModalResultField.FCWHTCc) / data.Duration();
}
- public static KilogramPerMeter FuelConsumptionAuxStartStopCorrected(this IModalDataContainer data)
+ public static KilogramPerMeter FuelConsumptionAuxStartStop(this IModalDataContainer data)
{
var distance = data.Distance();
if (distance == null || distance.IsEqual(0)) {
@@ -333,18 +320,37 @@ namespace TUGraz.VectoCore.OutputData
return data.TimeIntegral<Kilogram>(ModalResultField.FCAUXc) / distance;
}
- public static KilogramPerSecond FuelConsumptionAuxStartStopCorrectedPerSecond(this IModalDataContainer data)
+ public static KilogramPerSecond FuelConsumptionAAUXPerSecond(this IModalDataContainer data)
+ {
+ return data.TimeIntegral<Kilogram>(ModalResultField.FCAAUX) / data.Duration();
+ }
+
+ public static KilogramPerMeter FuelConsumptionAAUX(this IModalDataContainer data)
+ {
+ var distance = data.Distance();
+ if (distance == null || distance.IsEqual(0)) {
+ return null;
+ }
+ return data.TimeIntegral<Kilogram>(ModalResultField.FCAAUX) / distance;
+ }
+
+ public static KilogramPerSecond FuelConsumptionAuxStartStopPerSecond(this IModalDataContainer data)
{
return data.TimeIntegral<Kilogram>(ModalResultField.FCAUXc) / data.Duration();
}
+ public static KilogramPerSecond FuelConsumptionFinalPerSecond(this IModalDataContainer data)
+ {
+ return data.TimeIntegral<Kilogram>(ModalResultField.FCFinal) / data.Duration();
+ }
+
public static KilogramPerMeter FuelConsumptionFinal(this IModalDataContainer data)
{
var distance = data.Distance();
if (distance == null || distance.IsEqual(0)) {
return null;
}
- return data.TimeIntegral<Kilogram>(ModalResultField.FCWHTCc) / distance;
+ return data.TimeIntegral<Kilogram>(ModalResultField.FCFinal) / distance;
}
public static SI FuelConsumptionFinalLiterPer100Kilometer(this IModalDataContainer data)
@@ -364,21 +370,15 @@ namespace TUGraz.VectoCore.OutputData
if (distance == null || distance.IsEqual(0)) {
return null;
}
- return data.TimeIntegral<Kilogram>(ModalResultField.FCMap) * Physics.CO2PerFuelWeight / distance;
+ return data.TimeIntegral<Kilogram>(ModalResultField.FCFinal) * Physics.CO2PerFuelWeight / distance;
}
- public static SI FuelConsumptionLiterPer100Kilometer(this IModalDataContainer data)
- {
- var fcVolumePerMeter = data.FuelConsumptionPerMeter() / Physics.FuelDensity;
- return fcVolumePerMeter.ConvertTo().Cubic.Dezi.Meter * 100.SI().Kilo.Meter;
- }
-
- public static KilogramPerSecond FuelConsumptionPerSecond(this IModalDataContainer data)
+ public static KilogramPerSecond FCMapPerSecond(this IModalDataContainer data)
{
return data.TimeIntegral<Kilogram>(ModalResultField.FCMap) / data.Duration();
}
- public static KilogramPerMeter FuelConsumptionPerMeter(this IModalDataContainer data)
+ public static KilogramPerMeter FCMapPerMeter(this IModalDataContainer data)
{
var distance = data.Distance();
if (distance == null || distance.IsEqual(0)) {
@@ -427,7 +427,6 @@ namespace TUGraz.VectoCore.OutputData
return data.GetValues<Watt>(auxCol).Zip(simulationIntervals, (value, dt) => value * dt).Sum().Cast<WattSecond>();
}
-
private static T TimeIntegral<T>(this IModalDataContainer data, ModalResultField field, Func<SI, bool> filter = null)
where T : SIBase<T>
{
@@ -457,7 +456,6 @@ namespace TUGraz.VectoCore.OutputData
}
}
-
/// <summary>
/// Calculates the average acceleration for whole seconds.
/// </summary>
diff --git a/VectoCore/OutputData/PDF/PDFDeclarationReport.cs b/VectoCore/OutputData/PDF/PDFDeclarationReport.cs
index d16fb92ac2ed0f35ca536ec0f136f6015c3f70f4..a4b721fa5d49082e99b398cb23bcf43c00b01398 100644
--- a/VectoCore/OutputData/PDF/PDFDeclarationReport.cs
+++ b/VectoCore/OutputData/PDF/PDFDeclarationReport.cs
@@ -113,7 +113,6 @@ namespace TUGraz.VectoCore.OutputData.PDF
var reader = new PdfReader(inputStream);
var stamper = new PdfStamper(reader, stream);
-
var pdfFields = stamper.AcroFields;
pdfFields.SetField("version", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
pdfFields.SetField("Job", JobName);
@@ -130,7 +129,6 @@ namespace TUGraz.VectoCore.OutputData.PDF
pdfFields.SetField("GbxM", GearboxModel);
pdfFields.SetField("PageNr", string.Format("Page {0} of {1}", 1, missions.Count + 1));
-
var i = 1;
foreach (var results in missions.Values.OrderBy(m => m.Mission.MissionType)) {
pdfFields.SetField("Mission" + i, results.Mission.MissionType.ToString());
@@ -140,7 +138,7 @@ namespace TUGraz.VectoCore.OutputData.PDF
pdfFields.SetField("Loading" + i, results.Mission.RefLoad.ConvertTo().Ton.ToOutputFormat(1) + " t");
pdfFields.SetField("Speed" + i, data.Speed().ConvertTo().Kilo.Meter.Per.Hour.ToOutputFormat(1) + " km/h");
- var fcLiterPer100Km = data.FuelConsumptionLiterPer100Kilometer();
+ var fcLiterPer100Km = data.FuelConsumptionFinalLiterPer100Kilometer();
pdfFields.SetField("FC" + i, fcLiterPer100Km.ToOutputFormat(1));
var loadingTon = results.Mission.RefLoad.ConvertTo().Ton;
@@ -205,7 +203,6 @@ namespace TUGraz.VectoCore.OutputData.PDF
pdfFields.SetField("PageNr", string.Format("Page {0} of {1}", currentPageNr, pageCount));
pdfFields.SetField("Mission", results.Mission.MissionType.ToString());
-
foreach (var pair in results.ModData) {
var loadingType = pair.Key;
var data = pair.Value;
@@ -216,12 +213,11 @@ namespace TUGraz.VectoCore.OutputData.PDF
pdfFields.SetField("Load" + loadAppendix, loadingTon.ToOutputFormat(1) + " t");
pdfFields.SetField("Speed" + loadAppendix, data.Speed().ConvertTo().Kilo.Meter.Per.Hour.ToOutputFormat(1));
- var fcLiterPer100Km = data.FuelConsumptionLiterPer100Kilometer();
+ var fcLiterPer100Km = data.FuelConsumptionFinalLiterPer100Kilometer();
pdfFields.SetField("FCkm" + loadAppendix, fcLiterPer100Km.ToOutputFormat(1));
pdfFields.SetField("FCtkm" + loadAppendix,
loadingTon.IsEqual(0) ? "-" : (fcLiterPer100Km / loadingTon).ToOutputFormat(1));
-
var co2GrammPerKm = data.CO2PerMeter().ConvertTo().Gramm.Per.Kilo.Meter;
pdfFields.SetField("CO2km" + loadAppendix, co2GrammPerKm.ToOutputFormat(1));
pdfFields.SetField("CO2tkm" + loadAppendix,
diff --git a/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/OutputData/SummaryDataContainer.cs
index f7ad4729e302bab8da910bead158f5508f6068ca..f1aaabf3a4c7d947cb91fbde3733acfddc66b3fb 100644
--- a/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/OutputData/SummaryDataContainer.cs
@@ -29,13 +29,10 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System.Collections.Generic;
using System.Data;
-using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using TUGraz.VectoCore.Models;
-using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData
@@ -52,57 +49,64 @@ namespace TUGraz.VectoCore.OutputData
private const string INPUTFILE = "Input File [-]";
private const string CYCLE = "Cycle [-]";
private const string STATUS = "Status";
+ private const string MASS = "Mass [kg]";
+ private const string LOADING = "Loading [kg]";
private const string TIME = "time [s]";
private const string DISTANCE = "distance [km]";
private const string SPEED = "speed [km/h]";
- private const string ALTITUDE = "altitudeDelta [m]";
- private const string PPOS = "Ppos [kW]";
- private const string PNEG = "Pneg [kW]";
- private const string FCMAP = "FC-Map [g/h]";
- private const string FCMAPKM = "FC-Map [g/km]";
- private const string FCAUXC = "FC-AUXc [g/h]";
- private const string FCAUXCKM = "FC-AUXc [g/km]";
- private const string FCWHTCC = "FC-WHTCc [g/h]";
- private const string FCWHTCCKM = "FC-WHTCc [g/km]";
- private const string PWHEELPOS = "PwheelPos [kW]";
- private const string PBRAKE = "P_brake_loss [kW]";
- private const string EPOSICE = "EposICE [kWh]";
- private const string ENEGICE = "EnegICE [kWh]";
- private const string EAIR = "Eair [kWh]";
- private const string EROLL = "Eroll [kWh]";
- private const string EGRAD = "Egrad [kWh]";
- private const string EACC = "Eacc [kWh]";
- private const string EAUX = "Eaux [kWh]";
- private const string EBRAKE = "Ebrake [kWh]";
- private const string ETRANSM = "Etransm [kWh]";
- private const string ERETARDER = "Eretarder [kWh]";
- private const string MASS = "Mass [kg]";
- private const string LOADING = "Loading [kg]";
- private const string ACCELERATIONS = "a [m/s^2]";
- private const string APOS = "a_pos [m/s^2]";
- private const string ANEG = "a_neg [m/s^2]";
- private const string PACC = "pAcc [%]";
- private const string PDEC = "pDec [%]";
- private const string PCRUISE = "pCruise [%]";
- private const string PSTOP = "pStop [%]";
- private const string ETORQUECONV = "Etorqueconv [kWh]";
- private const string CO2KM = "CO2 [g/km]";
- private const string CO2TKM = "CO2 [g/tkm]";
- private const string FCFINAL = "FC-Final [g/km]";
+ private const string ALTITUDE_DELTA = "altitudeDelta [m]";
+
+ private const string FCMAP_H = "FC-Map [g/h]";
+ private const string FCMAP_KM = "FC-Map [g/km]";
+ private const string FCAUXC_H = "FC-AUXc [g/h]";
+ private const string FCAUXC_KM = "FC-AUXc [g/km]";
+ private const string FCWHTCC_H = "FC-WHTCc [g/h]";
+ private const string FCWHTCC_KM = "FC-WHTCc [g/km]";
+ private const string FCAAUX_H = "FC-AAUX [g/h]";
+ private const string FCAAUX_KM = "FC-AAUX [g/km]";
+
+ private const string FCFINAL_H = "FC-Final [g/h]";
+ private const string FCFINAL_KM = "FC-Final [g/km]";
private const string FCFINAL_LITERPER100KM = "FC-Final [l/100km]";
private const string FCFINAL_LITERPER100TKM = "FC-Final [l/100tkm]";
- private const string ACCNOISE = "Acc.Noise [m/s^2]";
+
+ private const string CO2_KM = "CO2 [g/km]";
+ private const string CO2_TKM = "CO2 [g/tkm]";
+
+ private const string P_WHEEL_POS = "P_wheel_in_pos [kW]";
+ private const string P_BRAKE_LOSS = "P_brake_loss [kW]";
+ private const string P_ENG_POS = "P_eng_out_pos [kW]";
+ private const string P_ENG_NEG = "P_eng_out_neg [kW]";
+
+ private const string E_AUX_FORMAT = "E_aux_{0} [kWh]";
+ private const string E_AUX = "E_aux_sum [kWh]";
+
+ private const string E_AIR = "E_air [kWh]";
+ private const string E_ROLL = "E_roll [kWh]";
+ private const string E_GRAD = "E_grad [kWh]";
+ private const string E_INERTIA = "E_inertia [kWh]";
+ private const string E_BRAKE = "E_brake [kWh]";
+ private const string E_GBX_AXL_LOSS = "E_gbx_axl_loss [kWh]";
+ private const string E_RET_LOSS = "E_ret_loss [kWh]";
+ private const string E_TC_LOSS = "E_tc_loss [kWh]";
+ private const string E_ENG_POS = "E_eng_out_pos [kWh]";
+ private const string E_ENG_NEG = "E_eng_out_neg [kWh]";
+
+ private const string ACC = "a [m/s^2]";
+ private const string ACC_POS = "a_pos [m/s^2]";
+ private const string ACC_NEG = "a_neg [m/s^2]";
+
+ private const string ACC_TIMESHARE = "AccelerationTimeShare [%]";
+ private const string DEC_TIMESHARE = "DecelerationTimeShare [%]";
+ private const string CRUISE_TIMESHARE = "CruiseTimeShare [%]";
+ private const string STOP_TIMESHARE = "StopTimeShare [%]";
// ReSharper restore InconsistentNaming
private readonly DataTable _table;
private readonly ISummaryWriter _sumWriter;
- private bool _engineOnly = true;
protected SummaryDataContainer() {}
-
- private readonly IList<string> _auxColumns = new List<string>();
-
/// <summary>
/// Initializes a new instance of the <see cref="SummaryDataContainer"/> class.
/// </summary>
@@ -118,174 +122,137 @@ namespace TUGraz.VectoCore.OutputData
_table.Columns.Add(STATUS, typeof(string));
_table.Columns.AddRange(new[] {
- TIME, DISTANCE, SPEED, ALTITUDE, PPOS, PNEG, FCMAP, FCMAPKM, FCAUXC, FCAUXCKM, FCWHTCC, FCWHTCCKM, PWHEELPOS, PBRAKE,
- EPOSICE, ENEGICE, EAIR, EROLL, EGRAD, EACC, EAUX, EBRAKE, ETRANSM, ERETARDER, MASS, LOADING, ACCELERATIONS, APOS,
- ANEG, PACC, PDEC, PCRUISE, PSTOP, ETORQUECONV, CO2KM, CO2TKM, FCFINAL, FCFINAL_LITERPER100KM, FCFINAL_LITERPER100TKM,
- ACCNOISE
+ MASS, LOADING, TIME, DISTANCE, SPEED, ALTITUDE_DELTA, FCMAP_H, FCMAP_KM, FCAUXC_H, FCAUXC_KM, FCWHTCC_H, FCWHTCC_KM,
+ FCAAUX_H, FCAAUX_KM, FCFINAL_H, FCFINAL_KM, FCFINAL_LITERPER100KM, FCFINAL_LITERPER100TKM, CO2_KM, CO2_TKM,
+ P_WHEEL_POS, P_BRAKE_LOSS, P_ENG_POS, P_ENG_NEG, E_AUX, E_AIR, E_ROLL, E_GRAD, E_INERTIA, E_BRAKE, E_GBX_AXL_LOSS,
+ E_RET_LOSS, E_TC_LOSS, E_ENG_POS, E_ENG_NEG, ACC, ACC_POS, ACC_NEG, ACC_TIMESHARE, DEC_TIMESHARE, CRUISE_TIMESHARE,
+ STOP_TIMESHARE
}.Select(x => new DataColumn(x, typeof(SI))).ToArray());
}
- public virtual void Write(bool isEngineOnly, IModalDataContainer data, string jobFileName, string jobName,
- string cycleFileName, Kilogram vehicleMass, Kilogram vehicleLoading)
+ /// <summary>
+ /// Finishes the summary data container (writes the data to the sumWriter).
+ /// </summary>
+ public virtual void Finish()
{
- if (isEngineOnly) {
- WriteEngineOnly(data, jobFileName, jobName, cycleFileName);
- } else {
- WriteFullPowertrain(data, jobFileName, jobName, cycleFileName, vehicleMass, vehicleLoading);
+ if (_sumWriter != null) {
+ _sumWriter.WriteSumData(new DataView(_table, "", JOB, DataViewRowState.CurrentRows).ToTable());
}
}
-
- protected internal void WriteEngineOnly(IModalDataContainer data, string jobFileName, string jobName,
- string cycleFileName)
+ /// <summary>
+ /// Writes the result of one run into the summary data container.
+ /// </summary>
+ [MethodImpl(MethodImplOptions.Synchronized)]
+ public virtual void Write(IModalDataContainer modData, string jobFileName, string jobName, string cycleFileName,
+ Kilogram vehicleMass, Kilogram vehicleLoading)
{
var row = _table.NewRow();
- row[JOB] = ReplaceNotAllowedCharacters(jobName);
- row[INPUTFILE] = ReplaceNotAllowedCharacters(jobFileName);
- row[CYCLE] = ReplaceNotAllowedCharacters(cycleFileName);
- row[STATUS] = data.RunStatus;
- row[TIME] = data.Duration();
- row[PPOS] = data.EnginePowerPositiveAverage().ConvertTo().Kilo.Watt;
- row[PNEG] = data.EnginePowerNegativeAverage().ConvertTo().Kilo.Watt;
- row[FCMAP] = data.FuelConsumptionPerSecond().ConvertTo().Gramm.Per.Hour;
- row[FCAUXC] = data.FuelConsumptionAuxStartStopCorrectedPerSecond().ConvertTo().Gramm.Per.Hour;
- row[FCWHTCC] = data.FuelConsumptionWHTCCorrectedPerSecond().ConvertTo().Gramm.Per.Hour;
- WriteAuxiliaries(data, row);
-
_table.Rows.Add(row);
- }
-
- protected internal void WriteFullPowertrain(IModalDataContainer data, string jobFileName, string jobName,
- string cycleFileName, Kilogram vehicleMass, Kilogram vehicleLoading)
- {
- _engineOnly = false;
-
- var row = _table.NewRow();
- _table.Rows.Add(row);
row[JOB] = ReplaceNotAllowedCharacters(jobName);
row[INPUTFILE] = ReplaceNotAllowedCharacters(jobFileName);
row[CYCLE] = ReplaceNotAllowedCharacters(cycleFileName);
- row[STATUS] = data.RunStatus;
- row[TIME] = data.Duration();
+ row[STATUS] = modData.RunStatus;
+
+ row[MASS] = vehicleMass;
+ row[LOADING] = vehicleLoading;
- var distance = data.Distance();
+ row[TIME] = modData.Duration();
+
+ var distance = modData.Distance();
if (distance != null) {
row[DISTANCE] = distance.ConvertTo().Kilo.Meter;
}
- var speed = data.Speed();
+ var speed = modData.Speed();
if (speed != null) {
row[SPEED] = speed.ConvertTo().Kilo.Meter.Per.Hour;
}
- row[ALTITUDE] = data.AltitudeDelta();
- row[PPOS] = data.EnginePowerPositiveAverage().ConvertTo().Kilo.Watt;
- row[PNEG] = data.EnginePowerNegativeAverage().ConvertTo().Kilo.Watt;
+ row[ALTITUDE_DELTA] = modData.AltitudeDelta();
- var fcfinal = data.FuelConsumptionFinal();
- if (fcfinal != null) {
- row[FCFINAL] = fcfinal.ConvertTo().Gramm.Per.Kilo.Meter;
+ row[FCMAP_H] = modData.FCMapPerSecond().ConvertTo().Gramm.Per.Hour;
+ var fcMapPerMeter = modData.FCMapPerMeter();
+ if (fcMapPerMeter != null) {
+ row[FCMAP_KM] = fcMapPerMeter.ConvertTo().Gramm.Per.Kilo.Meter;
}
- row[FCFINAL_LITERPER100KM] = data.FuelConsumptionFinalLiterPer100Kilometer();
- if (vehicleLoading != null && !vehicleLoading.IsEqual(0)) {
- row[FCFINAL_LITERPER100TKM] = data.FuelConsumptionFinalLiterPer100Kilometer() / vehicleLoading.ConvertTo().Ton;
+
+ row[FCAUXC_H] = modData.FuelConsumptionAuxStartStopPerSecond().ConvertTo().Gramm.Per.Hour;
+ var fuelConsumptionAuxStartStopCorrected = modData.FuelConsumptionAuxStartStop();
+ if (fuelConsumptionAuxStartStopCorrected != null) {
+ row[FCAUXC_KM] = fuelConsumptionAuxStartStopCorrected.ConvertTo().Gramm.Per.Kilo.Meter;
}
- row[FCMAP] = data.FuelConsumptionPerSecond().ConvertTo().Gramm.Per.Hour;
+ row[FCWHTCC_H] = modData.FuelConsumptionWHTCPerSecond().ConvertTo().Gramm.Per.Hour;
+ var fuelConsumptionWHTCCorrected = modData.FuelConsumptionWHTC();
+ if (fuelConsumptionWHTCCorrected != null) {
+ row[FCWHTCC_KM] = fuelConsumptionWHTCCorrected.ConvertTo().Gramm.Per.Kilo.Meter;
+ }
- var fuelConsumptionPerMeter = data.FuelConsumptionPerMeter();
- if (fuelConsumptionPerMeter != null) {
- row[FCMAPKM] = fuelConsumptionPerMeter.ConvertTo().Gramm.Per.Kilo.Meter;
+ row[FCAAUX_H] = modData.FuelConsumptionAAUXPerSecond().ConvertTo().Gramm.Per.Hour;
+ var fuelConsumptionAAUX = modData.FuelConsumptionAAUX();
+ if (fuelConsumptionAAUX != null) {
+ row[FCAAUX_KM] = fuelConsumptionAAUX.ConvertTo().Gramm.Per.Kilo.Meter;
}
- row[FCAUXC] = data.FuelConsumptionAuxStartStopCorrectedPerSecond().ConvertTo().Gramm.Per.Hour;
- var fuelConsumptionAuxStartStopCorrected = data.FuelConsumptionAuxStartStopCorrected();
- if (fuelConsumptionAuxStartStopCorrected != null) {
- row[FCAUXCKM] = fuelConsumptionAuxStartStopCorrected.ConvertTo().Gramm.Per.Kilo.Meter;
+
+ row[FCFINAL_H] = modData.FuelConsumptionFinalPerSecond().ConvertTo().Gramm.Per.Hour;
+ var fcfinal = modData.FuelConsumptionFinal();
+ if (fcfinal != null) {
+ row[FCFINAL_KM] = fcfinal.ConvertTo().Gramm.Per.Kilo.Meter;
}
- row[FCWHTCC] = data.FuelConsumptionWHTCCorrectedPerSecond().ConvertTo().Gramm.Per.Hour;
- var fuelConsumptionWHTCCorrected = data.FuelConsumptionWHTCCorrected();
- if (fuelConsumptionWHTCCorrected != null) {
- row[FCWHTCCKM] = fuelConsumptionWHTCCorrected.ConvertTo().Gramm.Per.Kilo.Meter;
+ row[FCFINAL_LITERPER100KM] = modData.FuelConsumptionFinalLiterPer100Kilometer();
+ if (vehicleLoading != null && !vehicleLoading.IsEqual(0)) {
+ row[FCFINAL_LITERPER100TKM] = modData.FuelConsumptionFinalLiterPer100Kilometer() / vehicleLoading.ConvertTo().Ton;
}
- var kilogramPerMeter = data.CO2PerMeter();
+ var kilogramPerMeter = modData.CO2PerMeter();
if (kilogramPerMeter != null) {
- row[CO2KM] = kilogramPerMeter.ConvertTo().Gramm.Per.Kilo.Meter;
+ row[CO2_KM] = kilogramPerMeter.ConvertTo().Gramm.Per.Kilo.Meter;
if (vehicleLoading != null && !vehicleLoading.IsEqual(0)) {
- row[CO2TKM] = kilogramPerMeter.ConvertTo().Gramm.Per.Kilo.Meter / vehicleLoading.ConvertTo().Ton;
+ row[CO2_TKM] = kilogramPerMeter.ConvertTo().Gramm.Per.Kilo.Meter / vehicleLoading.ConvertTo().Ton;
}
}
- row[PWHEELPOS] = data.PowerWheelPositive().ConvertTo().Kilo.Watt;
- row[PBRAKE] = data.PowerBrake().ConvertTo().Kilo.Watt;
- row[EPOSICE] = data.EngineWorkPositive().ConvertTo().Kilo.Watt.Hour;
- row[ENEGICE] = data.EngineWorkNegative().ConvertTo().Kilo.Watt.Hour;
- row[EAIR] = data.WorkAirResistance().ConvertTo().Kilo.Watt.Hour;
- row[EROLL] = data.WorkRollingResistance().ConvertTo().Kilo.Watt.Hour;
- row[EGRAD] = data.WorkRoadGradientResistance().ConvertTo().Kilo.Watt.Hour;
- row[EACC] = data.PowerAccelerations().ConvertTo().Kilo.Watt.Hour;
- row[EAUX] = data.WorkAuxiliaries().ConvertTo().Kilo.Watt.Hour;
- WriteAuxiliaries(data, row);
- row[EBRAKE] = data.WorkTotalMechanicalBrake().ConvertTo().Kilo.Watt.Hour;
- row[ETRANSM] = data.WorkTransmission().ConvertTo().Kilo.Watt.Hour;
- row[ERETARDER] = data.WorkRetarder().ConvertTo().Kilo.Watt.Hour;
- row[ETORQUECONV] = data.WorkTorqueConverter().ConvertTo().Kilo.Watt.Hour;
- row[MASS] = vehicleMass;
- row[LOADING] = vehicleLoading;
- row[ACCELERATIONS] = data.AccelerationAverage();
- row[APOS] = data.AccelerationsPositive3SecondAverage();
- row[ANEG] = data.AverageAccelerations3SecondNegative();
- row[ACCNOISE] = data.AccelerationNoise();
- row[PACC] = data.PercentAccelerationTime();
- row[PDEC] = data.PercentDecelerationTime();
- row[PCRUISE] = data.PercentCruiseTime();
- row[PSTOP] = data.PercentStopTime();
- }
+ row[P_WHEEL_POS] = modData.PowerWheelPositive().ConvertTo().Kilo.Watt;
+ row[P_BRAKE_LOSS] = modData.PowerBrake().ConvertTo().Kilo.Watt;
+ row[P_ENG_POS] = modData.EnginePowerPositiveAverage().ConvertTo().Kilo.Watt;
+ row[P_ENG_NEG] = modData.EnginePowerNegativeAverage().ConvertTo().Kilo.Watt;
- private static string ReplaceNotAllowedCharacters(string text)
- {
- return text.Replace('#', '_').Replace(',', '_').Replace('\n', '_').Replace('\r', '_');
- }
-
- [MethodImpl(MethodImplOptions.Synchronized)]
- private void WriteAuxiliaries(IModalDataContainer data, DataRow row)
- {
- foreach (var aux in data.Auxiliaries) {
- var colName = "Eaux_" + aux.Key + " [kWh]";
+ foreach (var aux in modData.Auxiliaries) {
+ var colName = string.Format(E_AUX_FORMAT, aux.Key);
if (!_table.Columns.Contains(colName)) {
- _table.Columns.Add(colName, typeof(SI));
- _auxColumns.Add(colName);
+ var col = _table.Columns.Add(colName, typeof(SI));
+ // move the new column to correct position
+ col.SetOrdinal(_table.Columns[E_AUX].Ordinal);
}
-
- row[colName] = data.AuxiliaryWork(aux.Value).ConvertTo().Kilo.Watt.Hour;
+ row[colName] = modData.AuxiliaryWork(aux.Value).ConvertTo().Kilo.Watt.Hour;
}
+ row[E_AUX] = modData.WorkAuxiliaries().ConvertTo().Kilo.Watt.Hour;
+
+ row[E_AIR] = modData.WorkAirResistance().ConvertTo().Kilo.Watt.Hour;
+ row[E_ROLL] = modData.WorkRollingResistance().ConvertTo().Kilo.Watt.Hour;
+ row[E_GRAD] = modData.WorkRoadGradientResistance().ConvertTo().Kilo.Watt.Hour;
+ row[E_INERTIA] = modData.PowerAccelerations().ConvertTo().Kilo.Watt.Hour;
+ row[E_BRAKE] = modData.WorkTotalMechanicalBrake().ConvertTo().Kilo.Watt.Hour;
+ row[E_GBX_AXL_LOSS] = modData.WorkTransmission().ConvertTo().Kilo.Watt.Hour;
+ row[E_RET_LOSS] = modData.WorkRetarder().ConvertTo().Kilo.Watt.Hour;
+ row[E_TC_LOSS] = modData.WorkTorqueConverter().ConvertTo().Kilo.Watt.Hour;
+ row[E_ENG_POS] = modData.EngineWorkPositive().ConvertTo().Kilo.Watt.Hour;
+ row[E_ENG_NEG] = modData.EngineWorkNegative().ConvertTo().Kilo.Watt.Hour;
+
+ row[ACC] = modData.AccelerationAverage();
+ row[ACC_POS] = modData.AccelerationsPositive();
+ row[ACC_NEG] = modData.AccelerationsNegative();
+ row[ACC_TIMESHARE] = modData.AccelerationTimeShare();
+ row[DEC_TIMESHARE] = modData.DecelerationTimeShare();
+ row[CRUISE_TIMESHARE] = modData.CruiseTimeShare();
+ row[STOP_TIMESHARE] = modData.StopTimeShare();
}
- public virtual void Finish()
+ private static string ReplaceNotAllowedCharacters(string text)
{
- var dataColumns = new List<string>();
-
- if (_engineOnly) {
- dataColumns.AddRange(new[] { JOB, INPUTFILE, CYCLE, STATUS, TIME, PPOS, PNEG, FCMAP, FCAUXC, FCWHTCC });
- } else {
- dataColumns.AddRange(new[] { JOB, INPUTFILE, CYCLE, STATUS, TIME, DISTANCE, SPEED, ALTITUDE });
-
- dataColumns.AddRange(_auxColumns);
-
- dataColumns.AddRange(new[] {
- PPOS, PNEG, FCMAP, FCMAPKM, FCAUXC, FCAUXCKM, FCWHTCC, FCWHTCCKM, CO2KM, CO2TKM, FCFINAL, FCFINAL_LITERPER100KM,
- FCFINAL_LITERPER100TKM, PWHEELPOS, PBRAKE, EPOSICE, ENEGICE, EAIR, EROLL, EGRAD, EACC, EAUX, EBRAKE, ETRANSM,
- ERETARDER, ETORQUECONV, MASS, LOADING, ACCELERATIONS, APOS, ANEG, ACCNOISE, PACC, PDEC, PCRUISE, PSTOP
- });
- }
-
- var sortedAndFilteredTable = new DataView(_table, "", JOB, DataViewRowState.CurrentRows).ToTable(false,
- dataColumns.ToArray());
-
- if (_sumWriter != null) {
- _sumWriter.WriteSumData(sortedAndFilteredTable);
- }
+ return text.Replace('#', '_').Replace(',', '_').Replace('\n', '_').Replace('\r', '_');
}
}
}
\ No newline at end of file
diff --git a/VectoCore/Utils/VectoCSVFile.cs b/VectoCore/Utils/VectoCSVFile.cs
index 487d8f4f722331580ed5143cebf1f9287501ddb3..111e0cedb6b38de1a40ff4c9f9fd9507d81639b0 100644
--- a/VectoCore/Utils/VectoCSVFile.cs
+++ b/VectoCore/Utils/VectoCSVFile.cs
@@ -32,8 +32,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
using System.Globalization;
using System.IO;
using System.Linq;
diff --git a/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCoreTest/Integration/CoachPowerTrain.cs
index a20f1110c9e0c697ee7830e83c504466e039c980..2427a1e53a9de6d50954a75e5063dde8e9e9af82 100644
--- a/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -60,7 +60,6 @@ namespace TUGraz.VectoCore.Tests.Integration
bool overspeed = false)
{
var container = CreatePowerTrain(cycleData, modFileName.Replace(".vmod", ""), overspeed);
-
return new DistanceRun(container);
}
diff --git a/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCoreTest/Models/Simulation/AuxTests.cs
index 30f9a61dbba2724ac19a7e8bc21e919ee709394a..0cdeace22400d1b816b4e41914698130bf5155e8 100644
--- a/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -29,8 +29,6 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System.Configuration;
-using System.Linq;
using TUGraz.VectoCore.Utils;
using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Tests.Utils;
@@ -52,6 +50,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
{
[TestMethod]
public void AuxWriteModFileSumFile()
+
{
var fileWriter = new FileOutputWriter("AuxWriteModFileSumFile", "");
var modData = new ModalDataContainer("AuxWriteModFileSumFile", fileWriter);
@@ -63,7 +62,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(modData, "", "", "", null, null));
var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\LongHaul_short.vdri", CycleType.DistanceBased, false);
var mockcycle = new MockDrivingCycle(container, data);
@@ -103,7 +102,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
ResultFileHelper.TestModFile(@"TestData\Results\EngineOnlyCycles\40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod",
@"AuxWriteModFileSumFile.vmod", testColumns);
- ResultFileHelper.TestSumFile(@"TestData\Results\EngineOnlyCycles\40t_Long_Haul_Truck.vsum",
+ ResultFileHelper.TestSumFile(@"TestData\Results\EngineOnlyCycles\AuxWriteModFileSumFile.vsum",
@"AuxWriteModFileSumFile.vsum");
}
@@ -144,7 +143,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 +174,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 +232,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 +282,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/Models/Simulation/SimulationTests.cs b/VectoCoreTest/Models/Simulation/SimulationTests.cs
index 6fd36bdd958b79b7be8396f0e232da3c6bbfcfe1..0c9d4020d10ba56c7f6db5c1de2fe9a0fb184f3a 100644
--- a/VectoCoreTest/Models/Simulation/SimulationTests.cs
+++ b/VectoCoreTest/Models/Simulation/SimulationTests.cs
@@ -71,7 +71,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
private class MockSumWriter : SummaryDataContainer
{
- public override void Write(bool isEngineOnly, IModalDataContainer data, string jobFileName, string jobName,
+ public override void Write(IModalDataContainer modData, string jobFileName, string jobName,
string cycleFileName, Kilogram vehicleMass, Kilogram vehicleLoading) {}
public override void Finish() {}
diff --git a/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCoreTest/Reports/SumWriterTest.cs
index edd0ddddc8340e248af71abd7caa5415e579a804..15925402d1daae5b061186c27a2b592ea4dbaee1 100644
--- a/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCoreTest/Reports/SumWriterTest.cs
@@ -29,7 +29,6 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
@@ -48,7 +47,7 @@ namespace TUGraz.VectoCore.Tests.Reports
var writer = new FileOutputWriter("testsumcalc_fixed", "");
var sumWriter = new SummaryDataContainer(writer);
- var modData = new ModalDataContainer("testsumcalc_fixed", writer); //("testsumcalc_fixed.vmod");
+ var modData = new ModalDataContainer("testsumcalc_fixed", writer);
modData.AddAuxiliary("FAN");
for (var i = 0; i < 500; i++) {
@@ -71,7 +70,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData.CommitSimulationStep();
}
- sumWriter.WriteFullPowertrain(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>());
+ sumWriter.Write(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>());
modData.Finish(VectoRun.Status.Success);
sumWriter.Finish();
@@ -79,12 +78,12 @@ namespace TUGraz.VectoCore.Tests.Reports
var sumData = VectoCSVFile.Read("testsumcalc_fixed.vsum", false, true);
// 3kW * 500s => to kWh
- Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("Eair [kWh]"), 1e-3);
- Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("Eaux_FAN [kWh]"), 1e-3);
- Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("Eroll [kWh]"), 1e-3);
- Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("Egrad [kWh]"), 1e-3);
- Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("Eaux [kWh]"), 1e-3);
- Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("Ebrake [kWh]"), 1e-3);
+ Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_air [kWh]"), 1e-3);
+ Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_aux_FAN [kWh]"), 1e-3);
+ Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_roll [kWh]"), 1e-3);
+ Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_grad [kWh]"), 1e-3);
+ Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_aux_sum [kWh]"), 1e-3);
+ Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_brake [kWh]"), 1e-3);
// 500s * 1e-4 kg/s = 0.05kg => 0.05kg / 499s => to g/h
Assert.AreEqual((500.0 * 1e-4) * 1000 * 3600 / 499.0, sumData.Rows[0].ParseDouble("FC-Map [g/h]"), 1e-3);
@@ -107,23 +106,23 @@ namespace TUGraz.VectoCore.Tests.Reports
{ 1000.SI<Watt>(), 1500.SI<Watt>(), 2000.SI<Watt>(), 2500.SI<Watt>(), 3000.SI<Watt>() };
for (var i = 0; i < 500; i++) {
- modData[ModalResultField.simulationInterval] = timeSteps[i % timeSteps.Count()];
+ modData[ModalResultField.simulationInterval] = timeSteps[i % timeSteps.Length];
modData[ModalResultField.time] = i.SI<Second>();
modData[ModalResultField.dist] = i.SI<Meter>();
- modData["FAN"] = powerDemand[i % powerDemand.Count()];
- modData[ModalResultField.P_air] = powerDemand[i % powerDemand.Count()];
- modData[ModalResultField.P_roll] = powerDemand[i % powerDemand.Count()];
- modData[ModalResultField.P_slope] = powerDemand[i % powerDemand.Count()];
- modData[ModalResultField.P_aux] = powerDemand[i % powerDemand.Count()];
- modData[ModalResultField.P_brake_loss] = powerDemand[i % powerDemand.Count()];
+ modData["FAN"] = powerDemand[i % powerDemand.Length];
+ modData[ModalResultField.P_air] = powerDemand[i % powerDemand.Length];
+ modData[ModalResultField.P_roll] = powerDemand[i % powerDemand.Length];
+ modData[ModalResultField.P_slope] = powerDemand[i % powerDemand.Length];
+ modData[ModalResultField.P_aux] = powerDemand[i % powerDemand.Length];
+ modData[ModalResultField.P_brake_loss] = powerDemand[i % powerDemand.Length];
modData[ModalResultField.altitude] = 0.SI<Meter>();
modData[ModalResultField.acc] = 0.SI<MeterPerSquareSecond>();
- modData[ModalResultField.P_eng_out] = (i % 2 == 0 ? 1 : -1) * powerDemand[i % powerDemand.Count()];
+ modData[ModalResultField.P_eng_out] = (i % 2 == 0 ? 1 : -1) * powerDemand[i % powerDemand.Length];
modData.CommitSimulationStep();
}
- sumWriter.WriteFullPowertrain(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>());
+ sumWriter.Write(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>());
modData.Finish(VectoRun.Status.Success);
sumWriter.Finish();
@@ -131,12 +130,12 @@ namespace TUGraz.VectoCore.Tests.Reports
var sumData = VectoCSVFile.Read("testsumcalc_var.vsum", false, true);
// sum(dt * p) => to kWh
- Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("Eair [kWh]"), 1e-3);
- Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("Eaux_FAN [kWh]"), 1e-3);
- Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("Eroll [kWh]"), 1e-3);
- Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("Egrad [kWh]"), 1e-3);
- Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("Eaux [kWh]"), 1e-3);
- Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("Ebrake [kWh]"), 1e-3);
+ Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_air [kWh]"), 1e-3);
+ Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_aux_FAN [kWh]"), 1e-3);
+ Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_roll [kWh]"), 1e-3);
+ Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_grad [kWh]"), 1e-3);
+ Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_aux_sum [kWh]"), 1e-3);
+ Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_brake [kWh]"), 1e-3);
}
}
}
\ No newline at end of file
diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum b/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum
index a13267d050e73cdf13a1f198922dcb997a59df7a..5447dd966017039b494b995707badd49b22b173d 100644
--- a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum
+++ b/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum
@@ -1,7 +1,7 @@
-Job [-],Input File [-],Cycle [-],time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [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/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [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 [%]
-1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5191,108.1816,75.02479,0.421385,1.44194444444444,1.93220560368564,0.622920016157958,2.55430160694652,0.504680546960897,83.0044647873451,-1.44743690025,16164.51,215.4556,-,-,16398.9,218.5797,690.7119,-,218.5797,-,26.2716,72.0020482132738,-2.68498480403798,119.687826864197,-2.08712359699938,-68.5278344177624,-27.6329095206844,-0.0022754793220924,-4.78407212843498E-07,-7.05605247603522,-3.87159892160032,-10.5060283433066,0,0,14600,0,-4.592922E-10,0.4745609,-0.5697597,0.1950882,0.04584859,0.03910615,0.8684261,0.04661915
-1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5283,108.1815,73.71825,0.4227829,1.4675,1.9664500489831,0.633960016444325,2.59957144856453,0.513624991253018,116.215934369497,-3.62246846215147,22384.18,303.645,-,-,22708.75,308.0478,973.4312,50.43685,308.0478,1.918393,37.02498,105.270756760669,-13.2240486442422,170.546883687236,-5.31597246820728,-67.1947587298106,-58.9778037699478,-0.0347325321514573,1.92677705652184E-08,-7.18110676765442,-19.4062913854255,-12.431615801437,0,0,14600,19300,-2.707763E-10,0.3457526,-0.4496562,0.1875284,0.07211812,0.05489305,0.8271815,0.04580731
-1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5319,108.1816,73.21935,0.420919,1.4775,1.97985004931688,0.638280016556382,2.61728573441505,0.517124991193414,126.894108027797,-3.95130005558772,24459.39,334.0563,-,-,24814.04,338.9001,1070.924,42.16238,338.9001,1.603669,40.73318,115.742611501086,-17.7108915195494,187.48604461107,-5.83804583213085,-66.6058228834239,-68.4483689518687,-0.105611213085552,1.2711120588291E-07,-7.23004105567932,-26.1678422201342,-13.0861264431311,0,0,14600,25400,4.482395E-10,0.3194488,-0.4369331,0.1876776,0.08234631,0.05828163,0.8138748,0.04549727
-1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1572,25.82798,59.14804,-0.02635411,0.524000020821889,0.794733356237411,0.165059996147951,0.658119066953659,0.0873333346347014,65.6984269253948,-2.47168210914723,12997.45,219.7443,-,-,13029.94,220.2937,696.128,-,220.2937,-,26.47761,56.8988239748508,-5.86145327473415,28.6883130907557,-1.07930118766096,-13.6953551892088,-6.58242678111212,0.0178329533458843,-2.97766592767504E-07,-2.22924580732981,-2.55950126330058,-2.55658434132735,0,0,14600,0,3.639978E-09,0.4583338,-0.4765232,0.3369744,0.1475827,0.1431298,0.6386768,0.07061069
-1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1571,25.82816,59.1861,-0.02548363,0.52366668747531,0.794227800667286,0.164954996150401,0.657700416147709,0.087277779078318,90.2059349805439,-4.4745985205996,17724.68,299.4737,-,-,17768.99,300.2224,948.7028,73.54285,300.2224,2.797242,36.08442,81.606861308587,-15.757476168594,39.3648677373429,-1.95266507662833,-13.7221050203763,-11.637801115815,-0.0297262116922583,4.66794671309698E-07,-2.22782771203253,-6.87638751690586,-2.91503153320816,0,0,14600,12900,1.214098E-09,0.4182017,-0.4154353,0.3413621,0.18014,0.1852323,0.563972,0.07065564
-1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1586,25.82833,58.62673,-0.02462262,0.528666687673993,0.80181113421917,0.166529996113645,0.663980178236961,0.088111112424069,113.350877053951,-5.20837518003444,22183.29,378.3818,-,-,22238.74,379.3277,1198.676,47.19196,379.3277,1.794972,45.59228,104.005408860395,-27.484892288042,49.9373586132129,-2.29457862098184,-13.502403507329,-16.305289074257,-0.0940772605625292,7.05304814295636E-08,-2.24909914149178,-12.108621991343,-3.3787372733487,0,0,14600,25400,-6.013079E-10,0.3607558,-0.3787642,0.3330187,0.223203,0.2156368,0.4911728,0.06998739
+Job [-],Input File [-],Cycle [-],time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [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/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [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 [%]
+1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5191,108.1816,75.02479,0.421385,1.44194444444444,1.93220560368564,0.622920016157958,2.55430160694652,0.504680546960897,83.0044647873451,-1.44743690025,16164.51,215.4556,-,-,16398.9,218.5797,690.7119,-,218.5797,-,26.2716,72.0020482132738,-2.68498480403798,119.687826864197,-2.08712359699938,-68.5278344177624,-27.6329095206844,-0.0022754793220924,-4.78407212843498E-07,-7.05605247603522,-3.87159892160032,-10.5060283433066,0,0,14600,0,-4.592922E-10,0.4745609,-0.5697597,0.04584859,0.03910615,0.8684261,0.04661915
+1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5283,108.1815,73.71825,0.4227829,1.4675,1.9664500489831,0.633960016444325,2.59957144856453,0.513624991253018,116.215934369497,-3.62246846215147,22384.18,303.645,-,-,22708.75,308.0478,973.4312,50.43685,308.0478,1.918393,37.02498,105.270756760669,-13.2240486442422,170.546883687236,-5.31597246820728,-67.1947587298106,-58.9778037699478,-0.0347325321514573,1.92677705652184E-08,-7.18110676765442,-19.4062913854255,-12.431615801437,0,0,14600,19300,-2.707763E-10,0.3457526,-0.4496562,0.07211812,0.05489305,0.8271815,0.04580731
+1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5319,108.1816,73.21935,0.420919,1.4775,1.97985004931688,0.638280016556382,2.61728573441505,0.517124991193414,126.894108027797,-3.95130005558772,24459.39,334.0563,-,-,24814.04,338.9001,1070.924,42.16238,338.9001,1.603669,40.73318,115.742611501086,-17.7108915195494,187.48604461107,-5.83804583213085,-66.6058228834239,-68.4483689518687,-0.105611213085552,1.2711120588291E-07,-7.23004105567932,-26.1678422201342,-13.0861264431311,0,0,14600,25400,4.482395E-10,0.3194488,-0.4369331,0.08234631,0.05828163,0.8138748,0.04549727
+1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1572,25.82798,59.14804,-0.02635411,0.524000020821889,0.794733356237411,0.165059996147951,0.658119066953659,0.0873333346347014,65.6984269253948,-2.47168210914723,12997.45,219.7443,-,-,13029.94,220.2937,696.128,-,220.2937,-,26.47761,56.8988239748508,-5.86145327473415,28.6883130907557,-1.07930118766096,-13.6953551892088,-6.58242678111212,0.0178329533458843,-2.97766592767504E-07,-2.22924580732981,-2.55950126330058,-2.55658434132735,0,0,14600,0,3.639978E-09,0.4583338,-0.4765232,0.1475827,0.1431298,0.6386768,0.07061069
+1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1571,25.82816,59.1861,-0.02548363,0.52366668747531,0.794227800667286,0.164954996150401,0.657700416147709,0.087277779078318,90.2059349805439,-4.4745985205996,17724.68,299.4737,-,-,17768.99,300.2224,948.7028,73.54285,300.2224,2.797242,36.08442,81.606861308587,-15.757476168594,39.3648677373429,-1.95266507662833,-13.7221050203763,-11.637801115815,-0.0297262116922583,4.66794671309698E-07,-2.22782771203253,-6.87638751690586,-2.91503153320816,0,0,14600,12900,1.214098E-09,0.4182017,-0.4154353,0.18014,0.1852323,0.563972,0.07065564
+1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1586,25.82833,58.62673,-0.02462262,0.528666687673993,0.80181113421917,0.166529996113645,0.663980178236961,0.088111112424069,113.350877053951,-5.20837518003444,22183.29,378.3818,-,-,22238.74,379.3277,1198.676,47.19196,379.3277,1.794972,45.59228,104.005408860395,-27.484892288042,49.9373586132129,-2.29457862098184,-13.502403507329,-16.305289074257,-0.0940772605625292,7.05304814295636E-08,-2.24909914149178,-12.108621991343,-3.3787372733487,0,0,14600,25400,-6.013079E-10,0.3607558,-0.3787642,0.223203,0.2156368,0.4911728,0.06998739
diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum b/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum
index 3aee9409955b3cd387713d8d5fd37f9d600a4860..5fedb81833319ab455158128d2c3a11a9c79b88c 100644
--- a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum
+++ b/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum
@@ -1,10 +1,10 @@
-Job [-],Input File [-],Cycle [-],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/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [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 [%]
-1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_85_downhill_1.vdri,60,0.95699,57.4194,-9.5699,175.306474145254,0,34374.12,598.6499,-,-,-,-,1891.734,98.0173,598.6499,3.728141,71.95311,164.295813465118,-0.000138600667317708,2.92177456908756,0,-0.409112303940985,-0.521875793321265,0.883999291327265,-2.7000226971476,0,-2.31001112196181E-06,-0.174761124948661,0,0,14600,19300,0.3935185,0.5517726,0,0.3640497,0.7,0,0.2666667,0.03333334
-1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_85_downhill_3.vdri,59,0.9667453,58.98785,-29.00236,123.785437923367,-6.30265533317954,23438.96,397.3523,-,-,-,-,1255.633,65.05873,397.3523,2.474544,47.75869,115.799342979819,-27.5270470764677,2.02870578818851,-0.103293517960442,-0.452447935329328,-0.526984904739592,2.67796067992846,-3.0273124868609,0,-0.451137715975444,-0.145490675585137,0,0,14600,19300,0.4237288,0.5852351,0,0.3427867,0.7118644,0,0.2542373,0.03389831
-1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_85_downhill_5.vdri,59,0.9765316,59.58498,-48.82658,59.2654687913798,-7.13939922138796,11537.47,193.6305,-,-,-,-,611.8725,31.70324,193.6305,1.20585,23.2729,54.3353294437214,-74.9616008693889,0.971295182969835,-0.117006820572747,-0.463687660630991,-0.531894579894013,4.50484998385112,-3.02731263003416,0,-1.22853734758165,-0.10770679662625,0,0,14600,19300,0.4237288,0.5992488,0,0.3312497,0.6949152,0,0.2711864,0.03389831
-1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_60_downhill_1.vdri,72,0.9830145,49.15072,-9.830145,67.8582484987047,-0.507567884193526,14414.34,293.2681,-,-,-,-,926.7272,48.01696,293.2681,1.826351,35.24857,64.3291643725501,-4.99089558919271E-05,1.35716496997409,-0.0101513576838705,-0.253276107995245,-0.536067676196496,0.9080387844642,-1.34410719014704,0,-9.98179117838542E-07,-0.121600765089194,0,0,14600,19300,0.2314815,0.6249714,0,0.3765692,0.3611111,0,0.6111111,0.02777778
-1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_60_downhill_3.vdri,69,0.990886,51.6984,-29.72658,54.3142052526059,-8.40652724279874,10415.48,201.4662,-,-,-,-,636.6332,32.98618,201.4662,1.254647,24.21469,51.0284102619558,-57.4339307425679,1.04102226734161,-0.161125105486976,-0.293279741194298,-0.54014431754748,2.74483239505026,-1.57788557955374,0,-1.10081700589922,-0.112603592955404,0,0,14600,19300,0.2616747,0.6288966,0,0.3674349,0.4057971,0,0.5652174,0.02898551
-1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_60_downhill_5.vdri,68,0.9768196,51.71398,-48.84098,29.7220186345718,-8.74667999323677,5914.038,114.3605,-,-,-,-,361.3793,18.72432,114.3605,0.7121894,13.74525,27.6657972616308,-127.509606669931,0.561415907541911,-0.165215066538917,-0.289893092251271,-0.532051403158241,4.5061782444848,-1.57788571359383,0,-2.40851479265425,-0.0940346761875682,0,0,14600,19300,0.2655229,0.6520829,0,0.3599118,0.3970588,0,0.5735294,0.02941176
-1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_40_downhill_1.vdri,98,0.9909539,36.40239,-9.909538,21.9399670192174,-5.4446823694268,4932.738,135.5059,-,-,-,-,428.1986,22.18646,135.5059,0.8438739,16.28677,20.7515338780929,-0.132063651571468,0.597254657745361,-0.148216353389952,-0.121580008554989,-0.540397226197852,0.915372537838088,-0.597600406113391,0,-0.00359506607055664,-0.101238352557023,0,0,14600,19300,0.1133787,0.6344942,0,0.3052644,0.1734694,0,0.8061224,0.02040816
-1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_40_downhill_3.vdri,98,0.9905689,36.38824,-29.71707,15.8016906465803,-9.15276610121435,3132.069,86.07365,-,-,-,-,271.9927,14.09289,86.07365,0.5360305,10.34539,14.7388859573676,-57.603646005903,0.430157134268019,-0.24915863275528,-0.121821108645648,-0.539971430699031,2.74395388086637,-0.59760037559602,0,-1.56809925238291,-0.0974603886902332,0,0,14600,19300,0.1133787,0.6781297,0,0.2981843,0.1632653,0,0.8163266,0.02040816
-1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_40_downhill_5.vdri,98,0.9915034,36.42257,-49.57517,9.50862113796935,-9.38991854142169,1952.151,53.59729,-,-,-,-,169.3674,8.775516,53.59729,0.3337815,6.441983,8.79713126591274,-118.49623419314,0.258845797644721,-0.255614449183146,-0.122051005167879,-0.540049332943228,4.57391597641839,-0.597600349320306,0,-3.22573081970215,-0.0905470021896892,0,0,14600,19300,0.1133787,0.7201149,-0.1358655,0.2941416,0.1530612,0.01020408,0.8163266,0.02040816
+Job [-],Input File [-],Cycle [-],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/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [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 [%]
+1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_85_downhill_1.vdri,60,0.95699,57.4194,-9.5699,175.306474145254,0,34374.12,598.6499,-,-,-,-,1891.734,98.0173,598.6499,3.728141,71.95311,164.295813465118,-0.000138600667317708,2.92177456908756,0,-0.409112303940985,-0.521875793321265,0.883999291327265,-2.7000226971476,0,-2.31001112196181E-06,-0.174761124948661,0,0,14600,19300,0.3935185,0.5517726,0,0.7,0,0.2666667,0.03333334
+1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_85_downhill_3.vdri,59,0.9667453,58.98785,-29.00236,123.785437923367,-6.30265533317954,23438.96,397.3523,-,-,-,-,1255.633,65.05873,397.3523,2.474544,47.75869,115.799342979819,-27.5270470764677,2.02870578818851,-0.103293517960442,-0.452447935329328,-0.526984904739592,2.67796067992846,-3.0273124868609,0,-0.451137715975444,-0.145490675585137,0,0,14600,19300,0.4237288,0.5852351,0,0.7118644,0,0.2542373,0.03389831
+1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_85_downhill_5.vdri,59,0.9765316,59.58498,-48.82658,59.2654687913798,-7.13939922138796,11537.47,193.6305,-,-,-,-,611.8725,31.70324,193.6305,1.20585,23.2729,54.3353294437214,-74.9616008693889,0.971295182969835,-0.117006820572747,-0.463687660630991,-0.531894579894013,4.50484998385112,-3.02731263003416,0,-1.22853734758165,-0.10770679662625,0,0,14600,19300,0.4237288,0.5992488,0,0.6949152,0,0.2711864,0.03389831
+1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_60_downhill_1.vdri,72,0.9830145,49.15072,-9.830145,67.8582484987047,-0.507567884193526,14414.34,293.2681,-,-,-,-,926.7272,48.01696,293.2681,1.826351,35.24857,64.3291643725501,-4.99089558919271E-05,1.35716496997409,-0.0101513576838705,-0.253276107995245,-0.536067676196496,0.9080387844642,-1.34410719014704,0,-9.98179117838542E-07,-0.121600765089194,0,0,14600,19300,0.2314815,0.6249714,0,0.3611111,0,0.6111111,0.02777778
+1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_60_downhill_3.vdri,69,0.990886,51.6984,-29.72658,54.3142052526059,-8.40652724279874,10415.48,201.4662,-,-,-,-,636.6332,32.98618,201.4662,1.254647,24.21469,51.0284102619558,-57.4339307425679,1.04102226734161,-0.161125105486976,-0.293279741194298,-0.54014431754748,2.74483239505026,-1.57788557955374,0,-1.10081700589922,-0.112603592955404,0,0,14600,19300,0.2616747,0.6288966,0,0.4057971,0,0.5652174,0.02898551
+1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_60_downhill_5.vdri,68,0.9768196,51.71398,-48.84098,29.7220186345718,-8.74667999323677,5914.038,114.3605,-,-,-,-,361.3793,18.72432,114.3605,0.7121894,13.74525,27.6657972616308,-127.509606669931,0.561415907541911,-0.165215066538917,-0.289893092251271,-0.532051403158241,4.5061782444848,-1.57788571359383,0,-2.40851479265425,-0.0940346761875682,0,0,14600,19300,0.2655229,0.6520829,0,0.3970588,0,0.5735294,0.02941176
+1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_40_downhill_1.vdri,98,0.9909539,36.40239,-9.909538,21.9399670192174,-5.4446823694268,4932.738,135.5059,-,-,-,-,428.1986,22.18646,135.5059,0.8438739,16.28677,20.7515338780929,-0.132063651571468,0.597254657745361,-0.148216353389952,-0.121580008554989,-0.540397226197852,0.915372537838088,-0.597600406113391,0,-0.00359506607055664,-0.101238352557023,0,0,14600,19300,0.1133787,0.6344942,0,0.1734694,0,0.8061224,0.02040816
+1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_40_downhill_3.vdri,98,0.9905689,36.38824,-29.71707,15.8016906465803,-9.15276610121435,3132.069,86.07365,-,-,-,-,271.9927,14.09289,86.07365,0.5360305,10.34539,14.7388859573676,-57.603646005903,0.430157134268019,-0.24915863275528,-0.121821108645648,-0.539971430699031,2.74395388086637,-0.59760037559602,0,-1.56809925238291,-0.0974603886902332,0,0,14600,19300,0.1133787,0.6781297,0,0.1632653,0,0.8163266,0.02040816
+1,40t_Long_Haul_Truck.vecto,Cycle_Accelerate_0_40_downhill_5.vdri,98,0.9915034,36.42257,-49.57517,9.50862113796935,-9.38991854142169,1952.151,53.59729,-,-,-,-,169.3674,8.775516,53.59729,0.3337815,6.441983,8.79713126591274,-118.49623419314,0.258845797644721,-0.255614449183146,-0.122051005167879,-0.540049332943228,4.57391597641839,-0.597600349320306,0,-3.22573081970215,-0.0905470021896892,0,0,14600,19300,0.1133787,0.7201149,-0.1358655,0.1530612,0.01020408,0.8163266,0.02040816
diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum b/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum
index 787650d4c12e96b6ce4b2f93ee38c6927a26c32d..53a6c6cd4530aff65d2c347e02fddc36977f621e 100644
--- a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum
+++ b/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum
@@ -1,3 +1,3 @@
-Job [-],Input File [-],Cycle [-],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/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [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 [%]
-1,24t Coach-1Gear.vecto,Coach_24t_InitTest.vdri,11,0.055,18,1.563477,36.2728424072266,0,8311.801,461.7667,-,-,-,-,1459.183,442.1766,461.7667,16.81843,55.50081,32.6869277954102,0,0.110833685133192,0,-0.000740383888284365,-0.0182289157973395,-0.0809074264102512,0,0,0,-0.0109569642278883,0,0,15700,3300,0,0,0,0,0,0,1,0
-1,24t Coach-1Gear.vecto,1-Gear-Test-dist.vdri,4116,16.80844,14.70126,-43.95795,10.4722688512911,-1.93318024173422,2854.648,194.177,-,-,-,-,613.5995,185.9392,194.177,7.072299,23.33859,9.04114719805379,-3.35899400379802,11.9732940533095,-2.21026940971613,-0.201207232583507,-5.5715248703791,2.27501199701439,-0.0838811713001794,0,-3.84044981100907,-2.3409734544158,0,0,15700,3300,0.001349746,0.5755603,-0.2358637,0.04782489,0.002429543,0.000728863,0.9963557,0.0004859086
+Job [-],Input File [-],Cycle [-],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/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [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 [%]
+1,24t Coach-1Gear.vecto,Coach_24t_InitTest.vdri,11,0.055,18,1.563477,36.2728424072266,0,8311.801,461.7667,-,-,-,-,1459.183,442.1766,461.7667,16.81843,55.50081,32.6869277954102,0,0.110833685133192,0,-0.000740383888284365,-0.0182289157973395,-0.0809074264102512,0,0,0,-0.0109569642278883,0,0,15700,3300,0,0,0,0,0,1,0
+1,24t Coach-1Gear.vecto,1-Gear-Test-dist.vdri,4116,16.80844,14.70126,-43.95795,10.4722688512911,-1.93318024173422,2854.648,194.177,-,-,-,-,613.5995,185.9392,194.177,7.072299,23.33859,9.04114719805379,-3.35899400379802,11.9732940533095,-2.21026940971613,-0.201207232583507,-5.5715248703791,2.27501199701439,-0.0838811713001794,0,-3.84044981100907,-2.3409734544158,0,0,15700,3300,0.001349746,0.5755603,-0.2358637,0.002429543,0.000728863,0.9963557,0.0004859086
diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
index d42b7544f8d0124a965c6912e7c01cd262417d71..a28caae8062f5ea07f811de4dfee64c87ecfd6f5 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+31-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,8862.0000,0.0000,1298.0000,16.8420,46.7112,,7788.5978,166.7393,7788.5978,166.7393,7788.5978,166.7393,7788.5978,166.7393,7788.5978,166.7393,20.0408,,526.8962,,27.2326,1.2447,44.3053,-8.0548,1.9832,5.3382,3.1099,0.3597,-0.0002,0.4488,2.1656,0.0000,0.0000,11.7532,-0.2976,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..6d72e82505e914ad5ee410477496fc37cb3f1ffb 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_ALT [kWh],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+16-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,8862.0000,0.0000,1298.0000,16.8411,46.7086,,7965.3302,170.5323,7965.3302,170.5323,7965.3302,170.5323,7965.3302,170.5323,7965.3302,170.5323,20.4967,,538.8820,,27.2303,1.2013,44.2984,-8.4708,0.3797,2.3629,5.3376,3.1097,0.3597,-0.0002,0.4331,2.1655,0.0000,0.0000,11.7514,-0.3130,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..b8fd6bdf78461f0534805fd7ceed90136a0ca3be 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+12-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,8862.0000,0.0000,1298.0000,16.8075,46.6155,,7666.7738,164.4684,7666.7738,164.4684,7666.7738,164.4684,7666.7738,164.4684,7666.7738,164.4684,19.7678,,519.7200,,27.2489,1.1417,42.1780,-8.5851,1.9832,5.3555,3.1158,0.3598,0.0000,0.4116,1.5459,0.0000,0.0000,11.1889,-0.3744,-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..5355e584d9bf46d14195990f428593c5a8b218a8 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_ALT [kWh],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+8-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,8862.0000,0.0000,1298.0000,16.8075,46.6155,,7850.1194,168.4015,7850.1194,168.4015,7850.1194,168.4015,7850.1194,168.4015,7850.1194,168.4015,20.2406,,532.1489,,27.2488,1.0940,42.1780,-8.9766,0.3984,2.3816,5.3555,3.1158,0.3598,0.0000,0.3945,1.5458,0.0000,0.0000,11.1889,-0.3915,-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..c9c3497d312df2ae7d6eba004f0d8f4b4e504155 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+24-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,8862.0000,0.0000,1298.0000,16.8070,46.6141,,6251.3983,134.1095,6251.3983,134.1095,6251.3983,134.1095,6251.3983,134.1095,6251.3983,134.1095,16.1189,,423.7859,,20.1200,1.6711,34.2473,-9.8890,1.9832,2.2254,3.1158,0.3598,0.0000,0.6025,1.5778,0.0000,0.0000,8.5047,-0.5988,-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..eb8680ba8dff4ed01af3a8a96b59273b00c8ccae 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_ALT [kWh],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+29-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,8862.0000,0.0000,1298.0000,16.8070,46.6141,,6425.9646,137.8544,6425.9646,137.8544,6425.9646,137.8544,6425.9646,137.8544,6425.9646,137.8544,16.5690,,435.6199,,20.1200,1.5967,34.2459,-10.3286,0.3984,2.3816,2.2254,3.1158,0.3598,0.0000,0.5757,1.5776,0.0000,0.0000,8.5044,-0.6255,-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..1b58cf8c4b96261d1217713a8c1b38fcb81239d6 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+22-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,8862.0000,0.0000,1298.0000,16.8514,46.7374,,6300.2654,134.8014,6300.2654,134.8014,6300.2654,134.8014,6300.2654,134.8014,6300.2654,134.8014,16.2021,,425.9725,,20.1375,1.8191,36.0191,-8.8062,1.9832,2.2237,3.1116,0.3596,-0.0002,0.6559,2.1232,0.0000,0.0000,8.9748,-0.4721,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..d38da713f7df8403696585f7dfe150901f44861d 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_ALT [kWh],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+0-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,8862.0000,0.0000,1298.0000,16.8509,46.7360,,6468.1691,138.3981,6468.1691,138.3981,6468.1691,138.3981,6468.1691,138.3981,6468.1691,138.3981,16.6344,,437.3380,,20.1371,1.7457,36.0530,-9.2445,0.3794,2.3626,2.2237,3.1115,0.3596,-0.0002,0.6294,2.1232,0.0000,0.0000,8.9732,-0.4982,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..7cb9c1147efac6e3df4fa091c7bba73284686f38 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+14-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,8862.0000,0.0000,1298.0000,16.8586,46.7574,,4856.7669,103.8716,4856.7669,103.8716,4856.7669,103.8716,4856.7669,103.8716,4856.7669,103.8716,12.4846,,328.2342,,13.7545,2.4128,29.6019,-9.0517,1.9832,-0.8572,3.1129,0.3598,-0.0002,0.8699,2.0922,0.0000,0.0000,6.3891,-0.7820,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..9ef26db487f129ba3cc55f9d8c2b119f06fc6cc5 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+27-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,8862.0000,0.0000,1298.0000,16.8563,46.7509,,5451.4678,116.6067,5451.4678,116.6067,5451.4678,116.6067,5451.4678,116.6067,5451.4678,116.6067,14.0152,,368.4770,,16.2774,1.9487,31.6045,-8.7574,1.9832,0.5292,3.1125,0.3597,-0.0002,0.7026,2.1030,0.0000,0.0000,7.4271,-0.5887,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..320ea7319264be9314ca0911a06d10eb3deead8d 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,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+10-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,8862.0000,0.0000,1298.0000,16.8572,46.7534,,5221.0961,111.6731,5221.0961,111.6731,5221.0961,111.6731,5221.0961,111.6731,5221.0961,111.6731,13.4222,,352.8869,,15.2904,2.1110,30.8156,-8.8161,1.9832,0.0000,3.1127,0.3597,-0.0002,0.7611,2.0987,0.0000,0.0000,7.0191,-0.6563,0.0000,0.2924,-0.3219,23.5158,22.2051,0.0000,14.4838
diff --git a/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum b/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
index 29f6484969d038c5f1f91f5f1e2d0033aae6088f..e69e8a55c9a605b74399ee832eb1528b38471216 100644
--- a/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
+++ b/VectoCoreTest/TestData/Pwheel/Results/Pwheel.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 [%]
-0-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,1.5000,,,,88.6411,0.0000,12098.8139,,12098.8139,,12098.8139,,,,,,,59.3466,0.0000,0.0246,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0009,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,0.0000
+Job [-],Input File [-],Cycle [-],Status,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+0-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,0.0000,0.0000,1.5000,,,,12098.8139,,12098.8139,,12098.8139,,12098.8139,,12098.8139,,,,,,59.3466,0.0000,88.6411,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0009,0.0000,0.0000,0.0246,0.0000,0.0000,,,,,,0.0000
diff --git a/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum b/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
index a1d6b5c7c6f0dc6768eb58c06d1d51fd22e063c5..f94b576866a38560255d35f2455d93f452c95691 100644
--- a/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
+++ b/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.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 [%]
-0-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,1566.0000,,,,65.0737,-8.4007,9501.4371,,9501.4371,,9501.4371,,,,,,,41.2368,0.0000,18.1772,-1.2993,0.0000,0.0000,0.0000,0.0000,1.5039,0.0000,0.4064,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,0.0000
+Job [-],Input File [-],Cycle [-],Status,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+2-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,0.0000,0.0000,1566.0000,,,,9501.4371,,9501.4371,,9501.4371,,9501.4371,,9501.4371,,,,,,41.2368,0.0000,65.0737,-8.4007,1.5039,0.0000,0.0000,0.0000,0.0000,0.0000,0.4064,0.0000,0.0000,18.1772,-1.2993,0.0000,,,,,,0.0000
diff --git a/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum b/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum
index 8dad7cff1a8204d588b224e1183d519805fb883c..0c1dcb7a258483781f395d5b5df6d196558ce0c1 100644
--- a/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum
+++ b/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum
@@ -1,7 +1,7 @@
-Job [-],Input File [-],Cycle [-],time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [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/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [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 [%]
-1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5188,108.1817,75.06826,0.4176572,1.44111111111111,1.93108893699116,0.62256001614862,2.55282541645898,0.504388880299197,84.2005492982813,-1.38841319755122,16373.51,218.1149,-,-,16610.92,221.2776,699.2371,-,221.2776,-,26.59586,71.9230417326127,-2.65873198913168,121.342347155412,-2.00085768580437,-68.5272798927924,-27.4112346063885,-0.000913775395601988,6.82509400778347E-08,-7.05197461869982,-3.8315282110042,-10.5097224537532,-2.00511476749089,0,14600,0,-4.595578E-10,0.4826669,-0.5824779,0.194878,0.04471858,0.03797225,0.870663,0.04664611
-1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5285,108.1821,73.69076,0.405076,1.46805555555556,1.96719449344609,0.634200016450551,2.60055557555623,0.513819435694151,117.069029630527,-3.5248178646913,22546.45,305.9603,-,-,22873.37,310.3967,980.8537,50.82144,310.3967,1.933021,37.3073,105.022315874343,-13.1872949838864,171.863839332594,-5.17462844858153,-67.1631451211485,-58.5049236301995,-0.042272475272831,1.16840367101961E-07,-7.18382533921136,-19.3596816638443,-12.4393761609495,-1.99137201235888,0,14600,19300,-2.706739E-10,0.347071,-0.4362039,0.1876148,0.0717124,0.05733207,0.8251656,0.04578997
-1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5322,108.1813,73.17788,0.4295395,1.47833333333333,1.98096671601137,0.63864001656572,2.6187619249026,0.517416657855113,127.378675165939,-3.93737369995846,24547.73,335.4529,-,-,24903.67,340.3169,1075.401,42.33864,340.3169,1.610373,40.90347,115.230841308054,-17.3626400919527,188.308141453647,-5.82075078643858,-66.5735653450041,-67.8989995111525,-0.0355927723190851,1.25660767985715E-07,-7.23411891301473,-25.6677696026034,-13.09323215276,-1.97993133016707,0,14600,25400,4.479868E-10,0.3184433,-0.4329029,0.1870568,0.08248778,0.05881248,0.8132281,0.04547163
-1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1571,25.82763,59.18489,-0.02803829,0.52366668747531,0.794227800667286,0.164954996150401,0.657700416147709,0.087277779078318,66.4784023538943,-2.39190498046117,13144.21,222.0873,-,-,13177.07,222.6425,703.5504,-,222.6425,-,26.75992,56.8615609158914,-5.73868856701424,29.0104361383244,-1.04380075675125,-13.6940184927538,-6.53187910419371,0.00310443965886306,6.19818456470966E-08,-2.22782771203253,-2.50429992743871,-2.55978002786636,-0.4482026269142,0,14600,0,1.214098E-09,0.4606809,-0.4776372,0.3371189,0.1464036,0.1425843,0.6403565,0.07065564
-1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1571,25.82797,59.18568,-0.02638249,0.52366668747531,0.794227800667286,0.164954996150401,0.657700416147709,0.087277779078318,90.8871916631921,-4.44909507559789,17854.29,301.6657,-,-,17898.92,302.4198,955.6467,74.08114,302.4198,2.817716,36.34854,81.6423797068476,-15.726417038943,39.6621605841319,-1.94153565660119,-13.712599570246,-11.5485113206299,-0.0119464354380034,-3.98331127750377E-07,-2.22782771203253,-6.86283365782764,-2.91673191388448,-0.437272039017537,0,14600,12900,2.428197E-09,0.4231861,-0.4139018,0.3423752,0.1769574,0.1865054,0.5658816,0.07065564
-1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1586,25.8282,58.62642,-0.02528494,0.528666687673993,0.80181113421917,0.166529996113645,0.663980178236961,0.088111112424069,114.21071311186,-5.17202703158687,22329.36,380.8753,-,-,22385.18,381.8275,1206.575,47.50294,381.8275,1.8068,45.89272,104.143813316037,-27.6649598017015,50.3161641653917,-2.2785652422491,-13.5011482622726,-16.1802100722409,-0.0954405769892037,5.55271334532234E-07,-2.24909914149178,-12.1879517348607,-3.38600274460183,-0.432368298185368,0,14600,25400,-6.013079E-10,0.3666722,-0.3816725,0.3317091,0.2194199,0.2137453,0.4968474,0.06998739
+Job [-],Input File [-],Cycle [-],time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [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/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [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 [%]
+1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5188,108.1817,75.06826,0.4176572,1.44111111111111,1.93108893699116,0.62256001614862,2.55282541645898,0.504388880299197,84.2005492982813,-1.38841319755122,16373.51,218.1149,-,-,16610.92,221.2776,699.2371,-,221.2776,-,26.59586,71.9230417326127,-2.65873198913168,121.342347155412,-2.00085768580437,-68.5272798927924,-27.4112346063885,-0.000913775395601988,6.82509400778347E-08,-7.05197461869982,-3.8315282110042,-10.5097224537532,-2.00511476749089,0,14600,0,-4.595578E-10,0.4826669,-0.5824779,0.04471858,0.03797225,0.870663,0.04664611
+1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5285,108.1821,73.69076,0.405076,1.46805555555556,1.96719449344609,0.634200016450551,2.60055557555623,0.513819435694151,117.069029630527,-3.5248178646913,22546.45,305.9603,-,-,22873.37,310.3967,980.8537,50.82144,310.3967,1.933021,37.3073,105.022315874343,-13.1872949838864,171.863839332594,-5.17462844858153,-67.1631451211485,-58.5049236301995,-0.042272475272831,1.16840367101961E-07,-7.18382533921136,-19.3596816638443,-12.4393761609495,-1.99137201235888,0,14600,19300,-2.706739E-10,0.347071,-0.4362039,0.0717124,0.05733207,0.8251656,0.04578997
+1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5322,108.1813,73.17788,0.4295395,1.47833333333333,1.98096671601137,0.63864001656572,2.6187619249026,0.517416657855113,127.378675165939,-3.93737369995846,24547.73,335.4529,-,-,24903.67,340.3169,1075.401,42.33864,340.3169,1.610373,40.90347,115.230841308054,-17.3626400919527,188.308141453647,-5.82075078643858,-66.5735653450041,-67.8989995111525,-0.0355927723190851,1.25660767985715E-07,-7.23411891301473,-25.6677696026034,-13.09323215276,-1.97993133016707,0,14600,25400,4.479868E-10,0.3184433,-0.4329029,0.08248778,0.05881248,0.8132281,0.04547163
+1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1571,25.82763,59.18489,-0.02803829,0.52366668747531,0.794227800667286,0.164954996150401,0.657700416147709,0.087277779078318,66.4784023538943,-2.39190498046117,13144.21,222.0873,-,-,13177.07,222.6425,703.5504,-,222.6425,-,26.75992,56.8615609158914,-5.73868856701424,29.0104361383244,-1.04380075675125,-13.6940184927538,-6.53187910419371,0.00310443965886306,6.19818456470966E-08,-2.22782771203253,-2.50429992743871,-2.55978002786636,-0.4482026269142,0,14600,0,1.214098E-09,0.4606809,-0.4776372,0.1464036,0.1425843,0.6403565,0.07065564
+1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1571,25.82797,59.18568,-0.02638249,0.52366668747531,0.794227800667286,0.164954996150401,0.657700416147709,0.087277779078318,90.8871916631921,-4.44909507559789,17854.29,301.6657,-,-,17898.92,302.4198,955.6467,74.08114,302.4198,2.817716,36.34854,81.6423797068476,-15.726417038943,39.6621605841319,-1.94153565660119,-13.712599570246,-11.5485113206299,-0.0119464354380034,-3.98331127750377E-07,-2.22782771203253,-6.86283365782764,-2.91673191388448,-0.437272039017537,0,14600,12900,2.428197E-09,0.4231861,-0.4139018,0.1769574,0.1865054,0.5658816,0.07065564
+1,40t_Long_Haul_Truck.vecto,Regional_Delivery.vdri,1586,25.8282,58.62642,-0.02528494,0.528666687673993,0.80181113421917,0.166529996113645,0.663980178236961,0.088111112424069,114.21071311186,-5.17202703158687,22329.36,380.8753,-,-,22385.18,381.8275,1206.575,47.50294,381.8275,1.8068,45.89272,104.143813316037,-27.6649598017015,50.3161641653917,-2.2785652422491,-13.5011482622726,-16.1802100722409,-0.0954405769892037,5.55271334532234E-07,-2.24909914149178,-12.1879517348607,-3.38600274460183,-0.432368298185368,0,14600,25400,-6.013079E-10,0.3666722,-0.3816725,0.2194199,0.2137453,0.4968474,0.06998739
diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum b/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum
index 9ad88585ec47c79f25265c440e6e72431ecced05..a66abbb020c24add1d484a359c2add99b1b8766e 100644
--- a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum
+++ b/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum
@@ -1,4 +1,4 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
-1,24t Coach.vecto,Engine Only1.vdri,Success,3951,29.5999634846317,-1.63579455196953,ERROR,-,-
-1,24t Coach.vecto,Engine Only2.vdri,Success,3951,29.5999634846317,-1.63579455196953,ERROR,-,-
-1,24t Coach.vecto,Engine Only3.vdri,Success,3951,29.5999634846317,-1.63579455196953,ERROR,-,-
+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],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],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%],Etorqueconv [kWh],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm]
+0-0,24t Coach EngineOnly,Engine Only1.vdri,Success,695.0000,,,,38.9315,-7.5017,8071.4665,,8071.4665,,8071.4665,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0-1,24t Coach EngineOnly,Engine Only2.vdri,Success,1006.0000,,,,39.1365,-8.6307,8394.1675,,8394.1675,,8394.1675,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0-2,24t Coach EngineOnly,Engine Only3.vdri,Success,166.0000,,,,29.2320,-7.4365,6477.3762,,6477.3762,,6477.3762,,,,,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum b/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum
index ee840a00c3541412e63c2d411e95aed25848dc2b..4d1eacbcd648d81c963e8f2cb2040fd9416c1bdb 100644
--- a/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum
+++ b/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [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/100tkm],FC-Final [l/100km],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 [%]
-1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,Success,5188,108.1817,75.06826,0.4176572,1.44111111111111,1.93108893699116,0.62256001614862,2.55282541645898,0.504388880299197,84.2005492982813,-1.38841319755122,16373.51,218.1149,-,-,16610.92,221.2776,699.2371,-,221.2776,-,26.59586,71.9230417326127,-2.65873198913168,121.342347155412,-2.00085768580437,-68.5272798927924,-27.4112346063885,-0.000913775395601988,6.82509400778347E-08,-7.05197461869982,-3.8315282110042,-10.5097224537532,-2.00511476749089,0,14600,0,-4.595578E-10,0.4826669,-0.5824779,0.194878,0.04471858,0.03797225,0.870663,0.04664611
\ No newline at end of file
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [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/100tkm],FC-Final [l/100km],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 [%]
+1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,Success,5188,108.1817,75.06826,0.4176572,1.44111111111111,1.93108893699116,0.62256001614862,2.55282541645898,0.504388880299197,84.2005492982813,-1.38841319755122,16373.51,218.1149,-,-,16610.92,221.2776,699.2371,-,221.2776,-,26.59586,71.9230417326127,-2.65873198913168,121.342347155412,-2.00085768580437,-68.5272798927924,-27.4112346063885,-0.000913775395601988,6.82509400778347E-08,-7.05197461869982,-3.8315282110042,-10.5097224537532,-2.00511476749089,0,14600,0,-4.595578E-10,0.4826669,-0.5824779,0.04471858,0.03797225,0.870663,0.04664611
\ No newline at end of file
diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum b/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
new file mode 100644
index 0000000000000000000000000000000000000000..1acda4b64ec1e3d3d2bad95eea475b3fd29a3164
--- /dev/null
+++ b/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
@@ -0,0 +1,2 @@
+Job [-],Input File [-],Cycle [-],Status,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_eng_out_pos [kW],P_eng_out_neg [kW],E_aux_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [kWh],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_axl_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_eng_out_pos [kWh],E_eng_out_neg [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
+,,,Pending,,,10.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,,,,,0.0000,0.0000,0.0000,0.0000,0.0031,0.0041,0.0013,0.0054,0.0011,0.0150,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000
diff --git a/VectoCoreTest/VectoCoreTest.csproj b/VectoCoreTest/VectoCoreTest.csproj
index 5269996027e9210cd074d1e14abd874bac288aa2..5a0f56c5a04c43ae4b79a2e03af315c012f218ba 100644
--- a/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCoreTest/VectoCoreTest.csproj
@@ -1168,6 +1168,9 @@
<None Include="TestData\Results\EngineOnlyCycles\24tCoach_EngineOnlyPaux.vmod">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Results\EngineOnlyCycles\AuxWriteModFileSumFile.vsum">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Results\Integration\24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>