Merge pull request #69 in VECTO/vecto-sim from ~EMLUZRAPH/vecto-sim:master to master

* commit '19308cad': -Updated Release Notes version update GUI Update für Retarder - Import WHTC Factors from XML file - Target framework changed to 4.5 (same as VECTO-Engine) Release Notes update - User Manual update - Fix in JIRA dialog User Manual update (unfinished) - Fixed path to JIRA guide - Updated changes.md - Updated Release Notes

Merge pull request #69 in VECTO/vecto-sim from ~EMLUZRAPH/vecto-sim:master to master
6c018a47 · Raphael LUZ · 82dc0217 · 19308cad · 6c018a47 · 6c018a47
Commit 6c018a47 authored 9 years ago by Raphael LUZ
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ TODO
 * Test Options are now only available in Engineering Mode
 * Gearbox Editor now shows generic and user-defined shift polygons (if available)
 * Various small updates in GUI
+* Added 'Create JIRA Issue' dialog

 ### VECTO 2.1.4
 * Bugfixes in start gear and (A)MT shift model

--- a/User Manual Source/Release Notes.pptx
+++ b/User Manual Source/Release Notes.pptx
--- a/User Manual Source/Release Notes 2.2.pptx
+++ b/User Manual Source/Release Notes 2.2.pptx
--- a/User Manual Source/Release Notes V2.1.pptx
+++ b/User Manual Source/Release Notes V2.1.pptx
--- a/User Manual Source/Release Notes.pdf
+++ b/User Manual Source/Release Notes.pdf
--- a/User Manual Source/VECTO Input Parameters.xlsx
+++ b/User Manual Source/VECTO Input Parameters.xlsx
--- a/User Manual Source/material User Manual.pptx
+++ b/User Manual Source/material User Manual.pptx
--- a/User Manual/GUI/ENG-Editor.html
+++ b/User Manual/GUI/ENG-Editor.html
 <!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>Engine Editor - VECTO User Manual</title></head>
-<body>
+
+<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Engine Editor - VECTO User Manual</title></head><body>
 <div style="text-align: left;">


@@ -14,7 +14,7 @@
 <div style="text-align: center;"><img src="pics/ENG-Editor.PNg" style="width: 800px; height: 444px;" alt="eng" usemap="#linkmap"><br></div>
 <span style="font-family: Verdana;"><br></span><div style="margin-left: 40px;"><big><big style="font-weight: bold;">Description</big></big><br><hr style="height: 1px; width: 100%;">

-The Engine File (.veng) defines all engine-related parameters and input files like Fuel Consumption Map and Full Load Curves.<br><br>
+The Engine File (.veng) defines all engine-related parameters and input files like Fuel Consumption Map and Full Load Curve.<br><br>
 <br>
 <big><big style="font-weight: bold;">Relatve File Paths</big></big><br>

@@ -50,13 +50,9 @@ including Flywheel</span> [kgm<sup>2</sup>]<br>
 including engine flywheel<span style="font-family: Verdana;"></span>. In <a href="../general/calc_Declaration.html">Declaration Mode</a> the inertia is calculated automatically.
 </div>
 <br>
-<span style="font-family: Verdana;"></span><br><big><big style="font-weight: bold;">Full Load and Drag Curves</big></big><br><hr style="height: 1px; width: 100%;">
-
-Multiple <a href="../fileformat/VFLD.html">Full Load and Drag Curves (.vfld)</a> can be defined and assigned
-to different gears. Gear "0" must be assigned for idling and <a href="../general/EngOnlyMode.html">Engine Only Mode</a>.<br>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&nbsp;.vfld files. Doubleclick entries to edit existing configurations.<br><br>The input file (.vfld) file format is described <a href="../fileformat/VFLD.html">here</a>. <br><br><br><big><big style="font-weight: bold;">Fuel Consumption Map</big></big><br><hr style="height: 1px; width: 100%;">
+<span style="font-family: Verdana;"></span><br><big><big style="font-weight: bold;">Full Load and Drag Curve</big></big><br><hr style="height: 1px; width: 100%;">The <a href="../fileformat/VFLD.html">Full Load and Drag Curve (.vfld)</a>. Note that gear-specific full load curves can be defined in the <a href="GBX-Editor.html">Gearbox File</a> to limit the maximum gearbox input torque.<br><br>The input file (.vfld) file format is described <a href="../fileformat/VFLD.html">here</a>. <br><br><br><big><big style="font-weight: bold;">Fuel Consumption Map</big></big><br><hr style="height: 1px; width: 100%;">

