diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb index 654e6e209cc6a48951f30227f67a13e65664b543..dc56b8a8bdeed325521f92783287cc6dae5c7e42 100644 --- a/VECTO/Input Files/VectoJob.vb +++ b/VECTO/Input Files/VectoJob.vb @@ -563,7 +563,7 @@ Public Class VectoJob End If - result = jobData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering), vehicleInputData.VehicleType, vehicleInputData.Components.ElectricMachines?.Entries.FirstOrDefault()?.Position, If(jobData.GearboxData?.Type, GearboxType.NoGeabox), False) + result = jobData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering), vehicleInputData.VehicleType, vehicleInputData.Components.ElectricMachines?.Entries.FirstOrDefault()?.Position, If(jobData.GearboxData?.Type, GearboxType.NoGearbox), False) If result.Any() Then Return _ New ValidationResult("Vecto Job Configuration is invalid. ", result.Select(Function(r) r.ErrorMessage).ToList()) diff --git a/VectoCommon/VectoCommon/Models/GearboxType.cs b/VectoCommon/VectoCommon/Models/GearboxType.cs index 753c5b89187216f39f4bb227ff6366848df01c19..1703c47360b8ea1abb80b9e5f72030dd81d5f9d2 100644 --- a/VectoCommon/VectoCommon/Models/GearboxType.cs +++ b/VectoCommon/VectoCommon/Models/GearboxType.cs @@ -45,7 +45,7 @@ namespace TUGraz.VectoCommon.Models ATPowerSplit, //Custom, DrivingCycle, - NoGeabox + NoGearbox } public static class GearBoxTypeHelper diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs index 9cb330b27c6afcf5c54ee5cd0ebbbdbdc8f39b53..4d46e77a52f6393226b070ad3155530f668e121e 100644 --- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs @@ -784,7 +784,7 @@ namespace TUGraz.VectoCore.OutputData { var data = runData.VehicleData; //if (runData.VehicleData.b) - var gbxType = runData.GearboxData?.Type ?? GearboxType.NoGeabox; + var gbxType = runData.GearboxData?.Type ?? GearboxType.NoGearbox; row[Fields.VEHICLE_MANUFACTURER] = data.Manufacturer; row[Fields.VIN_NUMBER] = data.VIN; diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs index 09d1ae1d1e98ae9e3c7d6d2ff55f80e3b30054db..bf2ec9ee61f5a2a19bb34e2915afa017bdb6ef32 100644 --- a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs +++ b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs @@ -1364,7 +1364,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid public static JobContainer CreateEngineeringRun(DrivingCycleData cycleData, string modFileName, double initialSoc, PowertrainPosition pos, double ratio, bool largeMotor = false, double pAuxEl = 0, - Kilogram payload = null, Watt maxDriveTrainPower = null, GearboxType gearboxType = GearboxType.NoGeabox) + Kilogram payload = null, Watt maxDriveTrainPower = null, GearboxType gearboxType = GearboxType.NoGearbox) { var fileWriter = new FileOutputWriter(Path.GetFileNameWithoutExtension(modFileName)); var sumData = new SummaryDataContainer(fileWriter); @@ -1387,7 +1387,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid public static VehicleContainer CreateParallelHybridPowerTrain(DrivingCycleData cycleData, string modFileName, double initialBatCharge, bool largeMotor, SummaryDataContainer sumData, double pAuxEl, - PowertrainPosition pos, double ratio, Kilogram payload = null, Watt maxDriveTrainPower = null, GearboxType gearboxType = GearboxType.NoGeabox) + PowertrainPosition pos, double ratio, Kilogram payload = null, Watt maxDriveTrainPower = null, GearboxType gearboxType = GearboxType.NoGearbox) { var gearboxData = CreateGearboxData(gearboxType); var axleGearData = CreateAxleGearData(gearboxType); @@ -1677,11 +1677,11 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid return motor; } - private static GearboxData CreateGearboxData(GearboxType gearboxType = GearboxType.NoGeabox) + private static GearboxData CreateGearboxData(GearboxType gearboxType = GearboxType.NoGearbox) { switch (gearboxType) { - case GearboxType.NoGeabox: + case GearboxType.NoGearbox: case GearboxType.AMT: return CreateAMTGearbox(); case GearboxType.ATSerial: