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

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

Merge pull request #484 in VECTO/vecto-sim from... 

Merge pull request #484 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-547-engine-manufacturer-and-engine to develop

* commit '22e62984':
  fix: copy manufacturer data in compbustionEngineData copy-constructor
  adding testcase to check vsum metadata
parents d23d6706 22e62984
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
+ 3
− 1
View file @ 1d30b55e
...@@ -96,7 +96,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data ...@@ -96,7 +96,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public CombustionEngineData Copy() public CombustionEngineData Copy()
{ {
return new CombustionEngineData { return new CombustionEngineData {
Manufacturer = Manufacturer,
ModelName = ModelName,
Displacement = Displacement, Displacement = Displacement,
IdleSpeed = IdleSpeed, IdleSpeed = IdleSpeed,
Inertia = Inertia, Inertia = Inertia,
......
VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
+ 172
− 127
View file @ 1d30b55e
...@@ -29,131 +29,176 @@ ...@@ -29,131 +29,176 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology * Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/ */
using Microsoft.VisualStudio.TestTools.UnitTesting; using System.IO;
using TUGraz.VectoCommon.Models; using System.Xml;
using TUGraz.VectoCommon.Utils; using Microsoft.VisualStudio.TestTools.UnitTesting;
using TUGraz.VectoCore.Models.Declaration; using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Models.Simulation.Data; using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.DataBus; using TUGraz.VectoCore.InputData.FileIO.XML.Declaration;
using TUGraz.VectoCore.Models.Simulation.Impl; using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.OutputData; using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.OutputData.FileIO; using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Tests.Models.SimulationComponent; using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Tests.Utils; using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.Utils; using TUGraz.VectoCore.OutputData.FileIO;
using TUGraz.VectoCore.OutputData.XML;
namespace TUGraz.VectoCore.Tests.Reports using TUGraz.VectoCore.Tests.Models.SimulationComponent;
{ using TUGraz.VectoCore.Tests.Utils;
[TestClass] using TUGraz.VectoCore.Utils;
public class SumWriterTest
{ namespace TUGraz.VectoCore.Tests.Reports
[TestMethod] {
public void TestSumCalcFixedTime() [TestClass]
{ public class SumWriterTest
var writer = new FileOutputWriter("testsumcalc_fixed"); {
var sumWriter = new SummaryDataContainer(writer); [TestMethod]
public void TestSumCalcFixedTime()
var modData = new ModalDataContainer("testsumcalc_fixed", FuelType.DieselCI, writer); {
var writer = new FileOutputWriter("testsumcalc_fixed");
modData.AddAuxiliary("FAN"); var sumWriter = new SummaryDataContainer(writer);
for (var i = 0; i < 499; i++) { var modData = new ModalDataContainer("testsumcalc_fixed", FuelType.DieselCI, writer);
modData[ModalResultField.simulationInterval] = 1.SI<Second>();
modData[ModalResultField.n_eng_avg] = 600.RPMtoRad(); modData.AddAuxiliary("FAN");
modData[ModalResultField.v_act] = 20.KMPHtoMeterPerSecond();
modData[ModalResultField.drivingBehavior] = DrivingBehavior.Driving; for (var i = 0; i < 499; i++) {
modData[ModalResultField.time] = i.SI<Second>(); modData[ModalResultField.simulationInterval] = 1.SI<Second>();
modData[ModalResultField.dist] = i.SI<Meter>(); modData[ModalResultField.n_eng_avg] = 600.RPMtoRad();
modData["FAN"] = 3000.SI<Watt>(); modData[ModalResultField.v_act] = 20.KMPHtoMeterPerSecond();
modData[ModalResultField.P_air] = 3000.SI<Watt>(); modData[ModalResultField.drivingBehavior] = DrivingBehavior.Driving;
modData[ModalResultField.P_roll] = 3000.SI<Watt>(); modData[ModalResultField.time] = i.SI<Second>();
modData[ModalResultField.P_slope] = 3000.SI<Watt>(); modData[ModalResultField.dist] = i.SI<Meter>();
modData[ModalResultField.P_aux] = 3000.SI<Watt>(); modData["FAN"] = 3000.SI<Watt>();
modData[ModalResultField.P_brake_loss] = 3000.SI<Watt>(); modData[ModalResultField.P_air] = 3000.SI<Watt>();
modData[ModalResultField.P_roll] = 3000.SI<Watt>();
modData[ModalResultField.FCMap] = 1e-4.SI<KilogramPerSecond>(); modData[ModalResultField.P_slope] = 3000.SI<Watt>();
modData[ModalResultField.P_aux] = 3000.SI<Watt>();
modData[ModalResultField.altitude] = 0.SI<Meter>(); modData[ModalResultField.P_brake_loss] = 3000.SI<Watt>();
modData[ModalResultField.acc] = 0.SI<MeterPerSquareSecond>();
modData[ModalResultField.P_eng_out] = (i % 2 == 0 ? 1 : -1) * 3000.SI<Watt>(); modData[ModalResultField.FCMap] = 1e-4.SI<KilogramPerSecond>();
modData[ModalResultField.P_eng_fcmap] = 0.SI<Watt>(); modData[ModalResultField.altitude] = 0.SI<Meter>();
modData[ModalResultField.acc] = 0.SI<MeterPerSquareSecond>();
modData.CommitSimulationStep(); modData[ModalResultField.P_eng_out] = (i % 2 == 0 ? 1 : -1) * 3000.SI<Watt>();
}
modData[ModalResultField.P_eng_fcmap] = 0.SI<Watt>();
sumWriter.Write(modData, 0, 0, new MockRunData());
modData.CommitSimulationStep();
modData.Finish(VectoRun.Status.Success); }
sumWriter.Finish();
sumWriter.Write(modData, 0, 0, new MockRunData());
var sumData = VectoCSVFile.Read("testsumcalc_fixed.vsum", false, true);
modData.Finish(VectoRun.Status.Success);
// 3kW * 500s => to kWh sumWriter.Finish();
Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_air [kWh]"), 1e-3);
Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_aux_FAN [kWh]"), 1e-3); var sumData = VectoCSVFile.Read("testsumcalc_fixed.vsum", false, true);
Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_roll [kWh]"), 1e-3);
Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_grad [kWh]"), 1e-3); // 3kW * 500s => to kWh
Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_aux_sum [kWh]"), 1e-3); Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_air [kWh]"), 1e-3);
Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_brake [kWh]"), 1e-3); Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_aux_FAN [kWh]"), 1e-3);
Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_roll [kWh]"), 1e-3);
// 500s * 1e-4 kg/s = 0.05kg => 0.05kg / 500 => to g/h Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_grad [kWh]"), 1e-3);
Assert.AreEqual((500.0 * 1e-4) * 1000 * 3600 / 500.0, sumData.Rows[0].ParseDouble("FC-Map [g/h]"), 1e-3); Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_aux_sum [kWh]"), 1e-3);
// 500s * 1e-4 kg/s = 0.05kg => 0.05kg / 499m => to g/km Assert.AreEqual(500.0 * 3000.0 / 1000 / 3600, sumData.Rows[0].ParseDouble("E_brake [kWh]"), 1e-3);
Assert.AreEqual((500.0 * 1e-4) * 1000 * 1000 / 499.0, sumData.Rows[0].ParseDouble("FC-Map [g/km]"), 1e-3);
} // 500s * 1e-4 kg/s = 0.05kg => 0.05kg / 500 => to g/h
Assert.AreEqual((500.0 * 1e-4) * 1000 * 3600 / 500.0, sumData.Rows[0].ParseDouble("FC-Map [g/h]"), 1e-3);
[TestMethod] // 500s * 1e-4 kg/s = 0.05kg => 0.05kg / 499m => to g/km
public void TestSumCalcVariableTime() Assert.AreEqual((500.0 * 1e-4) * 1000 * 1000 / 499.0, sumData.Rows[0].ParseDouble("FC-Map [g/km]"), 1e-3);
{ }
var writer = new FileOutputWriter("testsumcalc_var");
var sumWriter = new SummaryDataContainer(writer); [TestMethod]
public void TestSumCalcVariableTime()
var modData = new ModalDataContainer("testsumcalc_var", FuelType.DieselCI, writer); {
modData.AddAuxiliary("FAN"); var writer = new FileOutputWriter("testsumcalc_var");
var sumWriter = new SummaryDataContainer(writer);
var timeSteps = new[]
{ 0.5.SI<Second>(), 0.3.SI<Second>(), 1.2.SI<Second>(), 12.SI<Second>(), 0.1.SI<Second>() }; var modData = new ModalDataContainer("testsumcalc_var", FuelType.DieselCI, writer);
var powerDemand = new[] modData.AddAuxiliary("FAN");
{ 1000.SI<Watt>(), 1500.SI<Watt>(), 2000.SI<Watt>(), 2500.SI<Watt>(), 3000.SI<Watt>() };
var timeSteps = new[]
for (var i = 0; i < 500; i++) { { 0.5.SI<Second>(), 0.3.SI<Second>(), 1.2.SI<Second>(), 12.SI<Second>(), 0.1.SI<Second>() };
modData[ModalResultField.simulationInterval] = timeSteps[i % timeSteps.Length]; var powerDemand = new[]
modData[ModalResultField.time] = i.SI<Second>(); { 1000.SI<Watt>(), 1500.SI<Watt>(), 2000.SI<Watt>(), 2500.SI<Watt>(), 3000.SI<Watt>() };
modData[ModalResultField.dist] = i.SI<Meter>();
modData[ModalResultField.n_eng_avg] = 600.RPMtoRad(); for (var i = 0; i < 500; i++) {
modData[ModalResultField.v_act] = 20.KMPHtoMeterPerSecond(); modData[ModalResultField.simulationInterval] = timeSteps[i % timeSteps.Length];
modData[ModalResultField.drivingBehavior] = DrivingBehavior.Driving; modData[ModalResultField.time] = i.SI<Second>();
modData["FAN"] = powerDemand[i % powerDemand.Length]; modData[ModalResultField.dist] = i.SI<Meter>();
modData[ModalResultField.P_air] = powerDemand[i % powerDemand.Length]; modData[ModalResultField.n_eng_avg] = 600.RPMtoRad();
modData[ModalResultField.P_roll] = powerDemand[i % powerDemand.Length]; modData[ModalResultField.v_act] = 20.KMPHtoMeterPerSecond();
modData[ModalResultField.P_slope] = powerDemand[i % powerDemand.Length]; modData[ModalResultField.drivingBehavior] = DrivingBehavior.Driving;
modData[ModalResultField.P_aux] = powerDemand[i % powerDemand.Length]; modData["FAN"] = powerDemand[i % powerDemand.Length];
modData[ModalResultField.P_brake_loss] = powerDemand[i % powerDemand.Length]; modData[ModalResultField.P_air] = powerDemand[i % powerDemand.Length];
modData[ModalResultField.P_roll] = powerDemand[i % powerDemand.Length];
modData[ModalResultField.altitude] = 0.SI<Meter>(); modData[ModalResultField.P_slope] = powerDemand[i % powerDemand.Length];
modData[ModalResultField.acc] = 0.SI<MeterPerSquareSecond>(); modData[ModalResultField.P_aux] = powerDemand[i % powerDemand.Length];
modData[ModalResultField.P_eng_out] = (i % 2 == 0 ? 1 : -1) * powerDemand[i % powerDemand.Length]; modData[ModalResultField.P_brake_loss] = powerDemand[i % powerDemand.Length];
modData[ModalResultField.P_eng_fcmap] = 0.SI<Watt>(); modData[ModalResultField.altitude] = 0.SI<Meter>();
modData[ModalResultField.acc] = 0.SI<MeterPerSquareSecond>();
modData.CommitSimulationStep(); modData[ModalResultField.P_eng_out] = (i % 2 == 0 ? 1 : -1) * powerDemand[i % powerDemand.Length];
}
modData[ModalResultField.P_eng_fcmap] = 0.SI<Watt>();
sumWriter.Write(modData, 0, 0, new MockRunData());
modData.CommitSimulationStep();
modData.Finish(VectoRun.Status.Success); }
sumWriter.Finish();
sumWriter.Write(modData, 0, 0, new MockRunData());
var sumData = VectoCSVFile.Read("testsumcalc_var.vsum", false, true);
modData.Finish(VectoRun.Status.Success);
// sum(dt * p) => to kWh sumWriter.Finish();
Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_air [kWh]"), 1e-3);
Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_aux_FAN [kWh]"), 1e-3); var sumData = VectoCSVFile.Read("testsumcalc_var.vsum", false, true);
Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_roll [kWh]"), 1e-3);
Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_grad [kWh]"), 1e-3); // sum(dt * p) => to kWh
Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_aux_sum [kWh]"), 1e-3); Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_air [kWh]"), 1e-3);
Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_brake [kWh]"), 1e-3); Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_aux_FAN [kWh]"), 1e-3);
} Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_roll [kWh]"), 1e-3);
} Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_grad [kWh]"), 1e-3);
Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_aux_sum [kWh]"), 1e-3);
Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_brake [kWh]"), 1e-3);
}
[TestMethod]
public void TestSumDataMetaInformation()
{
var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
var dataProvider = new XMLDeclarationInputDataProvider(XmlTextReader.Create(jobfile), true);
var writer = new FileOutputWriter(jobfile);
var xmlReport = new XMLDeclarationReport(writer);
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
if (File.Exists(writer.SumFileName)) {
File.Delete(writer.SumFileName);
}
var runsFactory = new SimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport) {
WriteModalResults = false,
Validate = false,
};
jobContainer.AddRuns(runsFactory);
jobContainer.Execute();
jobContainer.WaitFinished();
var sumRow = sumData.Table.Rows[1];
Assert.AreEqual(dataProvider.VehicleInputData.Manufacturer, sumRow[SummaryDataContainer.VEHICLE_MANUFACTURER]);
Assert.AreEqual(dataProvider.VehicleInputData.Model, sumRow[SummaryDataContainer.VEHICLE_MODEL]);
Assert.AreEqual(dataProvider.VehicleInputData.VIN, sumRow[SummaryDataContainer.VIN_NUMBER]);
Assert.AreEqual(dataProvider.EngineInputData.Manufacturer, sumRow[SummaryDataContainer.ENGINE_MANUFACTURER]);
Assert.AreEqual(dataProvider.EngineInputData.Model, sumRow[SummaryDataContainer.ENGINE_MODEL]);
Assert.AreEqual(dataProvider.EngineInputData.FuelType.GetLabel(), sumRow[SummaryDataContainer.ENGINE_FUEL_TYPE]);
Assert.AreEqual((dataProvider.EngineInputData.RatedPowerDeclared.ConvertTo().Kilo.Watt.Value()),
((SI)sumRow[SummaryDataContainer.ENGINE_RATED_POWER]).Value());
Assert.AreEqual(dataProvider.EngineInputData.RatedSpeedDeclared.AsRPM,
((SI)sumRow[SummaryDataContainer.ENGINE_RATED_SPEED]).Value());
Assert.AreEqual(dataProvider.EngineInputData.Displacement.ConvertTo().Cubic.Centi.Meter.Value(),
((SI)sumRow[SummaryDataContainer.ENGINE_DISPLACEMENT]).Value());
Assert.AreEqual(dataProvider.GearboxInputData.Manufacturer, sumRow[SummaryDataContainer.GEARBOX_MANUFACTURER]);
Assert.AreEqual(dataProvider.GearboxInputData.Model, sumRow[SummaryDataContainer.GEARBOX_MODEL]);
Assert.AreEqual(dataProvider.AxleGearInputData.Manufacturer, sumRow[SummaryDataContainer.AXLE_MANUFACTURER]);
Assert.AreEqual(dataProvider.AxleGearInputData.Model, sumRow[SummaryDataContainer.AXLE_MODEL]);
}
}
} }
\ No newline at end of file
VectoCore/VectoCoreTest/VectoCoreTest.csproj
+ 5
− 0
View file @ 1d30b55e
...@@ -2543,9 +2543,14 @@ ...@@ -2543,9 +2543,14 @@
<Folder Include="Integration\FullPowertrain\" /> <Folder Include="Integration\FullPowertrain\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="TestData\XML\XMLReaderDeclaration\vecto_engine-sample.xml" />
<Content Include="TestData\XML\XMLReaderDeclaration\vecto_gearbox-sample.xml" />
<Content Include="TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml"> <Content Include="TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample_certificationOptions.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample_FULL.xml"> <Content Include="TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample_FULL.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about