From 82ddb5f138cf6b9db0f95b51713d0e56918454f8 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 3 Dec 2019 18:07:01 +0100
Subject: [PATCH] open and save dual fuel and whr declaration models in gui
---
.../Class9_RigidTruck_6x2/AMT_12.vgbx | 2 +-
.../Class9_RigidTruck.vveh | 2 +-
.../Class9_RigidTruck_DECL_DF.vecto | 10 ++--
.../Class9_RigidTruck_DECL_DF_WHR.vecto | 10 ++--
.../Class9_RigidTruck_DECL_WHR.vecto | 10 ++--
.../Engine_324kW_12.7l_DF.veng | 53 ++++++++---------
.../Engine_324kW_12.7l_DF_WHR.veng | 58 +++++++++----------
.../Engine_324kW_12.7l_WHR.veng | 41 +++++++------
8 files changed, 92 insertions(+), 94 deletions(-)
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx
index f89e0e79c1..e86cd7659f 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2019-12-03T16:13:52.1680515Z",
+ "Date": "2019-12-03T17:04:49.2328699Z",
"AppVersion": "3",
"FileVersion": 6
},
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
index aab1eb839d..33078ffdde 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2019-12-03T16:13:45.7578732Z",
+ "Date": "2019-12-03T17:04:41.4052976Z",
"AppVersion": "3",
"FileVersion": 8
},
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_DF.vecto b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_DF.vecto
index b70acfa855..0f8b84a958 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_DF.vecto
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_DF.vecto
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2017-05-19T08:36:57.2458195Z",
+ "CreatedBy": "",
+ "Date": "2019-12-03T17:03:52.3000074Z",
"AppVersion": "3",
- "FileVersion": 3
+ "FileVersion": 5
},
"Body": {
"SavedInDeclMode": true,
@@ -11,6 +11,7 @@
"VehicleFile": "Class9_RigidTruck.vveh",
"EngineFile": "Engine_324kW_12.7l_DF.veng",
"GearboxFile": "AMT_12.vgbx",
+ "ShiftStrategy": "",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
@@ -54,8 +55,7 @@
"OverSpeedEcoRoll": {
"Mode": "Overspeed",
"MinSpeed": 50.0,
- "OverSpeed": 5.0,
- "UnderSpeed": 5.0
+ "OverSpeed": 2.5
}
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_DF_WHR.vecto b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_DF_WHR.vecto
index 59442de21b..37b17920e5 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_DF_WHR.vecto
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_DF_WHR.vecto
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2017-05-19T08:36:57.2458195Z",
+ "CreatedBy": "",
+ "Date": "2019-12-03T17:04:34.6524681Z",
"AppVersion": "3",
- "FileVersion": 3
+ "FileVersion": 5
},
"Body": {
"SavedInDeclMode": true,
@@ -11,6 +11,7 @@
"VehicleFile": "Class9_RigidTruck.vveh",
"EngineFile": "Engine_324kW_12.7l_DF_WHR.veng",
"GearboxFile": "AMT_12.vgbx",
+ "ShiftStrategy": "",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
@@ -54,8 +55,7 @@
"OverSpeedEcoRoll": {
"Mode": "Overspeed",
"MinSpeed": 50.0,
- "OverSpeed": 5.0,
- "UnderSpeed": 5.0
+ "OverSpeed": 2.5
}
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_WHR.vecto b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_WHR.vecto
index 6f2b6176a8..0789414ce5 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_WHR.vecto
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL_WHR.vecto
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2017-05-19T08:36:57.2458195Z",
+ "CreatedBy": "",
+ "Date": "2019-12-03T17:04:58.1293371Z",
"AppVersion": "3",
- "FileVersion": 3
+ "FileVersion": 5
},
"Body": {
"SavedInDeclMode": true,
@@ -11,6 +11,7 @@
"VehicleFile": "Class9_RigidTruck.vveh",
"EngineFile": "Engine_324kW_12.7l_WHR.veng",
"GearboxFile": "AMT_12.vgbx",
+ "ShiftStrategy": "",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
@@ -54,8 +55,7 @@
"OverSpeedEcoRoll": {
"Mode": "Overspeed",
"MinSpeed": 50.0,
- "OverSpeed": 5.0,
- "UnderSpeed": 5.0
+ "OverSpeed": 2.5
}
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_DF.veng b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_DF.veng
index bdb47da32a..9aec034242 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_DF.veng
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_DF.veng
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2017-06-22T11:15:58.5117543Z",
+ "Date": "2019-12-03T17:03:35.7974084Z",
"AppVersion": "3",
"FileVersion": 5
},
@@ -12,33 +12,34 @@
"IdlingSpeed": 600.0,
"Inertia": 3.6,
"Fuels": [
- {
- "WHTC-Urban": 1.0,
- "WHTC-Rural": 1.0,
- "WHTC-Motorway": 1.0,
- "WHTC-Engineering": 1.0,
- "ColdHotBalancingFactor": 1.0,
- "CFRegPer": 1.0,
- "CFNCV": 1.0,
- "FuelMap": "350kW.vmap",
- "FuelType": "DieselCI"
- },
- {
- "WHTC-Urban": 1.0,
- "WHTC-Rural": 1.0,
- "WHTC-Motorway": 1.0,
- "WHTC-Engineering": 1.0,
- "ColdHotBalancingFactor": 1.0,
- "CFRegPer": 1.0,
- "CFNCV": 1.0,
- "FuelMap": "350kW_DF.vmap",
- "FuelType": "EthanolPI"
- }
- ],
- "FullLoadCurve": "324kW.vfld",
+ {
+ "WHTC-Urban": 1.0,
+ "WHTC-Rural": 1.0,
+ "WHTC-Motorway": 1.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "350kW.vmap",
+ "FuelType": "DieselCI"
+ },
+ {
+ "WHTC-Urban": 1.0,
+ "WHTC-Rural": 1.0,
+ "WHTC-Motorway": 1.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "350kW_DF.vmap",
+ "FuelType": "EthanolPI"
+ }
+ ],
"RatedPower": 324000.0,
"RatedSpeed": 1600.0,
"MaxTorque": 2300.0,
-
+ "FullLoadCurve": "324kW.vfld",
+ "WHRType": [
+ "None"
+ ],
+ "WHRCorrectionFactors": {}
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_DF_WHR.veng b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_DF_WHR.veng
index 55fec15af4..9f0ded69f0 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_DF_WHR.veng
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_DF_WHR.veng
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2017-06-22T11:15:58.5117543Z",
+ "Date": "2019-12-03T17:04:24.0684048Z",
"AppVersion": "3",
"FileVersion": 5
},
@@ -12,44 +12,42 @@
"IdlingSpeed": 600.0,
"Inertia": 3.6,
"Fuels": [
- {
- "WHTC-Urban": 1.0,
- "WHTC-Rural": 1.0,
- "WHTC-Motorway": 1.0,
- "WHTC-Engineering": 1.0,
- "ColdHotBalancingFactor": 1.0,
- "CFRegPer": 1.0,
- "CFNCV": 1.0,
- "FuelMap": "350kW_WHR_mech.vmap",
- "FuelType": "DieselCI"
- },
- {
- "WHTC-Urban": 1.0,
- "WHTC-Rural": 1.0,
- "WHTC-Motorway": 1.0,
- "WHTC-Engineering": 1.0,
- "ColdHotBalancingFactor": 1.0,
- "CFRegPer": 1.0,
- "CFNCV": 1.0,
- "FuelMap": "350kW_DF.vmap",
- "FuelType": "EthanolPI"
- }
- ],
- "FullLoadCurve": "324kW.vfld",
+ {
+ "WHTC-Urban": 1.0,
+ "WHTC-Rural": 1.0,
+ "WHTC-Motorway": 1.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "350kW_WHR_mech.vmap",
+ "FuelType": "DieselCI"
+ },
+ {
+ "WHTC-Urban": 1.0,
+ "WHTC-Rural": 1.0,
+ "WHTC-Motorway": 1.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "350kW_DF.vmap",
+ "FuelType": "EthanolPI"
+ }
+ ],
"RatedPower": 324000.0,
"RatedSpeed": 1600.0,
"MaxTorque": 2300.0,
+ "FullLoadCurve": "324kW.vfld",
"WHRType": [
- "MechanicalOutputDrivetrain"
- ],
- "WHRCorrectionFactors": {
- "Electrical": {
+ "MechanicalOutputDrivetrain"
+ ],
+ "WHRCorrectionFactors": {
+ "Mechanical": {
"Urban": 1.0,
"Rural": 1.0,
"Motorway": 1.0,
"ColdHotBalancingFactor": 1.0,
"CFRegPer": 1.0,
- "EngineeringCorrectionFactor": 1.02
+ "EngineeringCorrectionFactor": 0.0
}
}
}
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_WHR.veng b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_WHR.veng
index 1c38ad17aa..db08a08dde 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_WHR.veng
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l_WHR.veng
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2017-06-22T11:15:58.5117543Z",
+ "Date": "2019-12-03T17:04:44.5660016Z",
"AppVersion": "3",
"FileVersion": 5
},
@@ -11,34 +11,33 @@
"Displacement": "7000",
"IdlingSpeed": 600.0,
"Inertia": 3.6,
- "Fuels": [
- {
- "WHTC-Urban": 1.0,
- "WHTC-Rural": 1.0,
- "WHTC-Motorway": 1.0,
- "WHTC-Engineering": 1.0,
- "ColdHotBalancingFactor": 1.0,
- "CFRegPer": 1.0,
- "CFNCV": 1.0,
- "FuelMap": "350kW_WHR.vmap",
- "FuelType": "DieselCI"
- }
- ],
- "FullLoadCurve": "324kW.vfld",
- "RatedPower": 324000.0,
+ "Fuels": [
+ {
+ "WHTC-Urban": 1.0,
+ "WHTC-Rural": 1.0,
+ "WHTC-Motorway": 1.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "350kW_WHR.vmap",
+ "FuelType": "DieselCI"
+ }
+ ],
+ "RatedPower": 324000.0,
"RatedSpeed": 1600.0,
"MaxTorque": 2300.0,
- "WHRType": [
- "ElectricalOutput"
- ],
- "WHRCorrectionFactors": {
+ "FullLoadCurve": "324kW.vfld",
+ "WHRType": [
+ "ElectricalOutput"
+ ],
+ "WHRCorrectionFactors": {
"Electrical": {
"Urban": 1.0,
"Rural": 1.0,
"Motorway": 1.0,
"ColdHotBalancingFactor": 1.0,
"CFRegPer": 1.0,
- "EngineeringCorrectionFactor": 1.02
+ "EngineeringCorrectionFactor": 0.0
}
}
}
--
GitLab