From 31a09cf1c3d67d3ada2ca34cc4dabda820543c88 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Thu, 16 Feb 2023 11:57:23 +0100
Subject: [PATCH] update testcase job Generic E2 as saved via GUI
---
.../PEV/GenericVehicleE2/BEV_E2_PTO.vecto | 40 +++----------------
.../BatteryElectricVehicle_PTO.vveh | 32 ++++-----------
2 files changed, 13 insertions(+), 59 deletions(-)
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BEV_E2_PTO.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BEV_E2_PTO.vecto
index 341951c74f..afd9bd5518 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BEV_E2_PTO.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BEV_E2_PTO.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2022-10-31T15:32:36.6289781Z",
+ "Date": "2023-02-16T09:01:17.4590418Z",
"AppVersion": "3",
"FileVersion": 9
},
@@ -9,40 +9,7 @@
"SavedInDeclMode": true,
"VehicleFile": "BatteryElectricVehicle_PTO.vveh",
"GearboxFile": "AMT.vgbx",
- "TCU": "AMT.vgbx",
"Padd_electric": 0.0,
- "VACC": "Truck.vacc",
- "EngineStopStartAtVehicleStopThreshold": 2.0,
- "EngineStopStartMaxOffTimespan": 120.0,
- "EngineStopStartUtilityFactor": 0.8,
- "EngineStopStartUtilityFactorDriving": 0.8,
- "EcoRollMinSpeed": 60.000000000000007,
- "EcoRollActivationDelay": 2.0,
- "EcoRollUnderspeedThreshold": 0.0,
- "EcoRollMaxAcceleration": 0.1,
- "PCCEnableSpeed": 80.0,
- "PCCMinSpeed": 50.0,
- "PCCUnderspeed": 8.0,
- "PCCOverSpeed": 5.0,
- "PCCPreviewDistanceUC1": 1500.0,
- "PCCPreviewDistanceUC2": 1000.0,
- "LAC": {
- "Enabled": true,
- "PreviewDistanceFactor": 10.0,
- "DF_offset": 2.5,
- "DF_scaling": 1.5,
- "DF_targetSpeedLookup": "",
- "Df_velocityDropLookup": "",
- "MinSpeed": 50.0
- },
- "OverSpeedEcoRoll": {
- "Mode": "Off",
- "MinSpeed": 50.0,
- "OverSpeed": 5.0
- },
- "Cycles": [
- "MunicipalUtility"
- ],
"Aux": [
{
"ID": "STP",
@@ -73,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_PTO.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh
index 6eb23870d6..25e0051b48 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2022-10-31T15:32:30.7559947Z",
+ "Date": "2023-02-16T09:01:14.5329284Z",
"AppVersion": "3",
"FileVersion": 10
},
@@ -10,10 +10,10 @@
"VehCat": "RigidTruck",
"LegislativeClass": "N3",
"CurbWeight": 4670.0,
- "CurbWeightExtra": 1900.0,
+ "CurbWeightExtra": 0.0,
"MassMax": 11.99,
- "Loading": 3020.0,
- "rdyn": 421.0,
+ "Loading": 0.0,
+ "rdyn": 0.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
"AxleConfig": {
@@ -22,7 +22,7 @@
{
"Inertia": 6.5,
"Wheels": "265/70 R19.5",
- "AxleWeightShare": 0.2,
+ "AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
@@ -31,29 +31,11 @@
{
"Inertia": 6.5,
"Wheels": "265/70 R19.5",
- "AxleWeightShare": 0.3,
+ "AxleWeightShare": 0.0,
"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"
}
]
},
@@ -84,7 +66,7 @@
"Type": "only the drive shaft of the PTO - multi-disc clutch, oil pump",
"LossMap": "",
"Cycle": "",
- "CycleEPTO": "EPTO-idle.vptoel",
+ "CycleEPTO": "",
"CycleDriving": ""
}
}
--
GitLab