From 6a1449e38bb60aa719c80ad43238dc4ee55cc6f9 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Fri, 5 May 2023 10:50:45 +0200
Subject: [PATCH] bugfix de-normalizing generic EM-Maps

---
 .../Models/GenericModelData/GenericRatedPointHelper.cs        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericRatedPointHelper.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericRatedPointHelper.cs
index 158d5d0411..e3ddb81089 100644
--- a/VectoCore/VectoCore/Models/GenericModelData/GenericRatedPointHelper.cs
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericRatedPointHelper.cs
@@ -25,7 +25,7 @@ namespace TUGraz.VectoCore.Models.GenericModelData
 
 		private Watt GetPRated()
 		{
-			return (NRated.Value() * TRated.Value() * Math.PI / 30000).SI<Watt>();
+			return NRated * TRated;
 		}
 	}
 
@@ -77,7 +77,7 @@ namespace TUGraz.VectoCore.Models.GenericModelData
 		public static RatedPoint GetRatedPointOfFullLoadCurveAtEM(TableData fullLoadCurve)
 		{
             var n = ElectricMotorRatedSpeedHelper.GetRatedSpeed(fullLoadCurve.AsEnumerable(),
-                row => row.ParseDouble(MotorSpeedColumn).SI<PerSecond>(), row => row.ParseDouble(TorqueDriveColumn).SI<NewtonMeter>());
+                row => row.ParseDouble(MotorSpeedColumn).RPMtoRad(), row => row.ParseDouble(TorqueDriveColumn).SI<NewtonMeter>());
 
             var tDrive = fullLoadCurve.AsEnumerable()
                 .Max(row => row.ParseDouble(TorqueDriveColumn).SI<NewtonMeter>());
-- 
GitLab