From d4ff7e72571f4748215d8a9f01a24d035d6d7ef7 Mon Sep 17 00:00:00 2001 From: Michael Krisper <michael.krisper@tugraz.at> Date: Thu, 25 Feb 2016 11:14:49 +0100 Subject: [PATCH] corrected cycle file --- User Manual/5-input-and-output-files/VCDB.md | 15 +++++++++------ User Manual/help.html | 7 ++----- .../Models/Simulation/MeasuredSpeedModeTest.cs | 14 ++++++++++---- .../MeasuredSpeed/MeasuredSpeedGearVair.vecto | 2 +- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/User Manual/5-input-and-output-files/VCDB.md b/User Manual/5-input-and-output-files/VCDB.md index 6d1af3ec20..ec780acfe7 100644 --- a/User Manual/5-input-and-output-files/VCDB.md +++ b/User Manual/5-input-and-output-files/VCDB.md @@ -6,14 +6,17 @@ The file is needed for Vair & Beta [Cross Wind Correction](#cross-wind-correctio The file uses the VECTO CSV format [VECTO CSV format](#csv-format). -Format: -: - Two columns +**Format:** + +- Two columns - One header line - At least two lines with numeric values (below file header) ***Columns:*** -| **Beta \[°\]** | **cd Scaling Factor \[-\]** | -| ---------------------------- | ---------------------- | -| ... | ... | -| ... | ... | +| **Beta [°]** | **cd Scaling Factor [-]** | +|--------------|---------------------------| +| ... | ... | +| ... | ... | + + diff --git a/User Manual/help.html b/User Manual/help.html index 884e616ccf..9e57c8da15 100644 --- a/User Manual/help.html +++ b/User Manual/help.html @@ -1811,15 +1811,12 @@ Example: “Gears\Gear1.vtlm” points to the “Gears” subdirectory of the Ge <div id="file-format-1" class="section level3"> <h3>File Format</h3> <p>The file uses the VECTO CSV format <a href="#csv-format">VECTO CSV format</a>.</p> -<dl> -<dt>Format:</dt> -<dd><ul> +<p><strong>Format:</strong></p> +<ul> <li>Two columns</li> <li>One header line</li> <li>At least two lines with numeric values (below file header)</li> </ul> -</dd> -</dl> <p><strong><em>Columns:</em></strong></p> <table> <thead> diff --git a/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs b/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs index 8a05b8a25e..77f3ab2660 100644 --- a/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs +++ b/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs @@ -208,7 +208,11 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation var fullLoadCurve = EngineFullLoadCurve.Create(fullLoad); var data = new VectoRunData { Cycle = drivingCycle, - VehicleData = new VehicleData { VehicleCategory = VehicleCategory.RigidTruck }, + VehicleData = + new VehicleData { + VehicleCategory = VehicleCategory.RigidTruck, + CrossWindCorrectionCurve = CrossWindCorrectionCurve.GetNoCorrectionCurve(6.16498344.SI<SquareMeter>()) + }, AxleGearData = new AxleGearData { AxleGear = new GearData { Ratio = 2.3 } }, EngineData = new CombustionEngineData { IdleSpeed = 560.RPMtoRad(), FullLoadCurve = fullLoadCurve }, GearboxData = new GearboxData { Gears = new Dictionary<uint, GearData> { { 1, new GearData { Ratio = 6.2 } } } }, @@ -260,7 +264,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation new VehicleData { VehicleCategory = VehicleCategory.RigidTruck, WheelsInertia = 2.SI<KilogramSquareMeter>(), - DynamicTyreRadius = 0.85.SI<Meter>() + DynamicTyreRadius = 0.85.SI<Meter>(), + CrossWindCorrectionCurve = CrossWindCorrectionCurve.GetNoCorrectionCurve(6.16498344.SI<SquareMeter>()) }, AxleGearData = new AxleGearData { AxleGear = new GearData { Ratio = 2.3 } }, EngineData = new CombustionEngineData { IdleSpeed = 560.RPMtoRad(), FullLoadCurve = fullLoadCurve }, @@ -395,8 +400,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation var tbl = VectoCSVFile.Read(@"TestData/MeasuredSpeed/VairBeta.vcdb"); var vairbeta = new VAirBetaCrosswindCorrection(1.SI<SquareMeter>(), tbl); - - Assert.AreEqual(0, vairbeta.AverageAirDragPowerLoss(20.KMPHtoMeterPerSecond(), 20.KMPHtoMeterPerSecond(), 1.SI<Second>()) ); + + Assert.AreEqual(0, + vairbeta.AverageAirDragPowerLoss(20.KMPHtoMeterPerSecond(), 20.KMPHtoMeterPerSecond(), 1.SI<Second>())); } } } \ No newline at end of file diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVair.vecto b/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVair.vecto index 470dd9a9eb..c81eca06bb 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVair.vecto +++ b/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVair.vecto @@ -12,7 +12,7 @@ "EngineFile": "Engine.veng", "GearboxFile": "Gearbox.vgbx", "Cycles": [ - "MeasuredSpeed_Gear_Rural.vdri" + "MeasuredSpeed_Gear_Rural_Vair.vdri" ], "VACC": "Driver.vacc", "StartStop": { -- GitLab