diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs index f7625aa0ce9ab01893a6f950c209d2fbddd89ec7..8b7bca92608930057345eca936436396d7574ccc 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs @@ -223,7 +223,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON ? Body.GetEx<string>(JsonKeys.EM_ElectricMachineType).ParseEnum<ElectricMachineType>() : ElectricMachineType.PSM; - public Watt R85RatedPower => Body.ContainsKey(JsonKeys.EM_RatedPower) ? Body.GetEx<double>(JsonKeys.EM_RatedPower).SI<Watt>() : 0.SI<Watt>(); + public Watt R85RatedPower => Body.ContainsKey(JsonKeys.EM_RatedPower) ? Body.GetEx<double>(JsonKeys.EM_RatedPower).SI(Unit.SI.Kilo.Watt).Cast<Watt>() : 0.SI<Watt>(); public virtual KilogramSquareMeter Inertia => Body.GetEx<double>("Inertia").SI<KilogramSquareMeter>(); //public virtual Joule OverloadBuffer => Body.GetValueOrDefault<double>("ThermalOverloadBuffer")?.SI(Unit.SI.Mega.Joule).Cast<Joule>() ?? 1e18.SI<Joule>(); diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs index aa4aaf14977749556743e51197af40fe2d8530f9..e9efb2011ee464b3ffee079d9aa579a0dd92d650 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs @@ -46,7 +46,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON ? Body.GetEx<string>(JsonKeys.EM_ElectricMachineType).ParseEnum<ElectricMachineType>() : ElectricMachineType.PSM; - public Watt R85RatedPower => Body.ContainsKey(JsonKeys.EM_RatedPower) ? Body.GetEx<double>(JsonKeys.EM_RatedPower).SI<Watt>() : 0.SI<Watt>(); + public Watt R85RatedPower => Body.ContainsKey(JsonKeys.EM_RatedPower) ? Body.GetEx<double>(JsonKeys.EM_RatedPower).SI(Unit.SI.Kilo.Watt).Cast<Watt>() : 0.SI<Watt>(); public KilogramSquareMeter Inertia => Body.GetEx<double>(JsonKeys.IEPC_Inertia).SI<KilogramSquareMeter>(); public bool DifferentialIncluded => Body.GetEx<bool>(JsonKeys.IEPC_DifferentialIncluded); public bool DesignTypeWheelMotor => Body.GetEx<bool>(JsonKeys.IEPC_DesignTypeWheelMotor); diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs index a6ff4d3c0e40f7b3e0a4087841e96111eb4f159c..7faf3d6091895ff4adc1e606d18c06b52caba182 100644 --- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs +++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs @@ -94,7 +94,7 @@ public class JSONFileWriter : IOutputFileWriter { JsonKeys.Engine_Inertia, electricMachine.Inertia.Value() }, { JsonKeys.EM_ElectricMachineType, electricMachine.ElectricMachineType.ToString() }, { JsonKeys.EM_ThermalOverloadRecoveryFactor, electricMachine.OverloadRecoveryFactor }, - { JsonKeys.EM_RatedPower, electricMachine.R85RatedPower.Value() } + { JsonKeys.EM_RatedPower, electricMachine.R85RatedPower.ConvertToKiloWatt().Value } }; var vlevels = GetVoltageLevelEntries(electricMachine.VoltageLevels, filename); @@ -114,7 +114,7 @@ public class JSONFileWriter : IOutputFileWriter { JsonKeys.EM_DragCurve, GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename))}, { JsonKeys.Engine_Inertia, electricMachine.Inertia.Value() }, { JsonKeys.EM_ThermalOverloadRecoveryFactor, electricMachine.OverloadRecoveryFactor }, - { JsonKeys.EM_RatedPower, electricMachine.R85RatedPower.Value().ToGUIFormat() } + { JsonKeys.EM_RatedPower, electricMachine.R85RatedPower.ConvertToKiloWatt().Value } }; @@ -164,7 +164,7 @@ public class JSONFileWriter : IOutputFileWriter {JsonKeys.IEPC_DesignTypeWheelMotor, iepc.DesignTypeWheelMotor}, {JsonKeys.IEPC_NrOfDesignTypeWheelMotorMeasured, iepc.NrOfDesignTypeWheelMotorMeasured}, {JsonKeys.IEPC_ThermalOverloadRecoveryFactor, iepc.OverloadRecoveryFactor}, - { JsonKeys.EM_RatedPower, iepc.R85RatedPower.Value().ToGUIFormat() } + { JsonKeys.EM_RatedPower, iepc.R85RatedPower.ConvertToKiloWatt().Value } }; var gears = new List<Dictionary<string, object>>();