-The <a href="../fileformat/VMAP.html">Fuel Consumption Map</a> is used to calculate the base FC value. See <a href="../general/FC.html">Fuel Consumption Calculation</a> for details.<br><br>The input file (.vmap) file format is described <a href="../fileformat/VMAP.html">here</a>. <br><br><br><big><big style="font-weight: bold;">WHTC Test Results</big></big><br><hr style="height: 1px; width: 100%;">The WHTC test results are required in <a href="../general/calc_Declaration.html">Declaration Mode</a> for the <a href="../general/FC.html">WHTC FC Correction</a>. The fuel consumption must be defined in [g/kWh] for each test part (Urban, Rural, Motorway) separately.<br><br><br><big><big style="font-weight: bold;">Chart Area</big></big><br><hr style="height: 1px; width: 100%;">The Chart Area shows the fuel consumption map and the selected full load curve.<br><br><br><big><big style="font-weight: bold;">Controls</big></big><br><hr style="height: 1px; width: 100%;"><img src="../pics/icons/blue-document-icon.png" style="width: 16px; height: 16px;" alt="new"><span style="font-weight: bold;">New
+The <a href="../fileformat/VMAP.html">Fuel Consumption Map</a> is used to calculate the base FC value. See <a href="../general/FC.html">Fuel Consumption Calculation</a> for details.<br><br>The input file (.vmap) file format is described <a href="../fileformat/VMAP.html">here</a>. <br><br><br><big><big style="font-weight: bold;">WHTC Correction Factors</big></big><br><hr style="height: 1px; width: 100%;">The WHTC Correction Factors are required in <a href="../general/calc_Declaration.html">Declaration Mode</a> for the <a href="../general/FC.html">WHTC FC Correction</a>.<br><br><br><big><big style="font-weight: bold;">Chart Area</big></big><br><hr style="height: 1px; width: 100%;">The Chart Area shows the fuel consumption map and the selected full load curve.<br><br><br><big><big style="font-weight: bold;">Controls</big></big><br><hr style="height: 1px; width: 100%;"><img src="../pics/icons/blue-document-icon.png" style="width: 16px; height: 16px;" alt="new"><span style="font-weight: bold;">New
 file</span><br>
 <div style="margin-left: 40px;">Create a new empty .veng
 file<br>

--- a/User Manual/GUI/GBX-Editor.html
+++ b/User Manual/GUI/GBX-Editor.html
 <!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>Gearbox Editor - VECTO User Manual</title></head><body>


@@ -49,10 +51,13 @@ 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></ul><br><br><big><big style="font-weight: bold;">Gear shift parameters</big></big><br><hr style="height: 1px; width: 100%;">
+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
 polygons</span><br><div style="margin-left: 40px;">See <a href="../general/Shift.html">Gear Shift Model</a>.<br></div><br><span style="font-weight: bold;"><img style="width: 15px; height: 15px;" alt="" src="../pics/misc/checkbox.png"> Skip Gears</span><br><div style="margin-left: 40px;">See <a href="../general/Shift.html">Gear Shift Model</a>.<br></div><br><span style="font-weight: bold;">Torque Reserve</span> [%]<br>
 <div style="margin-left: 40px;">This parameter is required

--- a/User Manual/GUI/VEH-Editor.html
+++ b/User Manual/GUI/VEH-Editor.html
@@ -6,8 +6,10 @@



-<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 +87,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
@@ -122,8 +124,9 @@ axle configurations.<br>
 Three options are available:<br>

 <ul>
-<li>None</li><li>Primary (before gearbox): The rpm ratio is relative to the
-engine speed</li><li>Secondary (after gearbox): The rpm ratio is relative to the
+<li>Included in Transmission Loss Maps: Use this if the <a href="../fileformat/VTLM.html">Transmission Loss Maps</a> already include retarder losses.<br>
+</li><li>Primary Retarder (before gearbox): The rpm ratio is relative to the
+engine speed</li><li>Secondary Retarder (after gearbox): The rpm ratio is relative to the
 cardan shaft speed</li>
 </ul>

@@ -134,12 +137,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 &amp; Beta Input</li>
+<li>No Correction</li><li>Speed dependent (User-defined)<br>
+</li>
+  <li>Speed dependent (Declaration Mode) </li>
+<li>Vair &amp; Beta Input</li>
 </ul>



--- a/User Manual/GUI/mainform.html
+++ b/User Manual/GUI/mainform.html
 <!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>

--- a/User Manual/GUI/pics/ENG-Editor.PNG
+++ b/User Manual/GUI/pics/ENG-Editor.PNG
--- a/User Manual/GUI/pics/GBX-Editor.PNG
+++ b/User Manual/GUI/pics/GBX-Editor.PNG
--- a/User Manual/GUI/pics/VEH-Editor.PNG
+++ b/User Manual/GUI/pics/VEH-Editor.PNG
--- a/User Manual/fileformat/VDRI.html
+++ b/User Manual/fileformat/VDRI.html
 <!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 "&lt;t&gt;" 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;">&lt;s&gt;</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 &lt;t&gt; 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;">&lt;t&gt;</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 &lt;s&gt; 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;">&lt;v&gt;</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;">&lt;grad&gt;</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;">&lt;stop&gt;</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;">&lt;s&gt;</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 &lt;t&gt; 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;">&lt;t&gt;</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 &lt;s&gt; 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;">&lt;v&gt;</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;">&lt;grad&gt;</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;">&lt;stop&gt;</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. &lt;stop&gt;
 defines the time the vehicle spends in stop phases.</td></tr><tr><td style="font-weight: bold; width: 95px;">&lt;Aux_xxx&gt;</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">&nbsp;</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">&nbsp;</span>matches the ID of the corresponding <a href="../GUI/VECTO-Editor_Aux.html">Auxiliary</a>.&nbsp;</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;">&lt;n&gt;</span></td><td style="width: 112px;">Engine Speed</td><td style="width: 58px;">[rpm]</td><td style="width: 665px;">If &lt;n&gt; is defined VECTO uses that instead of the calculated engine speed value.</td></tr><tr><td><span style="font-weight: bold;">&lt;gear&gt;</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;">&lt;Padd&gt;</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;">&lt;vair_res&gt;</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';">&nbsp;</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 &amp; 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;">&lt;vair_beta&gt;</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';">&nbsp;</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 &amp; 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;">&lt;Pe&gt;</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 &lt;Me&gt; can be defined. Use <span style="font-weight: bold;">&lt;DRAG&gt;</span> to define motoring operation.</td></tr><tr><td><span style="font-weight: bold;">&lt;Me&gt;</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 &lt;Pe&gt; can be defined.&nbsp;Use <span style="font-weight: bold;">&lt;DRAG&gt;</span> to define motoring operation.</td></tr><tr>
      <td style="vertical-align: top;"><span style="font-weight: bold;">&lt;Pwheel&gt;</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>

--- a/User Manual/fileformat/VMOD.html
+++ b/User Manual/fileformat/VMOD.html
 <!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&nbsp;calculation and stored in the&nbsp;same directory as the .vecto file.<br><br>&nbsp;<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" =&nbsp;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&#957;</td><td>[-]</td><td>Torque converter speed ratio</td></tr><tr><td>TC&#956;</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>

--- a/User Manual/fileformat/VSUM.html
+++ b/User Manual/fileformat/VSUM.html
 <!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&nbsp;time</td>
+<td style="width: 109px;">[s]</td>
+<td style="width: 1342px;">Total simulation&nbsp;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">&#8710;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&nbsp;positive engine power</td>
-</tr>
+<td style="width: 109px;">[kW]</td>
+<td style="width: 1342px;">Average&nbsp;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&nbsp;negative engine power</td>
-</tr>
+<td style="width: 109px;">[kW]</td>
+<td style="width: 1342px;">Average&nbsp;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] &amp; [l/100km] &amp; [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] &amp; [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] &amp; [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] &amp; [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] &amp; [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 (&lt;0) / decelerations (&gt;0)&nbsp;</td>
+<td style="width: 109px;">[kWh]</td>
+<td style="width: 1342px;">Total work from accelerations (&lt;0) / decelerations (&gt;0)&nbsp;</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&nbsp;acceleration in&nbsp;acceleration
+<td style="width: 109px;">[m/s<sup>2</sup>]</td>
+<td style="width: 1342px;">Average&nbsp;acceleration in&nbsp;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>

--- a/User Manual/general/PwheelInput.html
+++ b/User Manual/general/PwheelInput.html
+<!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
--- a/User Manual/general/Shift.html
+++ b/User Manual/general/Shift.html
@@ -5,15 +5,46 @@



-<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Gear Shift Model</title></head>
-<body>
+
+
+<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;">

 <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>. In <a href="calc_Declaration.html">Declaration Mode</a> the shift polygons are generated automatically based on the full load curve.<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> [%] -&nbsp;Required
+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><br><br>In the Gearbox File two additional parameters are defined:<br><ul><li><span style="font-weight: bold;">Torque Reserve</span> [%] -&nbsp;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
@@ -22,7 +53,8 @@ cause high rpms during acceleration.<br></li></ul><br>&nbsp;<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).&nbsp;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>




--- 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 (&lt;vair_res&gt;) and the wind yaw angle (&lt;vair_beta&gt;).<br>
+The <a href="../fileformat/VDRI.html">driving cycle</a> must include the air speed relative to the vehicle v<sub>air</sub> (&lt;vair_res&gt;) and the wind yaw angle beta (&lt;vair_beta&gt;).<br>
 <br>
 <img style="width: 600px; height: 236px;" alt="" src="pics/VCDB.png"><br>
 <br>