diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat
index 627c162a5eeb36115ff72cfc1aeeaf87e28fc565..d3c72722774b317f19d3748b35db04bb8769db35 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/Common/GenericBattery_243kWh_750V.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_243kWh.vbatr",
- "SOC_min": 10,
- "SOC_max": 90,
- "MaxCurrentMap": "MaxCurrent.vimax",
- "Capacity": 324,
- "SoCCurve": "GenericBattery_243kWh.vbatv"
- }
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2023-02-09T15:28:18.9980418Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "REESSType": "Battery",
+ "Model": "Generic Battery",
+ "Capacity": 324.0,
+ "SOC_min": 10.0,
+ "SOC_max": 90.0,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "InternalResistanceCurve": "GenericBattery_243kWh.vbatr",
+ "SoCCurve": "GenericBattery_243kWh.vbatv",
+ "TestingTemperature": 40.0,
+ "JunctionboxIncluded": false,
+ "ConnectorsSubsystemsIncluded": true
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
index d5c2628009f1e62db0e14129dd2a950572194c84..c5e5b14dc7b0adca8b08c86f241916db663fccbe 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
@@ -1,18 +1,20 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:54:28.7387223Z",
+ "CreatedBy": "",
+ "Date": "2023-02-10T08:21:36.4723115Z",
"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/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
index 892b8e494761d9eb0333db2b0da18b0077cd4664..f9dfee2907ba728758b8317022b37feee6c15da7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
@@ -1,84 +1,71 @@
-{
- "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",
- "CdCorrMode": "CdofVdecl",
- "CdCorrFile": "",
- "IEPC": "GenericIEPC_Gbx3Whl1.viepc",
- "Batteries": [
- {
- "NumPacks": 1,
- "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
- "StreamId": 0
- },
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2023-02-10T08:21:37.3799846Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
+ "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": "E:\\QUAM\\Workspace\\VECTO_DEV_Buses\\VectoCore\\VectoCoreTest\\TestData\\Integration\\DeclarationMode\\2nd_AmendmDeclMode\\JSON\\PEV\\GenericIEPC\\IEPC_Gbx3Speed-Whl1\\GenericIEPC_Gbx3Whl1.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_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
index 1a3d309f35ea702420ecc2fe916c98e71318207f..c093f7d411bb59d76795cffb20a76be0a7b0a11d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
@@ -1,45 +1,14 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:55:18.2100810Z",
+ "CreatedBy": "",
+ "Date": "2023-02-10T08:21:42.1951204Z",
"AppVersion": "3",
"FileVersion": 12
},
"Body": {
"SavedInDeclMode": true,
- "EngineOnlyMode": false,
"VehicleFile": "IEPCVehicle_Gbx3Whl1.vveh",
- "GearboxFile": "",
- "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 +38,6 @@
"Vacuum pump + elec. driven"
]
}
- ],
+ ]
}
}
\ No newline at end of file