From 70de6e0875a47d26d04f6495b5268ef2e6a12bb2 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Mon, 9 Jan 2017 14:17:27 +0100 Subject: [PATCH] adapt expected results for engine-only tests --- .../EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod | 3 +-- .../EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod | 3 +-- .../EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod | 3 +-- .../EngineOnlyJob_Coach Engine Only short.vmod | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod index 08c93bd384..9fe26bdbf2 100644 --- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod +++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod @@ -1,5 +1,5 @@ time [s],n_eng_avg [1/min],T_eng_fcmap [Nm],Tq_full [Nm],Tq_drag [Nm],P_eng_fcmap [kW],P_eng_full [kW],P_eng_full_stat [kW],P_eng_drag [kW],P_eng_inertia [kW],P_eng_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle,FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h],FC-AAUX [g/h],FC-Final [g/h] -0.5000,580.0000,15.3868,1139.3103,-148.5000,0.9346,69.1988,74.7678,-9.0195,0.9668,0.0000,,,0.0000,0.0000,1506.8291,1506.8291,1506.8291,1506.8291,1506.8291 +0.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 1.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 2.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 3.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 @@ -694,4 +694,3 @@ 692.5000,1828.8550,419.6568,1757.6779,-269.3382,80.3715,336.6256,341.6938,-51.5829,4.5158,77.1577,,,0.0000,0.0000,18432.2375,18432.2375,18432.2375,18432.2375,18432.2375 693.5000,1879.2710,186.7066,1634.0959,-278.6651,36.7433,321.5848,326.0610,-54.8404,3.2561,33.8936,,,0.0000,0.0000,12627.1055,12627.1055,12627.1055,12627.1055,12627.1055 694.5000,1913.7100,282.6382,1544.5241,-285.0363,56.6416,309.5276,314.6095,-57.1222,2.1771,54.8685,,,0.0000,0.0000,15798.5513,15798.5513,15798.5513,15798.5513,15798.5513 -695.5000,1632.2305,423.4192,1856.7600,-239.6734,72.3737,317.3700,349.2417,-40.9666,-40.1481,99.4356,,,0.0000,0.0000,15949.2211,15949.2211,15949.2211,15949.2211,15949.2211 diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod index fd1a7512ea..92d6624300 100644 --- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod +++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod @@ -1,5 +1,5 @@ time [s],n_eng_avg [1/min],T_eng_fcmap [Nm],Tq_full [Nm],Tq_drag [Nm],P_eng_fcmap [kW],P_eng_full [kW],P_eng_full_stat [kW],P_eng_drag [kW],P_eng_inertia [kW],P_eng_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle,FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h],FC-AAUX [g/h],FC-Final [g/h] -0.5000,580.0000,15.3868,1139.3103,-148.5000,0.9346,69.1988,74.7678,-9.0195,0.9668,0.0000,,,0.0000,0.0000,1506.8291,1506.8291,1506.8291,1506.8291,1506.8291 +0.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 1.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 2.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 3.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 @@ -1005,4 +1005,3 @@ 1003.5000,1747.2970,300.1032,1848.6197,-256.3581,54.9118,338.2540,350.4916,-46.9075,0.6887,54.3718,,,0.0000,0.0000,13995.8711,13995.8711,13995.8711,13995.8711,13995.8711 1004.5000,1756.4730,279.3416,1846.5955,-257.6886,51.3814,339.6580,350.4587,-47.3986,0.6510,50.8605,,,0.0000,0.0000,13517.1779,13517.1779,13517.1779,13517.1779,13517.1779 1005.5000,1767.0600,371.2643,1842.4875,-259.2237,68.7010,340.9451,350.3965,-47.9683,0.9043,68.0355,,,0.0000,0.0000,16168.5403,16168.5403,16168.5403,16168.5403,16168.5403 -1006.5000,1782.7120,420.7529,1838.6908,-261.4932,78.5483,343.2563,350.2568,-48.8169,1.4133,77.5542,,,0.0000,0.0000,17735.7210,17735.7210,17735.7210,17735.7210,17735.7210 diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod index 8684e84cb6..f197498f18 100644 --- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod +++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod @@ -1,5 +1,5 @@ time [s],n_eng_avg [1/min],T_eng_fcmap [Nm],Tq_full [Nm],Tq_drag [Nm],P_eng_fcmap [kW],P_eng_full [kW],P_eng_full_stat [kW],P_eng_drag [kW],P_eng_inertia [kW],P_eng_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle,FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h],FC-AAUX [g/h],FC-Final [g/h] -0.5000,580.0000,15.3868,1139.3103,-148.5000,0.9346,69.1988,74.7678,-9.0195,0.9668,0.0000,,,0.0000,0.0000,1506.8291,1506.8291,1506.8291,1506.8291,1506.8291 +0.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 1.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 2.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 3.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 @@ -165,4 +165,3 @@ 163.5000,1304.2050,-130.9400,1839.3308,-191.5046,-17.8833,251.2085,314.1249,-26.1549,-2.9996,-14.5053,,,0.0000,0.0000,1284.6858,1284.6858,1284.6858,1284.6858,1284.6858 164.5000,1249.3625,-130.3151,1840.3154,-184.9235,-17.0495,240.7739,300.9158,-24.1941,-2.8371,-13.8406,,,0.0000,0.0000,1146.0132,1146.0132,1146.0132,1146.0132,1146.0132 165.5000,1202.9710,-127.2652,1840.5811,-179.3565,-16.0322,231.8669,289.7421,-22.5944,-1.9195,-13.8576,,,0.0000,0.0000,970.6337,970.6337,970.6337,970.6337,970.6337 -166.5000,1174.7100,28.3827,1841.3623,-176.5975,3.4915,226.5158,282.9353,-21.7242,-0.8925,4.3569,,,0.0000,0.0000,3760.5779,3760.5779,3760.5779,3760.5779,3760.5779 diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod index 88702f8843..ee62e8207e 100644 --- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod +++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod @@ -1,5 +1,5 @@ time [s],n_eng_avg [1/min],T_eng_fcmap [Nm],Tq_full [Nm],Tq_drag [Nm],P_eng_fcmap [kW],P_eng_full [kW],P_eng_full_stat [kW],P_eng_drag [kW],P_eng_inertia [kW],P_eng_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_aux_cycle,FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h],FC-AAUX [g/h],FC-Final [g/h] -0.5000,580.0000,15.3868,1139.3103,-148.5000,0.9346,69.1988,74.7678,-9.0195,0.9668,0.0000,,,0.0000,0.0000,1506.8291,1506.8291,1506.8291,1506.8291,1506.8291 +0.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 1.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 2.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 3.5000,600.0000,0.0000,1101.3333,-148.0000,0.0000,69.1988,80.5504,-9.2991,0.0000,0.0000,,,0.0000,0.0000,1459.0000,1459.0000,1459.0000,1459.0000,1459.0000 @@ -305,4 +305,3 @@ 303.5000,1817.8445,141.0337,1783.3780,-267.3012,26.8478,339.4914,344.9291,-50.8846,-0.0916,26.9304,,,0.0000,0.0000,10466.0279,10466.0279,10466.0279,10466.0279,10466.0279 304.5000,1811.6175,43.1361,1796.7821,-266.1492,8.1834,340.8714,346.7304,-50.4917,-0.8489,9.0070,,,0.0000,0.0000,7743.6503,7743.6503,7743.6503,7743.6503,7743.6503 305.5000,1796.3285,-29.2842,1825.3949,-263.4676,-5.5087,343.3770,350.0889,-49.5612,-1.4472,-4.0319,,,0.0000,0.0000,5685.1572,5685.1572,5685.1572,5685.1572,5685.1572 -306.5000,1775.9475,-8.8781,1830.6861,-260.5124,-1.6511,340.4651,350.3242,-48.4493,-1.5859,-0.0553,,,0.0000,0.0000,6067.8939,6067.8939,6067.8939,6067.8939,6067.8939 -- GitLab