diff --git a/User Manual Source/Release Notes V2.2.pptx b/User Manual Source/Release Notes V2.2.pptx
index ea51afbfe2cac0790795cb98c5a2b58475bf38d5..1238521ab196a214130190ccdfcf54b209f2b18a 100644
Binary files a/User Manual Source/Release Notes V2.2.pptx and b/User Manual Source/Release Notes V2.2.pptx differ
diff --git a/User Manual Source/VECTO Input Parameters.xlsx b/User Manual Source/VECTO Input Parameters.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..637f2806cd9bee5815deb2c400c42bcace55e961
Binary files /dev/null and b/User Manual Source/VECTO Input Parameters.xlsx differ
diff --git a/User Manual Source/material User Manual.pptx b/User Manual Source/material User Manual.pptx
index 3199bae5ae3fe37df996c15e5a78d84cd1a301b3..fc362e13e5ff301a7bc72da560861823ea4ef7fa 100644
Binary files a/User Manual Source/material User Manual.pptx and b/User Manual Source/material User Manual.pptx differ
diff --git a/User Manual/GUI/GBX-Editor.html b/User Manual/GUI/GBX-Editor.html
index 5a1808cfa65d9e4e6422e1cf84b5f47a61fe78d9..d0627c94dd421ca451bc3dc0cabb521668b166eb 100644
--- a/User Manual/GUI/GBX-Editor.html
+++ b/User Manual/GUI/GBX-Editor.html
@@ -2,6 +2,7 @@
<html><head>
+
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Gearbox Editor - VECTO User Manual</title></head><body>
@@ -50,11 +51,11 @@ gear shift event.<br></div>
<br><br>
<big><big style="font-weight: bold;">Gears</big></big><br><hr style="height: 1px; width: 100%;">
<span style="font-weight: bold;"></span>Use the <img style="width: 16px; height: 16px;" alt="add" src="../pics/icons/plus-circle-icon.png"> and <img style="width: 16px; height: 16px;" alt="remove" src="../pics/icons/minus-circle-icon.png"> buttons to add or
-remove gears form the vehicle. Doubleclick entries to edit existing gears.<br><ul><li>Gear "A" defines the ratio of the axle transmission /
-differential.</li><li>Column "TC" (AT only) defines which gears are using the torque converter (lock-up clutch open).</li><li>Column
-"Loss Map or Efficiency" allows to define either a constant efficiency
-value or a <a href="../fileformat/VTLM.html">loss map (.vtlm)</a>.</li><li>Column "Shift polygons" defines the <a href="../fileformat/VGBS.html">Shift Polygons Input File (.vgbs)</a> for each gear. Not required in <a href="../general/calc_Declaration.html">Declaration Mode</a>. See <a href="../general/Shift.html">Gear Shift Model</a> for details.</li>
- <li>Column "Full Load Curves" defines the <a href="../fileformat/VFLD.html">Full Load Curve for (.vfld)</a> each gear. It is used for torque limiting and <a href="../general/Shift.html">generic shift polygons</a> in Declaration Mode. If no file is defined the engine full load curve will be used.<br>
+remove gears form the vehicle. Doubleclick entries to edit existing gears.<br><ul><li>Gear <span style="font-weight: bold;">"A"</span> defines the ratio of the axle transmission /
+differential.</li><li>Column <span style="font-weight: bold;">"TC</span>" (AT only) defines which gears are using the torque converter (lock-up clutch open).</li><li>Column
+ <span style="font-weight: bold;">"Loss Map or Efficiency"</span> allows to define either a constant efficiency
+value or a <a href="../fileformat/VTLM.html">loss map (.vtlm)</a>.</li><li>Column <span style="font-weight: bold;">"Shift polygons"</span> defines the <a href="../fileformat/VGBS.html">Shift Polygons Input File (.vgbs)</a> for each gear. Not required in <a href="../general/calc_Declaration.html">Declaration Mode</a>. See <a href="../general/Shift.html">Gear Shift Model</a> for details.</li>
+ <li>Column <span style="font-weight: bold;">"Full Load Curves"</span> defines the <a href="../fileformat/VFLD.html">Full Load Curve for (.vfld)</a> each gear. It is used for torque limiting and <a href="../general/Shift.html">generic shift polygons</a> in Declaration Mode. If no file is defined the engine full load curve will be used.<br>
</li>
</ul><br><br><big><big style="font-weight: bold;">Gear shift parameters</big></big><br><hr style="height: 1px; width: 100%;">
<span style="font-weight: bold;"><img alt="" src="../pics/misc/checkbox.png"> Allow shift-up inside
diff --git a/User Manual/GUI/VEH-Editor.html b/User Manual/GUI/VEH-Editor.html
index 340f1e77f924dcb8bf646a2d3bc6803701983a41..2b3661e70a38cb749ef05bacc685b073ce37cee0 100644
--- a/User Manual/GUI/VEH-Editor.html
+++ b/User Manual/GUI/VEH-Editor.html
@@ -6,8 +6,9 @@
-<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Vehicle Editor - VECTO User Manual</title></head>
-<body>
+
+
+<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Vehicle Editor - VECTO User Manual</title></head><body>
<div style="text-align: left;">
@@ -85,9 +86,9 @@ Weight Extra Trailer/Body</span><span style="color: rgb(253, 0, 0);"> and </span
<br>
<br><big><big style="font-weight: bold;">Air Resistance</big></big><br>
-<hr style="height: 1px; width: 100%;">The product of <span style="font-weight: bold;">Drag Coefficient</span>
-[-], <span style="font-weight: bold;">Cross Sectional Area</span>
-[m<sup>2</sup>] and <span style="font-weight: bold;">Air
+<hr style="height: 1px; width: 100%;">The product of Drag Coefficient
+[-] and Cross Sectional Area
+[m<sup>2</sup>] (<span style="font-weight: bold;">c<sub>d</sub> x A</span>) and <span style="font-weight: bold;">Air
Density</span> [kg/m<sup>3</sup>]
(see <a href="settings.html">Settings</a>) together with the vehicle speed defines the Air Resistance. Note that the Drag Coefficient may
be altered when using <a href="../general/cd.html"><span style="font-weight: bold;">Cross
@@ -134,12 +135,15 @@ Both, primary and secondary retarders, require an <a href="../fileformat/VRLM.ht
<big><big style="font-weight: bold;">Cross Wind Correction</big></big><br>
-<hr style="height: 1px; width: 100%;">Three different options
+<hr style="height: 1px; width: 100%;">Four different options
are available:<br>
<ul>
-<li>No Correction</li><li>Speed dependent</li><li>Vair & Beta Input</li>
+<li>No Correction</li><li>Speed dependent (User-defined)<br>
+</li>
+ <li>Speed dependent (Declaration Mode) </li>
+<li>Vair & Beta Input</li>
</ul>
diff --git a/User Manual/GUI/mainform.html b/User Manual/GUI/mainform.html
index 91db9a0c46c42c202695ba6f04466a6cb58af5de..c74f7ae4a0b900859dd5147e8d2b5a59dc1640eb 100644
--- a/User Manual/GUI/mainform.html
+++ b/User Manual/GUI/mainform.html
@@ -1,7 +1,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html><head>
-<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Main Form - VECTO User Manual</title></head>
-<body>
+
+
+<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Main Form - VECTO User Manual</title></head><body>
<div style="text-align: left;">
@@ -177,7 +178,19 @@ editor</li>
<li style="font-weight: bold;">User Manual</li>
<ul>
<li style="font-weight: bold;"><span style="font-weight: normal;">Opens this User Manual</span></li>
-</ul><li style="font-weight: bold;">Create Activation File</li>
+</ul>
+ <li style="font-weight: bold;"><span style="font-weight: normal;"><span style="font-weight: bold;">Release Notes</span></span></li>
+ <ul>
+ <li style="font-weight: bold;"><span style="font-weight: normal;">Open the Release Notes (pdf)<br>
+</span></li>
+ </ul>
+ <li style="font-weight: bold;"><span style="font-weight: normal;"><span style="font-weight: bold;">Report Bug via CITnet / JIRA</span></span></li>
+ <ul>
+ <li style="font-weight: bold;"><span style="font-weight: normal;">Opens the CITnet/JIRA website for reporting bugs<br>
+</span></li>
+ </ul>
+
+<li style="font-weight: bold;">Create Activation File</li>
<ul>
<li style="font-weight: bold;"><span style="font-weight: normal;">Create an Activation File used
for Licensing</span></li>
diff --git a/User Manual/GUI/pics/VEH-Editor.PNG b/User Manual/GUI/pics/VEH-Editor.PNG
index aa989e0a0dd8555652b48869390680e91ec71b7f..99f72ff05aadd4899bddd430d82a0a5c663c057b 100644
Binary files a/User Manual/GUI/pics/VEH-Editor.PNG and b/User Manual/GUI/pics/VEH-Editor.PNG differ
diff --git a/User Manual/fileformat/VDRI.html b/User Manual/fileformat/VDRI.html
index d11c88bbc00fc11606dfd85f2637d74756725798..de2716e44f7a3e6b622c7d15b0be452295ae29d1 100644
--- a/User Manual/fileformat/VDRI.html
+++ b/User Manual/fileformat/VDRI.html
@@ -1,6 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html><head>
+
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Driving Cycle - VECTO User Manual</title></head><body>
@@ -16,7 +17,7 @@ required. The calculation will abort if larger steps are used.</li><li>Time-base
cycles can be defined in any given time resolution, including variable
time steps. If the time identifier "<t>" is not used the data
will be interpreted in 1[s] resolution (1Hz).</li></ul><br><big><big style="font-weight: bold;">Supported Identifiers</big></big><br>
-<hr style="height: 1px; width: 100%;"><table style="text-align: left; width: 100%; height: 116px;" border="1" cellpadding="5" cellspacing="0"><tbody><tr><td style="font-weight: bold; width: 95px;">Identifier</td><td style="width: 112px;"><span style="font-weight: bold;">Quantity</span></td><td style="width: 58px;"><span style="font-weight: bold;">Unit</span></td><td style="width: 665px;"><span style="font-weight: bold;">Description</span></td></tr><tr><td style="font-weight: bold; width: 95px;"><s></td><td style="width: 112px;">Distance</td><td style="width: 58px;">[m]</td><td style="width: 665px;"><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Travelled distance used for distance-based cycles. If <t> is also defined this column will be ignored.</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"></span></td></tr><tr><td style="font-weight: bold; width: 95px;"><t></td><td style="width: 112px;">Time</td><td style="width: 58px;">[s]</td><td style="width: 665px;">Used for time-based cycles. If neither this nor the distance <s> is defined the data will be <span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">interpreted as 1Hz.</span></td></tr><tr><td style="font-weight: bold;"><v></td><td>Vehicle Speed</td><td>[km/h]</td><td>Required except for <a href="../general/EngOnlyMode.html">Engine Only Mode</a> calculations.</td></tr><tr><td style="font-weight: bold; width: 95px;"><grad></td><td style="width: 112px;">Road Gradient</td><td style="width: 58px;">[%]</td><td style="width: 665px;">Optional.</td></tr><tr><td style="font-weight: bold; width: 95px;"><stop></td><td style="width: 112px;">Stopping Time</td><td style="width: 58px;">[s]</td><td style="width: 665px;">Required
+<hr style="height: 1px; width: 100%;"><table style="text-align: left; width: 100%; height: 116px;" border="1" cellpadding="5" cellspacing="0"><tbody><tr><td style="font-weight: bold; width: 95px;">Identifier</td><td style="width: 112px;"><span style="font-weight: bold;">Quantity</span></td><td style="width: 58px;"><span style="font-weight: bold;">Unit</span></td><td style="width: 665px;"><span style="font-weight: bold;">Description</span></td></tr><tr><td style="font-weight: bold; width: 95px;"><s></td><td style="width: 112px;">Distance</td><td style="width: 58px;">[m]</td><td style="width: 665px;"><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Travelled distance used for distance-based cycles. If <t> is also defined this column will be ignored.</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"></span></td></tr><tr><td style="font-weight: bold; width: 95px;"><t></td><td style="width: 112px;">Time</td><td style="width: 58px;">[s]</td><td style="width: 665px;">Used for time-based cycles. If neither this nor the distance <s> is defined the data will be <span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">interpreted as 1Hz.</span></td></tr><tr><td style="font-weight: bold;"><v></td><td>Vehicle Speed</td><td>[km/h]</td><td>Required except for <a href="../general/EngOnlyMode.html">Engine Only Mode</a> and <a href="../general/PwheelInput.html">P<sub>wheel</sub>-Input</a> calculations.</td></tr><tr><td style="font-weight: bold; width: 95px;"><grad></td><td style="width: 112px;">Road Gradient</td><td style="width: 58px;">[%]</td><td style="width: 665px;">Optional.</td></tr><tr><td style="font-weight: bold; width: 95px;"><stop></td><td style="width: 112px;">Stopping Time</td><td style="width: 58px;">[s]</td><td style="width: 665px;">Required
for distance-based cycles. Not used in time based cycles. <stop>
defines the time the vehicle spends in stop phases.</td></tr><tr><td style="font-weight: bold; width: 95px;"><Aux_xxx></td><td style="width: 112px;">Auxiliary Supply Power</td><td style="width: 58px;">[kW]</td><td style="width: 665px;"><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Supply Power input for each auxiliary defined in the <a href="../GUI/VECTO-Editor.html">.vecto file</a> where<span class="Apple-converted-space"> </span></span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; font-style: italic; font-weight: bold;">xxx</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"><span class="Apple-converted-space"> </span>matches the ID of the corresponding <a href="../GUI/VECTO-Editor_Aux.html">Auxiliary</a>. </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">ID's are not case sensitive and must not contain space or special characters.</span></td></tr><tr><td><span style="font-weight: bold;"><n></span></td><td style="width: 112px;">Engine Speed</td><td style="width: 58px;">[rpm]</td><td style="width: 665px;">If <n> is defined VECTO uses that instead of the calculated engine speed value.</td></tr><tr><td><span style="font-weight: bold;"><gear></span></td><td style="width: 112px;">Gear</td><td style="width: 58px;">[-]</td><td style="width: 665px;">Gear input. Overwrites the gear shift model.</td></tr><tr><td><span style="font-weight: bold;"><Padd></span></td><td style="width: 112px;">Additional Aux Power Demand</td><td style="width: 58px;">[kW]</td><td style="width: 665px;">This power input will be directly added to the engine power in addition to possible other auxiliaries. Also used in <a href="../general/EngOnlyMode.html">Engine Only Mode</a>.</td></tr><tr><td><span style="font-weight: bold;"><vair_res></span></td><td style="width: 112px;">Air speed relative to vehicle</td><td style="width: 58px;">[km/h]</td><td style="width: 665px;">Only required if <a href="../general/cd.html"><span style="font-weight: bold;">Cross Wind Correction</span></a> is set to<span style="font-family: 'Times New Roman';"> </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none; font-weight: bold;">Vair & Beta Input</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">.</span></td></tr><tr><td style="font-weight: bold;"><vair_beta></td><td style="width: 112px;">Wind Yaw Angle</td><td style="width: 58px;">[°]</td><td style="width: 665px;">Only required if <a href="../general/cd.html"><span style="font-weight: bold;">Cross Wind Correction</span></a> is set to<span style="font-family: 'Times New Roman';"> </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none; font-weight: bold;">Vair & Beta Input</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">.</span></td></tr><tr><td><span style="font-weight: bold;"><Pe></span></td><td>Engine power</td><td>[kW]</td><td>Effective engine power at clutch. Only required in <a href="../general/EngOnlyMode.html">Engine Only Mode</a>. Alternatively torque <Me> can be defined. Use <span style="font-weight: bold;"><DRAG></span> to define motoring operation.</td></tr><tr><td><span style="font-weight: bold;"><Me></span></td><td>Engine torque</td><td>[Nm]</td><td>Effective engine torque at clutch. Only required in <a href="../general/EngOnlyMode.html">Engine Only Mode</a>. Alternatively power <Pe> can be defined. Use <span style="font-weight: bold;"><DRAG></span> to define motoring operation.</td></tr><tr>
<td style="vertical-align: top;"><span style="font-weight: bold;"><Pwheel></span><br>
@@ -25,7 +26,7 @@ defines the time the vehicle spends in stop phases.</td></tr><tr><td style="font
</td>
<td style="vertical-align: top;">[kW]<br>
</td>
- <td style="vertical-align: top;">Overwrites power calculation. Requires Gear and Engine Speed input.<br>
+ <td style="vertical-align: top;">Overwrites power calculation. Requires Gear and Engine Speed input. Cycle must be time-based.<br>
</td>
</tr>
</tbody></table><big><big><span style="font-weight: bold;"><br></span></big></big><big><big style="font-weight: bold;">Examples</big></big><br>
diff --git a/User Manual/fileformat/VMOD.html b/User Manual/fileformat/VMOD.html
index a56eac6681fa47ea7ac36950f2ccf505395325eb..327583158dfa94a64981eed6c4ad4373f0a4ea6e 100644
--- a/User Manual/fileformat/VMOD.html
+++ b/User Manual/fileformat/VMOD.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html><head>
-<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Modal Results - VECTO User Manual</title></head>
-<body>
+
+<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Modal Results - VECTO User Manual</title></head><body>
@@ -9,7 +9,7 @@
<hr style="width: 100%; height: 0px;"><div style="margin-left: 40px;"><div style="text-align: left;"><span style="font-family: Times New Roman,Times,serif;">Modal
results are only created if enabled in the <a href="../GUI/mainform.html">Options</a> tab</span>.
One file is created for each calculation and stored in the same directory as the .vecto file.<br><br> <span style="font-weight: bold;">Quantities:</span><br><table style="width: 100%;" border="1" cellpadding="5" cellspacing="0">
-<col span="2" style="width: 60pt;" width="80">
+<col style="width: 60pt;" span="2" width="80">
<tbody>
<tr>
<td style="font-weight: bold; width: 95px;">Name</td>
@@ -77,7 +77,7 @@ Eng</span>).</td>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt; width: 95px;" height="20">Gear</td>
<td style="width: 66px;">[-]</td>
-<td style="width: 757px;">Gear. "0" = clutch opened / neutral. "0.5" = lock-up clutch is open (AT with torque converter only, see <a href="../GUI/GBX-Editor.html">Gearbox</a>)</td>
+<td style="width: 757px;">Gear. "0" = clutch opened / neutral.</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt; width: 95px;" height="20">Ploss
@@ -152,9 +152,9 @@ Veh</td>
</tr>
<tr style="height: 15pt;" height="20">
-<td style="height: 15pt; width: 95px;" height="20">FC</td>
+<td style="height: 15pt; width: 95px;" height="20">FC-Map</td>
<td style="width: 66px;">[g/h]</td>
-<td style="width: 757px;">Fuel consumption from FC map..</td>
+<td style="width: 757px;">Fuel consumption interpolated from FC map.</td>
</tr><tr><td>FC-AUXc</td><td>[g/h]</td><td>Fuel consumption after <a href="../general/FC.html">Auxiliary-Start/Stop Correction</a>. (Based on FC.)</td></tr><tr><td>FC-WHTCc</td><td>[g/h]</td><td>Fuel consumption after <a href="../general/FC.html">WHTC Correction</a>. (Based on FC-AUXc.)</td></tr><tr><td>TCν</td><td>[-]</td><td>Torque converter speed ratio</td></tr><tr><td>TCμ</td><td>[-]</td><td>Torque converter torque ratio</td></tr><tr><td>TC_M_Out</td><td>[Nm]</td><td>Torque converter output torque</td></tr><tr><td>TC_n_Out</td><td>[1/min]</td><td>Torque converter output speed</td></tr>
</tbody>
</table>
diff --git a/User Manual/fileformat/VSUM.html b/User Manual/fileformat/VSUM.html
index de15ac25bff3277072adf0eb6afd73c672db4f9f..f9bfcc1101f5d065f05d03d6e95a52c5a1180227 100644
--- a/User Manual/fileformat/VSUM.html
+++ b/User Manual/fileformat/VSUM.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html><head>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><title>Summary Results - VECTO User Manual</title></head>
-<body>
+
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><title>Summary Results - VECTO User Manual</title></head><body>
@@ -17,168 +17,202 @@
</span><span style="font-weight: bold;">Quantities:</span><br>
<span style="font-family: Verdana;"></span>
<table style="width: 100%;" border="1" cellpadding="5" cellspacing="0">
-<col span="2" style="width: 60pt;" width="80">
+<col style="width: 60pt;" span="2" width="80">
<tbody>
<tr>
<td style="font-weight: bold;">Name</td>
-<td style="font-weight: bold;">Unit</td>
-<td style="font-weight: bold;">Description</td>
+<td style="font-weight: bold; width: 109px;">Unit</td>
+<td style="font-weight: bold; width: 1342px;">Description</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt; width: 60pt;" height="20" width="80">Job</td>
-<td style="width: 60pt;" width="80">[-]</td>
-<td>Job number. Format is "x-y" with x = file number and y
+<td style="width: 109px;">[-]</td>
+<td style="width: 1342px;">Job number. Format is "x-y" with x = file number and y
= cycle number</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Input
File</td>
-<td>[-]</td>
-<td>Name of the input file</td>
+<td style="width: 109px;">[-]</td>
+<td style="width: 1342px;">Name of the input file</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Cycle</td>
-<td>[-]</td>
-<td>Name of the cycle file</td>
+<td style="width: 109px;">[-]</td>
+<td style="width: 1342px;">Name of the cycle file</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">time</td>
-<td>[s]</td>
-<td>Total simulation time</td>
+<td style="width: 109px;">[s]</td>
+<td style="width: 1342px;">Total simulation time</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">distance</td>
-<td>[km]</td>
-<td>Total travelled distance</td>
+<td style="width: 109px;">[km]</td>
+<td style="width: 1342px;">Total travelled distance</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">speed</td>
-<td>[km/h]</td>
-<td>Average vehicle speed</td>
+<td style="width: 109px;">[km/h]</td>
+<td style="width: 1342px;">Average vehicle speed</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">∆altitude</td>
-<td>[m]</td>
-<td>Altitude difference between start and end of cycle</td>
+<td style="width: 109px;">[m]</td>
+<td style="width: 1342px;">Altitude difference between start and end of cycle</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Ppos</td>
-<td>[kW]</td>
-<td>Average positive engine power</td>
-</tr>
+<td style="width: 109px;">[kW]</td>
+<td style="width: 1342px;">Average positive engine power</td>
+</tr>
+ <tr>
+ <td style="vertical-align: top;">PwheelPos<br>
+ </td>
+ <td style="vertical-align: top;">[kW]<br>
+ </td>
+ <td style="vertical-align: top;">Average positive wheel power<br>
+ </td>
+ </tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Pneg</td>
-<td>[kW]</td>
-<td>Average negative engine power</td>
-</tr>
+<td style="width: 109px;">[kW]</td>
+<td style="width: 1342px;">Average negative engine power</td>
+</tr>
+<tr style="height: 15pt;" height="20">
+<td style="height: 15pt;" height="20">FC-Final</td>
+<td style="width: 109px;">[g/km] & [l/100km] & [l/100tkm]<br>
+</td>
+<td style="width: 1342px;">Average fuel consumption. Final value after all corrections.<br>
+</td>
+</tr>
+ <tr>
+ <td style="vertical-align: top;">FC-Map<br>
+ </td>
+ <td style="vertical-align: top; width: 109px;">[g/h] & [g/km]<br>
+ </td>
+ <td style="vertical-align: top; width: 1342px;">Fuel consumption interpolated form <a href="../general/FC.html">Fuel Map</a>.<br>
+ </td>
+ </tr>
+<tr><td>FC-AUXc</td><td style="width: 109px;">[g/h] & [g/km]</td><td style="width: 1342px;">Fuel consumption after <a href="../general/FC.html">Auxiliary-Start/Stop Correction</a>. (Based on FC-Map.)</td></tr><tr><td>FC-WHTCc</td><td style="width: 109px;">[g/h] & [g/km]</td><td style="width: 1342px;">Fuel consumption after <a href="../general/FC.html">WHTC Correction</a>. (Based on FC-AUXc.)</td></tr><tr>
+ <td style="vertical-align: top;">CO<sub>2</sub><br>
+ </td>
+ <td style="vertical-align: top;">[g/km] & [g/tkm]<br>
+ </td>
+ <td style="vertical-align: top;">Average CO<sub>2</sub> emissions.<br>
+ </td>
+ </tr>
<tr style="height: 15pt;" height="20">
-<td style="height: 15pt;" height="20">FC</td>
-<td>[g/km]</td>
-<td>Average fuel consumption</td>
-</tr>
-<tr><td>FC-AUXc</td><td>[g/km]</td><td>Fuel consumption after <a href="../general/FC.html">Auxiliary-Start/Stop Correction</a>. (Based on FC.)</td></tr><tr><td>FC-WHTCc</td><td>[g/km]</td><td>Fuel consumption after <a href="../general/FC.html">WHTC Correction</a>. (Based on FC-AUXc.)</td></tr><tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Pbrake</td>
-<td>[kW]</td>
-<td>Average brake power (not including engine drag)</td>
+<td style="width: 109px;">[kW]</td>
+<td style="width: 1342px;">Average brake power (not including engine drag)</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">EposICE</td>
-<td>[kWh]</td>
-<td>Total positive engine work</td></tr><tr style="height: 15pt;" height="20"><td style="height: 15pt;" height="20">EnegICE</td>
-<td>[kWh]</td>
-<td>Total negative engine work (engine brake)</td>
+<td style="width: 109px;">[kWh]</td>
+<td style="width: 1342px;">Total positive engine work</td></tr><tr style="height: 15pt;" height="20"><td style="height: 15pt;" height="20">EnegICE</td>
+<td style="width: 109px;">[kWh]</td>
+<td style="width: 1342px;">Total negative engine work (engine brake)</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Eair</td>
-<td>[kWh]</td>
-<td>Total work of air resistance</td>
+<td style="width: 109px;">[kWh]</td>
+<td style="width: 1342px;">Total work of air resistance</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Eroll</td>
-<td>[kWh]</td>
-<td>Total work of rolling resistance</td>
+<td style="width: 109px;">[kWh]</td>
+<td style="width: 1342px;">Total work of rolling resistance</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Egrad</td>
-<td>[kWh]</td>
-<td>Total work of gradient resistance</td>
+<td style="width: 109px;">[kWh]</td>
+<td style="width: 1342px;">Total work of gradient resistance</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Eacc</td>
-<td>[kWh]</td>
-<td>Total work from accelerations (<0) / decelerations (>0) </td>
+<td style="width: 109px;">[kWh]</td>
+<td style="width: 1342px;">Total work from accelerations (<0) / decelerations (>0) </td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Eaux</td>
-<td>[kWh]</td>
-<td>Total energy demand of auxiliaries</td>
+<td style="width: 109px;">[kWh]</td>
+<td style="width: 1342px;">Total energy demand of auxiliaries</td>
</tr>
-<tr><td>Eaux_xxx</td><td>[kWh]</td><td>Energy demand of auxiliary with ID <span style="font-style: italic; font-weight: bold;">xxx</span>. See also <a href="../GUI/VECTO-Editor_Aux.html">Aux Dialog</a> and <a href="VDRI.html">Driving Cycle</a>.</td></tr><tr style="height: 15pt;" height="20">
+<tr><td>Eaux_xxx</td><td style="width: 109px;">[kWh]</td><td style="width: 1342px;">Energy demand of auxiliary with ID <span style="font-style: italic; font-weight: bold;">xxx</span>. See also <a href="../GUI/VECTO-Editor_Aux.html">Aux Dialog</a> and <a href="VDRI.html">Driving Cycle</a>.</td></tr><tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Ebrake</td>
-<td>[kWh]</td>
-<td>Total work dissipated in mechanical braking (sum of service brakes, retader and additional engine exhaust brakes)</td>
+<td style="width: 109px;">[kWh]</td>
+<td style="width: 1342px;">Total work dissipated in mechanical braking (sum of service brakes, retader and additional engine exhaust brakes)</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Etransm</td>
-<td>[kWh]</td>
-<td>Total work of transmission losses</td>
-</tr>
-<tr><td>Eretarder</td><td>[kWh]</td><td>Total retarder losses</td></tr><tr style="height: 15pt;" height="20">
+<td style="width: 109px;">[kWh]</td>
+<td style="width: 1342px;">Total transmission losses</td>
+</tr>
+<tr><td>Eretarder</td><td style="width: 109px;">[kWh]</td><td style="width: 1342px;">Total retarder losses</td></tr><tr>
+ <td style="vertical-align: top;">Etorqueconv<br>
+ </td>
+ <td style="vertical-align: top;">[kWh]<br>
+ </td>
+ <td style="vertical-align: top;">Total torque converter losses<br>
+ </td>
+ </tr>
+<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Mass</td>
-<td>[kg]</td>
-<td>Vehicle mass (equals <span style="font-weight: bold;">Curb Weight Vehicle</span>
+<td style="width: 109px;">[kg]</td>
+<td style="width: 1342px;">Vehicle mass (equals <span style="font-weight: bold;">Curb Weight Vehicle</span>
plus <span style="font-weight: bold;">Curb Weight Extra
Trailer/Body</span>, see <a href="../GUI/VEH-Editor.html">Vehicle
Editor</a>)</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Loading</td>
-<td>[kg]</td>
-<td>Vehicle loading (see <a href="../GUI/VEH-Editor.html">Vehicle Editor</a>)</td>
+<td style="width: 109px;">[kg]</td>
+<td style="width: 1342px;">Vehicle loading (see <a href="../GUI/VEH-Editor.html">Vehicle Editor</a>)</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">a</td>
-<td>[m/s<sup>2</sup>]</td>
-<td>Average acceleration</td>
+<td style="width: 109px;">[m/s<sup>2</sup>]</td>
+<td style="width: 1342px;">Average acceleration</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">a_pos</td>
-<td>[m/s<sup>2</sup>]</td>
-<td>Average acceleration in acceleration
+<td style="width: 109px;">[m/s<sup>2</sup>]</td>
+<td style="width: 1342px;">Average acceleration in acceleration
phases*</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">a_neg</td>
-<td>[m/s<sup>2</sup>]</td>
-<td>Average deceleration in deceleration phases*</td>
+<td style="width: 109px;">[m/s<sup>2</sup>]</td>
+<td style="width: 1342px;">Average deceleration in deceleration phases*</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">Acc.Noise</td>
-<td>[m/s<sup>2</sup>]</td>
-<td>Acceleration noise</td>
+<td style="width: 109px;">[m/s<sup>2</sup>]</td>
+<td style="width: 1342px;">Acceleration noise</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">pAcc</td>
-<td>[%]</td>
-<td>Time share of acceleration phases*</td>
+<td style="width: 109px;">[%]</td>
+<td style="width: 1342px;">Time share of acceleration phases*</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">pDec</td>
-<td>[%]</td>
-<td>Time share of deceleration phases*</td>
+<td style="width: 109px;">[%]</td>
+<td style="width: 1342px;">Time share of deceleration phases*</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">pCruise</td>
-<td>[%]</td>
-<td>Time share of cruise phases*</td>
+<td style="width: 109px;">[%]</td>
+<td style="width: 1342px;">Time share of cruise phases*</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt;" height="20">pStop</td>
-<td>[%]</td>
-<td>Time share of stop phases*</td>
+<td style="width: 109px;">[%]</td>
+<td style="width: 1342px;">Time share of stop phases*</td>
</tr>
</tbody>
</table>
diff --git a/User Manual/general/PwheelInput.html b/User Manual/general/PwheelInput.html
new file mode 100644
index 0000000000000000000000000000000000000000..3508e3b262f9020966ae878705f6bdc123e12692
--- /dev/null
+++ b/User Manual/general/PwheelInput.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html><head>
+
+<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Pwheel Input</title></head><body>
+<big><big><big><span style="font-family: Verdana; font-weight: bold;">P<sub>wheel</sub>-Input (SiCo Mode)</span></big></big></big><br>
+<hr style="width: 100%; height: 0px;"><div style="margin-left: 40px;">For verification tasks it is possible to manually input the power at wheels (P<sub>wheel</sub>)
+which is normally calculated via longitudinal dynamics. In this case
+VECTO only calculates the losses between wheels and engine and
+auxiliary power demand.<br>
+This mode is active as soon as P<sub>wheel</sub>, Gear and Engine Speed are defined in the driving cycle.<br><br><big><big><span style="font-weight: bold;">Requirements</span></big></big><br><hr style="width: 100%; height: 1px;"><ul><li>Driving Cycle must include P<sub>wheel</sub>, Gear and Engine Speed, see <a href="../fileformat/VDRI.html">Driving Cycle (.vdri) format</a>.</li>
+ <li>The driving cycle must be <span style="text-decoration: underline;">time-based</span>.</li>
+ <li>Distance Correction must be <span style="text-decoration: underline;">disabled</span> (<a href="../GUI/mainform.html">Options tab in Main Form</a>).</li>
+</ul><span style="font-weight: bold;">Example driving cylce with P</span><sub style="font-weight: bold;">wheel</sub><span style="font-weight: bold;"> input.</span><br>
+<img style="width: 324px; height: 203px;" alt="" src="pics/PwheelInput.png"><br>
+<br>
+<br>
+<big><big><span style="font-weight: bold;"></span></big></big><br>
+
+
+
+
+
+
+
+
+</div></body></html>
\ No newline at end of file
diff --git a/User Manual/general/Shift.html b/User Manual/general/Shift.html
index a176748e2a8386c16929c5e4e0b7c5688823538b..289a5d8d3b74af273df1d991aa1c06087c086a9f 100644
--- a/User Manual/general/Shift.html
+++ b/User Manual/general/Shift.html
@@ -6,6 +6,7 @@
+
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Gear Shift Model</title></head><body>
<big><big><big><span style="font-family: Verdana; font-weight: bold;">Gear Shift Model</span></big></big></big><br>
<hr style="width: 100%; height: 0px;">
@@ -13,13 +14,37 @@
<div style="margin-left: 40px;">The Gear Shift Model is based on shift
curves that define the engine speed for up- and down- shifting as a
function of engine torque. As soon as the engine operation point passes
-one of the shift curves a gear change is initiated.<br>The shift polygons are saved in the <a href="../fileformat/VGBS.html">Shift Polygons Input File (.vgbs)</a> and have to be added to the <a href="../GUI/GBX-Editor.html">Gearbox File</a>.<br>
+one of the shift curves a gear change is initiated.<br>
+<br>
+<img style="width: 500px; height: 392px;" alt="" src="pics/Shift.png"><br>
+<span style="font-style: italic;">Example shift polygons</span><br>
+<br>
+<ul>
+ <li style="font-weight: bold;">Down-shift:</li>
+ <ul>
+ <li>As soon as the current engine speed falls below the down-shift cuve a down-shift is initiated<br>
+ </li>
+ </ul>
+</ul>
+<ul>
+ <li><span style="font-weight: bold;">Up-shift:</span><br>
+ </li>
+ <ul>
+ <li>MT and AMT transmissions: Up-shift is initiated when the <span style="text-decoration: underline;">current engine speed</span> is above the up-shift curve<br>
+ </li>
+ </ul>
+ <ul>
+ <li>AT transmissions: Up-shift is initiated when the <span style="text-decoration: underline;">next-gear engine speed</span> is above the up-shift curve<br>
+ </li>
+ </ul>
+</ul>
+<br>The shift polygons are saved in the <a href="../fileformat/VGBS.html">Shift Polygons Input File (.vgbs)</a> and have to be added to the <a href="../GUI/GBX-Editor.html">Gearbox File</a> when not in <a href="calc_Declaration.html">Declaration Mode</a>.<br>
<br>
In <a href="calc_Declaration.html">Declaration Mode</a> the shift
polygons are generated automatically based on the full load curve of
each gear. If the engine's full load torque is lower than the gear's,
then the engine's full load is used to prevent unreasonable shifting
-with small engines.<br><br><img style="width: 500px; height: 392px;" alt="" src="pics/Shift.png"><br><span style="font-style: italic;">Example shift polygons</span><br><br>In the Gearbox File two additional parameters are defined:<br><ul><li><span style="font-weight: bold;">Torque Reserve</span> [%] - Required
+with small engines.<br><br><br><br>In the Gearbox File two additional parameters are defined:<br><ul><li><span style="font-weight: bold;">Torque Reserve</span> [%] - Required
for the "<span style="font-weight: bold;">Early Upshift</span>" and "<span style="font-weight: bold;">Skip
Gears</span>" options, see below.<span style="font-weight: bold;"></span></li><li><span style="font-weight: bold;">Minimum shift time</span> [s] - Limits
the time between two gear shifts in whole seconds. This rule will be
@@ -28,7 +53,8 @@ cause high rpms during acceleration.<br></li></ul><br> <big><big style="fon
a gear change is initiated (by crossing the up- or down-shift line)
VECTO may skip one or several gears as long as the required torque reserve is provided.<br><img style="width: 500px; height: 300px;" alt="" src="../GUI/pics/GBX-Editor-shift3.PNG"><br><br><br><big><big style="font-weight: bold;">Early Upshift</big></big><br><hr style="height: 1px; width: 100%;">Early Upshift can be enabled in the <a href="../GUI/GBX-Editor.html">Gearbox File</a> (Allow shift-up inside polygons). By default it is enabled for AMT only.<br>If the next higher gear
provides the required torque reserve
-and it's rpm is still above down-shift-rpm VECTO will shift up.<br><img style="width: 500px; height: 301px;" alt="" src="../GUI/pics/GBX-Editor-shift2.PNG"><br><br><br></div><span style="font-family: Calibri;"></span>
+and it's rpm is still above down-shift-rpm VECTO will shift up.<br><img style="width: 500px; height: 301px;" alt="" src="../GUI/pics/GBX-Editor-shift2.PNG"><br><br><br></div>
+<span style="font-family: Calibri;"></span>
diff --git a/User Manual/general/cd.html b/User Manual/general/cd.html
index 1288445fba44d277d49d127ba435566993007213..00ecac92ee1060ef6374939334855efc895eab69 100644
--- a/User Manual/general/cd.html
+++ b/User Manual/general/cd.html
@@ -14,6 +14,9 @@
+
+
+
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Cross Wind Correction</title></head><body>
<big><big><big><span style="font-family: Verdana; font-weight: bold;">Cross Wind Correction</span></big></big></big><br>
<hr style="width: 100%; height: 0px;">
@@ -21,9 +24,15 @@
<div style="margin-left: 40px;">VECTO offers two different modes to consider cross wind influence on the drag coefficient. It is configured in the <a href="../GUI/VEH-Editor.html">Vehicle File</a>.<br>
<br>
<br>
-<big><big style="font-weight: bold;">Speed dependent correction</big></big><br>
+<big><big style="font-weight: bold;">Speed dependent correction (Declaration Mode</big></big>)<br>
+
<hr style="height: 1px; width: 100%;">This is the default mode which is used in <a href="calc_Declaration.html">Declaration Mode</a>.<br>
-The base drag coefficient (see <a href="../GUI/VEH-Editor.html">Vehicle File</a>) is corrected by a speed dependent scaling function. The input file (.vcdv) format is described <a href="../fileformat/VCDV.html">here</a>.<br>
+The <span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; display: inline ! important; float: none;">speed dependent<span class="Apple-converted-space"> c<sub>d</sub> x A curve (see below) is calculated</span></span> based on generic parameters for each vehicle class and the base <span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; display: inline ! important; float: none;"><span class="Apple-converted-space">c<sub>d</sub> x A value</span></span> form the <a href="../GUI/VEH-Editor.html">Vehicle File</a>.<br>
+<br>
+<br>
+<br>
+<big><big style="font-weight: bold;">Speed dependent correction (User-defined)</big></big><br>
+<hr style="height: 1px; width: 100%;">The base <span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 1; word-spacing: 0px; display: inline ! important; float: none;"><span class="Apple-converted-space">c<sub>d</sub> x A value</span></span> (see <a href="../GUI/VEH-Editor.html">Vehicle File</a>) is corrected with a user-defined speed dependent scaling function. The input file (.vcdv) format is described <a href="../fileformat/VCDV.html">here</a>.<br>
<br>
<img style="width: 404px; height: 290px;" alt="" src="pics/VCDV.png"><br>
<br>
@@ -32,7 +41,7 @@ The base drag coefficient (see <a href="../GUI/VEH-Editor.html">Vehicle File</a>
<hr style="height: 1px; width: 100%;">If available the actual
(measured) air speed and direction can be used. The input file (.vcdb)
defines the drag coefficient scaling factor. The input file (.vcdb) format is described <a href="../fileformat/VCDB.html">here</a>.<br>
-The <a href="../fileformat/VDRI.html">driving cycle</a> must include the air speed relative to vehicle (<vair_res>) and the wind yaw angle (<vair_beta>).<br>
+The <a href="../fileformat/VDRI.html">driving cycle</a> must include the air speed relative to the vehicle v<sub>air</sub> (<vair_res>) and the wind yaw angle beta (<vair_beta>).<br>
<br>
<img style="width: 600px; height: 236px;" alt="" src="pics/VCDB.png"><br>
<br>
diff --git a/User Manual/general/pics/PwheelInput.png b/User Manual/general/pics/PwheelInput.png
new file mode 100644
index 0000000000000000000000000000000000000000..023ecd8982b0a237f97b63c252bf38ffc6054c34
Binary files /dev/null and b/User Manual/general/pics/PwheelInput.png differ
diff --git a/User Manual/main/changelog.html b/User Manual/main/changelog.html
index 4aa207081bdffa18901795437970839b2b3c1bcc..0958304dae6f53c4134bbd2ea61590a2d082a340 100644
--- a/User Manual/main/changelog.html
+++ b/User Manual/main/changelog.html
@@ -8,6 +8,45 @@
<big><big><big><span style="font-weight: bold;">Changelog</span></big></big></big>
<br><hr style="width: 100%; height: 0px;"><br>
+
+VECTO 2.2<br>
+<ul>
+<li>Bugfix: Error in Declaration Mode Pneumatic System aux power calculation ([kW] were interpreted as [W])</li>
+<li>Bugfix: Error in Declaration Mode Electric System aux power calculation</li>
+<li>Moved gear-specific Full Load Curves to Gearbox File</li>
+<li>Combined Drag Coefficient * Cross Sectional Area in one input parameter</li>
+<li>Updated .vgbx file format (Added gear-specific Full Load Curves)</li>
+<li>Updated .veng file format (Removed gear-specific Full Load Curves)</li>
+<li>Updated .vveh file format (Combined Drag Coefficient * Cross Sectional Area in one parameter)</li>
+<li>Updated Generic Vehicles (new file formats)</li>
+<li>Removed WHTC Correction Factor Calculation. Now in external tool, VECTO-Engine.</li>
+<li>Test Options are now only available in Engineering Mode</li>
+<li>Gearbox Editor now shows generic and user-defined shift polygons (if available)</li>
+<li>Various small updates in GUI</li>
+<li>Added 'Create JIRA Issue' dialog</li>
+</ul>
+<br>
+
+VECTO 2.1.4<br>
+<ul>
+<li>Bugfixes in start gear and (A)MT shift model</li>
+<li>Updated Coach .vcdv file for higher speeds to avoid extrapolation</li>
+<li>Renamed output "FC" to "FC-Map" for better clarification</li>
+<li>Same header for g/h and g/km output</li>
+<li>Reduced minimum turbine speed for 1C-to-2C AT up-shift condition from 900 to 700rpm.</li>
+<li>Updated cross wind correction parameters to current White Book values</li>
+</ul>
+<br>
+
+VECTO 2.1.3<br>
+<ul>
+<li>PwheelPos output in VSUM file.</li>
+<li>Implemented new Cd*A(v) method</li>
+<li>Bugfix in TC model</li>
+<li>Bugfix: Unit error in Cd(v) methods caused incorrect Delta-Cd value being used</li>
+</ul>
+<br>
+
VECTO 2.1.2<br>
<ul>
<li>Improved TC iteration for higher precision</li>
diff --git a/User Manual/main/index.html b/User Manual/main/index.html
index 2ecea664c017f83dd20b9c40dbf0282a7b5051e5..80a7ba19c4cbdf4fd6fdc3354a7053f03c0e04e3 100644
--- a/User Manual/main/index.html
+++ b/User Manual/main/index.html
@@ -1,11 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html><head>
+
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>VECTO User Manual</title>
<style>
li+ul {margin-left: -1.5em}
-</style>
-
-</head><body>
+</style></head><body>
<ul style="text-align: left; font-family: Calibri; line-height: 1.7em;">
<li><a target="mainframe" href="../main/changelog.html">Changelog</a></li>
@@ -42,6 +41,7 @@ li+ul {margin-left: -1.5em}
<li><a target="mainframe" href="../general/Shift.html">Gear Shift Model</a></li>
<li><a target="mainframe" href="../general/LAC.html">Look-Ahead Coasting</a></li>
<li><a target="mainframe" href="../general/EcoRoll.html">Overspeed</a></li>
+ <li><a target="mainframe" href="../general/PwheelInput.html">P<sub>wheel</sub>-Input (SiCo Mode)</a></li>
<li><a target="mainframe" href="../general/RRC.html">Roll Resistance Coefficient</a></li>
<li><a target="mainframe" href="../general/TC.html">Torque Converter Model</a></li>
<li><a target="mainframe" href="../general/PT1.html">Transient Full Load (PT1 approach)</a></li>
@@ -86,6 +86,4 @@ li+ul {margin-left: -1.5em}
-</body>
-
-</html>
\ No newline at end of file
+</body></html>
\ No newline at end of file
diff --git a/VECTO/GUI/F_JIRA.Designer.vb b/VECTO/GUI/F_JIRA.Designer.vb
index 53d7aa283ffd0282c4728733163b2390449c9627..64eff91b910d4ce382dba8f5836b8a7db6a26f2f 100644
--- a/VECTO/GUI/F_JIRA.Designer.vb
+++ b/VECTO/GUI/F_JIRA.Designer.vb
@@ -46,9 +46,9 @@ Partial Class F_JIRA
Me.Label1.AutoSize = True
Me.Label1.Location = New System.Drawing.Point(6, 16)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(272, 13)
+ Me.Label1.Size = New System.Drawing.Size(269, 13)
Me.Label1.TabIndex = 1
- Me.Label1.Text = "You need a user account for CITnet create a new issue."
+ Me.Label1.Text = "You need a CITnet user account to create a new issue."
'
'LinkLabel1
'
@@ -76,7 +76,7 @@ Partial Class F_JIRA
'LinkLabel3
'
Me.LinkLabel3.AutoSize = True
- Me.LinkLabel3.Location = New System.Drawing.Point(274, 39)
+ Me.LinkLabel3.Location = New System.Drawing.Point(246, 33)
Me.LinkLabel3.Name = "LinkLabel3"
Me.LinkLabel3.Size = New System.Drawing.Size(122, 13)
Me.LinkLabel3.TabIndex = 18
@@ -86,11 +86,11 @@ Partial Class F_JIRA
'Label2
'
Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(6, 39)
+ Me.Label2.Location = New System.Drawing.Point(6, 33)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(275, 13)
+ Me.Label2.Size = New System.Drawing.Size(241, 13)
Me.Label2.TabIndex = 3
- Me.Label2.Text = "If you don't have CITnet access please contact support: "
+ Me.Label2.Text = "If you don't have one yet please contact support: "
'
'Button1
'
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index 3408c51bee842c753ef9f841e4e29efb8eeba864..044c489215255c6a213eba2d6a453129b7d28e6c 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -944,13 +944,13 @@ Partial Class F_MAINForm
'UserManualToolStripMenuItem
'
Me.UserManualToolStripMenuItem.Name = "UserManualToolStripMenuItem"
- Me.UserManualToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
+ Me.UserManualToolStripMenuItem.Size = New System.Drawing.Size(222, 22)
Me.UserManualToolStripMenuItem.Text = "User Manual"
'
'UpdateNotesToolStripMenuItem
'
Me.UpdateNotesToolStripMenuItem.Name = "UpdateNotesToolStripMenuItem"
- Me.UpdateNotesToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
+ Me.UpdateNotesToolStripMenuItem.Size = New System.Drawing.Size(222, 22)
Me.UpdateNotesToolStripMenuItem.Text = "Release Notes"
'
'ReportBugViaCITnetToolStripMenuItem
@@ -962,18 +962,18 @@ Partial Class F_MAINForm
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(186, 6)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(219, 6)
'
'CreateActivationFileToolStripMenuItem
'
Me.CreateActivationFileToolStripMenuItem.Name = "CreateActivationFileToolStripMenuItem"
- Me.CreateActivationFileToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
+ Me.CreateActivationFileToolStripMenuItem.Size = New System.Drawing.Size(222, 22)
Me.CreateActivationFileToolStripMenuItem.Text = "Create Activation File"
'
'AboutVECTOToolStripMenuItem1
'
Me.AboutVECTOToolStripMenuItem1.Name = "AboutVECTOToolStripMenuItem1"
- Me.AboutVECTOToolStripMenuItem1.Size = New System.Drawing.Size(189, 22)
+ Me.AboutVECTOToolStripMenuItem1.Size = New System.Drawing.Size(222, 22)
Me.AboutVECTOToolStripMenuItem1.Text = "About VECTO"
'
'CmDEV