diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BEV_E4.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BEV_E4.vecto
index 2759ab1c625aac051a1e5ac3818839a51cc0e2f0..bec17424373f33d73e4d22d1e74a80cd5fedc9c8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BEV_E4.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BEV_E4.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2020-09-07T13:07:45.3911427Z",
+ "Date": "2023-02-15T16:42:46.2698734Z",
"AppVersion": "3",
"FileVersion": 9
},
@@ -9,41 +9,6 @@
"SavedInDeclMode": true,
"VehicleFile": "BatteryElectricVehicle.vveh",
"Padd_electric": 0.0,
- "VACC": "Bus.vacc",
- "EngineStopStartAtVehicleStopThreshold": 2.0,
- "EngineStopStartMaxOffTimespan": 120.0,
- "EngineStopStartUtilityFactor": 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": [
- "Interurban.vdri",
- "Suburban.vdri",
- "LongHaul",
- "RegionalDelivery",
- "UrbanDelivery"
- ],
"Aux": [
{
"ID": "STP",
@@ -74,5 +39,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/GenericVehicleE4/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BatteryElectricVehicle.vveh
index bbf5322c9677e2c1a6bb4f073d7a193dab731b03..9c434511d1a134f4ef7cbe11afe2aa8f7c91f1b7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BatteryElectricVehicle.vveh
@@ -1,7 +1,7 @@
-{
+{
"Header": {
"CreatedBy": "",
- "Date": "2017-07-13T14:14:29.3226830Z",
+ "Date": "2023-02-15T16:42:39.2513803Z",
"AppVersion": "3",
"FileVersion": 10
},
@@ -10,36 +10,19 @@
"VehCat": "RigidTruck",
"LegislativeClass": "N3",
"CurbWeight": 4670.0,
- "CurbWeightExtra": 1900.0,
- "Loading": 3020.0,
+ "CurbWeightExtra": 0.0,
"MassMax": 11.99,
- "rdyn": 421.0,
- "PowertrainConfiguration": "BatteryElectric",
+ "Loading": 0.0,
+ "rdyn": 0.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 22.6,
- "MechanicalEfficiency": 0.97,
- "Position": "B4",
- "MotorFile": "GenericEMotor_125kW_485Nm.vem"
- }
- ],
- "Battery": {
- "NumPacks": 2,
- "BatteryFile": "GenericBattery_243kWh_750V.vbat"
- },
- "InitialSoC": 80,
- "TorqueLimits": {},
- "IdlingSpeed": 0.0,
"AxleConfig": {
"Type": "4x2",
"Axles": [
{
"Inertia": 6.5,
"Wheels": "265/70 R19.5",
- "AxleWeightShare": 0.2,
+ "AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
@@ -48,37 +31,44 @@
{
"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"
}
]
},
- "EngineStopStart": true,
+ "EngineStopStart": false,
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
"CdA": 4.83,
- "VehicleHeight": 3.0
+ "VehicleHeight": 3.0,
+ "InitialSoC": 80.0,
+ "PowertrainConfiguration": "BatteryElectric",
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 22.6,
+ "Position": "E4",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem",
+ "MechanicalEfficiency": 0.97
+ }
+ ],
+ "Batteries": [
+ {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat",
+ "StreamId": 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/GenericVehicleE4/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/GenericBattery_243kWh_750V.vbat
index acfc51ef761e2be97171ea5e1f6523b264078b41..1c921a9ee3a6b3beb47dc917a62992b4d844be6a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/GenericBattery_243kWh_750V.vbat
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/GenericBattery_243kWh_750V.vbat
@@ -1,18 +1,22 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:54:28.7387223Z",
+ "CreatedBy": "",
+ "Date": "2023-02-15T16:21:51.0782720Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"SavedInDeclMode": true,
- "Model": "Generic Battery",
- "InternalResistanceCurve": "GenericBattery_243kWh.vbatr",
- "SOC_min": 10,
- "SOC_max": 90,
- "Capacity": 324,
- "MaxCurrentMap": "MaxCurrent.vimax",
- "SoCCurve": "GenericBattery_243kWh.vbatv"
- }
+ "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": 20.0,
+ "JunctionboxIncluded": false,
+ "ConnectorsSubsystemsIncluded": false
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/GenericEMotor_125kW_485Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/GenericEMotor_125kW_485Nm.vem
index 0cc89310f3aa36147337ed8b09db96979cc3dbbf..36ec21426736e869c746d5b7407db26265761bdb 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/GenericEMotor_125kW_485Nm.vem
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/GenericEMotor_125kW_485Nm.vem
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2022-10-07T04:24:39.3061134Z",
+ "Date": "2023-02-15T16:42:38.1403845Z",
"AppVersion": "3",
"FileVersion": 5
},
@@ -9,13 +9,15 @@
"SavedInDeclMode": true,
"Model": "Generic Electric Motor",
"Inertia": 0.225,
+ "ElectricMachineType": "ASM",
"ThermalOverloadRecoveryFactor": 0.9,
+ "R85RatedPower": 250.0,
"DragCurve": "GenericDrag_125kW_485Nm.vemd",
"VoltageLevels": [
{
- "Voltage": 0.0,
+ "Voltage": 100.0,
"ContinuousTorque": 450.0,
- "ContinuousTorqueSpeed": 2460.0,
+ "ContinuousTorqueSpeed": "2460",
"OverloadTorque": 485.0,
"OverloadTorqueSpeed": 2460.0,
"OverloadTime": 120.0,
@@ -25,9 +27,9 @@
}
},
{
- "Voltage": 1000000000.0,
+ "Voltage": 1000.0,
"ContinuousTorque": 450.0,
- "ContinuousTorqueSpeed": 2460.0,
+ "ContinuousTorqueSpeed": "2460",
"OverloadTorque": 485.0,
"OverloadTorqueSpeed": 2460.0,
"OverloadTime": 120.0,