From fc929e54a70713140f6246807e4b5711f43e9483 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Thu, 16 Feb 2023 09:58:01 +0100
Subject: [PATCH] update testcase generic E2 vehicle as saved in GUI, extend
gear 1 los map to higher speeds
---
.../GenericVehicleE2/BEV_E2_Cont30kW.vecto | 41 +----
.../BatteryElectricVehicle_Cont30kW.vveh | 156 ++++++++----------
.../JSON/PEV/GenericVehicleE2/Gear_1.vtlm | 31 +++-
.../GenericEMotor_125kW_485Nm_Cont30kW.vem | 8 +-
4 files changed, 116 insertions(+), 120 deletions(-)
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BEV_E2_Cont30kW.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BEV_E2_Cont30kW.vecto
index f4f0f6f1d5..bbe627beff 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BEV_E2_Cont30kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BEV_E2_Cont30kW.vecto
@@ -1,45 +1,15 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:55:18.2100810Z",
+ "CreatedBy": "",
+ "Date": "2023-02-16T07:50:58.3892306Z",
"AppVersion": "3",
"FileVersion": 9
},
"Body": {
"SavedInDeclMode": true,
- "EngineOnlyMode": false,
"VehicleFile": "BatteryElectricVehicle_Cont30kW.vveh",
"GearboxFile": "AMT.vgbx",
- "TCU": "AMT.vgbx",
"Padd_electric": 0.0,
-
- "VACC": "Truck.vacc",
-
- "LAC": {
- "Enabled": true,
- "PreviewDistanceFactor": 10.0,
- "DF_offset": 2.5,
- "DF_scaling": 1.5,
- "DF_targetSpeedLookup": "",
- "Df_velocityDropLookup": ""
- },
- "OverSpeedEcoRoll": {
- "Mode": "Off",
- "MinSpeed": 50.0,
- "OverSpeed": 5.0,
- "UnderSpeed": 5.0
- },
- "Cycles": [
- "LongHaul",
- "Coach",
- "Construction",
- "HeavyUrban",
- "Interurban",
- "RegionalDelivery",
- "Suburban",
- "Urban",
- "UrbanDelivery"
- ],
"Aux": [
{
"ID": "STP",
@@ -70,5 +40,10 @@
]
}
],
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 2.5
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh
index b2712b0384..dff42db479 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh
@@ -1,84 +1,74 @@
-{
- "Header": {
- "CreatedBy": "",
- "Date": "2017-07-13T14:14:29.3226830Z",
- "AppVersion": "3",
- "FileVersion": 10
- },
- "Body": {
- "SavedInDeclMode": true,
- "VehCat": "RigidTruck",
- "LegislativeClass": "N3",
- "CurbWeight": 4670.0,
- "CurbWeightExtra": 1900.0,
- "Loading": 3020.0,
- "MassMax": 11.99,
- "rdyn": 421.0,
- "PowertrainConfiguration": "BatteryElectric",
- "CdCorrMode": "CdofVdecl",
- "CdCorrFile": "",
- "ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 2,
- "MechanicalEfficiency": 0.97,
- "Position": "B2",
- "MotorFile": "GenericEMotor_125kW_485Nm_Cont30kW.vem"
- }
- ],
- "Battery": {
- "NumPacks": 2,
- "BatteryFile": "GenericBattery_243kWh_750V.vbat"
- },
- "InitialSoC": 80,
- "TorqueLimits": {},
- "IdlingSpeed": 0.0,
- "AxleConfig": {
- "Type": "4x2",
- "Axles": [
- {
- "Inertia": 6.5,
- "Wheels": "265/70 R19.5",
- "AxleWeightShare": 0.2,
- "TwinTyres": false,
- "RRCISO": 0.0065,
- "FzISO": 20850.0,
- "Type": "VehicleNonDriven"
- },
- {
- "Inertia": 6.5,
- "Wheels": "265/70 R19.5",
- "AxleWeightShare": 0.3,
- "TwinTyres": true,
- "RRCISO": 0.0075,
- "FzISO": 20850.0,
- "Type": "VehicleDriven"
- },
- {
- "Inertia": 4.5,
- "Wheels": "235/75 R17.5",
- "AxleWeightShare": 0.25,
- "TwinTyres": false,
- "RRCISO": 0.0055,
- "FzISO": 16680.0,
- "Type": "VehicleNonDriven"
- },
- {
- "Inertia": 4.5,
- "Wheels": "235/75 R17.5",
- "AxleWeightShare": 0.25,
- "TwinTyres": false,
- "RRCISO": 0.0055,
- "FzISO": 16680.0,
- "Type": "VehicleNonDriven"
- }
- ]
- },
- "EngineStopStart": true,
- "EcoRoll": "None",
- "PredictiveCruiseControl": "None",
- "ATEcoRollReleaseLockupClutch": false,
- "CdA": 4.83,
- "VehicleHeight": 3.0
- }
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2023-02-16T07:20:57.7541991Z",
+ "AppVersion": "3",
+ "FileVersion": 10
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "N3",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 0.0,
+ "MassMax": 11.99,
+ "Loading": 0.0,
+ "rdyn": 0.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ }
+ ]
+ },
+ "EngineStopStart": false,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0,
+ "InitialSoC": 80.0,
+ "PowertrainConfiguration": "BatteryElectric",
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 2.0,
+ "Position": "E2",
+ "MotorFile": "GenericEMotor_125kW_485Nm_Cont30kW.vem",
+ "MechanicalEfficiency": 0.97
+ }
+ ],
+ "Batteries": [
+ {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ }
+ ],
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": "",
+ "CycleEPTO": "",
+ "CycleDriving": ""
+ }
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/Gear_1.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/Gear_1.vtlm
index ea00afe57c..44d5320391 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/Gear_1.vtlm
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/Gear_1.vtlm
@@ -230,4 +230,33 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
3000,4000.0,208.0
3000,4500.0,228.0
3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
+3000,5500.0,268.0
+4000,-5500.0,268.0
+4000,-5000.0,248.0
+4000,-4500.0,208.0
+4000,-4000.0,208.0
+4000,-3500.0,188.0
+4000,-3000.0,168.0
+4000,-2500.0,148.0
+4000,-2000.0,128.0
+4000,-1600.0,112.0
+4000,-1200.0,96.0
+4000,-900.0,84.0
+4000,-600.0,72.0
+4000,-400.0,64.0
+4000,-200.0,56.0
+4000,0.0,56.0
+4000,200.0,56.0
+4000,400.0,64.0
+4000,600.0,72.0
+4000,900.0,84.0
+4000,1200.0,96.0
+4000,1600.0,112.0
+4000,2000.0,128.0
+4000,2500.0,148.0
+4000,3000.0,168.0
+4000,3500.0,188.0
+4000,4000.0,208.0
+4000,4500.0,228.0
+4000,5000.0,248.0
+4000,5500.0,268.0
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/GenericEMotor_125kW_485Nm_Cont30kW.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/GenericEMotor_125kW_485Nm_Cont30kW.vem
index b1c2edb34a..59fc2d69a7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/GenericEMotor_125kW_485Nm_Cont30kW.vem
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/GenericEMotor_125kW_485Nm_Cont30kW.vem
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2022-10-07T04:23:15.5776918Z",
+ "Date": "2023-02-16T07:20:55.7345776Z",
"AppVersion": "3",
"FileVersion": 5
},
@@ -9,13 +9,15 @@
"SavedInDeclMode": true,
"Model": "Generic Electric Motor",
"Inertia": 0.225,
+ "ElectricMachineType": "RM",
"ThermalOverloadRecoveryFactor": 0.9,
+ "R85RatedPower": 250.0,
"DragCurve": "GenericDrag_125kW_485Nm.vemd",
"VoltageLevels": [
{
"Voltage": 0.0,
"ContinuousTorque": 116.0,
- "ContinuousTorqueSpeed": 2460.0,
+ "ContinuousTorqueSpeed": "2460",
"OverloadTorque": 485.0,
"OverloadTorqueSpeed": 2460.0,
"OverloadTime": 30.0,
@@ -27,7 +29,7 @@
{
"Voltage": 1000000000.0,
"ContinuousTorque": 116.0,
- "ContinuousTorqueSpeed": 2460.0,
+ "ContinuousTorqueSpeed": "2460",
"OverloadTorque": 485.0,
"OverloadTorqueSpeed": 2460.0,
"OverloadTime": 30.0,
--
GitLab