diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
index b0995fd4f633abc760937ad464ccc53ba5e77c6e..05b8a42dcee6387c61355818822971f7866bb690 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
@@ -1,18 +1,20 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:54:28.7387223Z",
+ "CreatedBy": "",
+ "Date": "2023-02-16T12:30:44.7490972Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"SavedInDeclMode": true,
"Model": "Generic IEPC",
+ "ElectricMachineType": "PSM",
"Inertia": 0.5,
"DifferentialIncluded": true,
"DesignTypeWheelMotor": false,
"NrOfDesignTypeWheelMotorMeasured": 1,
- "ThermalOverloadRecoveryFactor": 0.9,
+ "ThermalOverloadRecoveryFactor": 0.0,
+ "R85RatedPower": 0.0,
"Gears": [
{
"Ratio": 12.276
@@ -20,24 +22,24 @@
],
"VoltageLevels": [
{
- "Voltage": 500,
+ "Voltage": 500.0,
"ContinuousTorque": 13860.59,
"ContinuousTorqueSpeed": 166.99,
- "OverloadTorque": 16517.20,
+ "OverloadTorque": 16517.2,
"OverloadTorqueSpeed": 166.01,
- "OverloadTime": 312,
+ "OverloadTime": 312.0,
"FullLoadCurve": "IEPC_Gbx1Axl_FLD_min.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx1Axl.viepco"
}
},
{
- "Voltage": 900,
+ "Voltage": 900.0,
"ContinuousTorque": 15015.63,
"ContinuousTorqueSpeed": 168.62,
"OverloadTorque": 17325.73,
"OverloadTorqueSpeed": 170.17,
- "OverloadTime": 345,
+ "OverloadTime": 345.0,
"FullLoadCurve": "IEPC_Gbx1Axl_FLD_max.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx1Axl.viepco"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
index a0a05e3854d3995bb27aad1d7668bf186d0dc142..14e68f6f63f92ac64d64bf7c27a6b36cdd4dc053 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.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_Gbx1Axl.viepc",
- "Batteries": [
- {
- "NumPacks": 1,
- "BatteryFile": "../Common/GenericBattery.vbat",
- "StreamId": 0
- }
- ],
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2023-02-16T12:33:54.3877240Z",
+ "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_Gbx1Axl.viepc",
"ElectricMotors": [
{
"Count": 1,
- "Ratio": 1,
+ "Ratio": 1.0,
"Position": "GEN",
"MotorFile": "../Common/GenericGen.vem",
- "MechanicalEfficiency": 1
+ "MechanicalEfficiency": 1.0
}
],
- "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
- }
+ "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_Gbx1Speed+Axle/IEPC-S__Gbx1Axl.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S__Gbx1Axl.vecto
index 6ea138e7bc5ecc9bacf90287ec48358045df83a5..8cce1636c147584109b799f56b359433d8c72043 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S__Gbx1Axl.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S__Gbx1Axl.vecto
@@ -1,47 +1,15 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:55:18.2100810Z",
+ "CreatedBy": "",
+ "Date": "2023-02-16T12:34:34.4826730Z",
"AppVersion": "3",
"FileVersion": 12
},
"Body": {
"SavedInDeclMode": true,
- "EngineOnlyMode": false,
"VehicleFile": "IEPC-S_Vehicle_Gbx1Axl.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