diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index 9938ccd2205ae0dde59d0579f83b3a9c361f9b77..551faa4fe7efbd5f526783283063a1299f5bcf63 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -104,7 +104,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
foreach (var mission in segment.Missions) {
if (mission.MissionType.IsEMS() &&
- engineData.FullLoadCurves[0].MaxPower.IsSmaller(DeclarationData.MinEnginePowerForEMS)) {
+ engineData.RatedPowerDeclared.IsSmaller(DeclarationData.MinEnginePowerForEMS)) {
continue;
}
DrivingCycleData cycle;
diff --git a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.veng b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.veng
index dd2d8f88db32c1b1e066751efabdfe651f53105a..7b8ba5dd5ca1cc56b99fe2b46ee41df3c99016b7 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.veng
+++ b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.veng
@@ -1,20 +1,27 @@
{
"Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
- "Date": "25.06.2015 09:02:39",
- "AppVersion": "2.2 beta",
- "FileVersion": 3
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "25.06.2015 09:02:39",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 4
},
"Body": {
- "SavedInDeclMode": true,
- "ModelName": "Generic 40t Long Haul Truck",
- "Displacement": 12730.0,
- "IdlingSpeed": 560.0,
- "Inertia": 5.1471,
- "FullLoadCurve": "40t_Long_Haul_Truck.vfld",
- "FuelMap": "40t_Long_Haul_Truck.vmap",
- "WHTC-Urban": 0.97,
- "WHTC-Rural": 0.99,
- "WHTC-Motorway": 1.02
+ "SavedInDeclMode": true,
+ "ModelName": "Generic 40t Long Haul Truck",
+ "Displacement": 12730.0,
+ "IdlingSpeed": 560.0,
+ "Inertia": 5.1471,
+ "FullLoadCurve": "40t_Long_Haul_Truck.vfld",
+ "FuelMap": "40t_Long_Haul_Truck.vmap",
+ "WHTC-Urban": 0.97,
+ "WHTC-Rural": 0.99,
+ "WHTC-Motorway": 1.02,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.00,
+ "CFNCF": 1.00,
+ "FuelType": "Diesel CI",
+ "RatedPower": 320000,
+ "RatedSpeed": 2400,
+ "MaxTorque": 2300
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.veng
index 9e6e6dd015d2d279b8e5fc94a4c5f34b1cf086aa..dd15bf5fad316b613b9e05fddf85c468906db660 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.veng
@@ -1,20 +1,27 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "10/6/2015 3:15:22 PM",
- "AppVersion": "2.2",
- "FileVersion": 3
+ "CreatedBy": " ()",
+ "Date": "10/6/2015 3:15:22 PM",
+ "AppVersion": "2.2",
+ "FileVersion": 4
},
"Body": {
- "SavedInDeclMode": true,
- "ModelName": "Generic 40t Long Haul Truck",
- "Displacement": 12730.0,
- "IdlingSpeed": 560.0,
- "Inertia": 5.1471,
- "FullLoadCurve": "40t_Long_Haul_Truck.vfld",
- "FuelMap": "40t_Long_Haul_Truck.vmap",
- "WHTC-Urban": 0.97,
- "WHTC-Rural": 0.99,
- "WHTC-Motorway": 1.02
+ "SavedInDeclMode": true,
+ "ModelName": "Generic 40t Long Haul Truck",
+ "Displacement": 12730.0,
+ "IdlingSpeed": 560.0,
+ "Inertia": 5.1471,
+ "FullLoadCurve": "40t_Long_Haul_Truck.vfld",
+ "FuelMap": "40t_Long_Haul_Truck.vmap",
+ "WHTC-Urban": 0.97,
+ "WHTC-Rural": 0.99,
+ "WHTC-Motorway": 1.02,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.00,
+ "CFNCF": 1.00,
+ "FuelType": "Diesel CI",
+ "RatedPower": 320000,
+ "RatedSpeed": 2400,
+ "MaxTorque": 2300
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
index 4bdfc0cdfcdcc4fd2b19f656c1e37cad41fa648d..20f5fdd7917eb2be9aeac1846be1e568d16881bf 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
@@ -1,21 +1,27 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T10:08:08.3476564Z",
- "AppVersion": "3",
- "FileVersion": 3
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T10:08:08.3476564Z",
+ "AppVersion": "3",
+ "FileVersion": 4
},
"Body": {
- "SavedInDeclMode": true,
- "ModelName": "325kW 12.7l Engine",
- "Displacement": "12740",
- "IdlingSpeed": 600.0,
- "Inertia": 5.1498,
- "FullLoadCurve": "325kW.vfld",
- "FuelMap": "325kW.vmap",
- "WHTC-Urban": 1.04,
- "WHTC-Rural": 1.01,
- "WHTC-Motorway": 1.00,
- "ColdHotBalancingFactor": 1.0
+ "SavedInDeclMode": true,
+ "ModelName": "325kW 12.7l Engine",
+ "Displacement": "12740",
+ "IdlingSpeed": 600.0,
+ "Inertia": 5.1498,
+ "FullLoadCurve": "325kW.vfld",
+ "FuelMap": "325kW.vmap",
+ "WHTC-Urban": 1.04,
+ "WHTC-Rural": 1.01,
+ "WHTC-Motorway": 1.00,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.00,
+ "CFNCF": 1.00,
+ "FuelType": "Diesel CI",
+ "RatedPower": 325000,
+ "RatedSpeed": 2400,
+ "MaxTorque": 2300
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
index 9c995ff80fd7f9212a3f0e162b74a3f2fcd27894..7f514c06ca203d770278cf1d1e11d8086ea75c1c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
@@ -1,22 +1,28 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2017-05-19T08:13:02.2025457Z",
- "AppVersion": "3",
- "FileVersion": 3
+ "CreatedBy": " ()",
+ "Date": "2017-05-19T08:13:02.2025457Z",
+ "AppVersion": "3",
+ "FileVersion": 4
},
"Body": {
- "SavedInDeclMode": true,
- "ModelName": "324kW 7l Engine",
- "Displacement": "7000",
- "IdlingSpeed": 600.0,
- "Inertia": 3.6,
- "FullLoadCurve": "324kW.vfld",
- "FuelMap": "350kW.vmap",
- "WHTC-Urban": 1.0,
- "WHTC-Rural": 1.0,
- "WHTC-Motorway": 1.0,
- "WHTC-Engineering": 1.0,
- "ColdHotBalancingFactor": 1.0
+ "SavedInDeclMode": true,
+ "ModelName": "324kW 7l Engine",
+ "Displacement": "7000",
+ "IdlingSpeed": 600.0,
+ "Inertia": 3.6,
+ "FullLoadCurve": "324kW.vfld",
+ "FuelMap": "350kW.vmap",
+ "WHTC-Urban": 1.0,
+ "WHTC-Rural": 1.0,
+ "WHTC-Motorway": 1.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.00,
+ "CFNCF": 1.00,
+ "FuelType": "Diesel CI",
+ "RatedPower": 320000,
+ "RatedSpeed": 2400,
+ "MaxTorque": 2300
}
}
\ No newline at end of file