diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusBatteryData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusBatteryData.cs
new file mode 100644
index 0000000000000000000000000000000000000000..3097eed69b70cdadbab6f21cf5b800d5b78619b3
--- /dev/null
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusBatteryData.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Battery;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.Models.GenericModelData
+{
+ public class GenericBusBatteryData
+ {
+ public BatterySystemData CreateBatteryData(IElectricStorageSystemDeclarationInputData batteryData, double initialSOC)
+ {
+ var currentBatteryData = batteryData.ElectricStorageElements
+ .Where(x => x.REESSPack.StorageType == REESSType.Battery).ToList();
+
+ if (currentBatteryData.Count == 0)
+ return null;
+
+ return new BatterySystemData
+ {
+ InitialSoC = initialSOC,
+ Batteries = GetBatteries(currentBatteryData)
+ };
+ }
+
+ private List<Tuple<int, BatteryData>> GetBatteries(List<IElectricStorageDeclarationInputData> currentBatteries)
+ {
+ var result = new List<Tuple<int, BatteryData>>();
+
+ foreach (var currentBattery in currentBatteries) {
+ var entry = new Tuple<int, BatteryData>(currentBattery.StringId,
+ GetBatteryData(currentBattery.REESSPack as IBatteryPackDeclarationInputData));
+ result.Add(entry);
+ }
+
+ return result;
+ }
+
+ private BatteryData GetBatteryData(IBatteryPackDeclarationInputData battery)
+ {
+ return new BatteryData {
+ MinSOC = battery.MinSOC ?? double.NaN,
+ MaxSOC = battery.MaxSOC ?? double.NaN,
+ MaxCurrent = BatteryMaxCurrentReader.Create(battery.MaxCurrentMap),
+ Capacity = battery.Capacity,
+ InternalResistance = GetGenericInternalResistanceMap(battery),
+ SOCMap = BatterySOCReader.Create(battery.VoltageCurve)
+ };
+ }
+
+ private InternalResistanceMap GetGenericInternalResistanceMap(IBatteryPackDeclarationInputData battery)
+ {
+ var vNominal = GetNominalVoltage(battery.VoltageCurve);
+ var resistance = 0.0;
+
+ if (battery.BatteryType == BatteryType.HPBS)
+ resistance = GetHPBSResistance(battery.Capacity.AsAmpHour, vNominal);
+ else if (battery.BatteryType == BatteryType.HEBS)
+ resistance = GetHEBSResistance(battery.Capacity.AsAmpHour, vNominal);
+
+ return BatteryInternalResistanceReader.Create(GetGenericResistanceDataTable(battery.BatteryType, resistance), true);
+ }
+
+ private DataTable GetGenericResistanceDataTable(BatteryType batteryType, double resistance)
+ {
+ var result = new DataTable();
+ result.Columns.Add(BatteryInternalResistanceReader.Fields.StateOfCharge);
+ result.Columns.Add(BatteryInternalResistanceReader.Fields.InternalResistance_2);
+ result.Columns.Add(BatteryInternalResistanceReader.Fields.InternalResistance_10);
+ result.Columns.Add(BatteryInternalResistanceReader.Fields.InternalResistance_20);
+
+ if (batteryType == BatteryType.HEBS)
+ result.Columns.Add(BatteryInternalResistanceReader.Fields.InternalResistance_120);
+
+ for (int r = 0; r < 2; r++) {
+
+ var soc = r == 0 ? 0 : 100;
+ result.Rows.Add(result.NewRow());
+ result.Rows[r][BatteryInternalResistanceReader.Fields.StateOfCharge] = soc;
+ result.Rows[r][BatteryInternalResistanceReader.Fields.InternalResistance_2] = resistance;
+ result.Rows[r][BatteryInternalResistanceReader.Fields.InternalResistance_10] = resistance;
+ result.Rows[r][BatteryInternalResistanceReader.Fields.InternalResistance_20] = resistance;
+ if (batteryType == BatteryType.HEBS)
+ result.Rows[r][BatteryInternalResistanceReader.Fields.InternalResistance_120] = resistance;
+ }
+
+ return result;
+ }
+
+ private Volt GetNominalVoltage(TableData ocvData)
+ {
+ var sortedOcvData = ocvData.AsEnumerable().OrderBy(x => x.ParseDouble(XMLNames.REESS_OCV_SoC)).ToList();
+
+ for (int i = 0; i < sortedOcvData.Count; i++) {
+
+ var soc = sortedOcvData[i].ParseDouble(XMLNames.REESS_OCV_SoC);
+ if (soc >= 50) {
+
+ int fstIndex;
+ int secIndex;
+ if (i < sortedOcvData.Count - 1) {
+ fstIndex = i;
+ secIndex = i + 1;
+ } else {
+ fstIndex = i - 1;
+ secIndex = i;
+ }
+
+ var fstSoC = sortedOcvData[fstIndex].ParseDouble(XMLNames.REESS_OCV_SoC);
+ var secSoC = sortedOcvData[secIndex].ParseDouble(XMLNames.REESS_OCV_SoC);
+ var fstOCV = sortedOcvData[fstIndex].ParseDouble(XMLNames.REESS_OCV_OCV);
+ var secOCV = sortedOcvData[secIndex].ParseDouble(XMLNames.REESS_OCV_OCV);
+
+ return VectoMath.Interpolate(fstSoC, secSoC, fstOCV, secOCV, 50).SI<Volt>();
+ }
+ }
+
+ return null;
+ }
+
+ private double GetHPBSResistance(double ratedCapacity, Volt vNominal)
+ {
+ return (25 / ratedCapacity ) * (vNominal.Value() / 3.3);
+ }
+
+ private double GetHEBSResistance(double ratedCapacity, Volt vNominal)
+ {
+ return (140 / ratedCapacity) * (vNominal.Value() / 3.7);
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusEMBase.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusEMBase.cs
new file mode 100644
index 0000000000000000000000000000000000000000..4fbe6fb03959928b95023b2b46a01cad7acc8b2a
--- /dev/null
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusEMBase.cs
@@ -0,0 +1,50 @@
+using System.IO;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.Models.GenericModelData
+{
+ public abstract class GenericBusEMBase
+ {
+ #region Constants
+
+ public const string MotorSpeedNorm = "n_norm";
+ public const string TorqueNorm = "T_norm";
+ public const string PowerElectricalNorm = "Pel_norm";
+
+
+ protected string GenericEfficiencyMap_ASM {get; set;}
+ protected string GenericEfficiencyMap_PSM {get; set;}
+
+ #endregion
+
+ protected TableData GetNormalizedEfficiencyMap(ElectricMachineType electricMachineType)
+ {
+ switch (electricMachineType)
+ {
+ case ElectricMachineType.ASM:
+ case ElectricMachineType.ESM:
+ case ElectricMachineType.RM:
+ return ReadCsvResource(GenericEfficiencyMap_ASM);
+ case ElectricMachineType.PSM:
+ return ReadCsvResource(GenericEfficiencyMap_PSM);
+ default:
+ return null;
+ }
+ }
+
+ protected TableData ReadCsvResource(string ressourceId)
+ {
+ var tmp = ressourceId.Replace(DeclarationData.DeclarationDataResourcePrefix + ".", "");
+ var parts = tmp.Split('.');
+ var fileName = Path.Combine("Declaration", string.Join(".", parts[parts.Length - 2], parts[parts.Length - 1]));
+ if (File.Exists(fileName))
+ {
+ return VectoCSVFile.Read(fileName);
+ }
+
+ return VectoCSVFile.ReadStream(RessourceHelper.ReadStream(ressourceId), source: ressourceId);
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs
new file mode 100644
index 0000000000000000000000000000000000000000..86659bc87325daac252c03cd6f1ec65315243f84
--- /dev/null
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.Models.GenericModelData
+{
+ public class GenericBusElectricMotorData : GenericBusEMBase
+ {
+ public GenericBusElectricMotorData()
+ {
+ GenericEfficiencyMap_ASM =
+ $"{DeclarationData.DeclarationDataResourcePrefix}.GenericBusData.EfficiencyMap_ASM_normalized.vmap";
+ GenericEfficiencyMap_PSM =
+ $"{DeclarationData.DeclarationDataResourcePrefix}.GenericBusData.EfficiencyMap_PSM_normalized.vmap";
+ }
+
+
+ public ElectricMotorData CreateGenericElectricMotorData(ElectricMachineEntry<IElectricMotorDeclarationInputData> electricMachineEntry)
+ {
+ var electricMachineType = electricMachineEntry.ElectricMachine.ElectricMachineType;
+
+ var electricMotorData = new ElectricMotorData {
+ RatioPerGear = electricMachineEntry.RatioPerGear,
+ EMDragCurve = ElectricMotorDragCurveReader.Create(electricMachineEntry.ElectricMachine.DragCurve,
+ electricMachineEntry.Count),
+ EfficiencyData = GetVoltageLevels(electricMachineEntry, electricMachineType),
+ Inertia = electricMachineEntry.ElectricMachine.Inertia * electricMachineEntry.Count,//??
+ RatioADC = electricMachineEntry.RatioADC
+ //electricMotorData.OverloadRegenerationFactor
+ //electricMotorData.Overload
+ //electricMotorData.TransmissionLossMap
+ };
+
+ return electricMotorData;
+ }
+
+
+ private VoltageLevelData GetVoltageLevels(ElectricMachineEntry<IElectricMotorDeclarationInputData> electricMachineEntry,
+ ElectricMachineType electricMachineType)
+ {
+ var voltageLevels = electricMachineEntry.ElectricMachine.VoltageLevels;
+ var count = electricMachineEntry.Count;
+ var normalizedMap = GetNormalizedEfficiencyMap(electricMachineType);
+
+
+ return new VoltageLevelData {
+ VoltageLevels = GetElectricMotorVoltageLevelData(voltageLevels, count, normalizedMap)
+ };
+ }
+
+
+ private List<ElectricMotorVoltageLevelData> GetElectricMotorVoltageLevelData(IList<IElectricMotorVoltageLevel> voltageLevels, int count, TableData normalizedMap)
+ {
+ var result = new List<ElectricMotorVoltageLevelData>();
+
+ foreach (var voltageLevel in voltageLevels) {
+
+ var ratedPoint = GenericRatedPointHelper.GetRatedPointOfFullLoadCurveAtEM(voltageLevels[0].FullLoadCurve);
+ var efficiencyMap = DeNormalizeData(normalizedMap, ratedPoint);
+
+ var electricMotorVoltageLevel = new ElectricMotorVoltageLevelData {
+ Voltage = voltageLevel.VoltageLevel,
+ FullLoadCurve = GetElectricMotorFullLoadCurve(voltageLevel.FullLoadCurve),
+ EfficiencyMap = ElectricMotorMapReader.Create(efficiencyMap, count)
+ };
+
+ result.Add(electricMotorVoltageLevel);
+ }
+
+ return result;
+ }
+
+
+ private ElectricMotorFullLoadCurve GetElectricMotorFullLoadCurve(TableData fullLoadCurve)
+ {
+ var entries = new List<ElectricMotorFullLoadCurve.FullLoadEntry>();
+
+ foreach (DataRow row in fullLoadCurve.Rows) {
+ entries.Add(new ElectricMotorFullLoadCurve.FullLoadEntry {
+ MotorSpeed = row.ParseDouble("outShaftSpeed").SI<PerSecond>(),
+ FullGenerationTorque = row.ParseDouble("minTorque").SI<NewtonMeter>(),
+ FullDriveTorque = row.ParseDouble("maxTorque").SI<NewtonMeter>()
+ });
+ }
+
+ return new ElectricMotorFullLoadCurve(entries);
+ }
+
+
+ private DataTable DeNormalizeData(TableData normalizedMap, RatedPoint ratedPoint)
+ {
+ var result = new DataTable();
+ result.Columns.Add(ElectricMotorMapReader.Fields.MotorSpeed);
+ result.Columns.Add(ElectricMotorMapReader.Fields.Torque);
+ result.Columns.Add(ElectricMotorMapReader.Fields.PowerElectrical);
+
+ foreach (DataRow row in normalizedMap.Rows) {
+ var motorSpeed = row.ParseDouble(MotorSpeedNorm) * ratedPoint.NRated;
+ var torque = row.ParseDouble(TorqueNorm) * ratedPoint.TRated;
+ var powerElectrical = row.ParseDouble(PowerElectricalNorm) * ratedPoint.PRated;
+
+ var newRow = result.NewRow();
+ newRow[ElectricMotorMapReader.Fields.MotorSpeed] = Math.Round(motorSpeed.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
+ newRow[ElectricMotorMapReader.Fields.Torque] = Math.Round(torque.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
+ newRow[ElectricMotorMapReader.Fields.PowerElectrical] = Math.Round(powerElectrical.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
+ result.Rows.Add(newRow);
+ }
+
+ return result;
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusIEPCData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusIEPCData.cs
new file mode 100644
index 0000000000000000000000000000000000000000..04d091041fb67d5720d7b50e07b378f9498144f4
--- /dev/null
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusIEPCData.cs
@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor;
+using TUGraz.VectoCore.Utils;
+
+
+namespace TUGraz.VectoCore.Models.GenericModelData
+{
+ public class GenericBusIEPCData : GenericBusEMBase
+ {
+ #region Constant
+
+ public const double GearEfficiency = 0.95;
+
+ #endregion
+
+ private double axleEfficiency;
+ private Dictionary<int, double> gearRatios;
+ private double axleRatio;
+ private KeyValuePair<int, double> gearRatioAtMeasurement;
+
+ public GenericBusIEPCData()
+ {
+ GenericEfficiencyMap_ASM =
+ $"{DeclarationData.DeclarationDataResourcePrefix}.GenericBusData.EfficiencyMap_IEPC_ASM_normalized.vmap";
+ GenericEfficiencyMap_PSM =
+ $"{DeclarationData.DeclarationDataResourcePrefix}.GenericBusData.EfficiencyMap_IEPC_PSM_normalized.vmap";
+ }
+
+ public IEPCElectricMotorData CreateIEPCElectricMotorData(IIEPCDeclarationInputData iepcData, IAxleGearInputData axleGearData)
+ {
+ InitData(iepcData, axleGearData);
+
+ var count = iepcData.DesignTypeWheelMotor && iepcData.NrOfDesignTypeWheelMotorMeasured == 1 ? 2 : 1; //? also for declaration mode valid
+
+ var iepcEM = new IEPCElectricMotorData {
+ IEPCDragCurves = GetIEPCDragCurves(iepcData, count),
+ EfficiencyData = GetIEPCVoltageLevelData(iepcData.VoltageLevels, count, iepcData.ElectricMachineType),
+ Inertia = iepcData.Inertia * count,
+ RatioPerGear = gearRatios.Select(x => x.Value).ToArray()
+ //iepcEM.OverloadRegenerationFactor
+ //iepcEM.RatioADC
+ //iepcEM.TransmissionLossMap
+ //iepcEM.EMDragCurve
+ //iepcEM.Overload
+ };
+
+ return iepcEM;
+ }
+
+ private void InitData(IIEPCDeclarationInputData iepcData, IAxleGearInputData axleGear)
+ {
+ if (!iepcData.DifferentialIncluded) {
+ axleEfficiency = 1;
+ axleRatio = 1;
+ } else {
+ axleEfficiency = axleGear.Efficiency;
+ axleRatio = axleGear.Ratio;
+ }
+
+ gearRatios = new Dictionary<int, double>();
+ foreach (var gear in iepcData.Gears.OrderBy(x => x.GearNumber)) {
+ gearRatios.Add(gear.GearNumber, gear.Ratio);
+ }
+
+ gearRatioAtMeasurement = GetGearRatioAtMeasurement();
+ }
+
+ private VoltageLevelData GetIEPCVoltageLevelData(IList<IElectricMotorVoltageLevel> voltageLevels, int count, ElectricMachineType electricMachineType)
+ {
+ return new VoltageLevelData {
+ VoltageLevels = GetElectricMotorVoltageLevelData(voltageLevels, count, electricMachineType)
+ };
+ }
+
+ private List<ElectricMotorVoltageLevelData> GetElectricMotorVoltageLevelData(IList<IElectricMotorVoltageLevel> voltageLevels, int count, ElectricMachineType electricMachineType)
+ {
+ var result = new List<ElectricMotorVoltageLevelData>();
+ foreach (var entry in voltageLevels.OrderBy(x => x.VoltageLevel)) {
+
+ var iepcVoltageLevel = new IEPCVoltageLevelData {
+ EfficiencyMaps = GetEfficiencyMaps(entry, count, electricMachineType),
+ Voltage = entry.VoltageLevel,
+ FullLoadCurve = GetElectricMotorFullLoadCurve(entry, count)
+ };
+ result.Add(iepcVoltageLevel);
+ }
+
+ return result;
+ }
+
+ private ElectricMotorFullLoadCurve GetElectricMotorFullLoadCurve(IElectricMotorVoltageLevel voltageLevel,
+ int count)
+ {
+ return IEPCFullLoadCurveReader.Create(voltageLevel.FullLoadCurve, count, gearRatioAtMeasurement.Value);
+ }
+
+
+ private Dictionary<uint, EfficiencyMap> GetEfficiencyMaps(IElectricMotorVoltageLevel voltageLevel, int count, ElectricMachineType electricMachineType)
+ {
+ var result = new Dictionary<uint, EfficiencyMap>();
+
+ foreach (var gearEntry in gearRatios) {
+
+ var gearRatio = gearEntry.Value;
+
+ var ratedPoint = GenericRatedPointHelper.GetRatedPointOfFullLoadCurveAtIEPC(voltageLevel.FullLoadCurve,
+ axleRatio, gearRatioAtMeasurement.Value, GearEfficiency, axleEfficiency);
+
+ var deNormalizedMap = DeNormalizeData(GetNormalizedEfficiencyMap(electricMachineType), ratedPoint, gearRatio);
+ result.Add((uint) gearEntry.Key, IEPCMapReader.Create(deNormalizedMap, count, gearRatio));
+ }
+
+ return result;
+ }
+
+
+ private Dictionary<uint, DragCurve> GetIEPCDragCurves(IIEPCDeclarationInputData iepcData, int count)
+ {
+ var result = new Dictionary<uint, DragCurve>();
+
+ foreach (var dragCurve in iepcData.DragCurves) {
+
+ if(!dragCurve.Gear.HasValue)
+ continue;
+
+ var ratio = iepcData.Gears.First(x => x.GearNumber == dragCurve.Gear.Value).Ratio;
+ result.Add((uint)dragCurve.Gear.Value, IEPCDragCurveReader.Create(dragCurve.DragCurve, count, ratio));
+ }
+
+ return result;
+ }
+
+
+ private KeyValuePair<int, double> GetGearRatioAtMeasurement()
+ {
+ var gear = gearRatios.Select(x => new {
+ Gear = x.Key,
+ Ratio = x.Value,
+ Distance = Math.Abs(x.Value - 1)
+ }).OrderBy(x => x.Distance).GroupBy(x => x.Distance).First().MaxBy(x => x.Ratio);
+
+ return new KeyValuePair<int, double>(gear.Gear, gear.Ratio);
+ }
+
+
+ private DataTable DeNormalizeData(TableData normalizedMap, RatedPoint ratedPoint, double gearRatio)
+ {
+ var result = new DataTable();
+ result.Columns.Add(ElectricMotorMapReader.Fields.MotorSpeed);
+ result.Columns.Add(ElectricMotorMapReader.Fields.Torque);
+ result.Columns.Add(ElectricMotorMapReader.Fields.PowerElectrical);
+
+ foreach (DataRow row in normalizedMap.Rows) {
+ var torqueNormValue = row.ParseDouble(TorqueNorm);
+ var motorSpeed = row.ParseDouble(MotorSpeedNorm) * ratedPoint.NRated / gearRatio / axleRatio;
+ var torque = torqueNormValue * ratedPoint.TRated * gearRatio * axleRatio *
+ ( torqueNormValue > 0 ? GearEfficiency * axleEfficiency : 1 / GearEfficiency * axleEfficiency);
+ var powerElectrical = row.ParseDouble(PowerElectricalNorm) * ratedPoint.PRated;
+
+ var newRow = result.NewRow();
+ newRow[ElectricMotorMapReader.Fields.MotorSpeed] = Math.Round(motorSpeed.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
+ newRow[ElectricMotorMapReader.Fields.Torque] = Math.Round(torque.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
+ newRow[ElectricMotorMapReader.Fields.PowerElectrical] = Math.Round(powerElectrical.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
+ result.Rows.Add(newRow);
+ }
+
+ return result;
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusIHPCData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusIHPCData.cs
new file mode 100644
index 0000000000000000000000000000000000000000..126d5735836fe981929d8d3c85f8eafa1f5ff4c1
--- /dev/null
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusIHPCData.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.Models.GenericModelData
+{
+ public class GenericBusIHPCData : GenericBusEMBase
+ {
+ public GenericBusIHPCData()
+ {
+ GenericEfficiencyMap_ASM =
+ $"{DeclarationData.DeclarationDataResourcePrefix}.GenericBusData.EfficiencyMap_ASM_normalized.vmap";
+
+ GenericEfficiencyMap_PSM =
+ $"{DeclarationData.DeclarationDataResourcePrefix}.GenericBusData.EfficiencyMap_PSM_normalized.vmap";
+ }
+
+
+ public ElectricMotorData CreateGenericBusIHPCData(
+ ElectricMachineEntry<IElectricMotorDeclarationInputData> electricMachineEntry,
+ ElectricMachineType electricMachineType, IGearboxDeclarationInputData gearboxData)
+ {
+ var electricMotorData = new ElectricMotorData {
+ EfficiencyData = GetVoltageLevels(electricMachineEntry, electricMachineType, gearboxData),
+ Inertia = electricMachineEntry.ElectricMachine.Inertia * electricMachineEntry.Count,
+ RatioADC = electricMachineEntry.RatioADC
+ };
+
+ return electricMotorData;
+ }
+
+
+ private VoltageLevelData GetVoltageLevels(
+ ElectricMachineEntry<IElectricMotorDeclarationInputData> electricMachineEntry,
+ ElectricMachineType electricMachineType, IGearboxDeclarationInputData gearboxData)
+ {
+ var voltageLevels = electricMachineEntry.ElectricMachine.VoltageLevels;
+ var count = electricMachineEntry.Count;
+ var normalizedMap = GetNormalizedEfficiencyMap(electricMachineType);
+
+ return new VoltageLevelData {
+ VoltageLevels = GetElectricMotorVoltageLevelData(voltageLevels, count, normalizedMap, gearboxData)
+ };
+ }
+
+
+ private List<ElectricMotorVoltageLevelData> GetElectricMotorVoltageLevelData(
+ IList<IElectricMotorVoltageLevel> voltageLevels, int count, TableData normalizedMap, IGearboxDeclarationInputData gearboxData)
+ {
+ var result = new List<ElectricMotorVoltageLevelData>();
+
+ foreach (var voltageLevel in voltageLevels) {
+
+ var ratedPoint = GenericRatedPointHelper.GetRatedPointOfFullLoadCurveAtEM(voltageLevels[0].FullLoadCurve);
+
+ var ihpcVoltageLevel = new IHPCVoltageLevelData {
+ Voltage = voltageLevel.VoltageLevel,
+ FullLoadCurve = GetElectricMotorFullLoadCurve(voltageLevel.FullLoadCurve),
+ EfficiencyMaps = GetEfficiencyMaps(ratedPoint, normalizedMap, gearboxData,count)
+ };
+
+ result.Add(ihpcVoltageLevel);
+ }
+
+ return result;
+ }
+
+
+ private Dictionary<uint, EfficiencyMap> GetEfficiencyMaps(RatedPoint ratedPoint, TableData normalizedMap,
+ IGearboxDeclarationInputData gearboxData, int count)
+ {
+ var result = new Dictionary<uint, EfficiencyMap>();
+
+ var efficiencyMap = DeNormalizeData(normalizedMap, ratedPoint);
+
+ foreach (var gearData in gearboxData.Gears.OrderBy(x => x.Gear)) {
+ result.Add((uint)gearData.Gear, ElectricMotorMapReader.Create(efficiencyMap, count));
+ }
+
+ return result;
+ }
+
+
+ private ElectricMotorFullLoadCurve GetElectricMotorFullLoadCurve(TableData fullLoadCurve)
+ {
+ var entries = new List<ElectricMotorFullLoadCurve.FullLoadEntry>();
+
+ foreach (DataRow row in fullLoadCurve.Rows)
+ {
+ entries.Add(new ElectricMotorFullLoadCurve.FullLoadEntry
+ {
+ MotorSpeed = row.ParseDouble("outShaftSpeed").SI<PerSecond>(),
+ FullGenerationTorque = row.ParseDouble("minTorque").SI<NewtonMeter>(),
+ FullDriveTorque = row.ParseDouble("maxTorque").SI<NewtonMeter>()
+ });
+ }
+
+ return new ElectricMotorFullLoadCurve(entries);
+ }
+
+
+ private DataTable DeNormalizeData(TableData normalizedMap, RatedPoint ratedPoint)
+ {
+ var result = new DataTable();
+ result.Columns.Add(ElectricMotorMapReader.Fields.MotorSpeed);
+ result.Columns.Add(ElectricMotorMapReader.Fields.Torque);
+ result.Columns.Add(ElectricMotorMapReader.Fields.PowerElectrical);
+
+ foreach (DataRow row in normalizedMap.Rows)
+ {
+ var motorSpeed = row.ParseDouble(MotorSpeedNorm) * ratedPoint.NRated;
+ var torque = row.ParseDouble(TorqueNorm) * ratedPoint.TRated;
+ var powerElectrical = row.ParseDouble(PowerElectricalNorm) * ratedPoint.PRated;
+
+ var newRow = result.NewRow();
+ newRow[ElectricMotorMapReader.Fields.MotorSpeed] = Math.Round(motorSpeed.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
+ newRow[ElectricMotorMapReader.Fields.Torque] = Math.Round(torque.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
+ newRow[ElectricMotorMapReader.Fields.PowerElectrical] = Math.Round(powerElectrical.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
+ result.Rows.Add(newRow);
+ }
+
+ return result;
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusSuperCapData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusSuperCapData.cs
new file mode 100644
index 0000000000000000000000000000000000000000..81d1712dc116d593170c639bc003bee2d5a0e884
--- /dev/null
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusSuperCapData.cs
@@ -0,0 +1,37 @@
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Battery;
+
+namespace TUGraz.VectoCore.Models.GenericModelData
+{
+ public class GenericBusSuperCapData
+ {
+ public static Ohm InternalResistance = 0.015.SI<Ohm>();
+ public static Volt ReferenceMaximumVoltage = 2.7.SI<Volt>();
+ public static Farad CapacitanceReference = 3000.SI<Farad>();
+
+ public SuperCapData CreateGenericSuperCapData(ISuperCapDeclarationInputData superCapData, double initialSoc)
+ {
+ if (superCapData == null)
+ return null;
+
+ return new SuperCapData {
+ InternalResistance = GetInternalResistance(superCapData),
+ MaxVoltage = superCapData.MaxVoltage,
+ MinVoltage = superCapData.MinVoltage,
+ MaxCurrentDischarge = superCapData.MaxCurrentDischarge,
+ MaxCurrentCharge = superCapData.MaxCurrentCharge,
+ Capacity = superCapData.Capacity,
+ InitialSoC = initialSoc
+ };
+ }
+
+ private Ohm GetInternalResistance(ISuperCapDeclarationInputData superCapData)
+ {
+ return (InternalResistance.Value() *
+ ((superCapData.MaxVoltage.Value() - superCapData.MinVoltage.Value()) /
+ (0.55 * ReferenceMaximumVoltage.Value())) *
+ (CapacitanceReference.Value() / superCapData.Capacity.Value())).SI<Ohm>();
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericRatedPointHelper.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericRatedPointHelper.cs
new file mode 100644
index 0000000000000000000000000000000000000000..df96a1fed9b62245679708e26d940795d0ebcdb9
--- /dev/null
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericRatedPointHelper.cs
@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using Castle.Core.Internal;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.Models.GenericModelData
+{
+
+ public class RatedPoint
+ {
+ public Watt PRated { get; }
+ public PerSecond NRated { get; }
+ public NewtonMeter TRated { get; }
+
+ public RatedPoint(PerSecond nRated, NewtonMeter tRated)
+ {
+ NRated = nRated;
+ TRated = tRated;
+ PRated = GetPRated();
+ }
+
+ private Watt GetPRated()
+ {
+ return (NRated.Value() * TRated.Value() * Math.PI / 30000).SI<Watt>();
+ }
+ }
+
+
+ public static class GenericRatedPointHelper
+ {
+ struct FullLoadCurveEntry
+ {
+ public PerSecond MotorSpeed { get; }
+ public NewtonMeter TorqueDrive { get; }
+ public NewtonMeter TorqueDrag { get; }
+ public Watt PowerDrive { get; }
+
+ public FullLoadCurveEntry(PerSecond motorSpeed, NewtonMeter torqueDrive, NewtonMeter torqueDrag)
+ {
+ MotorSpeed = motorSpeed;
+ TorqueDrive = torqueDrive;
+ TorqueDrag = torqueDrag;
+ PowerDrive = motorSpeed * torqueDrive * Math.PI / 30000;
+ }
+ }
+
+
+ struct SlopeValueEntry
+ {
+ public double Slope { get; }
+ public double Delta { get; }
+
+ public SlopeValueEntry(double slope, double delta)
+ {
+ Slope = slope;
+ Delta = delta;
+ }
+ }
+
+
+ #region Constants
+
+ public const string MotorSpeedColumn = "outShaftSpeed";
+ public const string TorqueDriveColumn = "maxTorque";
+ public const string TorqueDragColumn = "minTorque";
+
+ #endregion
+
+ private static List<FullLoadCurveEntry> fullLoadCurveEntries;
+ private static List<SlopeValueEntry> slopeValueEntries;
+
+
+ public static RatedPoint GetRatedPointOfFullLoadCurveAtEM(TableData fullLoadCurve)
+ {
+ SetCurveValues(fullLoadCurve);
+ var ratedIndex = FindRowOfRatedPoint();
+ var n = fullLoadCurveEntries[ratedIndex].MotorSpeed;
+ var tDrive = GetHighestTorque();
+
+ return new RatedPoint (n, tDrive);
+ }
+
+ public static RatedPoint GetRatedPointOfFullLoadCurveAtIEPC(TableData fullLoadCurve,
+ double axleRatio, double gearRatio,
+ double gearEfficiency, double axleEfficiency)
+ {
+
+ SetCurveValues(fullLoadCurve);
+ var ratedIndex = FindRowOfRatedPoint();
+ var n = fullLoadCurveEntries[ratedIndex].MotorSpeed;
+ var tDrive = GetHighestTorque();
+
+ var nRated = GetNRatedAtIEPC(n, axleRatio, gearRatio);
+ var tRated = GetTRatedAtIEPC(tDrive, gearRatio, gearEfficiency, axleRatio, axleEfficiency);
+
+ return new RatedPoint(nRated, tRated);
+ }
+
+ private static void SetCurveValues(TableData fullLoadCurve)
+ {
+ fullLoadCurveEntries = new List<FullLoadCurveEntry>();
+ slopeValueEntries = new List<SlopeValueEntry>();
+
+ for (int r = 0; r < fullLoadCurve.Rows.Count; r++) {
+
+ var motorSpeed = fullLoadCurve.Rows[r].ParseDouble(MotorSpeedColumn).SI<PerSecond>();
+ var torqueDrive = fullLoadCurve.Rows[r].ParseDouble(TorqueDriveColumn).SI<NewtonMeter>();
+ var torqueDrag = fullLoadCurve.Rows[r].ParseDouble(TorqueDragColumn).SI<NewtonMeter>();
+
+ fullLoadCurveEntries.Add(new FullLoadCurveEntry(motorSpeed, torqueDrive, torqueDrag));
+
+ if (r == 0)
+ continue;
+
+ var slopeValue = (fullLoadCurveEntries[r].PowerDrive.Value() - fullLoadCurveEntries[r - 1].PowerDrive.Value()) /
+ (fullLoadCurveEntries[r].MotorSpeed.Value() - fullLoadCurveEntries[r - 1].MotorSpeed.Value());
+
+ var deltaValue = slopeValue / (slopeValueEntries.IsNullOrEmpty() ? slopeValue : slopeValueEntries[0].Slope ) -1;
+
+ slopeValueEntries.Add(new SlopeValueEntry(slopeValue, deltaValue));
+ }
+ }
+
+
+ private static NewtonMeter GetHighestTorque()
+ {
+ var value = double.MinValue;
+
+ foreach (var entry in fullLoadCurveEntries)
+ {
+ var currentValue = entry.TorqueDrive.Value();
+ if (value < currentValue)
+ value = currentValue;
+ }
+
+ return value.SI<NewtonMeter>();
+ }
+
+
+ private static int FindRowOfRatedPoint()
+ {
+ for (int i = 0; i < slopeValueEntries.Count; i++)
+ {
+ var deltaValue = slopeValueEntries[i].Delta;
+
+ if (Math.Abs(deltaValue) > 0.2)
+ return i;
+ }
+
+ return -1;
+ }
+
+
+ private static PerSecond GetNRatedAtIEPC(PerSecond n, double axleRatio, double gearRatio)
+ {
+ return (n.Value() * axleRatio * gearRatio).SI<PerSecond>();
+ }
+
+ private static NewtonMeter GetTRatedAtIEPC(NewtonMeter tDrive, double gearRatio, double gearEfficiency,
+ double axleRatio, double axleEfficiency)
+ {
+ return (tDrive.Value() / gearRatio / gearEfficiency / axleRatio / axleEfficiency).SI<NewtonMeter>();
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_ASM_normalized.vmap b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_ASM_normalized.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..14b346d4ad0e5ed026b0ad95f7f2ceb74f950be3
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_ASM_normalized.vmap
@@ -0,0 +1,1013 @@
+n_norm , T_norm , Pel_norm
+0,-1.1,0.000812757
+0,-1.05,0.000834368
+0,-1,0.000850261
+0,-0.95,0.000860437
+0,-0.9,0.000864896
+0,-0.85,0.000863637
+0,-0.8,0.000856661
+0,-0.75,0.000843968
+0,-0.7,0.000825557
+0,-0.65,0.000801429
+0,-0.6,0.000771584
+0,-0.55,0.000736021
+0,-0.5,0.000694741
+0,-0.45,0.000647744
+0,-0.4,0.000595029
+0,-0.35,0.000536597
+0,-0.3,0.000472448
+0,-0.25,0.000402581
+0,-0.2,0.000326997
+0,-0.15,0.000245696
+0,-0.1,0.000158677
+0,-0.05,6.59413E-05
+0,-0.01,0
+0,0.01,0.003771854
+0,0.05,0.005340021
+0,0.1,0.007818667
+0,0.15,0.010873354
+0,0.2,0.014504083
+0,0.25,0.018710854
+0,0.3,0.023493667
+0,0.35,0.028852521
+0,0.4,0.034787417
+0,0.45,0.041298354
+0,0.5,0.048385333
+0,0.55,0.056048354
+0,0.6,0.064287417
+0,0.65,0.073102521
+0,0.7,0.082493667
+0,0.75,0.092460854
+0,0.8,0.103004083
+0,0.85,0.114123354
+0,0.9,0.125818667
+0,0.95,0.138090021
+0,1,0.150937417
+0,1.05,0.164360854
+0,1.1,0.178360333
+0.02,-1.1,0
+0.02,-1.05,0
+0.02,-1,0
+0.02,-0.95,0
+0.02,-0.9,0
+0.02,-0.85,0
+0.02,-0.8,0
+0.02,-0.75,0
+0.02,-0.7,0
+0.02,-0.65,0
+0.02,-0.6,0
+0.02,-0.55,0
+0.02,-0.5,0
+0.02,-0.45,0
+0.02,-0.4,0
+0.02,-0.35,0
+0.02,-0.3,0
+0.02,-0.25,0
+0.02,-0.2,0
+0.02,-0.15,0
+0.02,-0.1,0
+0.02,-0.05,0
+0.02,-0.01,0
+0.02,0.01,0.00344841
+0.02,0.05,0.004949956
+0.02,0.1,0.007298508
+0.02,0.15,0.010171081
+0.02,0.2,0.013567675
+0.02,0.25,0.01748829
+0.02,0.3,0.021932925
+0.02,0.35,0.026901581
+0.02,0.4,0.032394258
+0.02,0.45,0.038410956
+0.02,0.5,0.044951675
+0.02,0.55,0.052016415
+0.02,0.6,0.059605175
+0.02,0.65,0.067717956
+0.02,0.7,0.076354758
+0.02,0.75,0.085515581
+0.02,0.8,0.095200425
+0.02,0.85,0.10540929
+0.02,0.9,0.116142175
+0.02,0.95,0.127399081
+0.02,1,0.139180008
+0.02,1.05,0.151484956
+0.02,1.1,0.164313925
+0.2,-1.1,-0.07314816
+0.2,-1.05,-0.07509312
+0.2,-1,-0.07652352
+0.2,-0.95,-0.07743936
+0.2,-0.9,-0.07784064
+0.2,-0.85,-0.07772736
+0.2,-0.8,-0.07709952
+0.2,-0.75,-0.07595712
+0.2,-0.7,-0.07430016
+0.2,-0.65,-0.07212864
+0.2,-0.6,-0.06944256
+0.2,-0.55,-0.06624192
+0.2,-0.5,-0.06252672
+0.2,-0.45,-0.05829696
+0.2,-0.4,-0.05355264
+0.2,-0.35,-0.04829376
+0.2,-0.3,-0.04252032
+0.2,-0.25,-0.03623232
+0.2,-0.2,-0.02942976
+0.2,-0.15,-0.02211264
+0.2,-0.1,-0.01428096
+0.2,-0.05,-0.00593472
+0.2,-0.01,0
+0.2,0.01,0.005374083
+0.2,0.05,0.01439375
+0.2,0.1,0.026170833
+0.2,0.15,0.03850625
+0.2,0.2,0.0514
+0.2,0.25,0.064852083
+0.2,0.3,0.0788625
+0.2,0.35,0.09343125
+0.2,0.4,0.108558333
+0.2,0.45,0.12424375
+0.2,0.5,0.1404875
+0.2,0.55,0.157289583
+0.2,0.6,0.17465
+0.2,0.65,0.19256875
+0.2,0.7,0.211045833
+0.2,0.75,0.23008125
+0.2,0.8,0.249675
+0.2,0.85,0.269827083
+0.2,0.9,0.2905375
+0.2,0.95,0.31180625
+0.2,1,0.333633333
+0.2,1.05,0.35601875
+0.2,1.1,0.3789625
+0.4,-1.1,-0.27290112
+0.4,-1.05,-0.26624256
+0.4,-1,-0.25902336
+0.4,-0.95,-0.25124352
+0.4,-0.9,-0.24290304
+0.4,-0.85,-0.23400192
+0.4,-0.8,-0.22454016
+0.4,-0.75,-0.21451776
+0.4,-0.7,-0.20393472
+0.4,-0.65,-0.19279104
+0.4,-0.6,-0.18108672
+0.4,-0.55,-0.16882176
+0.4,-0.5,-0.15599616
+0.4,-0.45,-0.14260992
+0.4,-0.4,-0.12866304
+0.4,-0.35,-0.11415552
+0.4,-0.3,-0.09908736
+0.4,-0.25,-0.08345856
+0.4,-0.2,-0.06726912
+0.4,-0.15,-0.05051904
+0.4,-0.1,-0.03320832
+0.4,-0.05,-0.01533696
+0.4,-0.01,-0.000636211
+0.4,0.01,0.007643
+0.4,0.05,0.025025
+0.4,0.1,0.0473
+0.4,0.15,0.070183333
+0.4,0.2,0.093675
+0.4,0.25,0.117775
+0.4,0.3,0.142483333
+0.4,0.35,0.1678
+0.4,0.4,0.193725
+0.4,0.45,0.220258333
+0.4,0.5,0.2474
+0.4,0.55,0.27515
+0.4,0.6,0.303508333
+0.4,0.65,0.332475
+0.4,0.7,0.36205
+0.4,0.75,0.392233333
+0.4,0.8,0.423025
+0.4,0.85,0.454425
+0.4,0.9,0.486433333
+0.4,0.95,0.51905
+0.4,1,0.552275
+0.4,1.05,0.586108333
+0.4,1.1,0.62055
+0.6,-1.1,-0.4696128
+0.6,-1.05,-0.45460224
+0.6,-1,-0.43897344
+0.6,-0.95,-0.4227264
+0.6,-0.9,-0.40586112
+0.6,-0.85,-0.3883776
+0.6,-0.8,-0.37027584
+0.6,-0.75,-0.35155584
+0.6,-0.7,-0.3322176
+0.6,-0.65,-0.31226112
+0.6,-0.6,-0.2916864
+0.6,-0.55,-0.27049344
+0.6,-0.5,-0.24868224
+0.6,-0.45,-0.2262528
+0.6,-0.4,-0.20320512
+0.6,-0.35,-0.1795392
+0.6,-0.3,-0.15525504
+0.6,-0.25,-0.13035264
+0.6,-0.2,-0.104832
+0.6,-0.15,-0.07869312
+0.6,-0.1,-0.051936
+0.6,-0.05,-0.02456064
+0.6,-0.01,-0.002215219
+0.6,0.01,0.010096333
+0.6,0.05,0.03585
+0.6,0.1,0.068645833
+0.6,0.15,0.1021125
+0.6,0.2,0.13625
+0.6,0.25,0.171058333
+0.6,0.3,0.2065375
+0.6,0.35,0.2426875
+0.6,0.4,0.279508333
+0.6,0.45,0.317
+0.6,0.5,0.3551625
+0.6,0.55,0.393995833
+0.6,0.6,0.4335
+0.6,0.65,0.473675
+0.6,0.7,0.514520833
+0.6,0.75,0.5560375
+0.6,0.8,0.598225
+0.6,0.85,0.641083333
+0.6,0.9,0.6846125
+0.6,0.95,0.7288125
+0.6,1,0.773683333
+0.6,1.05,0.819225
+0.6,1.1,0.8654375
+0.8,-1.1,-0.66323712
+0.8,-1.05,-0.64012608
+0.8,-1,-0.61632768
+0.8,-0.95,-0.59184192
+0.8,-0.9,-0.5666688
+0.8,-0.85,-0.54080832
+0.8,-0.8,-0.51426048
+0.8,-0.75,-0.48702528
+0.8,-0.7,-0.45910272
+0.8,-0.65,-0.4304928
+0.8,-0.6,-0.40119552
+0.8,-0.55,-0.37121088
+0.8,-0.5,-0.34053888
+0.8,-0.45,-0.30917952
+0.8,-0.4,-0.2771328
+0.8,-0.35,-0.24439872
+0.8,-0.3,-0.21097728
+0.8,-0.25,-0.17686848
+0.8,-0.2,-0.14207232
+0.8,-0.15,-0.1065888
+0.8,-0.1,-0.07041792
+0.8,-0.05,-0.03355968
+0.8,-0.01,-0.003578189
+0.8,0.01,0.012784083
+0.8,0.05,0.04691875
+0.8,0.1,0.090258333
+0.8,0.15,0.13434375
+0.8,0.2,0.179175
+0.8,0.25,0.224752083
+0.8,0.3,0.271075
+0.8,0.35,0.31814375
+0.8,0.4,0.365958333
+0.8,0.45,0.41451875
+0.8,0.5,0.463825
+0.8,0.55,0.513877083
+0.8,0.6,0.564675
+0.8,0.65,0.61621875
+0.8,0.7,0.668508333
+0.8,0.75,0.72154375
+0.8,0.8,0.775325
+0.8,0.85,0.829852083
+0.8,0.9,0.885125
+0.8,0.95,0.94114375
+0.8,1,0.997908333
+0.8,1.05,1.05541875
+0.8,1.1,1.113675
+1,-1.1,-0.853728
+1,-1.05,-0.822768
+1,-1,-0.79104
+1,-0.95,-0.758544
+1,-0.9,-0.72528
+1,-0.85,-0.691248
+1,-0.8,-0.656448
+1,-0.75,-0.62088
+1,-0.7,-0.584544
+1,-0.65,-0.54744
+1,-0.6,-0.509568
+1,-0.55,-0.470928
+1,-0.5,-0.43152
+1,-0.45,-0.391344
+1,-0.4,-0.3504
+1,-0.35,-0.308688
+1,-0.3,-0.266208
+1,-0.25,-0.22296
+1,-0.2,-0.178944
+1,-0.15,-0.13416
+1,-0.1,-0.088608
+1,-0.05,-0.042288
+1,-0.01,-0.00467904
+1,0.01,0.01575625
+1,0.05,0.05828125
+1,0.1,0.1121875
+1,0.15,0.166927083
+1,0.2,0.2225
+1,0.25,0.27890625
+1,0.3,0.336145833
+1,0.35,0.39421875
+1,0.4,0.453125
+1,0.45,0.512864583
+1,0.5,0.5734375
+1,0.55,0.63484375
+1,0.6,0.697083333
+1,0.65,0.76015625
+1,0.7,0.8240625
+1,0.75,0.888802083
+1,0.8,0.954375
+1,0.85,1.02078125
+1,0.9,1.088020833
+1,0.95,1.15609375
+1,1,1.225
+1,1.05,1.294739583
+1,1.1,1.3653125
+1.2,-1.1,-1.04103936
+1.2,-1.05,-1.00248192
+1.2,-1,-0.96306432
+1.2,-0.95,-0.92278656
+1.2,-0.9,-0.88164864
+1.2,-0.85,-0.83965056
+1.2,-0.8,-0.79679232
+1.2,-0.75,-0.75307392
+1.2,-0.7,-0.70849536
+1.2,-0.65,-0.66305664
+1.2,-0.6,-0.61675776
+1.2,-0.55,-0.56959872
+1.2,-0.5,-0.52157952
+1.2,-0.45,-0.47270016
+1.2,-0.4,-0.42296064
+1.2,-0.35,-0.37236096
+1.2,-0.3,-0.32090112
+1.2,-0.25,-0.26858112
+1.2,-0.2,-0.21540096
+1.2,-0.15,-0.16136064
+1.2,-0.1,-0.10646016
+1.2,-0.05,-0.05069952
+1.2,-0.01,-0.005471693
+1.2,0.01,0.019062833
+1.2,0.05,0.0699875
+1.2,0.1,0.134483333
+1.2,0.15,0.1999125
+1.2,0.2,0.266275
+1.2,0.25,0.333570833
+1.2,0.3,0.4018
+1.2,0.35,0.4709625
+1.2,0.4,0.541058333
+1.2,0.45,0.6120875
+1.2,0.5,0.68405
+1.2,0.55,0.756945833
+1.2,0.6,0.830775
+1.2,0.65,0.9055375
+1.2,0.7,0.981233333
+1.2,0.75,1.0578625
+1.2,0.8,1.135425
+1.2,0.85,1.213920833
+1.2,0.9,1.29335
+1.2,0.95,1.3737125
+1.2,1,1.455008333
+1.2,1.05,1.5372375
+1.2,1.1,1.6204
+1.4,-1.1,-1.22512512
+1.4,-1.05,-1.17922176
+1.4,-1,-1.13235456
+1.4,-0.95,-1.08452352
+1.4,-0.9,-1.03572864
+1.4,-0.85,-0.98596992
+1.4,-0.8,-0.93524736
+1.4,-0.75,-0.88356096
+1.4,-0.7,-0.83091072
+1.4,-0.65,-0.77729664
+1.4,-0.6,-0.72271872
+1.4,-0.55,-0.66717696
+1.4,-0.5,-0.61067136
+1.4,-0.45,-0.55320192
+1.4,-0.4,-0.49476864
+1.4,-0.35,-0.43537152
+1.4,-0.3,-0.37501056
+1.4,-0.25,-0.31368576
+1.4,-0.2,-0.25139712
+1.4,-0.15,-0.18814464
+1.4,-0.1,-0.12392832
+1.4,-0.05,-0.05874816
+1.4,-0.01,-0.005910067
+1.4,0.01,0.022753833
+1.4,0.05,0.0820875
+1.4,0.1,0.157195833
+1.4,0.15,0.23335
+1.4,0.2,0.31055
+1.4,0.25,0.388795833
+1.4,0.3,0.4680875
+1.4,0.35,0.548425
+1.4,0.4,0.629808333
+1.4,0.45,0.7122375
+1.4,0.5,0.7957125
+1.4,0.55,0.880233333
+1.4,0.6,0.9658
+1.4,0.65,1.0524125
+1.4,0.7,1.140070833
+1.4,0.75,1.228775
+1.4,0.8,1.318525
+1.4,0.85,1.409320833
+1.4,0.9,1.5011625
+1.4,0.95,1.59405
+1.4,1,1.687983333
+1.4,1.05,1.7829625
+1.4,1.1,1.8789875
+1.6,-1.1,-1.4059392
+1.6,-1.05,-1.35294144
+1.6,-1,-1.29886464
+1.6,-0.95,-1.2437088
+1.6,-0.9,-1.18747392
+1.6,-0.85,-1.13016
+1.6,-0.8,-1.07176704
+1.6,-0.75,-1.01229504
+1.6,-0.7,-0.951744
+1.6,-0.65,-0.89011392
+1.6,-0.6,-0.8274048
+1.6,-0.55,-0.76361664
+1.6,-0.5,-0.69874944
+1.6,-0.45,-0.6328032
+1.6,-0.4,-0.56577792
+1.6,-0.35,-0.4976736
+1.6,-0.3,-0.42849024
+1.6,-0.25,-0.35822784
+1.6,-0.2,-0.2868864
+1.6,-0.15,-0.21446592
+1.6,-0.1,-0.1409664
+1.6,-0.05,-0.06638784
+1.6,-0.01,-0.005948083
+1.6,0.01,0.02687925
+1.6,0.05,0.09463125
+1.6,0.1,0.180375
+1.6,0.15,0.267289583
+1.6,0.2,0.355375
+1.6,0.25,0.44463125
+1.6,0.3,0.535058333
+1.6,0.35,0.62665625
+1.6,0.4,0.719425
+1.6,0.45,0.813364583
+1.6,0.5,0.908475
+1.6,0.55,1.00475625
+1.6,0.6,1.102208333
+1.6,0.65,1.20083125
+1.6,0.7,1.300625
+1.6,0.75,1.401589583
+1.6,0.8,1.503725
+1.6,0.85,1.60703125
+1.6,0.9,1.711508333
+1.6,0.95,1.81715625
+1.6,1,1.923975
+1.6,1.05,2.031964583
+1.6,1.1,2.141125
+1.8,-1.1,-1.58343552
+1.8,-1.05,-1.52359488
+1.8,-1,-1.46254848
+1.8,-0.95,-1.40029632
+1.8,-0.9,-1.3368384
+1.8,-0.85,-1.27217472
+1.8,-0.8,-1.20630528
+1.8,-0.75,-1.13923008
+1.8,-0.7,-1.07094912
+1.8,-0.65,-1.0014624
+1.8,-0.6,-0.93076992
+1.8,-0.55,-0.85887168
+1.8,-0.5,-0.78576768
+1.8,-0.45,-0.71145792
+1.8,-0.4,-0.6359424
+1.8,-0.35,-0.55922112
+1.8,-0.3,-0.48129408
+1.8,-0.25,-0.40216128
+1.8,-0.2,-0.32182272
+1.8,-0.15,-0.2402784
+1.8,-0.1,-0.15752832
+1.8,-0.05,-0.07357248
+1.8,-0.01,-0.005539661
+1.8,0.01,0.031489083
+1.8,0.05,0.10766875
+1.8,0.1,0.204070833
+1.8,0.15,0.30178125
+1.8,0.2,0.4008
+1.8,0.25,0.501127083
+1.8,0.3,0.6027625
+1.8,0.35,0.70570625
+1.8,0.4,0.809958333
+1.8,0.45,0.91551875
+1.8,0.5,1.0223875
+1.8,0.55,1.130564583
+1.8,0.6,1.24005
+1.8,0.65,1.35084375
+1.8,0.7,1.462945833
+1.8,0.75,1.57635625
+1.8,0.8,1.691075
+1.8,0.85,1.807102083
+1.8,0.9,1.9244375
+1.8,0.95,2.04308125
+1.8,1,2.163033333
+1.8,1.05,2.28429375
+1.8,1.1,2.4068625
+2,-1.1,-1.757568
+2,-1.05,-1.691136
+2,-1,-1.62336
+2,-0.95,-1.55424
+2,-0.9,-1.483776
+2,-0.85,-1.411968
+2,-0.8,-1.338816
+2,-0.75,-1.26432
+2,-0.7,-1.18848
+2,-0.65,-1.111296
+2,-0.6,-1.032768
+2,-0.55,-0.952896
+2,-0.5,-0.87168
+2,-0.45,-0.78912
+2,-0.4,-0.705216
+2,-0.35,-0.619968
+2,-0.3,-0.533376
+2,-0.25,-0.44544
+2,-0.2,-0.35616
+2,-0.15,-0.265536
+2,-0.1,-0.173568
+2,-0.05,-0.080256
+2,-0.01,-0.00463872
+2,0.01,0.036633333
+2,0.05,0.12125
+2,0.1,0.228333333
+2,0.15,0.336875
+2,0.2,0.446875
+2,0.25,0.558333333
+2,0.3,0.67125
+2,0.35,0.785625
+2,0.4,0.901458333
+2,0.45,1.01875
+2,0.5,1.1375
+2,0.55,1.257708333
+2,0.6,1.379375
+2,0.65,1.5025
+2,0.7,1.627083333
+2,0.75,1.753125
+2,0.8,1.880625
+2,0.85,2.009583333
+2,0.9,2.14
+2,0.95,2.271875
+2,1,2.405208333
+2,1.05,2.54
+2,1.1,2.67625
+2.2,-1.1,-1.92829056
+2.2,-1.05,-1.85551872
+2.2,-1,-1.78125312
+2.2,-0.95,-1.70549376
+2.2,-0.9,-1.62824064
+2.2,-0.85,-1.54949376
+2.2,-0.8,-1.46925312
+2.2,-0.75,-1.38751872
+2.2,-0.7,-1.30429056
+2.2,-0.65,-1.21956864
+2.2,-0.6,-1.13335296
+2.2,-0.55,-1.04564352
+2.2,-0.5,-0.95644032
+2.2,-0.45,-0.86574336
+2.2,-0.4,-0.77355264
+2.2,-0.35,-0.67986816
+2.2,-0.3,-0.58468992
+2.2,-0.25,-0.48801792
+2.2,-0.2,-0.38985216
+2.2,-0.15,-0.29019264
+2.2,-0.1,-0.18903936
+2.2,-0.05,-0.08639232
+2.2,-0.01,-0.003199181
+2.2,0.01,0.042362
+2.2,0.05,0.135425
+2.2,0.1,0.2532125
+2.2,0.15,0.372620833
+2.2,0.2,0.49365
+2.2,0.25,0.6163
+2.2,0.3,0.740570833
+2.2,0.35,0.8664625
+2.2,0.4,0.993975
+2.2,0.45,1.123108333
+2.2,0.5,1.2538625
+2.2,0.55,1.3862375
+2.2,0.6,1.520233333
+2.2,0.65,1.65585
+2.2,0.7,1.7930875
+2.2,0.75,1.931945833
+2.2,0.8,2.072425
+2.2,0.85,2.214525
+2.2,0.9,2.358245833
+2.2,0.95,2.5035875
+2.2,1,2.65055
+2.2,1.05,2.799133333
+2.2,1.1,2.9493375
+2.4,-1.1,-2.09555712
+2.4,-1.05,-2.01669696
+2.4,-1,-1.93618176
+2.4,-0.95,-1.85401152
+2.4,-0.9,-1.77018624
+2.4,-0.85,-1.68470592
+2.4,-0.8,-1.59757056
+2.4,-0.75,-1.50878016
+2.4,-0.7,-1.41833472
+2.4,-0.65,-1.32623424
+2.4,-0.6,-1.23247872
+2.4,-0.55,-1.13706816
+2.4,-0.5,-1.04000256
+2.4,-0.45,-0.94128192
+2.4,-0.4,-0.84090624
+2.4,-0.35,-0.73887552
+2.4,-0.3,-0.63518976
+2.4,-0.25,-0.52984896
+2.4,-0.2,-0.42285312
+2.4,-0.15,-0.31420224
+2.4,-0.1,-0.20389632
+2.4,-0.05,-0.09193536
+2.4,-0.01,-0.001174963
+2.4,0.01,0.048725083
+2.4,0.05,0.15024375
+2.4,0.1,0.278758333
+2.4,0.15,0.40906875
+2.4,0.2,0.541175
+2.4,0.25,0.675077083
+2.4,0.3,0.810775
+2.4,0.35,0.94826875
+2.4,0.4,1.087558333
+2.4,0.45,1.22864375
+2.4,0.5,1.371525
+2.4,0.55,1.516202083
+2.4,0.6,1.662675
+2.4,0.65,1.81094375
+2.4,0.7,1.961008333
+2.4,0.75,2.11286875
+2.4,0.8,2.266525
+2.4,0.85,2.421977083
+2.4,0.9,2.579225
+2.4,0.95,2.73826875
+2.4,1,2.899108333
+2.4,1.05,3.06174375
+2.4,1.1,3.226175
+2.6,-1.1,-2.2593216
+2.6,-1.05,-2.17462464
+2.6,-1,-2.08809984
+2.6,-0.95,-1.9997472
+2.6,-0.9,-1.90956672
+2.6,-0.85,-1.8175584
+2.6,-0.8,-1.72372224
+2.6,-0.75,-1.62805824
+2.6,-0.7,-1.5305664
+2.6,-0.65,-1.43124672
+2.6,-0.6,-1.3300992
+2.6,-0.55,-1.22712384
+2.6,-0.5,-1.12232064
+2.6,-0.45,-1.0156896
+2.6,-0.4,-0.90723072
+2.6,-0.35,-0.796944
+2.6,-0.3,-0.68482944
+2.6,-0.25,-0.57088704
+2.6,-0.2,-0.4551168
+2.6,-0.15,-0.33751872
+2.6,-0.1,-0.2180928
+2.6,-0.05,-0.09683904
+2.6,-0.01,0
+2.6,0.01,0.055772583
+2.6,0.05,0.16575625
+2.6,0.1,0.305020833
+2.6,0.15,0.44626875
+2.6,0.2,0.5895
+2.6,0.25,0.734714583
+2.6,0.3,0.8819125
+2.6,0.35,1.03109375
+2.6,0.4,1.182258333
+2.6,0.45,1.33540625
+2.6,0.5,1.4905375
+2.6,0.55,1.647652083
+2.6,0.6,1.80675
+2.6,0.65,1.96783125
+2.6,0.7,2.130895833
+2.6,0.75,2.29594375
+2.6,0.8,2.462975
+2.6,0.85,2.631989583
+2.6,0.9,2.8029875
+2.6,0.95,2.97596875
+2.6,1,3.150933333
+2.6,1.05,3.32788125
+2.6,1.1,3.5068125
+2.8,-1.1,-2.41953792
+2.8,-1.05,-2.32925568
+2.8,-1,-2.23696128
+2.8,-0.95,-2.14265472
+2.8,-0.9,-2.046336
+2.8,-0.85,-1.94800512
+2.8,-0.8,-1.84766208
+2.8,-0.75,-1.74530688
+2.8,-0.7,-1.64093952
+2.8,-0.65,-1.53456
+2.8,-0.6,-1.42616832
+2.8,-0.55,-1.31576448
+2.8,-0.5,-1.20334848
+2.8,-0.45,-1.08892032
+2.8,-0.4,-0.97248
+2.8,-0.35,-0.85402752
+2.8,-0.3,-0.73356288
+2.8,-0.25,-0.61108608
+2.8,-0.2,-0.48659712
+2.8,-0.15,-0.360096
+2.8,-0.1,-0.23158272
+2.8,-0.05,-0.10105728
+2.8,-0.01,0
+2.8,0.01,0.0635545
+2.8,0.05,0.1820125
+2.8,0.1,0.33205
+2.8,0.15,0.484270833
+2.8,0.2,0.638675
+2.8,0.25,0.7952625
+2.8,0.3,0.954033333
+2.8,0.35,1.1149875
+2.8,0.4,1.278125
+2.8,0.45,1.443445833
+2.8,0.5,1.61095
+2.8,0.55,1.7806375
+2.8,0.6,1.952508333
+2.8,0.65,2.1265625
+2.8,0.7,2.3028
+2.8,0.75,2.481220833
+2.8,0.8,2.661825
+2.8,0.85,2.8446125
+2.8,0.9,3.029583333
+2.8,0.95,3.2167375
+2.8,1,3.406075
+2.8,1.05,3.597595833
+2.8,1.1,3.7913
+3,-1.1,-2.57616
+3,-1.05,-2.480544
+3,-1,-2.38272
+3,-0.95,-2.282688
+3,-0.9,-2.180448
+3,-0.85,-2.076
+3,-0.8,-1.969344
+3,-0.75,-1.86048
+3,-0.7,-1.749408
+3,-0.65,-1.636128
+3,-0.6,-1.52064
+3,-0.55,-1.402944
+3,-0.5,-1.28304
+3,-0.45,-1.160928
+3,-0.4,-1.036608
+3,-0.35,-0.91008
+3,-0.3,-0.781344
+3,-0.25,-0.6504
+3,-0.2,-0.517248
+3,-0.15,-0.381888
+3,-0.1,-0.24432
+3,-0.05,-0.104544
+3,-0.01,0
+3,0.01,0.072120833
+3,0.05,0.1990625
+3,0.1,0.359895833
+3,0.15,0.523125
+3,0.2,0.68875
+3,0.25,0.856770833
+3,0.3,1.0271875
+3,0.35,1.2
+3,0.4,1.375208333
+3,0.45,1.5528125
+3,0.5,1.7328125
+3,0.55,1.915208333
+3,0.6,2.1
+3,0.65,2.2871875
+3,0.7,2.476770833
+3,0.75,2.66875
+3,0.8,2.863125
+3,0.85,3.059895833
+3,0.9,3.2590625
+3,0.95,3.460625
+3,1,3.664583333
+3,1.05,3.8709375
+3,1.1,4.0796875
+3.2,-1.1,-2.72914176
+3.2,-1.05,-2.62844352
+3.2,-1,-2.52532992
+3.2,-0.95,-2.41980096
+3.2,-0.9,-2.31185664
+3.2,-0.85,-2.20149696
+3.2,-0.8,-2.08872192
+3.2,-0.75,-1.97353152
+3.2,-0.7,-1.85592576
+3.2,-0.65,-1.73590464
+3.2,-0.6,-1.61346816
+3.2,-0.55,-1.48861632
+3.2,-0.5,-1.36134912
+3.2,-0.45,-1.23166656
+3.2,-0.4,-1.09956864
+3.2,-0.35,-0.96505536
+3.2,-0.3,-0.82812672
+3.2,-0.25,-0.68878272
+3.2,-0.2,-0.54702336
+3.2,-0.15,-0.40284864
+3.2,-0.1,-0.25625856
+3.2,-0.05,-0.10725312
+3.2,-0.01,0
+3.2,0.01,0.081521583
+3.2,0.05,0.21695625
+3.2,0.1,0.388608333
+3.2,0.15,0.56288125
+3.2,0.2,0.739775
+3.2,0.25,0.919289583
+3.2,0.3,1.101425
+3.2,0.35,1.28618125
+3.2,0.4,1.473558333
+3.2,0.45,1.66355625
+3.2,0.5,1.856175
+3.2,0.55,2.051414583
+3.2,0.6,2.249275
+3.2,0.65,2.44975625
+3.2,0.7,2.652858333
+3.2,0.75,2.85858125
+3.2,0.8,3.066925
+3.2,0.85,3.277889583
+3.2,0.9,3.491475
+3.2,0.95,3.70768125
+3.2,1,3.926508333
+3.2,1.05,4.14795625
+3.2,1.1,4.372025
+3.4,-1.1,-2.87843712
+3.4,-1.05,-2.77290816
+3.4,-1,-2.66474496
+3.4,-0.95,-2.55394752
+3.4,-0.9,-2.44051584
+3.4,-0.85,-2.32444992
+3.4,-0.8,-2.20574976
+3.4,-0.75,-2.08441536
+3.4,-0.7,-1.96044672
+3.4,-0.65,-1.83384384
+3.4,-0.6,-1.70460672
+3.4,-0.55,-1.57273536
+3.4,-0.5,-1.43822976
+3.4,-0.45,-1.30108992
+3.4,-0.4,-1.16131584
+3.4,-0.35,-1.01890752
+3.4,-0.3,-0.87386496
+3.4,-0.25,-0.72618816
+3.4,-0.2,-0.57587712
+3.4,-0.15,-0.42293184
+3.4,-0.1,-0.26735232
+3.4,-0.05,-0.10913856
+3.4,-0.01,0
+3.4,0.01,0.09180675
+3.4,0.05,0.23574375
+3.4,0.1,0.4182375
+3.4,0.15,0.603589583
+3.4,0.2,0.7918
+3.4,0.25,0.98286875
+3.4,0.3,1.176795833
+3.4,0.35,1.37358125
+3.4,0.4,1.573225
+3.4,0.45,1.775727083
+3.4,0.5,1.9810875
+3.4,0.55,2.18930625
+3.4,0.6,2.400383333
+3.4,0.65,2.61431875
+3.4,0.7,2.8311125
+3.4,0.75,3.050764583
+3.4,0.8,3.273275
+3.4,0.85,3.49864375
+3.4,0.9,3.726870833
+3.4,0.95,3.95795625
+3.4,1,4.1919
+3.4,1.05,4.428702083
+3.4,1.1,4.6683625
+3.6,-1.1,-3.024
+3.6,-1.05,-2.91389184
+3.6,-1,-2.80091904
+3.6,-0.95,-2.6850816
+3.6,-0.9,-2.56637952
+3.6,-0.85,-2.4448128
+3.6,-0.8,-2.32038144
+3.6,-0.75,-2.19308544
+3.6,-0.7,-2.0629248
+3.6,-0.65,-1.92989952
+3.6,-0.6,-1.7940096
+3.6,-0.55,-1.65525504
+3.6,-0.5,-1.51363584
+3.6,-0.45,-1.369152
+3.6,-0.4,-1.22180352
+3.6,-0.35,-1.0715904
+3.6,-0.3,-0.91851264
+3.6,-0.25,-0.76257024
+3.6,-0.2,-0.6037632
+3.6,-0.15,-0.44209152
+3.6,-0.1,-0.2775552
+3.6,-0.05,-0.11015424
+3.6,-0.01,0
+3.6,0.01,0.103026333
+3.6,0.05,0.255475
+3.6,0.1,0.448833333
+3.6,0.15,0.6453
+3.6,0.2,0.844875
+3.6,0.25,1.047558333
+3.6,0.3,1.25335
+3.6,0.35,1.46225
+3.6,0.4,1.674258333
+3.6,0.45,1.889375
+3.6,0.5,2.1076
+3.6,0.55,2.328933333
+3.6,0.6,2.553375
+3.6,0.65,2.780925
+3.6,0.7,3.011583333
+3.6,0.75,3.24535
+3.6,0.8,3.482225
+3.6,0.85,3.722208333
+3.6,0.9,3.9653
+3.6,0.95,4.2115
+3.6,1,4.460808333
+3.6,1.05,4.713225
+3.6,1.1,4.96875
+3.8,-1.1,-3.16578432
+3.8,-1.05,-3.05134848
+3.8,-1,-2.93380608
+3.8,-0.95,-2.81315712
+3.8,-0.9,-2.6894016
+3.8,-0.85,-2.56253952
+3.8,-0.8,-2.43257088
+3.8,-0.75,-2.29949568
+3.8,-0.7,-2.16331392
+3.8,-0.65,-2.0240256
+3.8,-0.6,-1.88163072
+3.8,-0.55,-1.73612928
+3.8,-0.5,-1.58752128
+3.8,-0.45,-1.43580672
+3.8,-0.4,-1.2809856
+3.8,-0.35,-1.12305792
+3.8,-0.3,-0.96202368
+3.8,-0.25,-0.79788288
+3.8,-0.2,-0.63063552
+3.8,-0.15,-0.4602816
+3.8,-0.1,-0.28682112
+3.8,-0.05,-0.11025408
+3.8,-0.01,0
+3.8,0.01,0.115230333
+3.8,0.05,0.2762
+3.8,0.1,0.480445833
+3.8,0.15,0.6880625
+3.8,0.2,0.89905
+3.8,0.25,1.113408333
+3.8,0.3,1.3311375
+3.8,0.35,1.5522375
+3.8,0.4,1.776708333
+3.8,0.45,2.00455
+3.8,0.5,2.2357625
+3.8,0.55,2.470345833
+3.8,0.6,2.7083
+3.8,0.65,2.949625
+3.8,0.7,3.194320833
+3.8,0.75,3.4423875
+3.8,0.8,3.693825
+3.8,0.85,3.948633333
+3.8,0.9,4.2068125
+3.8,0.95,4.4683625
+3.8,1,4.733283333
+3.8,1.05,5.001575
+3.8,1.1,5.2732375
+4,-1.1,-3.303744
+4,-1.05,-3.185232
+4,-1,-3.06336
+4,-0.95,-2.938128
+4,-0.9,-2.809536
+4,-0.85,-2.677584
+4,-0.8,-2.542272
+4,-0.75,-2.4036
+4,-0.7,-2.261568
+4,-0.65,-2.116176
+4,-0.6,-1.967424
+4,-0.55,-1.815312
+4,-0.5,-1.65984
+4,-0.45,-1.501008
+4,-0.4,-1.338816
+4,-0.35,-1.173264
+4,-0.3,-1.004352
+4,-0.25,-0.83208
+4,-0.2,-0.656448
+4,-0.15,-0.477456
+4,-0.1,-0.295104
+4,-0.05,-0.109392
+4,-0.01,0
+4,0.01,0.12846875
+4,0.05,0.29796875
+4,0.1,0.513125
+4,0.15,0.731927083
+4,0.2,0.954375
+4,0.25,1.18046875
+4,0.3,1.410208333
+4,0.35,1.64359375
+4,0.4,1.880625
+4,0.45,2.121302083
+4,0.5,2.365625
+4,0.55,2.61359375
+4,0.6,2.865208333
+4,0.65,3.12046875
+4,0.7,3.379375
+4,0.75,3.641927083
+4,0.8,3.908125
+4,0.85,4.17796875
+4,0.9,4.451458333
+4,0.95,4.72859375
+4,1,5.009375
+4,1.05,5.293802083
+4,1.1,5.581875
diff --git a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_IEPC_ASM_normalized.vmap b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_IEPC_ASM_normalized.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..cac7bf8be68f478b468149a89284dae5c98fa3c4
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_IEPC_ASM_normalized.vmap
@@ -0,0 +1,1013 @@
+n_norm , T_norm , Pel_norm
+0,-1.1,0.000812757
+0,-1.05,0.000834368
+0,-1,0.000850261
+0,-0.95,0.000860437
+0,-0.9,0.000864896
+0,-0.85,0.000863637
+0,-0.8,0.000856661
+0,-0.75,0.000843968
+0,-0.7,0.000825557
+0,-0.65,0.000801429
+0,-0.6,0.000771584
+0,-0.55,0.000736021
+0,-0.5,0.000694741
+0,-0.45,0.000647744
+0,-0.4,0.000595029
+0,-0.35,0.000536597
+0,-0.3,0.000472448
+0,-0.25,0.000402581
+0,-0.2,0.000326997
+0,-0.15,0.000245696
+0,-0.1,0.000158677
+0,-0.05,6.59E-05
+0,-0.01,0
+0,0.01,0.003771854
+0,0.05,0.005340021
+0,0.1,0.007818667
+0,0.15,0.010873354
+0,0.2,0.014504083
+0,0.25,0.018710854
+0,0.3,0.023493667
+0,0.35,0.028852521
+0,0.4,0.034787417
+0,0.45,0.041298354
+0,0.5,0.048385333
+0,0.55,0.056048354
+0,0.6,0.064287417
+0,0.65,0.073102521
+0,0.7,0.082493667
+0,0.75,0.092460854
+0,0.8,0.103004083
+0,0.85,0.114123354
+0,0.9,0.125818667
+0,0.95,0.138090021
+0,1,0.150937417
+0,1.05,0.164360854
+0,1.1,0.178360333
+0.02,-1.1,0
+0.02,-1.05,0
+0.02,-1,0
+0.02,-0.95,0
+0.02,-0.9,0
+0.02,-0.85,0
+0.02,-0.8,0
+0.02,-0.75,0
+0.02,-0.7,0
+0.02,-0.65,0
+0.02,-0.6,0
+0.02,-0.55,0
+0.02,-0.5,0
+0.02,-0.45,0
+0.02,-0.4,0
+0.02,-0.35,0
+0.02,-0.3,0
+0.02,-0.25,0
+0.02,-0.2,0
+0.02,-0.15,0
+0.02,-0.1,0
+0.02,-0.05,0
+0.02,-0.01,0
+0.02,0.01,0.00344841
+0.02,0.05,0.004949956
+0.02,0.1,0.007298508
+0.02,0.15,0.010171081
+0.02,0.2,0.013567675
+0.02,0.25,0.01748829
+0.02,0.3,0.021932925
+0.02,0.35,0.026901581
+0.02,0.4,0.032394258
+0.02,0.45,0.038410956
+0.02,0.5,0.044951675
+0.02,0.55,0.052016415
+0.02,0.6,0.059605175
+0.02,0.65,0.067717956
+0.02,0.7,0.076354758
+0.02,0.75,0.085515581
+0.02,0.8,0.095200425
+0.02,0.85,0.10540929
+0.02,0.9,0.116142175
+0.02,0.95,0.127399081
+0.02,1,0.139180008
+0.02,1.05,0.151484956
+0.02,1.1,0.164313925
+0.2,-1.1,-0.07314816
+0.2,-1.05,-0.07509312
+0.2,-1,-0.07652352
+0.2,-0.95,-0.07743936
+0.2,-0.9,-0.07784064
+0.2,-0.85,-0.07772736
+0.2,-0.8,-0.07709952
+0.2,-0.75,-0.07595712
+0.2,-0.7,-0.07430016
+0.2,-0.65,-0.07212864
+0.2,-0.6,-0.06944256
+0.2,-0.55,-0.06624192
+0.2,-0.5,-0.06252672
+0.2,-0.45,-0.05829696
+0.2,-0.4,-0.05355264
+0.2,-0.35,-0.04829376
+0.2,-0.3,-0.04252032
+0.2,-0.25,-0.03623232
+0.2,-0.2,-0.02942976
+0.2,-0.15,-0.02211264
+0.2,-0.1,-0.01428096
+0.2,-0.05,-0.00593472
+0.2,-0.01,0
+0.2,0.01,0.005374083
+0.2,0.05,0.01439375
+0.2,0.1,0.026170833
+0.2,0.15,0.03850625
+0.2,0.2,0.0514
+0.2,0.25,0.064852083
+0.2,0.3,0.0788625
+0.2,0.35,0.09343125
+0.2,0.4,0.108558333
+0.2,0.45,0.12424375
+0.2,0.5,0.1404875
+0.2,0.55,0.157289583
+0.2,0.6,0.17465
+0.2,0.65,0.19256875
+0.2,0.7,0.211045833
+0.2,0.75,0.23008125
+0.2,0.8,0.249675
+0.2,0.85,0.269827083
+0.2,0.9,0.2905375
+0.2,0.95,0.31180625
+0.2,1,0.333633333
+0.2,1.05,0.35601875
+0.2,1.1,0.3789625
+0.4,-1.1,-0.27290112
+0.4,-1.05,-0.26624256
+0.4,-1,-0.25902336
+0.4,-0.95,-0.25124352
+0.4,-0.9,-0.24290304
+0.4,-0.85,-0.23400192
+0.4,-0.8,-0.22454016
+0.4,-0.75,-0.21451776
+0.4,-0.7,-0.20393472
+0.4,-0.65,-0.19279104
+0.4,-0.6,-0.18108672
+0.4,-0.55,-0.16882176
+0.4,-0.5,-0.15599616
+0.4,-0.45,-0.14260992
+0.4,-0.4,-0.12866304
+0.4,-0.35,-0.11415552
+0.4,-0.3,-0.09908736
+0.4,-0.25,-0.08345856
+0.4,-0.2,-0.06726912
+0.4,-0.15,-0.05051904
+0.4,-0.1,-0.03320832
+0.4,-0.05,-0.01533696
+0.4,-0.01,-0.000636211
+0.4,0.01,0.007643
+0.4,0.05,0.025025
+0.4,0.1,0.0473
+0.4,0.15,0.070183333
+0.4,0.2,0.093675
+0.4,0.25,0.117775
+0.4,0.3,0.142483333
+0.4,0.35,0.1678
+0.4,0.4,0.193725
+0.4,0.45,0.220258333
+0.4,0.5,0.2474
+0.4,0.55,0.27515
+0.4,0.6,0.303508333
+0.4,0.65,0.332475
+0.4,0.7,0.36205
+0.4,0.75,0.392233333
+0.4,0.8,0.423025
+0.4,0.85,0.454425
+0.4,0.9,0.486433333
+0.4,0.95,0.51905
+0.4,1,0.552275
+0.4,1.05,0.586108333
+0.4,1.1,0.62055
+0.6,-1.1,-0.4696128
+0.6,-1.05,-0.45460224
+0.6,-1,-0.43897344
+0.6,-0.95,-0.4227264
+0.6,-0.9,-0.40586112
+0.6,-0.85,-0.3883776
+0.6,-0.8,-0.37027584
+0.6,-0.75,-0.35155584
+0.6,-0.7,-0.3322176
+0.6,-0.65,-0.31226112
+0.6,-0.6,-0.2916864
+0.6,-0.55,-0.27049344
+0.6,-0.5,-0.24868224
+0.6,-0.45,-0.2262528
+0.6,-0.4,-0.20320512
+0.6,-0.35,-0.1795392
+0.6,-0.3,-0.15525504
+0.6,-0.25,-0.13035264
+0.6,-0.2,-0.104832
+0.6,-0.15,-0.07869312
+0.6,-0.1,-0.051936
+0.6,-0.05,-0.02456064
+0.6,-0.01,-0.002215219
+0.6,0.01,0.010096333
+0.6,0.05,0.03585
+0.6,0.1,0.068645833
+0.6,0.15,0.1021125
+0.6,0.2,0.13625
+0.6,0.25,0.171058333
+0.6,0.3,0.2065375
+0.6,0.35,0.2426875
+0.6,0.4,0.279508333
+0.6,0.45,0.317
+0.6,0.5,0.3551625
+0.6,0.55,0.393995833
+0.6,0.6,0.4335
+0.6,0.65,0.473675
+0.6,0.7,0.514520833
+0.6,0.75,0.5560375
+0.6,0.8,0.598225
+0.6,0.85,0.641083333
+0.6,0.9,0.6846125
+0.6,0.95,0.7288125
+0.6,1,0.773683333
+0.6,1.05,0.819225
+0.6,1.1,0.8654375
+0.8,-1.1,-0.66323712
+0.8,-1.05,-0.64012608
+0.8,-1,-0.61632768
+0.8,-0.95,-0.59184192
+0.8,-0.9,-0.5666688
+0.8,-0.85,-0.54080832
+0.8,-0.8,-0.51426048
+0.8,-0.75,-0.48702528
+0.8,-0.7,-0.45910272
+0.8,-0.65,-0.4304928
+0.8,-0.6,-0.40119552
+0.8,-0.55,-0.37121088
+0.8,-0.5,-0.34053888
+0.8,-0.45,-0.30917952
+0.8,-0.4,-0.2771328
+0.8,-0.35,-0.24439872
+0.8,-0.3,-0.21097728
+0.8,-0.25,-0.17686848
+0.8,-0.2,-0.14207232
+0.8,-0.15,-0.1065888
+0.8,-0.1,-0.07041792
+0.8,-0.05,-0.03355968
+0.8,-0.01,-0.003578189
+0.8,0.01,0.012784083
+0.8,0.05,0.04691875
+0.8,0.1,0.090258333
+0.8,0.15,0.13434375
+0.8,0.2,0.179175
+0.8,0.25,0.224752083
+0.8,0.3,0.271075
+0.8,0.35,0.31814375
+0.8,0.4,0.365958333
+0.8,0.45,0.41451875
+0.8,0.5,0.463825
+0.8,0.55,0.513877083
+0.8,0.6,0.564675
+0.8,0.65,0.61621875
+0.8,0.7,0.668508333
+0.8,0.75,0.72154375
+0.8,0.8,0.775325
+0.8,0.85,0.829852083
+0.8,0.9,0.885125
+0.8,0.95,0.94114375
+0.8,1,0.997908333
+0.8,1.05,1.05541875
+0.8,1.1,1.113675
+1,-1.1,-0.853728
+1,-1.05,-0.822768
+1,-1,-0.79104
+1,-0.95,-0.758544
+1,-0.9,-0.72528
+1,-0.85,-0.691248
+1,-0.8,-0.656448
+1,-0.75,-0.62088
+1,-0.7,-0.584544
+1,-0.65,-0.54744
+1,-0.6,-0.509568
+1,-0.55,-0.470928
+1,-0.5,-0.43152
+1,-0.45,-0.391344
+1,-0.4,-0.3504
+1,-0.35,-0.308688
+1,-0.3,-0.266208
+1,-0.25,-0.22296
+1,-0.2,-0.178944
+1,-0.15,-0.13416
+1,-0.1,-0.088608
+1,-0.05,-0.042288
+1,-0.01,-0.00467904
+1,0.01,0.01575625
+1,0.05,0.05828125
+1,0.1,0.1121875
+1,0.15,0.166927083
+1,0.2,0.2225
+1,0.25,0.27890625
+1,0.3,0.336145833
+1,0.35,0.39421875
+1,0.4,0.453125
+1,0.45,0.512864583
+1,0.5,0.5734375
+1,0.55,0.63484375
+1,0.6,0.697083333
+1,0.65,0.76015625
+1,0.7,0.8240625
+1,0.75,0.888802083
+1,0.8,0.954375
+1,0.85,1.02078125
+1,0.9,1.088020833
+1,0.95,1.15609375
+1,1,1.225
+1,1.05,1.294739583
+1,1.1,1.3653125
+1.2,-1.1,-1.04103936
+1.2,-1.05,-1.00248192
+1.2,-1,-0.96306432
+1.2,-0.95,-0.92278656
+1.2,-0.9,-0.88164864
+1.2,-0.85,-0.83965056
+1.2,-0.8,-0.79679232
+1.2,-0.75,-0.75307392
+1.2,-0.7,-0.70849536
+1.2,-0.65,-0.66305664
+1.2,-0.6,-0.61675776
+1.2,-0.55,-0.56959872
+1.2,-0.5,-0.52157952
+1.2,-0.45,-0.47270016
+1.2,-0.4,-0.42296064
+1.2,-0.35,-0.37236096
+1.2,-0.3,-0.32090112
+1.2,-0.25,-0.26858112
+1.2,-0.2,-0.21540096
+1.2,-0.15,-0.16136064
+1.2,-0.1,-0.10646016
+1.2,-0.05,-0.05069952
+1.2,-0.01,-0.005471693
+1.2,0.01,0.019062833
+1.2,0.05,0.0699875
+1.2,0.1,0.134483333
+1.2,0.15,0.1999125
+1.2,0.2,0.266275
+1.2,0.25,0.333570833
+1.2,0.3,0.4018
+1.2,0.35,0.4709625
+1.2,0.4,0.541058333
+1.2,0.45,0.6120875
+1.2,0.5,0.68405
+1.2,0.55,0.756945833
+1.2,0.6,0.830775
+1.2,0.65,0.9055375
+1.2,0.7,0.981233333
+1.2,0.75,1.0578625
+1.2,0.8,1.135425
+1.2,0.85,1.213920833
+1.2,0.9,1.29335
+1.2,0.95,1.3737125
+1.2,1,1.455008333
+1.2,1.05,1.5372375
+1.2,1.1,1.6204
+1.4,-1.1,-1.22512512
+1.4,-1.05,-1.17922176
+1.4,-1,-1.13235456
+1.4,-0.95,-1.08452352
+1.4,-0.9,-1.03572864
+1.4,-0.85,-0.98596992
+1.4,-0.8,-0.93524736
+1.4,-0.75,-0.88356096
+1.4,-0.7,-0.83091072
+1.4,-0.65,-0.77729664
+1.4,-0.6,-0.72271872
+1.4,-0.55,-0.66717696
+1.4,-0.5,-0.61067136
+1.4,-0.45,-0.55320192
+1.4,-0.4,-0.49476864
+1.4,-0.35,-0.43537152
+1.4,-0.3,-0.37501056
+1.4,-0.25,-0.31368576
+1.4,-0.2,-0.25139712
+1.4,-0.15,-0.18814464
+1.4,-0.1,-0.12392832
+1.4,-0.05,-0.05874816
+1.4,-0.01,-0.005910067
+1.4,0.01,0.022753833
+1.4,0.05,0.0820875
+1.4,0.1,0.157195833
+1.4,0.15,0.23335
+1.4,0.2,0.31055
+1.4,0.25,0.388795833
+1.4,0.3,0.4680875
+1.4,0.35,0.548425
+1.4,0.4,0.629808333
+1.4,0.45,0.7122375
+1.4,0.5,0.7957125
+1.4,0.55,0.880233333
+1.4,0.6,0.9658
+1.4,0.65,1.0524125
+1.4,0.7,1.140070833
+1.4,0.75,1.228775
+1.4,0.8,1.318525
+1.4,0.85,1.409320833
+1.4,0.9,1.5011625
+1.4,0.95,1.59405
+1.4,1,1.687983333
+1.4,1.05,1.7829625
+1.4,1.1,1.8789875
+1.6,-1.1,-1.4059392
+1.6,-1.05,-1.35294144
+1.6,-1,-1.29886464
+1.6,-0.95,-1.2437088
+1.6,-0.9,-1.18747392
+1.6,-0.85,-1.13016
+1.6,-0.8,-1.07176704
+1.6,-0.75,-1.01229504
+1.6,-0.7,-0.951744
+1.6,-0.65,-0.89011392
+1.6,-0.6,-0.8274048
+1.6,-0.55,-0.76361664
+1.6,-0.5,-0.69874944
+1.6,-0.45,-0.6328032
+1.6,-0.4,-0.56577792
+1.6,-0.35,-0.4976736
+1.6,-0.3,-0.42849024
+1.6,-0.25,-0.35822784
+1.6,-0.2,-0.2868864
+1.6,-0.15,-0.21446592
+1.6,-0.1,-0.1409664
+1.6,-0.05,-0.06638784
+1.6,-0.01,-0.005948083
+1.6,0.01,0.02687925
+1.6,0.05,0.09463125
+1.6,0.1,0.180375
+1.6,0.15,0.267289583
+1.6,0.2,0.355375
+1.6,0.25,0.44463125
+1.6,0.3,0.535058333
+1.6,0.35,0.62665625
+1.6,0.4,0.719425
+1.6,0.45,0.813364583
+1.6,0.5,0.908475
+1.6,0.55,1.00475625
+1.6,0.6,1.102208333
+1.6,0.65,1.20083125
+1.6,0.7,1.300625
+1.6,0.75,1.401589583
+1.6,0.8,1.503725
+1.6,0.85,1.60703125
+1.6,0.9,1.711508333
+1.6,0.95,1.81715625
+1.6,1,1.923975
+1.6,1.05,2.031964583
+1.6,1.1,2.141125
+1.8,-1.1,-1.58343552
+1.8,-1.05,-1.52359488
+1.8,-1,-1.46254848
+1.8,-0.95,-1.40029632
+1.8,-0.9,-1.3368384
+1.8,-0.85,-1.27217472
+1.8,-0.8,-1.20630528
+1.8,-0.75,-1.13923008
+1.8,-0.7,-1.07094912
+1.8,-0.65,-1.0014624
+1.8,-0.6,-0.93076992
+1.8,-0.55,-0.85887168
+1.8,-0.5,-0.78576768
+1.8,-0.45,-0.71145792
+1.8,-0.4,-0.6359424
+1.8,-0.35,-0.55922112
+1.8,-0.3,-0.48129408
+1.8,-0.25,-0.40216128
+1.8,-0.2,-0.32182272
+1.8,-0.15,-0.2402784
+1.8,-0.1,-0.15752832
+1.8,-0.05,-0.07357248
+1.8,-0.01,-0.005539661
+1.8,0.01,0.031489083
+1.8,0.05,0.10766875
+1.8,0.1,0.204070833
+1.8,0.15,0.30178125
+1.8,0.2,0.4008
+1.8,0.25,0.501127083
+1.8,0.3,0.6027625
+1.8,0.35,0.70570625
+1.8,0.4,0.809958333
+1.8,0.45,0.91551875
+1.8,0.5,1.0223875
+1.8,0.55,1.130564583
+1.8,0.6,1.24005
+1.8,0.65,1.35084375
+1.8,0.7,1.462945833
+1.8,0.75,1.57635625
+1.8,0.8,1.691075
+1.8,0.85,1.807102083
+1.8,0.9,1.9244375
+1.8,0.95,2.04308125
+1.8,1,2.163033333
+1.8,1.05,2.28429375
+1.8,1.1,2.4068625
+2,-1.1,-1.757568
+2,-1.05,-1.691136
+2,-1,-1.62336
+2,-0.95,-1.55424
+2,-0.9,-1.483776
+2,-0.85,-1.411968
+2,-0.8,-1.338816
+2,-0.75,-1.26432
+2,-0.7,-1.18848
+2,-0.65,-1.111296
+2,-0.6,-1.032768
+2,-0.55,-0.952896
+2,-0.5,-0.87168
+2,-0.45,-0.78912
+2,-0.4,-0.705216
+2,-0.35,-0.619968
+2,-0.3,-0.533376
+2,-0.25,-0.44544
+2,-0.2,-0.35616
+2,-0.15,-0.265536
+2,-0.1,-0.173568
+2,-0.05,-0.080256
+2,-0.01,-0.00463872
+2,0.01,0.036633333
+2,0.05,0.12125
+2,0.1,0.228333333
+2,0.15,0.336875
+2,0.2,0.446875
+2,0.25,0.558333333
+2,0.3,0.67125
+2,0.35,0.785625
+2,0.4,0.901458333
+2,0.45,1.01875
+2,0.5,1.1375
+2,0.55,1.257708333
+2,0.6,1.379375
+2,0.65,1.5025
+2,0.7,1.627083333
+2,0.75,1.753125
+2,0.8,1.880625
+2,0.85,2.009583333
+2,0.9,2.14
+2,0.95,2.271875
+2,1,2.405208333
+2,1.05,2.54
+2,1.1,2.67625
+2.2,-1.1,-1.92829056
+2.2,-1.05,-1.85551872
+2.2,-1,-1.78125312
+2.2,-0.95,-1.70549376
+2.2,-0.9,-1.62824064
+2.2,-0.85,-1.54949376
+2.2,-0.8,-1.46925312
+2.2,-0.75,-1.38751872
+2.2,-0.7,-1.30429056
+2.2,-0.65,-1.21956864
+2.2,-0.6,-1.13335296
+2.2,-0.55,-1.04564352
+2.2,-0.5,-0.95644032
+2.2,-0.45,-0.86574336
+2.2,-0.4,-0.77355264
+2.2,-0.35,-0.67986816
+2.2,-0.3,-0.58468992
+2.2,-0.25,-0.48801792
+2.2,-0.2,-0.38985216
+2.2,-0.15,-0.29019264
+2.2,-0.1,-0.18903936
+2.2,-0.05,-0.08639232
+2.2,-0.01,-0.003199181
+2.2,0.01,0.042362
+2.2,0.05,0.135425
+2.2,0.1,0.2532125
+2.2,0.15,0.372620833
+2.2,0.2,0.49365
+2.2,0.25,0.6163
+2.2,0.3,0.740570833
+2.2,0.35,0.8664625
+2.2,0.4,0.993975
+2.2,0.45,1.123108333
+2.2,0.5,1.2538625
+2.2,0.55,1.3862375
+2.2,0.6,1.520233333
+2.2,0.65,1.65585
+2.2,0.7,1.7930875
+2.2,0.75,1.931945833
+2.2,0.8,2.072425
+2.2,0.85,2.214525
+2.2,0.9,2.358245833
+2.2,0.95,2.5035875
+2.2,1,2.65055
+2.2,1.05,2.799133333
+2.2,1.1,2.9493375
+2.4,-1.1,-2.09555712
+2.4,-1.05,-2.01669696
+2.4,-1,-1.93618176
+2.4,-0.95,-1.85401152
+2.4,-0.9,-1.77018624
+2.4,-0.85,-1.68470592
+2.4,-0.8,-1.59757056
+2.4,-0.75,-1.50878016
+2.4,-0.7,-1.41833472
+2.4,-0.65,-1.32623424
+2.4,-0.6,-1.23247872
+2.4,-0.55,-1.13706816
+2.4,-0.5,-1.04000256
+2.4,-0.45,-0.94128192
+2.4,-0.4,-0.84090624
+2.4,-0.35,-0.73887552
+2.4,-0.3,-0.63518976
+2.4,-0.25,-0.52984896
+2.4,-0.2,-0.42285312
+2.4,-0.15,-0.31420224
+2.4,-0.1,-0.20389632
+2.4,-0.05,-0.09193536
+2.4,-0.01,-0.001174963
+2.4,0.01,0.048725083
+2.4,0.05,0.15024375
+2.4,0.1,0.278758333
+2.4,0.15,0.40906875
+2.4,0.2,0.541175
+2.4,0.25,0.675077083
+2.4,0.3,0.810775
+2.4,0.35,0.94826875
+2.4,0.4,1.087558333
+2.4,0.45,1.22864375
+2.4,0.5,1.371525
+2.4,0.55,1.516202083
+2.4,0.6,1.662675
+2.4,0.65,1.81094375
+2.4,0.7,1.961008333
+2.4,0.75,2.11286875
+2.4,0.8,2.266525
+2.4,0.85,2.421977083
+2.4,0.9,2.579225
+2.4,0.95,2.73826875
+2.4,1,2.899108333
+2.4,1.05,3.06174375
+2.4,1.1,3.226175
+2.6,-1.1,-2.2593216
+2.6,-1.05,-2.17462464
+2.6,-1,-2.08809984
+2.6,-0.95,-1.9997472
+2.6,-0.9,-1.90956672
+2.6,-0.85,-1.8175584
+2.6,-0.8,-1.72372224
+2.6,-0.75,-1.62805824
+2.6,-0.7,-1.5305664
+2.6,-0.65,-1.43124672
+2.6,-0.6,-1.3300992
+2.6,-0.55,-1.22712384
+2.6,-0.5,-1.12232064
+2.6,-0.45,-1.0156896
+2.6,-0.4,-0.90723072
+2.6,-0.35,-0.796944
+2.6,-0.3,-0.68482944
+2.6,-0.25,-0.57088704
+2.6,-0.2,-0.4551168
+2.6,-0.15,-0.33751872
+2.6,-0.1,-0.2180928
+2.6,-0.05,-0.09683904
+2.6,-0.01,0
+2.6,0.01,0.055772583
+2.6,0.05,0.16575625
+2.6,0.1,0.305020833
+2.6,0.15,0.44626875
+2.6,0.2,0.5895
+2.6,0.25,0.734714583
+2.6,0.3,0.8819125
+2.6,0.35,1.03109375
+2.6,0.4,1.182258333
+2.6,0.45,1.33540625
+2.6,0.5,1.4905375
+2.6,0.55,1.647652083
+2.6,0.6,1.80675
+2.6,0.65,1.96783125
+2.6,0.7,2.130895833
+2.6,0.75,2.29594375
+2.6,0.8,2.462975
+2.6,0.85,2.631989583
+2.6,0.9,2.8029875
+2.6,0.95,2.97596875
+2.6,1,3.150933333
+2.6,1.05,3.32788125
+2.6,1.1,3.5068125
+2.8,-1.1,-2.41953792
+2.8,-1.05,-2.32925568
+2.8,-1,-2.23696128
+2.8,-0.95,-2.14265472
+2.8,-0.9,-2.046336
+2.8,-0.85,-1.94800512
+2.8,-0.8,-1.84766208
+2.8,-0.75,-1.74530688
+2.8,-0.7,-1.64093952
+2.8,-0.65,-1.53456
+2.8,-0.6,-1.42616832
+2.8,-0.55,-1.31576448
+2.8,-0.5,-1.20334848
+2.8,-0.45,-1.08892032
+2.8,-0.4,-0.97248
+2.8,-0.35,-0.85402752
+2.8,-0.3,-0.73356288
+2.8,-0.25,-0.61108608
+2.8,-0.2,-0.48659712
+2.8,-0.15,-0.360096
+2.8,-0.1,-0.23158272
+2.8,-0.05,-0.10105728
+2.8,-0.01,0
+2.8,0.01,0.0635545
+2.8,0.05,0.1820125
+2.8,0.1,0.33205
+2.8,0.15,0.484270833
+2.8,0.2,0.638675
+2.8,0.25,0.7952625
+2.8,0.3,0.954033333
+2.8,0.35,1.1149875
+2.8,0.4,1.278125
+2.8,0.45,1.443445833
+2.8,0.5,1.61095
+2.8,0.55,1.7806375
+2.8,0.6,1.952508333
+2.8,0.65,2.1265625
+2.8,0.7,2.3028
+2.8,0.75,2.481220833
+2.8,0.8,2.661825
+2.8,0.85,2.8446125
+2.8,0.9,3.029583333
+2.8,0.95,3.2167375
+2.8,1,3.406075
+2.8,1.05,3.597595833
+2.8,1.1,3.7913
+3,-1.1,-2.57616
+3,-1.05,-2.480544
+3,-1,-2.38272
+3,-0.95,-2.282688
+3,-0.9,-2.180448
+3,-0.85,-2.076
+3,-0.8,-1.969344
+3,-0.75,-1.86048
+3,-0.7,-1.749408
+3,-0.65,-1.636128
+3,-0.6,-1.52064
+3,-0.55,-1.402944
+3,-0.5,-1.28304
+3,-0.45,-1.160928
+3,-0.4,-1.036608
+3,-0.35,-0.91008
+3,-0.3,-0.781344
+3,-0.25,-0.6504
+3,-0.2,-0.517248
+3,-0.15,-0.381888
+3,-0.1,-0.24432
+3,-0.05,-0.104544
+3,-0.01,0
+3,0.01,0.072120833
+3,0.05,0.1990625
+3,0.1,0.359895833
+3,0.15,0.523125
+3,0.2,0.68875
+3,0.25,0.856770833
+3,0.3,1.0271875
+3,0.35,1.2
+3,0.4,1.375208333
+3,0.45,1.5528125
+3,0.5,1.7328125
+3,0.55,1.915208333
+3,0.6,2.1
+3,0.65,2.2871875
+3,0.7,2.476770833
+3,0.75,2.66875
+3,0.8,2.863125
+3,0.85,3.059895833
+3,0.9,3.2590625
+3,0.95,3.460625
+3,1,3.664583333
+3,1.05,3.8709375
+3,1.1,4.0796875
+3.2,-1.1,-2.72914176
+3.2,-1.05,-2.62844352
+3.2,-1,-2.52532992
+3.2,-0.95,-2.41980096
+3.2,-0.9,-2.31185664
+3.2,-0.85,-2.20149696
+3.2,-0.8,-2.08872192
+3.2,-0.75,-1.97353152
+3.2,-0.7,-1.85592576
+3.2,-0.65,-1.73590464
+3.2,-0.6,-1.61346816
+3.2,-0.55,-1.48861632
+3.2,-0.5,-1.36134912
+3.2,-0.45,-1.23166656
+3.2,-0.4,-1.09956864
+3.2,-0.35,-0.96505536
+3.2,-0.3,-0.82812672
+3.2,-0.25,-0.68878272
+3.2,-0.2,-0.54702336
+3.2,-0.15,-0.40284864
+3.2,-0.1,-0.25625856
+3.2,-0.05,-0.10725312
+3.2,-0.01,0
+3.2,0.01,0.081521583
+3.2,0.05,0.21695625
+3.2,0.1,0.388608333
+3.2,0.15,0.56288125
+3.2,0.2,0.739775
+3.2,0.25,0.919289583
+3.2,0.3,1.101425
+3.2,0.35,1.28618125
+3.2,0.4,1.473558333
+3.2,0.45,1.66355625
+3.2,0.5,1.856175
+3.2,0.55,2.051414583
+3.2,0.6,2.249275
+3.2,0.65,2.44975625
+3.2,0.7,2.652858333
+3.2,0.75,2.85858125
+3.2,0.8,3.066925
+3.2,0.85,3.277889583
+3.2,0.9,3.491475
+3.2,0.95,3.70768125
+3.2,1,3.926508333
+3.2,1.05,4.14795625
+3.2,1.1,4.372025
+3.4,-1.1,-2.87843712
+3.4,-1.05,-2.77290816
+3.4,-1,-2.66474496
+3.4,-0.95,-2.55394752
+3.4,-0.9,-2.44051584
+3.4,-0.85,-2.32444992
+3.4,-0.8,-2.20574976
+3.4,-0.75,-2.08441536
+3.4,-0.7,-1.96044672
+3.4,-0.65,-1.83384384
+3.4,-0.6,-1.70460672
+3.4,-0.55,-1.57273536
+3.4,-0.5,-1.43822976
+3.4,-0.45,-1.30108992
+3.4,-0.4,-1.16131584
+3.4,-0.35,-1.01890752
+3.4,-0.3,-0.87386496
+3.4,-0.25,-0.72618816
+3.4,-0.2,-0.57587712
+3.4,-0.15,-0.42293184
+3.4,-0.1,-0.26735232
+3.4,-0.05,-0.10913856
+3.4,-0.01,0
+3.4,0.01,0.09180675
+3.4,0.05,0.23574375
+3.4,0.1,0.4182375
+3.4,0.15,0.603589583
+3.4,0.2,0.7918
+3.4,0.25,0.98286875
+3.4,0.3,1.176795833
+3.4,0.35,1.37358125
+3.4,0.4,1.573225
+3.4,0.45,1.775727083
+3.4,0.5,1.9810875
+3.4,0.55,2.18930625
+3.4,0.6,2.400383333
+3.4,0.65,2.61431875
+3.4,0.7,2.8311125
+3.4,0.75,3.050764583
+3.4,0.8,3.273275
+3.4,0.85,3.49864375
+3.4,0.9,3.726870833
+3.4,0.95,3.95795625
+3.4,1,4.1919
+3.4,1.05,4.428702083
+3.4,1.1,4.6683625
+3.6,-1.1,-3.024
+3.6,-1.05,-2.91389184
+3.6,-1,-2.80091904
+3.6,-0.95,-2.6850816
+3.6,-0.9,-2.56637952
+3.6,-0.85,-2.4448128
+3.6,-0.8,-2.32038144
+3.6,-0.75,-2.19308544
+3.6,-0.7,-2.0629248
+3.6,-0.65,-1.92989952
+3.6,-0.6,-1.7940096
+3.6,-0.55,-1.65525504
+3.6,-0.5,-1.51363584
+3.6,-0.45,-1.369152
+3.6,-0.4,-1.22180352
+3.6,-0.35,-1.0715904
+3.6,-0.3,-0.91851264
+3.6,-0.25,-0.76257024
+3.6,-0.2,-0.6037632
+3.6,-0.15,-0.44209152
+3.6,-0.1,-0.2775552
+3.6,-0.05,-0.11015424
+3.6,-0.01,0
+3.6,0.01,0.103026333
+3.6,0.05,0.255475
+3.6,0.1,0.448833333
+3.6,0.15,0.6453
+3.6,0.2,0.844875
+3.6,0.25,1.047558333
+3.6,0.3,1.25335
+3.6,0.35,1.46225
+3.6,0.4,1.674258333
+3.6,0.45,1.889375
+3.6,0.5,2.1076
+3.6,0.55,2.328933333
+3.6,0.6,2.553375
+3.6,0.65,2.780925
+3.6,0.7,3.011583333
+3.6,0.75,3.24535
+3.6,0.8,3.482225
+3.6,0.85,3.722208333
+3.6,0.9,3.9653
+3.6,0.95,4.2115
+3.6,1,4.460808333
+3.6,1.05,4.713225
+3.6,1.1,4.96875
+3.8,-1.1,-3.16578432
+3.8,-1.05,-3.05134848
+3.8,-1,-2.93380608
+3.8,-0.95,-2.81315712
+3.8,-0.9,-2.6894016
+3.8,-0.85,-2.56253952
+3.8,-0.8,-2.43257088
+3.8,-0.75,-2.29949568
+3.8,-0.7,-2.16331392
+3.8,-0.65,-2.0240256
+3.8,-0.6,-1.88163072
+3.8,-0.55,-1.73612928
+3.8,-0.5,-1.58752128
+3.8,-0.45,-1.43580672
+3.8,-0.4,-1.2809856
+3.8,-0.35,-1.12305792
+3.8,-0.3,-0.96202368
+3.8,-0.25,-0.79788288
+3.8,-0.2,-0.63063552
+3.8,-0.15,-0.4602816
+3.8,-0.1,-0.28682112
+3.8,-0.05,-0.11025408
+3.8,-0.01,0
+3.8,0.01,0.115230333
+3.8,0.05,0.2762
+3.8,0.1,0.480445833
+3.8,0.15,0.6880625
+3.8,0.2,0.89905
+3.8,0.25,1.113408333
+3.8,0.3,1.3311375
+3.8,0.35,1.5522375
+3.8,0.4,1.776708333
+3.8,0.45,2.00455
+3.8,0.5,2.2357625
+3.8,0.55,2.470345833
+3.8,0.6,2.7083
+3.8,0.65,2.949625
+3.8,0.7,3.194320833
+3.8,0.75,3.4423875
+3.8,0.8,3.693825
+3.8,0.85,3.948633333
+3.8,0.9,4.2068125
+3.8,0.95,4.4683625
+3.8,1,4.733283333
+3.8,1.05,5.001575
+3.8,1.1,5.2732375
+4,-1.1,-3.303744
+4,-1.05,-3.185232
+4,-1,-3.06336
+4,-0.95,-2.938128
+4,-0.9,-2.809536
+4,-0.85,-2.677584
+4,-0.8,-2.542272
+4,-0.75,-2.4036
+4,-0.7,-2.261568
+4,-0.65,-2.116176
+4,-0.6,-1.967424
+4,-0.55,-1.815312
+4,-0.5,-1.65984
+4,-0.45,-1.501008
+4,-0.4,-1.338816
+4,-0.35,-1.173264
+4,-0.3,-1.004352
+4,-0.25,-0.83208
+4,-0.2,-0.656448
+4,-0.15,-0.477456
+4,-0.1,-0.295104
+4,-0.05,-0.109392
+4,-0.01,0
+4,0.01,0.12846875
+4,0.05,0.29796875
+4,0.1,0.513125
+4,0.15,0.731927083
+4,0.2,0.954375
+4,0.25,1.18046875
+4,0.3,1.410208333
+4,0.35,1.64359375
+4,0.4,1.880625
+4,0.45,2.121302083
+4,0.5,2.365625
+4,0.55,2.61359375
+4,0.6,2.865208333
+4,0.65,3.12046875
+4,0.7,3.379375
+4,0.75,3.641927083
+4,0.8,3.908125
+4,0.85,4.17796875
+4,0.9,4.451458333
+4,0.95,4.72859375
+4,1,5.009375
+4,1.05,5.293802083
+4,1.1,5.581875
diff --git a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_IEPC_PSM_normalized.vmap b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_IEPC_PSM_normalized.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..86ab892eba8f3f37114a5d9bdc7682804e571ae8
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_IEPC_PSM_normalized.vmap
@@ -0,0 +1,1013 @@
+n_norm , T_norm , Pel_norm
+0,-1.1,0.002005675
+0,-1.05,0.001924827
+0,-1,0.001842944
+0,-0.95,0.001760027
+0,-0.9,0.001676075
+0,-0.85,0.001591088
+0,-0.8,0.001505067
+0,-0.75,0.001418011
+0,-0.7,0.000931738
+0,-0.65,0.000253642
+0,-0.6,-0.000329318
+0,-0.55,-0.000817142
+0,-0.5,-0.00120983
+0,-0.45,-0.001507382
+0,-0.4,-0.001709798
+0,-0.35,-0.001817078
+0,-0.3,-0.001829222
+0,-0.25,-0.00174623
+0,-0.2,-0.001568102
+0,-0.15,-0.001294838
+0,-0.1,-0.000926438
+0,-0.05,-0.000462902
+0,-0.01,-2.35757E-05
+0,0.01,0.000391085
+0,0.05,0.001581052
+0,0.1,0.003161417
+0,0.15,0.00484501
+0,0.2,0.006631833
+0,0.25,0.008521885
+0,0.3,0.010515167
+0,0.35,0.012611677
+0,0.4,0.014811417
+0,0.45,0.017114385
+0,0.5,0.019520583
+0,0.55,0.02203001
+0,0.6,0.024642667
+0,0.65,0.027358552
+0,0.7,0.030177667
+0,0.75,0.03310001
+0,0.8,0.036125583
+0,0.85,0.039254385
+0,0.9,0.042486417
+0,0.95,0.045821677
+0,1,0.049260167
+0,0,0.045821677
+0,0,0.042486417
+0.02,-1.1,0
+0.02,-1.05,0
+0.02,-1,0
+0.02,-0.95,0
+0.02,-0.9,0
+0.02,-0.85,0
+0.02,-0.8,0
+0.02,-0.75,0
+0.02,-0.7,-0.000358364
+0.02,-0.65,-0.000888438
+0.02,-0.6,-0.001331958
+0.02,-0.55,-0.001688924
+0.02,-0.5,-0.001959337
+0.02,-0.45,-0.002143196
+0.02,-0.4,-0.002240502
+0.02,-0.35,-0.002251254
+0.02,-0.3,-0.002175452
+0.02,-0.25,-0.002013097
+0.02,-0.2,-0.001764188
+0.02,-0.15,-0.001428726
+0.02,-0.1,-0.00100671
+0.02,-0.05,-0.00049814
+0.02,-0.01,-2.89659E-05
+0.02,0.01,0.000385237
+0.02,0.05,0.001542817
+0.02,0.1,0.003074317
+0.02,0.15,0.004699733
+0.02,0.2,0.006419067
+0.02,0.25,0.008232317
+0.02,0.3,0.010139483
+0.02,0.35,0.012140567
+0.02,0.4,0.014235567
+0.02,0.45,0.016424483
+0.02,0.5,0.018707317
+0.02,0.55,0.021084067
+0.02,0.6,0.023554733
+0.02,0.65,0.026119317
+0.02,0.7,0.028777817
+0.02,0.75,0.031530233
+0.02,0.8,0.034376567
+0.02,0.85,0.037316817
+0.02,0.9,0.040350983
+0.02,0.95,0.043479067
+0.02,1,0.046701067
+0.02,1.05,0.050016983
+0.02,1.1,0.053426817
+0.2,-1.1,-0.18051072
+0.2,-1.05,-0.1732344
+0.2,-1,-0.16586496
+0.2,-0.95,-0.1584024
+0.2,-0.9,-0.15084672
+0.2,-0.85,-0.14319792
+0.2,-0.8,-0.135456
+0.2,-0.75,-0.12762096
+0.2,-0.7,-0.1196928
+0.2,-0.65,-0.11167152
+0.2,-0.6,-0.10355712
+0.2,-0.55,-0.0953496
+0.2,-0.5,-0.08704896
+0.2,-0.45,-0.0786552
+0.2,-0.4,-0.07016832
+0.2,-0.35,-0.06158832
+0.2,-0.3,-0.0529152
+0.2,-0.25,-0.04414896
+0.2,-0.2,-0.0352896
+0.2,-0.15,-0.02633712
+0.2,-0.1,-0.01729152
+0.2,-0.05,-0.0081528
+0.2,-0.01,-0.000774778
+0.2,0.01,0.003325979
+0.2,0.05,0.011986979
+0.2,0.1,0.022904167
+0.2,0.15,0.033922396
+0.2,0.2,0.045041667
+0.2,0.25,0.056261979
+0.2,0.3,0.067583333
+0.2,0.35,0.079005729
+0.2,0.4,0.090529167
+0.2,0.45,0.102153646
+0.2,0.5,0.113879167
+0.2,0.55,0.125705729
+0.2,0.6,0.137633333
+0.2,0.65,0.149661979
+0.2,0.7,0.161791667
+0.2,0.75,0.174022396
+0.2,0.8,0.186354167
+0.2,0.85,0.198786979
+0.2,0.9,0.211320833
+0.2,0.95,0.223955729
+0.2,1,0.236691667
+0.2,1.05,0.249528646
+0.2,1.1,0.262466667
+0.4,-1.1,-0.38588736
+0.4,-1.05,-0.3694032
+0.4,-1,-0.35280768
+0.4,-0.95,-0.3361008
+0.4,-0.9,-0.31928256
+0.4,-0.85,-0.30235296
+0.4,-0.8,-0.285312
+0.4,-0.75,-0.26815968
+0.4,-0.7,-0.250896
+0.4,-0.65,-0.23352096
+0.4,-0.6,-0.21603456
+0.4,-0.55,-0.1984368
+0.4,-0.5,-0.18072768
+0.4,-0.45,-0.1629072
+0.4,-0.4,-0.14497536
+0.4,-0.35,-0.12693216
+0.4,-0.3,-0.1087776
+0.4,-0.25,-0.09051168
+0.4,-0.2,-0.0721344
+0.4,-0.15,-0.05364576
+0.4,-0.1,-0.03504576
+0.4,-0.05,-0.0163344
+0.4,-0.01,-0.001285133
+0.4,0.01,0.006938875
+0.4,0.05,0.023942708
+0.4,0.1,0.04530625
+0.4,0.15,0.066790625
+0.4,0.2,0.088395833
+0.4,0.25,0.110121875
+0.4,0.3,0.13196875
+0.4,0.35,0.153936458
+0.4,0.4,0.176025
+0.4,0.45,0.198234375
+0.4,0.5,0.220564583
+0.4,0.55,0.243015625
+0.4,0.6,0.2655875
+0.4,0.65,0.288280208
+0.4,0.7,0.31109375
+0.4,0.75,0.334028125
+0.4,0.8,0.357083333
+0.4,0.85,0.380259375
+0.4,0.9,0.40355625
+0.4,0.95,0.426973958
+0.4,1,0.4505125
+0.4,1.05,0.474171875
+0.4,1.1,0.497952083
+0.6,-1.1,-0.58800768
+0.6,-1.05,-0.56256336
+0.6,-1,-0.53697792
+0.6,-0.95,-0.51125136
+0.6,-0.9,-0.48538368
+0.6,-0.85,-0.45937488
+0.6,-0.8,-0.43322496
+0.6,-0.75,-0.40693392
+0.6,-0.7,-0.38050176
+0.6,-0.65,-0.35392848
+0.6,-0.6,-0.32721408
+0.6,-0.55,-0.30035856
+0.6,-0.5,-0.27336192
+0.6,-0.45,-0.24622416
+0.6,-0.4,-0.21894528
+0.6,-0.35,-0.19152528
+0.6,-0.3,-0.16396416
+0.6,-0.25,-0.13626192
+0.6,-0.2,-0.10841856
+0.6,-0.15,-0.08043408
+0.6,-0.1,-0.05230848
+0.6,-0.05,-0.02404176
+0.6,-0.01,-0.001326778
+0.6,0.01,0.011060354
+0.6,0.05,0.036413021
+0.6,0.1,0.068241667
+0.6,0.15,0.100223437
+0.6,0.2,0.132358333
+0.6,0.25,0.164646354
+0.6,0.3,0.1970875
+0.6,0.35,0.229681771
+0.6,0.4,0.262429167
+0.6,0.45,0.295329688
+0.6,0.5,0.328383333
+0.6,0.55,0.361590104
+0.6,0.6,0.39495
+0.6,0.65,0.428463021
+0.6,0.7,0.462129167
+0.6,0.75,0.495948438
+0.6,0.8,0.529920833
+0.6,0.85,0.564046354
+0.6,0.9,0.598325
+0.6,0.95,0.632756771
+0.6,1,0.667341667
+0.6,1.05,0.702079688
+0.6,1.1,0.736970833
+0.8,-1.1,-0.78673344
+0.8,-1.05,-0.75257664
+0.8,-1,-0.71823744
+0.8,-0.95,-0.68371584
+0.8,-0.9,-0.64901184
+0.8,-0.85,-0.61412544
+0.8,-0.8,-0.57905664
+0.8,-0.75,-0.54380544
+0.8,-0.7,-0.50837184
+0.8,-0.65,-0.47275584
+0.8,-0.6,-0.43695744
+0.8,-0.55,-0.40097664
+0.8,-0.5,-0.36481344
+0.8,-0.45,-0.32846784
+0.8,-0.4,-0.29193984
+0.8,-0.35,-0.25522944
+0.8,-0.3,-0.21833664
+0.8,-0.25,-0.18126144
+0.8,-0.2,-0.14400384
+0.8,-0.15,-0.10656384
+0.8,-0.1,-0.06894144
+0.8,-0.05,-0.03113664
+0.8,-0.01,-0.000761472
+0.8,0.01,0.015840417
+0.8,0.05,0.049547917
+0.8,0.1,0.091860417
+0.8,0.15,0.134370833
+0.8,0.2,0.177079167
+0.8,0.25,0.219985417
+0.8,0.3,0.263089583
+0.8,0.35,0.306391667
+0.8,0.4,0.349891667
+0.8,0.45,0.393589583
+0.8,0.5,0.437485417
+0.8,0.55,0.481579167
+0.8,0.6,0.525870833
+0.8,0.65,0.570360417
+0.8,0.7,0.615047917
+0.8,0.75,0.659933333
+0.8,0.8,0.705016667
+0.8,0.85,0.750297917
+0.8,0.9,0.795777083
+0.8,0.95,0.841454167
+0.8,1,0.887329167
+0.8,1.05,0.933402083
+0.8,1.1,0.979672917
+1,-1.1,-0.9819264
+1,-1.05,-0.9393048
+1,-1,-0.896448
+1,-0.95,-0.853356
+1,-0.9,-0.8100288
+1,-0.85,-0.7664664
+1,-0.8,-0.7226688
+1,-0.75,-0.678636
+1,-0.7,-0.634368
+1,-0.65,-0.5898648
+1,-0.6,-0.5451264
+1,-0.55,-0.5001528
+1,-0.5,-0.454944
+1,-0.45,-0.4095
+1,-0.4,-0.3638208
+1,-0.35,-0.3179064
+1,-0.3,-0.2717568
+1,-0.25,-0.225372
+1,-0.2,-0.178752
+1,-0.15,-0.1318968
+1,-0.1,-0.0848064
+1,-0.05,-0.0374808
+1,-0.01,0
+1,0.01,0.021429063
+1,0.05,0.063497396
+1,0.1,0.1163125
+1,0.15,0.169382812
+1,0.2,0.222708333
+1,0.25,0.276289062
+1,0.3,0.330125
+1,0.35,0.384216146
+1,0.4,0.4385625
+1,0.45,0.493164063
+1,0.5,0.548020833
+1,0.55,0.603132813
+1,0.6,0.6585
+1,0.65,0.714122396
+1,0.7,0.77
+1,0.75,0.826132813
+1,0.8,0.882520833
+1,0.85,0.939164063
+1,0.9,0.9960625
+1,0.95,1.053216146
+1,1,1.110625
+1,1.05,1.168289063
+1,1.1,1.226208333
+1.2,-1.1,-1.17344832
+1.2,-1.05,-1.1226096
+1.2,-1,-1.07147136
+1.2,-0.95,-1.0200336
+1.2,-0.9,-0.96829632
+1.2,-0.85,-0.91625952
+1.2,-0.8,-0.8639232
+1.2,-0.75,-0.81128736
+1.2,-0.7,-0.758352
+1.2,-0.65,-0.70511712
+1.2,-0.6,-0.65158272
+1.2,-0.55,-0.5977488
+1.2,-0.5,-0.54361536
+1.2,-0.45,-0.4891824
+1.2,-0.4,-0.43444992
+1.2,-0.35,-0.37941792
+1.2,-0.3,-0.3240864
+1.2,-0.25,-0.26845536
+1.2,-0.2,-0.2125248
+1.2,-0.15,-0.15629472
+1.2,-0.1,-0.09976512
+1.2,-0.05,-0.042936
+1.2,-0.01,0
+1.2,0.01,0.027976292
+1.2,0.05,0.078411458
+1.2,0.1,0.141747917
+1.2,0.15,0.205409375
+1.2,0.2,0.269395833
+1.2,0.25,0.333707292
+1.2,0.3,0.39834375
+1.2,0.35,0.463305208
+1.2,0.4,0.528591667
+1.2,0.45,0.594203125
+1.2,0.5,0.660139583
+1.2,0.55,0.726401042
+1.2,0.6,0.7929875
+1.2,0.65,0.859898958
+1.2,0.7,0.927135417
+1.2,0.75,0.994696875
+1.2,0.8,1.062583333
+1.2,0.85,1.130794792
+1.2,0.9,1.19933125
+1.2,0.95,1.268192708
+1.2,1,1.337379167
+1.2,1.05,1.406890625
+1.2,1.1,1.476727083
+1.4,-1.1,-1.36116096
+1.4,-1.05,-1.3023528
+1.4,-1,-1.24316928
+1.4,-0.95,-1.1836104
+1.4,-0.9,-1.12367616
+1.4,-0.85,-1.06336656
+1.4,-0.8,-1.0026816
+1.4,-0.75,-0.94162128
+1.4,-0.7,-0.8801856
+1.4,-0.65,-0.81837456
+1.4,-0.6,-0.75618816
+1.4,-0.55,-0.6936264
+1.4,-0.5,-0.63068928
+1.4,-0.45,-0.5673768
+1.4,-0.4,-0.50368896
+1.4,-0.35,-0.43962576
+1.4,-0.3,-0.3751872
+1.4,-0.25,-0.31037328
+1.4,-0.2,-0.245184
+1.4,-0.15,-0.17961936
+1.4,-0.1,-0.11367936
+1.4,-0.05,-0.047364
+1.4,-0.01,0
+1.4,0.01,0.035632104
+1.4,0.05,0.094440104
+1.4,0.1,0.168316667
+1.4,0.15,0.242600521
+1.4,0.2,0.317291667
+1.4,0.25,0.392390104
+1.4,0.3,0.467895833
+1.4,0.35,0.543808854
+1.4,0.4,0.620129167
+1.4,0.45,0.696856771
+1.4,0.5,0.773991667
+1.4,0.55,0.851533854
+1.4,0.6,0.929483333
+1.4,0.65,1.007840104
+1.4,0.7,1.086604167
+1.4,0.75,1.165775521
+1.4,0.8,1.245354167
+1.4,0.85,1.325340104
+1.4,0.9,1.405733333
+1.4,0.95,1.486533854
+1.4,1,1.567741667
+1.4,1.05,1.649356771
+1.4,1.1,1.731379167
+1.6,-1.1,-1.54492608
+1.6,-1.05,-1.47839616
+1.6,-1,-1.41140352
+1.6,-0.95,-1.34394816
+1.6,-0.9,-1.27603008
+1.6,-0.85,-1.20764928
+1.6,-0.8,-1.13880576
+1.6,-0.75,-1.06949952
+1.6,-0.7,-0.99973056
+1.6,-0.65,-0.92949888
+1.6,-0.6,-0.85880448
+1.6,-0.55,-0.78764736
+1.6,-0.5,-0.71602752
+1.6,-0.45,-0.64394496
+1.6,-0.4,-0.57139968
+1.6,-0.35,-0.49839168
+1.6,-0.3,-0.42492096
+1.6,-0.25,-0.35098752
+1.6,-0.2,-0.27659136
+1.6,-0.15,-0.20173248
+1.6,-0.1,-0.12641088
+1.6,-0.05,-0.05062656
+1.6,-0.01,0
+1.6,0.01,0.0445465
+1.6,0.05,0.111733333
+1.6,0.1,0.19616875
+1.6,0.15,0.28110625
+1.6,0.2,0.366545833
+1.6,0.25,0.4524875
+1.6,0.3,0.53893125
+1.6,0.35,0.625877083
+1.6,0.4,0.713325
+1.6,0.45,0.801275
+1.6,0.5,0.889727083
+1.6,0.55,0.97868125
+1.6,0.6,1.0681375
+1.6,0.65,1.158095833
+1.6,0.7,1.24855625
+1.6,0.75,1.33951875
+1.6,0.8,1.430983333
+1.6,0.85,1.52295
+1.6,0.9,1.61541875
+1.6,0.95,1.708389583
+1.6,1,1.8018625
+1.6,1.05,1.8958375
+1.6,1.1,1.990314583
+1.8,-1.1,-1.72460544
+1.8,-1.05,-1.65060144
+1.8,-1,-1.57603584
+1.8,-0.95,-1.50090864
+1.8,-0.9,-1.42521984
+1.8,-0.85,-1.34896944
+1.8,-0.8,-1.27215744
+1.8,-0.75,-1.19478384
+1.8,-0.7,-1.11684864
+1.8,-0.65,-1.03835184
+1.8,-0.6,-0.95929344
+1.8,-0.55,-0.87967344
+1.8,-0.5,-0.79949184
+1.8,-0.45,-0.71874864
+1.8,-0.4,-0.63744384
+1.8,-0.35,-0.55557744
+1.8,-0.3,-0.47314944
+1.8,-0.25,-0.39015984
+1.8,-0.2,-0.30660864
+1.8,-0.15,-0.22249584
+1.8,-0.1,-0.13782144
+1.8,-0.05,-0.05258544
+1.8,-0.01,0
+1.8,0.01,0.054869479
+1.8,0.05,0.130441146
+1.8,0.1,0.225454167
+1.8,0.15,0.321076562
+1.8,0.2,0.417308333
+1.8,0.25,0.514149479
+1.8,0.3,0.6116
+1.8,0.35,0.709659896
+1.8,0.4,0.808329167
+1.8,0.45,0.907607813
+1.8,0.5,1.007495833
+1.8,0.55,1.107993229
+1.8,0.6,1.2091
+1.8,0.65,1.310816146
+1.8,0.7,1.413141667
+1.8,0.75,1.516076563
+1.8,0.8,1.619620833
+1.8,0.85,1.723774479
+1.8,0.9,1.8285375
+1.8,0.95,1.933909896
+1.8,1,2.039891667
+1.8,1.05,2.146482813
+1.8,1.1,2.253683333
+2,-1.1,-1.9000608
+2,-1.05,-1.8188304
+2,-1,-1.736928
+2,-0.95,-1.6543536
+2,-0.9,-1.5711072
+2,-0.85,-1.4871888
+2,-0.8,-1.4025984
+2,-0.75,-1.317336
+2,-0.7,-1.2314016
+2,-0.65,-1.1447952
+2,-0.6,-1.0575168
+2,-0.55,-0.9695664
+2,-0.5,-0.880944
+2,-0.45,-0.7916496
+2,-0.4,-0.7016832
+2,-0.35,-0.6110448
+2,-0.3,-0.5197344
+2,-0.25,-0.427752
+2,-0.2,-0.3350976
+2,-0.15,-0.2417712
+2,-0.1,-0.1477728
+2,-0.05,-0.0531024
+2,-0.01,0
+2,0.01,0.066751042
+2,0.05,0.150713542
+2,0.1,0.256322917
+2,0.15,0.362661458
+2,0.2,0.469729167
+2,0.25,0.577526042
+2,0.3,0.686052083
+2,0.35,0.795307292
+2,0.4,0.905291667
+2,0.45,1.016005208
+2,0.5,1.127447917
+2,0.55,1.239619792
+2,0.6,1.352520833
+2,0.65,1.466151042
+2,0.7,1.580510417
+2,0.75,1.695598958
+2,0.8,1.811416667
+2,0.85,1.927963542
+2,0.9,2.045239583
+2,0.95,2.163244792
+2,1,2.281979167
+2,1.05,2.401442708
+2,1.1,2.521635417
+2.2,-1.1,-2.07115392
+2.2,-1.05,-1.9829448
+2.2,-1,-1.89394176
+2.2,-0.95,-1.8041448
+2.2,-0.9,-1.71355392
+2.2,-0.85,-1.62216912
+2.2,-0.8,-1.5299904
+2.2,-0.75,-1.43701776
+2.2,-0.7,-1.3432512
+2.2,-0.65,-1.24869072
+2.2,-0.6,-1.15333632
+2.2,-0.55,-1.057188
+2.2,-0.5,-0.96024576
+2.2,-0.45,-0.8625096
+2.2,-0.4,-0.76397952
+2.2,-0.35,-0.66465552
+2.2,-0.3,-0.5645376
+2.2,-0.25,-0.46362576
+2.2,-0.2,-0.36192
+2.2,-0.15,-0.25942032
+2.2,-0.1,-0.15612672
+2.2,-0.05,-0.0520392
+2.2,-0.01,0
+2.2,0.01,0.080341188
+2.2,0.05,0.172700521
+2.2,0.1,0.288925
+2.2,0.15,0.406010937
+2.2,0.2,0.523958333
+2.2,0.25,0.642767187
+2.2,0.3,0.7624375
+2.2,0.35,0.882969271
+2.2,0.4,1.0043625
+2.2,0.45,1.126617188
+2.2,0.5,1.249733333
+2.2,0.55,1.373710938
+2.2,0.6,1.49855
+2.2,0.65,1.624250521
+2.2,0.7,1.7508125
+2.2,0.75,1.878235938
+2.2,0.8,2.006520833
+2.2,0.85,2.135667188
+2.2,0.9,2.265675
+2.2,0.95,2.396544271
+2.2,1,2.528275
+2.2,1.05,2.660867188
+2.2,1.1,2.794320833
+2.4,-1.1,-2.23774656
+2.4,-1.05,-2.1428064
+2.4,-1,-2.04693888
+2.4,-0.95,-1.950144
+2.4,-0.9,-1.85242176
+2.4,-0.85,-1.75377216
+2.4,-0.8,-1.6541952
+2.4,-0.75,-1.55369088
+2.4,-0.7,-1.4522592
+2.4,-0.65,-1.34990016
+2.4,-0.6,-1.24661376
+2.4,-0.55,-1.1424
+2.4,-0.5,-1.03725888
+2.4,-0.45,-0.9311904
+2.4,-0.4,-0.82419456
+2.4,-0.35,-0.71627136
+2.4,-0.3,-0.6074208
+2.4,-0.25,-0.49764288
+2.4,-0.2,-0.3869376
+2.4,-0.15,-0.27530496
+2.4,-0.1,-0.16274496
+2.4,-0.05,-0.0492576
+2.4,-0.01,0
+2.4,0.01,0.095789917
+2.4,0.05,0.196552083
+2.4,0.1,0.323410417
+2.4,0.15,0.451275
+2.4,0.2,0.580145833
+2.4,0.25,0.710022917
+2.4,0.3,0.84090625
+2.4,0.35,0.972795833
+2.4,0.4,1.105691667
+2.4,0.45,1.23959375
+2.4,0.5,1.374502083
+2.4,0.55,1.510416667
+2.4,0.6,1.6473375
+2.4,0.65,1.785264583
+2.4,0.7,1.924197917
+2.4,0.75,2.0641375
+2.4,0.8,2.205083333
+2.4,0.85,2.347035417
+2.4,0.9,2.48999375
+2.4,0.95,2.633958333
+2.4,1,2.778929167
+2.4,1.05,2.92490625
+2.4,1.1,3.071889583
+2.6,-1.1,-2.39970048
+2.6,-1.05,-2.29827696
+2.6,-1,-2.19578112
+2.6,-0.95,-2.09221296
+2.6,-0.9,-1.98757248
+2.6,-0.85,-1.88185968
+2.6,-0.8,-1.77507456
+2.6,-0.75,-1.66721712
+2.6,-0.7,-1.55828736
+2.6,-0.65,-1.44828528
+2.6,-0.6,-1.33721088
+2.6,-0.55,-1.22506416
+2.6,-0.5,-1.11184512
+2.6,-0.45,-0.99755376
+2.6,-0.4,-0.88219008
+2.6,-0.35,-0.76575408
+2.6,-0.3,-0.64824576
+2.6,-0.25,-0.52966512
+2.6,-0.2,-0.41001216
+2.6,-0.15,-0.28928688
+2.6,-0.1,-0.16748928
+2.6,-0.05,-0.04461936
+2.6,-0.01,0
+2.6,0.01,0.113247229
+2.6,0.05,0.222418229
+2.6,0.1,0.359929167
+2.6,0.15,0.498603646
+2.6,0.2,0.638441667
+2.6,0.25,0.779443229
+2.6,0.3,0.921608333
+2.6,0.35,1.064936979
+2.6,0.4,1.209429167
+2.6,0.45,1.355084896
+2.6,0.5,1.501904167
+2.6,0.55,1.649886979
+2.6,0.6,1.799033333
+2.6,0.65,1.949343229
+2.6,0.7,2.100816667
+2.6,0.75,2.253453646
+2.6,0.8,2.407254167
+2.6,0.85,2.562218229
+2.6,0.9,2.718345833
+2.6,0.95,2.875636979
+2.6,1,3.034091667
+2.6,1.05,3.193709896
+2.6,1.1,3.354491667
+2.8,-1.1,-2.55687744
+2.8,-1.05,-2.44921824
+2.8,-1,-2.34033024
+2.8,-0.95,-2.23021344
+2.8,-0.9,-2.11886784
+2.8,-0.85,-2.00629344
+2.8,-0.8,-1.89249024
+2.8,-0.75,-1.77745824
+2.8,-0.7,-1.66119744
+2.8,-0.65,-1.54370784
+2.8,-0.6,-1.42498944
+2.8,-0.55,-1.30504224
+2.8,-0.5,-1.18386624
+2.8,-0.45,-1.06146144
+2.8,-0.4,-0.93782784
+2.8,-0.35,-0.81296544
+2.8,-0.3,-0.68687424
+2.8,-0.25,-0.55955424
+2.8,-0.2,-0.43100544
+2.8,-0.15,-0.30122784
+2.8,-0.1,-0.17022144
+2.8,-0.05,-0.03798624
+2.8,-0.01,0
+2.8,0.01,0.132863125
+2.8,0.05,0.250448958
+2.8,0.1,0.39863125
+2.8,0.15,0.548146875
+2.8,0.2,0.698995833
+2.8,0.25,0.851178125
+2.8,0.3,1.00469375
+2.8,0.35,1.159542708
+2.8,0.4,1.315725
+2.8,0.45,1.473240625
+2.8,0.5,1.632089583
+2.8,0.55,1.792271875
+2.8,0.6,1.9537875
+2.8,0.65,2.116636458
+2.8,0.7,2.28081875
+2.8,0.75,2.446334375
+2.8,0.8,2.613183333
+2.8,0.85,2.781365625
+2.8,0.9,2.95088125
+2.8,0.95,3.121730208
+2.8,1,3.2939125
+2.8,1.05,3.467428125
+2.8,1.1,3.642277083
+3,-1.1,-2.7091392
+3,-1.05,-2.595492
+3,-1,-2.480448
+3,-0.95,-2.3640072
+3,-0.9,-2.2461696
+3,-0.85,-2.1269352
+3,-0.8,-2.006304
+3,-0.75,-1.884276
+3,-0.7,-1.7608512
+3,-0.65,-1.6360296
+3,-0.6,-1.5098112
+3,-0.55,-1.382196
+3,-0.5,-1.253184
+3,-0.45,-1.1227752
+3,-0.4,-0.9909696
+3,-0.35,-0.8577672
+3,-0.3,-0.723168
+3,-0.25,-0.587172
+3,-0.2,-0.4497792
+3,-0.15,-0.3109896
+3,-0.1,-0.1708032
+3,-0.05,-0.02922
+3,-0.01,0
+3,0.01,0.154787604
+3,0.05,0.280794271
+3,0.1,0.439666667
+3,0.15,0.600054687
+3,0.2,0.761958333
+3,0.25,0.925377604
+3,0.3,1.0903125
+3,0.35,1.256763021
+3,0.4,1.424729167
+3,0.45,1.594210938
+3,0.5,1.765208333
+3,0.55,1.937721354
+3,0.6,2.11175
+3,0.65,2.287294271
+3,0.7,2.464354167
+3,0.75,2.642929688
+3,0.8,2.823020833
+3,0.85,3.004627604
+3,0.9,3.18775
+3,0.95,3.372388021
+3,1,3.558541667
+3,1.05,3.746210938
+3,1.1,3.935395833
+3.2,-1.1,-2.85634752
+3.2,-1.05,-2.73696
+3.2,-1,-2.61599616
+3.2,-0.95,-2.493456
+3.2,-0.9,-2.36933952
+3.2,-0.85,-2.24364672
+3.2,-0.8,-2.1163776
+3.2,-0.75,-1.98753216
+3.2,-0.7,-1.8571104
+3.2,-0.65,-1.72511232
+3.2,-0.6,-1.59153792
+3.2,-0.55,-1.4563872
+3.2,-0.5,-1.31966016
+3.2,-0.45,-1.1813568
+3.2,-0.4,-1.04147712
+3.2,-0.35,-0.90002112
+3.2,-0.3,-0.7569888
+3.2,-0.25,-0.61238016
+3.2,-0.2,-0.4661952
+3.2,-0.15,-0.31843392
+3.2,-0.1,-0.16909632
+3.2,-0.05,-0.0181824
+3.2,-0.01,0
+3.2,0.01,0.179170667
+3.2,0.05,0.313604167
+3.2,0.1,0.483185417
+3.2,0.15,0.654477083
+3.2,0.2,0.827479167
+3.2,0.25,1.002191667
+3.2,0.3,1.178614583
+3.2,0.35,1.356747917
+3.2,0.4,1.536591667
+3.2,0.45,1.718145833
+3.2,0.5,1.901410417
+3.2,0.55,2.086385417
+3.2,0.6,2.273070833
+3.2,0.65,2.461466667
+3.2,0.7,2.651572917
+3.2,0.75,2.843389583
+3.2,0.8,3.036916667
+3.2,0.85,3.232154167
+3.2,0.9,3.429102083
+3.2,0.95,3.627760417
+3.2,1,3.828129167
+3.2,1.05,4.030208333
+3.2,1.1,4.233997917
+3.4,-1.1,-2.99836416
+3.4,-1.05,-2.873484
+3.4,-1,-2.74683648
+3.4,-0.95,-2.6184216
+3.4,-0.9,-2.48823936
+3.4,-0.85,-2.35628976
+3.4,-0.8,-2.2225728
+3.4,-0.75,-2.08708848
+3.4,-0.7,-1.9498368
+3.4,-0.65,-1.81081776
+3.4,-0.6,-1.67003136
+3.4,-0.55,-1.5274776
+3.4,-0.5,-1.38315648
+3.4,-0.45,-1.237068
+3.4,-0.4,-1.08921216
+3.4,-0.35,-0.93958896
+3.4,-0.3,-0.7881984
+3.4,-0.25,-0.63504048
+3.4,-0.2,-0.4801152
+3.4,-0.15,-0.32342256
+3.4,-0.1,-0.16496256
+3.4,-0.05,-0.0047352
+3.4,-0.01,0
+3.4,0.01,0.206162313
+3.4,0.05,0.349028646
+3.4,0.1,0.5293375
+3.4,0.15,0.711564062
+3.4,0.2,0.895708333
+3.4,0.25,1.081770313
+3.4,0.3,1.26975
+3.4,0.35,1.459647396
+3.4,0.4,1.6514625
+3.4,0.45,1.845195313
+3.4,0.5,2.040845833
+3.4,0.55,2.238414063
+3.4,0.6,2.4379
+3.4,0.65,2.639303646
+3.4,0.7,2.842625
+3.4,0.75,3.047864063
+3.4,0.8,3.255020833
+3.4,0.85,3.464095313
+3.4,0.9,3.6750875
+3.4,0.95,3.887997396
+3.4,1,4.102825
+3.4,1.05,4.319570313
+3.4,1.1,4.538233333
+3.6,-1.1,-3.13505088
+3.6,-1.05,-3.00492576
+3.6,-1,-2.87283072
+3.6,-0.95,-2.73876576
+3.6,-0.9,-2.60273088
+3.6,-0.85,-2.46472608
+3.6,-0.8,-2.32475136
+3.6,-0.75,-2.18280672
+3.6,-0.7,-2.03889216
+3.6,-0.65,-1.89300768
+3.6,-0.6,-1.74515328
+3.6,-0.55,-1.59532896
+3.6,-0.5,-1.44353472
+3.6,-0.45,-1.28977056
+3.6,-0.4,-1.13403648
+3.6,-0.35,-0.97633248
+3.6,-0.3,-0.81665856
+3.6,-0.25,-0.65501472
+3.6,-0.2,-0.49140096
+3.6,-0.15,-0.32581728
+3.6,-0.1,-0.15826368
+3.6,-0.05,0
+3.6,-0.01,0
+3.6,0.01,0.235912542
+3.6,0.05,0.387217708
+3.6,0.1,0.578272917
+3.6,0.15,0.771465625
+3.6,0.2,0.966795833
+3.6,0.25,1.164263542
+3.6,0.3,1.36386875
+3.6,0.35,1.565611458
+3.6,0.4,1.769491667
+3.6,0.45,1.975509375
+3.6,0.5,2.183664583
+3.6,0.55,2.393957292
+3.6,0.6,2.6063875
+3.6,0.65,2.820955208
+3.6,0.7,3.037660417
+3.6,0.75,3.256503125
+3.6,0.8,3.477483333
+3.6,0.85,3.700601042
+3.6,0.9,3.92585625
+3.6,0.95,4.153248958
+3.6,1,4.382779167
+3.6,1.05,4.614446875
+3.6,1.1,4.848252083
+3.8,-1.1,-3.26626944
+3.8,-1.05,-3.13114704
+3.8,-1,-2.99384064
+3.8,-0.95,-2.85435024
+3.8,-0.9,-2.71267584
+3.8,-0.85,-2.56881744
+3.8,-0.8,-2.42277504
+3.8,-0.75,-2.27454864
+3.8,-0.7,-2.12413824
+3.8,-0.65,-1.97154384
+3.8,-0.6,-1.81676544
+3.8,-0.55,-1.65980304
+3.8,-0.5,-1.50065664
+3.8,-0.45,-1.33932624
+3.8,-0.4,-1.17581184
+3.8,-0.35,-1.01011344
+3.8,-0.3,-0.84223104
+3.8,-0.25,-0.67216464
+3.8,-0.2,-0.49991424
+3.8,-0.15,-0.32547984
+3.8,-0.1,-0.14886144
+3.8,-0.05,0
+3.8,-0.01,0
+3.8,0.01,0.268571354
+3.8,0.05,0.428321354
+3.8,0.1,0.630141667
+3.8,0.15,0.834331771
+3.8,0.2,1.040891667
+3.8,0.25,1.249821354
+3.8,0.3,1.461120833
+3.8,0.35,1.674790104
+3.8,0.4,1.890829167
+3.8,0.45,2.109238021
+3.8,0.5,2.330016667
+3.8,0.55,2.553165104
+3.8,0.6,2.778683333
+3.8,0.65,3.006571354
+3.8,0.7,3.236829167
+3.8,0.75,3.469456771
+3.8,0.8,3.704454167
+3.8,0.85,3.941821354
+3.8,0.9,4.181558333
+3.8,0.95,4.423665104
+3.8,1,4.668141667
+3.8,1.05,4.914988021
+3.8,1.1,5.164204167
+4,-1.1,-3.3918816
+4,-1.05,-3.2520096
+4,-1,-3.109728
+4,-0.95,-2.9650368
+4,-0.9,-2.817936
+4,-0.85,-2.6684256
+4,-0.8,-2.5165056
+4,-0.75,-2.362176
+4,-0.7,-2.2054368
+4,-0.65,-2.046288
+4,-0.6,-1.8847296
+4,-0.55,-1.7207616
+4,-0.5,-1.554384
+4,-0.45,-1.3855968
+4,-0.4,-1.2144
+4,-0.35,-1.0407936
+4,-0.3,-0.8647776
+4,-0.25,-0.686352
+4,-0.2,-0.5055168
+4,-0.15,-0.322272
+4,-0.1,-0.1366176
+4,-0.05,0
+4,-0.01,0
+4,0.01,0.30428875
+4,0.05,0.472489583
+4,0.1,0.68509375
+4,0.15,0.9003125
+4,0.2,1.118145833
+4,0.25,1.33859375
+4,0.3,1.56165625
+4,0.35,1.787333333
+4,0.4,2.015625
+4,0.45,2.24653125
+4,0.5,2.480052083
+4,0.55,2.7161875
+4,0.6,2.9549375
+4,0.65,3.196302083
+4,0.7,3.44028125
+4,0.75,3.686875
+4,0.8,3.936083333
+4,0.85,4.18790625
+4,0.9,4.44234375
+4,0.95,4.699395833
+4,1,4.9590625
+4,1.05,5.22134375
+4,1.1,5.486239583
diff --git a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_PSM_normalized.vmap b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_PSM_normalized.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..86ab892eba8f3f37114a5d9bdc7682804e571ae8
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_PSM_normalized.vmap
@@ -0,0 +1,1013 @@
+n_norm , T_norm , Pel_norm
+0,-1.1,0.002005675
+0,-1.05,0.001924827
+0,-1,0.001842944
+0,-0.95,0.001760027
+0,-0.9,0.001676075
+0,-0.85,0.001591088
+0,-0.8,0.001505067
+0,-0.75,0.001418011
+0,-0.7,0.000931738
+0,-0.65,0.000253642
+0,-0.6,-0.000329318
+0,-0.55,-0.000817142
+0,-0.5,-0.00120983
+0,-0.45,-0.001507382
+0,-0.4,-0.001709798
+0,-0.35,-0.001817078
+0,-0.3,-0.001829222
+0,-0.25,-0.00174623
+0,-0.2,-0.001568102
+0,-0.15,-0.001294838
+0,-0.1,-0.000926438
+0,-0.05,-0.000462902
+0,-0.01,-2.35757E-05
+0,0.01,0.000391085
+0,0.05,0.001581052
+0,0.1,0.003161417
+0,0.15,0.00484501
+0,0.2,0.006631833
+0,0.25,0.008521885
+0,0.3,0.010515167
+0,0.35,0.012611677
+0,0.4,0.014811417
+0,0.45,0.017114385
+0,0.5,0.019520583
+0,0.55,0.02203001
+0,0.6,0.024642667
+0,0.65,0.027358552
+0,0.7,0.030177667
+0,0.75,0.03310001
+0,0.8,0.036125583
+0,0.85,0.039254385
+0,0.9,0.042486417
+0,0.95,0.045821677
+0,1,0.049260167
+0,0,0.045821677
+0,0,0.042486417
+0.02,-1.1,0
+0.02,-1.05,0
+0.02,-1,0
+0.02,-0.95,0
+0.02,-0.9,0
+0.02,-0.85,0
+0.02,-0.8,0
+0.02,-0.75,0
+0.02,-0.7,-0.000358364
+0.02,-0.65,-0.000888438
+0.02,-0.6,-0.001331958
+0.02,-0.55,-0.001688924
+0.02,-0.5,-0.001959337
+0.02,-0.45,-0.002143196
+0.02,-0.4,-0.002240502
+0.02,-0.35,-0.002251254
+0.02,-0.3,-0.002175452
+0.02,-0.25,-0.002013097
+0.02,-0.2,-0.001764188
+0.02,-0.15,-0.001428726
+0.02,-0.1,-0.00100671
+0.02,-0.05,-0.00049814
+0.02,-0.01,-2.89659E-05
+0.02,0.01,0.000385237
+0.02,0.05,0.001542817
+0.02,0.1,0.003074317
+0.02,0.15,0.004699733
+0.02,0.2,0.006419067
+0.02,0.25,0.008232317
+0.02,0.3,0.010139483
+0.02,0.35,0.012140567
+0.02,0.4,0.014235567
+0.02,0.45,0.016424483
+0.02,0.5,0.018707317
+0.02,0.55,0.021084067
+0.02,0.6,0.023554733
+0.02,0.65,0.026119317
+0.02,0.7,0.028777817
+0.02,0.75,0.031530233
+0.02,0.8,0.034376567
+0.02,0.85,0.037316817
+0.02,0.9,0.040350983
+0.02,0.95,0.043479067
+0.02,1,0.046701067
+0.02,1.05,0.050016983
+0.02,1.1,0.053426817
+0.2,-1.1,-0.18051072
+0.2,-1.05,-0.1732344
+0.2,-1,-0.16586496
+0.2,-0.95,-0.1584024
+0.2,-0.9,-0.15084672
+0.2,-0.85,-0.14319792
+0.2,-0.8,-0.135456
+0.2,-0.75,-0.12762096
+0.2,-0.7,-0.1196928
+0.2,-0.65,-0.11167152
+0.2,-0.6,-0.10355712
+0.2,-0.55,-0.0953496
+0.2,-0.5,-0.08704896
+0.2,-0.45,-0.0786552
+0.2,-0.4,-0.07016832
+0.2,-0.35,-0.06158832
+0.2,-0.3,-0.0529152
+0.2,-0.25,-0.04414896
+0.2,-0.2,-0.0352896
+0.2,-0.15,-0.02633712
+0.2,-0.1,-0.01729152
+0.2,-0.05,-0.0081528
+0.2,-0.01,-0.000774778
+0.2,0.01,0.003325979
+0.2,0.05,0.011986979
+0.2,0.1,0.022904167
+0.2,0.15,0.033922396
+0.2,0.2,0.045041667
+0.2,0.25,0.056261979
+0.2,0.3,0.067583333
+0.2,0.35,0.079005729
+0.2,0.4,0.090529167
+0.2,0.45,0.102153646
+0.2,0.5,0.113879167
+0.2,0.55,0.125705729
+0.2,0.6,0.137633333
+0.2,0.65,0.149661979
+0.2,0.7,0.161791667
+0.2,0.75,0.174022396
+0.2,0.8,0.186354167
+0.2,0.85,0.198786979
+0.2,0.9,0.211320833
+0.2,0.95,0.223955729
+0.2,1,0.236691667
+0.2,1.05,0.249528646
+0.2,1.1,0.262466667
+0.4,-1.1,-0.38588736
+0.4,-1.05,-0.3694032
+0.4,-1,-0.35280768
+0.4,-0.95,-0.3361008
+0.4,-0.9,-0.31928256
+0.4,-0.85,-0.30235296
+0.4,-0.8,-0.285312
+0.4,-0.75,-0.26815968
+0.4,-0.7,-0.250896
+0.4,-0.65,-0.23352096
+0.4,-0.6,-0.21603456
+0.4,-0.55,-0.1984368
+0.4,-0.5,-0.18072768
+0.4,-0.45,-0.1629072
+0.4,-0.4,-0.14497536
+0.4,-0.35,-0.12693216
+0.4,-0.3,-0.1087776
+0.4,-0.25,-0.09051168
+0.4,-0.2,-0.0721344
+0.4,-0.15,-0.05364576
+0.4,-0.1,-0.03504576
+0.4,-0.05,-0.0163344
+0.4,-0.01,-0.001285133
+0.4,0.01,0.006938875
+0.4,0.05,0.023942708
+0.4,0.1,0.04530625
+0.4,0.15,0.066790625
+0.4,0.2,0.088395833
+0.4,0.25,0.110121875
+0.4,0.3,0.13196875
+0.4,0.35,0.153936458
+0.4,0.4,0.176025
+0.4,0.45,0.198234375
+0.4,0.5,0.220564583
+0.4,0.55,0.243015625
+0.4,0.6,0.2655875
+0.4,0.65,0.288280208
+0.4,0.7,0.31109375
+0.4,0.75,0.334028125
+0.4,0.8,0.357083333
+0.4,0.85,0.380259375
+0.4,0.9,0.40355625
+0.4,0.95,0.426973958
+0.4,1,0.4505125
+0.4,1.05,0.474171875
+0.4,1.1,0.497952083
+0.6,-1.1,-0.58800768
+0.6,-1.05,-0.56256336
+0.6,-1,-0.53697792
+0.6,-0.95,-0.51125136
+0.6,-0.9,-0.48538368
+0.6,-0.85,-0.45937488
+0.6,-0.8,-0.43322496
+0.6,-0.75,-0.40693392
+0.6,-0.7,-0.38050176
+0.6,-0.65,-0.35392848
+0.6,-0.6,-0.32721408
+0.6,-0.55,-0.30035856
+0.6,-0.5,-0.27336192
+0.6,-0.45,-0.24622416
+0.6,-0.4,-0.21894528
+0.6,-0.35,-0.19152528
+0.6,-0.3,-0.16396416
+0.6,-0.25,-0.13626192
+0.6,-0.2,-0.10841856
+0.6,-0.15,-0.08043408
+0.6,-0.1,-0.05230848
+0.6,-0.05,-0.02404176
+0.6,-0.01,-0.001326778
+0.6,0.01,0.011060354
+0.6,0.05,0.036413021
+0.6,0.1,0.068241667
+0.6,0.15,0.100223437
+0.6,0.2,0.132358333
+0.6,0.25,0.164646354
+0.6,0.3,0.1970875
+0.6,0.35,0.229681771
+0.6,0.4,0.262429167
+0.6,0.45,0.295329688
+0.6,0.5,0.328383333
+0.6,0.55,0.361590104
+0.6,0.6,0.39495
+0.6,0.65,0.428463021
+0.6,0.7,0.462129167
+0.6,0.75,0.495948438
+0.6,0.8,0.529920833
+0.6,0.85,0.564046354
+0.6,0.9,0.598325
+0.6,0.95,0.632756771
+0.6,1,0.667341667
+0.6,1.05,0.702079688
+0.6,1.1,0.736970833
+0.8,-1.1,-0.78673344
+0.8,-1.05,-0.75257664
+0.8,-1,-0.71823744
+0.8,-0.95,-0.68371584
+0.8,-0.9,-0.64901184
+0.8,-0.85,-0.61412544
+0.8,-0.8,-0.57905664
+0.8,-0.75,-0.54380544
+0.8,-0.7,-0.50837184
+0.8,-0.65,-0.47275584
+0.8,-0.6,-0.43695744
+0.8,-0.55,-0.40097664
+0.8,-0.5,-0.36481344
+0.8,-0.45,-0.32846784
+0.8,-0.4,-0.29193984
+0.8,-0.35,-0.25522944
+0.8,-0.3,-0.21833664
+0.8,-0.25,-0.18126144
+0.8,-0.2,-0.14400384
+0.8,-0.15,-0.10656384
+0.8,-0.1,-0.06894144
+0.8,-0.05,-0.03113664
+0.8,-0.01,-0.000761472
+0.8,0.01,0.015840417
+0.8,0.05,0.049547917
+0.8,0.1,0.091860417
+0.8,0.15,0.134370833
+0.8,0.2,0.177079167
+0.8,0.25,0.219985417
+0.8,0.3,0.263089583
+0.8,0.35,0.306391667
+0.8,0.4,0.349891667
+0.8,0.45,0.393589583
+0.8,0.5,0.437485417
+0.8,0.55,0.481579167
+0.8,0.6,0.525870833
+0.8,0.65,0.570360417
+0.8,0.7,0.615047917
+0.8,0.75,0.659933333
+0.8,0.8,0.705016667
+0.8,0.85,0.750297917
+0.8,0.9,0.795777083
+0.8,0.95,0.841454167
+0.8,1,0.887329167
+0.8,1.05,0.933402083
+0.8,1.1,0.979672917
+1,-1.1,-0.9819264
+1,-1.05,-0.9393048
+1,-1,-0.896448
+1,-0.95,-0.853356
+1,-0.9,-0.8100288
+1,-0.85,-0.7664664
+1,-0.8,-0.7226688
+1,-0.75,-0.678636
+1,-0.7,-0.634368
+1,-0.65,-0.5898648
+1,-0.6,-0.5451264
+1,-0.55,-0.5001528
+1,-0.5,-0.454944
+1,-0.45,-0.4095
+1,-0.4,-0.3638208
+1,-0.35,-0.3179064
+1,-0.3,-0.2717568
+1,-0.25,-0.225372
+1,-0.2,-0.178752
+1,-0.15,-0.1318968
+1,-0.1,-0.0848064
+1,-0.05,-0.0374808
+1,-0.01,0
+1,0.01,0.021429063
+1,0.05,0.063497396
+1,0.1,0.1163125
+1,0.15,0.169382812
+1,0.2,0.222708333
+1,0.25,0.276289062
+1,0.3,0.330125
+1,0.35,0.384216146
+1,0.4,0.4385625
+1,0.45,0.493164063
+1,0.5,0.548020833
+1,0.55,0.603132813
+1,0.6,0.6585
+1,0.65,0.714122396
+1,0.7,0.77
+1,0.75,0.826132813
+1,0.8,0.882520833
+1,0.85,0.939164063
+1,0.9,0.9960625
+1,0.95,1.053216146
+1,1,1.110625
+1,1.05,1.168289063
+1,1.1,1.226208333
+1.2,-1.1,-1.17344832
+1.2,-1.05,-1.1226096
+1.2,-1,-1.07147136
+1.2,-0.95,-1.0200336
+1.2,-0.9,-0.96829632
+1.2,-0.85,-0.91625952
+1.2,-0.8,-0.8639232
+1.2,-0.75,-0.81128736
+1.2,-0.7,-0.758352
+1.2,-0.65,-0.70511712
+1.2,-0.6,-0.65158272
+1.2,-0.55,-0.5977488
+1.2,-0.5,-0.54361536
+1.2,-0.45,-0.4891824
+1.2,-0.4,-0.43444992
+1.2,-0.35,-0.37941792
+1.2,-0.3,-0.3240864
+1.2,-0.25,-0.26845536
+1.2,-0.2,-0.2125248
+1.2,-0.15,-0.15629472
+1.2,-0.1,-0.09976512
+1.2,-0.05,-0.042936
+1.2,-0.01,0
+1.2,0.01,0.027976292
+1.2,0.05,0.078411458
+1.2,0.1,0.141747917
+1.2,0.15,0.205409375
+1.2,0.2,0.269395833
+1.2,0.25,0.333707292
+1.2,0.3,0.39834375
+1.2,0.35,0.463305208
+1.2,0.4,0.528591667
+1.2,0.45,0.594203125
+1.2,0.5,0.660139583
+1.2,0.55,0.726401042
+1.2,0.6,0.7929875
+1.2,0.65,0.859898958
+1.2,0.7,0.927135417
+1.2,0.75,0.994696875
+1.2,0.8,1.062583333
+1.2,0.85,1.130794792
+1.2,0.9,1.19933125
+1.2,0.95,1.268192708
+1.2,1,1.337379167
+1.2,1.05,1.406890625
+1.2,1.1,1.476727083
+1.4,-1.1,-1.36116096
+1.4,-1.05,-1.3023528
+1.4,-1,-1.24316928
+1.4,-0.95,-1.1836104
+1.4,-0.9,-1.12367616
+1.4,-0.85,-1.06336656
+1.4,-0.8,-1.0026816
+1.4,-0.75,-0.94162128
+1.4,-0.7,-0.8801856
+1.4,-0.65,-0.81837456
+1.4,-0.6,-0.75618816
+1.4,-0.55,-0.6936264
+1.4,-0.5,-0.63068928
+1.4,-0.45,-0.5673768
+1.4,-0.4,-0.50368896
+1.4,-0.35,-0.43962576
+1.4,-0.3,-0.3751872
+1.4,-0.25,-0.31037328
+1.4,-0.2,-0.245184
+1.4,-0.15,-0.17961936
+1.4,-0.1,-0.11367936
+1.4,-0.05,-0.047364
+1.4,-0.01,0
+1.4,0.01,0.035632104
+1.4,0.05,0.094440104
+1.4,0.1,0.168316667
+1.4,0.15,0.242600521
+1.4,0.2,0.317291667
+1.4,0.25,0.392390104
+1.4,0.3,0.467895833
+1.4,0.35,0.543808854
+1.4,0.4,0.620129167
+1.4,0.45,0.696856771
+1.4,0.5,0.773991667
+1.4,0.55,0.851533854
+1.4,0.6,0.929483333
+1.4,0.65,1.007840104
+1.4,0.7,1.086604167
+1.4,0.75,1.165775521
+1.4,0.8,1.245354167
+1.4,0.85,1.325340104
+1.4,0.9,1.405733333
+1.4,0.95,1.486533854
+1.4,1,1.567741667
+1.4,1.05,1.649356771
+1.4,1.1,1.731379167
+1.6,-1.1,-1.54492608
+1.6,-1.05,-1.47839616
+1.6,-1,-1.41140352
+1.6,-0.95,-1.34394816
+1.6,-0.9,-1.27603008
+1.6,-0.85,-1.20764928
+1.6,-0.8,-1.13880576
+1.6,-0.75,-1.06949952
+1.6,-0.7,-0.99973056
+1.6,-0.65,-0.92949888
+1.6,-0.6,-0.85880448
+1.6,-0.55,-0.78764736
+1.6,-0.5,-0.71602752
+1.6,-0.45,-0.64394496
+1.6,-0.4,-0.57139968
+1.6,-0.35,-0.49839168
+1.6,-0.3,-0.42492096
+1.6,-0.25,-0.35098752
+1.6,-0.2,-0.27659136
+1.6,-0.15,-0.20173248
+1.6,-0.1,-0.12641088
+1.6,-0.05,-0.05062656
+1.6,-0.01,0
+1.6,0.01,0.0445465
+1.6,0.05,0.111733333
+1.6,0.1,0.19616875
+1.6,0.15,0.28110625
+1.6,0.2,0.366545833
+1.6,0.25,0.4524875
+1.6,0.3,0.53893125
+1.6,0.35,0.625877083
+1.6,0.4,0.713325
+1.6,0.45,0.801275
+1.6,0.5,0.889727083
+1.6,0.55,0.97868125
+1.6,0.6,1.0681375
+1.6,0.65,1.158095833
+1.6,0.7,1.24855625
+1.6,0.75,1.33951875
+1.6,0.8,1.430983333
+1.6,0.85,1.52295
+1.6,0.9,1.61541875
+1.6,0.95,1.708389583
+1.6,1,1.8018625
+1.6,1.05,1.8958375
+1.6,1.1,1.990314583
+1.8,-1.1,-1.72460544
+1.8,-1.05,-1.65060144
+1.8,-1,-1.57603584
+1.8,-0.95,-1.50090864
+1.8,-0.9,-1.42521984
+1.8,-0.85,-1.34896944
+1.8,-0.8,-1.27215744
+1.8,-0.75,-1.19478384
+1.8,-0.7,-1.11684864
+1.8,-0.65,-1.03835184
+1.8,-0.6,-0.95929344
+1.8,-0.55,-0.87967344
+1.8,-0.5,-0.79949184
+1.8,-0.45,-0.71874864
+1.8,-0.4,-0.63744384
+1.8,-0.35,-0.55557744
+1.8,-0.3,-0.47314944
+1.8,-0.25,-0.39015984
+1.8,-0.2,-0.30660864
+1.8,-0.15,-0.22249584
+1.8,-0.1,-0.13782144
+1.8,-0.05,-0.05258544
+1.8,-0.01,0
+1.8,0.01,0.054869479
+1.8,0.05,0.130441146
+1.8,0.1,0.225454167
+1.8,0.15,0.321076562
+1.8,0.2,0.417308333
+1.8,0.25,0.514149479
+1.8,0.3,0.6116
+1.8,0.35,0.709659896
+1.8,0.4,0.808329167
+1.8,0.45,0.907607813
+1.8,0.5,1.007495833
+1.8,0.55,1.107993229
+1.8,0.6,1.2091
+1.8,0.65,1.310816146
+1.8,0.7,1.413141667
+1.8,0.75,1.516076563
+1.8,0.8,1.619620833
+1.8,0.85,1.723774479
+1.8,0.9,1.8285375
+1.8,0.95,1.933909896
+1.8,1,2.039891667
+1.8,1.05,2.146482813
+1.8,1.1,2.253683333
+2,-1.1,-1.9000608
+2,-1.05,-1.8188304
+2,-1,-1.736928
+2,-0.95,-1.6543536
+2,-0.9,-1.5711072
+2,-0.85,-1.4871888
+2,-0.8,-1.4025984
+2,-0.75,-1.317336
+2,-0.7,-1.2314016
+2,-0.65,-1.1447952
+2,-0.6,-1.0575168
+2,-0.55,-0.9695664
+2,-0.5,-0.880944
+2,-0.45,-0.7916496
+2,-0.4,-0.7016832
+2,-0.35,-0.6110448
+2,-0.3,-0.5197344
+2,-0.25,-0.427752
+2,-0.2,-0.3350976
+2,-0.15,-0.2417712
+2,-0.1,-0.1477728
+2,-0.05,-0.0531024
+2,-0.01,0
+2,0.01,0.066751042
+2,0.05,0.150713542
+2,0.1,0.256322917
+2,0.15,0.362661458
+2,0.2,0.469729167
+2,0.25,0.577526042
+2,0.3,0.686052083
+2,0.35,0.795307292
+2,0.4,0.905291667
+2,0.45,1.016005208
+2,0.5,1.127447917
+2,0.55,1.239619792
+2,0.6,1.352520833
+2,0.65,1.466151042
+2,0.7,1.580510417
+2,0.75,1.695598958
+2,0.8,1.811416667
+2,0.85,1.927963542
+2,0.9,2.045239583
+2,0.95,2.163244792
+2,1,2.281979167
+2,1.05,2.401442708
+2,1.1,2.521635417
+2.2,-1.1,-2.07115392
+2.2,-1.05,-1.9829448
+2.2,-1,-1.89394176
+2.2,-0.95,-1.8041448
+2.2,-0.9,-1.71355392
+2.2,-0.85,-1.62216912
+2.2,-0.8,-1.5299904
+2.2,-0.75,-1.43701776
+2.2,-0.7,-1.3432512
+2.2,-0.65,-1.24869072
+2.2,-0.6,-1.15333632
+2.2,-0.55,-1.057188
+2.2,-0.5,-0.96024576
+2.2,-0.45,-0.8625096
+2.2,-0.4,-0.76397952
+2.2,-0.35,-0.66465552
+2.2,-0.3,-0.5645376
+2.2,-0.25,-0.46362576
+2.2,-0.2,-0.36192
+2.2,-0.15,-0.25942032
+2.2,-0.1,-0.15612672
+2.2,-0.05,-0.0520392
+2.2,-0.01,0
+2.2,0.01,0.080341188
+2.2,0.05,0.172700521
+2.2,0.1,0.288925
+2.2,0.15,0.406010937
+2.2,0.2,0.523958333
+2.2,0.25,0.642767187
+2.2,0.3,0.7624375
+2.2,0.35,0.882969271
+2.2,0.4,1.0043625
+2.2,0.45,1.126617188
+2.2,0.5,1.249733333
+2.2,0.55,1.373710938
+2.2,0.6,1.49855
+2.2,0.65,1.624250521
+2.2,0.7,1.7508125
+2.2,0.75,1.878235938
+2.2,0.8,2.006520833
+2.2,0.85,2.135667188
+2.2,0.9,2.265675
+2.2,0.95,2.396544271
+2.2,1,2.528275
+2.2,1.05,2.660867188
+2.2,1.1,2.794320833
+2.4,-1.1,-2.23774656
+2.4,-1.05,-2.1428064
+2.4,-1,-2.04693888
+2.4,-0.95,-1.950144
+2.4,-0.9,-1.85242176
+2.4,-0.85,-1.75377216
+2.4,-0.8,-1.6541952
+2.4,-0.75,-1.55369088
+2.4,-0.7,-1.4522592
+2.4,-0.65,-1.34990016
+2.4,-0.6,-1.24661376
+2.4,-0.55,-1.1424
+2.4,-0.5,-1.03725888
+2.4,-0.45,-0.9311904
+2.4,-0.4,-0.82419456
+2.4,-0.35,-0.71627136
+2.4,-0.3,-0.6074208
+2.4,-0.25,-0.49764288
+2.4,-0.2,-0.3869376
+2.4,-0.15,-0.27530496
+2.4,-0.1,-0.16274496
+2.4,-0.05,-0.0492576
+2.4,-0.01,0
+2.4,0.01,0.095789917
+2.4,0.05,0.196552083
+2.4,0.1,0.323410417
+2.4,0.15,0.451275
+2.4,0.2,0.580145833
+2.4,0.25,0.710022917
+2.4,0.3,0.84090625
+2.4,0.35,0.972795833
+2.4,0.4,1.105691667
+2.4,0.45,1.23959375
+2.4,0.5,1.374502083
+2.4,0.55,1.510416667
+2.4,0.6,1.6473375
+2.4,0.65,1.785264583
+2.4,0.7,1.924197917
+2.4,0.75,2.0641375
+2.4,0.8,2.205083333
+2.4,0.85,2.347035417
+2.4,0.9,2.48999375
+2.4,0.95,2.633958333
+2.4,1,2.778929167
+2.4,1.05,2.92490625
+2.4,1.1,3.071889583
+2.6,-1.1,-2.39970048
+2.6,-1.05,-2.29827696
+2.6,-1,-2.19578112
+2.6,-0.95,-2.09221296
+2.6,-0.9,-1.98757248
+2.6,-0.85,-1.88185968
+2.6,-0.8,-1.77507456
+2.6,-0.75,-1.66721712
+2.6,-0.7,-1.55828736
+2.6,-0.65,-1.44828528
+2.6,-0.6,-1.33721088
+2.6,-0.55,-1.22506416
+2.6,-0.5,-1.11184512
+2.6,-0.45,-0.99755376
+2.6,-0.4,-0.88219008
+2.6,-0.35,-0.76575408
+2.6,-0.3,-0.64824576
+2.6,-0.25,-0.52966512
+2.6,-0.2,-0.41001216
+2.6,-0.15,-0.28928688
+2.6,-0.1,-0.16748928
+2.6,-0.05,-0.04461936
+2.6,-0.01,0
+2.6,0.01,0.113247229
+2.6,0.05,0.222418229
+2.6,0.1,0.359929167
+2.6,0.15,0.498603646
+2.6,0.2,0.638441667
+2.6,0.25,0.779443229
+2.6,0.3,0.921608333
+2.6,0.35,1.064936979
+2.6,0.4,1.209429167
+2.6,0.45,1.355084896
+2.6,0.5,1.501904167
+2.6,0.55,1.649886979
+2.6,0.6,1.799033333
+2.6,0.65,1.949343229
+2.6,0.7,2.100816667
+2.6,0.75,2.253453646
+2.6,0.8,2.407254167
+2.6,0.85,2.562218229
+2.6,0.9,2.718345833
+2.6,0.95,2.875636979
+2.6,1,3.034091667
+2.6,1.05,3.193709896
+2.6,1.1,3.354491667
+2.8,-1.1,-2.55687744
+2.8,-1.05,-2.44921824
+2.8,-1,-2.34033024
+2.8,-0.95,-2.23021344
+2.8,-0.9,-2.11886784
+2.8,-0.85,-2.00629344
+2.8,-0.8,-1.89249024
+2.8,-0.75,-1.77745824
+2.8,-0.7,-1.66119744
+2.8,-0.65,-1.54370784
+2.8,-0.6,-1.42498944
+2.8,-0.55,-1.30504224
+2.8,-0.5,-1.18386624
+2.8,-0.45,-1.06146144
+2.8,-0.4,-0.93782784
+2.8,-0.35,-0.81296544
+2.8,-0.3,-0.68687424
+2.8,-0.25,-0.55955424
+2.8,-0.2,-0.43100544
+2.8,-0.15,-0.30122784
+2.8,-0.1,-0.17022144
+2.8,-0.05,-0.03798624
+2.8,-0.01,0
+2.8,0.01,0.132863125
+2.8,0.05,0.250448958
+2.8,0.1,0.39863125
+2.8,0.15,0.548146875
+2.8,0.2,0.698995833
+2.8,0.25,0.851178125
+2.8,0.3,1.00469375
+2.8,0.35,1.159542708
+2.8,0.4,1.315725
+2.8,0.45,1.473240625
+2.8,0.5,1.632089583
+2.8,0.55,1.792271875
+2.8,0.6,1.9537875
+2.8,0.65,2.116636458
+2.8,0.7,2.28081875
+2.8,0.75,2.446334375
+2.8,0.8,2.613183333
+2.8,0.85,2.781365625
+2.8,0.9,2.95088125
+2.8,0.95,3.121730208
+2.8,1,3.2939125
+2.8,1.05,3.467428125
+2.8,1.1,3.642277083
+3,-1.1,-2.7091392
+3,-1.05,-2.595492
+3,-1,-2.480448
+3,-0.95,-2.3640072
+3,-0.9,-2.2461696
+3,-0.85,-2.1269352
+3,-0.8,-2.006304
+3,-0.75,-1.884276
+3,-0.7,-1.7608512
+3,-0.65,-1.6360296
+3,-0.6,-1.5098112
+3,-0.55,-1.382196
+3,-0.5,-1.253184
+3,-0.45,-1.1227752
+3,-0.4,-0.9909696
+3,-0.35,-0.8577672
+3,-0.3,-0.723168
+3,-0.25,-0.587172
+3,-0.2,-0.4497792
+3,-0.15,-0.3109896
+3,-0.1,-0.1708032
+3,-0.05,-0.02922
+3,-0.01,0
+3,0.01,0.154787604
+3,0.05,0.280794271
+3,0.1,0.439666667
+3,0.15,0.600054687
+3,0.2,0.761958333
+3,0.25,0.925377604
+3,0.3,1.0903125
+3,0.35,1.256763021
+3,0.4,1.424729167
+3,0.45,1.594210938
+3,0.5,1.765208333
+3,0.55,1.937721354
+3,0.6,2.11175
+3,0.65,2.287294271
+3,0.7,2.464354167
+3,0.75,2.642929688
+3,0.8,2.823020833
+3,0.85,3.004627604
+3,0.9,3.18775
+3,0.95,3.372388021
+3,1,3.558541667
+3,1.05,3.746210938
+3,1.1,3.935395833
+3.2,-1.1,-2.85634752
+3.2,-1.05,-2.73696
+3.2,-1,-2.61599616
+3.2,-0.95,-2.493456
+3.2,-0.9,-2.36933952
+3.2,-0.85,-2.24364672
+3.2,-0.8,-2.1163776
+3.2,-0.75,-1.98753216
+3.2,-0.7,-1.8571104
+3.2,-0.65,-1.72511232
+3.2,-0.6,-1.59153792
+3.2,-0.55,-1.4563872
+3.2,-0.5,-1.31966016
+3.2,-0.45,-1.1813568
+3.2,-0.4,-1.04147712
+3.2,-0.35,-0.90002112
+3.2,-0.3,-0.7569888
+3.2,-0.25,-0.61238016
+3.2,-0.2,-0.4661952
+3.2,-0.15,-0.31843392
+3.2,-0.1,-0.16909632
+3.2,-0.05,-0.0181824
+3.2,-0.01,0
+3.2,0.01,0.179170667
+3.2,0.05,0.313604167
+3.2,0.1,0.483185417
+3.2,0.15,0.654477083
+3.2,0.2,0.827479167
+3.2,0.25,1.002191667
+3.2,0.3,1.178614583
+3.2,0.35,1.356747917
+3.2,0.4,1.536591667
+3.2,0.45,1.718145833
+3.2,0.5,1.901410417
+3.2,0.55,2.086385417
+3.2,0.6,2.273070833
+3.2,0.65,2.461466667
+3.2,0.7,2.651572917
+3.2,0.75,2.843389583
+3.2,0.8,3.036916667
+3.2,0.85,3.232154167
+3.2,0.9,3.429102083
+3.2,0.95,3.627760417
+3.2,1,3.828129167
+3.2,1.05,4.030208333
+3.2,1.1,4.233997917
+3.4,-1.1,-2.99836416
+3.4,-1.05,-2.873484
+3.4,-1,-2.74683648
+3.4,-0.95,-2.6184216
+3.4,-0.9,-2.48823936
+3.4,-0.85,-2.35628976
+3.4,-0.8,-2.2225728
+3.4,-0.75,-2.08708848
+3.4,-0.7,-1.9498368
+3.4,-0.65,-1.81081776
+3.4,-0.6,-1.67003136
+3.4,-0.55,-1.5274776
+3.4,-0.5,-1.38315648
+3.4,-0.45,-1.237068
+3.4,-0.4,-1.08921216
+3.4,-0.35,-0.93958896
+3.4,-0.3,-0.7881984
+3.4,-0.25,-0.63504048
+3.4,-0.2,-0.4801152
+3.4,-0.15,-0.32342256
+3.4,-0.1,-0.16496256
+3.4,-0.05,-0.0047352
+3.4,-0.01,0
+3.4,0.01,0.206162313
+3.4,0.05,0.349028646
+3.4,0.1,0.5293375
+3.4,0.15,0.711564062
+3.4,0.2,0.895708333
+3.4,0.25,1.081770313
+3.4,0.3,1.26975
+3.4,0.35,1.459647396
+3.4,0.4,1.6514625
+3.4,0.45,1.845195313
+3.4,0.5,2.040845833
+3.4,0.55,2.238414063
+3.4,0.6,2.4379
+3.4,0.65,2.639303646
+3.4,0.7,2.842625
+3.4,0.75,3.047864063
+3.4,0.8,3.255020833
+3.4,0.85,3.464095313
+3.4,0.9,3.6750875
+3.4,0.95,3.887997396
+3.4,1,4.102825
+3.4,1.05,4.319570313
+3.4,1.1,4.538233333
+3.6,-1.1,-3.13505088
+3.6,-1.05,-3.00492576
+3.6,-1,-2.87283072
+3.6,-0.95,-2.73876576
+3.6,-0.9,-2.60273088
+3.6,-0.85,-2.46472608
+3.6,-0.8,-2.32475136
+3.6,-0.75,-2.18280672
+3.6,-0.7,-2.03889216
+3.6,-0.65,-1.89300768
+3.6,-0.6,-1.74515328
+3.6,-0.55,-1.59532896
+3.6,-0.5,-1.44353472
+3.6,-0.45,-1.28977056
+3.6,-0.4,-1.13403648
+3.6,-0.35,-0.97633248
+3.6,-0.3,-0.81665856
+3.6,-0.25,-0.65501472
+3.6,-0.2,-0.49140096
+3.6,-0.15,-0.32581728
+3.6,-0.1,-0.15826368
+3.6,-0.05,0
+3.6,-0.01,0
+3.6,0.01,0.235912542
+3.6,0.05,0.387217708
+3.6,0.1,0.578272917
+3.6,0.15,0.771465625
+3.6,0.2,0.966795833
+3.6,0.25,1.164263542
+3.6,0.3,1.36386875
+3.6,0.35,1.565611458
+3.6,0.4,1.769491667
+3.6,0.45,1.975509375
+3.6,0.5,2.183664583
+3.6,0.55,2.393957292
+3.6,0.6,2.6063875
+3.6,0.65,2.820955208
+3.6,0.7,3.037660417
+3.6,0.75,3.256503125
+3.6,0.8,3.477483333
+3.6,0.85,3.700601042
+3.6,0.9,3.92585625
+3.6,0.95,4.153248958
+3.6,1,4.382779167
+3.6,1.05,4.614446875
+3.6,1.1,4.848252083
+3.8,-1.1,-3.26626944
+3.8,-1.05,-3.13114704
+3.8,-1,-2.99384064
+3.8,-0.95,-2.85435024
+3.8,-0.9,-2.71267584
+3.8,-0.85,-2.56881744
+3.8,-0.8,-2.42277504
+3.8,-0.75,-2.27454864
+3.8,-0.7,-2.12413824
+3.8,-0.65,-1.97154384
+3.8,-0.6,-1.81676544
+3.8,-0.55,-1.65980304
+3.8,-0.5,-1.50065664
+3.8,-0.45,-1.33932624
+3.8,-0.4,-1.17581184
+3.8,-0.35,-1.01011344
+3.8,-0.3,-0.84223104
+3.8,-0.25,-0.67216464
+3.8,-0.2,-0.49991424
+3.8,-0.15,-0.32547984
+3.8,-0.1,-0.14886144
+3.8,-0.05,0
+3.8,-0.01,0
+3.8,0.01,0.268571354
+3.8,0.05,0.428321354
+3.8,0.1,0.630141667
+3.8,0.15,0.834331771
+3.8,0.2,1.040891667
+3.8,0.25,1.249821354
+3.8,0.3,1.461120833
+3.8,0.35,1.674790104
+3.8,0.4,1.890829167
+3.8,0.45,2.109238021
+3.8,0.5,2.330016667
+3.8,0.55,2.553165104
+3.8,0.6,2.778683333
+3.8,0.65,3.006571354
+3.8,0.7,3.236829167
+3.8,0.75,3.469456771
+3.8,0.8,3.704454167
+3.8,0.85,3.941821354
+3.8,0.9,4.181558333
+3.8,0.95,4.423665104
+3.8,1,4.668141667
+3.8,1.05,4.914988021
+3.8,1.1,5.164204167
+4,-1.1,-3.3918816
+4,-1.05,-3.2520096
+4,-1,-3.109728
+4,-0.95,-2.9650368
+4,-0.9,-2.817936
+4,-0.85,-2.6684256
+4,-0.8,-2.5165056
+4,-0.75,-2.362176
+4,-0.7,-2.2054368
+4,-0.65,-2.046288
+4,-0.6,-1.8847296
+4,-0.55,-1.7207616
+4,-0.5,-1.554384
+4,-0.45,-1.3855968
+4,-0.4,-1.2144
+4,-0.35,-1.0407936
+4,-0.3,-0.8647776
+4,-0.25,-0.686352
+4,-0.2,-0.5055168
+4,-0.15,-0.322272
+4,-0.1,-0.1366176
+4,-0.05,0
+4,-0.01,0
+4,0.01,0.30428875
+4,0.05,0.472489583
+4,0.1,0.68509375
+4,0.15,0.9003125
+4,0.2,1.118145833
+4,0.25,1.33859375
+4,0.3,1.56165625
+4,0.35,1.787333333
+4,0.4,2.015625
+4,0.45,2.24653125
+4,0.5,2.480052083
+4,0.55,2.7161875
+4,0.6,2.9549375
+4,0.65,3.196302083
+4,0.7,3.44028125
+4,0.75,3.686875
+4,0.8,3.936083333
+4,0.85,4.18790625
+4,0.9,4.44234375
+4,0.95,4.699395833
+4,1,4.9590625
+4,1.05,5.22134375
+4,1.1,5.486239583
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusEMotorData.cs b/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusEMotorData.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f2e4645ab868c8b11c79de0b94fc566de17ac99f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusEMotorData.cs
@@ -0,0 +1,222 @@
+using System.Data;
+using System.Linq;
+using Ninject;
+using NUnit.Framework;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.InputData.FileIO.XML;
+using TUGraz.VectoCore.Models.GenericModelData;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration
+{
+
+ [TestFixture]
+ public class TestGenericBusEMotorData
+ {
+ private const string OutputShaftSpeedColumn = "outShaftSpeed";
+ private const string MaxTorqueColumn = "maxTorque";
+ private const string MinTorqueColumn = "minTorque";
+ private TableData fullLoadCurve;
+
+
+ protected IXMLInputDataReader xmlInputReader;
+ private IKernel _kernel;
+
+
+ [OneTimeSetUp]
+ public void Init()
+ {
+ SetFullLoadCurveData();
+ _kernel = new StandardKernel(new VectoNinjectModule());
+ xmlInputReader = _kernel.Get<IXMLInputDataReader>();
+ }
+
+ private void SetFullLoadCurveData()
+ {
+ fullLoadCurve = new TableData();
+ fullLoadCurve.Columns.Add(OutputShaftSpeedColumn);
+ fullLoadCurve.Columns.Add(MaxTorqueColumn);
+ fullLoadCurve.Columns.Add(MinTorqueColumn);
+ for (int i = 0; i < 22; i++) {
+ fullLoadCurve.Rows.Add(fullLoadCurve.NewRow());
+ }
+
+ fullLoadCurve.Rows[0][OutputShaftSpeedColumn] = "0.00";
+ fullLoadCurve.Rows[1][OutputShaftSpeedColumn] = "14.96";
+ fullLoadCurve.Rows[2][OutputShaftSpeedColumn] = "151.09";
+ fullLoadCurve.Rows[3][OutputShaftSpeedColumn] = "302.19";
+ fullLoadCurve.Rows[4][OutputShaftSpeedColumn] = "452.92";
+ fullLoadCurve.Rows[5][OutputShaftSpeedColumn] = "604.01";
+ fullLoadCurve.Rows[6][OutputShaftSpeedColumn] = "755.11";
+ fullLoadCurve.Rows[7][OutputShaftSpeedColumn] = "906.20";
+ fullLoadCurve.Rows[8][OutputShaftSpeedColumn] = "1057.30";
+ fullLoadCurve.Rows[9][OutputShaftSpeedColumn] = "1208.03";
+ fullLoadCurve.Rows[10][OutputShaftSpeedColumn] = "1359.12";
+ fullLoadCurve.Rows[11][OutputShaftSpeedColumn] = "1510.22";
+ fullLoadCurve.Rows[12][OutputShaftSpeedColumn] = "1661.31";
+ fullLoadCurve.Rows[13][OutputShaftSpeedColumn] = "1812.41";
+ fullLoadCurve.Rows[14][OutputShaftSpeedColumn] = "1963.14";
+ fullLoadCurve.Rows[15][OutputShaftSpeedColumn] = "2114.23";
+ fullLoadCurve.Rows[16][OutputShaftSpeedColumn] = "2265.33";
+ fullLoadCurve.Rows[17][OutputShaftSpeedColumn] = "2416.42";
+ fullLoadCurve.Rows[18][OutputShaftSpeedColumn] = "2567.52";
+ fullLoadCurve.Rows[19][OutputShaftSpeedColumn] = "2718.25";
+ fullLoadCurve.Rows[20][OutputShaftSpeedColumn] = "2869.34";
+ fullLoadCurve.Rows[21][OutputShaftSpeedColumn] = "3020.44";
+
+ fullLoadCurve.Rows[0][MaxTorqueColumn] = "4027.80";
+ fullLoadCurve.Rows[1][MaxTorqueColumn] = "4010.00";
+ fullLoadCurve.Rows[2][MaxTorqueColumn] = "3980.00";
+ fullLoadCurve.Rows[3][MaxTorqueColumn] = "4010.00";
+ fullLoadCurve.Rows[4][MaxTorqueColumn] = "3950.00";
+ fullLoadCurve.Rows[5][MaxTorqueColumn] = "3900.00";
+ fullLoadCurve.Rows[6][MaxTorqueColumn] = "3950.00";
+ fullLoadCurve.Rows[7][MaxTorqueColumn] = "3356.50";
+ fullLoadCurve.Rows[8][MaxTorqueColumn] = "2876.98";
+ fullLoadCurve.Rows[9][MaxTorqueColumn] = "2517.38";
+ fullLoadCurve.Rows[10][MaxTorqueColumn] = "2237.68";
+ fullLoadCurve.Rows[11][MaxTorqueColumn] = "2013.90";
+ fullLoadCurve.Rows[12][MaxTorqueColumn] = "1830.82";
+ fullLoadCurve.Rows[13][MaxTorqueColumn] = "1678.25";
+ fullLoadCurve.Rows[14][MaxTorqueColumn] = "1549.15";
+ fullLoadCurve.Rows[15][MaxTorqueColumn] = "1438.52";
+ fullLoadCurve.Rows[16][MaxTorqueColumn] = "1342.60";
+ fullLoadCurve.Rows[17][MaxTorqueColumn] = "1258.71";
+ fullLoadCurve.Rows[18][MaxTorqueColumn] = "1184.66";
+ fullLoadCurve.Rows[19][MaxTorqueColumn] = "1118.82";
+ fullLoadCurve.Rows[20][MaxTorqueColumn] = "1059.96";
+ fullLoadCurve.Rows[21][MaxTorqueColumn] = "1006.95";
+
+ foreach (DataRow row in fullLoadCurve.Rows) {
+ row[MinTorqueColumn] = row.ParseDouble(MaxTorqueColumn) * -1;
+ }
+ }
+
+ [TestCase()]
+ public void TestFullLoadCurveRatedPointSearch()
+ {
+ var emResult = GenericRatedPointHelper.GetRatedPointOfFullLoadCurveAtEM(fullLoadCurve);
+ Assert.IsNotNull(emResult);
+ Assert.AreEqual(755.11 , emResult.NRated.Value(), 1e-2);
+ Assert.AreEqual(4027.8000, emResult.TRated.Value(), 1e-4);
+ Assert.AreEqual(318.4980 , emResult.PRated.Value(), 1e-4);
+
+ var iepcResult = GenericRatedPointHelper.GetRatedPointOfFullLoadCurveAtIEPC(fullLoadCurve, 1, 1, 0.95, 1);
+ Assert.IsNotNull(iepcResult);
+ Assert.AreEqual(755.11, iepcResult.NRated.Value(), 1e-2);
+ Assert.AreEqual(4239.7894, iepcResult.TRated.Value(), 1e-4);
+ Assert.AreEqual(335.26, iepcResult.PRated.Value(), 1e-2);
+ }
+
+
+ [TestCase(@"TestData\XML\XMLVIFBusReport\IHPC_HEV_completedBus_2.VIF_Report_1.xml")]
+ public void TestGenericBusElectricMotorData(string filePath)
+ {
+ var multistepBusInputData = xmlInputReader.Create(filePath) as IMultistepBusInputDataProvider;
+ var em = multistepBusInputData.JobInputData.PrimaryVehicle.Vehicle.Components.ElectricMachines;
+
+ var genericElectricMotor = new GenericBusElectricMotorData();
+ var electricMotorData = genericElectricMotor.CreateGenericElectricMotorData(em.Entries[0]);
+
+ Assert.AreEqual(2, electricMotorData.EfficiencyData.VoltageLevels.Count);
+ }
+
+
+ [TestCase(@"TestData\XML\XMLVIFBusReport\IEPC_completedBus_2.VIF_Report_2.xml")]
+ public void TestGenericIEPCElectricMotorData(string iepcFilePath)
+ {
+ var multistepBusInputData = xmlInputReader.Create(iepcFilePath) as IMultistepBusInputDataProvider;
+ var iepcData = multistepBusInputData.JobInputData.PrimaryVehicle.Vehicle.Components.IEPC;
+ var axleGear = multistepBusInputData.JobInputData.PrimaryVehicle.Vehicle.Components.AxleGearInputData;
+
+ var genericIEPCData = new GenericBusIEPCData();
+ var iepcMotorData = genericIEPCData.CreateIEPCElectricMotorData(iepcData, axleGear);
+
+ Assert.AreEqual(1, iepcMotorData.EfficiencyData.VoltageLevels.Count);
+ }
+
+
+ [TestCase(@"TestData\XML\XMLVIFBusReport\IHPC_HEV_completedBus_2.VIF_Report_1.xml")]
+ public void TestGenericIHPCElectricMotorData(string ihpcFilePath)
+ {
+ var multistepBusInputData = xmlInputReader.Create(ihpcFilePath) as IMultistepBusInputDataProvider;
+ var electricMachineEntry = multistepBusInputData.JobInputData.PrimaryVehicle.Vehicle.Components.ElectricMachines.Entries.First() ;
+ var transmission = multistepBusInputData.JobInputData.PrimaryVehicle.Vehicle.Components.GearboxInputData;
+ var machineType = electricMachineEntry.ElectricMachine.ElectricMachineType;
+
+ var genericBusIHPCData = new GenericBusIHPCData();
+ var ihpcData = genericBusIHPCData.CreateGenericBusIHPCData(electricMachineEntry, machineType, transmission);
+
+ Assert.AreEqual(2, ihpcData.EfficiencyData.VoltageLevels.Count);
+ }
+
+ [TestCase(@"TestData\XML\XMLVIFBusReport\IEPC_completedBus_2.VIF_Report_2.xml", 0.1)]
+ public void TestGenericBatteryData(string vifFilePath, double initialSoC)
+ {
+ var multistepBusInputData = xmlInputReader.Create(vifFilePath) as IMultistepBusInputDataProvider;
+ var electricStorage = multistepBusInputData.JobInputData.PrimaryVehicle.Vehicle.Components.ElectricStorage;
+
+ var genericBusBatteryData = new GenericBusBatteryData();
+ var batterySystemData = genericBusBatteryData.CreateBatteryData(electricStorage, initialSoC);
+
+ Assert.AreEqual(initialSoC, batterySystemData.InitialSoC);
+ Assert.AreEqual(2, batterySystemData.Batteries.Count);
+
+ var battery0 = batterySystemData.Batteries[0];
+ Assert.AreEqual(80, battery0.Item2.MaxSOC);
+ Assert.AreEqual(20, battery0.Item2.MinSOC);
+ Assert.AreEqual(72, battery0.Item2.Capacity.AsAmpHour);
+ Assert.AreEqual(2, battery0.Item2.InternalResistance.Entries.Length);
+
+ Assert.AreEqual(0, battery0.Item2.InternalResistance.Entries[0].SoC);
+ Assert.AreEqual(3, battery0.Item2.InternalResistance.Entries[0].Resistance.Count);
+
+ var resistance = battery0.Item2.InternalResistance.Entries[0].Resistance[0].Item2.Value();
+ Assert.AreEqual(resistance, battery0.Item2.InternalResistance.Entries[0].Resistance[0].Item2.Value());
+ Assert.AreEqual(resistance, battery0.Item2.InternalResistance.Entries[0].Resistance[1].Item2.Value());
+ Assert.AreEqual(resistance, battery0.Item2.InternalResistance.Entries[0].Resistance[2].Item2.Value());
+ Assert.AreEqual(1, battery0.Item2.InternalResistance.Entries[1].SoC);
+ Assert.AreEqual(3, battery0.Item2.InternalResistance.Entries[1].Resistance.Count);
+ Assert.AreEqual(resistance, battery0.Item2.InternalResistance.Entries[1].Resistance[0].Item2.Value());
+ Assert.AreEqual(resistance, battery0.Item2.InternalResistance.Entries[1].Resistance[1].Item2.Value());
+ Assert.AreEqual(resistance, battery0.Item2.InternalResistance.Entries[1].Resistance[2].Item2.Value());
+
+ var battery1 = batterySystemData.Batteries[0];
+ Assert.AreEqual(80, battery1.Item2.MaxSOC);
+ Assert.AreEqual(20, battery1.Item2.MinSOC);
+ Assert.AreEqual(72, battery1.Item2.Capacity.AsAmpHour);
+ Assert.AreEqual(2, battery1.Item2.InternalResistance.Entries.Length);
+
+ Assert.AreEqual(0, battery1.Item2.InternalResistance.Entries[0].SoC);
+ Assert.AreEqual(3, battery1.Item2.InternalResistance.Entries[0].Resistance.Count);
+
+ resistance = battery1.Item2.InternalResistance.Entries[0].Resistance[0].Item2.Value();
+ Assert.AreEqual(resistance, battery1.Item2.InternalResistance.Entries[0].Resistance[0].Item2.Value());
+ Assert.AreEqual(resistance, battery1.Item2.InternalResistance.Entries[0].Resistance[1].Item2.Value());
+ Assert.AreEqual(resistance, battery1.Item2.InternalResistance.Entries[0].Resistance[2].Item2.Value());
+ Assert.AreEqual(1, battery1.Item2.InternalResistance.Entries[1].SoC);
+ Assert.AreEqual(3, battery1.Item2.InternalResistance.Entries[1].Resistance.Count);
+ Assert.AreEqual(resistance, battery1.Item2.InternalResistance.Entries[1].Resistance[0].Item2.Value());
+ Assert.AreEqual(resistance, battery1.Item2.InternalResistance.Entries[1].Resistance[1].Item2.Value());
+ Assert.AreEqual(resistance, battery1.Item2.InternalResistance.Entries[1].Resistance[2].Item2.Value());
+ }
+
+
+ [TestCase(@"TestData\Hybrids\Hyb_P2_Group2SuperCapOvl\SuperCap.vreess", 0.1)]
+ public void TestGenericSuperCapData(string superCapFilePath, double initialSoC)
+ {
+ var superCap = JSONInputDataFactory.ReadREESSData(superCapFilePath, false) as ISuperCapDeclarationInputData;
+ var genericBusSuperCapData = new GenericBusSuperCapData();
+ var superCapData = genericBusSuperCapData.CreateGenericSuperCapData(superCap, initialSoC);
+
+ Assert.AreEqual(37.0, superCapData.Capacity.Value());
+ Assert.AreEqual(0, superCapData.MinVoltage.Value());
+ Assert.AreEqual(330.0, superCapData.MaxVoltage.Value());
+ Assert.AreEqual(100, superCapData.MaxCurrentCharge.Value());
+ Assert.AreEqual(100, superCapData.MaxCurrentDischarge.Value());
+ Assert.AreEqual(initialSoC , superCapData.InitialSoC);
+ Assert.AreEqual(270.2703, superCapData.InternalResistance.Value(), 1e-4);
+ }
+ }
+}
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLVIFBusReport/IEPC_completedBus_2.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLVIFBusReport/IEPC_completedBus_2.VIF_Report_2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3b33d6df167be866c3d747812c136e32d4545f97
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLVIFBusReport/IEPC_completedBus_2.VIF_Report_2.xml
@@ -0,0 +1,659 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
+ <PrimaryVehicle>
+ <Data id="VIF_P-7198abf5d8364942a4ef" xsi:type="PrimaryVehicleDataType">
+ <Vehicle xsi:type="IEPC_VehicleVIFType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <RetarderType>Axlegear Input Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <OvcHev>true</OvcHev>
+ <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </vif:ADAS>
+ <Components xsi:type="Vehicle_PEV-IEPC_ComponentsVIFType">
+ <IEPC>
+ <Data xsi:type="IEPCDataDeclarationType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Standard values for all components</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>false</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <VoltageLevel>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="4027.80" minTorque="-4027.80"/>
+ <v2.3:Entry outShaftSpeed="14.96" maxTorque="4010.00" minTorque="-4010.00"/>
+ <v2.3:Entry outShaftSpeed="151.09" maxTorque="3980.00" minTorque="-3980.00"/>
+ <v2.3:Entry outShaftSpeed="302.19" maxTorque="4010.00" minTorque="-4010.00"/>
+ <v2.3:Entry outShaftSpeed="452.92" maxTorque="3950.00" minTorque="-3950.00"/>
+ <v2.3:Entry outShaftSpeed="604.01" maxTorque="3900.00" minTorque="-3900.00"/>
+ <v2.3:Entry outShaftSpeed="755.11" maxTorque="3950.00" minTorque="-3950.00"/>
+ <v2.3:Entry outShaftSpeed="906.20" maxTorque="3356.50" minTorque="-3356.50"/>
+ <v2.3:Entry outShaftSpeed="1057.30" maxTorque="2876.98" minTorque="-2876.98"/>
+ <v2.3:Entry outShaftSpeed="1208.03" maxTorque="2517.38" minTorque="-2517.38"/>
+ <v2.3:Entry outShaftSpeed="1359.12" maxTorque="2237.68" minTorque="-2237.68"/>
+ <v2.3:Entry outShaftSpeed="1510.22" maxTorque="2013.90" minTorque="-2013.90"/>
+ <v2.3:Entry outShaftSpeed="1661.31" maxTorque="1830.82" minTorque="-1830.82"/>
+ <v2.3:Entry outShaftSpeed="1812.41" maxTorque="1678.25" minTorque="-1678.25"/>
+ <v2.3:Entry outShaftSpeed="1963.14" maxTorque="1549.15" minTorque="-1549.15"/>
+ <v2.3:Entry outShaftSpeed="2114.23" maxTorque="1438.52" minTorque="-1438.52"/>
+ <v2.3:Entry outShaftSpeed="2265.33" maxTorque="1342.60" minTorque="-1342.60"/>
+ <v2.3:Entry outShaftSpeed="2416.42" maxTorque="1258.71" minTorque="-1258.71"/>
+ <v2.3:Entry outShaftSpeed="2567.52" maxTorque="1184.66" minTorque="-1184.66"/>
+ <v2.3:Entry outShaftSpeed="2718.25" maxTorque="1118.82" minTorque="-1118.82"/>
+ <v2.3:Entry outShaftSpeed="2869.34" maxTorque="1059.96" minTorque="-1059.96"/>
+ <v2.3:Entry outShaftSpeed="3020.44" maxTorque="1006.95" minTorque="-1006.95"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="10.00" />
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+ </DragCurve>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00" />
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00" />
+ </DragCurve>
+ </Data>
+ </IEPC>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <Data xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationMethod>Measured</CertificationMethod>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00" />
+ <Entry SoC="100" OCV="640.00" />
+ </OCV>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00" />
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
+ </CurrentLimits>
+ </Data>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <Data xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationMethod>Measured</CertificationMethod>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00" />
+ <Entry SoC="100" OCV="640.00" />
+ </OCV>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00" />
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
+ </CurrentLimits>
+ </Data>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Retarder>
+ <Data xsi:type="RetarderDataVIFType">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <RetarderRatio>1.000</RetarderRatio>
+ </Data>
+ </Retarder>
+ <Axlegear>
+ <Data xsi:type="AxlegearDataVIFType">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ </Data>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataVIFType">
+ <Axles>
+ <vif:Axle axleNumber="1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </vif:Axle>
+ <vif:Axle axleNumber="2" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </vif:Axle>
+ </Axles>
+ </Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_IEPC_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ <PneumaticSCRReagentDosing>false</PneumaticSCRReagentDosing>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </Vehicle>
+ <InputDataSignature>
+ <di:Reference URI="#a">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>RKfHo2q2myHTPwSHYhCu3qDm0dVCRKsc9TqFn8TiL8Y=</di:DigestValue>
+ </di:Reference>
+ </InputDataSignature>
+ <ManufacturerRecordSignature>
+ <di:Reference URI="#MRF-f66092ebd65f44929ebf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>sUPpGaLjPqQYvsx9SwhYmVmRGTUFlTZxtW3ZPJliRz4=</di:DigestValue>
+ </di:Reference>
+ </ManufacturerRecordSignature>
+ <Results>
+ <!--Always prints success at the moment-->
+ <Status>success</Status>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1075.44</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">3519.61</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1075.44</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">3519.61</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1094.99</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">2737.48</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1262.82</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">4209.41</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1347.01</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">3367.53</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ </Results>
+ <ApplicationInformation>
+ <SimulationToolVersion>0.7.9.2791-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2022-08-23T18:13:55.6320197Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#VIF_P-7198abf5d8364942a4ef">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>s/4DxRD09IJyjEobHcn7QPXqWSvc0SduFygyi4XWlC0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </PrimaryVehicle>
+ <ManufacturingStep stepCount="2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-a7a6921582d1496c87f2">
+ <HashPreviousStep>
+ <di:Reference URI="#VIF_P-7198abf5d8364942a4ef">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>s/4DxRD09IJyjEobHcn7QPXqWSvc0SduFygyi4XWlC0=</di:DigestValue>
+ </di:Reference>
+ </HashPreviousStep>
+ <vif:Vehicle id="VEH-86bdddb68ffb41719f3a" xsi:type="Vehicle_IEPC_CompletedBusDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+ <ClassBus>II+III</ClassBus>
+ <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CB</BodyworkCode>
+ <LowEntry>false</LowEntry>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ <VehicleLength>9500</VehicleLength>
+ <VehicleWidth>2500</VehicleWidth>
+ <EntranceHeight>2000</EntranceHeight>
+ <DoorDriveTechnology>electric</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_xEV_CompletedBusType">
+ <v2.4:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </v2.4:AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_xEV_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>1</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 3-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+ <DoubleGlazing>false</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ <WaterElectricHeater>false</WaterElectricHeater>
+ <AirElectricHeater>false</AirElectricHeater>
+ <OtherHeatingTechnology>false</OtherHeatingTechnology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </vif:Vehicle>
+ <ApplicationInformation>
+ <SimulationToolVersion>0.7.9.2791-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2022-08-23T18:13:55.8029392Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#MST-a7a6921582d1496c87f2">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>oFCD2Jf5h9JiCSH8d2LipnB+0PnntjqXxtOlkLYArpI=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </ManufacturingStep>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLVIFBusReport/IHPC_HEV_completedBus_2.VIF_Report_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLVIFBusReport/IHPC_HEV_completedBus_2.VIF_Report_1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..713bd63bb58ca25dff56c36567656cdf7e69cd56
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLVIFBusReport/IHPC_HEV_completedBus_2.VIF_Report_1.xml
@@ -0,0 +1,884 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
+ <PrimaryVehicle>
+ <Data id="VIF_P-714f43f566c2431b9836" xsi:type="PrimaryVehicleDataType">
+ <Vehicle xsi:type="HEV-Px_VehicleVIFType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>600</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ArchitectureID>P2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </vif:ADAS>
+ <vif:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Entry gear="9" maxTorque="2000" />
+ </vif:TorqueLimits>
+ <vif:ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00" />
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00" />
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00" />
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00" />
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </vif:ElectricMotorTorqueLimits>
+ <vif:BoostingLimitations xsi:type="BoostingLimitationsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+ <Entry rotationalSpeed="0.00" boostingTorque="0.00" />
+ <Entry rotationalSpeed="1000.00" boostingTorque="0.00" />
+ </vif:BoostingLimitations>
+ <Components xsi:type="Vehicle_HEV-Px_ComponentsVIFType">
+ <Engine>
+ <Data xsi:type="EngineDataVIFType">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHRType>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>false</ElectricalOutput>
+ </WHRType>
+ <Mode>
+ <IdlingSpeed>560</IdlingSpeed>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00" />
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00" />
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00" />
+ </FullLoadAndDragCurve>
+ <Fuels>
+ <FuelType>NG PI</FuelType>
+ </Fuels>
+ </Mode>
+ </Data>
+ </Engine>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <Data xsi:type="ElectricMachineSystemDataDeclarationType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationMethod>Measured</CertificationMethod>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>IHPC Type 1</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="4027.80" minTorque="-4027.80"/>
+ <Entry outShaftSpeed="14.96" maxTorque="4010.00" minTorque="-4010.00"/>
+ <Entry outShaftSpeed="151.09" maxTorque="3980.00" minTorque="-3980.00"/>
+ <Entry outShaftSpeed="302.19" maxTorque="4010.00" minTorque="-4010.00"/>
+ <Entry outShaftSpeed="452.92" maxTorque="3950.00" minTorque="-3950.00"/>
+ <Entry outShaftSpeed="604.01" maxTorque="3900.00" minTorque="-3900.00"/>
+ <Entry outShaftSpeed="755.11" maxTorque="3950.00" minTorque="-3950.00"/>
+ <Entry outShaftSpeed="906.20" maxTorque="3356.50" minTorque="-3356.50"/>
+ <Entry outShaftSpeed="1057.30" maxTorque="2876.98" minTorque="-2876.98"/>
+ <Entry outShaftSpeed="1208.03" maxTorque="2517.38" minTorque="-2517.38"/>
+ <Entry outShaftSpeed="1359.12" maxTorque="2237.68" minTorque="-2237.68"/>
+ <Entry outShaftSpeed="1510.22" maxTorque="2013.90" minTorque="-2013.90"/>
+ <Entry outShaftSpeed="1661.31" maxTorque="1830.82" minTorque="-1830.82"/>
+ <Entry outShaftSpeed="1812.41" maxTorque="1678.25" minTorque="-1678.25"/>
+ <Entry outShaftSpeed="1963.14" maxTorque="1549.15" minTorque="-1549.15"/>
+ <Entry outShaftSpeed="2114.23" maxTorque="1438.52" minTorque="-1438.52"/>
+ <Entry outShaftSpeed="2265.33" maxTorque="1342.60" minTorque="-1342.60"/>
+ <Entry outShaftSpeed="2416.42" maxTorque="1258.71" minTorque="-1258.71"/>
+ <Entry outShaftSpeed="2567.52" maxTorque="1184.66" minTorque="-1184.66"/>
+ <Entry outShaftSpeed="2718.25" maxTorque="1118.82" minTorque="-1118.82"/>
+ <Entry outShaftSpeed="2869.34" maxTorque="1059.96" minTorque="-1059.96"/>
+ <Entry outShaftSpeed="3020.44" maxTorque="1006.95" minTorque="-1006.95"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="4027.80" minTorque="-4027.80"/>
+ <Entry outShaftSpeed="14.96" maxTorque="4010.00" minTorque="-4010.00"/>
+ <Entry outShaftSpeed="151.09" maxTorque="3980.00" minTorque="-3980.00"/>
+ <Entry outShaftSpeed="302.19" maxTorque="4010.00" minTorque="-4010.00"/>
+ <Entry outShaftSpeed="452.92" maxTorque="3950.00" minTorque="-3950.00"/>
+ <Entry outShaftSpeed="604.01" maxTorque="3900.00" minTorque="-3900.00"/>
+ <Entry outShaftSpeed="755.11" maxTorque="3950.00" minTorque="-3950.00"/>
+ <Entry outShaftSpeed="906.20" maxTorque="3356.50" minTorque="-3356.50"/>
+ <Entry outShaftSpeed="1057.30" maxTorque="2876.98" minTorque="-2876.98"/>
+ <Entry outShaftSpeed="1208.03" maxTorque="2517.38" minTorque="-2517.38"/>
+ <Entry outShaftSpeed="1359.12" maxTorque="2237.68" minTorque="-2237.68"/>
+ <Entry outShaftSpeed="1510.22" maxTorque="2013.90" minTorque="-2013.90"/>
+ <Entry outShaftSpeed="1661.31" maxTorque="1830.82" minTorque="-1830.82"/>
+ <Entry outShaftSpeed="1812.41" maxTorque="1678.25" minTorque="-1678.25"/>
+ <Entry outShaftSpeed="1963.14" maxTorque="1549.15" minTorque="-1549.15"/>
+ <Entry outShaftSpeed="2114.23" maxTorque="1438.52" minTorque="-1438.52"/>
+ <Entry outShaftSpeed="2265.33" maxTorque="1342.60" minTorque="-1342.60"/>
+ <Entry outShaftSpeed="2416.42" maxTorque="1258.71" minTorque="-1258.71"/>
+ <Entry outShaftSpeed="2567.52" maxTorque="1184.66" minTorque="-1184.66"/>
+ <Entry outShaftSpeed="2718.25" maxTorque="1118.82" minTorque="-1118.82"/>
+ <Entry outShaftSpeed="2869.34" maxTorque="1059.96" minTorque="-1059.96"/>
+ <Entry outShaftSpeed="3020.44" maxTorque="1006.95" minTorque="-1006.95"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00" />
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000" />
+ </Conditioning>
+ </Data>
+ </ElectricMachineSystem>
+ <P2.5GearRatios>
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <Data xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationMethod>Measured</CertificationMethod>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00" />
+ <Entry SoC="100" OCV="640.00" />
+ </OCV>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00" />
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
+ </CurrentLimits>
+ </Data>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <Data xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationMethod>Measured</CertificationMethod>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00" />
+ <Entry SoC="100" OCV="640.00" />
+ </OCV>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00" />
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
+ </CurrentLimits>
+ </Data>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Transmission>
+ <Data xsi:type="TransmissionDataVIFType">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>IHPC Type 1</TransmissionType>
+ <Gears xsi:type="TransmissionGearsVIFType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ </Gears>
+ </Data>
+ </Transmission>
+ <TorqueConverter>
+ <Data xsi:type="TorqueConverterDataVIFType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ </Data>
+ </TorqueConverter>
+ <Angledrive>
+ <Data xsi:type="AngledriveDataVIFType">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ </Data>
+ </Angledrive>
+ <Retarder>
+ <Data xsi:type="RetarderDataVIFType">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <RetarderRatio>1.000</RetarderRatio>
+ </Data>
+ </Retarder>
+ <Axlegear>
+ <Data xsi:type="AxlegearDataVIFType">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ </Data>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataVIFType">
+ <Axles>
+ <vif:Axle axleNumber="1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </vif:Axle>
+ <vif:Axle axleNumber="2" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </vif:Axle>
+ </Axles>
+ </Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-P_PrimaryBusType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SmartAlternator>
+ <RatedCurrent>100</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <SmartAlternator>
+ <RatedCurrent>50</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <Battery>
+ <BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+ <RatedCapacity>50</RatedCapacity>
+ <NominalVoltage>48</NominalVoltage>
+ </Battery>
+ <Capacitor>
+ <CapacitorTechnology>with DCDC converter</CapacitorTechnology>
+ <RatedCapacitance>120</RatedCapacitance>
+ <RatedVoltage>30</RatedVoltage>
+ </Capacitor>
+ <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
+ <Clutch>none</Clutch>
+ <CompressorRatio>1.000</CompressorRatio>
+ <SmartCompressionSystem>true</SmartCompressionSystem>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </Vehicle>
+ <InputDataSignature>
+ <di:Reference URI="#a">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>mWj4jQLxOzx84ZJbLaKoxq7oPkxUeaks+yN+Wn1dQGg=</di:DigestValue>
+ </di:Reference>
+ </InputDataSignature>
+ <ManufacturerRecordSignature>
+ <di:Reference URI="#MRF-4d8eea5c936a49ea8144">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>xA05G8WIWWU2Irww2UwZ0jg5Q9+wu05tJqSf4eVxffI=</di:DigestValue>
+ </di:Reference>
+ </ManufacturerRecordSignature>
+ <Results>
+ <!--Always prints success at the moment-->
+ <Status>success</Status>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1075.44</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">3519.61</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1075.44</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">3519.61</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1094.99</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">2737.48</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1262.82</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">4209.41</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">1347.01</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15000</TotalVehicleMass>
+ <Payload unit="kg">3367.53</Payload>
+ <PassengerCount>2</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="NG PI">
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ </Results>
+ <ApplicationInformation>
+ <SimulationToolVersion>0.7.9.2791-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2022-08-23T18:13:59.7951172Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#VIF_P-714f43f566c2431b9836">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>LqJ7uu5bT4gRMpQ28ahsuqXIsAMYzdzQUGdriC/4JSA=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </PrimaryVehicle>
+ <ManufacturingStep stepCount="2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-d000bbf04fab4598b80d">
+ <HashPreviousStep>
+ <di:Reference URI="#VIF_P-714f43f566c2431b9836">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>LqJ7uu5bT4gRMpQ28ahsuqXIsAMYzdzQUGdriC/4JSA=</di:DigestValue>
+ </di:Reference>
+ </HashPreviousStep>
+ <vif:Vehicle id="VEH-7c6682e087db463a8876" xsi:type="Vehicle_HEV_CompletedBusDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+ <ClassBus>II+III</ClassBus>
+ <NgTankSystem>Compressed</NgTankSystem>
+ <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CB</BodyworkCode>
+ <LowEntry>false</LowEntry>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ <VehicleLength>9500</VehicleLength>
+ <VehicleWidth>2500</VehicleWidth>
+ <EntranceHeight>2000</EntranceHeight>
+ <DoorDriveTechnology>electric</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_xEV_CompletedBusType">
+ <v2.4:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </v2.4:AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_xEV_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>1</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 3-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+ <DoubleGlazing>false</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ <WaterElectricHeater>false</WaterElectricHeater>
+ <AirElectricHeater>false</AirElectricHeater>
+ <OtherHeatingTechnology>false</OtherHeatingTechnology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </vif:Vehicle>
+ <ApplicationInformation>
+ <SimulationToolVersion>0.7.9.2791-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2022-08-23T18:13:59.8982757Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#MST-d000bbf04fab4598b80d">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>kuvCTlflJZYCs2ozMsnPnNfgvPYzU+Flv0E9bhWIrdQ=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </ManufacturingStep>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index cbb304e0ea55e4076b1e8366c3447aecfc047c27..ba989f26f6e8f916f92c4912e1582dd507276f02 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -61,6 +61,10 @@
<Folder Include="Models\Declaration\BusAux\" />
<Folder Include="Integration\Declaration\HeavyLorry\" />
</ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="TestData\XML\XMLVIFBusReport\" />
+ </ItemGroup>
<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>