diff --git a/User Manual/5-input-and-output-files/VSUM.md b/User Manual/5-input-and-output-files/VSUM.md
index dc2b8f679daf42cec5b0b8256c2894d9df537c90..49c43770395e4e26250fdc80dea52d4e77c09d73 100644
--- a/User Manual/5-input-and-output-files/VSUM.md
+++ b/User Manual/5-input-and-output-files/VSUM.md
@@ -3,58 +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 \* |
-| 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/Models/Simulation/Data/ModalResult.cs b/VectoCore/Models/Simulation/Data/ModalResult.cs
index 6d6ff6ec72d0c19965c389a98458af3bed6e0bb0..7bb96ec9f4db0913ba1e843a40a2cc5e4863fbae 100644
--- a/VectoCore/Models/Simulation/Data/ModalResult.cs
+++ b/VectoCore/Models/Simulation/Data/ModalResult.cs
@@ -188,6 +188,11 @@ 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>
diff --git a/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index 2bea6b706ecc81884dd63e9a7a5326c642c919e6..01221911493fc9c044ebbca584aa20c1595638be 100644
--- a/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -332,11 +332,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var fcAux = fc;
var fcWHTC = fcAux * ModelData.WHTCCorrectionFactor;
- var fcFinal = fcWHTC;
+ 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) {
@@ -349,6 +351,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container[ModalResultField.FCMap] = null;
container[ModalResultField.FCAUXc] = null;
container[ModalResultField.FCWHTCc] = null;
+ container[ModalResultField.FCAAUX] = null;
container[ModalResultField.FCFinal] = null;
}
}
diff --git a/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/OutputData/IModalDataContainer.cs
index 093d28a9efcf39ccc2f83d4deefc2ceb4aa8aa21..df18a017a4dd4473c21c2ef87c104cee5453864c 100644
--- a/VectoCore/OutputData/IModalDataContainer.cs
+++ b/VectoCore/OutputData/IModalDataContainer.cs
@@ -138,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);
@@ -148,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()) {
@@ -168,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()) {
@@ -177,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()) {
@@ -186,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()) {
@@ -196,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 })
@@ -308,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)) {
@@ -317,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)) {
@@ -331,11 +320,30 @@ 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();
diff --git a/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/OutputData/SummaryDataContainer.cs
index 160c7aec22666e1fcfea2ecf86f91cc832f49714..f1aaabf3a4c7d947cb91fbde3733acfddc66b3fb 100644
--- a/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/OutputData/SummaryDataContainer.cs
@@ -48,52 +48,58 @@ namespace TUGraz.VectoCore.OutputData
private const string JOB = "Job [-]";
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 STATUS = "Status";
private const string TIME = "time [s]";
private const string DISTANCE = "distance [km]";
private const string SPEED = "speed [km/h]";
private const string ALTITUDE_DELTA = "altitudeDelta [m]";
- 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 FCFINAL = "FC-Final [g/km]";
+ 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 CO2KM = "CO2 [g/km]";
- private const string CO2TKM = "CO2 [g/tkm]";
-
- private const string PPOS = "Ppos [kW]";
- private const string PNEG = "Pneg [kW]";
- 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 ETORQUECONV = "Etorqueconv [kWh]";
-
- 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 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;
@@ -116,14 +122,29 @@ namespace TUGraz.VectoCore.OutputData
_table.Columns.Add(STATUS, typeof(string));
_table.Columns.AddRange(new[] {
- TIME, DISTANCE, SPEED, ALTITUDE_DELTA, 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
+ 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(IModalDataContainer data, string jobFileName, string jobName, string cycleFileName,
+ /// <summary>
+ /// Finishes the summary data container (writes the data to the sumWriter).
+ /// </summary>
+ public virtual void Finish()
+ {
+ if (_sumWriter != null) {
+ _sumWriter.WriteSumData(new DataView(_table, "", JOB, DataViewRowState.CurrentRows).ToTable());
+ }
+ }
+
+ /// <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();
@@ -132,105 +153,106 @@ namespace TUGraz.VectoCore.OutputData
row[JOB] = ReplaceNotAllowedCharacters(jobName);
row[INPUTFILE] = ReplaceNotAllowedCharacters(jobFileName);
row[CYCLE] = ReplaceNotAllowedCharacters(cycleFileName);
- row[STATUS] = data.RunStatus;
- row[TIME] = data.Duration();
+ row[STATUS] = modData.RunStatus;
- var fcfinal = data.FuelConsumptionFinal();
- if (fcfinal != null) {
- row[FCFINAL] = fcfinal.ConvertTo().Gramm.Per.Kilo.Meter;
+ row[MASS] = vehicleMass;
+ row[LOADING] = vehicleLoading;
+
+ row[TIME] = modData.Duration();
+
+ var distance = modData.Distance();
+ if (distance != null) {
+ row[DISTANCE] = distance.ConvertTo().Kilo.Meter;
}
- row[FCFINAL_LITERPER100KM] = data.FuelConsumptionFinalLiterPer100Kilometer();
- if (vehicleLoading != null && !vehicleLoading.IsEqual(0)) {
- row[FCFINAL_LITERPER100TKM] = data.FuelConsumptionFinalLiterPer100Kilometer() / vehicleLoading.ConvertTo().Ton;
+
+ var speed = modData.Speed();
+ if (speed != null) {
+ row[SPEED] = speed.ConvertTo().Kilo.Meter.Per.Hour;
}
- row[FCMAP] = data.FCMapPerSecond().ConvertTo().Gramm.Per.Hour;
- var fcMapPerMeter = data.FCMapPerMeter();
+ row[ALTITUDE_DELTA] = modData.AltitudeDelta();
+
+ row[FCMAP_H] = modData.FCMapPerSecond().ConvertTo().Gramm.Per.Hour;
+ var fcMapPerMeter = modData.FCMapPerMeter();
if (fcMapPerMeter != null) {
- row[FCMAPKM] = fcMapPerMeter.ConvertTo().Gramm.Per.Kilo.Meter;
+ row[FCMAP_KM] = fcMapPerMeter.ConvertTo().Gramm.Per.Kilo.Meter;
}
- row[FCAUXC] = data.FuelConsumptionAuxStartStopCorrectedPerSecond().ConvertTo().Gramm.Per.Hour;
- var fuelConsumptionAuxStartStopCorrected = data.FuelConsumptionAuxStartStopCorrected();
+ row[FCAUXC_H] = modData.FuelConsumptionAuxStartStopPerSecond().ConvertTo().Gramm.Per.Hour;
+ var fuelConsumptionAuxStartStopCorrected = modData.FuelConsumptionAuxStartStop();
if (fuelConsumptionAuxStartStopCorrected != null) {
- row[FCAUXCKM] = fuelConsumptionAuxStartStopCorrected.ConvertTo().Gramm.Per.Kilo.Meter;
+ row[FCAUXC_KM] = fuelConsumptionAuxStartStopCorrected.ConvertTo().Gramm.Per.Kilo.Meter;
}
- row[FCWHTCC] = data.FuelConsumptionWHTCCorrectedPerSecond().ConvertTo().Gramm.Per.Hour;
- var fuelConsumptionWHTCCorrected = data.FuelConsumptionWHTCCorrected();
+
+ row[FCWHTCC_H] = modData.FuelConsumptionWHTCPerSecond().ConvertTo().Gramm.Per.Hour;
+ var fuelConsumptionWHTCCorrected = modData.FuelConsumptionWHTC();
if (fuelConsumptionWHTCCorrected != null) {
- row[FCWHTCCKM] = fuelConsumptionWHTCCorrected.ConvertTo().Gramm.Per.Kilo.Meter;
+ row[FCWHTCC_KM] = fuelConsumptionWHTCCorrected.ConvertTo().Gramm.Per.Kilo.Meter;
}
- var kilogramPerMeter = data.CO2PerMeter();
- if (kilogramPerMeter != null) {
- row[CO2KM] = kilogramPerMeter.ConvertTo().Gramm.Per.Kilo.Meter;
- if (vehicleLoading != null && !vehicleLoading.IsEqual(0)) {
- row[CO2TKM] = kilogramPerMeter.ConvertTo().Gramm.Per.Kilo.Meter / vehicleLoading.ConvertTo().Ton;
- }
+ 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;
}
- var distance = data.Distance();
- if (distance != null) {
- row[DISTANCE] = distance.ConvertTo().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;
}
-
- var speed = data.Speed();
- if (speed != null) {
- row[SPEED] = speed.ConvertTo().Kilo.Meter.Per.Hour;
+ row[FCFINAL_LITERPER100KM] = modData.FuelConsumptionFinalLiterPer100Kilometer();
+ if (vehicleLoading != null && !vehicleLoading.IsEqual(0)) {
+ row[FCFINAL_LITERPER100TKM] = modData.FuelConsumptionFinalLiterPer100Kilometer() / vehicleLoading.ConvertTo().Ton;
}
- row[ALTITUDE_DELTA] = data.AltitudeDelta();
- row[PPOS] = data.EnginePowerPositiveAverage().ConvertTo().Kilo.Watt;
- row[PNEG] = data.EnginePowerNegativeAverage().ConvertTo().Kilo.Watt;
-
- 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[PACC] = data.PercentAccelerationTime();
- row[PDEC] = data.PercentDecelerationTime();
- row[PCRUISE] = data.PercentCruiseTime();
- row[PSTOP] = data.PercentStopTime();
- }
+ var kilogramPerMeter = modData.CO2PerMeter();
+ if (kilogramPerMeter != null) {
+ row[CO2_KM] = kilogramPerMeter.ConvertTo().Gramm.Per.Kilo.Meter;
+ if (vehicleLoading != null && !vehicleLoading.IsEqual(0)) {
+ row[CO2_TKM] = kilogramPerMeter.ConvertTo().Gramm.Per.Kilo.Meter / vehicleLoading.ConvertTo().Ton;
+ }
+ }
- private static string ReplaceNotAllowedCharacters(string text)
- {
- return text.Replace('#', '_').Replace(',', '_').Replace('\n', '_').Replace('\r', '_');
- }
+ 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;
- [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));
+ 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)
{
- if (_sumWriter != null) {
- _sumWriter.WriteSumData(new DataView(_table, "", JOB, DataViewRowState.CurrentRows).ToTable());
- }
+ return text.Replace('#', '_').Replace(',', '_').Replace('\n', '_').Replace('\r', '_');
}
}
}
\ No newline at end of file
diff --git a/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCoreTest/Models/Simulation/AuxTests.cs
index d44a38ce62fcc08cb4ee11ffa3e0d5cea86ca218..0cdeace22400d1b816b4e41914698130bf5155e8 100644
--- a/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -102,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");
}
diff --git a/VectoCoreTest/Models/Simulation/SimulationTests.cs b/VectoCoreTest/Models/Simulation/SimulationTests.cs
index 1323120cba0701d0c50f4bb9679fa10ab826c107..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(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 dd38b28c7ec6eeed2ab9f2bfe51a8a8c614541a1..15925402d1daae5b061186c27a2b592ea4dbaee1 100644
--- a/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCoreTest/Reports/SumWriterTest.cs
@@ -78,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);
@@ -130,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/MeasuredSpeed/Results/MeasuredSpeed.vsum b/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
index 60b9d4653ef679655a6a1ef810f2c2fed2652bb8..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-20-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,1298.0000,16.8420,46.7112,,44.3053,-8.0548,7788.5978,166.7393,7788.5978,166.7393,7788.5978,166.7393,526.8962,,166.7393,20.0408,,27.2326,1.2447,11.7532,-0.2976,5.3382,3.1099,0.3597,-0.0002,1.9832,0.4488,2.1656,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2937,-0.3215,23.4387,22.2822,0.0000,14.4838
+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 35ff6a13e9320fa4f3e9a44f6cdbff53e6190025..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-10-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,1298.0000,16.8411,46.7086,,0.3797,44.2984,-8.4708,7965.3302,170.5323,7965.3302,170.5323,7965.3302,170.5323,538.8820,,170.5323,20.4967,,27.2303,1.2013,11.7514,-0.3130,5.3376,3.1097,0.3597,-0.0002,2.3629,0.4331,2.1655,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2937,-0.3208,23.4387,22.3593,0.0000,14.4838
+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 b9de5b789e637b21fa0685d434f6f7cdf82b3e81..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-6-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,1298.0000,16.8075,46.6155,,42.1780,-8.5851,7666.7738,164.4684,7666.7738,164.4684,7666.7738,164.4684,519.7200,,164.4684,19.7678,,27.2489,1.1417,11.1889,-0.3744,5.3555,3.1158,0.3598,0.0000,1.9832,0.4116,1.5459,0.0000,0.0000,8862.0000,0.0000,-0.0002,0.2931,-0.3223,23.4387,22.2051,0.0000,14.4838
+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 530a2b4d066b9d187b86577a64d6d131193591b7..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-2-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,1298.0000,16.8075,46.6155,,0.3984,42.1780,-8.9766,7850.1194,168.4015,7850.1194,168.4015,7850.1194,168.4015,532.1489,,168.4015,20.2406,,27.2488,1.0940,11.1889,-0.3915,5.3555,3.1158,0.3598,0.0000,2.3816,0.3945,1.5458,0.0000,0.0000,8862.0000,0.0000,-0.0002,0.2931,-0.3223,23.4387,22.2051,0.0000,14.4838
+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 28736057bd7da595a52c018671a2af3fcc80a568..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-14-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,1298.0000,16.8070,46.6141,,34.2473,-9.8890,6251.3983,134.1095,6251.3983,134.1095,6251.3983,134.1095,423.7859,,134.1095,16.1189,,20.1200,1.6711,8.5047,-0.5988,2.2254,3.1158,0.3598,0.0000,1.9832,0.6025,1.5778,0.0000,0.0000,8862.0000,0.0000,-0.0003,0.2931,-0.3220,23.4387,22.2822,0.0000,14.4838
+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 d74c0e5ad22bbe6f54814efe02cf099e3db657a2..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-18-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,1298.0000,16.8070,46.6141,,0.3984,34.2459,-10.3286,6425.9646,137.8544,6425.9646,137.8544,6425.9646,137.8544,435.6199,,137.8544,16.5690,,20.1200,1.5967,8.5044,-0.6255,2.2254,3.1158,0.3598,0.0000,2.3816,0.5757,1.5776,0.0000,0.0000,8862.0000,0.0000,-0.0003,0.2931,-0.3220,23.4387,22.2822,0.0000,14.4838
+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 d17c7437587daaab115c46cc49042023ff42a47c..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-12-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,1298.0000,16.8514,46.7374,,36.0191,-8.8062,6300.2654,134.8014,6300.2654,134.8014,6300.2654,134.8014,425.9725,,134.8014,16.2021,,20.1375,1.8191,8.9748,-0.4721,2.2237,3.1116,0.3596,-0.0002,1.9832,0.6559,2.1232,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2920,-0.3219,23.5929,22.2051,0.0000,14.4838
+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 8d0308be2712bec42dff138a8c00d72edeaca56e..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-0-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,1298.0000,16.8509,46.7360,,0.3794,36.0530,-9.2445,6468.1691,138.3981,6468.1691,138.3981,6468.1691,138.3981,437.3380,,138.3981,16.6344,,20.1371,1.7457,8.9732,-0.4982,2.2237,3.1115,0.3596,-0.0002,2.3626,0.6294,2.1232,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2920,-0.3219,23.5929,22.2051,0.0000,14.4838
+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 5a8f73bd392d578f50938531c86764ac9095f966..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-8-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,1298.0000,16.8586,46.7574,,29.6019,-9.0517,4856.7669,103.8716,4856.7669,103.8716,4856.7669,103.8716,328.2342,,103.8716,12.4846,,13.7545,2.4128,6.3891,-0.7820,-0.8572,3.1129,0.3598,-0.0002,1.9832,0.8699,2.0922,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2923,-0.3220,23.5158,22.2051,0.0000,14.4838
+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 9179dc3c71d3b006781bdc2ac73e3067931192a8..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-16-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,1298.0000,16.8563,46.7509,,31.6045,-8.7574,5451.4678,116.6067,5451.4678,116.6067,5451.4678,116.6067,368.4770,,116.6067,14.0152,,16.2774,1.9487,7.4271,-0.5887,0.5292,3.1125,0.3597,-0.0002,1.9832,0.7026,2.1030,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2924,-0.3219,23.5158,22.2051,0.0000,14.4838
+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 2d99e589af2848c3749206903a2759399787334d..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],pAcc [%],pDec [%],pCruise [%],pStop [%]
-4-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,1298.0000,16.8572,46.7534,,30.8156,-8.8161,5221.0961,111.6731,5221.0961,111.6731,5221.0961,111.6731,352.8869,,111.6731,13.4222,,15.2904,2.1110,7.0191,-0.6563,0.0000,3.1127,0.3597,-0.0002,1.9832,0.7611,2.0987,0.0000,0.0000,8862.0000,0.0000,0.0000,0.2924,-0.3219,23.5158,22.2051,0.0000,14.4838
+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 72f968fd14439211453fd62408108aac74680e85..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],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 b0d7aef1db62d8a5e515c7b6a74f8f3d7c27c4a7..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],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/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>