Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 61e65bf0 authored by Stefanos DOUMPOULAKIS's avatar Stefanos DOUMPOULAKIS
Browse files

Merge branch 'bugfix/CodeEU-202_XMLSchema_adaptations' into 'amdm2/develop'

regression update: consider ADC ratio for EM contribution to max propulsion torque

See merge request vecto/vecto!134
parents 4f072b61 e8821ae8
No related branches found
No related tags found
No related merge requests found
......@@ -35,6 +35,8 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
var isP3OrP4Hybrid = archId.IsOneOf(ArchitectureID.P3, ArchitectureID.P4);
var isAtGearbox = gearboxData.Type.IsOneOf(GearboxType.ATSerial, GearboxType.ATPowerSplit);
var em = isP3OrP4Hybrid ? null : emData.First(x => x.Item1 != PowertrainPosition.GEN).Item2;
var ratioAdc = em?.RatioADC ?? 1.0;
foreach (var key in engineData.FullLoadCurves.Keys)
{
if (key == 0)
......@@ -62,13 +64,14 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
gbxLimit.Add(new VehicleMaxPropulsionTorque.FullLoadEntry() {
MotorSpeed = 0.RPMtoRad(),
FullDriveTorque = VectoMath.Min(gearboxData.Gears[key].MaxTorque,
(em?.EfficiencyData.VoltageLevels.Last().FullLoadDriveTorque(0.RPMtoRad()) ?? 0.SI<NewtonMeter>()))
(em?.EfficiencyData.VoltageLevels.Last().FullLoadDriveTorque(0.RPMtoRad()) ?? 0.SI<NewtonMeter>() * ratioAdc))
});
foreach (var iceEntry in engineData.FullLoadCurves[0].FullLoadEntries) {
gbxLimit.Add(new VehicleMaxPropulsionTorque.FullLoadEntry() {
MotorSpeed = iceEntry.EngineSpeed,
FullDriveTorque = VectoMath.Min(gearboxData.Gears[key].MaxTorque,
iceEntry.TorqueFullLoad + (em?.EfficiencyData.VoltageLevels.Last().FullLoadDriveTorque(iceEntry.EngineSpeed) ?? 0.SI<NewtonMeter>()))
iceEntry.TorqueFullLoad + (em?.EfficiencyData.VoltageLevels.Last().FullLoadDriveTorque(
iceEntry.EngineSpeed * ratioAdc) * ratioAdc ?? 0.SI<NewtonMeter>()))
});
}
var bKey = isAtGearbox
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment