Merge pull request #129 in VECTO/vecto-sim from...

Merge pull request #129 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-110-documentation to develop

* commit 'b5ee2e86': (30 commits)
  update version template header, version numbers
  updated screenshot main window
  add print css to fix page brakes, add vcdb example
  add print css to fix page brakes, add vcdb example
  set physical constants (air density, etc) in vecto3 from gui
  make physical constants writeable
  changed column header for vcdb files
  updating documentation
  command line: accept xml files
  changelog, fixed wrong links, combined engine only mode to one chapter
  updated calculation modes, files, simulation models (aka functions)
  updated changelog
  added missing newlines at end of file
  added v3.0.2 on start page, added "Print View" link in footer.
  added makefile, updated vmap
  updated all file formats, added json, added file format overview, updated some functions: aux, roll resistance,
  added pages for Vehicle File, Gearbox File, Engine File and Job File
  Documentation: Driving Cycles
  adding image commandline v3
  update help text: use correct executable name
  ...

User Manual/1-user-interface/0_start.md

+
+User Manual
+====================================
+![](pics/VECTOlarge.png)\
+\
+Version: VECTO 2.2 / VectoCore 3.0.2 / VectoCmd 3.0.2
+
+---
+
+VECTO is a tool for the calculation of energy consumption and CO~2~ emissions of vehicles. It models the components of a heavy-duty vehicle and simulates a virtual drive on a route. The goal is to provide a standardized way of calculating the energy consumption (fuel consumption) and corresponding CO~2~ emissions.
+
+
+This User Manual consists of 4 Parts:
+
+- [Graphical User Interface](#user-interface):
+    : Here graphical user interface of VECTO with all windows and configuration possibilities is described.
+- [Calculation Modes](#calculation-modes):
+    : The calculation modes of VECTO are described here (Declaration, Engineering, ...). 
+- [Simulation Models](#simulation-models):
+    : This chapter describes the used component models and formulas which are implemented in the software. 
+- [Input and Output](#input-and-output):
+    : The input and output file formats are described in this chapter.
+
+This user manual describes both, version 2.2 and verson 3.0.x of Vecto. Vecto 3.x is a complete rewrite of Vecto 2.2 that uses the same models and input data and also produces the same output. However, in some parts version 3.x differs from version 2.2. The according paragraphs are highlighted accordingly.
+
+

User Manual/1-user-interface/mainform.md → User Manual/1-user-interface/B_mainform.md

@@ -10,7 +10,7 @@
 
 The Main Form is loaded when starting VECTO. Closing this form will close VECTO even if other dialogs are still open. In this form all global settings can be controlled and all other application dialogs can be opened.
 
-In order to start a calculation the [Calculation Mode](#calculation-modes) must be set and at least one [Job File (.vecto)](#job-editor) must added to the Job List. After clicking START all checked files in the Job List will be calculated.
+In order to start a simulation the [Calculation Mode](#calculation-modes) must be set and at least one [Job File (.vecto)](#job-editor) must added to the Job List. After clicking START all checked files in the Job List will be calculated. From the user interface you can either run the simulation using Vecto 2.2 or Vecto 3.x by clicking the according START button on the left side of the window.
 
 The Main Form includes three tabs as described below:
 
@@ -69,26 +69,22 @@ Driving Cycle List
 In this tab the global calculation settings can be changed.
 
 ![](pics/checkbox.png) Declaration Mode
-:   Enable or disable [Declaration Mode](#declaration-mode)
+:   Select either [Declaration Mode](#declaration-mode) or [Engineering Mode](#engineering-mode)
 
+![cb](pics/checkbox.png) Write modal results
+:   Toggle output of modal results (.vmod files). Summary files (.vsum, .vres) are always created.
 
+<div class="vecto2">
 ![](pics/checkbox.png) Batch Mode
 :   If Declaration Mode is disabled VECTO can be run in [Batch Mode](#batch-mode).
 
-
 ![cb](pics/checkbox.png) Cycle Distance Correction
 :   Toggle Cycle Distance Correction. Always ON in Declaration Mode. Cycle Distance Correction monitors the driven distance in each time step and, if necessary, adds or removes time steps in order to keep the original distance given in the driving cycle.
 :   -   If **enabled** the vehicle drives the same **distance** as given in the driving cycle
--   If ***disabled*** the vehicle travels the same **time** as given in the driving cycle (Note that distance-based cycles (see [here](#driving-cycle-.vdri)) are always converted to time-based cycles internally)
-
+-   If ***disabled*** the vehicle travels the same **time** as given in the driving cycle (Note that distance-based cycles (see [here](#driving-cycles)) are always converted to time-based cycles internally)
 
 ![cb](pics/checkbox.png) Use gears/rpm's form driving cycle
-:   If activated VECTO will use gear and/or engine speed defintions included in the driving cycle (see [here](#driving-cycle-.vdri)).
-
-
-![cb](pics/checkbox.png) Write modal results
-:   Toggle output of modal results (.vmod files). Summary files (.vsum, .vres) are always created.
-
+:   If activated VECTO will use gear and/or engine speed defintions included in the driving cycle (see [here](#driving-cycles)).
 
 ![cb](pics/checkbox.png) Shutdown system after last job
 :   If activated VECTO will shutdown the system after the last job was completed. (Can be aborted during 100 seconds before shutdown.)
@@ -96,11 +92,9 @@ In this tab the global calculation settings can be changed.
 Output Path (BATCH Mode only)
 :   Select target directory for result files (.vmod, .vres, .vsum)
 
-
-
 ![cb](pics/checkbox.png) Create Subdirectories for modal results (BATCH Mode only)
 :   If activated a subdirectory for each job file will be created inside **Output Path** for modal output.
-
+</div>
 
 ###Controls
 
@@ -149,5 +143,9 @@ Depending on the colour the following message types are displayed:
 
 Note that the [message log](#application-files) can be opened in the ![](pics/Misc-Tools-icon.png) Tools menu with **Open Log**.
 
+<div class="vecto3">
+In addition to the log messages shown in the message list, Vecto 3 writes more elaborate messages in the subdirectory logs. If multiple simulations are run in parallel (e.g., in declartion mode a vehicle is simulated on different cycles with different loadings) a separate log-file is created for every simulation run.
+</div>
+
 Statusbar
-: Displays current status and progress of running calculations. When no calculation is running the current mode is displayed (Standard, Batch or Declaration Mode).
+: Displays current status and progress of active simulations. When no simulation is executed the current mode is displayed (Standard, Batch or Declaration Mode).

User Manual/1-user-interface/settings.md → User Manual/1-user-interface/C_settings.md

@@ -10,9 +10,9 @@ In the Settings dialog controls general application settings. The settings are s
 
 ###Interface Settings
 
-
+<div class="vecto22">
 Logfile Size Limit \[MB\]
-:	Whenever the [Log File](#application-files) reaches this size it will be restarted. One backup is always stored as LOG\_backup.txt.
+:	Whenever the [Log File](#application-files) reaches this size it will be restarted. One backup is always stored as LOG\_backup.txt. <span class="vecto3">*Note:* this setting only affects the log-file written by the graphical user interface. The log-files written in the logs subdirectory are not limited by this setting!</span>
 
 File Open Command
 :	This command will be used to open CSV Input Files like Driving Cycles (.vdri). See: [Run command![](pics/external-icon%2012x12.png)](http://en.wikipedia.org/wiki/Run_command)\
@@ -20,11 +20,10 @@ File Open Command
 **Command**: The actual command.
 
 :	***Example*** *: If the command is* ***excel*** *and the file is* ***C:\\VECTO\\cycle1.vdri*** *then VECTO will run:* ***excel "C:\\VECTO\\cycle1.vdri"***
-
+</div>
 
 ###Calculation Settings
 
-
 Air Density \[kg/m³\]
 :	The Air Density is needed to calculate the air resistance together with the **Drag Coefficient** and the **Cross Sectional Area** (see [Vehicle Editor](#vehicle-editor)).
 

User Manual/1-user-interface/VECTO-Editor.md → User Manual/1-user-interface/D_VECTO-Job-Editor.md

@@ -6,7 +6,7 @@
 
 ###Description
 
-The job file (.vecto) includes all informations to run a VECTO calculation. It defines the vehicle and the driving cycle(s) to be used for calculation. In summary it defines:
+The [job file (.vecto)](#job-file) includes all informations to run a VECTO calculation. It defines the vehicle and the driving cycle(s) to be used for calculation. In summary it defines:
 
 -   Filepath to the [Vehicle File (.vveh)](#vehicle-editor) which defines the not-engine/gearbox-related vehicle parameters
 -   Filepath to the [Engine File (.veng)](#engine-editor) which includes full load curve(s) and the fuel consumption map
@@ -18,19 +18,19 @@ The job file (.vecto) includes all informations to run a VECTO calculation. It d
 
 ###Relative File Paths
 
-It is recommended to define relative filepaths. This way the Job File and all input files can be moved without having to update the paths. Example: "Vehicles\\Vehicle1.vveh" points to the "Vehicles" subdirectory of the Job File's directoy.
+It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths. Example: "Vehicles\\Vehicle1.vveh" points to the "Vehicles" subdirectory of the Job File's directoy.
 
-VECTO automatically uses relative paths if the input file (e.g. Vehicle File) is in the same directory as the Job File. (The Job File must be saved before browsing for input files.)
+VECTO automatically uses relative paths if the input file (e.g. Vehicle File) is in the same directory as the Job File. (*Note:* The Job File must be saved before browsing for input files.)
 
 
 ###General Settings
 
 ![](pics/checkbox.png) Engine Only Mode
 
-:	Enables [Engine Only Mode](#engine-only-mode). Only the following parameters are needed for this mode:
+:	Enables [Engine Only Mode](#engine-only-mode) (Engineering mode only). The following parameters are needed for this mode:
 
 -   Filepath to the [Engine File (.veng)](#engine-editor)
--   [Driving Cycles](#driving-cycle-.vdri) including engine torque (or power) and engine speed
+-   [Driving Cycles](#driving-cycles) including engine torque (or power) and engine speed
 
 
 Filepath to the Vehicle File (.vveh)
@@ -43,7 +43,7 @@ Filepath ot the Gearbox File(.vgbx)
 :	Files can be created and edited using the [Gearbox Editor](#gearbox-editor).
 
 Auxiliaries
-:	This list contains all auxiliaries used for calculation. The auxiliaries are configured using the [Auxiliary Dialog](#auxiliary-dialog). For each auxiliary an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux) must be provided and the [driving cycle](#driving-cycle-.vdri) must include the corresponding supply power.
+:	This list contains all auxiliaries used for calculation. The auxiliaries are configured using the [Auxiliary Dialog](#auxiliary-dialog). For each auxiliary an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux) must be provided and the [driving cycle](#driving-cycles) must include the corresponding supply power.
 **Double-click** entries to edit with the [Auxiliary Dialog](#auxiliary-dialog).
 
 : ![addaux](pics/plus-circle-icon.png) Add new Auxiliary
@@ -52,7 +52,7 @@ Auxiliaries
 : See [Auxiliaries](#auxiliaries) for details.
 
 Cycles
-:	List of cycles used for calculation. The .vdri format is described [here](#driving-cycle-.vdri).
+:	List of cycles used for calculation. The .vdri format is described [here](#driving-cycles).
 **Double-click** an entry to open the file (see [File Open Command](#settings)).
 **Click** selected items to edit file paths.
 
@@ -79,7 +79,7 @@ Acceleration Limiting
 
 ###Chart Area
 
-If a valid [Vehicle File](#vehicle-editor), [Engine File](#engine-editor) and [Gearbox File](#gearbox-editor) is loaded into the Editor the main vehicle parameters like HDV class and axle configuration are shown here. The plot shows the full load curve(s) and shift polygons. In [Declaration Mode](#declaration-mode) the **generic**  shift polygons are shown, not the ones from the Gearbox File.
+If a valid [Vehicle File](#vehicle-editor), [Engine File](#engine-file) and [Gearbox File](#gearbox-file) is loaded into the Editor the main vehicle parameters like HDV class and axle configuration are shown here. The plot shows the full load curve(s) and shift polygons. In [Declaration Mode](#declaration-mode) the **generic**  shift polygons are shown, not the ones from the Gearbox File.
 
 ###Controls
 

User Manual/1-user-interface/VECTO-Editor_Aux.md → User Manual/1-user-interface/E_VECTO-Editor_Aux.md

@@ -6,24 +6,27 @@
 ###Description
 
 
-The Auxiliary Dialog is used to configure auxiliaries. Auxiliary efficieny is defined using an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux). See [Auxiliaries](#auxiliaries) for details on how the power demand for each auxiliary is calculated.
-
-In [Declaration Mode](#declaration-mode) only the Technology for each auxiliary has to be selected.
-
+The Auxiliary Dialog is used to configure auxiliaries. In [Declaration Mode](#declaration-mode) the set of auxiliaries and their power demand is pre-defined. The user has to select for every auxiliary the technology from a given list. In [Engineering Mode](#engineering-mode) the set of auxiliaries can be specified by the user. Auxiliary efficieny is defined using an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux). See [Auxiliaries](#auxiliaries) for details on how the power demand for each auxiliary is calculated.
 
 ###Settings
 
+<div class="declaration">
+Technology
+:   List of available technology for the auxiliary type (declaration mode)
+</div>
 
+<div class="engineering">
 Type
 :	String defining type of auxiliary. Click the arrow to load from a predefined list, however It is not required to use a type from the list.
 
 ID
-:	The ID string is required to link the auxiliary to the corresponding supply power definition in the driving cycle. The ID must not contain space or special characters text and numbers only). The ID is not case sensitive (e.g. "ALT" will link to "Alt" or "alt", etc.)
-***Example*** *: Auxiliary "ALT" is linked to the column "&lt;AUX\_ALT&gt;" in the driving cylce.*
+:	The ID string is required to link the auxiliary to the corresponding supply power definition in the driving cycle. The ID must contain characters  and numbers only (A-Z, a-z, 0-9). The ID is not case sensitive (e.g. "ALT" will link to "Alt" or "alt", etc.)
+***Example*** *: Auxiliary "ALT" is linked to the column "&lt;Aux\_ALT&gt;" in the driving cylce.*
 See [Auxiliaries](#auxiliaries) for details.
 
 Input File
 :	Path to the [Auxiliary File (.vaux)](#auxiliary-input-file-.vaux).
+</div>
 
 ###Controls
 

User Manual/1-user-interface/VEH-Editor.md → User Manual/1-user-interface/F_VEH-Editor.md

@@ -6,15 +6,15 @@
 ###Description
 
 
-The Vehicle File (.vveh) defines the main vehicle/chassis parameters like axles including [RRC](#rolling-resistance-coefficient)s, air resistance and weight.
+The [Vehicle File (.vveh)](#vehicle-file) defines the main vehicle/chassis parameters like axles including [RRC](#rolling-resistance-coefficient)s, air resistance and weight.
 
 ###Relative File Paths
 
 
-It is recommended to define relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
-Example: "Demo\RT1.vrlm" points to the "Demo" subdirectory of the Vehicle File's directoy.
+It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
+Example: "Demo\\RT1.vrlm" points to the "Demo" subdirectory of the Vehicle File's directoy.
 
-VECTO automatically uses relative paths if the input file (e.g. Retarder Losses File) is in the same directory as the Vehicle File. (The Vehicle File must be saved before browsing for input files.)
+VECTO automatically uses relative paths if the input file (e.g. Retarder Losses File) is in the same directory as the Vehicle File. (*Note:* The Vehicle File must be saved before browsing for input files.)
 
 ###General vehicle parameters
 
@@ -41,13 +41,22 @@ These fields define the weight and loading of the vehicle. **Max. Loading** disp
 ###Air Resistance
 
 
-The product of Drag Coefficient [-] and Cross Sectional Area [m²] (**c~d~ x A**) and **Air Density** [kg/m³] (see [Settings](#settings)) together with the vehicle speed defines the Air Resistance. Note that the Drag Coefficient may be altered when using [**Cross Wind Correction**](#cross-wind-correction).
+The product of Drag Coefficient [-] and Cross Sectional Area [m²] (**c~d~ x A**) and **Air Density** [kg/m³] (see [Settings](#settings)) together with the vehicle speed defines the Air Resistance. Note that the Air Drag depends on the chosen [**Cross Wind Correction**](#cross-wind-correction).
 
 ###Axles/Wheels
 
 
-For each axle the parameters **Relative axle load, RRC~ISO~** and **F~zISO~** have to be defined in order to calculate the total [Rolling Resistance Coefficient](#rolling-resistance-coefficient). 
-Furthermore the **Wheels Inertia [kgm²]** has to be set per wheel for each axle. In [Declaration Mode](#declaration-mode) the inertia is defined automatically according to the selected tyres.
+For each axle the parameters **Relative axle load, RRC~ISO~** and **F~zISO~** have to be given in order to calculate the total [Rolling Resistance Coefficient](#rolling-resistance-coefficient).
+Furthermore the **Wheels Inertia [kgm²]** has to be set per wheel for each axle. In [Declaration Mode](#declaration-mode) the inertia is computed based on the selected tyres and rims. The number of axles specified have to match the vehicle type (e.g., 2 axles for a 4x2 truck). 
+
+<div class="declaration">
+In [Declaration mode](#declaration-mode) only the axles of the truck have to be given. For the trailer predefined wheels and weight-shares are used.
+</div>
+
+<div class="engineering">
+In [Engineering Mode](#engineering-mode) all axles, for both  truck and trailer, have to be given.
+</div>
+
 Use the ![](pics/plus-circle-icon.png) and ![](pics/minus-circle-icon.png) buttons to add or remove axles form the vehicle. Doubleclick entries to edit existing axle configurations.
 
 Dynamic Tyre Radius [mm]
@@ -60,25 +69,27 @@ Powered axle tyres/rims
 ###Retarder Losses
 
 
-If available a **Retarder Torque Loss Map** can be defined here to consider idling losses caused by the retarder.
-***Note: Do not use this function if the retarder's losses are already included in the Transmission Loss Maps!***
+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:
-: -	Included in Transmission Loss Maps: Use this if the [Transmission Loss Maps](#transmission-loss-map-.vtlm) already include retarder losses.
+: -   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
 -   Secondary Retarder (after gearbox): The rpm ratio is relative to the cardan shaft speed
 
-Both, primary and secondary retarders, require an [Retarder Loss Torque Input File (.vrlm)](#retarder-loss-torque-input-file-.vrlm).
+Both, primary and secondary retarders, require an [Retarder Torque Loss Input File (.vrlm)](#retarder-loss-torque-input-file-.vrlm).
 
 
-###Cross Wind Correction
+###Cross Wind Correction Options
 
 
 Four different options are available:
-: -  No Correction
--  Speed dependent (User-defined)
--  Speed dependent (Declaration Mode)
--  Vair & Beta Input
+: -  No Correction: The specified CdxA value is used to compute the air drag, no cross-wind correction is applied
+-  Speed dependent (User-defined): The specified CdxA value is corrected depending on the vehicle's speed.
+-  Speed dependent (Declaration Mode): A uniformly distributed cross-wind is assumed and used for correcting the air-drag depending on the vehicle's speed
+-  Vair & Beta Input: Correction mode if the actual wind speed and wind angle relative to the vehicle have been measured.
+
+In delcaration mode the 'Speed dependent (Declaration Mode)' cross-wind correction is used.
 
 Depending on the chosen mode either a [Speed Dependent Cross Wind Correction Input File (.vcdv)](#speed-dependent-cross-wind-correction-input-file-.vcdv) or a [Vair & Beta Cross Wind Correction Input File (.vcdb)](#speed-dependent-cross-wind-correction-input-file-.vcdv) must be defined. For details see [Cross Wind Correction](#cross-wind-correction).
 

User Manual/1-user-interface/ENG-Editor.md → User Manual/1-user-interface/G_ENG-Editor.md

@@ -4,15 +4,14 @@
 
 ###Description
 
-The Engine File (.veng) defines all engine-related parameters and input files like Fuel Consumption Map and Full Load Curve.
+The [Engine File (.veng)](#engine-file) defines all engine-related parameters and input files like Fuel Consumption Map and Full Load Curve.
 
 ###Relative File Paths
 
-It is recommended to define relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
-
+It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
 Example: "Demo\\FLD1.vfld" points to the "Demo" subdirectory of the Engine File's directory.
 
-VECTO automatically uses relative paths if the input file (e.g. FC Map) is in the same directory as the Engine File. The Engine File must be saved before browsing for input files.)
+VECTO automatically uses relative paths if the input file (e.g. FC Map) is in the same directory as the Engine File. *Note:* The Engine File must be saved before browsing for input files.)
 
 ###Main Engine Parameters
 
@@ -26,16 +25,12 @@ Displacement \[ccm\]
 :   Used in [Declaration Mode](#declaration-mode) to calculate inertia.
 
 Inertia including Flywheel \[kgm²\]
-:   Inertia for rotating parts including engine flywheel. In [Declaration Mode](#declaration-mode) the inertia is calculated automatically.
+:   Inertia for rotating parts including engine flywheel. In [Declaration Mode](#declaration-mode) the inertia is calculated automatically depending on the engine's displacement and also accounts for the clutch's inertia.
 
 ###Full Load and Drag Curves
 
 
-
-The [Full Load and Drag Curves (.vfld)](#full-load-and-drag-curves-.vfld) Note that gear-specific full load curves can be defined in the [Gearbox File](#gearbox-editor) to limit the maximum gearbox input torque.
-
-The input file (.vfld) file format is described
-[here](#full-load-and-drag-curves-.vfld).
+The [Engine's Full Load and Drag Curves (.vfld)](#full-load-and-drag-curves-.vfld) limits the engine's maximum torque and drag torque respectively The full-load curve must at least cover the engine-speed range from idling speed up to the speed where the power goes down to 70% of the maximum power. The input file (.vfld) file format is described [here](#full-load-and-drag-curves-.vfld).
 
 ###Fuel Consumption Map
 

User Manual/1-user-interface/GBX-Editor.md → User Manual/1-user-interface/H_GBX-Editor.md

@@ -9,12 +9,12 @@
 
 
 
-The Gearbox File (.vgbx) defines alls gearbox-related input parameters like gear ratios and transmission loss maps. See [Gear Shift Model](#gear-shift-model) for details.
+The [Gearbox File (.vgbx)](#gearbox-file) defines alls gearbox-related input parameters like gear ratios and transmission loss maps. See [Gear Shift Model](#gear-shift-model) for details.
 
 
 ###Relative File Paths
 
-It is recommended to define relative filepaths. This way the Job File and all input files can be moved without having to update the paths. \
+It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths. \
 Example: "Gears\\Gear1.vtlm" points to the "Gears" subdirectory of the Gearbox File's directoy.
 
 VECTO automatically uses relative paths if the input file (e.g. Shift Polygons File) is in the same directory as the Gearbox File. (The Gearbox File must be saved before browsing for input files.)
@@ -36,11 +36,11 @@ Transmission Type
 
 
 Inertia \[kgm²\]
-:   Rotational inertia of the gearbox (constant for all gears).
+:   Rotational inertia of the gearbox (constant for all gears). (Engineering mode only)
 
 
 Traction Interruption \[s\]
-:   Interruption during gear shift event.
+:   Interruption during gear shift event. (Engineering mode only)
 
 
 ###Gears
@@ -48,10 +48,11 @@ Traction Interruption \[s\]
 Use the ![add](pics/plus-circle-icon.png) and ![remove](pics/minus-circle-icon.png) buttons to add or remove gears from the vehicle. Doubleclick entries to edit existing gears.
 
 -   Gear **"A"** defines the ratio of the axle transmission / differential.
--   Column **"TC"** (AT only) defines which gears are using the torque converter (lock-up clutch open).
--   Column **"Loss Map or Efficiency"** allows to define either a constant efficiency value or a [loss map (.vtlm)](#transmission-loss-map-.vtlm).
--   Column **"Shift polygons"** defines the [Shift Polygons InputFile (.vgbs)](#shift-polygons-input-file-.vgbs) for each gear. Not required in [Declaration Mode](#declaration-mode). See [GearShift Model](#gear-shift-model) for details.
--	Column **"Full Load Curves"** defines the [Full Load Curve for (.vfld)](#full-load-and-drag-curves-.vfld) each gear. It is used for torque limiting and [generic shift polygons](#gear-shift-model) in Declaration Mode. If no file is defined the engine full load curve will be used. 
+-    **"TC"** (AT only) defines which gears are using the torque converter (lock-up clutch open).
+-    **"Ratio"** defines the ratio between the output speed and input speed for the current gear. Must be greater than 0.
+-    **"Loss Map or Efficiency"** allows to define either a constant efficiency value or a [loss map (.vtlm)](#transmission-loss-map). <span class="vecto3">Note: in Vecto 3 it is mandatory to specify a loss map for every gear!</span>
+-    **"Shift polygons"** defines the [Shift Polygons InputFile (.vgbs)](#shift-polygons-input-file-.vgbs) for each gear. Not required in [Declaration Mode](#declaration-mode). See [GearShift Model](#gear-shift-model) for details.
+-	 **"Full Load Curves"** defines the [Full Load Curve for (.vfld)](#full-load-and-drag-curves-.vfld) each gear. It is used for torque limiting in the current gear. Note: in Declaration mode the [generic shift polygons](#gear-shift-model) are computed from the engine's full-load curve. If the maximum torque is limited by the gearbox, the minimum of the gearbox and engine maximum torque will be used to compute the [generic shift polygons](#gear-shift-model)!
 
 
 ###Gear shift parameters
@@ -69,7 +70,8 @@ Torque Reserve \[%\]
 
 
 Minimum shift time \[s\]
-:   Limits the time between two gear shifts in whole seconds. This rule will be ignored if rpms are too high or too low. Note that high values may cause high rpms during acceleration.
+:   Limits the time between two gear shifts. This rule will be ignored if rpms are too high or too low. <span class="vecto2">Vecto 2.2 uses fixed time-steps of 1 second, hence only whole seconds can be specified.</span>
+<span class="vecto3">Vecto 3 uses dynamic time-steps, hence any values greater than 0 seconds can be given.</span>
 
 
 Start Gear
@@ -85,7 +87,7 @@ The Chart Area displays the [Shift Polygons Input File(.vgbs)](#shift-polygons-i
 
 ###Torque Converter
 
-
+<div class="vecto2">
 
 The [Torque Converter Model](#torque-converter-model) is still in development.
 
@@ -123,3 +125,4 @@ be updated.
 
 
 ![Cancel](pics/Cancel.png) ***Cancel without saving***
+</div>
\ No newline at end of file

User Manual/1-user-interface/start.md

-
-User Manual
-====================================
-![](pics/VECTOlarge.png)\
-
-VECTO 2.2

User Manual/2-calculation-modes/calc_BATCH.md → User Manual/2-calculation-modes/batch.md

 ##Batch Mode
 
+<div class="vecto2">
 
 In Batch Mode a list of vehicles is run with a list of driving cycles. Each vehicle defined in the Job List is calculated with each driving cycle defined in the Driving Cycle List. Note that the Driving Cycle List is only visible if Batch Mode is enabled in the Main Form / Options Tab.
 
@@ -12,3 +13,10 @@ In Batch Mode a list of vehicles is run with a list of driving cycles. Each vehi
 
 -   Modal results (.vmod) for each job file and driving cycle. One file for each vehicle/cycle combination.
 -   Average/sum results (.vsum / .vsum.json). One file in total containing results for each vehicle/cycle combination.
+
+</div>
+
+<div class="vecto3">
+VECTO V3.x doesn't support Batch mode anymore. The same functionality can be achieved by referencing every needed cycle file in the job files.
+</div>
+

User Manual/2-calculation-modes/calc_STANDARD.md

-##Standard Mode
-
-
-
-This is the default calculation mode in VECTO. It is active when both [Batch](#batch-mode) and [Declaration](#declaration-mode) Mode are disabled.  In this mode a predefined list of job files (.vecto) is run. Each job file defines a vehicle and a list of driving cycles.
-
-###Requirements
-
-
--   One or more checked job files in the Job List
--   Each job file must include at least one driving cycle
-
-
-###Results
-
-
--   Modal results (.vmod) for each job file and driving cycle. One file for each cycle.
--   Average/sum results (.vsum / .vsum.json). One file in total containing results for each calculation.

User Manual/2-calculation-modes/calc_index.md

-Calculation Modes
-=================
-
-
-The Calculation Mode can be changed in the Options Tab of the [Main Form](#main-form). VECTO is running in Standard Mode when Batch Mode and Declaration Mode is disabled.
-
-Note that [Engine Only Mode](#engine-only-mode) is not an actual calculation mode and can be set for each [Job File](#job-editor) individually and used in Standard and Batch Mode.
-
--   [Standard Mode](#standard-mode)
--   [Batch Mode](#batch-mode)
--   [Declaration Mode](#declaration-mode)

User Manual/2-calculation-modes/calculation-modes.md

+#Calculation Modes
+
+VECTO supports different calculation modes for declaring a vehicle, validation of test-results, or experimenting with different parameters and components. These modes are described here.
+
+- [**Declaration Mode**](#declaration-mode)
+    : In this mode a vehicle can be declared. Many simulation parameters are predefined to provide a generic way of comparing the emissions.
+
+- [**Engineering Mode**](#engineering-mode)
+    : This mode is for experimenting and validation of a vehicle. There exist several options how the driving cycle may be defined (Target speed, Measured Speed, Pwheel).
+
+- [**Engine Only Mode**](#engine-only-mode)
+    : This mode is for validation of a measured engine component. Only the engine is simulated in this mode.
+
+
+In the GUI the Calculation Mode can be changed via the Options Tab of the [Main Form](#main-form).
+
+In the Command Line the Calculation Mode is Declaration by default, but can be changed to Engineering with the "-eng" flag.
+
+<div class="vecto2">
+A so called [Batch Mode](#batch-mode) exists in VECTO v2.2, which simulates every given job file with every given cycle file. This has nothing to do with the command line, it is just a convenience function to combine job files and cycle files.
+</div>
+
+<div class="vecto3">
+VECTO V3.x doesn't support Batch mode anymore. The same functionality can be achieved by referencing every needed cycle file in the job files.
+</div>
+
+
+

User Manual/2-calculation-modes/calc_Declaration.md → User Manual/2-calculation-modes/declaration.md

 ##Declaration Mode
 
-
-
-In Declaration Mode all input parameters that are not user-defined in official certification are locked in the user interface and automatically defined by VECTO during calculation. Calculations will be performed for each mission profile (of the corresponding HDV class) with three different loadings each: Empty, full and with reference loading. 
+In Declaration Mode many input parameters are predefined for the official certification. They are locked in the user interface and will automatically be set by VECTO during calculation. Calculations will be performed for each mission profile (of the corresponding HDV class) with three different loadings each: Empty, full, and reference loading. 
 
 Declaration Mode can be activated in the [Options Tab](#main-form).
 
 
 ###Requirements
 
-
-
 -   One or more checked job files in the Job List
 -   The job files don't need to include driving cycles. These are automatically assigned.
 
 ###Results
 
+-   Modal results (.vmod). One file for each vehicle/cycle/loading combination.
+-   Sum results (.vsum). One file for each invocation of VECTO.
+-   Results overview (.pdf). One file for each job.
 
-
--   Modal results (.vmod) for each job file and driving cycle. One file for each cycle.
--   Average/sum results (.vsum / .vsum.json). One file in total containing results for each calculation.
--   Results overview (.pdf). One file for each job file.

User Manual/2-calculation-modes/engine-only.md

+##Engine-Only Mode
+
+When this mode is enabled in the Job File then VECTO only calculates the fuel consumption based on a load cycle (engine speed and torque). In the [Job File](#job-file) only the following parameters are needed:
+
+-   Filepath to the Engine File (.veng)
+-   Driving Cycles including engine torque (or power) and engine speed
+
+The driving cycle also has to be in a special format which is described here: [Engine Only Driving Cycle](#engine-only-mode-engine-only-driving-cycle).
+

User Manual/2-calculation-modes/engineering.md

+##Engineering Mode
+
+The Engineering Mode lets the user define every aspect in the components of the vehicle and the driving cycle. This is for experimenting and validation purposes.
+
+In this mode the given list of job files is simulated with the respective driving cycles. Each job file defines a separate vehicle.
+
+<div class="vecto2">
+This is the default calculation mode in VECTO V2.
+</div>
+<div class="vecto3">
+In VectoCMD V3.x the default mode is Declaration Mode.
+</div>
+
+###Requirements
+
+-   One or more checked job files in the Job List
+-   Each job file must include at least one driving cycle
+
+###Results
+
+-   Modal results (.vmod). One file for each vehicle/cycle combination.
+-   Sum results (.vsum). One file for each invocation of VECTO.
+
+
+###Options###
+The option depends on the driving cycle and cannot be chosen explicitely. For more information see [Driving Cycles](#driving-cycles).
+
+###Target Speed
+
+This option is the a target vehicle speed distance based cycle (like in Declaration Mode). With this option experiments can be made by the manufacturer.
+
+###Measured Speed
+
+See [Measured speed, time-based cycle](#engineering-mode-measured-speed-time-based-cycle).
+
+
+
+###Measured Speed with Gear
+
+See [Measured speed with gear, time-based cycle](#engineering-mode-measured-speed-with-gear-time-based-cycle).
+
+
+
+###Pwheel (SiCo)
+
+In Pwheel mode the measured power at the wheels is given, and the simulation takes that as input.
+
+For more information see [P~wheel~-Input (SiCo Mode)](#pwheel-input-sico-mode).
+
+
+
+
+
+

User Manual/3-functions/AccLimit.md

-##Acceleration Limiting
-
-
-VECTO limits the vehicle acceleration and deceleration according to speed-dependent limits. These limits are defined in the [Acceleration Limiting Input File](#acceleration-limiting-input-file-.vacc) (.vacc). Note that the full load curve also limits acceleration. If the engine cannot provide the required power the vehicle might accelerate below the defined acceleration limit.
-
-This function cannot be disabled. If acceleration and/or deceleration should not be limited during calculation the values in the Acceleration Limiting file (.vacc) have to be changed accordingly.
-
-Parameters in [Job File](#job-editor):
-:	-   Filepath of the [Acceleration Limiting Input File](#acceleration-limiting-input-file-.vacc) (.vacc)
-
- The input file format is described [here](#acceleration-limiting-input-file-.vacc).