read electrical power as watt in ElectricMotorMapReader

VectoCommon/VectoCommon/InputData/DeclarationInputData.cs

@@ -793,7 +793,9 @@ namespace TUGraz.VectoCommon.InputData
 	public interface IElectricMotorPowerMap
 	{
 		int Gear { get; }
-
+		/// <summary>
+		/// P_el must be in W!
+		/// </summary>
 		TableData PowerMap { get; }
 	}
 	

VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs

@@ -4,15 +4,13 @@ using System.Data;
 using System.IO;
 using System.Linq;
 using TUGraz.VectoCommon.Exceptions;
-using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Models.SimulationComponent.Data;
 using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor;
-using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
 using TUGraz.VectoCore.Utils;
 
-namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
+namespace TUGraz.VectoCore.InputData.Reader.ComponentData
+{
 
     public class ElectricMotorMapReader
 	{
@@ -67,6 +65,8 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
 			return retVal;
 		}
 
+		
+
 		private static List<EfficiencyMap.Entry> GetEntriesAtZeroRpm(List<EfficiencyMap.Entry> entries)
 		{
 			// find entries at first grid point above 0. em-speed might vary slightly,
@@ -138,7 +138,8 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
 			return new EfficiencyMap.Entry(
 				speed: row.ParseDouble(Fields.MotorSpeed).RPMtoRad(),
 				torque: row.ParseDouble(Fields.Torque).SI<NewtonMeter>(),
-				powerElectrical: row.ParseDouble(Fields.PowerElectrical).SI(Unit.SI.Kilo.Watt).Cast<Watt>());
+				//powerElectrical: row.ParseDouble(Fields.PowerElectrical).SI(Unit.SI.Kilo.Watt).Cast<Watt>());
+				powerElectrical: row.ParseDouble(Fields.PowerElectrical).SI<Watt>());
 		}