Merge pull request #130 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:Release/3.0.2 to develop

* commit '54cfbd7d':
  update build version
  license check only in release mode
  updating links to user manual in GUI, updating docu, adding release notes
  remove condition to disengage when angular velocity gets 0
  fix testcase for segment-table related bug
  adapt results due to changed header
  adapt expected mod files due to changes in header
  bugfix: error in computaton of reference load, reference load may not exceed maximum load
  updated changelog, release notes 3.0.2
  renaming files
  adding documentation for WHTC correction
  reduce distance divergance warning in release mode to 1e-6m
  get rid of warnings when intersecting full-load curves: replace findIndex method by search loop
  update cmd documentation
  vectocmd can run xml files
  check if grossvehiclemass is not null

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

@@ -43,7 +43,9 @@ Filepath ot the Gearbox File(.vgbx)
 :	Files can be created and edited using the [Gearbox Editor](#gearbox-editor).
 
 Auxiliaries
-:	This list contains all auxiliaries used for calculation. The auxiliaries are configured using the [Auxiliary Dialog](#auxiliary-dialog). For each auxiliary an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux) must be provided and the [driving cycle](#driving-cycles) must include the corresponding supply power.
+:	This list contains all auxiliaries used for calculation. The auxiliaries are configured using the [Auxiliary Dialog](#auxiliary-dialog). 
+In Declaration Mode the set of auxiliaries and their power-demand is pre-defined, depending on the vehicle category and driving cycle. 
+In Engineering Mode the set of auxiliaries can be freely defined. For each auxiliary an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux) must be provided and the [driving cycle](#driving-cycles) must include the corresponding supply power.
 **Double-click** entries to edit with the [Auxiliary Dialog](#auxiliary-dialog).
 
 : ![addaux](pics/plus-circle-icon.png) Add new Auxiliary

User Manual/3-simulation-models/PT1.md → User Manual/3-simulation-models/Engine_DynamicFullLoad.md

-##Transient Full Load
+###Engine: Transient Full Load
 
 <div class="vecto2">
 VECTO uses a PT1 function to model transient torque build up using this formula:
@@ -25,4 +25,5 @@ $t_{i-1}^* = PT1 \cdot ln(\frac{1.0}{1 - \frac{P_{eng_{i - 1}}}{P_{fld\ stat}(n_
 
 $t_i^* = t_{i-1}^* + dt$
 
-</div>
\ No newline at end of file
+</div>
+

User Manual/3-simulation-models/FC.md → User Manual/3-simulation-models/Engine_FC.md

 ##Fuel Consumption Calculation
 
 
-
 The base FC value is interpolated from the stationary [FC map](#fuel-consumption-map-.vmap). If necessary the base value is corrected to compensate for unconsidered auxiliary energy consumption for vehicles with Start/Stop. In Declaration Mode additionally the WHTC correction is applied, see below.
 
 The CO~2~ result for the actual mission profile is directly derived from the fuel consumption using a gravimetric [CO~2~/FC factor](#settings).
@@ -40,26 +39,3 @@ For vehicles with [Start/Stop](#engine-startstop) the fuel consumption needs to
 *Example of a linear regression between engine power and fuel consumption*
 </div>
 
-###WHTC Correction
-
-
-The WHTC correction aims to counter the disadvantages of using a stationary FC map. The following steps are applied in VECTO for the WHTC correction method:
-
-1.  VECTO interpolates the fuel consumption for the WHTC load cycle from the engine fuel map based on the target speed and target torque as determined based on the engine full-load curve. The results are FC values for the Urban, Rural and Motorway part.
-2.  The correction factor CF~WHTC~ is calculated using the equation below considering the current mission profile's weighting factors for each part.
-3.  The factor is multiplied to the FC values for each time step and the total FC result.
-
-
-$CF_{WHTC} = \sum_{i=1}^{3} f_i \cdot \frac{FC_{meas_i}}{FC_{calc_i}}[-]$
-
-
-where:
-
-|                   |                                                    |            |
-| ----------------- | -------------------------------------------------- | ---------- |
-| $CF_{WHTC}$          | WHTC Correction Factor                             | \[-\]      |
-| $i$                | index for each part (Urban, Rural, Motorway)       | \[-\]      |
-| $f_i$              | Weighting factor per part                          | \[-\]      |
-| $FC_{meas_i}$       | WHTC measurement result per part (input parameter) | \[g/kWh\]  |
-| $FC_{calc_i}$       | Calculated FC per part                             | \[g/kWh\]  |
-

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

+##Engine: WHTC Correction
+
+<div class="declaration">
+In declaration mode the fuel consumption is corrected as follows:
+
+To prevent inconsistencies of regulated emissions and fuel consumption between the WHTC (hot part) test and the steady state fuel map as well as considering effects of transient engine behaviour a “WHTC correction factor” is used.
+
+Based on the target engine operation points of the particular engine in WHTC the fuel consumption is interpolated from the steady state fuel map (“backward calculation”) in each of the three parts of the WHTC separately. The measured specific fuel consumption per WHTC part in [g/kWh] is then divided by the interpolated specific fuel consumption to obtain the “WHTC correction factors” CF~Urb~, CF~Road~, CF~MW~. For the interpolation the same method as for interpolation in VECTO is applied (Delauney triangulation).
+
+All calculations regarding the brake specific fuel consumption from the interpolation as well as from the measurement and the three correction factors CF~Urb~, CF~Road~, CF~MW~ are fully implemented in the VECTO-Engine evaluation tool.
+
+The total correction factor CF~Tot-i~ depends on the mission profile "i" and is produced in VECTO by mission profile specific weighting factors (WF~i~) listed in the table below.
+
+CF~Tot-i~ = CF~Urb~ * WF~Urb-i~ + CF~Rur~ * WF~Rur-i~ + CF~MW~ * WF~MW-i~
+
+| Index | Mission profile		| WF~MW~| WF~Road~| WF~Urb~ |
+|-------|-----------------------|-------|-------|---------|
+| 1 	| 	Long haul			| 89%	| 0%	| 11% |
+| 2 	| 	Regional delivery	| 53%	| 30%	| 17% |
+| 3 	| 	Urban delivery		| 4%	| 27%	| 69% |
+| 4 	| 	Municipial utility	| 2%	| 0%	| 98% |
+| 5 	| 	Construction		| 6%	| 32%	| 62% |
+| 6 	| 	Citybus				| 0%	| 0%	| 100% |
+| 7 	| 	Interurban bus		| 19%	| 36%	| 45% |
+| 8 	| 	Coach				| 78%	| 22%	| 0% |
+
+</div>
+
+<div class="engineering">
+In engineering mode no WHTC correction is applied by Vecto. For an arbitrary cycle the weighting factors are not known, hence the total correction factor CF~Tot~ can not be computed.
+WHTC correction can be applied manually as a post-processing step.
+</div>
\ No newline at end of file

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

@@ -2,16 +2,17 @@
 
 In this chapter the used component models for the simulation are described.
 
-* [Acceleration Limiting](#acceleration-limiting)
-* [Auxiliaries](#auxiliaries)
-* [Cross Wind Correction](#cross-wind-correction)
-* [Engine Only Mode](#engine-only-mode)
+* [Driver: Acceleration Limiting](#acceleration-limiting)
+* [Driver: Look-Ahead Coasting](#look-ahead-coasting)
+* [ADAS: Overspeed / Eco-Roll](#overspeed-eco-roll)
+* [Vehicle: Cross Wind Correction](#cross-wind-correction)
+* [Vehicle: Rolling Resistance Coefficient](#rolling-resistance-coefficient)
 * [Engine Start/Stop](#engine-startstop)
-* [Fuel Consumption Calculation](#fuel-consumption-calculation)
+* [Engine: Fuel Consumption Calculation](#fuel-consumption-calculation)
+* [Engine: Transient Full Load](#transient-full-load)
+* [Engine: WHTC Correction](#transient-full-load)
 * [Gear Shift Model](#gear-shift-model)
-* [Look-Ahead Coasting](#look-ahead-coasting)
-* [Overspeed / Eco-Roll](#overspeed-eco-roll)
-* [Pwheel-Input (SiCo Mode)](#pwheel-input-sico-mode)
-* [Rolling Resistance Coefficient](#rolling-resistance-coefficient)
 * [Torque Converter Model](#torque-converter-model)
-* [Transient Full Load](#transient-full-load)
+* [Auxiliaries](#auxiliaries)
+* [Engine Only Mode](#engine-only-mode)
+* [Pwheel-Input (SiCo Mode)](#pwheel-input-sico-mode)

User Manual/4-command-line-arguments/cmd.md

@@ -49,11 +49,11 @@ If the file has one of the following extensions it is opened with the associated
 
 ![](pics/cmd3.png)
 
-The Vecto 3.x commandline tool runs completely without a graphical user interface. If multiple job-files are specified or a job-file contains multiple simulation runs (i.e., multiple cycles and/or loadings) these simulations are executed in parallel.
+The Vecto 3.x commandline tool runs completely without a graphical user interface. If multiple job-files are specified or a job-file contains multiple simulation runs (i.e., multiple cycles and/or loadings) these simulations are executed in parallel. Vectocmd supports both types of input files, JSON (in engineering and declaration mode) and XML (Declaration mode only).
 
 The basic usage is as follows
 
-        vectocmd.exe [-h] [-v] FILE1.vecto [FILE2.vecto ...]
+        vectocmd.exe [-h] [-v] FILE1.(vecto|xml) [FILE2.(vecto|xml) ...]
 
 ###List of command line arguments
 

User Manual/6-changelog/changelog.md

@@ -7,14 +7,33 @@
     + Measured Speed
     + Measured Speed with Gear
     + Pwheel (SiCo)
-- User Manual updated for VECTO V3.x
-- ModData Format changed for better information and clarity
+- Adaptations of powertrain components architecture
+    + Move wheels inertia from vehicle to wheels
+    + Auxiliaries no longer connected via clutch to the engine but via a separate port
+    + Engine checks overload of gearbox and engine overload
+- Fixed some driving behavior related issues in VectoCore:
+    + When the vehicle comes to a halt during gear shift, instead of aborting the cycle, it tries to drive away again with an appropriate gear.
+- [ModData Format](#modal-results-.vmod) changed for better information and clarity
+- Entries in the sum-file are sorted in the same way as in Vecto 2.2
+- In engineering mode the execution mode (distance-based, time-based measured speed, time-based measured speed with gear, engine only) are detected based on the cycle
 - Added validation of input values
+- Gravity constant set to 9.80665 (NIST standard acceleration for gravity)
+- Improved input data handling: sort input values of full-load curves (engine, gbx, retarder)
 - Better Integration of VectoCore into GUI (Notifications and Messages)
-- Fixed some driving behavior related bugs in VectoCore:
-    + When the vehicle comes to a halt during gear shift, instead of aborting the cycle, it tries to drive away again with an appropriate gear.
-- For all calculations the averaged values of the current cycle step are used.
-
+- Speed dependent cross-wind correction (vcdv) and v_air/beta cross-wind correction (vcdb) impemented
+- For all calculations the averaged values of the current simulation step are used for interpolations in loss-maps.
+- Allow extrapolation of loss maps in engineering mode (warnings)
+- Refactoring of input data handling: separate InputDataProvider interfaces for model data
+- Refactoring of result handling: separate result container and output writer
+- New Long-Haul driving cycle included
+- User Manual updated for VECTO V3.x
+- Fix: sparse representation of declaration cycles had some missing entries
+- Bugfix: error in computation of engine's preferred speed 
+- Bugfix: wrong vehicle class lookup
+- Bugfix: duplicate entries in intersected full-load curves
+- Bugfix: retarder takes the retarder ratio into account for lossmap lookup
+- Bugfix: use unique identifier for jobs in job list
+- Bugfix: error in triagulation of fuel consumption map
 
 **VECTO 3.0.1**
 

User Manual/files.txt

@@ -15,18 +15,19 @@
 2-calculation-modes/engine-only.md
 2-calculation-modes/batch.md
 3-simulation-models/simulation-models.md
-3-simulation-models/AccLimit.md
+3-simulation-models/Driver_AccLimit.md
+3-simulation-models/Driver_LAC.md
+3-simulation-models/ADAS_EcoRoll.md
+3-simulation-models/Vehicle_CrossWindCorrection.md
+3-simulation-models/Vehicle_RRC.md
+3-simulation-models/Engine_StartStop.md
+3-simulation-models/Engine_FC.md
+3-simulation-models/Engine_DynamicFullLoad.md
+3-simulation-models/Engine_WHTC.md
+3-simulation-models/GearShift.md
+3-simulation-models/TC.md
 3-simulation-models/Auxiliaries.md
-3-simulation-models/cd.md
-3-simulation-models/StartStop.md
-3-simulation-models/FC.md
-3-simulation-models/Shift.md
-3-simulation-models/LAC.md
-3-simulation-models/EcoRoll.md
 3-simulation-models/PwheelInput.md
-3-simulation-models/RRC.md
-3-simulation-models/TC.md
-3-simulation-models/PT1.md
 5-input-and-output-files/input-output.md
 5-input-and-output-files/CSV.md
 5-input-and-output-files/JSON.md