From aa07b19016a77b36343f322f05e1396879aacbf0 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Fri, 3 Mar 2023 12:10:29 +0100
Subject: [PATCH] provide full-load curve for generic iepc data (factor method
---
.../Models/GenericModelData/GenericBusIEPCData.cs | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusIEPCData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusIEPCData.cs
index c9e670316f..3ff291a221 100644
--- a/VectoCore/VectoCore/Models/GenericModelData/GenericBusIEPCData.cs
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusIEPCData.cs
@@ -84,11 +84,11 @@ namespace TUGraz.VectoCore.Models.GenericModelData
{
var result = new List<ElectricMotorVoltageLevelData>();
foreach (var entry in voltageLevels.OrderBy(x => x.VoltageLevel)) {
-
+ var fld = GetElectricMotorFullLoadCurve(entry, count);
var iepcVoltageLevel = new IEPCVoltageLevelData {
- EfficiencyMaps = GetEfficiencyMaps(entry, count, electricMachineType),
+ EfficiencyMaps = GetEfficiencyMaps(entry, count, electricMachineType, fld),
Voltage = entry.VoltageLevel,
- FullLoadCurve = GetElectricMotorFullLoadCurve(entry, count)
+ FullLoadCurve = fld
};
result.Add(iepcVoltageLevel);
}
@@ -103,7 +103,8 @@ namespace TUGraz.VectoCore.Models.GenericModelData
}
- private Dictionary<uint, EfficiencyMap> GetEfficiencyMaps(IElectricMotorVoltageLevel voltageLevel, int count, ElectricMachineType electricMachineType)
+ private Dictionary<uint, EfficiencyMap> GetEfficiencyMaps(IElectricMotorVoltageLevel voltageLevel, int count,
+ ElectricMachineType electricMachineType, ElectricMotorFullLoadCurve fullLoadCurve)
{
var result = new Dictionary<uint, EfficiencyMap>();
@@ -115,7 +116,7 @@ namespace TUGraz.VectoCore.Models.GenericModelData
axleRatio, gearRatioAtMeasurement.Value, GearEfficiency, axleEfficiency);
var deNormalizedMap = DeNormalizeData(GetNormalizedEfficiencyMap(electricMachineType), ratedPoint, gearRatio);
- result.Add((uint) gearEntry.Key, IEPCMapReader.Create(deNormalizedMap, count, gearRatio, null));
+ result.Add((uint) gearEntry.Key, IEPCMapReader.Create(deNormalizedMap, count, gearRatio, fullLoadCurve));
}
return result;
--
GitLab