Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 17e98f7c authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

GenericEM Adapter: use generic efficiencies for ADC if presen

parent 9d2ac812
No related branches found
No related tags found
No related merge requests found
......@@ -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;
}
}
......@@ -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");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment