diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs index 77ec493924ddf45abfdacba5481a8bf754897110..f85c2996a5702b71f60838bb6526fd31d16b4b37 100644 --- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs +++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs @@ -468,9 +468,10 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl var crossWindRequired = vehicle.Components.AirdragInputData.CrossWindCorrectionMode == CrossWindCorrectionMode.VAirBetaLookupTable; - //var ptoTransmissionData = dao.CreatePTOTransmissionData(vehicle.Components.PTOTransmissionInputData); + //var ptoTransmissionData = dao.CreatePTOTransmissionData(vehicle.Components.PTOTransmissionInputData); + var ptoTransmissionData = dao.CreateBatteryElectricPTOTransmissionData(vehicle.Components.PTOTransmissionInputData); - var drivingCycle = GetDrivingCycle(cycle, crossWindRequired); + var drivingCycle = GetDrivingCycle(cycle, crossWindRequired); var vehicleData = dao.CreateVehicleData(vehicle); return new VectoRunData { @@ -486,7 +487,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl BusAuxiliaries = dao.CreateBusAuxiliariesData(vehicle.Components.AuxiliaryInputData, vehicleData, VectoSimulationJobType.BatteryElectricVehicle), Retarder = retarderData, - //PTO = ptoTransmissionData, + PTO = ptoTransmissionData, Cycle = new DrivingCycleProxy(drivingCycle, cycle.Name), ExecutionMode = ExecutionMode.Engineering, ElectricMachinesData = electricMachinesData, diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs index ee52a2d339444dc9200caf9845f32ec4bb8a33b4..742cf172019d1fa5d584350bb8210b5e7fea6043 100644 --- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs +++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs @@ -249,9 +249,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Data } if (runData.Cycle != null && runData.Cycle.Entries.Any(e => e.PTOActive == PTOActivity.PTOActivityDuringStop)) { - if (jobType == VectoSimulationJobType.BatteryElectricVehicle) { - // TODO: MQ 20201020 - validate depending on EM position!? - } if (runData.PTO == null || runData.PTO.PTOCycle == null) { return new ValidationResult("PTOCycle is used in DrivingCycle, but is not defined in Vehicle-Data.");