diff --git a/Documentation/Checklist_Release_VECTO_3.1.2.796.docx b/Documentation/Checklist_Release_VECTO_3.1.2.796.docx
new file mode 100644
index 0000000000000000000000000000000000000000..81a172abed90b5a877936414d209bce590b8a768
Binary files /dev/null and b/Documentation/Checklist_Release_VECTO_3.1.2.796.docx differ
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf
index beaa97982d376117366f0bd3995ce0910d0d4b4c..5a17c71aa82788c03d9882b7be679f1416105912 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf and b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf differ
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx
index 939c3f4020f96b00576fccedfdaffd770a61a14c..cf6dbacfb5ed07859fead79e6ff5b21cbac39f2c 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx and b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx differ
diff --git a/Documentation/User Manual/6-changelog/changelog.md b/Documentation/User Manual/6-changelog/changelog.md
index 21c63658ad98ee421bf9e6c0b549ab3d9219ad8f..8765375ce4bf6a5a8685cfe36b87679b3acc9c00 100644
--- a/Documentation/User Manual/6-changelog/changelog.md
+++ b/Documentation/User Manual/6-changelog/changelog.md
@@ -1,5 +1,27 @@
#Changelog
+**VECTO 3.1.2**
+
+***Build 796 (2017-03-07)***
+
+- Improvements:
+ + [VECTO-405] Adding clutch-losses for AMT/MT gearboxes during drive-off, reduce drive-off distance after stop from 1m to 0.25m, set clutch closing speed (normalized) to 6.5%, changes in clutch model
+ + [VECTO-379] Make GUI more tolerant against missing files. Instead of aborting reading the input data the GUI shows a suffix for missing input files
+ + [VECTO-411] Allow a traction interruption of 0s for AMT/MT gearboxes
+ + [VECTO-408] Gearbox Inertia for AT gearboxes set to 0
+ + [VECTO-419] Adapted error messages, added list of errors
+ + [VECTO-421,VECTO-439] Added volume-related results to vsum file (volume is computed based on default bodies)
+ + [] Energy balance (vsum) and balance of engine power output and power consumers (vmod) level
+ + [VECTO-430] AT shift strategy: upshifts may happen too early
+ + [VECTO-431] AMT shift strategy always started in first gear due to changes in clutch model
+ + [VECTO-433] adapt generic vehicles: use typical WHTC correction factors
+ + [VECTO-437] set vehicle speed at clutch-closed to 1.3 m/s
+ + [VECTO-436] fix simulation aborts with AT gearbox (neg. braking power, unexpected response, underload)
+- Bugfixes:
+ + [VECTO-415] Powershift Losses were not considered for AT gearboxes with PowerSplit
+ + [VECTO-416] Measured Speed with gear failed when cycle contained parts with eco-roll (computation of next gear failed)
+ + [VECTO-428] Sum of timeshares adds up to 100%
+ + [VECTO-429] Min Velocity for lookahead coasting was not written to JSON file
**VECTO 3.1.1**
diff --git a/Documentation/User Manual/help.html b/Documentation/User Manual/help.html
index 52c68c69ea1b6b36984adf6c2d1c9ab23f47ca56..fcc20d10a700a983eb305a64d8a6b865c7d0b8a6 100644
--- a/Documentation/User Manual/help.html
+++ b/Documentation/User Manual/help.html
@@ -5705,60 +5705,70 @@ CycleTime,UnknownCycleName,3600</code></pre>
<td>Vehicle loading (see <a href="#vehicle-editor">Vehicle Editor</a>)</td>
</tr>
<tr class="odd">
+<td>Cargo Volume</td>
+<td>[m^3]</td>
+<td>Vehicle cargo volume (Declaration Mode only!)</td>
+</tr>
+<tr class="even">
<td>time</td>
<td>[s]</td>
<td>Total simulation time</td>
</tr>
-<tr class="even">
+<tr class="odd">
<td>distance</td>
<td>[km]</td>
<td>Total traveled distance</td>
</tr>
-<tr class="odd">
+<tr class="even">
<td>speed</td>
<td>[km/h]</td>
<td>Average vehicle speed</td>
</tr>
-<tr class="even">
+<tr class="odd">
<td>altitudeDelta</td>
<td>[m]</td>
<td>Altitude difference between start and end of cycle</td>
</tr>
-<tr class="odd">
+<tr class="even">
<td>FC-Map</td>
<td>[g/h], [g/km]</td>
<td>Average fuel consumption before all corrections, interpolated from <a href="#fuel-consumption-calculation">Fuel Map</a>, based on torque and engine speed.</td>
</tr>
-<tr class="even">
+<tr class="odd">
<td>FC-AUXc</td>
<td>[g/h], [g/km]</td>
<td>Average fuel consumption after <a href="#fuel-consumption-calculation">Auxiliary-Start/Stop Correction</a> (Based on FC-Map)</td>
</tr>
-<tr class="odd">
+<tr class="even">
<td>FC-WHTCc</td>
<td>[g/h], [g/km]</td>
<td>Average fuel consumption after <a href="#fuel-consumption-calculation">WHTC Correction</a> (Based on FC-AUXc)</td>
</tr>
-<tr class="even">
+<tr class="odd">
<td>FC-AAUX</td>
<td>[g/h], [g/km]</td>
<td>Average fuel consumption after Smart Auxiliary Correction (<em>still in development</em>) (Based on FC-WHTCc)</td>
</tr>
-<tr class="odd">
+<tr class="even">
<td>FC-Final</td>
-<td>[g/h], [g/km], [l/100km], [l/100tkm]</td>
+<td>[g/h], [g/km], [l/100km], [l/100tkm], [l/100m^3km]</td>
<td>Final average fuel consumption after ALL corrections. Value for calculation of CO<sub>2</sub> value. If Loading = 0[kg] the column [l/100tkm] is left empty.</td>
</tr>
-<tr class="even">
+<tr class="odd">
<td>CO2</td>
-<td>[g/km], [g/tkm]</td>
+<td>[g/km], [g/tkm], [g/m^3km]</td>
<td>Average CO<sub>2</sub> emissions (based on FC-Final value). Output for [l/100tkm] is empty when Loading = 0[kg].</td>
</tr>
-<tr class="odd">
+<tr class="even">
<td>P_wheel_in_pos</td>
<td>[kW]</td>
<td>Average positive power at the wheels</td>
</tr>
+<tr class="odd">
+<td>P_fcmap_pos</td>
+<td>[kW]</td>
+<td>Average positive power at engine (all non-negative values averaged over the whole cycle duration)</td>
+</tr>
<tr class="even">
<td>E_fcmap_pos</td>
<td>[kWh]</td>
@@ -5892,6 +5902,7 @@ CycleTime,UnknownCycleName,3600</code></pre>
</tbody>
</table>
<p>E_fcmap_pos = E_fcmap_neg + E_powertrain_inertia + E_aux_xxx + E_aux_sum + E_clutch_loss + E_tc_loss + E_gbx_loss + E_ret_loss + E_angle_loss + E_axl_loss + E_brake + E_vehicle_inertia + E_air + E_roll + E_grad + E_PTO_CONSUM + E_PTO_TRANSM</p>
+<p>E_fcmap_pos = P_fcmap_pos * time</p>
</div>
<div id="application-files" class="section level2">
<h2>Application Files</h2>
@@ -5918,6 +5929,32 @@ CycleTime,UnknownCycleName,3600</code></pre>
</div>
<div id="changelog" class="section level1">
<h1>Changelog</h1>
+<p><strong>VECTO 3.1.2</strong></p>
+<p><strong><em>Build 796 (2017-03-07)</em></strong></p>
+<ul>
+<li>Improvements:
+<ul>
+<li>[VECTO-405] Adding clutch-losses for AMT/MT gearboxes during drive-off, reduce drive-off distance after stop from 1m to 0.25m, set clutch closing speed (normalized) to 6.5%, changes in clutch model</li>
+<li>[VECTO-379] Make GUI more tolerant against missing files. Instead of aborting reading the input data the GUI shows a suffix for missing input files</li>
+<li>[VECTO-411] Allow a traction interruption of 0s for AMT/MT gearboxes</li>
+<li>[VECTO-408] Gearbox Inertia for AT gearboxes set to 0</li>
+<li>[VECTO-419] Adapted error messages, added list of errors</li>
+<li>[VECTO-421,VECTO-439] Added volume-related results to vsum file (volume is computed based on default bodies)</li>
+<li>[] Energy balance (vsum) and balance of engine power output and power consumers (vmod) level</li>
+<li>[VECTO-430] AT shift strategy: upshifts may happen too early</li>
+<li>[VECTO-431] AMT shift strategy always started in first gear due to changes in clutch model</li>
+<li>[VECTO-433] adapt generic vehicles: use typical WHTC correction factors</li>
+<li>[VECTO-437] set vehicle speed at clutch-closed to 1.3 m/s</li>
+<li>[VECTO-436] fix simulation aborts with AT gearbox (neg. braking power, unexpected response, underload)</li>
+</ul></li>
+<li>Bugfixes:
+<ul>
+<li>[VECTO-415] Powershift Losses were not considered for AT gearboxes with PowerSplit</li>
+<li>[VECTO-416] Measured Speed with gear failed when cycle contained parts with eco-roll (computation of next gear failed)</li>
+<li>[VECTO-428] Sum of timeshares adds up to 100%</li>
+<li>[VECTO-429] Min Velocity for lookahead coasting was not written to JSON file</li>
+</ul></li>
+</ul>
<p><strong>VECTO 3.1.1</strong></p>
<p><strong><em>Build 748 (2017-01-18)</em></strong></p>
<ul>
diff --git a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/250kW.vfld b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/250kW.vfld
index 775c31bc2d0e96570b8de34a2dae818d8f9ba2c2..ca060a27380cd9d49e547d12aa320966cbe57354 100644
--- a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/250kW.vfld
+++ b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/250kW.vfld
@@ -1,6 +1,6 @@
engine speed [1/min],full load torque [Nm],motoring torque [Nm],PT1 [s]
-600,914,-106,0.24
-800,1277,-110,0.47
+600,1114,-106,0.24
+800,1377,-110,0.47
1000,1641,-117,0.58
1200,1641,-127,0.53
1400,1641,-144,0.46
diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index 2a06ca9d0aaed550e3872bbf53be8b670be1b9b1..6181aac403b7240ae1f5ba8cc8c10611189ab985 100644
--- a/VectoConsole/Properties/Version.cs
+++ b/VectoConsole/Properties/Version.cs
@@ -11,7 +11,7 @@
* by the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use VECTO except in compliance with the Licence.
* You may obtain a copy of the Licence at:
-*
+*
* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
*
* Unless required by applicable law or agreed to in writing, VECTO
@@ -29,8 +29,6 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-
-
using System.Reflection;
[assembly: AssemblyVersion("3.1.1.748")]
[assembly: AssemblyFileVersion("3.1.1.748")]
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs
index 056f046d5912669ccc0a4e555e66f56c24afc0f5..a499a5465325ab8f9a775da771610c1a5af4544f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs
@@ -61,7 +61,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
if (value.HasValue) {
return value.Value.SI<Watt>();
}
-
+ value = _map.Extrapolate(nAuxiliary.Value(), powerAuxOut.Value());
+ if (value.HasValue) {
+ return value.Value.SI<Watt>();
+ }
throw new VectoException("AuxiliaryData {2}: Interpolation failed. nAux: {0}, powerOut:{1}", nAuxiliary.AsRPM,
powerAuxOut, auxId);
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
index 8886b98df31be3c5d26cc9c2970a7e123c463bc6..bbd0c7293f96cf1d67df15cc29eb71af00fba238 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
@@ -111,7 +111,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
//if (false && DataBus.VehicleStopped && DataBus.DriverBehavior == DrivingBehavior.Driving && outTorque.IsGreater(0)) {
// dryOperatingPoint = ModelData.FindOperatingPoint(DataBus.EngineIdleSpeed, outAngularVelocity);
//} else {
- dryOperatingPoint = (DataBus.DriverBehavior != DrivingBehavior.Braking) ||
+ dryOperatingPoint = (DataBus.DriverBehavior != DrivingBehavior.Braking && DataBus.BrakePower.IsEqual(0)) ||
(outTorque.IsGreater(0) && DataBus.BrakePower.IsEqual(0))
? GetMaxPowerOperatingPoint(dt, outAngularVelocity, engineResponse,
PreviousState.InTorque * PreviousState.InAngularVelocity)
diff --git a/VectoCore/VectoCore/Properties/Version.cs b/VectoCore/VectoCore/Properties/Version.cs
index fe34c542bc975b260cea5fb050f03e983e638993..871667aa6284942a9302c46d1761a652e9a067f3 100644
--- a/VectoCore/VectoCore/Properties/Version.cs
+++ b/VectoCore/VectoCore/Properties/Version.cs
@@ -29,8 +29,6 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-
-
using System.Reflection;
-[assembly: AssemblyVersion("3.1.1.748")]
-[assembly: AssemblyFileVersion("3.1.1.748")]
+[assembly: AssemblyVersion("3.1.2.796")]
+[assembly: AssemblyFileVersion("3.1.2.796")]
diff --git a/VectoCore/VectoCore/Properties/Version.tt b/VectoCore/VectoCore/Properties/Version.tt
index 7bb5ce3cc1fb4c0aeb7c69f0f49f4812c3001ef1..e5ca8e5e9e85e918432dd564d6360e86d5547ed5 100644
--- a/VectoCore/VectoCore/Properties/Version.tt
+++ b/VectoCore/VectoCore/Properties/Version.tt
@@ -32,8 +32,8 @@
<#@ template language="C#" #>
<#@ output extension=".cs"#>
using System.Reflection;
-[assembly: AssemblyVersion("3.1.1.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("3.1.1.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("3.1.2.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("3.1.2.<#= this.RevisionNumber #>")]
<#+
int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2015, 1, 1)).TotalDays;
#>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index a187faca402ecda111549dba60aec6d4cf64491d..e5367d31495ed54d27de41abb948ebc47e2a1bc9 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -569,7 +569,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_6x4, 40000, 0, VehicleClass.Class11,
new[] { 101.4, 51.9, 51.9, 51.9 }),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_6x4, 99000, 0, VehicleClass.Class12,
- new[] { 91.0, 91.0, 91.0, 91.0 }),
+ new[] { 91.0, 91.0, 91.0 }),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_8x4, 99000, 0, VehicleClass.Class16,
new[] { 0.0 })
]
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Driver.vacc b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Driver.vacc
index bd2b491f11edc28b65ecd1b944c3538fb6ab17d0..5e4343b2ce6a4b6d45f6e2defe97f4cfd550b780 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Driver.vacc
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Driver.vacc
@@ -1,2 +1,2 @@
-0 ,100,-100
-1000,100,-100
\ No newline at end of file
+0 ,10,-10
+1000,10,-10
\ No newline at end of file