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

Skip to content
Snippets Groups Projects
Commit 00cf5665 authored by Harald Martini's avatar Harald Martini
Browse files

Merge branch 'merge_xev_develop' into... 

Merge branch 'merge_xev_develop' into feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev

# Conflicts:
#	NuGet.Config
parents fc2e426a 9308be98
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4546 additions and 6386 deletions
.gitattributes
+ 1
− 1
View file @ 00cf5665
text eol=crlf
\ No newline at end of file
* text=auto
.mailmap 0 → 100644
+ 18
− 0
View file @ 00cf5665
Markus QUARITSCH <markus.quaritsch@tugraz.at> <quaritsch@ivt.tugraz.at>
Stefan MEYER <stefan.meyer@student.tugraz.at>
Harald MARTINI <harald.martini@ivt.tugraz.at> <martini@ivt.tugraz.at>
Franz KOBER josef<franz.josef.kober@ivt.tugraz.at>
Franz KOBER josef<franz.josef.kober@ivt.tugraz.at> <ko6er.franz@gmail.com>
Michael KRISPER <michael.krisper@tugraz.at>
Michael KRISPER <michael.krisper@tugraz.at> <michael.krisper@gmail.com>
Michael KRISPER <michael.krisper@tugraz.at> <michaelkrisper@fvkmb037.vkmthd.tugraz.at>
Stefan BRANDT <brandt@ivt.tugraz.at> <Brandt@ivt.tugraz.at>
Raphael LUZ <luz@ivt.tugraz.at> <Luz@ivt.tugraz.at>
Glenn Zarb <glenn@ascentsoftware.eu>
Glenn Zarb <glenn@ascentsoftware.eu> <STC\GZ1>
Glenn Zarb <glenn@ascentsoftware.eu> “Glenn <“glenn@ascentsoftware.eu”>
Terry Burns <Terry.Burns@ricardo.com>
Kostis Anagnostopoulos <ankostis@gmail.com>
Kostis Anagnostopoulos <ankostis@gmail.com> <konstantinos.anagnostopoulos@ext.jrc.ec.europa.eu>
Raphael Kalchgruber <kalchgruber@ivt.tugraz.at>
Vasilis Kouliaridis <vasilis.k@emisia.com> <baboulas8@gmail.com>
\ No newline at end of file
CHANGES.md
+ 1132
− 17
View file @ 00cf5665
This diff is collapsed.
Documentation/User Manual Source/Release Notes Vecto3.x.pdf
+ 0
− 0
View file @ 00cf5665
No preview for this file type
Documentation/User Manual Source/Release Notes Vecto3.x.pptx
+ 0
− 0
View file @ 00cf5665
No preview for this file type
Documentation/User Manual/3-simulation-models/Engine_DualFuel.md
+ 2
− 1
View file @ 00cf5665
......@@ -2,4 +2,5 @@
VECTO supports to simulate vehicles equipped with dual-fuel engines, i.e. two different fuels are used simultaneously. Therefore, the engine model contains a second fuel consumption map and VECTO interpolates the fuel consumption from both consumption maps. In the .vmod and .vsum files the consumption of every fuel is reported. The CO2 emissions are the sum of CO2 emissions from both fuels.
In case a WHR system is used with a dual-fuel vehicle the WHR map shall be provided in the fuel consumption map of the primary fuel.
\ No newline at end of file
In case a WHR system is used with a dual-fuel vehicle the WHR map shall be provided in the fuel consumption map of the primary fuel.
Documentation/User Manual/5-input-and-output-files/VDRI.md
+ 4
− 2
View file @ 00cf5665
......@@ -102,6 +102,7 @@ s [m] , v [km/h] , stop [s] , grad [%] , Padd [kW] |
### Engineering Mode: Measured-Speed, Time-Based Cycle
This driving cycle defines the actual measured speed over time. Vecto tries to simulate the vehicle model using this speed as the actual vehicle speed.
Due to differences in the real and simulated shift strategies a small difference in speed can occur, but Vecto immediately tries to catch up after the gear is engaged again.
This type of cycle is now supported for BEVs (E2, E3, E4, IEPC) also, and it was tested with the following input fields: **t**, **v**, *grad*.
Header: **t, v***\[, grad]\[, Padd]\[, vair\_res, vair\_beta\]*
......@@ -131,7 +132,7 @@ t [s] v [km/h] , grad [%] , Padd [kW]
This driving cycle defines the actual measured speed of the vehicle, the gear, and the engine speed over time.
It overrides the shift strategy of VECTO and also directly sets the engine speed.
This type of cycle is now supported for BEVs (E2, IEPC) also, and it was tested with the following input fields: **t**, **v**, **gear**, *grad*.
Header: **t, v, gear***\[, tc\_active, grad]\[, Padd]\[, vair\_res, vair\_beta]\[, Aux\_ID\]*
......@@ -161,6 +162,7 @@ t [s] , v [km/h] , gear [-] , grad [%] , Padd [kW]
### Engineering Mode: Pwheel (SiCo), Time-Based
This driving cycle defines the power measured at the wheels over time. VECTO tries to simulate the vehicle with this power requirement.
This type of cycle is now supported for BEVs (E2, E3, E4, IEPC) also, and it was tested with the following input fields: **t**, **Pwheel**, **gear**, **n**.
Header: **t, Pwheel, gear, n***\[, Padd]*
......@@ -172,7 +174,7 @@ Units are optional and are enclosed in [square-brackets] after the header-column
| **t** | [s] | The absolute time. Must always be increasing. |
| **Pwheel** | [kW] | Power at the wheels. |
| **gear** | [-] | The current gear. Must be >= 0 (0 is neutral). |
| **n** | [rpm] | The actual engine speed. Must be >= 0 rpm. |
| **n** | [rpm] | The actual engine speed for conventionals or the electric motor speed for BEVs. Must be >= 0 rpm. |
| *Padd* | [kW] | Additional auxiliary power demand. This power demand will be directly added to the engine power. Must be >= 0 kW. |
**Example:**
......
Documentation/User Manual/5-input-and-output-files/VMOD.md
+ 12
− 0
View file @ 00cf5665
......@@ -150,3 +150,15 @@ P_loss_total = P_clutch_loss + P_gbx_loss + P_ret_loss + P_gbx_inertia + P_angle
P_wheel_inertia + P_air + P_roll + P_grad + P_veh_inertia (+ P_PTOconsumer + P_PTO_transm)
P_trac = P_veh_inertia + P_roll + P_air + P_slope
**Driving Action:**
| DrivingAction | Value |
| ---------------- | ------- |
| Halt | 0 |
| Roll | 2 |
| Coast | 4 |
| Accelerate | 6 |
| Brake | -5 |
Documentation/User Manual/help.html
+ 251
− 84
View file @ 00cf5665
This diff is collapsed.
Documentation/User Manual/pics/JRClogo.jpg 0 → 100644
+ 0
− 0
View file @ 00cf5665
Documentation/User Manual/pics/JRClogo.jpg

