Pull request #929: Develop

Merge in VECTO/vecto-sim from develop to master

* commit 'd5d8f061': (79 commits)
  preparing new release updating changelog adding release report
  correcting codition that engine speed is not too high after a downshift
  AT Gearbox: downshift if below target speed only if engine speed in lower gear is below max engine speed
  Bugfix: avoiding short simulation interval. in case the vehicle speed is already below the target speed of the current  'next driving action' and the trigger distance is reached, assume the current 'next driving action' as completed and switch to the next one.
  correct path in build script
  preparing new release candidate
  xmlvalidator: handle the case where validationeventargs may be null
  update hashing tool to read the error message from the correct fields
  extending xml validation to check it the tyre dimension is valid
  updating xml schema version 2.5: remove restrictions for tyre dimension adding xml reader for tyre in version 2.5 adding testcase to read vehicle with 2.5 tyres adding tyre xml version 2.5
  adding new tyre dimensions
  correcting typo
  adding missing file
  fix: use generic alternator efficiency for converting electric power of engine fan to mechanical power
  Revert "bugfix: corrected expected values for Engine fan auxiliary tests"
  adding new tyre dimensions
  bugfix: corrected expected values for Engine fan auxiliary tests
  Extend mock-cycle data in VTP testcases with newly required columns
  re-include xsd file into project
  added missing files
  ...

.gitignore

@@ -207,3 +207,5 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/
 Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vmod
 Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vsum
 Documentation/User Manual/img/
+
+.vs/
\ No newline at end of file

Build/TextPreProcessing.targets

@@ -6,6 +6,6 @@
 		</ItemGroup>
 		<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\12.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
 		<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\14.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
-		<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
+		<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
 	</Target>
 </Project>
\ No newline at end of file

Documentation/User Manual/1-user-interface/D2_VTP-Job-Editor.md

@@ -6,11 +6,11 @@
 
 ### Description
 
-A VTP-Job is intended to verify the declared data of a vehicle through an on-road test. VTP-Jobs can be either simulated in engineering mode or declaration mode. For a VTP simulation the measured driving cycle along with the VECTO job-file is required. The driving cycle has to contain the vehicle's velocity, rotational speed of the driven wheels, torque of the driven wheels, and fuel consumption in a temporal resolution of 2Hz.
+A VTP-Job is intended to verify the declared data of a vehicle through an on-road test. VTP-Jobs can be either simulated in engineering mode or declaration mode. For a VTP simulation the measured driving cycle along with the VECTO job-file is required. The driving cycle has to contain the vehicle's velocity, rotational speed of the driven wheels, torque of the driven wheels, fuel consumption, engine speed, engine torque, engine fan speed or power, and pollutants flow in a temporal resolution of 2Hz.
 VECTO computes the best matching gear based on the vehicle parameters, the actual vehicle speed and the engine speed.
 Next, VECTO re-computes the fuel consumption based for the given driving cycle. For a VTP-test the re-computed fuel consumption has to be within certain limits of the real fuel consumption.
 
