diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs index 0543be7d7cf3eb91d5704f17b101e9cbc8cf6d50..7cbefe7f8c5863168ff349c9eea0046e4a663ff7 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs @@ -133,7 +133,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider public double Ratio => GetDouble(XMLNames.ADC_Ratio); - public TableData LossMap => ReadTableData(XMLNames.ADC_TorqueLossMap, XMLNames.ADC_TorqueLossMap_Entry, + public virtual TableData LossMap => ReadTableData(XMLNames.ADC_TorqueLossMap, XMLNames.ADC_TorqueLossMap_Entry, new Dictionary<string, string> { { XMLNames.ADC_TorqueLossMap_InputSpeed, XMLNames.ADC_TorqueLossMap_InputSpeed }, { XMLNames.ADC_TorqueLossMap_InputTorque, XMLNames.ADC_TorqueLossMap_InputTorque }, @@ -182,6 +182,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); public XMLADCDeclarationInputDataV01(XmlNode componentNode, string sourceFile) : base(componentNode, sourceFile) { } - } + + public override TableData LossMap => null; + } } diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs index 53f0bd859caeb01096af5b03c98e14539dd82048..1d0b903e0fc62b826ba500b498f14aea49502663 100644 --- a/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs +++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs @@ -32,11 +32,12 @@ namespace TUGraz.VectoCore.Models.GenericModelData var electricMachineType = electricMachineEntry.ElectricMachine.ElectricMachineType; var efficiencyData = GetVoltageLevels(electricMachineEntry, electricMachineType, torqueLimits); var powertrainPosition = electricMachineEntry.Position; - var adcLossMap = electricMachineEntry.MechanicalTransmissionLossMap; + //var adcLossMap = electricMachineEntry.MechanicalTransmissionLossMap; var adcRatio = electricMachineEntry.RatioADC; + var adcLossMap = adcRatio.IsEqual(1) ? 0.98 : 0.96; var lossMap = powertrainPosition == PowertrainPosition.IHPC ? TransmissionLossMapReader.CreateEmADCLossMap(1.0, 1.0, "EM ADC IHPC LossMap Eff") - : adcLossMap != null + : electricMachineEntry.ADC != null ? TransmissionLossMapReader.CreateEmADCLossMap(adcLossMap, adcRatio, "EM ADC LossMap") : TransmissionLossMapReader.CreateEmADCLossMap(DeclarationData.ElectricMachineDefaultMechanicalTransmissionEfficiency, adcRatio, "EM ADC LossMap Eff");