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

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

adding missing fields in the runData for some testcases

parent 3e910724
No related branches found
No related tags found
No related merge requests found
......@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
ModelData = modelData;
AirdragData = airdrag;
if (AirdragData.CrossWindCorrectionCurve != null) {
if (AirdragData?.CrossWindCorrectionCurve != null) {
AirdragData.CrossWindCorrectionCurve.SetDataBus(container);
}
var model = container.RunData;
......
......@@ -97,6 +97,9 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
GearshiftParameters = CreateGearshiftData(),
VehicleData = vehicleData,
AirdragData = airDragData,
Retarder = new RetarderData() { Type = RetarderType.None},
Cycle = cycleData,
Aux = new List<VectoRunData.AuxData>(),
SimulationType = SimulationType.DistanceCycle,
ElectricMachinesData = new List<Tuple<PowertrainPosition, ElectricMotorData>>()
};
......@@ -262,7 +265,10 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
GearboxData = gearboxData,
GearshiftParameters = CreateGearshiftData(),
AirdragData = airDragData,
Retarder = new RetarderData() { Type = RetarderType.None},
DriverData = driverData,
Cycle = cycleData,
Aux = new List<VectoRunData.AuxData>(),
ElectricMachinesData = new List<Tuple<PowertrainPosition, ElectricMotorData>>()
};
var fileWriter = new FileOutputWriter("Coach_FullPowertrain_LowSpeed");
......
......@@ -102,6 +102,8 @@ namespace TUGraz.VectoCore.Tests.Integration
AirdragData = airdragData,
AxleGearData = axleGearData,
GearboxData = gearboxData,
Retarder = new RetarderData() { Type = RetarderType.None},
Aux = new List<VectoRunData.AuxData>(),
GearshiftParameters = CreateGearshiftData(),
SimulationType = SimulationType.DistanceCycle,
Cycle = cycleData,
......
......@@ -263,6 +263,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var engineData = new CombustionEngineData() {
IdleSpeed = 600.RPMtoRad(),
Inertia = 0.SI<KilogramSquareMeter>(),
EngineStartTime = 1.SI<Second>(),
};
var fullLoadCurves = new Dictionary<uint, EngineFullLoadCurve>();
fullLoadCurves[0] = FullLoadCurveReader.Create(
......@@ -276,13 +277,23 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
engineData.FullLoadCurves = fullLoadCurves;
return new VectoRunData() {
VehicleData = new VehicleData() {
DynamicTyreRadius = 0.492.SI<Meter>()
DynamicTyreRadius = 0.492.SI<Meter>(),
CurbMass = 10000.SI<Kilogram>(),
AxleData = new List<Axle>() {
new Axle() {
AxleWeightShare = 1,
Inertia = 0.SI<KilogramSquareMeter>(),
RollResistanceCoefficient = 0.0055,
TyreTestLoad = 33500.SI<Newton>(),
}
}
},
AxleGearData = new AxleGearData() {
AxleGear = new GearData() {
Ratio = 2.64
}
},
Retarder = new RetarderData() { Type = RetarderType.None },
EngineData = engineData,
GearboxData = gearboxData,
GearshiftParameters = new ShiftStrategyParameters() {
......@@ -292,6 +303,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
DownshiftAfterUpshiftDelay = DeclarationData.Gearbox.DownshiftAfterUpshiftDelay,
UpshiftAfterDownshiftDelay = DeclarationData.Gearbox.UpshiftAfterDownshiftDelay,
UpshiftMinAcceleration = DeclarationData.Gearbox.UpshiftMinAcceleration,
},
Cycle = new DrivingCycleData() {
CycleType = CycleType.EngineOnly
}
};
}
......
......@@ -32,6 +32,7 @@
using NUnit.Framework;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Tests.Reports
......@@ -44,7 +45,8 @@ namespace TUGraz.VectoCore.Tests.Reports
public void TestGearshiftCountTractionInterruptionShiftup()
{
var rundata = new VectoRunData() {
JobName = "GearshiftRun"
JobName = "GearshiftRun",
GearboxData = new GearboxData()
};
var modData = new ModalDataContainer(rundata, null, null);
modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
......@@ -72,7 +74,8 @@ namespace TUGraz.VectoCore.Tests.Reports
{
var rundata = new VectoRunData()
{
JobName = "GearshiftRun"
JobName = "GearshiftRun",
GearboxData = new GearboxData()
};
var modData = new ModalDataContainer(rundata, null, null);
modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
......@@ -100,7 +103,8 @@ namespace TUGraz.VectoCore.Tests.Reports
{
var rundata = new VectoRunData()
{
JobName = "GearshiftRun"
JobName = "GearshiftRun",
GearboxData = new GearboxData()
};
var modData = new ModalDataContainer(rundata, null, null);
modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
......@@ -129,7 +133,8 @@ namespace TUGraz.VectoCore.Tests.Reports
{
var rundata = new VectoRunData()
{
JobName = "GearshiftRun"
JobName = "GearshiftRun",
GearboxData = new GearboxData()
};
var modData = new ModalDataContainer(rundata, null, null);
modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
......@@ -157,7 +162,8 @@ namespace TUGraz.VectoCore.Tests.Reports
{
var rundata = new VectoRunData()
{
JobName = "GearshiftRun"
JobName = "GearshiftRun",
GearboxData = new GearboxData()
};
var modData = new ModalDataContainer(rundata, null, null);
modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
......@@ -187,7 +193,8 @@ namespace TUGraz.VectoCore.Tests.Reports
{
var rundata = new VectoRunData()
{
JobName = "GearshiftRun"
JobName = "GearshiftRun",
GearboxData = new GearboxData()
};
var modData = new ModalDataContainer(rundata, null, null);
modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
......@@ -216,7 +223,8 @@ namespace TUGraz.VectoCore.Tests.Reports
{
var rundata = new VectoRunData()
{
JobName = "GearshiftRun"
JobName = "GearshiftRun",
GearboxData = new GearboxData()
};
var modData = new ModalDataContainer(rundata, null, null);
modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment