Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into develop

Conflicts:
	Documentation/User Manual/3-simulation-models/Driver_LAC.md
	Documentation/User Manual/6-changelog/changelog.md

Declaration/SegmentTable.csv

 Valid,Vehicle Category ,Axle Conf.,GVW_Min,GVW_Max,HDV class,.vacc file ,Cross Wind Correction - Long haul,Cross Wind Correction - Other,Truck Axles - Long haul,Truck Axles - Other,Trailer Axles - Long haul,Trailer Axles - Other,Long haul,Regional delivery,Urban delivery,Municipal utility,Construction,Heavy Urban,Urban,Suburban,Interurban,Coach,Mass Extra - Long haul,Mass Extra - Regional delivery,Mass Extra - Urban delivery,Mass Extra - Municipal utility,Mass Extra - Construction,Mass Extra - Heavy Urban,Mass Extra - Urban,Mass Extra - Suburban,Mass Extra - Interurban,Mass Extra - Coach,Payload - Long haul,Payload - Regional delivery,Payload - Urban delivery,Payload - Municipal utility,Payload - Construction,Payload - Heavy Urban,Payload - Urban,Payload - Suburban,Payload - Interurban,Payload - Coach
 0,RigidTruck,4x2,0,7.5,0,Truck.vacc,-,RigidSolo,-,-,-,-,0,1,1,0,0,0,0,0,0,0,-,???,???,-,-,-,-,-,-,-,-,???,???,-,-,-,-,-,-,-
 1,RigidTruck,4x2,7.5,10,1,Truck.vacc,-,RigidSolo,-,45/55,-,-,0,1,1,0,0,0,0,0,0,0,-,1600,1600,-,-,-,-,-,-,-,-,f,f,-,-,-,-,-,-,-
-1,RigidTruck,4x2,10,12,2,Truck.vacc,RigidSolo,RigidSolo,40/60,45/55,-,-,1,1,1,0,0,0,0,0,0,0,1900,1900,1900,-,-,-,-,-,-,-,f,f,f,-,-,-,-,-,-,-
+1,RigidTruck,4x2,10,12,2,Truck.vacc,RigidSolo,RigidSolo,22.5/32.5,45/55,45/1,-,1,1,1,0,0,0,0,0,0,0,1900,1900,1900,-,-,-,-,-,-,-,f,f,f,-,-,-,-,-,-,-
 1,RigidTruck,4x2,12,16,3,Truck.vacc,-,RigidSolo,-,40/60,-,-,0,1,1,0,0,0,0,0,0,0,-,2000,2000,-,-,-,-,-,-,-,-,f,f,-,-,-,-,-,-,-
 1,RigidTruck,4x2,16,99,4,Truck.vacc,RigidTrailer,RigidSolo,20/30,45/55,50/2,-,1,1,0,1,0,0,0,0,0,0,7500,2100,-,2100,-,-,-,-,-,-,14000,4400,-,4400,-,-,-,-,-,-
 1,Tractor,4x2,16,99,5,Truck.vacc,TractorSemitrailer,TractorSemitrailer,20/25,25/25,55/3,50/3,1,1,0,0,0,0,0,0,0,0,7500,7500,-,-,-,-,-,-,-,-,19300,12900,-,-,-,-,-,-,-,-

Documentation/User Manual/1-user-interface/F_VEH-Editor.md

@@ -71,7 +71,7 @@ Powered axle tyres/rims
 
 If a separate retarder is used in the vehicle a **Retarder Torque Loss Map** can be defined here to consider idling losses caused by the retarder.
 
