From 5d23b7f189def57992e7dbeeab892ddaa57b2718 Mon Sep 17 00:00:00 2001
From: Raphael Luz <luz@ivt.tugraz.at>
Date: Thu, 25 Jun 2015 11:35:26 +0200
Subject: [PATCH] - Updated Generic Vehicles to new file formats
---
.../12t Delivery Truck.veng | 6 ++--
.../40t_Long_Haul_Truck.veng | 8 ++---
.../Engineering Mode/24t Coach/24t Coach.veng | 15 +++------
.../Engineering Mode/24t Coach/24t Coach.vgbx | 32 ++++++++++++-------
.../24t Coach/Direct Gear.vtlm | 22 ++++++-------
.../24t Coach/Indirect Gear.vtlm | 22 ++++++-------
.../AT-TC Demo Vehicle/Engine.veng | 13 +++-----
.../AT-TC Demo Vehicle/Gearbox.vgbx | 18 +++++++----
8 files changed, 69 insertions(+), 67 deletions(-)
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng
index 2fe4c0c77d..96d53aa5f1 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
- "Date": "24.06.2015 09:20:06",
+ "Date": "25.06.2015 08:59:55",
"AppVersion": "2.2 beta",
"FileVersion": 3
},
@@ -13,8 +13,8 @@
"Inertia": 3.789,
"FullLoadCurve": "12t Delivery Truck.vfld",
"FuelMap": "12t Delivery Truck.vmap",
- "WHTC-Urban": 1.03,
- "WHTC-Rural": 1.02,
+ "WHTC-Urban": 0.99,
+ "WHTC-Rural": 0.99,
"WHTC-Motorway": 1.01
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng
index 38c83945d7..dd2d8f88db 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
- "Date": "24.06.2015 09:43:47",
+ "Date": "25.06.2015 09:02:39",
"AppVersion": "2.2 beta",
"FileVersion": 3
},
@@ -13,8 +13,8 @@
"Inertia": 5.1471,
"FullLoadCurve": "40t_Long_Haul_Truck.vfld",
"FuelMap": "40t_Long_Haul_Truck.vmap",
- "WHTC-Urban": 1.05,
- "WHTC-Rural": 1.02,
- "WHTC-Motorway": 1.03
+ "WHTC-Urban": 0.97,
+ "WHTC-Rural": 0.99,
+ "WHTC-Motorway": 1.02
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng
index 45a0b3979f..d93e66348b 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng
+++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
- "Date": "29.07.2014 16:59:15",
- "AppVersion": "2.0.4-beta",
- "FileVersion": 2
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "25.06.2015 11:23:22",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": false,
@@ -11,12 +11,7 @@
"Displacement": 12730.0,
"IdlingSpeed": 560.0,
"Inertia": 3.8,
- "FullLoadCurves": [
- {
- "Path": "24t Coach.vfld",
- "Gears": "0 - 99"
- }
- ],
+ "FullLoadCurve": "24t Coach.vfld",
"FuelMap": "24t Coach.vmap",
"WHTC-Urban": 0.0,
"WHTC-Rural": 0.0,
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx
index 4fdb98db9e..88dc64fa30 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx
+++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
- "Date": "29.07.2014 16:59:17",
- "AppVersion": "2.0.4-beta",
- "FileVersion": 4
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "25.06.2015 11:23:31",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 5
},
"Body": {
"SavedInDeclMode": false,
@@ -19,49 +19,57 @@
"Ratio": 6.38,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "ShiftPolygons.vgbs"
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 4.63,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "ShiftPolygons.vgbs"
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 3.44,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "ShiftPolygons.vgbs"
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 2.59,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "ShiftPolygons.vgbs"
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.86,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "ShiftPolygons.vgbs"
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.35,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "ShiftPolygons.vgbs"
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.0,
"LossMap": "Direct Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "ShiftPolygons.vgbs"
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 0.76,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "ShiftPolygons.vgbs"
+ "ShiftPolygon": "ShiftPolygons.vgbs",
+ "FullLoadCurve": "<NOFILE>"
}
],
"TqReserve": 20.0,
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm b/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm
index f01578ad9e..b9f1d570fd 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm
+++ b/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
0,1850,14.31,
0,2050,15.31,
0,2250,16.31,
-0,2450,17.31,
+0,2700,17.31,
200,-350,7.822,
200,-150,6.822,
200,50,6.322,
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
200,1850,15.322,
200,2050,16.322,
200,2250,17.322,
-200,2450,18.322,
+200,2700,18.322,
400,-350,8.834,
400,-150,7.834,
400,50,7.334,
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
400,1850,16.334,
400,2050,17.334,
400,2250,18.334,
-400,2450,19.334,
+400,2700,19.334,
600,-350,9.846,
600,-150,8.846,
600,50,8.346,
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
600,1850,17.346,
600,2050,18.346,
600,2250,19.346,
-600,2450,20.346,
+600,2700,20.346,
800,-350,10.858,
800,-150,9.858,
800,50,9.358,
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
800,1850,18.358,
800,2050,19.358,
800,2250,20.358,
-800,2450,21.358,
+800,2700,21.358,
1000,-350,11.87,
1000,-150,10.87,
1000,50,10.37,
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1000,1850,19.37,
1000,2050,20.37,
1000,2250,21.37,
-1000,2450,22.37,
+1000,2700,22.37,
1200,-350,12.882,
1200,-150,11.882,
1200,50,11.382,
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1200,1850,20.382,
1200,2050,21.382,
1200,2250,22.382,
-1200,2450,23.382,
+1200,2700,23.382,
1400,-350,13.894,
1400,-150,12.894,
1400,50,12.394,
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1400,1850,21.394,
1400,2050,22.394,
1400,2250,23.394,
-1400,2450,24.394,
+1400,2700,24.394,
1600,-350,14.906,
1600,-150,13.906,
1600,50,13.406,
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1600,1850,22.406,
1600,2050,23.406,
1600,2250,24.406,
-1600,2450,25.406,
+1600,2700,25.406,
1800,-350,15.918,
1800,-150,14.918,
1800,50,14.418,
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1800,1850,23.418,
1800,2050,24.418,
1800,2250,25.418,
-1800,2450,26.418,
+1800,2700,26.418,
2000,-350,16.93,
2000,-150,15.93,
2000,50,15.43,
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
2000,1850,24.43,
2000,2050,25.43,
2000,2250,26.43,
-2000,2450,27.43,
+2000,2700,27.43,
0,-1000,10.06,
200,-1000,11.072,
400,-1000,12.084,
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm b/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm
index 90e4beee5b..900961da99 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm
+++ b/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
0,1850,42.06,
0,2050,46.06,
0,2250,50.06,
-0,2450,54.06,
+0,2700,54.06,
200,-350,13.072,
200,-150,9.072,
200,50,7.072,
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
200,1850,43.072,
200,2050,47.072,
200,2250,51.072,
-200,2450,55.072,
+200,2700,55.072,
400,-350,14.084,
400,-150,10.084,
400,50,8.084,
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
400,1850,44.084,
400,2050,48.084,
400,2250,52.084,
-400,2450,56.084,
+400,2700,56.084,
600,-350,15.096,
600,-150,11.096,
600,50,9.096,
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
600,1850,45.096,
600,2050,49.096,
600,2250,53.096,
-600,2450,57.096,
+600,2700,57.096,
800,-350,16.108,
800,-150,12.108,
800,50,10.108,
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
800,1850,46.108,
800,2050,50.108,
800,2250,54.108,
-800,2450,58.108,
+800,2700,58.108,
1000,-350,17.12,
1000,-150,13.12,
1000,50,11.12,
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1000,1850,47.12,
1000,2050,51.12,
1000,2250,55.12,
-1000,2450,59.12,
+1000,2700,59.12,
1200,-350,18.132,
1200,-150,14.132,
1200,50,12.132,
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1200,1850,48.132,
1200,2050,52.132,
1200,2250,56.132,
-1200,2450,60.132,
+1200,2700,60.132,
1400,-350,19.144,
1400,-150,15.144,
1400,50,13.144,
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1400,1850,49.144,
1400,2050,53.144,
1400,2250,57.144,
-1400,2450,61.144,
+1400,2700,61.144,
1600,-350,20.156,
1600,-150,16.156,
1600,50,14.156,
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1600,1850,50.156,
1600,2050,54.156,
1600,2250,58.156,
-1600,2450,62.156,
+1600,2700,62.156,
1800,-350,21.168,
1800,-150,17.168,
1800,50,15.168,
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1800,1850,51.168,
1800,2050,55.168,
1800,2250,59.168,
-1800,2450,63.168,
+1800,2700,63.168,
2000,-350,22.18,
2000,-150,18.18,
2000,50,16.18,
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
2000,1850,52.18,
2000,2050,56.18,
2000,2250,60.18,
-2000,2450,64.18,
+2000,2700,64.18,
0,-1000,25.06,
200,-1000,26.072,
400,-1000,27.084,
diff --git a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng
index 80aa1489f0..87cae4ef3a 100644
--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng
@@ -1,9 +1,9 @@
{
"Header": {
"CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
- "Date": "22.04.2015 15:19:42",
- "AppVersion": "2.1",
- "FileVersion": 2
+ "Date": "25.06.2015 11:23:46",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": false,
@@ -11,12 +11,7 @@
"Displacement": 7700.0,
"IdlingSpeed": 600.0,
"Inertia": 3.8,
- "FullLoadCurves": [
- {
- "Path": "FullLoad.vfld",
- "Gears": "0-99"
- }
- ],
+ "FullLoadCurve": "FullLoad.vfld",
"FuelMap": "FCMap.vmap",
"WHTC-Urban": 0.0,
"WHTC-Rural": 0.0,
diff --git a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx
index 8d2b9a1a42..acac788219 100644
--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx
@@ -1,9 +1,9 @@
{
"Header": {
"CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
- "Date": "22.04.2015 15:19:44",
- "AppVersion": "2.1",
- "FileVersion": 4
+ "Date": "25.06.2015 11:23:52",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 5
},
"Body": {
"SavedInDeclMode": false,
@@ -19,25 +19,29 @@
"Ratio": 3.0,
"Efficiency": "0.96",
"TCactive": true,
- "ShiftPolygon": "AT-Shift.vgbs"
+ "ShiftPolygon": "AT-Shift.vgbs",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 3.0,
"Efficiency": "0.96",
"TCactive": false,
- "ShiftPolygon": "AT-Shift.vgbs"
+ "ShiftPolygon": "AT-Shift.vgbs",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.0,
"Efficiency": "0.98",
"TCactive": false,
- "ShiftPolygon": "AT-Shift.vgbs"
+ "ShiftPolygon": "AT-Shift.vgbs",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 0.8,
"Efficiency": "0.96",
"TCactive": false,
- "ShiftPolygon": "AT-Shift.vgbs"
+ "ShiftPolygon": "AT-Shift.vgbs",
+ "FullLoadCurve": "<NOFILE>"
}
],
"TqReserve": 5.0,
--
GitLab