PTO column names changed in SUM File, and also added in user manual

Documentation/User Manual/5-input-and-output-files/VSUM.md

@@ -19,25 +19,28 @@ The .vsum file includes total / average results for each calculation run in one
 | 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. If Loading = 0[kg] the column [l/100tkm] is left empty.                                                                                                                                                                          |
+| FC-Final              | [g/h], [g/km], [l/100km], [l/100tkm] | Final average fuel consumption after ALL corrections. Value for calculation of CO~2~ value. If Loading = 0[kg] the column [l/100tkm] is left empty.                                                                                                                                                                       |
 | 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_clutch_pos          | [kW]                                 | Average positive power at clutch (coming from engine) (all non-negative values averaged over the whole cycle duration)                                                                                                                                                                                                                            |
-| P_clutch_neg          | [kW]                                 | Average negative power at clutch (coming from engine) (all non-positive values averaged over the whole cycle duration)                                                                                                                                                                                                                            |
+| P_clutch_pos          | [kW]                                 | Average positive power at clutch (coming from engine) (all non-negative values averaged over the whole cycle duration)                                                                                                                                                                                                    |
+| P_clutch_neg          | [kW]                                 | Average negative power at clutch (coming from engine) (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_PTO_CONSUM          | [kWh]                                | Total energy demand of the pto consumer (if a pto consumer was used).                                                                                                                                                                                                                                                     |
+| E_PTO_TRANSM          | [kWh]                                | Total energy demand of the pto transmission (if a pto transmission was used).                                                                                                                                                                                                                                             |
 | 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_gbx_loss            | [kWh]                                | Total transmission energy losses at gearbox                                                                                                                                                                                                                                                                               |
+| E_axl_loss            | [kWh]                                | Total transmission energy losses at the axlegear                                                                                                                                                                                                                                                                          |
+| E_angle_loss          | [kWh]                                | Total torque converter energy loss                                                                                                                                                                                                                                                                                        |
 | E_ret_loss            | [kWh]                                | Total retarder energy loss                                                                                                                                                                                                                                                                                                |
 | E_tc_loss             | [kWh]                                | Total torque converter energy loss                                                                                                                                                                                                                                                                                        |
-| E_angle_loss          | [kWh]                                | Total torque converter energy loss                                                                                                                                                                                                                                                                                        |
-| E_clutch_pos          | [kWh]                                | Total positive work at clutch input (produced by engine) (all non-negative values averaged over the whole cycle duration)                                                                                                                                                                                                                                                                                                   |
-| E_clutch_neg          | [kWh]                                | Total negative work at clutch input (produced by engine drag) (all non-positive values averaged over the whole cycle duration)                                                                                                                                                                                                                                                                                  |
+| E_clutch_pos          | [kWh]                                | Total positive work at clutch input (produced by engine) (all non-negative values averaged over the whole cycle duration)                                                                                                                                                                                                 |
+| E_clutch_neg          | [kWh]                                | Total negative work at clutch input (produced by engine drag) (all non-positive values averaged over the whole cycle duration)                                                                                                                                                                                            |
 | 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)                                                                                                                                                                                                          |

VectoCore/VectoCore/OutputData/SummaryDataContainer.cs

@@ -35,6 +35,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
 
 // ReSharper disable MemberCanBePrivate.Global  -- used by API!
 
@@ -84,6 +85,7 @@ namespace TUGraz.VectoCore.OutputData
 		public const string P_ANGLE_LOSS = "P_angle_loss [kW]";
 		public const string P_TC_LOSS = "P_tc_loss [kW]";
 
+		public const string E_FORMAT = "E_{0} [kWh]";
 		public const string E_AUX_FORMAT = "E_aux_{0} [kWh]";
 		public const string E_AUX = "E_aux_sum [kWh]";
 
@@ -237,12 +239,19 @@ namespace TUGraz.VectoCore.OutputData
 			row[P_FCMAP_POS] = modData.TotalPowerEnginePositiveAverage().ConvertTo().Kilo.Watt;
 
 			foreach (var aux in modData.Auxiliaries) {
-				var colName = string.Format(E_AUX_FORMAT, aux.Key);
+				string colName;
+				if (aux.Key == Constants.Auxiliaries.IDs.PTOConsumer || aux.Key == Constants.Auxiliaries.IDs.PTOTransmission) {
+					colName = string.Format(E_FORMAT, aux.Key);
+				} else {
+					colName = string.Format(E_AUX_FORMAT, aux.Key);
+				}
+
 				if (!_table.Columns.Contains(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] = modData.AuxiliaryWork(aux.Value).ConvertTo().Kilo.Watt.Hour;
 			}
 			row[E_AUX] = modData.WorkAuxiliaries().ConvertTo().Kilo.Watt.Hour;