Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Verified Commit 72fb8236 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

extend adc loss map, additional testcase

parent 7885b97b
Branches
Tags
No related merge requests found
......@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
return new TransmissionLossMap(entries, gearRatio, gearName);
}
public static TransmissionLossMap CreateEmADCLossMap(DataTable data, double gearRatio, string gearName)
public static TransmissionLossMap CreateEmADCLossMap(DataTable data, double gearRatio, string gearName, bool extendLossMap)
{
if (data == null || data.Columns.Count < 3) {
throw new VectoException("TransmissionLossMap Data File for {0} must consist of 3 columns.", gearName);
......@@ -126,6 +126,10 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
torqueLoss: -row.ParseDouble(Fields.TorqeLoss).SI<NewtonMeter>()))
.ToList();
if (!extendLossMap) {
return new TransmissionLossMap(entries, gearRatio, gearName);
}
entries = ExtendLossMap(entries);
return new TransmissionLossMap(entries, gearRatio, gearName);
}
......
......@@ -982,7 +982,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var lossMap = powertrainPosition == PowertrainPosition.IHPC
? TransmissionLossMapReader.CreateEmADCLossMap(1.0, 1.0, "EM ADC IHPC LossMap Eff")
: adcLossMap != null
? TransmissionLossMapReader.CreateEmADCLossMap(adcLossMap, ratio, "EM ADC LossMap")
? TransmissionLossMapReader.CreateEmADCLossMap(adcLossMap, ratio, "EM ADC LossMap", true)
: TransmissionLossMapReader.CreateEmADCLossMap(efficiency, ratio, "EM ADC LossMap Eff");
var retVal = new ElectricMotorData() {
......
......@@ -114,7 +114,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
var lossMap = powertrainPosition == PowertrainPosition.IHPC
? TransmissionLossMapReader.CreateEmADCLossMap(1.0, 1.0, "EM ADC IHPC LossMap Eff")
: adcLossMap != null
? TransmissionLossMapReader.CreateEmADCLossMap(adcLossMap, adcRatio, "EM ADC LossMap")
? TransmissionLossMapReader.CreateEmADCLossMap(adcLossMap, adcRatio, "EM ADC LossMap", true)
: TransmissionLossMapReader.CreateEmADCLossMap(DeclarationData.ElectricMachineDefaultMechanicalTransmissionEfficiency, adcRatio, "EM ADC LossMap Eff");
......
......@@ -119,6 +119,7 @@ public class PrimaryBusSimulation
TestCase(@"PrimaryBus/P-HEV/PrimaryCoach_P2_HEV_AMT_Conv.xml", 0, TestName="2nd Amendment PrimaryBus Coach P-HEV P2 AMT"),
TestCase(@"PrimaryBus/P-HEV/PrimaryCoach_P2_HEV_Base_AMT.xml", 0, TestName = "2nd Amendment PrimaryBus Coach P-HEV P2 Base AMT"),
TestCase(@"PrimaryBus/P-HEV/PrimaryCoach_P2_HEV_AMT_ADC.xml", 0, TestName = "2nd Amendment PrimaryBus Coach P-HEV P2 AMT ADC"),
TestCase(@"PrimaryBus/P-HEV/PrimaryCoach_P2_HEV_AMT_OVC.xml", 0, TestName = "2nd Amendment PrimaryBus Coach P-HEV P2 AMT OVC"),
TestCase(@"PrimaryBus/P-HEV/PrimaryCityBus_P1_HEV_Base_AT.xml", 0, TestName = "2nd Amendment PrimaryBus CityBus P-HEV P1 Base AT"),
TestCase(@"PrimaryBus/P-HEV/PrimaryCityBus_P1_HEV_Supercap.xml", 0, TestName = "2nd Amendment PrimaryBus CityBus P-HEV P1 Supercap"),
......
......@@ -545,7 +545,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var lossMap =
TransmissionLossMapReader.CreateEmADCLossMap(VectoCSVFile.ReadStream(InputDataHelper.InputDataAsStream(header, mapData)), 1.0,
"EM ADC Map");
"EM ADC Map", false);
var outTorque = lossMap.GetOutTorque(emSpeed.RPMtoRad(), emTorque.SI<NewtonMeter>());
......@@ -569,7 +569,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var lossMap =
TransmissionLossMapReader.CreateEmADCLossMap(VectoCSVFile.ReadStream(InputDataHelper.InputDataAsStream(header, mapData)), 1.0,
"EM ADC Map");
"EM ADC Map", false);
var torqueLoss = lossMap.GetTorqueLoss(dtSpeed.RPMtoRad(), dtTorque.SI<NewtonMeter>());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment