From 094484b0ae4aaf0178f07e7a90718eecabd8f1cf Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Thu, 16 Feb 2023 12:29:50 +0100
Subject: [PATCH] update generic IEPC-S Gbx3SpeedWhl2 job as saved via GUI
---
.../GenericIEPC-S/Common/209kW_7c7l.veng | 10 +-
.../GenericIEPC-S/Common/GenericBattery.vbat | 38 ++--
.../S_HEV/GenericIEPC-S/Common/GenericGen.vem | 32 ++--
.../GenericIEPC_Gbx3Whl1.viepc | 22 +--
.../IEPC-S_Vehicle_Gbx3Whl1.vveh | 163 ++++++++----------
.../IEPC-S__Gbx3Whl1.vecto | 40 +----
6 files changed, 139 insertions(+), 166 deletions(-)
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng
index a523490289..63989696d4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-06-17T07:29:46.1581600Z",
+ "Date": "2023-02-16T10:54:38.4841708Z",
"AppVersion": "3",
"FileVersion": 5
},
@@ -10,10 +10,10 @@
"ModelName": "209kW 7.7l Engine",
"Displacement": "7700",
"IdlingSpeed": 600.0,
- "Inertia": 3.33,
+ "Inertia": 3.789,
"Fuels": [
{
- "WHTC-Urban": 1.0097,
+ "WHTC-Urban": 1.0097,
"WHTC-Rural": 1.0035,
"WHTC-Motorway": 1.0035,
"WHTC-Engineering": 1.0090832895,
@@ -23,9 +23,9 @@
"FuelType": "DieselCI"
}
],
- "RatedPower": 209000,
+ "RatedPower": 209000.0,
"RatedSpeed": 2550.0,
- "MaxTorque": 1100,
+ "MaxTorque": 1100.0,
"FullLoadCurve": "209kW_ICE_fld.vfld",
"WHRType": [
"None"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/GenericBattery.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/GenericBattery.vbat
index 719e214157..f6efbc99f0 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/GenericBattery.vbat
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/GenericBattery.vbat
@@ -1,18 +1,22 @@
-{
- "Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:54:28.7387223Z",
- "AppVersion": "3",
- "FileVersion": 1
- },
- "Body": {
- "SavedInDeclMode": true,
- "Model": "Generic Battery",
- "InternalResistanceCurve": "GenericBattery.vbatr",
- "SOC_min": 10,
- "SOC_max": 90,
- "MaxCurrentMap": "MaxCurrent.vimax",
- "Capacity": 68,
- "SoCCurve": "GenericBattery.vbatv"
- }
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2023-02-16T10:42:11.2828877Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "REESSType": "Battery",
+ "Model": "Generic Battery",
+ "Capacity": 68.0,
+ "SOC_min": 10.0,
+ "SOC_max": 90.0,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "InternalResistanceCurve": "GenericBattery.vbatr",
+ "SoCCurve": "GenericBattery.vbatv",
+ "TestingTemperature": 20.0,
+ "JunctionboxIncluded": false,
+ "ConnectorsSubsystemsIncluded": false
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/GenericGen.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/GenericGen.vem
index b8935297a1..de0cb86580 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/GenericGen.vem
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/GenericGen.vem
@@ -1,32 +1,42 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-05T14:49:40.5920495Z",
+ "Date": "2023-02-16T10:43:13.6196236Z",
"AppVersion": "3",
- "FileVersion": 3
+ "FileVersion": 5
},
"Body": {
"SavedInDeclMode": true,
"Model": "Generic Electric Motor",
"Inertia": 0.134,
- "ContinuousTorque": 798,
- "ContinuousTorqueSpeed": 1850,
- "OverloadTorque": 1030,
- "OverloadTorqueSpeed": 1850,
- "OverloadTime": 120,
+ "ElectricMachineType": "RM",
"ThermalOverloadRecoveryFactor": 0.9,
+ "R85RatedPower": 250.0,
+ "DragCurve": "Gen_drag.vemd",
"VoltageLevels": [
{
"Voltage": 0.0,
+ "ContinuousTorque": 798.0,
+ "ContinuousTorqueSpeed": "1850",
+ "OverloadTorque": 1030.0,
+ "OverloadTorqueSpeed": 1850.0,
+ "OverloadTime": 120.0,
"FullLoadCurve": "Gen_fld.vemp",
- "DragCurve": "Gen_drag.vemd",
- "EfficiencyMap": "Gen_Map.vemo"
+ "EfficiencyMap": {
+ "0": "Gen_Map.vemo"
+ }
},
{
"Voltage": 1000.0,
+ "ContinuousTorque": 798.0,
+ "ContinuousTorqueSpeed": "1850",
+ "OverloadTorque": 1030.0,
+ "OverloadTorqueSpeed": 1850.0,
+ "OverloadTime": 120.0,
"FullLoadCurve": "Gen_fld.vemp",
- "DragCurve": "Gen_drag.vemd",
- "EfficiencyMap": "Gen_Map.vemo"
+ "EfficiencyMap": {
+ "0": "Gen_Map.vemo"
+ }
}
]
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
index d5c2628009..41dd6f7ddf 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
@@ -1,18 +1,20 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:54:28.7387223Z",
+ "CreatedBy": "",
+ "Date": "2023-02-16T10:42:00.7543352Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"SavedInDeclMode": true,
"Model": "Generic IEPC",
+ "ElectricMachineType": "ASM",
"Inertia": 0.5,
"DifferentialIncluded": false,
"DesignTypeWheelMotor": true,
"NrOfDesignTypeWheelMotorMeasured": 1,
- "ThermalOverloadRecoveryFactor": 0.9,
+ "ThermalOverloadRecoveryFactor": 0.0,
+ "R85RatedPower": 250.0,
"Gears": [
{
"Ratio": 21.9384
@@ -26,12 +28,12 @@
],
"VoltageLevels": [
{
- "Voltage": 500,
+ "Voltage": 500.0,
"ContinuousTorque": 3222.24,
"ContinuousTorqueSpeed": 748.18,
"OverloadTorque": 3839.84,
- "OverloadTorqueSpeed": 743.80,
- "OverloadTime": 312,
+ "OverloadTorqueSpeed": 743.8,
+ "OverloadTime": 312.0,
"FullLoadCurve": "IEPC_Gbx3Whl1_FLD_min.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx3Whl1_1.viepco",
@@ -40,12 +42,12 @@
}
},
{
- "Voltage": 900,
+ "Voltage": 900.0,
"ContinuousTorque": 3490.76,
"ContinuousTorqueSpeed": 755.47,
- "OverloadTorque": 4027.80,
+ "OverloadTorque": 4027.8,
"OverloadTorqueSpeed": 762.41,
- "OverloadTime": 345,
+ "OverloadTime": 345.0,
"FullLoadCurve": "IEPC_Gbx3Whl1_FLD_max.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx3Whl1_1.viepco",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
index fb63057d3b..4f0ac61252 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
@@ -1,88 +1,77 @@
-{
- "Header": {
- "CreatedBy": "",
- "Date": "2017-07-13T14:14:29.3226830Z",
- "AppVersion": "3",
- "FileVersion": 11
- },
- "Body": {
- "SavedInDeclMode": true,
- "VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
- "CurbWeight": 4670.0,
- "CurbWeightExtra": 1900.0,
- "Loading": 3020.0,
- "MassMax": 11.99,
- "rdyn": 421.0,
- "PowertrainConfiguration": "IEPC-S",
- "CdCorrMode": "CdofVdecl",
- "CdCorrFile": "",
- "IEPC": "GenericIEPC_Gbx3Whl1.viepc",
- "Batteries": [
- {
- "NumPacks": 1,
- "BatteryFile": "../Common/GenericBattery.vbat",
- "StreamId": 0
- }
- ],
- "ElectricMotors": [
- {
- "Count": 1,
- "Ratio": 1,
- "Position": "GEN",
- "MotorFile": "../Common/GenericGen.vem",
- "MechanicalEfficiency": 1
- }
- ],
- "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-16T10:43:21.0743876Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "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": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0,
+ "InitialSoC": 80.0,
+ "PowertrainConfiguration": "IEPC_S",
+ "IEPC": "GenericIEPC_Gbx3Whl1.viepc",
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1.0,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1.0
+ }
+ ],
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "OvcHev": false,
+ "MaxChargingPower": 0.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/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S__Gbx3Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S__Gbx3Whl1.vecto
index 7e4cc5bc3c..335b70678f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S__Gbx3Whl1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S__Gbx3Whl1.vecto
@@ -1,47 +1,15 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:55:18.2100810Z",
+ "CreatedBy": "",
+ "Date": "2023-02-16T10:54:52.1674767Z",
"AppVersion": "3",
"FileVersion": 12
},
"Body": {
"SavedInDeclMode": true,
- "EngineOnlyMode": false,
"VehicleFile": "IEPC-S_Vehicle_Gbx3Whl1.vveh",
"EngineFile": "../Common/209kW_7c7l.veng",
- "GearboxFile": "",
- "TCU": "../Common/ShiftParameters.vtcu",
- "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
"Padd_electric": 0.0,
-
- "VACC": "../Common/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": "FAN",
@@ -78,6 +46,6 @@
"Vacuum pump + elec. driven"
]
}
- ],
+ ]
}
}
\ No newline at end of file
--
GitLab