From 17e98f7c6f40b7b3ddeaf378f5b7990c8847d6d5 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Mon, 15 May 2023 17:46:10 +0200
Subject: [PATCH] GenericEM Adapter: use generic efficiencies for ADC if presen
---
.../XMLElectricMachinesDeclarationInputDataProvider.cs | 6 ++++--
.../Models/GenericModelData/GenericBusElectricMotorData.cs | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs
index 0543be7d7c..7cbefe7f8c 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 53f0bd859c..1d0b903e0f 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");
--
GitLab