diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericRatedPointHelper.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericRatedPointHelper.cs index 158d5d0411679432f67914740ab45f9bb895a3f4..e3ddb81089746f713bb7faa48fcecd50d6a8083d 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>());