diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/Axlegear.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/Axlegear.vgbx
index 6d42e7230c9eb9b6b0039530bb0326164b102883..7ea4c8eb90c5d07604e3b8ea16d107af0722b85b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/Axlegear.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/Axlegear.vgbx
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2020-11-03T14:19:09.9858299Z",
+ "Date": "2023-02-15T16:14:48.4738773Z",
"AppVersion": "3",
"FileVersion": 6
},
@@ -9,7 +9,7 @@
"SavedInDeclMode": true,
"ModelName": "3_speed_AMT",
"Inertia": 0.0,
- "TracInt": 0.8,
+ "TracInt": 1.0,
"Gears": [
{
"Ratio": 2.64,
@@ -19,9 +19,9 @@
"TqReserve": 0.0,
"ShiftTime": 2.0,
"StartTqReserve": 20.0,
- "StartSpeed": 2.22222222222222,
+ "StartSpeed": 2.222222222222,
"StartAcc": 0.8,
- "GearboxType": "AMT",
+ "GearboxType": "IEPC",
"TorqueConverter": {
"Enabled": false
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/GenericIEPC_Gbx1.viepc b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/GenericIEPC_Gbx1.viepc
index be0c1c769afcc3de76b300f1f6c01837028b6643..abf74ca808602e6d8bae14f05900f66b29c381e7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/GenericIEPC_Gbx1.viepc
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/GenericIEPC_Gbx1.viepc
@@ -1,18 +1,20 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:54:28.7387223Z",
+ "CreatedBy": "",
+ "Date": "2023-02-15T16:14:15.1655011Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"SavedInDeclMode": true,
"Model": "Generic IEPC",
+ "ElectricMachineType": "PSM",
"Inertia": 0.5,
"DifferentialIncluded": false,
"DesignTypeWheelMotor": false,
"NrOfDesignTypeWheelMotorMeasured": 1,
- "ThermalOverloadRecoveryFactor": 0.9,
+ "ThermalOverloadRecoveryFactor": 0.0,
+ "R85RatedPower": 0.0,
"Gears": [
{
"Ratio": 4.65
@@ -20,24 +22,24 @@
],
"VoltageLevels": [
{
- "Voltage": 500,
- "ContinuousTorque": 5412.60,
+ "Voltage": 500.0,
+ "ContinuousTorque": 5412.6,
"ContinuousTorqueSpeed": 440.86,
"OverloadTorque": 6450.02,
"OverloadTorqueSpeed": 438.28,
- "OverloadTime": 312,
+ "OverloadTime": 312.0,
"FullLoadCurve": "IEPC_Gbx1_FLD_min.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx1.viepco"
}
},
{
- "Voltage": 900,
+ "Voltage": 900.0,
"ContinuousTorque": 5863.65,
"ContinuousTorqueSpeed": 445.16,
"OverloadTorque": 6765.75,
"OverloadTorqueSpeed": 449.25,
- "OverloadTime": 345,
+ "OverloadTime": 345.0,
"FullLoadCurve": "IEPC_Gbx1_FLD_max.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx1.viepco"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
index 882d9334de59623a614bf84236648c537b87d312..8b4119d80ca4be2eed6acd5d5b3940046b142acd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
@@ -1,84 +1,71 @@
-{
- "Header": {
- "CreatedBy": "",
- "Date": "2017-07-13T14:14:29.3226830Z",
- "AppVersion": "3",
- "FileVersion": 11
- },
- "Body": {
- "SavedInDeclMode": true,
- "VehCat": "RigidTruck",
- "LegislativeClass": "N3",
- "CurbWeight": 4670.0,
- "CurbWeightExtra": 1900.0,
- "Loading": 3020.0,
- "MassMax": 11.99,
- "rdyn": 421.0,
- "PowertrainConfiguration": "IEPC",
- "CdCorrMode": "CdofVdecl",
- "CdCorrFile": "",
- "IEPC": "GenericIEPC_Gbx1.viepc",
- "Batteries": [
- {
- "NumPacks": 1,
- "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
- "StreamId": 0
- },
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2023-02-15T16:14:36.3420001Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "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": "IEPC_E",
+ "IEPC": "GenericIEPC_Gbx1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
{
"NumPacks": 1,
"BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
"StreamId": 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
- }
+ ],
+ "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/GenericIEPC/IEPC_Gbx1Speed/IEPC__Gbx1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPC__Gbx1.vecto
index 712a12df562b5d736913730f810897141cd45978..c1ff6a3518436627d08ef6466fe91dc3a5ca6451 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPC__Gbx1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPC__Gbx1.vecto
@@ -1,45 +1,15 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:55:18.2100810Z",
+ "CreatedBy": "",
+ "Date": "2023-02-15T16:14:54.5106703Z",
"AppVersion": "3",
"FileVersion": 12
},
"Body": {
"SavedInDeclMode": true,
- "EngineOnlyMode": false,
"VehicleFile": "IEPCVehicle_Gbx1.vveh",
"GearboxFile": "Axlegear.vgbx",
- "TCU": "../Common/ShiftParameters.vtcu",
"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": "STP",
@@ -69,6 +39,6 @@
"Vacuum pump + elec. driven"
]
}
- ],
+ ]
}
}
\ No newline at end of file