Merge branch 'develop' of...

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-sim into develop

VectoCore/VectoCore/Configuration/Constants.cs

@@ -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";

VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineFanAuxiliary.cs

@@ -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;
 		}
 
     }

VectoCore/VectoCoreTest/Models/SimulationComponent/EngineFanAuxTest.cs

@@ -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)
         {