diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto index 57fa716756a7f5da45abf18bd864815f54dfc71e..9fefa74b7795324aa80223f1cf0ea07078ba1672 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2020-08-25T16:42:29.2557272Z", + "Date": "2021-08-03T08:49:27.7267205Z", "AppVersion": "3", "FileVersion": 8 }, @@ -14,16 +14,15 @@ "TCU": "AMT_12.vgbx", "ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy", "HybridStrategyParams": "Hybrid_Parameters.vhctl", - "AuxiliaryAssembly": "Classic", - "AuxiliaryVersion": "CLASSIC", - "AdvancedAuxiliaryFilePath": "", - "Aux": [], "Padd": 3000.0, + "Paux_ICEOff_Driving": 0.0, + "Paux_ICEOff_Standstill": 0.0, "Padd_electric": 0.0, "VACC": "Truck.vacc", "EngineStopStartAtVehicleStopThreshold": 2.0, "EngineStopStartMaxOffTimespan": 120.0, "EngineStopStartUtilityFactor": 0.8, + "EngineStopStartUtilityFactorDriving": 0.8, "EcoRollMinSpeed": 60.000000000000007, "EcoRollActivationDelay": 2.0, "EcoRollUnderspeedThreshold": 0.0, diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG.vecto index 2e8ba50aec6e5460926e7904514eda4beda38628..d40b8be45a989fe0086200d07a42b5a3b256fb28 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG.vecto +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG.vecto @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2020-08-25T16:42:29.2557272Z", + "Date": "2021-08-03T08:49:22.9874955Z", "AppVersion": "3", "FileVersion": 8 }, @@ -14,16 +14,15 @@ "TCU": "AMT_12.vgbx", "ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy", "HybridStrategyParams": "Hybrid_Parameters.vhctl", - "AuxiliaryAssembly": "Classic", - "AuxiliaryVersion": "CLASSIC", - "AdvancedAuxiliaryFilePath": "", - "Aux": [], "Padd": 3000.0, + "Paux_ICEOff_Driving": 0.0, + "Paux_ICEOff_Standstill": 0.0, "Padd_electric": 0.0, "VACC": "Truck.vacc", "EngineStopStartAtVehicleStopThreshold": 2.0, "EngineStopStartMaxOffTimespan": 120.0, "EngineStopStartUtilityFactor": 0.8, + "EngineStopStartUtilityFactorDriving": 0.8, "EcoRollMinSpeed": 60.000000000000007, "EcoRollActivationDelay": 2.0, "EcoRollUnderspeedThreshold": 0.0, diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto index ca9002a0efad43a9e033b308f7c1335e406e5ea2..793c93b3b544862f6986ec49032e5d0f88d65e09 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2020-08-25T16:42:29.2557272Z", + "Date": "2021-08-03T09:19:40.4212564Z", "AppVersion": "3", "FileVersion": 8 }, @@ -14,16 +14,15 @@ "TCU": "AMT_12.vgbx", "ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy", "HybridStrategyParams": "Hybrid_Parameters.vhctl", - "AuxiliaryAssembly": "Classic", - "AuxiliaryVersion": "CLASSIC", - "AdvancedAuxiliaryFilePath": "", - "Aux": [], "Padd": 3000.0, + "Paux_ICEOff_Driving": 0.0, + "Paux_ICEOff_Standstill": 0.0, "Padd_electric": 0.0, "VACC": "Truck.vacc", "EngineStopStartAtVehicleStopThreshold": 2.0, "EngineStopStartMaxOffTimespan": 120.0, "EngineStopStartUtilityFactor": 0.8, + "EngineStopStartUtilityFactorDriving": 0.8, "EcoRollMinSpeed": 60.000000000000007, "EcoRollActivationDelay": 2.0, "EcoRollUnderspeedThreshold": 0.0, @@ -49,18 +48,7 @@ "OverSpeed": 2.5 }, "Cycles": [ - "CrestCoast1.vdri", - "CrestCoast2.vdri", - "Group5Eng_CaseA.vdri", - "Group5Eng_CaseB.vdri", - "Group5Eng_CaseC.vdri", - "Group5Eng_CaseD.vdri", - "Group5Eng_CaseE.vdri", - "Group5Eng_CaseF.vdri", - "Group5Eng_CaseG.vdri", - "Group5Eng_CaseH.vdri", - "Group5Eng_CaseI.vdri", - "Group5Eng_CaseJ.vdri" + "Group5Eng_CaseA.vdri" ] } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto index a4c46be8832782bf3cca4567b71aacf02d27cf2a..b82127a0dca2ec3bed1bab6b458d0985d5365c61 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2020-08-25T16:42:29.2557272Z", + "Date": "2021-08-03T08:49:06.1941881Z", "AppVersion": "3", "FileVersion": 8 }, @@ -14,16 +14,15 @@ "TCU": "AMT_12.vgbx", "ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy", "HybridStrategyParams": "Hybrid_Parameters.vhctl", - "AuxiliaryAssembly": "Classic", - "AuxiliaryVersion": "CLASSIC", - "AdvancedAuxiliaryFilePath": "", - "Aux": [], "Padd": 3000.0, + "Paux_ICEOff_Driving": 0.0, + "Paux_ICEOff_Standstill": 0.0, "Padd_electric": 0.0, "VACC": "Truck.vacc", "EngineStopStartAtVehicleStopThreshold": 2.0, "EngineStopStartMaxOffTimespan": 120.0, "EngineStopStartUtilityFactor": 0.8, + "EngineStopStartUtilityFactorDriving": 0.8, "EcoRollMinSpeed": 60.000000000000007, "EcoRollActivationDelay": 2.0, "EcoRollUnderspeedThreshold": 0.0, diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto index 89ab5469d183deb4e6f34b730c629f43e79a9e36..acf6db8a09c0de80b217b0302ddad22fba4dfd4c 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2020-08-25T16:42:29.2557272Z", + "Date": "2021-08-03T08:48:29.0567135Z", "AppVersion": "3", "FileVersion": 8 }, @@ -14,16 +14,15 @@ "TCU": "AMT_12.vgbx", "ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy", "HybridStrategyParams": "Hybrid_Parameters.vhctl", - "AuxiliaryAssembly": "Classic", - "AuxiliaryVersion": "CLASSIC", - "AdvancedAuxiliaryFilePath": "", - "Aux": [], "Padd": 3000.0, + "Paux_ICEOff_Driving": 0.0, + "Paux_ICEOff_Standstill": 0.0, "Padd_electric": 0.0, "VACC": "Truck.vacc", "EngineStopStartAtVehicleStopThreshold": 2.0, "EngineStopStartMaxOffTimespan": 120.0, "EngineStopStartUtilityFactor": 0.8, + "EngineStopStartUtilityFactorDriving": 0.8, "EcoRollMinSpeed": 60.000000000000007, "EcoRollActivationDelay": 2.0, "EcoRollUnderspeedThreshold": 0.0, diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC12.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC12.vveh index e66bc6403a8f002be83fae8ab0326a41272caba3..38f1c22fd37ee8939f3c0817bb754f6f9cf0b257 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC12.vveh +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC12.vveh @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2020-08-25T16:42:15.3361450Z", + "Date": "2021-08-03T09:13:22.6254913Z", "AppVersion": "3", "FileVersion": 10 }, @@ -11,50 +11,11 @@ "LegislativeClass": "Unknown", "CurbWeight": 8229.0, "CurbWeightExtra": 7500.0, - "Loading": 19300.0, "MassMax": 18.0, - "CdA": 5.3, + "Loading": 19300.0, "rdyn": 492.0, "CdCorrMode": "CdofVdecl", "CdCorrFile": "", - "EngineStopStart": false, - "EcoRoll": "None", - "PredictiveCruiseControl": "Option_1_2", - "ATEcoRollReleaseLockupClutch": false, - "VehicleHeight": 4.0, - "IdlingSpeed": 600.0, - "TorqueLimits": {}, - "InitialSoC": 80.0, - "PowertrainConfiguration": "ParallelHybrid", - "MaxDrivetrainPower": 32500000.0, - "ElectricMotors": [ - { - "Count": 1, - "Ratio": 1.0, - "MechanicalEfficiency": 1.0, - "Position": "P2", - "MotorFile": "GenericEMotor_140kW_936Nm.vem" - } - ], - "Battery": { - "NumPacks": 1, - "BatteryFile": "GenericBattery_10kWh_658V.vbat" - }, - "Retarder": { - "Type": "None", - "Ratio": 1.0, - "File": "" - }, - "Angledrive": { - "Type": "None", - "Ratio": 0.0, - "LossMap": "" - }, - "PTO": { - "Type": "None", - "LossMap": "", - "Cycle": "" - }, "AxleConfig": { "Type": "4x2", "Axles": [ @@ -104,6 +65,48 @@ "Type": "Trailer" } ] - } + }, + "EngineStopStart": false, + "EcoRoll": "None", + "PredictiveCruiseControl": "None", + "ATEcoRollReleaseLockupClutch": false, + "CdA": 5.3, + "VehicleHeight": 4.0, + "IdlingSpeed": 600.0, + "Retarder": { + "Type": "None", + "Ratio": 1.0, + "File": "" + }, + "Angledrive": { + "Type": "None", + "Ratio": 0.0, + "LossMap": "" + }, + "PTO": { + "Type": "None", + "LossMap": "", + "Cycle": "", + "CycleDriving": "" + }, + "TorqueLimits": {}, + "InitialSoC": 80.0, + "PowertrainConfiguration": "ParallelHybrid", + "ElectricMotors": [ + { + "Count": 1, + "Ratio": 1.0, + "Position": "P2", + "MotorFile": "GenericEMotor_140kW_936Nm.vem", + "MechanicalEfficiency": 1.0 + } + ], + "Batteries": [ + { + "NumPacks": 1, + "BatteryFile": "GenericBattery_10kWh_658V.vbat", + "StreamId": 0 + } + ] } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC123.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC123.vveh index 085582dab20a08b995020a969f0e3ba3bed415a5..2379822d9cd74a66f434b1c8c634aac9d2a38b24 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC123.vveh +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC123.vveh @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2020-08-25T16:42:15.3361450Z", + "Date": "2021-08-03T08:49:01.8366510Z", "AppVersion": "3", "FileVersion": 10 }, @@ -11,50 +11,11 @@ "LegislativeClass": "Unknown", "CurbWeight": 8229.0, "CurbWeightExtra": 7500.0, - "Loading": 19300.0, "MassMax": 18.0, - "CdA": 5.3, + "Loading": 19300.0, "rdyn": 492.0, "CdCorrMode": "CdofVdecl", "CdCorrFile": "", - "EngineStopStart": false, - "EcoRoll": "None", - "PredictiveCruiseControl": "Option_1_2_3", - "ATEcoRollReleaseLockupClutch": false, - "VehicleHeight": 4.0, - "IdlingSpeed": 600.0, - "TorqueLimits": {}, - "InitialSoC": 80.0, - "PowertrainConfiguration": "ParallelHybrid", - "MaxDrivetrainPower": 32500000.0, - "ElectricMotors": [ - { - "Count": 1, - "Ratio": 1.0, - "MechanicalEfficiency": 1.0, - "Position": "P2", - "MotorFile": "GenericEMotor_140kW_936Nm.vem" - } - ], - "Battery": { - "NumPacks": 1, - "BatteryFile": "GenericBattery_10kWh_658V.vbat" - }, - "Retarder": { - "Type": "None", - "Ratio": 1.0, - "File": "" - }, - "Angledrive": { - "Type": "None", - "Ratio": 0.0, - "LossMap": "" - }, - "PTO": { - "Type": "None", - "LossMap": "", - "Cycle": "" - }, "AxleConfig": { "Type": "4x2", "Axles": [ @@ -104,6 +65,48 @@ "Type": "Trailer" } ] - } + }, + "EngineStopStart": false, + "EcoRoll": "None", + "PredictiveCruiseControl": "Option_1_2_3", + "ATEcoRollReleaseLockupClutch": false, + "CdA": 5.3, + "VehicleHeight": 4.0, + "IdlingSpeed": 600.0, + "Retarder": { + "Type": "None", + "Ratio": 1.0, + "File": "" + }, + "Angledrive": { + "Type": "None", + "Ratio": 0.0, + "LossMap": "" + }, + "PTO": { + "Type": "None", + "LossMap": "", + "Cycle": "", + "CycleDriving": "" + }, + "TorqueLimits": {}, + "InitialSoC": 80.0, + "PowertrainConfiguration": "ParallelHybrid", + "ElectricMotors": [ + { + "Count": 1, + "Ratio": 1.0, + "Position": "P2", + "MotorFile": "GenericEMotor_140kW_936Nm.vem", + "MechanicalEfficiency": 1.0 + } + ], + "Batteries": [ + { + "NumPacks": 1, + "BatteryFile": "GenericBattery_10kWh_658V.vbat", + "StreamId": 0 + } + ] } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh index 9e7c5355858a6fa579ba7f3ffc545c2ed82d7485..98ed5b2990373c3853e0418379cc7c8a9833f3df 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2020-08-25T16:42:15.3361450Z", + "Date": "2021-08-03T08:48:25.1392008Z", "AppVersion": "3", "FileVersion": 10 }, @@ -11,50 +11,11 @@ "LegislativeClass": "Unknown", "CurbWeight": 8229.0, "CurbWeightExtra": 7500.0, - "Loading": 19300.0, "MassMax": 18.0, - "CdA": 5.3, + "Loading": 19300.0, "rdyn": 492.0, "CdCorrMode": "CdofVdecl", "CdCorrFile": "", - "EngineStopStart": true, - "EcoRoll": "withEngineStop", - "PredictiveCruiseControl": "Option_1_2_3", - "ATEcoRollReleaseLockupClutch": false, - "VehicleHeight": 4.0, - "IdlingSpeed": 600.0, - "TorqueLimits": {}, - "InitialSoC": 80.0, - "PowertrainConfiguration": "ParallelHybrid", - "MaxDrivetrainPower": 32500000.0, - "ElectricMotors": [ - { - "Count": 1, - "Ratio": 1.0, - "MechanicalEfficiency": 1.0, - "Position": "P2", - "MotorFile": "GenericEMotor_140kW_936Nm.vem" - } - ], - "Battery": { - "NumPacks": 1, - "BatteryFile": "GenericBattery_10kWh_658V.vbat" - }, - "Retarder": { - "Type": "None", - "Ratio": 1.0, - "File": "" - }, - "Angledrive": { - "Type": "None", - "Ratio": 0.0, - "LossMap": "" - }, - "PTO": { - "Type": "None", - "LossMap": "", - "Cycle": "" - }, "AxleConfig": { "Type": "4x2", "Axles": [ @@ -104,6 +65,48 @@ "Type": "Trailer" } ] - } + }, + "EngineStopStart": true, + "EcoRoll": "WithEngineStop", + "PredictiveCruiseControl": "Option_1_2_3", + "ATEcoRollReleaseLockupClutch": false, + "CdA": 5.3, + "VehicleHeight": 4.0, + "IdlingSpeed": 600.0, + "Retarder": { + "Type": "None", + "Ratio": 1.0, + "File": "" + }, + "Angledrive": { + "Type": "None", + "Ratio": 0.0, + "LossMap": "" + }, + "PTO": { + "Type": "None", + "LossMap": "", + "Cycle": "", + "CycleDriving": "" + }, + "TorqueLimits": {}, + "InitialSoC": 80.0, + "PowertrainConfiguration": "ParallelHybrid", + "ElectricMotors": [ + { + "Count": 1, + "Ratio": 1.0, + "Position": "P2", + "MotorFile": "GenericEMotor_140kW_936Nm.vem", + "MechanicalEfficiency": 1.0 + } + ], + "Batteries": [ + { + "NumPacks": 1, + "BatteryFile": "GenericBattery_10kWh_658V.vbat", + "StreamId": 0 + } + ] } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Engine_325kW_12.7l.veng index 3c5609bc2596943173f06c348e4013ea7aac2bbd..2535dd9e83f0274355294437466fc0d70d00c3e0 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Engine_325kW_12.7l.veng @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2020-08-21T09:24:04.0725494Z", + "Date": "2021-08-03T08:48:38.4435668Z", "AppVersion": "3", "FileVersion": 5 }, diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/GenericEMotor_140kW_936Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/GenericEMotor_140kW_936Nm.vem index 0e165bc87bf92aff2806862da017eb4245889bac..fd98dc5c6e8c7991a2c583ffb782c58916441b82 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/GenericEMotor_140kW_936Nm.vem +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/GenericEMotor_140kW_936Nm.vem @@ -1,20 +1,33 @@ -{ +{ "Header": { - "CreatedBy": " ()", - "Date": "2016-10-13T08:54:28.7387223Z", + "CreatedBy": "", + "Date": "2021-08-03T08:49:13.1556780Z", "AppVersion": "3", - "FileVersion": 1 + "FileVersion": 3 }, "Body": { "SavedInDeclMode": false, "Model": "Generic Electric Motor", - "FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp", - "DragCurve": "GenericDrag_140kW_936Nm.vemd", - "EfficiencyMap": "GenericMap_140kW_936Nm.vemo", "Inertia": 0.5, - "ContinuousPower": 5000000, - "ContinuousPowerSpeed": 2000, - "OverloadTime": 30, - "ThermalOverloadRecoveryFactor": 0.9 + "ContinuousTorque": 23873.2414637843, + "ContinuousTorqueSpeed": 1999.9999999999998, + "OverloadTorque": 0.0, + "OverloadTorqueSpeed": 0.0, + "OverloadTime": 30.0, + "ThermalOverloadRecoveryFactor": 0.9, + "VoltageLevels": [ + { + "Voltage": 0.0, + "FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp", + "DragCurve": "GenericDrag_140kW_936Nm.vemd", + "EfficiencyMap": "GenericMap_140kW_936Nm.vemo" + }, + { + "Voltage": 1000000000.0, + "FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp", + "DragCurve": "GenericDrag_140kW_936Nm.vemd", + "EfficiencyMap": "GenericMap_140kW_936Nm.vemo" + } + ] } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor.vveh index d4a428a60b95c54a7b320376e838c96edf4997f4..2759a54b627b33d93e460a07845a485b19f2eab1 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor.vveh +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor.vveh @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2017-07-13T14:14:29.3226830Z", + "Date": "2021-08-03T08:50:43.8606266Z", "AppVersion": "3", "FileVersion": 10 }, @@ -11,34 +11,11 @@ "LegislativeClass": "Unknown", "CurbWeight": 8229.0, "CurbWeightExtra": 7500.0, - "Loading": 19300.0, "MassMax": 18.0, - "CdxA": 5.3, + "Loading": 19300.0, "rdyn": 492.0, - "PowertrainConfiguration": "BatteryElectric", "CdCorrMode": "CdofVdecl", "CdCorrFile": "", - "EngineStopStart": true, - "EcoRoll": "None", - "PredictiveCruiseControl": "None", - "ATEcoRollReleaseLockupClutch": false, - "VehicleHeight": 3.0, - "ElectricMotors": [ - { - "Count": 2, - "Ratio": 2, - "MechanicalEfficiency": 0.97, - "Position": "B2", - "MotorFile": "GenericEMotor_125kW_485Nm.vem" - } - ], - "Battery": { - "NumPacks": 2, - "BatteryFile": "GenericBattery_243kWh_750V.vbat" - }, - "InitialSoC": 80, - "TorqueLimits": {}, - "IdlingSpeed": 0.0, "AxleConfig": { "Type": "4x2", "Axles": [ @@ -88,6 +65,29 @@ "Type": "VehicleNonDriven" } ] - } + }, + "EngineStopStart": false, + "EcoRoll": "None", + "PredictiveCruiseControl": "None", + "ATEcoRollReleaseLockupClutch": false, + "VehicleHeight": 3.0, + "InitialSoC": 80.0, + "PowertrainConfiguration": "BatteryElectric", + "ElectricMotors": [ + { + "Count": 2, + "Ratio": 2.0, + "Position": "E2", + "MotorFile": "GenericEMotor_125kW_485Nm.vem", + "MechanicalEfficiency": 0.97 + } + ], + "Batteries": [ + { + "NumPacks": 2, + "BatteryFile": "GenericBattery_243kWh_750V.vbat", + "StreamId": 0 + } + ] } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG.vecto index eded9a33cf85b985a0f36b9dd195838103fb4429..1947b58c0a47652b28847349710282b5754715f6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG.vecto +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG.vecto @@ -1,13 +1,12 @@ -{ +{ "Header": { - "CreatedBy": " ()", - "Date": "2016-10-13T08:55:18.2100810Z", + "CreatedBy": "", + "Date": "2021-08-03T08:50:46.6542922Z", "AppVersion": "3", "FileVersion": 9 }, "Body": { "SavedInDeclMode": false, - "EngineOnlyMode": false, "VehicleFile": "Class5_Tractor.vveh", "GearboxFile": "AMT_12.vgbx", "TCU": "AMT_12.vgbx", @@ -16,6 +15,7 @@ "EngineStopStartAtVehicleStopThreshold": 2.0, "EngineStopStartMaxOffTimespan": 120.0, "EngineStopStartUtilityFactor": 0.8, + "EngineStopStartUtilityFactorDriving": 0.8, "EcoRollMinSpeed": 60.000000000000007, "EcoRollActivationDelay": 2.0, "EcoRollUnderspeedThreshold": 0.0, @@ -32,7 +32,8 @@ "DF_offset": 2.5, "DF_scaling": 1.5, "DF_targetSpeedLookup": "", - "Df_velocityDropLookup": "" + "Df_velocityDropLookup": "", + "MinSpeed": 50.0 }, "OverSpeedEcoRoll": { "Mode": "Overspeed", diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto index ac67910a843a2d28f720edccce2f4524d5035010..8a85be01addc5b8979586ec6e510cfee18becbba 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto @@ -1,13 +1,12 @@ -{ +{ "Header": { - "CreatedBy": " ()", - "Date": "2016-10-13T08:55:18.2100810Z", + "CreatedBy": "", + "Date": "2021-08-03T08:50:22.0146590Z", "AppVersion": "3", "FileVersion": 9 }, "Body": { "SavedInDeclMode": false, - "EngineOnlyMode": false, "VehicleFile": "Class5_Tractor_PCC12.vveh", "GearboxFile": "AMT_12.vgbx", "TCU": "AMT_12.vgbx", @@ -16,6 +15,7 @@ "EngineStopStartAtVehicleStopThreshold": 2.0, "EngineStopStartMaxOffTimespan": 120.0, "EngineStopStartUtilityFactor": 0.8, + "EngineStopStartUtilityFactorDriving": 0.8, "EcoRollMinSpeed": 60.000000000000007, "EcoRollActivationDelay": 2.0, "EcoRollUnderspeedThreshold": 0.0, @@ -32,7 +32,8 @@ "DF_offset": 2.5, "DF_scaling": 1.5, "DF_targetSpeedLookup": "", - "Df_velocityDropLookup": "" + "Df_velocityDropLookup": "", + "MinSpeed": 50.0 }, "OverSpeedEcoRoll": { "Mode": "Overspeed", diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto index 89518074b7d61d789a89c25996d26f2b8ecd8e64..fbde9ee8e9ea881e572774930934d3ecd4e1d7a7 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto @@ -1,13 +1,12 @@ -{ +{ "Header": { - "CreatedBy": " ()", - "Date": "2016-10-13T08:55:18.2100810Z", + "CreatedBy": "", + "Date": "2021-08-03T08:50:09.0823144Z", "AppVersion": "3", "FileVersion": 9 }, "Body": { "SavedInDeclMode": false, - "EngineOnlyMode": false, "VehicleFile": "Class5_Tractor_PCC123.vveh", "GearboxFile": "AMT_12.vgbx", "TCU": "AMT_12.vgbx", @@ -16,6 +15,7 @@ "EngineStopStartAtVehicleStopThreshold": 2.0, "EngineStopStartMaxOffTimespan": 120.0, "EngineStopStartUtilityFactor": 0.8, + "EngineStopStartUtilityFactorDriving": 0.8, "EcoRollMinSpeed": 60.000000000000007, "EcoRollActivationDelay": 2.0, "EcoRollUnderspeedThreshold": 0.0, @@ -32,7 +32,8 @@ "DF_offset": 2.5, "DF_scaling": 1.5, "DF_targetSpeedLookup": "", - "Df_velocityDropLookup": "" + "Df_velocityDropLookup": "", + "MinSpeed": 50.0 }, "OverSpeedEcoRoll": { "Mode": "Overspeed", diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto index 5c51dacea382f9a13e9c274c27cca4a93fa80049..e9aea7c08eba30d183fa613cdf8aa6c6945c513c 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto @@ -1,13 +1,12 @@ -{ +{ "Header": { - "CreatedBy": " ()", - "Date": "2016-10-13T08:55:18.2100810Z", + "CreatedBy": "", + "Date": "2021-08-03T08:49:50.2004062Z", "AppVersion": "3", "FileVersion": 9 }, "Body": { "SavedInDeclMode": false, - "EngineOnlyMode": false, "VehicleFile": "Class5_Tractor_PCC123EcoSS.vveh", "GearboxFile": "AMT_12.vgbx", "TCU": "AMT_12.vgbx", @@ -16,6 +15,7 @@ "EngineStopStartAtVehicleStopThreshold": 2.0, "EngineStopStartMaxOffTimespan": 120.0, "EngineStopStartUtilityFactor": 0.8, + "EngineStopStartUtilityFactorDriving": 0.8, "EcoRollMinSpeed": 60.000000000000007, "EcoRollActivationDelay": 2.0, "EcoRollUnderspeedThreshold": 0.0, @@ -32,7 +32,8 @@ "DF_offset": 2.5, "DF_scaling": 1.5, "DF_targetSpeedLookup": "", - "Df_velocityDropLookup": "" + "Df_velocityDropLookup": "", + "MinSpeed": 50.0 }, "OverSpeedEcoRoll": { "Mode": "Overspeed", diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vveh index ced0916e69627c146ceeb21687f06f683d5f8c7f..f7b489b94ed55b9324f2e8ccbd8bc49e4595ec81 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vveh +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vveh @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2017-07-13T14:14:29.3226830Z", + "Date": "2021-08-03T08:50:19.0490707Z", "AppVersion": "3", "FileVersion": 10 }, @@ -11,34 +11,11 @@ "LegislativeClass": "Unknown", "CurbWeight": 8229.0, "CurbWeightExtra": 7500.0, - "Loading": 19300.0, "MassMax": 18.0, - "CdxA": 4.83, + "Loading": 19300.0, "rdyn": 492.0, - "PowertrainConfiguration": "BatteryElectric", "CdCorrMode": "CdofVdecl", "CdCorrFile": "", - "EngineStopStart": true, - "EcoRoll": "None", - "PredictiveCruiseControl": "Option_1_2", - "ATEcoRollReleaseLockupClutch": false, - "VehicleHeight": 3.0, - "ElectricMotors": [ - { - "Count": 2, - "Ratio": 2, - "MechanicalEfficiency": 0.97, - "Position": "B2", - "MotorFile": "GenericEMotor_125kW_485Nm.vem" - } - ], - "Battery": { - "NumPacks": 2, - "BatteryFile": "GenericBattery_243kWh_750V.vbat" - }, - "InitialSoC": 80, - "TorqueLimits": {}, - "IdlingSpeed": 0.0, "AxleConfig": { "Type": "4x2", "Axles": [ @@ -88,6 +65,29 @@ "Type": "VehicleNonDriven" } ] - } + }, + "EngineStopStart": false, + "EcoRoll": "None", + "PredictiveCruiseControl": "Option_1_2", + "ATEcoRollReleaseLockupClutch": false, + "VehicleHeight": 3.0, + "InitialSoC": 80.0, + "PowertrainConfiguration": "BatteryElectric", + "ElectricMotors": [ + { + "Count": 2, + "Ratio": 2.0, + "Position": "E2", + "MotorFile": "GenericEMotor_125kW_485Nm.vem", + "MechanicalEfficiency": 0.97 + } + ], + "Batteries": [ + { + "NumPacks": 2, + "BatteryFile": "GenericBattery_243kWh_750V.vbat", + "StreamId": 0 + } + ] } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vveh index 1d3661e057b3b150dcb74f68cf9d251eeba77f64..28a409d8a28949948679213809c23ea43bc99978 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vveh +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vveh @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2017-07-13T14:14:29.3226830Z", + "Date": "2021-08-03T08:50:05.6779432Z", "AppVersion": "3", "FileVersion": 10 }, @@ -11,34 +11,11 @@ "LegislativeClass": "Unknown", "CurbWeight": 8229.0, "CurbWeightExtra": 7500.0, - "Loading": 19300.0, "MassMax": 18.0, - "CdxA": 4.83, + "Loading": 19300.0, "rdyn": 492.0, - "PowertrainConfiguration": "BatteryElectric", "CdCorrMode": "CdofVdecl", "CdCorrFile": "", - "EngineStopStart": true, - "EcoRoll": "None", - "PredictiveCruiseControl": "Option_1_2_3", - "ATEcoRollReleaseLockupClutch": false, - "VehicleHeight": 3.0, - "ElectricMotors": [ - { - "Count": 2, - "Ratio": 2, - "MechanicalEfficiency": 0.97, - "Position": "B2", - "MotorFile": "GenericEMotor_125kW_485Nm.vem" - } - ], - "Battery": { - "NumPacks": 2, - "BatteryFile": "GenericBattery_243kWh_750V.vbat" - }, - "InitialSoC": 80, - "TorqueLimits": {}, - "IdlingSpeed": 0.0, "AxleConfig": { "Type": "4x2", "Axles": [ @@ -88,6 +65,29 @@ "Type": "VehicleNonDriven" } ] - } + }, + "EngineStopStart": false, + "EcoRoll": "None", + "PredictiveCruiseControl": "Option_1_2_3", + "ATEcoRollReleaseLockupClutch": false, + "VehicleHeight": 3.0, + "InitialSoC": 80.0, + "PowertrainConfiguration": "BatteryElectric", + "ElectricMotors": [ + { + "Count": 2, + "Ratio": 2.0, + "Position": "E2", + "MotorFile": "GenericEMotor_125kW_485Nm.vem", + "MechanicalEfficiency": 0.97 + } + ], + "Batteries": [ + { + "NumPacks": 2, + "BatteryFile": "GenericBattery_243kWh_750V.vbat", + "StreamId": 0 + } + ] } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh index 9023a3a78a2afd87aff7b8514aea0879aecde97a..5e235dcfa224e906dacc22158443d6b47f8481ed 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh @@ -1,7 +1,7 @@ -{ +{ "Header": { "CreatedBy": "", - "Date": "2017-07-13T14:14:29.3226830Z", + "Date": "2021-08-03T08:49:46.2442021Z", "AppVersion": "3", "FileVersion": 10 }, @@ -11,34 +11,11 @@ "LegislativeClass": "Unknown", "CurbWeight": 8229.0, "CurbWeightExtra": 7500.0, - "Loading": 19300.0, "MassMax": 18.0, - "CdxA": 4.83, + "Loading": 19300.0, "rdyn": 492.0, - "PowertrainConfiguration": "BatteryElectric", "CdCorrMode": "CdofVdecl", "CdCorrFile": "", - "EngineStopStart": true, - "EcoRoll": "withEngineStop", - "PredictiveCruiseControl": "Option_1_2_3", - "ATEcoRollReleaseLockupClutch": false, - "VehicleHeight": 3.0, - "ElectricMotors": [ - { - "Count": 2, - "Ratio": 2, - "MechanicalEfficiency": 0.97, - "Position": "B2", - "MotorFile": "GenericEMotor_125kW_485Nm.vem" - } - ], - "Battery": { - "NumPacks": 2, - "BatteryFile": "GenericBattery_243kWh_750V.vbat" - }, - "InitialSoC": 80, - "TorqueLimits": {}, - "IdlingSpeed": 0.0, "AxleConfig": { "Type": "4x2", "Axles": [ @@ -88,6 +65,29 @@ "Type": "VehicleNonDriven" } ] - } + }, + "EngineStopStart": false, + "EcoRoll": "None", + "PredictiveCruiseControl": "Option_1_2_3", + "ATEcoRollReleaseLockupClutch": false, + "VehicleHeight": 3.0, + "InitialSoC": 80.0, + "PowertrainConfiguration": "BatteryElectric", + "ElectricMotors": [ + { + "Count": 2, + "Ratio": 2.0, + "Position": "E2", + "MotorFile": "GenericEMotor_125kW_485Nm.vem", + "MechanicalEfficiency": 0.97 + } + ], + "Batteries": [ + { + "NumPacks": 2, + "BatteryFile": "GenericBattery_243kWh_750V.vbat", + "StreamId": 0 + } + ] } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/GenericEMotor_125kW_485Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/GenericEMotor_125kW_485Nm.vem index 807ce0f57e4820d6ca128cff4d7cfcca941b9ebc..9326b999de924c0109d24cb6895e6b7fc0747ada 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/GenericEMotor_125kW_485Nm.vem +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/GenericEMotor_125kW_485Nm.vem @@ -1,20 +1,33 @@ -{ +{ "Header": { - "CreatedBy": " ()", - "Date": "2016-10-13T08:54:28.7387223Z", + "CreatedBy": "", + "Date": "2021-08-03T08:50:28.1560565Z", "AppVersion": "3", - "FileVersion": 1 + "FileVersion": 3 }, "Body": { "SavedInDeclMode": false, "Model": "Generic Electric Motor", - "FullLoadCurve": "GenericEMotor_125kW_485Nm.vemp", - "DragCurve": "GenericDrag_125kW_485Nm.vemd", - "EfficiencyMap": "GenericMap_125kW_485Nm.vemo", "Inertia": 0.225, - "ContinuousPower": 5000000, - "ContinuousPowerSpeed": 2000, - "OverloadTime": 30, - "ThermalOverloadRecoveryFactor": 0.9 + "ContinuousTorque": 23873.2414637843, + "ContinuousTorqueSpeed": 1999.9999999999998, + "OverloadTorque": 0.0, + "OverloadTorqueSpeed": 0.0, + "OverloadTime": 30.0, + "ThermalOverloadRecoveryFactor": 0.9, + "VoltageLevels": [ + { + "Voltage": 0.0, + "FullLoadCurve": "GenericEMotor_125kW_485Nm.vemp", + "DragCurve": "GenericDrag_125kW_485Nm.vemd", + "EfficiencyMap": "GenericMap_125kW_485Nm.vemo" + }, + { + "Voltage": 1000000000.0, + "FullLoadCurve": "GenericEMotor_125kW_485Nm.vemp", + "DragCurve": "GenericDrag_125kW_485Nm.vemd", + "EfficiencyMap": "GenericMap_125kW_485Nm.vemo" + } + ] } } \ No newline at end of file