-Three options are available:
+Four options are available:
 : -   No retarder
 -	Included in Transmission Loss Maps: Use this if the [Transmission Loss Maps](#transmission-loss-map) already include retarder losses.
 -   Primary Retarder (before gearbox): The rpm ratio is relative to the engine speed
@@ -79,6 +79,15 @@ Three options are available:
 
 Both, primary and secondary retarders, require an [Retarder Torque Loss Input File (.vrlm)](#retarder-loss-torque-input-file-.vrlm).
 
+###Angular Gear
+
+If an angular gear is used in the vehicle, it can be defined here.
+Three options are available:
+
+- No angular gear (**default**)
+- Separate angular gear: Use this if the angular gear is measured separately. In this case the ratio must be set and the [Transmission Loss Map](#transmission-loss-map) (or an Efficiency value) must also be given.
+- Included in transmission: Use this if the gearbox already includes the transmission losses for the angular gear in the respective transmission loss maps.
+
 
 ###Cross Wind Correction Options
 

Documentation/User Manual/1-user-interface/H_GBX-Editor.md

@@ -64,6 +64,17 @@ Use the ![add](pics/plus-circle-icon.png) and ![remove](pics/minus-circle-icon.p
 ![](pics/checkbox.png) Skip Gears
 :   See [Gear Shift Model](#gear-shift-model).
 
+<div class="vecto3">
+Since version Vecto 3.0.3 the gearshift polygon calculation according to the ACEA White Book 2016 is implemented and since Vecto 3.0.4 the ACEA White Book 2016 shift strategy for AMT and MT is implemented. For details on this topic please see the ACEA White Book 2016.
+
+The user interface contains input fields for the following parameters:
+! - **Downshift after upshift delay**: to prevent frequent (oscilating) up-/down shifts this parameter blocks downshifts for a certain period after an upshift
+- **Upshift after downshift delay**: to prevent frequent (oscilating) up-/down shifts this parameter blocks upshifts for a certain period after a downshift
+- **Min acceleration after upshift**: after an upshift the vehicle must be able to accelerate with at least the given acceleration. The achievable acceleration after an upshift is estimated on the current driving condition and powertrain state.
+
+![](pics/Vecto_ShiftStrategyParameters.png)
+
+</div>
 
 Torque Reserve \[%\]
 :   This parameter is required for the **Allow shift-up inside polygons** and **Skip Gears** options.

Documentation/User Manual/3-simulation-models/Driver_LAC.md

 ##Look-Ahead Coasting
 
-<div class="vecto22">
 Like Overspeed, Look-Ahead Coasting is a function that aims on modelling real-life driver behaviour. It is a forward-looking function that detects forthcoming reductions in target speed in the mission profile (e.g. speed limit, etc.) and induces an early deceleration using engine braking before applying mechanical brakes according to the [deceleration limit](#acceleration-limiting).
 
  The implemented approach uses a predefined target deceleration (a~lookahead~) to calculate the deceleration time for each particular target speed change.
@@ -10,6 +9,73 @@ Like Overspeed, Look-Ahead Coasting is a function that aims on modelling real-li
 At the resulting deceleration start point the model calculates the
 coasting trajectory until it meets the brake deceleration trajectory. The resulting deceleration consists of a coasting phase followed by combined mechanical/engine braking. If Look-Ahead Coasting is disabled only the braking phase according to the [deceleration limit](#acceleration-limiting) will be applied.
 
+
+<div class="vecto3">
+Since Vecto 3.0.4 the coasting strategy according to the ACEA White Book 2016 is implemented. 
+
+The look ahead coasting functionality represents the driver behavior prior to a deceleration event. Due to information of the route ahead the driver is able to anticipate on the deceleration event by releasing the accelerator pedal.
+
+This pedal release decision is based on an estimation of kinetical and potential (height) energy gain versus the expected dissipated energy tue to vehicle resistances during the route section ahead.
+
+For an upcoming target speed change the energy level after the speed change is compared to the vehicle's current energy level (kinetic and potential energy). The difference of those energy levels is used to estimate the average deceleration force to reach the next target speed. Coasting starts if the vehicle's (estimated) average resistance force during coasting multiplied by a speed dependent 'Decision Factor' becomes smaller than the average deceleration force. (For details on the equations please see the ACEA White Book 2016, Section 8)
+
+The *Decision Factor (DF)* depends on the next target speed and the speed change:
+
+$DF_{Coasting} = 2.5 - 1.5 * DF_{vel} * DF_{vdrop}$
+
+whereas $DF_{vel}$ and $DF_{vdrop}$ are speed dependent and speed change dependent lookup curves, giving a value from 0 and 1.
+
+For the look ahead coasting target speed changes within the preview distance are considered. 
+
+$preview distance [m] = 10 * vehicle speed [km/h]$
+
+Parameters in [Job File](#job-file):
+: - **PreviewDistanceFactor**
+- **DF_offset**: offset in the equation for DF~coasting~ (default 2.5)
+- **DF_scaling**: factor in the equation for DF~coasting~ (default 1.5)
+- **DF_targetSpeedLookup**: csv file for DF~vel~ lookup (see below)
+- **Df_velocityDropLookup**: csv file for DF~vdrop~ lookup (see below)
+
+In engineering mode the parameters can be freely chosen while in declaration mode the default values are used.
+
+![](pics/Vecto-UI_LAC.png)
+
+####Decision Factor for target velocity lookup (DF~vel~)
+
+![](pics/Vecto_LAC-DF.png)
+
+Example (default values):
+
+~~~
+v_target [km/h], decision_factor [-]
+0              , 0
+48             , 0
+52             , 1
+100            , 1
+~~~
+
+####Decision Factor for velocity drop lookup (DF~vdrop~)
+
+Example (default values):
+
+~~~
+v_drop [km/h], decision_factor [-]
+-100          , 1
+9             , 1
+11            , 0
+100           , 0
+~~~
+</div>
+
+<div class="vecto2">
+ The implemented approach uses a predefined target deceleration (a~lookahead~) to calculate the deceleration time for each particular target speed change.
+
+![](pics/LAC.svg)
+
+At the resulting deceleration start point the model calculates the
+coasting trajectory until it meets the brake deceleration trajectory. The resulting deceleration consists of a coasting phase followed by combined mechanical/engine braking. If Look-Ahead Coasting is disabled only the braking phase according to the [deceleration limit](#acceleration-limiting) will be applied.
+
+
 Parameters in [Job File](#job-file):
 : -   **Target Retardation** = a~lookahead~
 -   **Minimum speed**. Below this speed the function is disabled.

Documentation/User Manual/3-simulation-models/GearShift.md

@@ -44,3 +44,15 @@ Early Upshift can be enabled in the [Gearbox File](#gearbox-file) (Allow shift-u
 
 
 ![](pics/GBX-Editor-shift2.svg)
+
+
+###Generic shift conditions (extra conditions)
+
+- Only allow upshifts if the vehicle is not decelerating **and** the calculated (estimated) acceleration in the next gear is higher than a certain value (default: 0.1 m/s²)
+- Do not allow downshifts with less time than a certain amount after an upshift (default 10 s)
+- Do not allow upshifts with less time than a certain amount after an downshift (default 10 s)
+
+Parameters in [Gearbox File](#gearbox-file):
+: - **DownshiftAferUpshiftDelay**
+- **UpshiftAfterDownshiftDelay**
+- **UpshiftMinAcceleration**

Documentation/User Manual/3-simulation-models/Vehicle_RRC.md

@@ -4,7 +4,7 @@
 The rolling resistance is calculated using a speed-independent rolling resistance coefficient (RRC).
 In order to consider that the RRC depends on the vehicle weight it is modelled as a function of the total vehicle mass. The total RRC is calculated in VECTO using the following equation (the index i refers to the vehicle's axle (truck and trailer)):
 
-$RRC = \sum_{i=1}^{n} s_{(i)} \cdot RRC_{ISO(i)} \cdot \left( \fracs{_{(i)} \cdot m \cdot g }{w_{(i)} \cdot F_{zISO(i)} } \right)^{\beta-1}$
+$RRC = \sum_{i=1}^{n} s_{(i)} \cdot RRC_{ISO(i)} \cdot \left( \frac{s_{(i)} \cdot m \cdot g }{w_{(i)} \cdot F_{zISO(i)} } \right)^{\beta-1}$
 
 with:
 

Documentation/User Manual/3-simulation-models/powertrain.md

+## Powertrain and Components Structure
+The powertrain in Vecto V3 consists of the following components which are connected in this order:
+
+![](pics/powertrain.svg)
+
+The engine tries to supply the requested power demand (including all power losses happening in the powertrain and auxiliaries).
+If the engine can't supply the given power demand, the driver component limits it (e.g. by accelerating slower than requested by the driving cycle).

Documentation/User Manual/3-simulation-models/simulation-models.md

@@ -2,6 +2,7 @@
 
 In this chapter the used component models for the simulation are described.
 
+* [Powertrain and Components Structure](#powertrain-and-components-structure)
 * [Driver: Acceleration Limiting](#acceleration-limiting)
 * [Driver: Look-Ahead Coasting](#look-ahead-coasting)
 * [ADAS: Overspeed / Eco-Roll](#overspeed-eco-roll)

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

@@ -104,6 +104,9 @@ Refers to other files:
       "RefRPM": 0.0,
       "Inertia": 0.0
     }
+    "DownshiftAferUpshiftDelay": 10.0,
+    "UpshiftAfterDownshiftDelay": 10.0,
+    "UpshiftMinAcceleration": 0.1
   }
 }
 ~~~

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

@@ -73,11 +73,13 @@ In Vecto 3.0.2 the structure of the modal data output has been revised and re-st
 | P_clutch_out		|	[kW]	|	Power at the clutch's out shaft. P_clutch_out = P_eng_out - P_clutch_loss |
 | P_aux				|	[kW]	|	Total power demand by the auxiliaries |
 | P_gbx_in			|	[kW]	|	Power at the gearbox' input shaft |
-| P_gbx_loss		|	[kW]	|	Power loss at the gerbox, interpolated from the loss-map |
+| P_gbx_loss		|	[kW]	|	Power loss at the gearbox, interpolated from the loss-map |
 | P_gbx_inertia		|	[kW]	|	Power loss due to the gearbox' inertia |
 | P_ret_in			|	[kW]	|	Power at the retarder's input shaft. P_ret_in = P_gbx_in - P_gbx_loss - P_gbx_inertia |
-| P_ret_loss		|	[kW]	|	Power loss at the retarder, interpolated from the loss-map |
-| P_axle_in			|	[kW]	|	Power at the axle-gear input shaft. P_axle_in = P_ret_in - P_ret_loss |
+| P_ret_loss		|	[kW]	|	Power loss at the retarder, interpolated from the loss-map. |
+| P_angle_in		|	[kW]	|	Power at the Anglegear's input shaft. Empty if no Anglegear is used. |
+| P_angle_loss		|	[kW]	|	Power loss at the Anglegear, interpolated from the loss-map. Empty if no Anglegear is used. |
+| P_axle_in			|	[kW]	|	Power at the axle-gear input shaft. P_axle_in = P_ret_in - P_ret_loss ( - P_angle_loss if an Angulargear is used) |
 | P_axle_loss		|	[kW]	|	Power loss at the axle gear, interpolated from the loss-map |
 | P_brake_in		|	[kW]	|	Power at the brake input shaft (definition: serially mounted into the drive train between wheels and axle). P_brake_in = P_axle_in - P_axle_loss |
 | P_brake_loss		|	[kW]	|	Power loss due to braking |

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

 ##Transmission Loss Map
-This file defines losses in gearbox and axle transmission and must be provided for each gear in the [Gearbox File](#gearbox-editor). The file uses the [VECTO CSV format](#csv).
+This file defines losses in gearbox and axle transmission and must be provided for each gear in the [Gearbox File](#gearbox-editor). The file uses the [VECTO CSV format](#csv). The same file format is also used for the axle gear (gear 0) and the angular gear.
 
 - Filetype: .vtlm
 - Header: **Input Speed [rpm], Input Torque [Nm], Torque Loss [Nm]**

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

@@ -9,7 +9,7 @@ Refers to other files:
 
 * [Cross Wind Correction (VCDV, VCDB)](#cross-wind-correction)
 * [Retarder Loss Map (VRLM)](#retarder-loss-torque-input-file-.vrlm)
-
+* [Transmission Loss Map (for Angular Gear) (VTLM)](#transmission-loss-map)
 
 **Example:**
 
@@ -38,6 +38,11 @@ Refers to other files:
       "Ratio": 1.0,
       "File": "Retarder.vrlm"
     },
+    "AngularGear": {
+      "Type" : "SeparateAngularGear",
+      "Ratio": 1.0,
+      "LossMap": "AngularGear.vtlm"
+    },
     "AxleConfig": {
       "Type": "4x2",
       "Axles": [

Documentation/User Manual/6-changelog/changelog.md

@@ -2,13 +2,16 @@
 
 **VECTO 3.0.4**
 
-***Build 537 (2016-06-28)***
+
+
+***Build 544 (2016-06-28)***
 
 - Main Updates
     + New gear shift strategy according to White Book 2016
     + New coasting strategy according to White Book 2016
     + New input parameters (enineering mode) for coasting and gear shift behavior
     + Use SI units in Advanced Auxiliaries Module and compile with strict compiler settings (no implicit casts, etc.)
+    + Allow efficiency for transmission losses (in engineering mode)
 
 - Bugfixes
     + Auxiliary TechList not read from JSON input data

Documentation/User Manual/files.txt

@@ -20,6 +20,7 @@
 2-calculation-modes/engine-only.md
 2-calculation-modes/batch.md
 3-simulation-models/simulation-models.md
+3-simulation-models/powertrain.md
 3-simulation-models/Driver_AccLimit.md
 3-simulation-models/Driver_LAC.md
 3-simulation-models/ADAS_EcoRoll.md