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

Skip to content
Snippets Groups Projects
Commit 60b4cd39 authored by Markus QUARITSCH's avatar Markus QUARITSCH
Browse files

Pull request #922: Bugfix/VECTO-1554 vtp mode according to 2nd amendment

Merge in VECTO/vecto-sim from VECTO/mq_vecto-sim:bugfix/VECTO-1554-vtp-mode-according-to-2nd-amendment to develop

* commit '0ff94601':
  fix: use generic alternator efficiency for converting electric power of engine fan to mechanical power
  Revert "bugfix: corrected expected values for Engine fan auxiliary tests"
parents 2809e108 0ff94601
No related branches found
No related tags found
No related merge requests found
......@@ -51,8 +51,6 @@ namespace TUGraz.VectoCore.Configuration
public const string Prefix = "AUX_";
public const string PowerPrefix = "P_";
public const double FanElectricToMechanicalEfficiency = 1.05;
public static class IDs
{
public const string PTOTransmission = "PTO_TRANSM";
......
......@@ -32,6 +32,7 @@
using System;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
......@@ -64,8 +65,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
public Watt PowerDemand(Watt fanElectricalPower)
{
return fanElectricalPower * Constants.Auxiliaries.FanElectricToMechanicalEfficiency;
{
return fanElectricalPower / DeclarationData.AlternatorEfficiency;
}
}
......
......@@ -53,9 +53,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
}
[
TestCase(14, 14.7),
TestCase(28, 29.4),
TestCase(7, 7.35)
TestCase(14, 20),
TestCase(28, 40),
TestCase(7, 10)
]
public void TestEngineFanPowerDemandWithElectricalPower(double fanElectricalPower, double expectedPowerDemand)
{
......
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