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

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

Pull request #315: Bugfix/VECTO-1778 problems inserting the e pto in vecto

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1778-problems-inserting-the-e-pto-in-vecto to develop

* commit 'df3953b6':
  remove todo, no longer needed
  adding e-PTO to IEPC architecture (engineering mode)
parents 3ef9b38b df3953b6
No related branches found
No related tags found
No related merge requests found
......@@ -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,
......
......@@ -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.");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment