Merge remote-tracking branch 'codeu-doumpst/amdm2/develop' into amdm2/main

83fa76c7 · Stefanos Doumpoulakis · ebc34e4a · 9b746cc1 · 83fa76c7 · 83fa76c7
Commit 83fa76c7 authored 1 year ago by Stefanos Doumpoulakis
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,13 +2,13 @@
  <PropertyGroup>
    <!-- For a Release-Candidate uncomment the following line: -->
-    <!-- <DefineConstants>RELEASE_CANDIDATE</DefineConstants> -->
+     <DefineConstants>RELEASE_CANDIDATE</DefineConstants> 
    <!-- For a Release uncomment the following line: -->
-    <DefineConstants>CERTIFICATION_RELEASE</DefineConstants>
+    <!--<DefineConstants>CERTIFICATION_RELEASE</DefineConstants>-->
    <!-- Global VECTO Version -->
-    <MainProductVersion>4.0.3</MainProductVersion>
+    <MainProductVersion>4.1.0</MainProductVersion>
    <!-- <VersionSuffix>RC</VersionSuffix> -->
    <!-- The following settings are used as default values for ALL projects -->

--- a/Documentation/User Manual Source/Release Notes Vecto4.x.pptx
+++ b/Documentation/User Manual Source/Release Notes Vecto4.x.pptx
--- a/Documentation/User Manual Source/release notes vecto4.x.pdf
+++ b/Documentation/User Manual Source/release notes vecto4.x.pdf
--- a/Documentation/User Manual/1-user-interface/D2_VTP-Job-Editor.md
+++ b/Documentation/User Manual/1-user-interface/D2_VTP-Job-Editor.md
@@ -6,12 +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](#xml-job-file-declaration-mode)) which defines all relevant parameters, including all components
 -   Driving Cycles
@@ -24,7 +23,7 @@ In engineering mode multiple driving cycles can be specified
 <div class="declaration">
 In declaration mode only the first given driving cycle is simulated as the results are further compared with the re-simulated results of the reference cycle. The reference cycle is the first driving cycle applicable for the actual vehicle group as listed in the Job Window and provided in the reports (i.e., LongHaul for most heavy lorries).
-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

--- a/Documentation/User Manual/5-input-and-output-files/VDRI.md
+++ b/Documentation/User Manual/5-input-and-output-files/VDRI.md
@@ -29,40 +29,51 @@ 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_<Fuel Type>, gear*
+Header: **\<t>, \<v>, \<n\_eng>,\<n\_fan>, \<Pel\_fan>, \<tq\_wh\_left>, \<tq\_wh\_right>, \<n\_wh\_left>, \<n\_wh\_right>, \<tq\_eng>, \<CO>, \<NOx>, \<PN>, \<CO2>***, \<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**.                                                                                                                                                                                                                    |
-| **tq_left**     | [Nm]     | The actual torque at the driven wheel (left side)                                                                                                                                                                                                                                                      |
+| **Pel_fan**    | [W]      | Electric cooling fan power. Mutually exclusive with **n_fan**.                                                                                                                                                                                                                                         |
-| **tq_right**    | [Nm]     | The actual torque at the driven wheel (left side)                                                                                                                                                                                                                                                      |
+| **tq_wh_left**    | [Nm]     | The actual torque at the driven wheel (left side)                                                                                                                                                                                                                                                      |
+| **tq_wh_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_<Fuel Type>*| [g/h]    | Fuel consumption, this column has to be provided for every fuel in case of dual-fuel vehicles                                                                                                                                                                                                          |
+| **tq_eng**     | [Nm]     | Engine torque                                                                                                                                                                                                                                                                                          |                 
-| *gear*          | [-]      | The actual gear                                                                                                                                                                                                                                                                                        |
+| **CO**         | [g/s]    | CO mass flow
+| **NOx**        | [g/s]    | NOx mass flow
+| **PN**         | [#/s]    | PM number flow
+| **CO2**		 | [g/s]    | CO2 mass 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_wh_left> [Nm] | \<tq_wh_right> [Nm] | \<n_wh_left> [rpm]  | \<n_wh_right> [rpm]  | \<tq\_eng> [Nm]  | \<CO> [g/s]  | \<CO2> [g/s]  | \<NOx> [g/s]  | \<THC> [g/s]  | \<PN> [#/s]  | \<fc_Diesel CI> [g/h]  | \<gear>  |
-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_Diesel CI [g/h] , gear
+| --------- | ------------ | --------------- | --------------- | ------------------ | ------------------- | ------------------- | -------------------- | -----------------|--------------|---------------|---------------|---------------|--------------| ---------------------- | -------- |	
-0                  , 0           , 599.7       , 727.3       , 319.1        , 429.8         , 0.78            , 0.78             , 836                , 3
+| 0         | 0            | 599.7           | 727.3           | 319.1              | 429.8               | 0.78                | 0.78                 | 219              | 1234         | 657           | 243           | 345           | 6544         | 836                    | 3        |
-0.5                , 0           , 600.2       , 727.3       , 316.7        , 430.0         , 0.78            , 0.78             , 836                , 3
+| 0.5       | 0            | 600.2           | 727.3           | 316.7              | 430.0               | 0.78                | 0.78                 | 219              | 1243         | 765           | 233           | 345           | 6544         | 836                    | 3        |
-1                  , 0           , 600.1       , 726.9       , 319.9        , 430.8         , 0.78            , 0.78             , 836                , 3
+| 1         | 0            | 600.1           | 726.9           | 319.9              | 430.8               | 0.78                | 0.78                 | 220              | 1211         | 345           | 244           | 344           | 5555         | 836                    | 3        |
-1.5                , 0           , 599.9       , 726.6       , 317.4        , 431.1         , 0.78            , 0.79             , 836                , 3
+| 1.5       | 0            | 599.9           | 726.6           | 317.4              | 431.1               | 0.78                | 0.79                 | 220              | 1222         | 445           | 233           | 455           | 4565         | 836                    | 3        |
-2                  , 0           , 600.1       , 726.2       , 319.5        , 421.7         , 0.78            , 0.78             , 836                , 3
+| 2         | 0            | 600.1           | 726.2           | 319.5              | 421.7               | 0.78                | 0.78                 | 220              | 1233         | 678           | 233           | 355           | 6555         | 836                    | 3        |
-2.5                , 0           , 599.7       , 726         , 319.0        , 434.1         , 0.78            , 0.78             , 836                , 3
+| 2.5       | 0            | 599.7           | 726             | 319.0              | 434.1               | 0.78                | 0.78                 | 220              | 1332         | 666           | 244           | 454           | 6555         | 836                    | 3        |
-3                  , 0           , 600.2       , 725.4       , 322.2        , 428.5         , 0.78            , 0.78             , 836                , 3
+| 3         | 0            | 600.2           | 725.4           | 322.2              | 428.5               | 0.78                | 0.78                 | 220              | 1223         | 888           | 243           | 544           | 4565         | 836                    | 3        |
-3.5                , 0           , 599.9       , 724.7       , 317.3        , 430.4         , 0.78            , 0.78             , 836                , 3
+| 3.5       | 0            | 599.9           | 724.7           | 317.3              | 430.4               | 0.78                | 0.78                 | 222              | 1144         | 456           | 322           | 345           | 6565         | 836                    | 3        |
-4                  , 0           , 599.5       , 724.0       , 320.9        , 428.0         , 0.78            , 0.78             , 836                , 3
+| 4         | 0            | 599.5           | 724.0           | 320.9              | 428.0               | 0.78                | 0.78                 | 223              | 1232         | 788           | 234           | 344           | 4566         | 836                    | 3        |
-4.5                , 0           , 599.9       , 723.4       , 187.0        , 247.6         , 0.78            , 0.78             , 836                , 3
+| 4.5       | 0            | 599.9           | 723.4           | 187.0              | 247.6               | 0.78                | 0.78                 | 222              | 1222         | 566           | 433           | 555           | 4566         | 836                    | 3        |
-5                  , 0           , 598.7       , 722.5       , 156.9        , 171.5         , 0.78            , 0.78             , 1003.2             , 3
+| 5         | 0            | 598.7           | 722.5           | 156.9              | 171.5               | 0.78                | 0.78                 | 218              | 1122         | 888           | 222           | 345           | 6565         | 1003.2                 | 3        |
-~~~
 ### Engineering Mode: Target-Speed, Distance-Based Cycle

--- a/Documentation/User Manual/5-input-and-output-files/VECTO-VTP.md
+++ b/Documentation/User Manual/5-input-and-output-files/VECTO-VTP.md
@@ -32,6 +32,18 @@ Refers to other files:
      108.5
    ],
    "FanDiameter": 0.225,
+    "FuelNCVs": [
+      {
+        "Type": "Diesel CI",
+        "NCV": 42.7
+      },
+      {
+        "Type": "NG CI",
+        "NCV": 48.0
+      }
+    ],
+    "TorqueDriftLeftWheel": 0.0,
+    "TorqueDriftRightWheel": 0.0,
    "Cycles": [
      "VTP-cycle.vdri"
    ]

--- a/Documentation/User Manual/6-changelog/changelog.md
+++ b/Documentation/User Manual/6-changelog/changelog.md
 # Changelog
+**VECTO-4.1.0-RC**
+***Build 3392 (2024-04-15)***
+- Features
+   * CodeEU-577: Add missing mission profiles to vocational and non-vocational
+- Bugfixes
+   * CodeEU-331: Gear 1 DrivingActionAccelerate: Fail
+   * CodeEU-367: Gear 1 DrivingActionAccelerate: Fail
+   * CodeEU-372: ADT Error on Bus Category Primary Vehicle Simulation on VECTO
+   * CodeEU-373: ADT Error on Bus Category Primary Vehicle Simulation on VECTO
+   * CodeEU-374: ADT Error on Bus Category Primary Vehicle Simulation on VECTO
+   * CodeEU-375: ADT Error on Bus Category Primary Vehicle Simulation on VECTO
+   * CodeEU-393: Finished Run VEH-PrimaryBus_nonSmart Interurban _P32SD_ReferenceLoad with ERROR: 16
+   * CodeEU-439: 615 (Interurban _P32DD_ReferenceLoad) - absTime: 7129.6359 [s], distance: 53875.9765 [m], dt: 0.6388 [s], v: 0.5098 [m/s], Gear: 1 | DrivingActionAccelerate: Failed
+   * CodeEU-446: Finished Run VEH-PrimaryBus_nonSmart Interurban _P32SD_ReferenceLoad with ERROR: 16
+   * CodeEU-449: Finished Run VEH-PrimaryBus_nonSmart Interurban _P32SD_ReferenceLoad with ERROR: 16
+   * CodeEU-478: Finished Run VEH-PrimaryBus_nonSmart Urban _P31SD_ReferenceLoad with ERROR: 4 (Urban _P31SD_ReferenceLoad) - absTime: 8606.6241 [s], distance: 39112.5127 [m], dt: 1.1131 [s], v: 0.1833 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating poi
+   * CodeEU-481: Finished Run VEH-PrimaryBus_nonSmart Urban _P31SD_ReferenceLoad with ERROR: 4 (Urban _P31SD_ReferenceLoad) - absTime: 8606.6241 [s], distance: 39112.5127 [m], dt: 1.1131 [s], v: 0.1833 [m/s], Gear: 1 |
+   * CodeEU-488: Finished Run VEH-PrimaryBus_nonSmart Urban _P31SD_ReferenceLoad with ERROR: 4 (Urban _P31SD_ReferenceLoad) - absTime: 8606.6241 [s], distance: 39112.5127 [m], dt: 1.1131 [s], v: 0.1833 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating poi
+   * CodeEU-494: Finished Run VEH-PrimaryBus_nonSmart Urban _P31SD_ReferenceLoad with ERROR: 26 (Urban _P31SD_ReferenceLoad) - absTime: 8606.6241 [s], distance: 39112.5127 [m], dt: 1.1131 [s], v: 0.1833 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to fi
+   * CodeEU-420: Finished Run VEH-PrimaryBus_nonSmart Interurban _P32SD_ReferenceLoad with ERROR: 16
+   * CodeEU-573: Unhandled powertrain architecture Conventional Vehicle to calculate gradability
+   * CodeEU-582: unhandled powertrain architecture ConventionalVehicle to calculate gradability, 11:44:36.63,
+   * CodeEU-595: Inconsistency exempted vehicles "Fuel cell vehicle" vs. "FCV Article 9 exempted"
+   * CodeEU-501: Help regarding VTP vdri format is not up to date in v4
+   * CodeEU-594: inadequate validation for auxiliaries in completed vehicle XML
+   * CodeEU-580: Potential error in XML schema v2.4 (exempted vehicles)
+   * CodeEU-551: Article-10-2 XLRASF5E00G419905
+   * CodeEU-547: Max ICE Off timespan for buses
+   * CodeEU-583: Incorrect internal resistance for SuperCap used in factor method
+   * CodeEU-571: Article10-2-issue | VECTO-4.0.3 | Order-Nr 28202896 | HEV P1 Error Mercedes-Benz and Setra Hybrid Buses
+   * CodeEU-526: VTP calculation aborted on fuel consumption map
+   * CodeEU-502: Error in VECTO calculation WMA10CZZ0RF022326
+   * CodeEU-401: Electric steering system with conventional vehicle not according to 2017/2400
+   * CodeEU-476: Setting Initial SoC in REESS editor leads to error
+   * CodeEU-533: Question about heavy lorry_IEPC_Gb×4speed: Failed to generate electric power map - at least two negative entries are required
+   * CodeEU-456: Clarification Documentation official Results
+   * CodeEU-506: Article 10(2) issue - VIN YS2P6X200R2201285
+   * CodeEU-507: Article 10(2) issue - VIN YS2P6X20005732399
+   * CodeEU-508: Article 10(2) issue - VIN S2P6X20005734199
+   * CodeEU-499: Object Reference not set Error
+   * CodeEU-546: Problem with P181 (Cooling Fan Technology) for a conventional vehicle
+   * CodeEU-516: Article10-2-issue | VECTO-4.0.3 | Order-Nr 28208044 | HEV P1 Error Mercedes-Benz and Setra Hybrid Buses
+   * CodeEU-517: Article10-2-issue | VECTO-4.0.3 | Order-Nr 28208037 | HEV P1 Error Mercedes-Benz and Setra Hybrid Buses
+   * CodeEU-519: Article10-2-issue | VECTO-4.0.3 | Order-Nr 10098181 | HEV P1 Error Mercedes-Benz and Setra Hybrid Buses
+   * CodeEU-527: Article10-2-issue | VECTO-4.0.3 | Order-Nr 28196233 | HEV P1 Error Mercedes-Benz and Setra Hybrid Buses
+   * CodeEU-528: Article10-2-issue | VECTO-4.0.3 | Order-Nr 28196652 | HEV P1 Error Mercedes-Benz and Setra Hybrid Buses
+   * CodeEU-338: Eco-roll only, without engine stop, impact on CO2 emission
+   * CodeEU-475: XML files loading in VTP Job not OK; No auxiliary data and torque curve visible, Job can't be saved in VECTO 4.0.3.3330
+   * CodeEU-610: VTP mode is broken due to changes in the Clutch component.
 **VECTO-4.0.3**
 ***Build 3330 (2024-02-13)***

--- a/Documentation/User Manual/help.html
+++ b/Documentation/User Manual/help.html
--- a/Documentation/User Manual/pics/VTP-Job.PNG
+++ b/Documentation/User Manual/pics/VTP-Job.PNG
--- a/Documentation/XML/Documentation_OfficialResults_2ndAmendment_20230425.xlsx
+++ b/Documentation/XML/Documentation_OfficialResults_2ndAmendment_20230425.xlsx
--- a/Generic Vehicles/Declaration Mode/VTP Truck/VTP.vecto
+++ b/Generic Vehicles/Declaration Mode/VTP Truck/VTP.vecto
@@ -8,7 +8,7 @@
  "Body": {
    "SavedInDeclMode": true,
    "DeclarationVehicle": "vehicle_sampleSingleModeDualFuel.xml",
-    "ManufacturerRecord": "vehicle_sampleSingleModeDualFuel.RSLT_MANUFACTURER.xml",
+    "ManufacturerRecord": "vehicle_sampleSingleModeDualFuel.MANUFACTURER.xml",
    "Mileage": 30000.0,
    "FanPowerCoefficients": [
      0.0,

--- a/Generic Vehicles/Declaration Mode/VTP Truck/vehicle_sampleSingleModeDualFuel.RSLT_MANUFACTURER.xml
+++ b/Generic Vehicles/Declaration Mode/VTP Truck/vehicle_sampleSingleModeDualFuel.RSLT_MANUFACTURER.xml
--- a/Generic Vehicles/Declaration Mode/xEV XML Jobs/PrimaryBuses/exempted_primary_heavyBus.xml
+++ b/Generic Vehicles/Declaration Mode/xEV XML Jobs/PrimaryBuses/exempted_primary_heavyBus.xml
@@ -21,6 +21,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass>
 		<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
 		<SumNetPower>350000</SumNetPower>
-		<Technology>Fuel cell vehicle</Technology>
+		<Technology>FCV Article 9 exempted</Technology>
 	</v2.0:Vehicle>
 </tns:VectoInputDeclaration>
--- a/NuGet.Config
+++ b/NuGet.Config
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -1421,13 +1421,11 @@ lbFound:
            Try
                Dim jobDataProvider As IInputDataProvider = JSONInputDataFactory.ReadComponentData(filePathOrType)
-                'Declaration is the base class for EngineeringJobInputData, hence is valid for both Eng. and Decl.
-                If jobType = Nothing Then jobType = TryCast(jobDataProvider, IDeclarationJobInputData).JobType
                Dim vtpEngineeringJob As IVTPEngineeringInputDataProvider = TryCast(jobDataProvider, IVTPEngineeringInputDataProvider)
                Dim vtpDeclarationJob As IVTPDeclarationInputDataProvider = TryCast(jobDataProvider, IVTPDeclarationInputDataProvider)
                If vtpEngineeringJob Is Nothing AndAlso vtpDeclarationJob Is Nothing Then
+                    If jobType = Nothing Then jobType = TryCast(jobDataProvider, IDeclarationJobInputData).JobType
                    ShowVectoJobForm(jobType)
                    VectoJobForm.VECTOload2Form(filePathOrType)
                Else

--- a/VECTO/GUI/VectoVTPJobForm.vb
+++ b/VECTO/GUI/VectoVTPJobForm.vb
@@ -207,7 +207,7 @@ Public Class VectoVTPJobForm
        'Files -----------------------------
        TbVEH.Text = GetRelativePath(inputData.JobInputData.Vehicle.DataSource.SourceFile, _basePath)
        tbManufacturerRecord.Text =
-            If(Cfg.DeclMode, GetRelativePath(inputData.JobInputData.ManufacturerReportInputData.Source, _basePath), "")
+            If(Cfg.DeclMode, inputData.JobInputData.ManufacturerReportInputData.Source, "")
        Dim auxInput As IAuxiliariesDeclarationInputData = inputData.JobInputData.Vehicle.Components.AuxiliaryInputData
@@ -408,6 +408,8 @@ Public Class VectoVTPJobForm
        ToolStripStatusLabelGEN.Text = ""
        _changed = False
        UpdatePic()
+        _tqDriftLeftTextbox.Text = "0"
+        _tqDriftRightTextbox.Text = "0"
    End Sub
    Private Sub DeclInit()
@@ -446,7 +448,7 @@ Public Class VectoVTPJobForm
        If File.Exists(vehicleFile) Then
            Try
                Dim inputData As IDeclarationInputDataProvider =
-                        _xmlInputReader.CreateDeclaration(XmlReader.Create(vehicleFile))
+                        _xmlInputReader.CreateDeclaration(vehicleFile, True)
                Dim auxiliaries As IList(Of IAuxiliaryDeclarationInputData) = inputData.JobInputData.Vehicle.Components.AuxiliaryInputData.Auxiliaries
@@ -495,7 +497,7 @@ Public Class VectoVTPJobForm
        If File.Exists(vehicleFile) Then
            Try
                Dim inputData As IDeclarationInputDataProvider =
-                        _xmlInputReader.CreateDeclaration(XmlReader.Create(vehicleFile))
+                        _xmlInputReader.CreateDeclaration(vehicleFile, True)
                Dim fuels As IList(Of IEngineFuelDeclarationInputData) =
                    inputData.JobInputData.Vehicle.Components.EngineInputData.EngineModes.First().Fuels
@@ -550,7 +552,7 @@ Public Class VectoVTPJobForm
        If File.Exists(vehicleFile) Then
            Try
                Dim inputData As IDeclarationInputDataProvider =
-                        _xmlInputReader.CreateDeclaration(XmlReader.Create(vehicleFile))
+                        _xmlInputReader.CreateDeclaration(vehicleFile, True)
                Dim auxInput As IAuxiliariesDeclarationInputData = inputData.JobInputData.Vehicle.Components.AuxiliaryInputData
                PopulateAuxiliaryList(auxInput)
            Catch
@@ -733,7 +735,7 @@ Public Class VectoVTPJobForm
        If File.Exists(vehicleFile) Then
            Try
                Dim inputData As IDeclarationInputDataProvider =
-                        _xmlInputReader.CreateDeclaration(XmlReader.Create(vehicleFile))
+                        _xmlInputReader.CreateDeclaration(vehicleFile, True)
                gearbox = inputData.JobInputData.Vehicle.Components.GearboxInputData
            Catch
            End Try
@@ -757,7 +759,7 @@ Public Class VectoVTPJobForm
        If File.Exists(vehicleFile) Then
            Try
                Dim inputData As IDeclarationInputDataProvider =
-                        _xmlInputReader.CreateDeclaration(XmlReader.Create(vehicleFile))
+                        _xmlInputReader.CreateDeclaration(vehicleFile, True)
                engine = inputData.JobInputData.Vehicle.Components.EngineInputData
            Catch
                Return
@@ -848,7 +850,7 @@ Public Class VectoVTPJobForm
        If File.Exists(vehicleFile) Then
            Try
                Dim inputData As IDeclarationInputDataProvider =
-                        _xmlInputReader.CreateDeclaration(XmlReader.Create(vehicleFile))
+                        _xmlInputReader.CreateDeclaration(vehicleFile, True)
                vehicle = inputData.JobInputData.Vehicle
            Catch
            End Try

--- a/VECTO/GUI/VehicleAuxiliariesDialog.vb
+++ b/VECTO/GUI/VehicleAuxiliariesDialog.vb
@@ -72,16 +72,20 @@ Public Class VehicleAuxiliariesDialog
 		If CbType.SelectedItem Is Nothing Then Exit Sub
-		dim batteryElectricAuxOnly = JobType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle, VectoSimulationJobType.IEPC_E)
        Select Case CbType.SelectedValue.ToString()
            Case VectoCore.Configuration.Constants.Auxiliaries.IDs.Fan
                CbTech.DataSource =
-					if(batteryElectricAuxOnly, DeclarationData.Fan.FullyElectricTechnologies(), DeclarationData.Fan.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
+                    DeclarationData.Fan.GetTechnologies().Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
            Case VectoCore.Configuration.Constants.Auxiliaries.IDs.SteeringPump
+                Dim batteryElectricAuxOnly = JobType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle, VectoSimulationJobType.IEPC_S, VectoSimulationJobType.SerialHybridVehicle)
                Dim notSteered = (New String() {AxleNotSteered}).Concat(If(batteryElectricAuxOnly, DeclarationData.SteeringPump.FullyElectricTechnologies(), DeclarationData.SteeringPump.GetTechnologies())).ToArray()
-				CbTech.DataSource =
+                Dim steeringTechs = If(
-				    If(batteryElectricAuxOnly,DeclarationData.SteeringPump.FullyElectricTechnologies() ,DeclarationData.SteeringPump.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
+                        batteryElectricAuxOnly,
+                        DeclarationData.SteeringPump.FullyElectricTechnologies(),
+                        DeclarationData.SteeringPump.GetTechnologies()
+                    )
+                CbTech.DataSource = steeringTechs.Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
                CbTech2.DataSource = notSteered.Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
                CbTech3.DataSource = notSteered.Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
                CbTech4.DataSource = notSteered.Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
@@ -94,7 +98,7 @@ Public Class VehicleAuxiliariesDialog
                    DeclarationData.ElectricSystem.GetTechnologies().Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
            Case VectoCore.Configuration.Constants.Auxiliaries.IDs.PneumaticSystem
                CbTech.DataSource =
-					if(batteryElectricAuxOnly, DeclarationData.PneumaticSystem.FullyElectricTechnologies(), DeclarationData.PneumaticSystem.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
+                    If(JobType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle), DeclarationData.PneumaticSystem.FullyElectricTechnologies(), DeclarationData.PneumaticSystem.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
        End Select
        If CbTech.Items.Count > 0 Then
 			'CbTech.SelectedIndex = 0

--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -1391,8 +1391,8 @@ Public Class VehicleForm
 			tbInitialSoC.Focus()
 			Return
 		End If
-        If Not 100 < Convert.ToInt32(tbInitialSoC.Text) Then
+        If 100 < Convert.ToInt32(tbInitialSoC.Text) Then
-            MsgBox("Input has to below 100")
+			MsgBox("Input has to be less than or equal to 100")
 			tbInitialSoC.Focus()
            Return
        End If

--- a/VECTO/Input Files/VectoEPTPJob.vb
+++ b/VECTO/Input Files/VectoEPTPJob.vb
@@ -122,7 +122,7 @@ Public Class VectoVTPJob
        Get
            If Not File.Exists(_vehicleFile.FullPath) Then Return Nothing
            'Return New JSONComponentInputData(_vehicleFile.FullPath).JobInputData.Vehicle
-            Return _xmlInputReader.CreateDeclaration(_vehicleFile.FullPath).JobInputData.Vehicle
+            Return _xmlInputReader.CreateDeclaration(_vehicleFile.FullPath, True).JobInputData.Vehicle
        End Get
    End Property

--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs