diff --git a/VectoCore/InputData/Reader/DrivingCycleDataReader.cs b/VectoCore/InputData/Reader/DrivingCycleDataReader.cs index 1a3d54c559c07b99c1c66715f7c213ad770a809f..d21d2549aa5c968042df3f9c9efe0b23039722e7 100644 --- a/VectoCore/InputData/Reader/DrivingCycleDataReader.cs +++ b/VectoCore/InputData/Reader/DrivingCycleDataReader.cs @@ -263,7 +263,7 @@ namespace TUGraz.VectoCore.InputData.Reader public const string StoppingTime = "stop"; public const string AuxiliarySupplyPower = "Aux_"; public const string EngineSpeed = "n"; - public const string Gear = "Gear"; + public const string Gear = "gear"; public const string AdditionalAuxPowerDemand = "Padd"; public const string AirSpeedRelativeToVehicle = "vair_res"; public const string WindYawAngle = "vair_beta"; diff --git a/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs index a226107df6b0353ec59b61803c83198145e475e1..bd7ebfd62d48a357f150f736667022603d852ed6 100644 --- a/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs +++ b/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs @@ -140,28 +140,30 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl private VehicleContainer BuildMeasuredSpeed(VectoRunData data) { _container.RunData = data; - var cycle = new MeasuredSpeedCycle(_container, data.Cycle); + data.GearboxData.Type = GearboxType.PWheel; + var gearbox = GetGearbox(_container, data.GearboxData); + + var cycle = new MeasuredSpeedCycle(_container, data.Cycle, (Gearbox)gearbox); var vehicle = AddComponent(cycle, new Vehicle(_container, data.VehicleData)); var wheels = AddComponent(vehicle, new Wheels(_container, data.VehicleData.DynamicTyreRadius)); var brakes = AddComponent(wheels, new Brakes(_container)); var tmp = AddComponent(brakes, new AxleGear(_container, data.AxleGearData)); - data.GearboxData.Type = GearboxType.PWheel; switch (data.Retarder.Type) { case RetarderData.RetarderType.Primary: tmp = AddComponent(tmp, new Retarder(_container, data.Retarder.LossMap)); - tmp = AddComponent(tmp, GetGearbox(_container, data.GearboxData)); + tmp = AddComponent(tmp, gearbox); break; case RetarderData.RetarderType.Secondary: - tmp = AddComponent(tmp, GetGearbox(_container, data.GearboxData)); + tmp = AddComponent(tmp, gearbox); tmp = AddComponent(tmp, new Retarder(_container, data.Retarder.LossMap)); break; case RetarderData.RetarderType.None: - tmp = AddComponent(tmp, GetGearbox(_container, data.GearboxData)); + tmp = AddComponent(tmp, gearbox); break; case RetarderData.RetarderType.LossesIncludedInTransmission: - tmp = AddComponent(tmp, GetGearbox(_container, data.GearboxData)); + tmp = AddComponent(tmp, gearbox); break; default: throw new ArgumentOutOfRangeException(); diff --git a/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs b/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs index 169148c2dcd98c986dab761790648e32570f9b11..860273695d6787398e3158ca8bc46519b527f165 100644 --- a/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs +++ b/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs @@ -254,13 +254,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl /// <summary> /// Driving Cycle for the PWheel driving cycle. /// </summary> - public class MeasuredSpeedCycle : VectoSimulationComponent, IDrivingCycleInfo, IDriverDemandInProvider, + public class MeasuredSpeedCycle : VectoSimulationComponent, IDriverInfo, IDrivingCycleInfo, IDriverDemandInProvider, IDriverDemandInPort, ISimulationOutProvider, ISimulationOutPort { protected DrivingCycleData Data; protected IDriverDemandOutPort NextComponent; protected IEnumerator<DrivingCycleData.DrivingCycleEntry> RightSample { get; set; } protected IEnumerator<DrivingCycleData.DrivingCycleEntry> LeftSample { get; set; } + protected Gearbox Gearbox; protected Second AbsTime { get; set; } @@ -269,9 +270,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl /// </summary> /// <param name="container">The container.</param> /// <param name="cycle">The cycle.</param> - public MeasuredSpeedCycle(IVehicleContainer container, DrivingCycleData cycle) + /// <param name="gearbox">the gearbox.</param> + public MeasuredSpeedCycle(IVehicleContainer container, DrivingCycleData cycle, Gearbox gearbox) : base(container) { + Gearbox = gearbox; + Data = cycle; LeftSample = Data.Entries.GetEnumerator(); LeftSample.MoveNext(); @@ -327,6 +331,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl var acceleration = delta_v / delta_t; var gradient = LeftSample.Current.RoadGradient; + Gearbox.Gear = LeftSample.Current.Gear; + Gearbox.Disengaged = LeftSample.Current.Gear == 0; + var response = NextComponent.Request(absTime, dt, acceleration, gradient); response.Switch() @@ -403,5 +410,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl } protected override void DoWriteModalResults(IModalDataContainer container) {} + + public bool VehicleStopped + { + get { return false; } + } + + public DrivingBehavior DrivingBehavior + { + get { return DrivingBehavior.Driving; } + } } } \ No newline at end of file diff --git a/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs b/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs index d0eae0011beccd697eb66cb7f62972ae32d98bae..b52aaee843b43923dc81c0440180fae773e40cfd 100644 --- a/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs +++ b/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs @@ -49,13 +49,18 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation public void MeasuredSpeed_ReadCycle_Test() { var container = new VehicleContainer(); - var inputData = @"<t>,<v>, <grad>,<Gear>,<Aux_Alt>, <Padd> + var inputData = @"<t>,<v>, <grad>,<gear>,<Aux_Alt>, <Padd> 1, 1.383, 0, 1, 0.5767916, 1.969367304 2, 3.515, 0, 1, 0.5426120, 2.042128260"; var drivingCycle = DrivingCycleDataReader.ReadFromStream(inputData.GetStream(), CycleType.MeasuredSpeed); - var cycle = new MeasuredSpeedCycle(container, drivingCycle); + var gearbox = new Gearbox(container, + new GearboxData { + Gears = new Dictionary<uint, GearData> { { 1, new GearData { Ratio = 2.0 } }, { 2, new GearData { Ratio = 3.5 } } } + }, new PWheelShiftStrategy(null, container)); + + var cycle = new MeasuredSpeedCycle(container, drivingCycle, gearbox); Assert.AreEqual(container.CycleData.LeftSample.Time, 1.SI<Second>()); Assert.AreEqual(container.CycleData.RightSample.Time, 2.SI<Second>()); @@ -84,7 +89,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation public void MeasuredSpeed_CreatePowertrain_Test() { // prepare input data - var inputData = @"<t>,<v>, <grad>,<Gear>,<Aux_Alt>, <Padd> + var inputData = @"<t>,<v>, <grad>,<gear>,<Aux_Alt>, <Padd> 1, 1.383, 0, 1, 0.5767916, 1.969367304 2, 3.515, 0, 1, 0.5426120, 2.042128260"; @@ -143,7 +148,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Join("", jobContainer.Runs.Select(r => r.ExecException))); - //ResultFileHelper.TestSumFile(@"TestData\Results\Pwheel\Atego_ges.v2.vsum", @"TestData\Jobs\Pwheel.vsum"); + ResultFileHelper.TestSumFile(@"TestData\Results\Pwheel\Atego_ges.v2.vsum", @"TestData\Jobs\Pwheel.vsum"); //ResultFileHelper.TestModFile(@"TestData\Results\Pwheel\Atego_ges_Gear2_pt1_rep1_actual.vmod",@"TestData\Jobs\Pwheel_Gear2_pt1_rep1_actual.vmod"); diff --git a/VectoCoreTest/Models/Simulation/PwheelModeTests.cs b/VectoCoreTest/Models/Simulation/PwheelModeTests.cs index c56d490c800add5ce18b9c9c660b15d42e68e1b6..795834d21e4acd2b56799daf85debf828470b9f8 100644 --- a/VectoCoreTest/Models/Simulation/PwheelModeTests.cs +++ b/VectoCoreTest/Models/Simulation/PwheelModeTests.cs @@ -48,7 +48,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation public void Pwheel_ReadCycle_Test() { var container = new VehicleContainer(); - var inputData = "<t>,<Pwheel>,<Gear>,<n>,<Padd>\n1,89,2,1748,1.300\n2,120,2,1400,0.4"; + var inputData = @"<t>,<Pwheel>,<gear>,<n>,<Padd> + 1,89,2,1748,1.300 + 2,120,2,1400,0.4"; var cycleFile = new MemoryStream(Encoding.UTF8.GetBytes(inputData)); var drivingCycle = DrivingCycleDataReader.ReadFromStream(cycleFile, CycleType.PWheel); @@ -87,7 +89,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation public void Pwheel_CreatePowertrain_Test() { // prepare input data - var inputData = "<t>,<Pwheel>,<Gear>,<n>,<Padd>\n1,89,2,1748,1.300\n2,120,2,1400,0.4"; + var inputData = @"<t>,<Pwheel>,<gear>,<n>, <Padd> + 1, 89, 2, 1748, 1.3 + 2, 120, 2, 1400, 0.4"; var cycleFile = new MemoryStream(Encoding.UTF8.GetBytes(inputData)); var drivingCycle = DrivingCycleDataReader.ReadFromStream(cycleFile, CycleType.PWheel); diff --git a/VectoCoreTest/TestData/Components/Pwheel/Gear2_pt1_rep1_actual.vdri b/VectoCoreTest/TestData/Components/Pwheel/Gear2_pt1_rep1_actual.vdri index 887f32397190c8bcf973c73dd34ec0d29d8bc64f..df465bcd42d944e2f3d91fbfa39119b707222fa5 100644 --- a/VectoCoreTest/TestData/Components/Pwheel/Gear2_pt1_rep1_actual.vdri +++ b/VectoCoreTest/TestData/Components/Pwheel/Gear2_pt1_rep1_actual.vdri @@ -1,3 +1,3 @@ -<t>,<Pwheel>,<Gear>,<n>,<Padd> +<t>,<Pwheel>,<gear>,<n>,<Padd> 1,89.0198276644304,2,1748.32425666667,0 2,89.0198276644304,2,1748.32425666667,0 diff --git a/VectoCoreTest/TestData/Components/Pwheel/RD_#1_Pwheel_AuxStd.vdri b/VectoCoreTest/TestData/Components/Pwheel/RD_#1_Pwheel_AuxStd.vdri index ade46e03d657c7386e7b24b089fb35e721764557..3a9cd7680b11132beda9f716a6fd9b10cbfe1992 100644 --- a/VectoCoreTest/TestData/Components/Pwheel/RD_#1_Pwheel_AuxStd.vdri +++ b/VectoCoreTest/TestData/Components/Pwheel/RD_#1_Pwheel_AuxStd.vdri @@ -1,4 +1,4 @@ -<t>,<Pwheel>,<Gear>,<n>,<Padd> +<t>,<Pwheel>,<gear>,<n>,<Padd> 0.4,0,2,602,1.60479943647419 0.8,0,2,602,1.6069839807413 1.2,0,2,602,1.60573566973152 diff --git a/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Motorway.vdri b/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Motorway.vdri index 12d2f0211f6a4aed9f0aeb4ce83d0cb2cf4be61d..012c87c6d81327e8fee1e2fd239a6df057a415b3 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Motorway.vdri +++ b/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Motorway.vdri @@ -1,5 +1,4 @@ <t>,<v>,<grad>,<gear>,<Aux_Alt>,<Padd> -c [s],[km/h],[%],[-],[kW],[kW] 1,0,0,0,0.662242,2.040810491 2,0,0,0,0.6793304,2.055966253 3,0,0,0,0.687876,2.031795115 diff --git a/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Rural.vdri b/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Rural.vdri index 49c31720a97a87871dc19f04c3c3b1a04f348d8c..1b0b83f092c096cd0404fea20301d0c7164c5615 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Rural.vdri +++ b/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Rural.vdri @@ -1,5 +1,4 @@ <t>,<v>,<grad>,<gear>,<Aux_Alt>,<Padd> -c [s],[km/h],[%],[-],[kW],[kW] 1,0,0,0,1.3629364,1.964386794 2,0,0,0,1.3629364,2.052252424 3,0,0,0,1.3458452,2.041330699 diff --git a/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Urban.vdri b/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Urban.vdri index ed3edcb4c9b138d36daf3034d0d1dc920e78f213..2937e609b4fa903e2fe9b795e8609d1751fe0961 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Urban.vdri +++ b/VectoCoreTest/TestData/MeasuredSpeed/ChassisDyno_Urban.vdri @@ -1,5 +1,4 @@ <t>,<v>,<grad>,<gear>,<Aux_Alt>,<Padd> -c [s],[km/h],[%],[-],[kW],[kW] 1,0,0,0,0.6366052,2.043329549 2,0,0,0,0.6366052,2.039027881 3,0,0,0,0.662242,2.047959477 diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Demo_AuxAlternator.vaux b/VectoCoreTest/TestData/MeasuredSpeed/Demo_AuxAlternator.vaux new file mode 100644 index 0000000000000000000000000000000000000000..2eaf05a9a32d7c3536482e0bc6473ee83980dfa1 --- /dev/null +++ b/VectoCoreTest/TestData/MeasuredSpeed/Demo_AuxAlternator.vaux @@ -0,0 +1,138 @@ +Transmission ration to engine rpm [-] +4.078 +Efficiency to engine [-] +0.96 +Efficiency auxiliary to supply [-] +0.98 +Auxiliary speed [rpm], Mechanical power [kW],Supply power [kW] +1415,0.07,0 +1415,0.87,0.53 +1415,1.03,0.64 +1415,1.17,0.75 +1416,1.36,0.84 +1416,2.4,1.4 +1887,0.07,0 +1887,0.68,0.41 +1887,0.87,0.54 +1887,0.99,0.64 +1887,1.1,0.74 +1887,2.11,1.47 +1887,2.55,1.74 +2358,0.07,0 +2358,0.65,0.38 +2358,0.79,0.49 +2358,0.99,0.64 +2358,1.12,0.75 +2358,1.59,1.12 +2358,1.99,1.42 +2358,2.41,1.68 +2358,2.86,1.95 +2358,3.19,2.12 +2358,3.51,2.3 +2830,0.08,0 +2830,0.7,0.41 +2830,0.83,0.51 +2830,1.02,0.66 +2830,1.12,0.75 +2830,1.6,1.13 +2830,2.45,1.71 +2830,2.96,2.02 +2830,3.38,2.24 +2830,3.8,2.46 +2830,4.14,2.63 +3302,0.08,0 +3302,0.74,0.44 +3302,0.88,0.54 +3302,1.07,0.69 +3302,1.19,0.79 +3302,2.45,1.71 +3302,2.98,2.03 +3302,3.44,2.28 +3302,3.88,2.51 +3302,4.46,2.8 +3773,0.09,0 +3773,0.8,0.47 +3773,0.93,0.57 +3773,1.15,0.74 +3773,1.27,0.85 +3773,2.44,1.69 +3773,2.98,2.02 +3773,3.46,2.29 +3773,3.96,2.55 +3773,4.47,2.8 +3773,4.69,2.91 +4245,0.11,0 +4245,0.88,0.51 +4245,1.02,0.62 +4245,1.22,0.78 +4245,1.47,0.98 +4245,2.36,1.62 +4245,2.98,2.01 +4245,3.46,2.28 +4245,4,2.57 +4245,4.47,2.79 +4245,4.94,3 +4716,0.12,0 +4716,0.97,0.56 +4716,1.11,0.67 +4716,1.32,0.84 +4716,1.91,1.29 +4716,2.96,1.99 +4716,3.46,2.27 +4716,4,2.56 +4716,4.52,2.81 +4716,4.97,3 +4716,5.12,3.08 +5188,0.14,0 +5188,1.08,0.62 +5188,1.21,0.73 +5188,1.47,0.93 +5188,2.89,1.92 +5188,3.45,2.25 +5188,3.99,2.54 +5188,4.54,2.82 +5188,4.98,3 +5188,5.19,3.11 +5660,0.17,0 +5660,1.19,0.67 +5660,1.32,0.79 +5660,1.69,1.07 +5660,2.54,1.66 +5660,3.37,2.18 +5660,3.98,2.52 +5660,4.55,2.8 +5660,5.02,3.01 +5660,5.27,3.14 +6131,0.19,0 +6131,1.28,0.72 +6131,1.49,0.88 +6131,2.15,1.37 +6131,3.19,2.04 +6131,3.92,2.46 +6131,4.48,2.75 +6131,5.44,3.16 +6603,0.22,0 +6603,1.42,0.79 +6603,1.81,1.08 +6603,2.92,1.84 +6603,3.75,2.33 +6603,4.38,2.66 +6603,4.94,2.92 +6603,5.51,3.19 +7075,0.25,0 +7075,1.63,0.91 +7075,2.35,1.43 +7075,3.43,2.1 +7075,4.24,2.55 +7075,4.82,2.83 +7075,5.54,3.19 +7546,0.28,0 +7546,1.93,1.09 +7546,3.04,1.82 +7546,4.09,2.43 +7546,4.69,2.73 +7546,5.7,3.19 +9150,0.42,0 +9150,5.74,3.19 +12000,0.42,0 +12000,5.74,3.19 diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Demo_ChassisDyno.vecto b/VectoCoreTest/TestData/MeasuredSpeed/Demo_ChassisDyno.vecto index 3a2f723f2e6e44c01007d9467ffcf94b14aa2d58..370141156c7675775fb74c328e4fd48cadc8ff53 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/Demo_ChassisDyno.vecto +++ b/VectoCoreTest/TestData/MeasuredSpeed/Demo_ChassisDyno.vecto @@ -6,6 +6,7 @@ "FileVersion": 2 }, "Body": { + "SavedInDeclMode": false, "VehicleFile": "Demo_Vehicle_ChassisDyno.vveh", "EngineFile": "Demo_Engine.veng", "GearboxFile": "Demo_Gearbox.vgbx", @@ -16,9 +17,10 @@ ], "Aux": [ { - "ID": "ALT", + "ID": "Alt", "Type": "Alternator", - "Path": "Demo_AuxAlternator.vaux" + "Path": "Demo_AuxAlternator.vaux", + "Technology": "" } ], "VACC": "Dummy.vacc", diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Demo_Engine.veng b/VectoCoreTest/TestData/MeasuredSpeed/Demo_Engine.veng index dfb154a3e4af94105bdb3c3f54f036453f0a0cae..163c7d926820aeceba4bbc51d6f71909b31b7411 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/Demo_Engine.veng +++ b/VectoCoreTest/TestData/MeasuredSpeed/Demo_Engine.veng @@ -1,24 +1,20 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (eed25180-b54a-46f8-a51e-2182e6c955c5)", - "Date": "07.10.2013 16:38:55", - "AppVersion": "1.4", - "FileVersion": "1.0" + "CreatedBy": "Michael Krisper", + "Date": "04.02.2016 16:38:55", + "AppVersion": "3.0.2", + "FileVersion": 3 }, "Body": { + "SavedInDeclMode": false, "ModelName": "Demo Engine", "Displacement": 6000.0, - "RatedPower": 185.0, - "RatedSpeed": 2200.0, - "IdlingSpeed": 600.0, - "Inertia": 2.8, - "FullLoadCurves": [ - { - "Path": "Demo_EngineFullload.vfld", - "Gears": "0 - 99" - } - ], - "FuelMap": "Demo_EngineFcmap.vmap", - "WHTCresults": "<NOFILE>" + "IdlingSpeed": 600.0, + "Inertia": 2.8, + "FullLoadCurve": "Demo_EngineFullload.vfld", + "FuelMap": "Demo_EngineFcmap.vmap", + "WHTC-Urban": 1, + "WHTC-Rural": 1, + "WHTC-Motorway": 1 } } \ No newline at end of file diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Demo_EngineFcmap.vmap b/VectoCoreTest/TestData/MeasuredSpeed/Demo_EngineFcmap.vmap new file mode 100644 index 0000000000000000000000000000000000000000..f7ad107b968d22126c862db3a0d24a78c7ba3f14 --- /dev/null +++ b/VectoCoreTest/TestData/MeasuredSpeed/Demo_EngineFcmap.vmap @@ -0,0 +1,186 @@ +engine speed [1/min],torque [Nm],fuel consumption [g/h] +600,-45,0 +600,0,767 +600,100,1759 +600,200,2890 +600,300,4185 +600,400,5404 +600,500,6535 +600,587,7442 +800,-55,0 +800,0,951 +800,100,2346 +800,200,3653 +800,300,5328 +800,400,6903 +800,500,8503 +800,600,10003 +800,700,11641 +800,756,12557 +1000,-63,0 +1000,0,1006 +1000,100,2932 +1000,200,4503 +1000,300,6472 +1000,400,8503 +1000,500,10472 +1000,600,12504 +1000,700,14514 +1000,800,16546 +1000,884,18243 +1200,-75,0 +1200,0,1467 +1200,100,3063 +1200,200,5359 +1200,300,7701 +1200,400,10082 +1200,500,12504 +1200,600,14902 +1200,700,17182 +1200,800,19569 +1200,900,21989 +1300,-81,0 +1300,0,1684 +1300,100,3302 +1300,200,5828 +1300,300,8367 +1300,400,10926 +1300,500,13533 +1300,600,16046 +1300,700,18591 +1300,800,21172 +1300,900,23733 +1400,-88,0 +1400,0,1943 +1400,100,3660 +1400,200,6304 +1400,300,9031 +1400,400,11783 +1400,500,14466 +1400,600,17180 +1400,700,20015 +1400,800,22828 +1400,900,25498 +1500,-93,0 +1500,0,2167 +1500,100,3963 +1500,200,6793 +1500,300,9721 +1500,400,12670 +1500,500,15534 +1500,600,18413 +1500,700,21467 +1500,800,24495 +1500,900,27363 +1600,-98,0 +1600,0,2391 +1600,100,4272 +1600,200,7257 +1600,300,10398 +1600,400,13535 +1600,500,16711 +1600,600,19835 +1600,700,22965 +1600,800,26115 +1600,900,29164 +1700,-101,0 +1700,0,2641 +1700,100,4578 +1700,200,7768 +1700,300,11114 +1700,400,14439 +1700,500,17759 +1700,600,21069 +1700,700,24380 +1700,800,27739 +1700,891,30707 +1800,-104,0 +1800,0,2890 +1800,100,4965 +1800,200,8233 +1800,300,11783 +1800,400,15307 +1800,500,18849 +1800,600,22267 +1800,700,25749 +1800,800,29389 +1800,882,32310 +1900,-108,0 +1900,0,3192 +1900,100,5416 +1900,200,8777 +1900,300,12531 +1900,400,16204 +1900,500,19993 +1900,600,23620 +1900,700,27255 +1900,800,31168 +1900,868,33790 +2000,-112,0 +2000,0,3496 +2000,100,5853 +2000,200,9345 +2000,300,13315 +2000,400,17188 +2000,500,21137 +2000,600,25058 +2000,700,28927 +2000,800,33026 +2000,854,35268 +2150,-119,117 +2150,0,4067 +2150,100,6490 +2150,200,10226 +2150,300,14474 +2150,400,18647 +2150,500,22797 +2150,600,27142 +2150,700,31624 +2150,800,36035 +2150,812,36568 +2200,-126,0 +2200,0,4247 +2200,100,6689 +2200,200,10535 +2200,300,14855 +2200,400,19151 +2200,500,23395 +2200,600,27834 +2200,700,32507 +2200,803,37265 +2300,-131,0 +2300,0,4523 +2300,100,7178 +2300,200,11221 +2300,300,15658 +2300,400,20237 +2300,500,24761 +2300,600,29476 +2300,700,34611 +2300,756,37404 +2400,-136,0 +2400,0,4945 +2400,100,7525 +2400,200,11830 +2400,300,16443 +2400,400,21307 +2400,500,26324 +2400,600,31334 +2400,706,37034 +2500,-141,0 +2500,0,5338 +2500,100,7731 +2500,200,12385 +2500,300,17231 +2500,400,22333 +2500,500,27940 +2500,645,35727 +2600,-146,0 +2600,0,5500 +2600,100,7796 +2600,200,12887 +2600,300,18021 +2600,400,23315 +2600,480,28351 +2700,-150,0 +2700,0,5900 \ No newline at end of file diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Demo_EngineFullload.vfld b/VectoCoreTest/TestData/MeasuredSpeed/Demo_EngineFullload.vfld index e93adaf3ccf25e0e17fcdcb376b3236c8f8b0ffb..b7d5289d1511d34bdb478b72f55b4df473bbb5c6 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/Demo_EngineFullload.vfld +++ b/VectoCoreTest/TestData/MeasuredSpeed/Demo_EngineFullload.vfld @@ -1,21 +1,18 @@ -c Demo full-load characteristics,,,,,, -c engine speed,max. torque,drag torque,PT1 time constant,,, -c [rpm],[Nm],[Nm],[s],,, -520,482.6264592,-123.0993328,1.928990229,,, -600,586.7143916,-100.9497236,1.869945135,,, -800,755.8572807,-79.49790953,1.666251293,,, -900,829.8572932,-72.34730387,1.564404372,,, -1000,883.771589,-66.62681933,1.462557451,,, -1100,893.285876,-73.78507102,1.36071053,,, -1200,898.571591,-79.75028222,1.258863609,,, -1600,898.571591,-103.4734685,0.851475925,,, -1800,881.6573025,-110.5960324,0.647782083,,, -2000,854.1715834,-118.1111784,0.444088241,,, -2150,811.885861,-129.5912747,0.31653907,,, -2200,803.0090311,-133.0700923,0.282872228,,, -2250,777.0001406,-136.394295,0.249205385,,, -2300,755.8572797,-138.9594907,0.215538543,,, -2400,706.1715562,-143.7692334,0.184375,,, -2500,644.8572594,-148.1941966,0.1640625,,, -2600,475.7143721,-154.7248671,0.1640625,,, -2740,0.105714146,-163.0669643,0.1640625,,, +520,482.6264592,-123.0993328,1.928990229 +600,586.7143916,-100.9497236,1.869945135 +800,755.8572807,-79.49790953,1.666251293 +900,829.8572932,-72.34730387,1.564404372 +1000,883.771589,-66.62681933,1.462557451 +1100,893.285876,-73.78507102,1.36071053 +1200,898.571591,-79.75028222,1.258863609 +1600,898.571591,-103.4734685,0.851475925 +1800,881.6573025,-110.5960324,0.647782083 +2000,854.1715834,-118.1111784,0.444088241 +2150,811.885861,-129.5912747,0.31653907 +2200,803.0090311,-133.0700923,0.282872228 +2250,777.0001406,-136.394295,0.249205385 +2300,755.8572797,-138.9594907,0.215538543 +2400,706.1715562,-143.7692334,0.184375 +2500,644.8572594,-148.1941966,0.1640625 +2600,475.7143721,-154.7248671,0.1640625 +2740,0.105714146,-163.0669643,0.1640625 diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Demo_Gearbox.vgbx b/VectoCoreTest/TestData/MeasuredSpeed/Demo_Gearbox.vgbx index 7fb093069d7dc77ea94985c2f426097e973ff8e4..a2016932b4575e6ccd1da66e87c2eca607ccddee 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/Demo_Gearbox.vgbx +++ b/VectoCoreTest/TestData/MeasuredSpeed/Demo_Gearbox.vgbx @@ -1,52 +1,63 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (eed25180-b54a-46f8-a51e-2182e6c955c5)", - "Date": "07.10.2013 16:38:57", - "AppVersion": "1.4", - "FileVersion": "1.0" + "CreatedBy": "Michael Krisper", + "Date": "04.02.2016 16:38:57", + "AppVersion": "3.0.2", + "FileVersion": 5 }, "Body": { + "SavedInDeclMode": false, "ModelName": "Demo", "Inertia": 0.0, "TracInt": 1.0, "Gears": [ { "Ratio": 4.3, - "Efficiency": "0.96", - "TCactive": false + "LossMap": "Axle.vtlm" }, { "Ratio": 6.696, - "Efficiency": "0.96", - "TCactive": false + "LossMap": "Indirect Gear.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" }, { "Ratio": 3.806, - "Efficiency": "0.96", - "TCactive": false + "LossMap": "Indirect Gear.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" }, { "Ratio": 2.289, - "Efficiency": "0.96", - "TCactive": false + "LossMap": "Indirect Gear.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" }, { "Ratio": 1.48, - "Efficiency": "0.96", - "TCactive": false + "LossMap": "Indirect Gear.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" }, { "Ratio": 1.0, - "Efficiency": "0.98", - "TCactive": false + "LossMap": "Direct Gear.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" }, { "Ratio": 0.728, - "Efficiency": "0.96", - "TCactive": false + "LossMap": "Indirect Gear.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" } ], - "ShiftPolygons": "ShiftPolygons.vgbs", "TqReserve": 10.0, "SkipGears": true, "ShiftTime": 3, @@ -58,7 +69,8 @@ "TorqueConverter": { "Enabled": false, "File": "<NOFILE>", - "RefRPM": 0.0 + "RefRPM": 0.0, + "Inertia": 0.0 } } } \ No newline at end of file diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Demo_Rigid.vcdb b/VectoCoreTest/TestData/MeasuredSpeed/Demo_Rigid.vcdb index a2f92eac86c19f19e1c1f99c45fc0b50300587a3..461e1f06e78ac4dc662066df9ff4504f44602112 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/Demo_Rigid.vcdb +++ b/VectoCoreTest/TestData/MeasuredSpeed/Demo_Rigid.vcdb @@ -1,6 +1,3 @@ -c Werte f�r Kastenwagen aus Mitschke BandI S33 -c beta,cd / cd0 -c [�],[-] 0,1 5,1.05 10,1.1 diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Demo_Vehicle_ChassisDyno.vveh b/VectoCoreTest/TestData/MeasuredSpeed/Demo_Vehicle_ChassisDyno.vveh index dadef62c017e9ce39b5ec28f065c945d8f0c7fb5..b3721dc1befe143a10f435a9a9cacc0cedd09f57 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/Demo_Vehicle_ChassisDyno.vveh +++ b/VectoCoreTest/TestData/MeasuredSpeed/Demo_Vehicle_ChassisDyno.vveh @@ -1,20 +1,22 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (eed25180-b54a-46f8-a51e-2182e6c955c5)", - "Date": "07.10.2013 16:39:02", - "AppVersion": "1.4", - "FileVersion": "1.0" + "CreatedBy": "Michael Krisper", + "Date": "04.02.2016 16:39:02", + "AppVersion": "3.0.2", + "FileVersion": 7 }, "Body": { + "SavedInDeclMode": false, "VehCat": "Rigid", "CurbWeight": 8862.0, "CurbWeightExtra": 0.0, "Loading": 0.0, "MassMax": 11990.0, - "Cd": 0.7005663, - "CrossSecArea": 8.8, + "CdA": 6.16498344, + "rdyn": 520.0, "WheelsInertia": 216.2271, "WheelsDiaEff": 0.848974, + "Rim": "-", "CdCorrMode": "Off", "CdCorrFile": "<NOFILE>", "Retarder": { @@ -26,12 +28,16 @@ "Type": "4x2", "Axles": [ { + "Inertia": 6.0, + "Wheels": "245/70 R19.5", "AxleWeightShare": 0.4, "TwinTyres": false, "RRCISO": 0.007144311, "FzISO": 20800.0 }, { + "Inertia": 6.0, + "Wheels": "245/70 R19.5", "AxleWeightShare": 0.6, "TwinTyres": false, "RRCISO": 0.008081271, diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Dummy.vacc b/VectoCoreTest/TestData/MeasuredSpeed/Dummy.vacc index 3b5d72ff4afb7b4021bfff6f38cdcb1bdfbcc4bd..0f78529ceacb1b8d4c90ac68c3a9de584cd656f9 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/Dummy.vacc +++ b/VectoCoreTest/TestData/MeasuredSpeed/Dummy.vacc @@ -1,4 +1,2 @@ -c v,a_desmax,a_brake -c [km/h],[m/s�],[m/s�] 0,100,-100 1000,100,-100 \ No newline at end of file diff --git a/VectoCoreTest/TestData/MeasuredSpeed/ShiftPolygons.vgbs b/VectoCoreTest/TestData/MeasuredSpeed/ShiftPolygons.vgbs index 1fdb01567ab43643df9e67423161b3d62b106310..ee9207c9cbbcce1101efc70e4c1f7596a9a39933 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/ShiftPolygons.vgbs +++ b/VectoCoreTest/TestData/MeasuredSpeed/ShiftPolygons.vgbs @@ -1,5 +1,3 @@ -c M,nDown,nUp -c [Nm],[rpm],[rpm] -111.3203,634.5779,1434.366 130.8344,712.1084,1552.703 384.7441,879.4111,1626.153 diff --git a/VectoCoreTest/TestData/MeasuredSpeed/TestTrackCycle_ActualSpeed.vdri b/VectoCoreTest/TestData/MeasuredSpeed/TestTrackCycle_ActualSpeed.vdri index 6024027b4bdb731352f989c22a41b5340ab14194..ecc684dce96b43d0d8edc766fff124fc79158321 100644 --- a/VectoCoreTest/TestData/MeasuredSpeed/TestTrackCycle_ActualSpeed.vdri +++ b/VectoCoreTest/TestData/MeasuredSpeed/TestTrackCycle_ActualSpeed.vdri @@ -1,5 +1,4 @@ <t>,<v>,<grad>,<n>,<vair_res>,<vair_beta>,<Aux_Alt>,<Padd> -c [s],[km/h],[%],[1/min],[km/h],[�],[kW],[kW] 1,0,0,594,0,0,0.532,2.007686806 2,0,0,602.25,0,0,0.588,3.222867975 3,0,0,600,0,0,0.644,3.215345965 diff --git a/VectoCoreTest/VectoCoreTest.csproj b/VectoCoreTest/VectoCoreTest.csproj index ab9ef85c803eac83a9c343a4f0c5c7475c169f5d..aed0bdc87a8e4697b1db5156a1474fae6355f0a5 100644 --- a/VectoCoreTest/VectoCoreTest.csproj +++ b/VectoCoreTest/VectoCoreTest.csproj @@ -814,6 +814,9 @@ <None Include="TestData\MeasuredSpeed\ChassisDyno_Urban.vdri"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="TestData\MeasuredSpeed\Demo_AuxAlternator.vaux"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> <None Include="TestData\MeasuredSpeed\Demo_ChassisDyno.v2.vsum"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> @@ -823,6 +826,9 @@ <None Include="TestData\MeasuredSpeed\Demo_Engine.veng"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="TestData\MeasuredSpeed\Demo_EngineFcmap.vmap"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> <None Include="TestData\MeasuredSpeed\Demo_EngineFullload.vfld"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None>