-The [VTP job file (.vecto)](#vtp-job-file) includes all informations to run a VECTO calculation. It defines the vehicle and the driving cycle(s) to be used for calculation. In summary it defines:
+The [VTP job file (.vecto)](#vtp-job-file) includes all the necessary information to run a VECTO calculation. It defines the vehicle and the driving cycle(s) to be used for the calculations. In summary, it defines:
 
 -   Filepath to the Vehicle File (.xml)](#vehicle-editor which defines all relevant parameters, including all components
 -   Driving Cycles
@@ -22,7 +22,7 @@ The [VTP job file (.vecto)](#vtp-job-file) includes all informations to run a VE
 <div class="declaration">
 In declaration mode only the first given driving cycle is simulated as the results are further compared with the re-simulated Long-Haul results.
 
-In declaration mode the manufacturer's record file needs to be provided. Furthermore, declaration mode simulations consider correction factors for the net calorific value of the used fuel and the vehicle's mileage. In engineering mode the according input fields are not shown.
+In declaration mode the manufacturer's record file needs to be provided. Furthermore, declaration mode simulations consider correction factors for the net calorific value of the used fuel(s) and the vehicle's mileage. In engineering mode the according input fields are not shown. The fields for the net calorific values are shown only after the vehicle XML has been loaded, because it defines the fuel types used.
 </div>
 
 ### Relative File Paths

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

 ## Driver: Overspeed
 
-
-Both functions control the vehicle's behaviour on uneven road sections (slope ≠ 0) and can be configured in the [Job File](#job-file)'s Driver Assist Tab. Overspeed is designed to model an average driver's behaviour without the aid of driver assistance systems. Eco-Roll  represents an optional driver assistance feature. For this reason vehicles without Eco-Roll should always have the Overspeed function enabled.
+Overspeed controls the vehicle's behaviour on uneven road sections (slope ≠ 0) and can be configured in the [Job File](#job-file)'s Driver Assist Tab. Overspeed is designed to model an average driver's behaviour without the aid of driver assistance systems. Eco-Roll represents an optional driver assistance feature. For this reason vehicles without Eco-Roll should always have the Overspeed function enabled.
 
 
 ### Overspeed
@@ -141,7 +140,7 @@ During downhill driving when the vehicle is braking at the overspeed velocity, P
 
 In VECTO a vehicle may either support use cases 1 and 2 or all three use cases.
 
-Predictive cruise control is only considered on highway sections of the simulated driving cycle (see [sistance-based driving cycle](#engineering-mode-target-speed-distance-based-cycle).
+Predictive cruise control is only considered on highway sections of the simulated driving cycle (see [distance-based driving cycle](#engineering-mode-target-speed-distance-based-cycle).
 
 <div class="declaration">
 In declaration mode, the whole long-haul cycle is considered as highway. Moreover, the section from 29760m to 96753m of the regional delivery cycle is considered as highway.

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

 ## Dual Fuel Engine
 
-<div class="engineering">
 VECTO supports to simulate vehicles equipped with dual-fuel engines, i.e. two different fuels are used simulateously. Therefore, the engine model contains a second fuel comsumption map and VECTO interpolates the fuel consumtion from both consumption maps. In the .vmod and .vsum files the consumption of every fuel is reported. The CO2 emissions are te sum of CO2 emissions from both fuels.
 
 In case a WHR system is used with a dual-fuel vehicle the WHR map shall be provided in the fuel consumption map of the primary fuel.
-</div>
+
\ No newline at end of file

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

 ## Vehicle: ADAS Technologies
 
-<div class="declaration">
-Advanced Driver Assistant Systems are considered in Declaration Mode via a technology dependent and vehicle group specific bonus on the fuel cosumption as described in the followin.
-</div>		
 
-In Declaration mode VECTO applies a correction factor to take into account certain Advanced Driver Assistant System technologies. The following Technologies are currently considered:
+VECTO simulates certain Advanced Driver Assistant System technologies in-the-loop (see [Engine Stop/Start](#advanced-driver-assistant-systems-engine-stopstart), [Eco-Roll](#advanced-driver-assistant-systems-eco-roll), [Predictive Cruise Control](#advanced-driver-assistant-systems-predictive-cruise-control). The following Technologies are currently considered:
 
 - Engine stop start
 - EcoRoll without engine stop
@@ -19,9 +16,7 @@ For predictive cruise control three different options are considered:
 
 A PCC system can be declared as input to the simulation tool if either the functionalities set out in points 1) and 2) or points 1), 2) and 3) are covered.
 
-Out of this four technologies as listed above only 11 combinations are valid. For every valid ADAS technology combination VECTO reduces the final fuel consumtion by a certain percentage depending on the vehicle group, driving cycle, and payload.
-
-The following table maps the valid combinations of ADAS systems to a so-called "ADAS Combination".
+Out of this four technologies as listed above only 11 combinations are valid. The following table maps the valid combinations of ADAS systems to a so-called "ADAS Combination".
 
 | Engine Stop Start   | EcoRoll without Engine Stop   | EcoRoll with Engine Stop   | Predictive Cruise Control   | ADAS Combination  |
 | ------------------- | ----------------------------- | -------------------------- | --------------------------- | ----------------- |

Documentation/User Manual/5-input-and-output-files/VDRI.md

@@ -34,39 +34,49 @@ In Declaration Mode driving cycles are automatically chosen depending on vehicle
 ### Verification Test Cycle
 This kind of cycle is used for simulating vehicles defined in declaration mode (xml) on a real driving cycle.
 
-Header: **\<t>, \<v>, \<n\_eng>,\<n\_fan>, \<tq\_left>, \<tq\_right>, \<n\_wh\_left>, \<n\_wh\_right>***, \<fc>, \<gear>*
+Header: **\<t>, \<v>, \<n\_eng>,\<n\_fan>, \<Pel\_fan>, \<tq\_left>, \<tq\_right>, \<n\_wh\_left>, \<n\_wh\_right>, \<tq\_eng>, \<CO>, \<NOx>, \<PN>***, \<fc_X>, \<gear>, \<TC\_active>, \<THC>, \<CH4>, \<NMHC>*
 
 **Bold columns** are mandatory. *Italic columns* are optional. Only the listed columns are allowed (no other columns!).<br />
 Units are optional and are enclosed in [square-brackets] after the header-column. Comments may be written with a preceding hash-sign "#".
+**\<n\_fan>** and **\<Pel\_fan>** are mutually exclusive, you can have only one of them in the cycle.
 
 | Identifier     | Unit     | Description                                                                                                                                                                                                                                                                                            |
 | -------------  | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | **t**          | [s]      | The absolute time. Must always be increasing.                                                                                                                                                                                                                                                          |
 | **v**          | [km/h]   | The actual velocity of the vehicle. Must be >= 0 km/h.                                                                                                                                                                                                                                                 |
 | **n_eng**      | [rpm]    | The actual engine speed. Must be >= 0 rpm.                                                                                                                                                                                                                                                             |
-| **n_fan**      | [rpm]    | The actual engine-fan speed. Must be >= 0 rpm.                                                                                                                                                                                                                                                         |
+| **n_fan**      | [rpm]    | The actual engine-fan speed. Must be >= 0 rpm. Mutually exclusive with **Pel_fan**.                                                                                                                                                                                                                    |
+| **Pel_fan**    | [W]      | Electric cooling fan power. Mutually exclusive with **n_fan**.                                                                                                                                                                                                                                         |
 | **tq_left**    | [Nm]     | The actual torque at the driven wheel (left side)                                                                                                                                                                                                                                                      |
 | **tq_right**   | [Nm]     | The actual torque at the driven wheel (left side)                                                                                                                                                                                                                                                      |
 | **n_wh_left**  | [rpm]    | The actual wheel speed of the driven wheel (left side). Must be >= 0 rpm.                                                                                                                                                                                                                              |
 | **n_wh_right** | [rpm]    | The actual wheel speed of the driven wheel (right side). Must be >= 0 rpm.                                                                                                                                                                                                                             |
-| *fc*           | [g/h]    | Fuel consumption                                                                                                                                                                                                                                                                                       |
-| *gear*         | [-]      | The actual gear                                                                                                                                                                                                                                                                                        |
+| **tq_eng**     | [Nm]     | Engine torque                                                                                                                                                                                                                                                                                          |                 
+| **CO**         | [g/s]    | CO mass flow
+| **NOx**        | [g/s]    | NOx mass flow
+| **PN**         | [#/s]    | PM number flow
+| *fc_X*         | [g/h]    | Fuel consumption. “X” shall be the fuel type, e.g. “\<fc\_Diesel CI>”. For dual-fuel engines a separate column for each fuel shall be provided.                                                                                                                                                                                                                                                                                       |
+| *gear*         | [-]      | The actual gear. Mandatory for APT transmissions.
+| *TC_active*    | [-]		| Torque converter active. 0 = not active (locked); 1 = active (unlocked); mandatory for AT transmissions, not relevant for other transmission types.                                                                                                                                                     |
+| *THC*			 | [g/s]    | THC mass flow. Mandatory if *CH4* and *NMHC* are not present.
+| *CH4*          | [g/s]    | CH4 mass flow.
+| *NMHC*         | [g/s]    | NMHC mass flow.
 
 **Example:**
 
-| \<t> [s]  | \<v> [km/h]  | \<n_eng> [rpm]  | \<n_fan> [rpm]  | \<tq_left> [Nm]  | \<tq_right> [Nm]  | \<n_wh_left> [rpm]  | \<n_wh_right> [rpm]  | \<fc> [g/h]  | \<gear>  |
-| --------- | ------------ | --------------- | --------------- | ---------------- | ----------------- | ------------------- | -------------------- | ------------ | -------- | 	
-| 0         | 0            | 599.7           | 727.3           | 319.1            | 429.8             | 0.78                | 0.78                 | 836          | 3        |
-| 0.5       | 0            | 600.2           | 727.3           | 316.7            | 430.0             | 0.78                | 0.78                 | 836          | 3        |
-| 1         | 0            | 600.1           | 726.9           | 319.9            | 430.8             | 0.78                | 0.78                 | 836          | 3        |
-| 1.5       | 0            | 599.9           | 726.6           | 317.4            | 431.1             | 0.78                | 0.79                 | 836          | 3        |
-| 2         | 0            | 600.1           | 726.2           | 319.5            | 421.7             | 0.78                | 0.78                 | 836          | 3        |
-| 2.5       | 0            | 599.7           | 726             | 319.0            | 434.1             | 0.78                | 0.78                 | 836          | 3        |
-| 3         | 0            | 600.2           | 725.4           | 322.2            | 428.5             | 0.78                | 0.78                 | 836          | 3        |
-| 3.5       | 0            | 599.9           | 724.7           | 317.3            | 430.4             | 0.78                | 0.78                 | 836          | 3        |
-| 4         | 0            | 599.5           | 724.0           | 320.9            | 428.0             | 0.78                | 0.78                 | 836          | 3        |
-| 4.5       | 0            | 599.9           | 723.4           | 187.0            | 247.6             | 0.78                | 0.78                 | 836          | 3        |
-| 5         | 0            | 598.7           | 722.5           | 156.9            | 171.5             | 0.78                | 0.78                 | 1003.2       | 3        |
+| \<t> [s]  | \<v> [km/h]  | \<n_eng> [rpm]  | \<n_fan> [rpm]  | \<tq_left> [Nm]  | \<tq_right> [Nm]  | \<n_wh_left> [rpm]  | \<n_wh_right> [rpm]  | \<tq\_eng> [Nm]  | \<CO> [g/s]  | \<NOx> [g/s]  | \<THC> [g/s]  | \<PN> [#/s]  | \<fc_Diesel CI> [g/h]  | \<gear>  |
+| --------- | ------------ | --------------- | --------------- | ---------------- | ----------------- | ------------------- | -------------------- | -----------------|--------------|---------------|---------------|--------------|----------------------- | -------- | 	
+| 0         | 0            | 599.7           | 727.3           | 319.1            | 429.8             | 0.78                | 0.78                 | 219              | 1234         | 243           | 345           | 6544         | 836                    | 3        |
+| 0.5       | 0            | 600.2           | 727.3           | 316.7            | 430.0             | 0.78                | 0.78                 | 219              | 1243         | 233           | 345           | 6544         | 836                    | 3        |
+| 1         | 0            | 600.1           | 726.9           | 319.9            | 430.8             | 0.78                | 0.78                 | 220              | 1211         | 244           | 344           | 5555         | 836                    | 3        |
+| 1.5       | 0            | 599.9           | 726.6           | 317.4            | 431.1             | 0.78                | 0.79                 | 220              | 1222         | 233           | 455           | 4565         | 836                    | 3        |
+| 2         | 0            | 600.1           | 726.2           | 319.5            | 421.7             | 0.78                | 0.78                 | 220              | 1233         | 233           | 355           | 6555         | 836                    | 3        |
+| 2.5       | 0            | 599.7           | 726             | 319.0            | 434.1             | 0.78                | 0.78                 | 220              | 1332         | 244           | 454           | 6555         | 836                    | 3        |
+| 3         | 0            | 600.2           | 725.4           | 322.2            | 428.5             | 0.78                | 0.78                 | 220              | 1223         | 243           | 544           | 4565         | 836                    | 3        |
+| 3.5       | 0            | 599.9           | 724.7           | 317.3            | 430.4             | 0.78                | 0.78                 | 222              | 1144         | 322           | 345           | 6565         | 836                    | 3        |
+| 4         | 0            | 599.5           | 724.0           | 320.9            | 428.0             | 0.78                | 0.78                 | 223              | 1232         | 234           | 344           | 4566         | 836                    | 3        |
+| 4.5       | 0            | 599.9           | 723.4           | 187.0            | 247.6             | 0.78                | 0.78                 | 222              | 1222         | 433           | 555           | 4566         | 836                    | 3        |
+| 5         | 0            | 598.7           | 722.5           | 156.9            | 171.5             | 0.78                | 0.78                 | 218              | 1122         | 222           | 345           | 6565         | 1003.2                 | 3        |
 
 
 

Documentation/User Manual/5-input-and-output-files/VECTO-VTP.md

@@ -18,22 +18,36 @@ Refers to other files:
 ~~~json
 {
   "Header": {
-    "CreatedBy": "VECTO 3.2",
-    "Date": "2017-11-14T13:16:31.7337506Z",
+    "CreatedBy": "VECTO 3.3.11",
+    "Date": "2022-09-12T13:30:50.8149043Z",
     "AppVersion": "3",
     "FileVersion": 4
   },
   "Body": {
-    "SavedInDeclMode": false,
-    "DeclarationVehicle": "SampleVehicle.xml",
+    "SavedInDeclMode": true,
+    "DeclarationVehicle": "vehicle_sampleSingleModeDualFuel.xml",
+    "ManufacturerRecord": "vehicle_sampleSingleModeDualFuel.RSLT_MANUFACTURER.xml",
+    "Mileage": 30000.0,
     "FanPowerCoefficients": [
-      0.00000055,
-      14.62,
-      108.5
+      7.32,
+      1200.0,
+      810.0
     ],
-    "FanDiameter": 0.225,
+    "FanDiameter": 0.3,
+    "FuelNCVs": [
+      {
+        "Type": "Diesel CI",
+        "NCV": 42.7
+      },
+      {
+        "Type": "NG CI",
+        "NCV": 48.0
+      }
+    ],
+    "TorqueDriftLeftWheel": 0.0,
+    "TorqueDriftRightWheel": 0.0,
     "Cycles": [
-      "VTP-cycle.vdri"
+      "vtp_cycle_2Hz.vdri"
     ]
   }
 }

Documentation/User Manual/6-changelog/changelog.md

 # Changelog
 
+**VECTO-3.3.13**
+
+***Build 2924 (2023-01-03) OFFICIAL RELEASE***
+
+ - Bugfixes (compared to 3.3.13.2891)
+    * [VECTO-1692] - Unexpected Response: Response Overload. UD RefLoad
+
+***Build 2891 (2022-12-01) RELEASE CANDIDATE***
+
+- Improvements
+   * [VECTO-1554] - VTP Mode according to 2nd amendment
+   * [VECTO-1652] - Additional Tyre Dimension
+   * [VECTO-1647] - Update user manual
+- Bugfixes (compared to VECTO 3.3.12.2769)
+   * [VECTO-1655] - Not possible to set Tank System to Liquefied (changes it back to compressed) in .vveh file
+   * [VECTO-1656] - Simulation run aborted - TC & ESS
+   * [VECTO-1661] - Gear disabling not functioning in 3.3.12.2800.
+   * [VECTO-1643] - Error: Gear 6L LossMap data was extrapolated in Declaration Mode
+
+
 **VECTO-3.3.12**
 
 ***Build 2800 (2022-09-01) OFFICIAL RELEASE***

HashingCmd/Program.cs

@@ -183,6 +183,10 @@ hashingcmd.exe
 		{
 			var args = evt.ValidationEventArgs;
 			if (severity == XmlSeverityType.Error) {
+				if (args == null) {
+					throw new Exception(string.Format("Validation error: {0}", evt.Exception.Message), evt.Exception.InnerException);
+				}
+
 				throw new Exception(string.Format("Validation error: {0}" + Environment.NewLine +
 												"Line: {1}", args.Message, args.Exception.LineNumber), evt.Exception);
 			} else {