diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs index 7d2f64e0de6e6b511db0b0a8a1f1f86bf267409b..92af6aeb2f46cb1d49307533f9de0668bbb3fc1c 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs @@ -177,7 +177,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl return true; } // Emergency Upshift: if higher than engine rated speed - if (inAngularVelocity.IsGreaterOrEqual(ModelData.Gears[gear].MaxSpeed ?? DataBus.EngineRatedSpeed)) { + if (inAngularVelocity.IsGreaterOrEqual(VectoMath.Min(ModelData.Gears[gear].MaxSpeed, DataBus.EngineRatedSpeed))) { // check if upshift is possible if (!ModelData.Gears.ContainsKey(gear + 1)) { return false; diff --git a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs index d085fb2100bcb0a2251b65ff391b9ddf7481481a..b59640fe244d84cc8f9bef9fbac868772c048d16 100644 --- a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs +++ b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs @@ -64,6 +64,9 @@ namespace TUGraz.VectoCore.Tests.Integration const string EngineSpeedLimitJobDecl = @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_engineSpeedlimit\Class2_RigidTruck_DECL.vecto"; + const string EngineSpeedLimitJobATDecl = + @"TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\TruckAT.vecto"; + private const string DeclarationVehicle9GearsFord = @"TestData\Integration\DeclarationMode\EngineSpeedTooHigh\vecto_vehicle-sample_9gears.xml"; @@ -249,6 +252,28 @@ namespace TUGraz.VectoCore.Tests.Integration Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException))); } + [TestCase(EngineSpeedLimitJobATDecl)] + public void EngineSpeedSpeedLimitAT(string jobFile) + { + var inputData = JSONInputDataFactory.ReadJsonJob(jobFile); + var fileWriter = new FileOutputWriter(jobFile); + var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, fileWriter) { + WriteModalResults = true, + Validate = false + }; + var sumData = new SummaryDataContainer(fileWriter); + var jobContainer = new JobContainer(sumData); + jobContainer.AddRuns(factory); + + //var runs = jobContainer.Runs; + //runs[2].Run.Run(); + + jobContainer.Execute(); + jobContainer.WaitFinished(); + + Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException))); + } + [TestCase(DeclarationVehicle9GearsFord)] public void EngineSpeedTooHigh9SpeedGearbox(string jobFile) { @@ -270,5 +295,7 @@ namespace TUGraz.VectoCore.Tests.Integration Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException))); } + + } } diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/325kW.vmap b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/325kW.vmap new file mode 100644 index 0000000000000000000000000000000000000000..55a9eb325f3a013676613c11c956e312f3cc3282 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/325kW.vmap @@ -0,0 +1,142 @@ +engine speed [rpm], torque [Nm], fuel consumption [g/h] +500,-135.5,0 +500,0,1355 +500,213.4,3412.291 +500,426.8,5830.1 +500,640.2,8316.426 +500,853.6,10439.87 +500,1067,12823.69 +500,1188,14228.79 +500,1401.4,16628.66 +600,-138,0 +600,0,1355 +600,213.4,3412.291 +600,426.8,5830.1 +600,640.2,8316.426 +600,853.6,10439.87 +600,1067,12823.69 +600,1188,14228.79 +600,1401.4,16628.66 +751,-141.775,0 +750.9,0,1649.255 +750.9,213.4,4157.795 +750.9,426.8,7149.494 +750.9,640.2,10037.08 +750.9,853.6,12957.07 +750.9,1067,16055.22 +750.9,1280.4,19231.36 +750.9,1493.8,22400.17 +750.9,1544.879,23213.92 +751,1758.279,26392.93 +902,-147.59,0 +901.8,0,2210.735 +901.8,213.4,5204.867 +901.8,426.8,8515.462 +901.8,640.2,11804.75 +901.8,853.6,15410.55 +901.8,1067,19081.7 +901.8,1280.4,22742.96 +901.8,1493.8,26543.87 +901.8,1707.2,30534.68 +901.8,1901.757,34352.75 +902,2115.157,38403.27 +1053,-155.445,0 +1052.7,0,2768.035 +1052.7,213.4,6228.407 +1052.7,426.8,9836.041 +1052.7,640.2,13624.5 +1052.7,853.6,17854.95 +1052.7,1067,22072.71 +1052.7,1280.4,26161.13 +1052.7,1493.8,30525.55 +1052.7,1707.2,35019.18 +1052.7,1920.6,39913.3 +1052.7,2134,45438.16 +1053,2347.4,50542.53 +1204,-165.44,0 +1203.6,0,3086.704 +1203.6,213.4,6943.027 +1203.6,426.8,11040.37 +1203.6,640.2,15504.65 +1203.6,853.6,20335.89 +1203.6,1067,25176.6 +1203.6,1280.4,29782.22 +1203.6,1493.8,34642.24 +1203.6,1707.2,39786.14 +1203.6,1920.6,45254.8 +1203.6,2134,51129.03 +1204,2347.4,56732.88 +1367,-183.37,0 +1367.1,0,3845.344 +1367.1,213.4,7981.742 +1367.1,426.8,12796.69 +1367.1,640.2,17789.2 +1367.1,853.6,22854.21 +1367.1,1067,28302.84 +1367.1,1280.4,33739.91 +1367.1,1493.8,39393.87 +1367.1,1707.2,45836.33 +1367.1,1920.6,52078.71 +1367.1,2134,58296.41 +1367,2347.4,64530.56 +1490,-200.5,0 +1489.6,0,4373.424 +1489.6,213.4,8861.484 +1489.6,426.8,14090.86 +1489.6,640.2,19518.29 +1489.6,853.6,25092.8 +1489.6,1067,30873.69 +1489.6,1280.4,36865.42 +1489.6,1493.8,43095.57 +1489.6,1707.2,50249.81 +1489.6,1920.6,57035.25 +1489.6,2041.712,60609.5 +1490,2255.112,67311.83 +1612,-218.62,0 +1612.2,0,4904.015 +1612.2,213.4,9810.482 +1612.2,426.8,15403.9 +1612.2,640.2,21301.35 +1612.2,853.6,27492.32 +1612.2,1067,33580.96 +1612.2,1280.4,40114.61 +1612.2,1493.8,46914.77 +1612.2,1707.2,54666.14 +1612.2,1915.434,61862.91 +1612,2128.834,69491.99 +1735,-235.225,0 +1734.7,0,5586.953 +1734.7,213.4,11041.15 +1734.7,426.8,16949.24 +1734.7,640.2,23500.23 +1734.7,853.6,30159.59 +1734.7,1067,36741.18 +1734.7,1280.4,43923.85 +1734.7,1493.8,51295.21 +1734.7,1707.2,59469.31 +1734.7,1789.259,62731.31 +1735,2002.659,70935.23 +1857,-253.69,0 +1857.3,0,6673.839 +1857.3,213.4,12518.56 +1857.3,426.8,18687.88 +1857.3,640.2,25652.39 +1857.3,853.6,33003.08 +1857.3,1067,40438.09 +1857.3,1280.4,48117.52 +1857.3,1493.8,55848.59 +1857.3,1587.631,59434.17 +1857,1801.031,67215.39 +1957,-270.69,0 +1957.3,0,6673.839 +1957.3,213.4,12518.56 +1957.3,426.8,18687.88 +1957.3,640.2,25652.39 +1957.3,853.6,33003.08 +1957.3,1067,40438.09 +1957.3,1280.4,48117.52 +1957.3,1493.8,55848.59 +1957.3,1587.631,59434.17 +1957,1801.031,67215.39 +3000,-200,0 +3000,2000,67215.39 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Axle_4x2.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Axle_4x2.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..1353f24059ae4c26ad9d9ba8cf62226fa6a9ef20 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Axle_4x2.vtlm @@ -0,0 +1,481 @@ +Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm] +0,-4535.8357,143.4491698 +0,-3781.121409,120.7993009 +0,-3026.407119,98.14943196 +0,-2649.189787,86.96431151 +0,-2271.692828,75.49956305 +0,-1894.475497,64.3144426 +0,-1516.978537,52.84969413 +0,-1215.204672,43.90159777 +0,-913.4308074,34.95350141 +0,-611.3773144,25.72577704 +0,-309.6034493,16.77768068 +0,-234.1599831,14.54065659 +0,-158.7165168,12.3036325 +0,-83.27305057,10.06660841 +0,-45.55131744,8.948096361 +0,-7.549956305,7.549956305 +0,7.549956305,7.549956305 +0,45.55131744,8.948096361 +0,83.27305057,10.06660841 +0,158.7165168,12.3036325 +0,234.1599831,14.54065659 +0,309.6034493,16.77768068 +0,611.3773144,25.72577704 +0,913.4308074,34.95350141 +0,1215.204672,43.90159777 +0,1516.978537,52.84969413 +0,1894.475497,64.3144426 +0,2271.692828,75.49956305 +0,2649.189787,86.96431151 +0,3026.407119,98.14943196 +0,3781.121409,120.7993009 +0,4535.8357,143.4491698 +341.5,-4535.8357,143.4491698 +341.5,-3781.121409,120.7993009 +341.5,-3026.407119,98.14943196 +341.5,-2649.189787,86.96431151 +341.5,-2271.692828,75.49956305 +341.5,-1894.475497,64.3144426 +341.5,-1516.978537,52.84969413 +341.5,-1215.204672,43.90159777 +341.5,-913.4308074,34.95350141 +341.5,-611.3773144,25.72577704 +341.5,-309.6034493,16.77768068 +341.5,-234.1599831,14.54065659 +341.5,-158.7165168,12.3036325 +341.5,-83.27305057,10.06660841 +341.5,-45.55131744,8.948096361 +341.5,-7.549956305,7.549956305 +341.5,7.549956305,7.549956305 +341.5,45.55131744,8.948096361 +341.5,83.27305057,10.06660841 +341.5,158.7165168,12.3036325 +341.5,234.1599831,14.54065659 +341.5,309.6034493,16.77768068 +341.5,611.3773144,25.72577704 +341.5,913.4308074,34.95350141 +341.5,1215.204672,43.90159777 +341.5,1516.978537,52.84969413 +341.5,1894.475497,64.3144426 +341.5,2271.692828,75.49956305 +341.5,2649.189787,86.96431151 +341.5,3026.407119,98.14943196 +341.5,3781.121409,120.7993009 +341.5,4535.8357,143.4491698 +683,-4524.510765,132.1242353 +683,-3771.893685,111.5715765 +683,-3019.276604,91.01891767 +683,-2642.898157,80.67268126 +683,-2266.659524,70.46625884 +683,-1890.420891,60.25983643 +683,-1514.042443,49.91360002 +683,-1212.967648,41.66457368 +683,-911.8928534,33.41554735 +683,-610.9578724,25.30633502 +683,-309.8830774,17.05730869 +683,-234.5794251,14.9600986 +683,-159.2757729,12.86288852 +683,-84.11193461,10.90549244 +683,-46.39020148,9.786980395 +683,-8.808282356,8.808282356 +683,8.808282356,8.808282356 +683,46.39020148,9.786980395 +683,84.11193461,10.90549244 +683,159.2757729,12.86288852 +683,234.5794251,14.9600986 +683,309.8830774,17.05730869 +683,610.9578724,25.30633502 +683,911.8928534,33.41554735 +683,1212.967648,41.66457368 +683,1514.042443,49.91360002 +683,1890.420891,60.25983643 +683,2266.659524,70.46625884 +683,2642.898157,80.67268126 +683,3019.276604,91.01891767 +683,3771.893685,111.5715765 +683,4524.510765,132.1242353 +1024.5,-4514.397552,122.0110223 +1024.5,-3763.691263,103.3691548 +1024.5,-3012.984974,84.72728742 +1024.5,-2637.53862,75.31314437 +1024.5,-2262.185476,65.99221066 +1024.5,-1886.832331,56.67127695 +1024.5,-1511.479187,47.35034324 +1024.5,-1211.103462,39.80038694 +1024.5,-910.820946,32.34363997 +1024.5,-610.5384303,24.886893 +1024.5,-310.2559147,17.43014604 +1024.5,-235.1852858,15.5659593 +1024.5,-160.1146569,13.70177255 +1024.5,-85.04402798,11.83758581 +1024.5,-47.50871352,10.90549244 +1024.5,-9.973399069,9.973399069 +1024.5,9.973399069,9.973399069 +1024.5,47.50871352,10.90549244 +1024.5,85.04402798,11.83758581 +1024.5,160.1146569,13.70177255 +1024.5,235.1852858,15.5659593 +1024.5,310.2559147,17.43014604 +1024.5,610.5384303,24.886893 +1024.5,910.820946,32.34363997 +1024.5,1211.103462,39.80038694 +1024.5,1511.479187,47.35034324 +1024.5,1886.832331,56.67127695 +1024.5,2262.185476,65.99221066 +1024.5,2637.53862,75.31314437 +1024.5,3012.984974,84.72728742 +1024.5,3763.691263,103.3691548 +1024.5,4514.397552,122.0110223 +1366,-4505.915503,113.5289726 +1366,-3756.793772,96.47166389 +1366,-3007.602135,79.3444482 +1366,-2633.04127,70.81579386 +1366,-2258.480405,62.28713951 +1366,-1883.919539,53.75848517 +1366,-1509.358674,45.22983083 +1366,-1209.682019,38.37894455 +1366,-910.0053643,31.52805827 +1366,-610.3986163,24.747079 +1366,-310.7219614,17.89619272 +1366,-235.8377512,16.21842465 +1366,-160.8836339,14.47074958 +1366,-85.99942368,12.79298152 +1366,-48.48741156,11.88419048 +1366,-11.04530645,11.04530645 +1366,11.04530645,11.04530645 +1366,48.48741156,11.88419048 +1366,85.99942368,12.79298152 +1366,160.8836339,14.47074958 +1366,235.8377512,16.21842465 +1366,310.7219614,17.89619272 +1366,610.3986163,24.747079 +1366,910.0053643,31.52805827 +1366,1209.682019,38.37894455 +1366,1509.358674,45.22983083 +1366,1883.919539,53.75848517 +1366,2258.480405,62.28713951 +1366,2633.04127,70.81579386 +1366,3007.602135,79.3444482 +1366,3756.793772,96.47166389 +1366,4505.915503,113.5289726 +1707.5,-4499.036654,106.6501235 +1707.5,-3751.257138,90.93502927 +1707.5,-3003.421696,75.16400943 +1707.5,-2629.503975,67.27849952 +1707.5,-2255.586255,59.3929896 +1707.5,-1881.668534,51.50747968 +1707.5,-1507.806739,43.67789536 +1707.5,-1208.661377,37.35830231 +1707.5,-909.5160153,31.03870925 +1707.5,-610.4265791,24.7750418 +1707.5,-311.2812174,18.45544875 +1707.5,-236.5088584,16.88953188 +1707.5,-161.7364994,15.32361502 +1707.5,-86.90821472,13.70177255 +1707.5,-49.5220352,12.91881412 +1707.5,-12.13585569,12.13585569 +1707.5,12.13585569,12.13585569 +1707.5,49.5220352,12.91881412 +1707.5,86.90821472,13.70177255 +1707.5,161.7364994,15.32361502 +1707.5,236.5088584,16.88953188 +1707.5,311.2812174,18.45544875 +1707.5,610.4265791,24.7750418 +1707.5,909.5160153,31.03870925 +1707.5,1208.661377,37.35830231 +1707.5,1507.806739,43.67789536 +1707.5,1881.668534,51.50747968 +1707.5,2255.586255,59.3929896 +1707.5,2629.503975,67.27849952 +1707.5,3003.421696,75.16400943 +1707.5,3751.257138,90.93502927 +1707.5,4499.036654,106.6501235 +2049,-4493.751684,101.3651541 +2049,-3747.006792,86.6846835 +2049,-3000.215295,71.95760824 +2049,-2626.866151,64.64067528 +2049,-2253.470403,57.27713765 +2049,-1880.121259,49.96020468 +2049,-1506.72551,42.59666705 +2049,-1208.027553,36.72447882 +2049,-909.3295966,30.85229058 +2049,-610.6316397,24.98010234 +2049,-311.9336828,19.1079141 +2049,-237.2358912,17.61656471 +2049,-162.5847043,16.17181999 +2049,-87.88691276,14.68047059 +2049,-50.53801698,13.9347959 +2049,-13.23572587,13.23572587 +2049,13.23572587,13.23572587 +2049,50.53801698,13.9347959 +2049,87.88691276,14.68047059 +2049,162.5847043,16.17181999 +2049,237.2358912,17.61656471 +2049,311.9336828,19.1079141 +2049,610.6316397,24.98010234 +2049,909.3295966,30.85229058 +2049,1208.027553,36.72447882 +2049,1506.72551,42.59666705 +2049,1880.121259,49.96020468 +2049,2253.470403,57.27713765 +2049,2626.866151,64.64067528 +2049,3000.215295,71.95760824 +2049,3747.006792,86.6846835 +2049,4493.751684,101.3651541 +2390.5,-4489.776972,97.39044165 +2390.5,-3743.85099,83.52888166 +2390.5,-2997.925008,69.66732167 +2390.5,-2624.981991,62.7565151 +2390.5,-2251.999027,55.80576168 +2390.5,-1879.056009,48.89495512 +2390.5,-1506.073045,41.94420169 +2390.5,-1207.73461,36.43153519 +2390.5,-909.3562278,30.87892182 +2390.5,-610.9778458,25.32630845 +2390.5,-312.5994638,19.77369508 +2390.5,-238.0348284,18.41550189 +2390.5,-163.4302462,17.01736183 +2390.5,-88.82566394,15.61922177 +2390.5,-51.54334626,14.94012517 +2390.5,-14.22108172,14.22108172 +2390.5,14.22108172,14.22108172 +2390.5,51.54334626,14.94012517 +2390.5,88.82566394,15.61922177 +2390.5,163.4302462,17.01736183 +2390.5,238.0348284,18.41550189 +2390.5,312.5994638,19.77369508 +2390.5,610.9778458,25.32630845 +2390.5,909.3562278,30.87892182 +2390.5,1207.73461,36.43153519 +2390.5,1506.073045,41.94420169 +2390.5,1879.056009,48.89495512 +2390.5,2251.999027,55.80576168 +2390.5,2624.981991,62.7565151 +2390.5,2997.925008,69.66732167 +2390.5,3743.85099,83.52888166 +2390.5,4489.776972,97.39044165 +2732,-4486.970705,94.58417482 +2732,-3741.658906,81.33679778 +2732,-2996.382061,68.12437425 +2732,-2623.743638,61.51816248 +2732,-2251.105216,54.91195072 +2732,-1878.466793,48.30573895 +2732,-1505.793417,41.66457368 +2732,-1207.68967,36.38659497 +2732,-909.5859223,31.10861626 +2732,-611.4472214,25.79568404 +2732,-313.343474,20.51770533 +2732,-238.8087988,19.18947227 +2732,-164.2741236,17.86123922 +2732,-89.73944833,16.53300617 +2732,-52.50706423,15.90384314 +2732,-15.23972662,15.23972662 +2732,15.23972662,15.23972662 +2732,52.50706423,15.90384314 +2732,89.73944833,16.53300617 +2732,164.2741236,17.86123922 +2732,238.8087988,19.18947227 +2732,313.343474,20.51770533 +2732,611.4472214,25.79568404 +2732,909.5859223,31.10861626 +2732,1207.68967,36.38659497 +2732,1505.793417,41.66457368 +2732,1878.466793,48.30573895 +2732,2251.105216,54.91195072 +2732,2623.743638,61.51816248 +2732,2996.382061,68.12437425 +2732,3741.658906,81.33679778 +2732,4486.970705,94.58417482 +3073.5,-4485.036611,92.65008107 +3073.5,-3740.23358,79.91147167 +3073.5,-2995.430549,67.17286227 +3073.5,-2622.997964,60.77248779 +3073.5,-2250.596448,54.40318309 +3073.5,-1878.194933,48.03387838 +3073.5,-1505.793417,41.66457368 +3073.5,-1207.872205,36.56912992 +3073.5,-909.9509922,31.47368616 +3073.5,-612.0297797,26.3782424 +3073.5,-314.1085673,21.28279864 +3073.5,-239.6282642,20.0089377 +3073.5,-165.1479611,18.73507676 +3073.5,-90.66765798,17.46121582 +3073.5,-53.41197154,16.80875046 +3073.5,-16.1562851,16.1562851 +3073.5,16.1562851,16.1562851 +3073.5,53.41197154,16.80875046 +3073.5,90.66765798,17.46121582 +3073.5,165.1479611,18.73507676 +3073.5,239.6282642,20.0089377 +3073.5,314.1085673,21.28279864 +3073.5,612.0297797,26.3782424 +3073.5,909.9509922,31.47368616 +3073.5,1207.872205,36.56912992 +3073.5,1505.793417,41.66457368 +3073.5,1878.194933,48.03387838 +3073.5,2250.596448,54.40318309 +3073.5,2622.997964,60.77248779 +3073.5,2995.430549,67.17286227 +3073.5,3740.23358,79.91147167 +3073.5,4485.036611,92.65008107 +3415,-4483.796927,91.41039689 +3415,-3739.344984,79.02287599 +3415,-2994.893042,66.63535509 +3415,-2622.653089,60.42761324 +3415,-2250.441099,54.24783419 +3415,-1878.201147,48.04009234 +3415,-1505.989157,41.86031329 +3415,-1208.213972,36.91089749 +3415,-910.4108249,31.93351889 +3415,-612.6356404,26.98410309 +3415,-314.860456,22.03468729 +3415,-240.4236505,20.80432404 +3415,-165.9588823,19.54599799 +3415,-91.52207691,18.31563474 +3415,-54.3036742,17.70045311 +3415,-17.08527149,17.08527149 +3415,17.08527149,17.08527149 +3415,54.3036742,17.70045311 +3415,91.52207691,18.31563474 +3415,165.9588823,19.54599799 +3415,240.4236505,20.80432404 +3415,314.860456,22.03468729 +3415,612.6356404,26.98410309 +3415,910.4108249,31.93351889 +3415,1208.213972,36.91089749 +3415,1505.989157,41.86031329 +3415,1878.201147,48.04009234 +3415,2250.441099,54.24783419 +3415,2622.653089,60.42761324 +3415,2994.893042,66.63535509 +3415,3739.344984,79.02287599 +3415,4483.796927,91.41039689 +3756.5,-4483.087689,90.70115857 +3756.5,-3738.89758,78.57547117 +3756.5,-2994.70747,66.44978377 +3756.5,-2622.599706,60.37422971 +3756.5,-2250.517361,54.32409637 +3756.5,-1878.409596,48.24854231 +3756.5,-1506.327252,42.19840898 +3756.5,-1208.646125,37.34304987 +3756.5,-910.9649968,32.48769077 +3756.5,-613.283869,27.63233166 +3756.5,-315.6027412,22.77697256 +3756.5,-241.2015248,21.58219833 +3756.5,-166.7748877,20.36200337 +3756.5,-92.34825058,19.14180841 +3756.5,-55.13493201,18.53171093 +3756.5,-17.92161345,17.92161345 +3756.5,17.92161345,17.92161345 +3756.5,55.13493201,18.53171093 +3756.5,92.34825058,19.14180841 +3756.5,166.7748877,20.36200337 +3756.5,241.2015248,21.58219833 +3756.5,315.6027412,22.77697256 +3756.5,613.283869,27.63233166 +3756.5,910.9649968,32.48769077 +3756.5,1208.646125,37.34304987 +3756.5,1506.327252,42.19840898 +3756.5,1878.409596,48.24854231 +3756.5,2250.517361,54.32409637 +3756.5,2622.599706,60.37422971 +3756.5,2994.70747,66.44978377 +3756.5,3738.89758,78.57547117 +3756.5,4483.087689,90.70115857 +4098,-4482.72968,90.34314998 +4098,-3738.734463,78.41235483 +4098,-2994.739246,66.48155968 +4098,-2622.741638,60.51616211 +4098,-2250.74403,54.55076454 +4098,-1878.746421,48.58536696 +4098,-1506.748813,42.61996939 +4098,-1209.146066,37.84299086 +4098,-911.5433183,33.06601233 +4098,-613.9405711,28.28903381 +4098,-316.337824,23.51205528 +4098,-241.9429627,22.32363623 +4098,-167.5481015,21.13521719 +4098,-93.15324031,19.94679814 +4098,-55.94415853,19.34093745 +4098,-18.73507676,18.73507676 +4098,18.73507676,18.73507676 +4098,55.94415853,19.34093745 +4098,93.15324031,19.94679814 +4098,167.5481015,21.13521719 +4098,241.9429627,22.32363623 +4098,316.337824,23.51205528 +4098,613.9405711,28.28903381 +4098,911.5433183,33.06601233 +4098,1209.146066,37.84299086 +4098,1506.748813,42.61996939 +4098,1878.746421,48.58536696 +4098,2250.74403,54.55076454 +4098,2622.741638,60.51616211 +4098,2994.739246,66.48155968 +4098,3738.734463,78.41235483 +4098,4482.72968,90.34314998 +4439.5,-4482.663358,90.27682795 +4439.5,-3738.81154,78.48943178 +4439.5,-2994.938212,66.68052577 +4439.5,-2623.012304,60.78682768 +4439.5,-2251.086395,54.8931296 +4439.5,-1879.160486,48.99943152 +4439.5,-1507.234577,43.10573343 +4439.5,-1209.676642,38.37356709 +4439.5,-912.1402166,33.66291059 +4439.5,-614.6037914,28.95225409 +4439.5,-317.0458564,24.22008775 +4439.5,-242.6778825,23.05855601 +4439.5,-168.2883988,21.87551442 +4439.5,-93.898915,20.69247284 +4439.5,-56.71492805,20.11170697 +4439.5,-19.50943125,19.50943125 +4439.5,19.50943125,19.50943125 +4439.5,56.71492805,20.11170697 +4439.5,93.898915,20.69247284 +4439.5,168.2883988,21.87551442 +4439.5,242.6778825,23.05855601 +4439.5,317.0458564,24.22008775 +4439.5,614.6037914,28.95225409 +4439.5,912.1402166,33.66291059 +4439.5,1209.676642,38.37356709 +4439.5,1507.234577,43.10573343 +4439.5,1879.160486,48.99943152 +4439.5,2251.086395,54.8931296 +4439.5,2623.012304,60.78682768 +4439.5,2994.938212,66.68052577 +4439.5,3738.81154,78.48943178 +4439.5,4482.663358,90.27682795 +4781,-4482.766298,90.37976793 +4781,-3739.01742,78.69531175 +4781,-2995.248569,66.99088213 +4781,-2623.384117,61.15864075 +4781,-2251.499691,55.30642595 +4781,-1879.635239,49.47418457 +4781,-1507.750813,43.62196976 +4781,-1210.251262,38.94818729 +4781,-912.7517108,34.27440481 +4781,-615.2321862,29.58064891 +4781,-317.7326351,24.90686643 +4781,-243.367734,23.74840753 +4781,-168.9828595,22.5699752 +4781,-94.61795846,21.41151629 +4781,-57.4155345,20.81231341 +4781,-20.23308396,20.23308396 +4781,20.23308396,20.23308396 +4781,57.4155345,20.81231341 +4781,94.61795846,21.41151629 +4781,168.9828595,22.5699752 +4781,243.367734,23.74840753 +4781,317.7326351,24.90686643 +4781,615.2321862,29.58064891 +4781,912.7517108,34.27440481 +4781,1210.251262,38.94818729 +4781,1507.750813,43.62196976 +4781,1879.635239,49.47418457 +4781,2251.499691,55.30642595 +4781,2623.384117,61.15864075 +4781,2995.248569,66.99088213 +4781,3739.01742,78.69531175 +4781,4482.766298,90.37976793 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Engine.veng b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Engine.veng new file mode 100644 index 0000000000000000000000000000000000000000..431c0200ac50ed0d8ccb87cfb58694518c213e64 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Engine.veng @@ -0,0 +1,27 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2018-08-03T10:29:59.6929954Z", + "AppVersion": "3", + "FileVersion": 4 + }, + "Body": { + "SavedInDeclMode": true, + "ModelName": "SomeEngine", + "Displacement": "7698", + "IdlingSpeed": 550.0, + "Inertia": 3.78846, + "WHTC-Urban": 1.0, + "WHTC-Rural": 1.0, + "WHTC-Motorway": 1.0, + "WHTC-Engineering": 0.0, + "ColdHotBalancingFactor": 0.0, + "CFRegPer": 0.5, + "RatedPower": 210000.0, + "RatedSpeed": 2100.0, + "MaxTorque": 1100.0, + "FuelType": "DieselCI", + "FullLoadCurve": "Engine.vfld", + "FuelMap": "325kW.vmap" + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Engine.vfld b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Engine.vfld new file mode 100644 index 0000000000000000000000000000000000000000..4f97e877f1f4524decf0fc92cb8aa59c17615837 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Engine.vfld @@ -0,0 +1,265 @@ +engine speed [1/min],full load torque [Nm],motoring torque [Nm],PT1 [s] +542,573.42,-82.7,0.6 +550,573.42,-82.7,0.6 +558,587.16,-83.04,0.6 +566,608.91,-83.37,0.6 +574,636.02,-83.71,0.6 +582,659.27,-84.05,0.6 +590,672.45,-84.38,0.6 +598,677.01,-84.72,0.6 +606,680.26,-85.05,0.6 +614,684.43,-85.39,0.6 +622,681.54,-85.72,0.6 +630,677.4,-86.06,0.6 +638,688.56,-86.4,0.6 +646,695,-86.73,0.6 +654,698.57,-87.07,0.6 +662,708.83,-87.4,0.6 +670,723.88,-87.74,0.6 +678,728.5,-88.07,0.6 +686,741.12,-88.41,0.6 +694,762.74,-88.75,0.6 +702,772.64,-89.08,0.6 +710,778.16,-89.42,0.6 +718,791.47,-89.74,0.6 +726,798.43,-90.02,0.6 +734,811.08,-90.24,0.6 +742,823.48,-90.45,0.6 +750,832.52,-90.67,0.6 +758,839.88,-90.88,0.6 +766,854.96,-91.1,0.6 +774,862.1,-91.32,0.6 +782,864.82,-91.53,0.6 +790,881.1,-91.75,0.6 +798,890.83,-91.97,0.6 +806,896.79,-92.18,0.6 +814,913.72,-92.4,0.6 +822,917.97,-92.62,0.6 +830,924.3,-92.83,0.6 +838,940.57,-93.05,0.6 +846,952.38,-93.26,0.6 +854,962.2,-93.48,0.6 +862,976.34,-93.7,0.6 +870,984.61,-93.91,0.6 +878,994.81,-94.13,0.6 +886,1009.54,-94.35,0.6 +894,1024.3,-94.59,0.6 +902,1029.56,-94.87,0.6 +910,1038.9,-95.17,0.6 +918,1054.23,-95.46,0.6 +926,1055.87,-95.76,0.6 +934,1063.05,-96.05,0.6 +942,1071.87,-96.35,0.6 +950,1071.58,-96.64,0.6 +958,1081.08,-96.94,0.6 +966,1081.33,-97.23,0.6 +974,1070.98,-97.53,0.6 +982,1076.96,-97.82,0.6 +990,1077.14,-98.12,0.6 +998,1072.14,-98.41,0.6 +1006,1078.68,-98.71,0.6 +1014,1080.33,-99,0.6 +1022,1075.34,-99.3,0.6 +1030,1072.28,-99.59,0.6 +1038,1072.46,-99.89,0.6 +1046,1073.67,-100.19,0.6 +1054,1073.78,-100.48,0.6 +1062,1074.04,-100.8,0.6 +1070,1074.12,-101.17,0.6 +1078,1072.76,-101.6,0.6 +1086,1079.94,-102.03,0.6 +1094,1077.88,-102.46,0.6 +1102,1075.23,-102.89,0.6 +1110,1071.48,-103.32,0.6 +1118,1067.57,-103.75,0.6 +1126,1068.09,-104.18,0.6 +1134,1069.33,-104.61,0.6 +1142,1061.71,-105.04,0.6 +1150,1063.71,-105.47,0.6 +1158,1058.02,-105.9,0.6 +1166,1051.83,-106.33,0.6 +1174,1049.5,-106.76,0.6 +1182,1053.94,-107.19,0.6 +1190,1057.1,-107.61,0.6 +1198,1059.07,-108.04,0.6 +1206,1056.24,-108.47,0.6 +1214,1059.24,-108.9,0.6 +1222,1060.8,-109.33,0.6 +1230,1055.37,-109.76,0.6 +1238,1065.28,-110.26,0.6 +1246,1063.26,-110.86,0.6 +1254,1067.3,-111.47,0.6 +1262,1067.17,-112.08,0.6 +1270,1063.35,-112.69,0.6 +1278,1062.51,-113.3,0.6 +1286,1058.91,-113.91,0.6 +1294,1059.91,-114.51,0.6 +1302,1060.86,-115.12,0.6 +1310,1064.46,-115.73,0.6 +1318,1063.62,-116.34,0.6 +1326,1066.05,-116.95,0.6 +1334,1067.84,-117.56,0.6 +1342,1066.93,-118.16,0.6 +1350,1065.65,-118.77,0.6 +1358,1066,-119.38,0.6 +1366,1061.83,-119.99,0.6 +1374,1064.12,-120.6,0.6 +1382,1067.66,-121.21,0.6 +1390,1062.94,-121.81,0.6 +1398,1066.2,-122.42,0.6 +1406,1062.44,-123,0.6 +1414,1062.74,-123.52,0.6 +1422,1070.6,-124.01,0.6 +1430,1070.71,-124.49,0.6 +1438,1073.41,-124.98,0.6 +1446,1066.86,-125.47,0.6 +1454,1066.64,-125.95,0.6 +1462,1065.32,-126.44,0.6 +1470,1064.35,-126.93,0.6 +1478,1066.16,-127.41,0.6 +1486,1065.89,-127.9,0.6 +1494,1064.91,-128.38,0.6 +1502,1058.51,-128.87,0.6 +1510,1063.37,-129.36,0.6 +1518,1065.51,-129.84,0.6 +1526,1064.33,-130.33,0.6 +1534,1065.56,-130.81,0.6 +1542,1067.87,-131.3,0.6 +1550,1068.55,-131.79,0.6 +1558,1071.38,-132.27,0.6 +1566,1070.69,-132.76,0.6 +1574,1068.64,-133.24,0.6 +1582,1071.39,-133.73,0.6 +1590,1074.48,-134.22,0.6 +1598,1073.12,-134.7,0.6 +1606,1071.89,-135.19,0.6 +1614,1071.1,-135.67,0.6 +1622,1069.7,-136.16,0.6 +1630,1074.23,-136.64,0.6 +1638,1077.92,-137.07,0.6 +1646,1072.01,-137.46,0.6 +1654,1070.91,-137.85,0.6 +1662,1077.6,-138.25,0.6 +1670,1074.01,-138.64,0.6 +1678,1071.56,-139.03,0.6 +1686,1074.98,-139.42,0.6 +1694,1073.01,-139.82,0.6 +1702,1072.13,-140.21,0.6 +1710,1067.79,-140.6,0.6 +1718,1066.15,-140.99,0.6 +1726,1065.68,-141.39,0.6 +1734,1062.83,-141.78,0.6 +1742,1061.44,-142.17,0.6 +1750,1059.42,-142.56,0.6 +1758,1056.93,-142.96,0.6 +1766,1059.76,-143.35,0.6 +1774,1056.69,-143.74,0.6 +1782,1050.86,-144.13,0.6 +1790,1045.37,-144.53,0.6 +1798,1048.73,-144.92,0.6 +1806,1043.9,-145.31,0.6 +1814,1041.29,-145.7,0.6 +1822,1043,-146.1,0.6 +1830,1039.3,-146.49,0.6 +1838,1037.07,-146.88,0.6 +1846,1030.75,-147.27,0.6 +1854,1034.67,-147.67,0.6 +1862,1027.24,-148.08,0.6 +1870,1025.52,-148.5,0.6 +1878,1019.94,-148.91,0.6 +1886,1018.86,-149.32,0.6 +1894,1021.32,-149.74,0.6 +1902,1022.77,-150.15,0.6 +1910,1017.73,-150.56,0.6 +1918,1013.3,-150.97,0.6 +1926,1004.18,-151.39,0.6 +1934,1004.22,-151.8,0.6 +1942,1002.25,-152.21,0.6 +1950,999.13,-152.62,0.6 +1958,1001.05,-153.04,0.6 +1966,995.69,-153.45,0.6 +1974,993.18,-153.86,0.6 +1982,989.2,-154.27,0.6 +1990,987.58,-154.69,0.6 +1998,987.51,-155.1,0.6 +2006,982.88,-155.51,0.6 +2014,986.86,-155.93,0.6 +2022,984.97,-156.34,0.6 +2030,973.39,-156.75,0.6 +2038,975.31,-157.16,0.6 +2046,977.29,-157.58,0.6 +2054,976.58,-157.99,0.6 +2062,972.31,-158.4,0.6 +2070,969.71,-158.8,0.6 +2078,967.87,-159.18,0.6 +2086,967.37,-159.54,0.6 +2094,961.57,-159.9,0.6 +2102,959.47,-160.26,0.6 +2110,958.21,-160.62,0.6 +2118,950.25,-160.98,0.6 +2126,947.44,-161.34,0.6 +2134,944.8,-161.7,0.6 +2142,940.84,-162.05,0.6 +2150,933.35,-162.41,0.6 +2158,930.3,-162.77,0.6 +2166,926.58,-163.13,0.6 +2174,925.98,-163.49,0.6 +2182,919.38,-163.85,0.6 +2190,912.24,-164.21,0.6 +2198,907.98,-164.57,0.6 +2206,900.6,-164.93,0.6 +2214,897.98,-165.29,0.6 +2222,885.47,-165.65,0.6 +2230,880.31,-166.01,0.6 +2238,876.55,-166.37,0.6 +2246,875.63,-166.73,0.6 +2254,868.37,-167.09,0.6 +2262,862.62,-167.45,0.6 +2270,852.23,-167.81,0.6 +2278,852.18,-168.17,0.6 +2286,846.05,-168.51,0.6 +2294,834.39,-168.69,0.6 +2302,828.35,-168.69,0.6 +2310,824.1,-168.69,0.6 +2318,815.95,-168.69,0.6 +2326,813.92,-168.69,0.6 +2334,799.99,-168.69,0.6 +2342,791.92,-168.69,0.6 +2350,781.37,-168.69,0.6 +2358,772.93,-168.69,0.6 +2366,766.47,-168.69,0.6 +2374,753.67,-168.69,0.6 +2382,741.6,-168.69,0.6 +2390,735.33,-168.69,0.6 +2398,720.83,-168.69,0.6 +2406,708.54,-168.69,0.6 +2414,695.07,-168.69,0.6 +2422,681.64,-168.69,0.6 +2430,673.59,-168.69,0.6 +2438,664.96,-168.69,0.6 +2446,647.2,-168.69,0.6 +2454,631.49,-168.69,0.6 +2462,613.95,-168.69,0.6 +2470,603.63,-168.69,0.6 +2478,588.06,-168.69,0.6 +2486,576.52,-168.69,0.6 +2494,563.79,-168.69,0.6 +2502,554.19,-168.69,0.6 +2510,540.44,-168.69,0.6 +2518,528.41,-168.69,0.6 +2526,511.56,-168.69,0.6 +2534,499.8,-168.69,0.6 +2542,489.7,-168.69,0.6 +2550,473.88,-168.69,0.6 +2558,455.16,-168.69,0.6 +2566,439.13,-168.69,0.6 +2574,427.31,-168.69,0.6 +2582,415.34,-168.69,0.6 +2590,408.41,-168.69,0.6 +2598,399.22,-168.69,0.6 +2606,381,-168.69,0.6 +2614,368.05,-168.69,0.6 +2622,353.06,-168.69,0.6 +2630,342.45,-168.69,0.6 +2638,331.12,-168.69,0.6 +2646,317.96,-168.69,0.6 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Engine_175kW_6.8l.veng new file mode 100644 index 0000000000000000000000000000000000000000..100b26e3d13290055fbd00e2686d6806da16ab50 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Engine_175kW_6.8l.veng @@ -0,0 +1,21 @@ +{ + "Header": { + "CreatedBy": " ()", + "Date": "2016-10-13T10:06:05.1636564Z", + "AppVersion": "3", + "FileVersion": 3 + }, + "Body": { + "SavedInDeclMode": false, + "ModelName": "175kW 6.8l Engine", + "Displacement": "6871", + "IdlingSpeed": 600.0, + "Inertia": 3.565, + "FullLoadCurve": "175kW.vfld", + "FuelMap": "175kW.vmap", + "WHTC-Urban": 0.0, + "WHTC-Rural": 0.0, + "WHTC-Motorway": 0.0, + "ColdHotBalancingFactor": 0.0 + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Gear_1.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Gear_1.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..b4274373230f50e6df7eb9702010c7a868dc967e --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Gear_1.vtlm @@ -0,0 +1,233 @@ +Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm] +0,-5500.0,229.6 +0,-5000.0,209.6 +0,-4500.0,169.6 +0,-4000.0,169.6 +0,-3500.0,149.6 +0,-3000.0,129.6 +0,-2500.0,109.6 +0,-2000.0,89.6 +0,-1600.0,73.6 +0,-1200.0,57.6 +0,-900.0,45.6 +0,-600.0,33.6 +0,-400.0,25.6 +0,-200.0,17.6 +0,0.0,17.6 +0,200.0,17.6 +0,400.0,25.6 +0,600.0,33.6 +0,900.0,45.6 +0,1200.0,57.6 +0,1600.0,73.6 +0,2000.0,89.6 +0,2500.0,109.6 +0,3000.0,129.6 +0,3500.0,149.6 +0,4000.0,169.6 +0,4500.0,189.6 +0,5000.0,209.6 +0,5500.0,229.6 +600,-5500.0,229.6 +600,-5000.0,209.6 +600,-4500.0,169.6 +600,-4000.0,169.6 +600,-3500.0,149.6 +600,-3000.0,129.6 +600,-2500.0,109.6 +600,-2000.0,89.6 +600,-1600.0,73.6 +600,-1200.0,57.6 +600,-900.0,45.6 +600,-600.0,33.6 +600,-400.0,25.6 +600,-200.0,17.6 +600,0.0,17.6 +600,200.0,17.6 +600,400.0,25.6 +600,600.0,33.6 +600,900.0,45.6 +600,1200.0,57.6 +600,1600.0,73.6 +600,2000.0,89.6 +600,2500.0,109.6 +600,3000.0,129.6 +600,3500.0,149.6 +600,4000.0,169.6 +600,4500.0,189.6 +600,5000.0,209.6 +600,5500.0,229.6 +900,-5500.0,231.4 +900,-5000.0,211.4 +900,-4500.0,171.4 +900,-4000.0,171.4 +900,-3500.0,151.4 +900,-3000.0,131.4 +900,-2500.0,111.4 +900,-2000.0,91.4 +900,-1600.0,75.4 +900,-1200.0,59.4 +900,-900.0,47.4 +900,-600.0,35.4 +900,-400.0,27.4 +900,-200.0,19.4 +900,0.0,19.4 +900,200.0,19.4 +900,400.0,27.4 +900,600.0,35.4 +900,900.0,47.4 +900,1200.0,59.4 +900,1600.0,75.4 +900,2000.0,91.4 +900,2500.0,111.4 +900,3000.0,131.4 +900,3500.0,151.4 +900,4000.0,171.4 +900,4500.0,191.4 +900,5000.0,211.4 +900,5500.0,231.4 +1200,-5500.0,233.2 +1200,-5000.0,213.2 +1200,-4500.0,173.2 +1200,-4000.0,173.2 +1200,-3500.0,153.2 +1200,-3000.0,133.2 +1200,-2500.0,113.2 +1200,-2000.0,93.2 +1200,-1600.0,77.2 +1200,-1200.0,61.2 +1200,-900.0,49.2 +1200,-600.0,37.2 +1200,-400.0,29.2 +1200,-200.0,21.2 +1200,0.0,21.2 +1200,200.0,21.2 +1200,400.0,29.2 +1200,600.0,37.2 +1200,900.0,49.2 +1200,1200.0,61.2 +1200,1600.0,77.2 +1200,2000.0,93.2 +1200,2500.0,113.2 +1200,3000.0,133.2 +1200,3500.0,153.2 +1200,4000.0,173.2 +1200,4500.0,193.2 +1200,5000.0,213.2 +1200,5500.0,233.2 +1600,-5500.0,235.6 +1600,-5000.0,215.6 +1600,-4500.0,175.6 +1600,-4000.0,175.6 +1600,-3500.0,155.6 +1600,-3000.0,135.6 +1600,-2500.0,115.6 +1600,-2000.0,95.6 +1600,-1600.0,79.6 +1600,-1200.0,63.6 +1600,-900.0,51.6 +1600,-600.0,39.6 +1600,-400.0,31.6 +1600,-200.0,23.6 +1600,0.0,23.6 +1600,200.0,23.6 +1600,400.0,31.6 +1600,600.0,39.6 +1600,900.0,51.6 +1600,1200.0,63.6 +1600,1600.0,79.6 +1600,2000.0,95.6 +1600,2500.0,115.6 +1600,3000.0,135.6 +1600,3500.0,155.6 +1600,4000.0,175.6 +1600,4500.0,195.6 +1600,5000.0,215.6 +1600,5500.0,235.6 +2000,-5500.0,238.0 +2000,-5000.0,218.0 +2000,-4500.0,178.0 +2000,-4000.0,178.0 +2000,-3500.0,158.0 +2000,-3000.0,138.0 +2000,-2500.0,118.0 +2000,-2000.0,98.0 +2000,-1600.0,82.0 +2000,-1200.0,66.0 +2000,-900.0,54.0 +2000,-600.0,42.0 +2000,-400.0,34.0 +2000,-200.0,26.0 +2000,0.0,26.0 +2000,200.0,26.0 +2000,400.0,34.0 +2000,600.0,42.0 +2000,900.0,54.0 +2000,1200.0,66.0 +2000,1600.0,82.0 +2000,2000.0,98.0 +2000,2500.0,118.0 +2000,3000.0,138.0 +2000,3500.0,158.0 +2000,4000.0,178.0 +2000,4500.0,198.0 +2000,5000.0,218.0 +2000,5500.0,238.0 +2500,-5500.0,241.0 +2500,-5000.0,221.0 +2500,-4500.0,181.0 +2500,-4000.0,181.0 +2500,-3500.0,161.0 +2500,-3000.0,141.0 +2500,-2500.0,121.0 +2500,-2000.0,101.0 +2500,-1600.0,85.0 +2500,-1200.0,69.0 +2500,-900.0,57.0 +2500,-600.0,45.0 +2500,-400.0,37.0 +2500,-200.0,29.0 +2500,0.0,29.0 +2500,200.0,29.0 +2500,400.0,37.0 +2500,600.0,45.0 +2500,900.0,57.0 +2500,1200.0,69.0 +2500,1600.0,85.0 +2500,2000.0,101.0 +2500,2500.0,121.0 +2500,3000.0,141.0 +2500,3500.0,161.0 +2500,4000.0,181.0 +2500,4500.0,201.0 +2500,5000.0,221.0 +2500,5500.0,241.0 +3000,-5500.0,244.0 +3000,-5000.0,224.0 +3000,-4500.0,184.0 +3000,-4000.0,184.0 +3000,-3500.0,164.0 +3000,-3000.0,144.0 +3000,-2500.0,124.0 +3000,-2000.0,104.0 +3000,-1600.0,88.0 +3000,-1200.0,72.0 +3000,-900.0,60.0 +3000,-600.0,48.0 +3000,-400.0,40.0 +3000,-200.0,32.0 +3000,0.0,32.0 +3000,200.0,32.0 +3000,400.0,40.0 +3000,600.0,48.0 +3000,900.0,60.0 +3000,1200.0,72.0 +3000,1600.0,88.0 +3000,2000.0,104.0 +3000,2500.0,124.0 +3000,3000.0,144.0 +3000,3500.0,164.0 +3000,4000.0,184.0 +3000,4500.0,204.0 +3000,5000.0,224.0 +3000,5500.0,244.0 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Gearbox.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Gearbox.vgbx new file mode 100644 index 0000000000000000000000000000000000000000..56d3ea85d651c6fb719134568b73c6bb0df27803 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Gearbox.vgbx @@ -0,0 +1,82 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2018-08-09T12:53:31.5281425Z", + "AppVersion": "3", + "FileVersion": 6 + }, + "Body": { + "SavedInDeclMode": true, + "ModelName": "Allison 3000 CR", + "Inertia": 0.0, + "TracInt": 0.0, + "Gears": [ + { + "Ratio": 6.83, + "LossMap": "Axle_4x2.vtlm" + }, + { + "Ratio": 3.4872, + "LossMap": "Gear_1.vtlm", + "ShiftPolygon": "", + "MaxTorque": "1491", + "MaxSpeed": "2800" + }, + { + "Ratio": 1.8643, + "LossMap": "Gear_1.vtlm", + "ShiftPolygon": "", + "MaxTorque": "1491", + "MaxSpeed": "2800" + }, + { + "Ratio": 1.4093, + "LossMap": "Gear_1.vtlm", + "ShiftPolygon": "", + "MaxTorque": "1695", + "MaxSpeed": "2800" + }, + { + "Ratio": 1.0, + "LossMap": "Gear_1.vtlm", + "ShiftPolygon": "", + "MaxTorque": "1695", + "MaxSpeed": "2800" + }, + { + "Ratio": 0.7498, + "LossMap": "Gear_1.vtlm", + "ShiftPolygon": "", + "MaxTorque": "1695", + "MaxSpeed": "2800" + }, + { + "Ratio": 0.6525, + "LossMap": "Gear_1.vtlm", + "ShiftPolygon": "", + "MaxTorque": "1695", + "MaxSpeed": "2800" + } + ], + "TqReserve": 20.0, + "ShiftTime": 1.5, + "StartTqReserve": 20.0, + "StartSpeed": 1.3, + "StartAcc": 0.6, + "GearboxType": "ATSerial", + "TorqueConverter": { + "Enabled": true, + "File": "TorqueConverter.vtcc", + "RefRPM": 999.99999999999989, + "Inertia": 0.835, + "MaxTCSpeed": 5000.0, + "ShiftPolygon": "", + "CLUpshiftMinAcceleration": 0.0, + "CCUpshiftMinAcceleration": 0.0 + }, + "DownshiftAfterUpshiftDelay": 10.0, + "UpshiftAfterDownshiftDelay": 10.0, + "UpshiftMinAcceleration": 0.1, + "PowershiftShiftTime": 0.8 + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/TorqueConverter.vtcc b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/TorqueConverter.vtcc new file mode 100644 index 0000000000000000000000000000000000000000..a836f45e64278cf68baf98602e3310d8a556a316 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/TorqueConverter.vtcc @@ -0,0 +1,21 @@ +Speed Ratio, Torque Ratio,MP1000 +0.0,1.93,377.80 +0.1,1.82,365.21 +0.2,1.70,352.62 +0.3,1.60,340.02 +0.4,1.49,327.43 +0.5,1.39,314.84 +0.6,1.28,302.24 +0.7,1.18,264.46 +0.8,1.07,226.68 +0.9,0.97,188.90 +1.0,0.97,0.00 +1.100,1.000,-40.34 +1.222,1.000,-80.34 +1.375,1.000,-136.11 +1.571,1.000,-216.52 +1.833,1.000,-335.19 +2.200,1.000,-528.77 +2.750,1.000,-883.40 +4.400,1.000,-2462.17 +11.000,1.000,-16540.98 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/TruckAT.vecto b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/TruckAT.vecto new file mode 100644 index 0000000000000000000000000000000000000000..220586b7485b33194d6fd22ea59295b13e65279a --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/TruckAT.vecto @@ -0,0 +1,61 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2018-08-09T12:53:35.3617877Z", + "AppVersion": "3", + "FileVersion": 4 + }, + "Body": { + "SavedInDeclMode": true, + "EngineOnlyMode": false, + "VehicleFile": "Vehicle.vveh", + "EngineFile": "Engine.veng", + "GearboxFile": "Gearbox.vgbx", + "AuxiliaryAssembly": "Classic", + "AuxiliaryVersion": "CLASSIC", + "AdvancedAuxiliaryFilePath": "", + "Aux": [ + { + "ID": "FAN", + "Type": "Fan", + "Technology": [ + "Crankshaft mounted - Electronically controlled visco clutch" + ] + }, + { + "ID": "STP", + "Type": "Steering pump", + "Technology": [ + "Fixed displacement" + ] + }, + { + "ID": "AC", + "Type": "HVAC", + "Technology": [ + "None" + ] + }, + { + "ID": "ES", + "Type": "Electric System", + "Technology": [ + "Standard technology" + ] + }, + { + "ID": "PS", + "Type": "Pneumatic System", + "Technology": [ + "Large Supply + ESS" + ] + } + ], + "OverSpeedEcoRoll": { + "Mode": "Overspeed", + "MinSpeed": 50.0, + "OverSpeed": 2.5, + "UnderSpeed": 5.0 + } + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Vehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Vehicle.vveh new file mode 100644 index 0000000000000000000000000000000000000000..e1bae74b2e3dfa7e565c996148ce6af541b17315 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/Vehicle.vveh @@ -0,0 +1,62 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2018-08-09T08:53:13.0204772Z", + "AppVersion": "3", + "FileVersion": 7 + }, + "Body": { + "SavedInDeclMode": true, + "VehCat": "RigidTruck", + "LegislativeClass": "N3", + "CurbWeight": 11640.0, + "CurbWeightExtra": 0.0, + "Loading": 0.0, + "MassMax": 18.0, + "rdyn": 0.0, + "CdCorrMode": "CdofVdecl", + "CdCorrFile": "", + "Retarder": { + "Type": "None", + "Ratio": 0.0, + "File": "" + }, + "Angledrive": { + "Type": "None", + "Ratio": 0.0, + "LossMap": "" + }, + "PTO": { + "Type": "only one engaged gearwheel above oil level", + "LossMap": "", + "Cycle": "" + }, + "TorqueLimits": {}, + "IdlingSpeed": 550.0, + "AxleConfig": { + "Type": "4x2", + "Axles": [ + { + "Inertia": 15.5, + "Wheels": "295/80 R22.5", + "AxleWeightShare": 0.0, + "TwinTyres": false, + "RRCISO": 0.0065, + "FzISO": 31269.0, + "Type": "VehicleNonDriven" + }, + { + "Inertia": 15.5, + "Wheels": "295/80 R22.5", + "AxleWeightShare": 0.0, + "TwinTyres": true, + "RRCISO": 0.0065, + "FzISO": 27100.0, + "Type": "VehicleDriven" + } + ] + }, + "CdA": 4.464, + "VehicleHeight": 0.0 + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj index 997ef0b1e28526b7877221e674738e3c4390b9f4..fbf584db5dbff8f76f513dfa89325d4681894759 100644 --- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj +++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj @@ -1483,6 +1483,36 @@ <None Include="TestData\Integration\EngineeringMode\CityBus_AT\UrbanDelivery.vdri"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\Gearbox.vgbx"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\325kW.vmap"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\Axle_4x2.vtlm"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\Engine.vfld"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\Engine.veng"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\Vehicle.vveh"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\TruckAT.vecto"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\Engine_175kW_6.8l.veng"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\Gear_1.vtlm"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\TorqueConverter.vtcc"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> <None Include="TestData\Integration\EngineeringMode\Class2_RigidTruck_4x2\175kW.vfld"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None>