11.6 KiB

Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericEMotor_140kW_900Nm.vemp
+ 23
− 73
View file @ 00cf5665
n [rpm] , T_drive [Nm] , T_drag [Nm]
0,900,-900
1485.446136,900,-900
1480,900,-900
1488.888889,897.93,-897.93
1497.777778,892.5975,-892.5975
1506.666667,887.3325,-887.3325
1511.111111,884.7225,-884.7225
1555.555556,859.4325,-859.4325
1600,835.56,-835.56
1644.444444,812.97,-812.97
1688.888889,791.595,-791.595
1733.333333,771.3,-771.3
1777.777778,752.0175,-752.0175
1822.222222,733.6575,-733.6575
1866.666667,716.1975,-716.1975
1911.111111,699.5475,-699.5475
1955.555556,683.64,-683.64
2000,668.4525,-668.4525
2044.444444,653.9175,-653.9175
2088.888889,640.0125,-640.0125
2133.333333,626.67,-626.67
2177.777778,613.89,-613.89
2222.222222,601.605,-601.605
2266.666667,589.815,-589.815
2311.111111,578.475,-578.475
2355.555556,567.5625,-567.5625
2400,557.0325,-557.0325
2444.444444,546.9075,-546.9075
2488.888889,537.1425,-537.1425
2533.333333,527.715,-527.715
2577.777778,518.625,-518.625
2622.222222,509.8275,-509.8275
2666.666667,501.345,-501.345
2711.111111,493.11,-493.11
2755.555556,485.1675,-485.1675
2800,477.4725,-477.4725
2844.444444,470.0025,-470.0025
2888.888889,462.78,-462.78
2933.333333,455.76,-455.76
2977.777778,448.965,-448.965
3022.222222,442.35,-442.35
3066.666667,435.9375,-435.9375
3111.111111,429.7275,-429.7275
3155.555556,423.675,-423.675
3200,417.78,-417.78
3244.444444,412.065,-412.065
3288.888889,406.485,-406.485
3333.333333,401.0625,-401.0625
3377.777778,395.7975,-395.7975
3422.222222,390.645,-390.645
3466.666667,385.65,-385.65
3511.111111,380.7675,-380.7675
3555.555556,375.9975,-375.9975
3600,371.3625,-371.3625
3644.444444,366.84,-366.84
3688.888889,362.4075,-362.4075
3733.333333,358.0875,-358.0875
3777.777778,353.88,-353.88
3822.222222,349.7625,-349.7625
3866.666667,345.7575,-345.7575
3911.111111,341.82,-341.82
3955.555556,337.9725,-337.9725
4000,334.215,-334.215
4044.444444,330.5475,-330.5475
4088.888889,326.97,-326.97
4133.333333,323.4375,-323.4375
4177.777778,319.995,-319.995
4222.222222,316.6425,-316.6425
4266.666667,313.335,-313.335
4311.111111,310.095,-310.095
4355.555556,306.945,-306.945
4400,303.84,-303.84
4444.444444,300.8025,-300.8025
0, 900.00, -900.00
30, 900.00, -900.00
297, 900.00, -900.00
594, 900.00, -900.00
891, 900.00, -900.00
1188, 900.00, -900.00
1485, 900.00, -900.00
1782, 750.00, -750.00
2079, 642.86, -642.86
2376, 562.50, -562.50
2673, 500.00, -500.00
2970, 450.00, -450.00
3267, 409.09, -409.09
3564, 375.00, -375.00
3861, 346.15, -346.15
4158, 321.43, -321.43
4455, 300.00, -300.00
4752, 281.25, -281.25
5049, 264.71, -264.71
5346, 250.00, -250.00
5643, 236.84, -236.84
5940, 225.00, -225.00
Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericIHPC_140kW_936Nm.vem
+ 10
− 10
View file @ 00cf5665
......@@ -14,11 +14,11 @@
"VoltageLevels": [
{
"Voltage": 500,
"ContinuousTorque": 13860.59,
"ContinuousTorqueSpeed": 166.99,
"OverloadTorque": 16517.20,
"OverloadTorqueSpeed": 166.01,
"OverloadTime": 312,
"ContinuousTorque": 600.00,
"ContinuousTorqueSpeed": 1485.00,
"OverloadTorque": 900.00,
"OverloadTorqueSpeed": 1485.00,
"OverloadTime": 180,
"FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp",
"EfficiencyMap": {
"1": "GenericMap_140kW_936Nm.vemo",
......@@ -37,11 +37,11 @@
},
{
"Voltage": 900,
"ContinuousTorque": 15015.63,
"ContinuousTorqueSpeed": 168.62,
"OverloadTorque": 17325.73,
"OverloadTorqueSpeed": 170.17,
"OverloadTime": 345,
"ContinuousTorque": 600.00,
"ContinuousTorqueSpeed": 1485.00,
"OverloadTorque": 900.00,
"OverloadTorqueSpeed": 1485.00,
"OverloadTime": 200,
"FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp",
"EfficiencyMap": {
"1": "GenericMap_140kW_936Nm.vemo",
......
Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/IHPC Group 5.vecto
+ 0
− 1
View file @ 00cf5665
......@@ -54,7 +54,6 @@
"Construction",
"HeavyUrban",
"Interurban",
"MunicipalUtility",
"RegionalDelivery",
"Suburban",
"Urban",
......
Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto
+ 0
− 1
View file @ 00cf5665
......@@ -54,7 +54,6 @@
"Construction",
"HeavyUrban",
"Interurban",
"MunicipalUtility",
"RegionalDelivery",
"Suburban",
"Urban",
......
Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_6spd.vem
+ 13
− 13
View file @ 00cf5665
{
"Header": {
"CreatedBy": "",
"Date": "2020-10-09T08:18:42.8238326Z",
"Date": "2022-09-29T07:36:33.1687475Z",
"AppVersion": "3",
"FileVersion": 5
},
......@@ -13,12 +13,12 @@
"ThermalOverloadRecoveryFactor": 0.9,
"VoltageLevels": [
{
"Voltage": 500,
"ContinuousTorque": 1722.91,
"ContinuousTorqueSpeed": 1477,
"OverloadTorque": 1956.56,
"OverloadTorqueSpeed": 1475,
"OverloadTime": 200,
"Voltage": 500.0,
"ContinuousTorque": 600.0,
"ContinuousTorqueSpeed": 1485.0000000000002,
"OverloadTorque": 900.0,
"OverloadTorqueSpeed": 1485.0000000000002,
"OverloadTime": 200.0,
"FullLoadCurve": "IHPC-EM_FLD_min.vemp",
"EfficiencyMap": {
"1": "IHPC-EM_Map_G1.vemo",
......@@ -30,12 +30,12 @@
}
},
{
"Voltage": 900,
"ContinuousTorque": 1736.79,
"ContinuousTorqueSpeed": 1470,
"OverloadTorque": 2010.59,
"OverloadTorqueSpeed": 1482,
"OverloadTime": 230,
"Voltage": 900.0,
"ContinuousTorque": 600.0,
"ContinuousTorqueSpeed": 1485.0000000000002,
"OverloadTorque": 900.0,
"OverloadTorqueSpeed": 1485.0000000000002,
"OverloadTime": 230.0,
"FullLoadCurve": "IHPC-EM_FLD_max.vemp",
"EfficiencyMap": {
"1": "IHPC-EM_Map_G1.vemo",
......
Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_max.vemp
+ 22
− 69
View file @ 00cf5665
n [rpm] , T_drive [Nm] , T_drag [Nm]
0.00 , 1991.48 , -1996.23
1485.45 , 2012.58 , -2017.12
1480.00 , 2012.50 , -2017.06
1488.89 , 2008.08 , -2012.59
1497.78 , 1996.49 , -2000.90
1506.67 , 1985.05 , -1989.36
1511.11 , 1979.38 , -1983.64
1555.56 , 1924.45 , -1928.06
1600.00 , 1872.64 , -1873.95
1644.44 , 1823.64 , -1822.14
1688.89 , 1777.31 , -1772.61
1733.33 , 1733.35 , -1725.55
1777.78 , 1691.62 , -1680.81
1822.22 , 1651.92 , -1638.18
1866.67 , 1614.19 , -1597.61
1911.11 , 1578.24 , -1558.89
1955.56 , 1543.93 , -1521.87
2000.00 , 1511.19 , -1486.49
2044.44 , 1479.89 , -1452.61
2088.89 , 1449.97 , -1420.17
2133.33 , 1421.29 , -1389.02
2177.78 , 1393.85 , -1359.15
2222.22 , 1367.49 , -1330.42
2266.67 , 1342.22 , -1302.82
2311.11 , 1317.93 , -1276.25
2355.56 , 1294.59 , -1250.65
2400.00 , 1272.09 , -1225.93
2444.44 , 1250.48 , -1202.14
2488.89 , 1229.65 , -1179.17
2533.33 , 1209.57 , -1156.97
2577.78 , 1190.24 , -1135.55
2622.22 , 1171.54 , -1114.79
2666.67 , 1153.53 , -1094.75
2711.11 , 1136.07 , -1075.29
2755.56 , 1119.26 , -1056.48
2800.00 , 1102.98 , -1038.25
2844.44 , 1087.20 , -1020.53
2888.89 , 1071.97 , -1003.38
2933.33 , 1057.18 , -986.69
2977.78 , 1042.88 , -970.51
3022.22 , 1028.98 , -954.75
3066.67 , 1015.52 , -939.45
3111.11 , 1002.51 , -924.61
3155.56 , 989.84 , -910.13
3200.00 , 977.52 , -896.02
3244.44 , 965.60 , -882.31
3288.89 , 953.97 , -868.92
3333.33 , 942.69 , -855.88
3377.78 , 931.75 , -843.21
3422.22 , 921.07 , -830.79
3466.67 , 910.72 , -818.73
3511.11 , 900.63 , -806.93
3555.56 , 890.78 , -795.39
3600.00 , 881.23 , -784.15
3644.44 , 871.92 , -773.17
3688.89 , 862.82 , -762.40
3733.33 , 853.96 , -751.89
3777.78 , 845.35 , -741.63
3822.22 , 836.93 , -731.58
3866.67 , 828.76 , -721.79
3911.11 , 820.75 , -712.15
3955.56 , 812.92 , -702.72
4000.00 , 805.30 , -693.49
4044.44 , 797.87 , -684.47
4088.89 , 790.65 , -675.66
4133.33 , 783.52 , -666.94
4177.78 , 776.59 , -658.44
4222.22 , 769.85 , -650.14
4266.67 , 763.22 , -641.94
0, 900.00, -900.00
30, 900.00, -900.00
297, 900.00, -900.00
594, 900.00, -900.00
891, 900.00, -900.00
1188, 900.00, -900.00
1485, 900.00, -900.00
1782, 750.00, -750.00
2079, 642.86, -642.86
2376, 562.50, -562.50
2673, 500.00, -500.00
2970, 450.00, -450.00
3267, 409.09, -409.09
3564, 375.00, -375.00
3861, 346.15, -346.15
4158, 321.43, -321.43
4455, 300.00, -300.00
4752, 281.25, -281.25
5049, 264.71, -264.71
5346, 250.00, -250.00
5643, 236.84, -236.84
5940, 225.00, -225.00
Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_min.vemp
+ 22
− 69
View file @ 00cf5665
n [rpm] , T_drive [Nm] , T_drag [Nm]
0.00 , 1991.48 , -1996.23
1485.45 , 2012.58 , -2017.12
1480.00 , 2012.50 , -2017.06
1488.89 , 2008.08 , -2012.59
1497.78 , 1996.49 , -2000.90
1506.67 , 1985.05 , -1989.36
1511.11 , 1979.38 , -1983.64
1555.56 , 1924.45 , -1928.06
1600.00 , 1872.64 , -1873.95
1644.44 , 1823.64 , -1822.14
1688.89 , 1777.31 , -1772.61
1733.33 , 1733.35 , -1725.55
1777.78 , 1691.62 , -1680.81
1822.22 , 1651.92 , -1638.18
1866.67 , 1614.19 , -1597.61
1911.11 , 1578.24 , -1558.89
1955.56 , 1543.93 , -1521.87
2000.00 , 1511.19 , -1486.49
2044.44 , 1479.89 , -1452.61
2088.89 , 1449.97 , -1420.17
2133.33 , 1421.29 , -1389.02
2177.78 , 1393.85 , -1359.15
2222.22 , 1367.49 , -1330.42
2266.67 , 1342.22 , -1302.82
2311.11 , 1317.93 , -1276.25
2355.56 , 1294.59 , -1250.65
2400.00 , 1272.09 , -1225.93
2444.44 , 1250.48 , -1202.14
2488.89 , 1229.65 , -1179.17
2533.33 , 1209.57 , -1156.97
2577.78 , 1190.24 , -1135.55
2622.22 , 1171.54 , -1114.79
2666.67 , 1153.53 , -1094.75
2711.11 , 1136.07 , -1075.29
2755.56 , 1119.26 , -1056.48
2800.00 , 1102.98 , -1038.25
2844.44 , 1087.20 , -1020.53
2888.89 , 1071.97 , -1003.38
2933.33 , 1057.18 , -986.69
2977.78 , 1042.88 , -970.51
3022.22 , 1028.98 , -954.75
3066.67 , 1015.52 , -939.45
3111.11 , 1002.51 , -924.61
3155.56 , 989.84 , -910.13
3200.00 , 977.52 , -896.02
3244.44 , 965.60 , -882.31
3288.89 , 953.97 , -868.92
3333.33 , 942.69 , -855.88
3377.78 , 931.75 , -843.21
3422.22 , 921.07 , -830.79
3466.67 , 910.72 , -818.73
3511.11 , 900.63 , -806.93
3555.56 , 890.78 , -795.39
3600.00 , 881.23 , -784.15
3644.44 , 871.92 , -773.17
3688.89 , 862.82 , -762.40
3733.33 , 853.96 , -751.89
3777.78 , 845.35 , -741.63
3822.22 , 836.93 , -731.58
3866.67 , 828.76 , -721.79
3911.11 , 820.75 , -712.15
3955.56 , 812.92 , -702.72
4000.00 , 805.30 , -693.49
4044.44 , 797.87 , -684.47
4088.89 , 790.65 , -675.66
4133.33 , 783.52 , -666.94
4177.78 , 776.59 , -658.44
4222.22 , 769.85 , -650.14
4266.67 , 763.22 , -641.94
0, 900.00, -900.00
30, 900.00, -900.00
297, 900.00, -900.00
594, 900.00, -900.00
891, 900.00, -900.00
1188, 900.00, -900.00
1485, 900.00, -900.00
1782, 750.00, -750.00
2079, 642.86, -642.86
2376, 562.50, -562.50
2673, 500.00, -500.00
2970, 450.00, -450.00
3267, 409.09, -409.09
3564, 375.00, -375.00
3861, 346.15, -346.15
4158, 321.43, -321.43
4455, 300.00, -300.00
4752, 281.25, -281.25
5049, 264.71, -264.71
5346, 250.00, -250.00
5643, 236.84, -236.84
5940, 225.00, -225.00
\ No newline at end of file
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