Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

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

Merge branch 'fix/444_hev_s_rated_power' into 'amdm2/develop'

Fix total power calculation for hybrids

See merge request vecto/vecto!173
parents fad93f16 24af6e99
No related branches found
No related tags found
No related merge requests found
......@@ -279,8 +279,7 @@ namespace TUGraz.VectoCore.Models.Declaration
case VectoSimulationJobType.BatteryElectricVehicle:
case VectoSimulationJobType.IEPC_E:
case VectoSimulationJobType.IEPC_S:
return (vehicleData.Components?.EngineInputData?.RatedPowerDeclared ?? 0.SI<Watt>()) +
(vehicleData.Components?.ElectricMachines?.Entries
return (vehicleData.Components?.ElectricMachines?.Entries
.Where(x => x.Position != PowertrainPosition.GEN)
.Sum(x => x.ElectricMachine.R85RatedPower * x.Count) ?? 0.SI<Watt>()) +
(vehicleData.Components?.IEPC?.R85RatedPower ?? 0.SI<Watt>()) +
......
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