Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 43cd5299 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Pull request #162: Feature/VECTO-1460 apt n gearbox 

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1460-apt-n-gearbox to develop

* commit 'bc41c98b':
  adding testcases for B2 with APT-N transmission
  renaming test directory
parents cdfaaa4f bc41c98b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 201 additions and 9 deletions
VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
+ 13
− 1
View file @ 43cd5299
......@@ -48,6 +48,9 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
protected const string BEV_E2_Job_BusAux = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_BusAux.vecto";
protected const string BEV_E2_Job_Cont30kW = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_Cont30kW.vecto";
protected const string BEV_E2_APTN_Job = @"TestData\BatteryElectric\GenericVehicleB2_APTN\BEV_B2_Group5LH_rl_APTN.vecto";
public const string MotorFile = @"TestData\BatteryElectric\GenericVehicleB4\GenericEMotor_125kW_485Nm.vem";
public const string BatFile = @"TestData\BatteryElectric\GenericVehicleB4\GenericBattery_243kWh_750V.vbat";
......@@ -660,7 +663,16 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
TestCase(BEV_E2_Job_Cont30kW, 7, TestName = "PEV E2 Cont. 30kW Job Suburban"),
TestCase(BEV_E2_Job_Cont30kW, 8, TestName = "PEV E2 Cont. 30kW Job Urban"),
TestCase(BEV_E2_Job_Cont30kW, 9, TestName = "PEV E2 Cont. 30kW Job UrbanDelivery"),
//TestCase(BEV_Job_Cont30kW, 0, TestName = "PEV E2 Job Cont. 80kW RD")
//TestCase(BEV_Job_Cont30kW, 0, TestName = "PEV E2 Job Cont. 80kW RD")
TestCase(BEV_E2_APTN_Job, 0, TestName = "PEV E2 APT-N Job LongHaul"),
TestCase(BEV_E2_APTN_Job, 1, TestName = "PEV E2 APT-N Job RegionalDelivery"),
TestCase(BEV_E2_APTN_Job, 2, TestName = "PEV E2 APT-N Job UrbanDelivery"),
TestCase(BEV_E2_APTN_Job, 3, TestName = "PEV E2 APT-N Job Construction"),
TestCase(BEV_E2_APTN_Job, 4, TestName = "PEV E2 APT-N Job Urban"),
TestCase(BEV_E2_APTN_Job, 5, TestName = "PEV E2 APT-N Job Suburban"),
TestCase(BEV_E2_APTN_Job, 6, TestName = "PEV E2 APT-N Job Interurban"),
TestCase(BEV_E2_APTN_Job, 7, TestName = "PEV E2 APT-N Job Coach"),
]
public void B2PEVRunJob(string jobFile, int cycleIdx)
{
......
VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
+ 8
− 8
View file @ 43cd5299
......@@ -78,14 +78,14 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto", 7, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Coach"),
]
[
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 0, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, LongHaul"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 1, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, RegionalDelivery"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 2, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, UrbanDelivery"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 3, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Construction"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 4, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Urban"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 5, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Suburban"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 6, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Interurban"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 7, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Coach"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 0, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, LongHaul"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 1, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, RegionalDelivery"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 2, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, UrbanDelivery"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 3, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Construction"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 4, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Urban"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 5, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Suburban"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 6, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Interurban"),
TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 7, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Coach"),
]
public void S2SerialHybridJob(string jobFile, int runIdx)
{
......
VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5LH_rl_APTN.vecto 0 → 100644
+ 57
− 0
View file @ 43cd5299
{
"Header": {
"CreatedBy": "",
"Date": "2021-12-17T13:29:45.3314877Z",
"AppVersion": "3",
"FileVersion": 9
},
"Body": {
"SavedInDeclMode": false,
"VehicleFile": "BEV_B2_Group5_LH_rl.vveh",
"EngineFile": "209kW_7c7l.veng",
"GearboxFile": "3speedAPT-N.vgbx",
"TCU": "3speedAPT-N.vgbx",
"HybridStrategyParams": "Hybrid_Parameters.vhctl",
"Padd_electric": 0.0,
"---BusAux": "xEV_Aux.vaux",
"VACC": "Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,
"EngineStopStartUtilityFactor": 0.8,
"EngineStopStartUtilityFactorDriving": 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": "Overspeed",
"MinSpeed": 50.0,
"OverSpeed": 2.5
},
"Cycles": [
"LongHaul",
"RegionalDelivery",
"UrbanDelivery",
"Construction",
"Urban",
"Suburban",
"Interurban",
"Coach"
]
}
}
\ No newline at end of file
VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh 0 → 100644
+ 104
− 0
View file @ 43cd5299
{
"Header": {
"CreatedBy": "",
"Date": "2021-12-17T13:29:44.1894088Z",
"AppVersion": "3",
"FileVersion": 10
},
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
"LegislativeClass": "Unknown",
"CurbWeight": 10143.4,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
"Loading": 19300.0,
"rdyn": 492.20000000000005,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
"Retarder": {
"Type": "None",
"Ratio": 1.0,
"File": ""
},
"AxleConfig": {
"Type": "4x2",
"Axles": [
{
"Inertia": 14.9,
"Wheels": "315/70 R22.5",
"AxleWeightShare": 0.2,
"TwinTyres": false,
"RRCISO": 0.0034,
"FzISO": 33350.0,
"Type": "VehicleNonDriven"
},
{
"Inertia": 14.9,
"Wheels": "315/70 R22.5",
"AxleWeightShare": 0.25,
"TwinTyres": true,
"RRCISO": 0.004,
"FzISO": 33350.0,
"Type": "VehicleDriven"
},
{
"Inertia": 19.2,
"Wheels": "385/65 R22.5",
"AxleWeightShare": 0.18333,
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 37500.0,
"Type": "Trailer"
},
{
"Inertia": 19.2,
"Wheels": "385/65 R22.5",
"AxleWeightShare": 0.18333,
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 37500.0,
"Type": "Trailer"
},
{
"Inertia": 19.2,
"Wheels": "385/65 R22.5",
"AxleWeightShare": 0.18334,
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 37500.0,
"Type": "Trailer"
}
]
},
"EngineStopStart": false,
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
"CdA": 4.31,
"VehicleHeight": 4.0,
"InitialSoC": 70,
"PowertrainConfiguration": "BatteryElectric",
"ElectricMotors": [
{
"Count": 2,
"Ratio": 1.0,
"Position": "E2",
"MotorFile": "BEV_Group5_EM.vem",
"MechanicalEfficiency": 1.0
}
],
"Batteries": [
{
"NumPacks": 1,
"BatteryFile": "BEV_Group5_REESS.vreess",
"StreamId": 0
},
{
"NumPacks": 1,
"BatteryFile": "BEV_Group5_REESS.vreess",
"StreamId": 1
}
]
}
}
\ No newline at end of file
VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_Group5_REESS.vreess 0 → 100644
+ 19
− 0
View file @ 43cd5299
{
"Header": {
"CreatedBy": "",
"Date": "2021-06-16T09:37:48.3166199Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"SavedInDeclMode": false,
"REESSType": "Battery",
"Model": "Generic Battery",
"Capacity": 300,
"SOC_min": 20,
"SOC_max": 80,
"MaxCurrentMap": "MaxCurrent.vimax",
"InternalResistanceCurve": "GenericBattery_PEV_800V.vbatr",
"SoCCurve": "REESS_SOC_curve.vbatv"
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about