diff --git a/Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md b/Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md
index ec40c97611cc40ec9317a708049896524ea05699..c3e32012c2084985ad0efc3c7636c1f1c4ecb69c 100644
--- a/Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md
+++ b/Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md
@@ -92,7 +92,7 @@ Acceleration Limiting
###Chart Area
-If a valid [Vehicle File](#vehicle-editor), [Engine File](#engine-file-.veng) and [Gearbox File](#gearbox-file-.vgbx) is loaded into the Editor the main vehicle parameters like HDV class and axle configuration are shown here. The plot shows the full load curve(s) and sampling points of the fuel consumption map.
+If a valid [Vehicle File](#vehicle-editor), [Engine File](#engine-file-.veng) and [Gearbox File](#gearbox-file-.vgbx) is loaded into the Editor the main vehicle parameters like HDV group and axle configuration are shown here. The plot shows the full load curve(s) and sampling points of the fuel consumption map.
###Controls
diff --git a/Documentation/User Manual/1-user-interface/D2_VTP-Job-Editor.md b/Documentation/User Manual/1-user-interface/D2_VTP-Job-Editor.md
index 53b28e597d6a6dbaac3a5e2d073653ebca543661..f691f1c1fea3d763bc017b4c08ba6184f53e6689 100644
--- a/Documentation/User Manual/1-user-interface/D2_VTP-Job-Editor.md
+++ b/Documentation/User Manual/1-user-interface/D2_VTP-Job-Editor.md
@@ -45,7 +45,7 @@ Cycles
###Chart Area
-If a valid Vehicle File is loaded into the Editor the main vehicle parameters like HDV class and axle configuration are shown here. The plot shows the full load curve(s) and sampling points of the fuel consumption map.
+If a valid Vehicle File is loaded into the Editor the main vehicle parameters like HDV group and axle configuration are shown here. The plot shows the full load curve(s) and sampling points of the fuel consumption map.
###Controls
diff --git a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
index 1717977bf6dda36df6c18d9cd4add4eaf840dffa..bc2ff49647064f584c0f9f8b79a574141e521abf 100644
--- a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
+++ b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
@@ -4,7 +4,7 @@
###Description
-The [Vehicle File (.vveh)](#vehicle-file-.vveh) defines the main vehicle/chassis parameters like axles including [RRC](#vehicle-rolling-resistance-coefficient)s, air resistance and weight.
+The [Vehicle File (.vveh)](#vehicle-file-.vveh) defines the main vehicle/chassis parameters like axles including [RRC](#vehicle-rolling-resistance-coefficient)s, air resistance and masses.
The Vehicle Editor contains 3 tabs to edit all vehicle-related parameters. The 'General' tab allows to input mass, loading, air resistance, vehicle axles, etc. The 'Powertrain' allows to define the retarder, an optional angle drive, or PTO consumer. In the third tab the engine torque can be limited to a maximum for individual gears.
@@ -18,33 +18,33 @@ VECTO automatically uses relative paths if the input file (e.g. Retarder Losses
###General vehicle parameters
Vehicle Category
-: Needed for [Declaration Mode](#declaration-mode) to identify the HDV Class.
+: Needed for [Declaration Mode](#declaration-mode) to identify the HDV Group.
Axle Configuration
-: Needed for [Declaration Mode](#declaration-mode) to identify the HDV Class.
+: Needed for [Declaration Mode](#declaration-mode) to identify the HDV Group.
-Gross Vehicle Mass Rating [t]
-: Needed for [Declaration Mode](#declaration-mode) to identify the HDV Class.
+Technically Permissible Maximum Laden Mass [t]
+: Needed for [Declaration Mode](#declaration-mode) to identify the HDV Group.
-HDV Class
-: Displays the automatically selected HDV Class depending on the settings above.
+HDV Group
+: Displays the automatically selected HDV Group depending on the settings above.
-###Weight/Loading
+###Masses/Loading
-Curb Weight Vehicle
-: Specifies the vehicle's weight without loading
+Corrected Actual Curb Mass Vehicle
+: Specifies the vehicle's mass without loading
<div class="engineering">
-Curb Weight Extra Trailer/Body
-: Specifies additional weight due to superstructures on the vehicle or an additional trailer
+Curb Mass Extra Trailer/Body
+: Specifies additional mass due to superstructures on the vehicle or an additional trailer
Loading
: Speciefies the loading of both, the vehicle and if available the trailer
</div>
-**Max. Loading** displays a hint for the maximum possible loading for the selected vehicle depending on curb weight and GVW values (without taking into account the loading capacity of an additional trailer).
+**Max. Loading** displays a hint for the maximum possible loading for the selected vehicle depending on curb mass and TPMLM values (without taking into account the loading capacity of an additional trailer).
-***Note:*** *VECTO uses the sum of* ***Curb Weight Vehicle, Curb Weight Extra Trailer/Body*** *and* ***Loading*** *for calculation! The total weight is distributed to all defined axles according to the relative weight share.*
+***Note:*** *VECTO uses the sum of* ***Corrected Actual Curb Mass Vehicle, Curb Mass Extra Trailer/Body*** *and* ***Loading*** *for calculation! The total mass is distributed to all defined axles according to the relative axle load share.*
<div class="declaration">
In Declaration Mode only the vehicle itself needs to be specified. Depending on the vehicle category and mission the simulation adds a standard trailer for certain missions.
@@ -91,7 +91,7 @@ Use the  and  butto
<div class="declaration">
In [Declaration mode](#declaration-mode) only the axles of the truck have to be given (e.g., 2 axles for a 4x2 truck).
The dynamic tyre radius is derived from the second axle as it is assumed this is the driven axle.
-For missions with a trailer predefined wheels and weight-shares are added by Vecto automatically.
+For missions with a trailer predefined wheels and load-shares are added by Vecto automatically.
</div>
Doubleclick entries to edit existing axle configurations.
diff --git a/Documentation/User Manual/3-simulation-models/Vehicle_RRC.md b/Documentation/User Manual/3-simulation-models/Vehicle_RRC.md
index ab0a8165368af5207a90aa46f7749d1d3c0f109b..3d02e10bd4466d1988c3558d74dee57186b73e76 100644
--- a/Documentation/User Manual/3-simulation-models/Vehicle_RRC.md
+++ b/Documentation/User Manual/3-simulation-models/Vehicle_RRC.md
@@ -2,7 +2,7 @@
The rolling resistance is calculated using a speed-independent rolling resistance coefficient (RRC).
-In order to consider that the RRC depends on the vehicle weight it is modelled as a function of the total vehicle mass. The total RRC is calculated in VECTO using the following equation (the index i refers to the vehicle's axle (truck and trailer)):
+In order to consider that the RRC depends on the vehicle's mass it is modelled as a function of the total vehicle mass. The total RRC is calculated in VECTO using the following equation (the index i refers to the vehicle's axle (truck and trailer)):
$RRC = \sum_{i=1}^{n} s_{(i)} \cdot RRC_{ISO(i)} \cdot \left( \frac{s_{(i)} \cdot m \cdot g }{w_{(i)} \cdot F_{zISO(i)} } \right)^{\beta-1}$
diff --git a/Documentation/User Manual/5-input-and-output-files/VSUM.md b/Documentation/User Manual/5-input-and-output-files/VSUM.md
index 2d8d7e233b9bc0fcb56e6a8ed3b3445a7d0aca85..ba34cd20542ccd783d9879780b977ad554c0c1af 100644
--- a/Documentation/User Manual/5-input-and-output-files/VSUM.md
+++ b/Documentation/User Manual/5-input-and-output-files/VSUM.md
@@ -9,7 +9,7 @@ The .vsum file includes total / average results for each calculation run in one
| Input File | [-] | Name of the input job file (.vecto) |
| Cycle | [-] | Name of the cycle file (or cycle name in declaration mode) |
| Status | [-] | The result status of the run (Success, Aborted) |
-| Mass | [kg] | Vehicle mass (**Curb Weight Vehicle** + **Curb Weight Extra Trailer/Body**, see [Vehicle Editor](#vehicle-editor)) |
+| Mass | [kg] | Vehicle mass (**Corected Actual Curb Mass Vehicle** + **Curb Mass Extra Trailer/Body**, see [Vehicle Editor](#vehicle-editor)) |
| Loading | [kg] | Vehicle loading (see [Vehicle Editor](#vehicle-editor)) |
| Cargo Volume | [m^3] | Vehicle cargo volume (Declaration Mode only!) |
| time | [s] | Total simulation time |
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 3083ca2290b7a902f10026dd5e167190e7ac2933..da1294962218ca0d8ec2d0526e06343ad58b4fb3 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -1337,7 +1337,7 @@ lbDlog:
PicVehicle.Image = ConvPicPath(If(Not s0.Found, -1, HDVclass.ToInt()), False) _
'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False))
- TbHVCclass.Text = String.Format("HDV Class {0}", HDVclass)
+ TbHVCclass.Text = String.Format("HDV Group {0}", HDVclass)
TbVehCat.Text = vehicle.VehicleCategory.GetCategoryName() 'ConvVehCat(VEH0.VehCat, True)
TbMass.Text = (vehicle.GrossVehicleMassRating.Value() / 1000) & " t"
TbAxleConf.Text = vehicle.AxleConfiguration.GetName() 'ConvAxleConf(VEH0.AxleConf)
diff --git a/VECTO/GUI/VectoVTPJobForm.vb b/VECTO/GUI/VectoVTPJobForm.vb
index 05e9f9ce6b843cdd908ccb5bf2cfb04c664effaa..e667c47311c5dcc4ea63bf4b1b186b4c75241565 100644
--- a/VECTO/GUI/VectoVTPJobForm.vb
+++ b/VECTO/GUI/VectoVTPJobForm.vb
@@ -655,7 +655,7 @@ Public Class VectoVTPJobForm
PicVehicle.Image = ConvPicPath(If(Not s0.Found, -1, HDVclass.ToInt()), False) _
'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False))
- TbHVCclass.Text = String.Format("HDV Class {0}", HDVclass)
+ TbHVCclass.Text = String.Format("HDV Group {0}", HDVclass)
TbVehCat.Text = vehicle.VehicleCategory.GetCategoryName() 'ConvVehCat(VEH0.VehCat, True)
TbMass.Text = (vehicle.GrossVehicleMassRating.Value() / 1000) & " t"
TbAxleConf.Text = vehicle.AxleConfiguration.GetName() 'ConvAxleConf(VEH0.AxleConf)
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index a577e3dc35771594491c66ff2b93a3900465c803..55dacc3f792b787179936d17d7959afa0294d563 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -177,15 +177,15 @@ Partial Class VehicleForm
'Label1
'
Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(27, 22)
+ Me.Label1.Location = New System.Drawing.Point(6, 22)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(139, 13)
+ Me.Label1.Size = New System.Drawing.Size(177, 13)
Me.Label1.TabIndex = 0
- Me.Label1.Text = "Corrected Actual Curb Mass"
+ Me.Label1.Text = "Corrected Actual Curb Mass Vehicle"
'
'TbMass
'
- Me.TbMass.Location = New System.Drawing.Point(172, 19)
+ Me.TbMass.Location = New System.Drawing.Point(188, 19)
Me.TbMass.Name = "TbMass"
Me.TbMass.Size = New System.Drawing.Size(57, 20)
Me.TbMass.TabIndex = 0
@@ -193,7 +193,7 @@ Partial Class VehicleForm
'Label2
'
Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(115, 31)
+ Me.Label2.Location = New System.Drawing.Point(128, 31)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(45, 13)
Me.Label2.TabIndex = 2
@@ -201,7 +201,7 @@ Partial Class VehicleForm
'
'TbLoad
'
- Me.TbLoad.Location = New System.Drawing.Point(166, 28)
+ Me.TbLoad.Location = New System.Drawing.Point(182, 28)
Me.TbLoad.Name = "TbLoad"
Me.TbLoad.Size = New System.Drawing.Size(57, 20)
Me.TbLoad.TabIndex = 1
@@ -262,7 +262,7 @@ Partial Class VehicleForm
'Label14
'
Me.Label14.AutoSize = true
- Me.Label14.Location = New System.Drawing.Point(231, 22)
+ Me.Label14.Location = New System.Drawing.Point(247, 22)
Me.Label14.Name = "Label14"
Me.Label14.Size = New System.Drawing.Size(25, 13)
Me.Label14.TabIndex = 24
@@ -271,7 +271,7 @@ Partial Class VehicleForm
'Label31
'
Me.Label31.AutoSize = true
- Me.Label31.Location = New System.Drawing.Point(225, 31)
+ Me.Label31.Location = New System.Drawing.Point(241, 31)
Me.Label31.Name = "Label31"
Me.Label31.Size = New System.Drawing.Size(25, 13)
Me.Label31.TabIndex = 24
@@ -522,7 +522,7 @@ Partial Class VehicleForm
'Label46
'
Me.Label46.AutoSize = true
- Me.Label46.Location = New System.Drawing.Point(6, 5)
+ Me.Label46.Location = New System.Drawing.Point(32, 5)
Me.Label46.Name = "Label46"
Me.Label46.Size = New System.Drawing.Size(145, 13)
Me.Label46.TabIndex = 31
@@ -531,7 +531,7 @@ Partial Class VehicleForm
'Label50
'
Me.Label50.AutoSize = true
- Me.Label50.Location = New System.Drawing.Point(225, 5)
+ Me.Label50.Location = New System.Drawing.Point(241, 5)
Me.Label50.Name = "Label50"
Me.Label50.Size = New System.Drawing.Size(25, 13)
Me.Label50.TabIndex = 24
@@ -539,7 +539,7 @@ Partial Class VehicleForm
'
'TbMassExtra
'
- Me.TbMassExtra.Location = New System.Drawing.Point(166, 2)
+ Me.TbMassExtra.Location = New System.Drawing.Point(182, 2)
Me.TbMassExtra.Name = "TbMassExtra"
Me.TbMassExtra.Size = New System.Drawing.Size(57, 20)
Me.TbMassExtra.TabIndex = 0
@@ -734,7 +734,7 @@ Partial Class VehicleForm
Me.GroupBox1.Size = New System.Drawing.Size(278, 118)
Me.GroupBox1.TabIndex = 0
Me.GroupBox1.TabStop = false
- Me.GroupBox1.Text = "Weight / Loading"
+ Me.GroupBox1.Text = "Masses / Loading"
'
'PnLoad
'
@@ -746,7 +746,7 @@ Partial Class VehicleForm
Me.PnLoad.Controls.Add(Me.Label46)
Me.PnLoad.Location = New System.Drawing.Point(6, 43)
Me.PnLoad.Name = "PnLoad"
- Me.PnLoad.Size = New System.Drawing.Size(256, 58)
+ Me.PnLoad.Size = New System.Drawing.Size(269, 58)
Me.PnLoad.TabIndex = 1
'
'GrAirRes
@@ -1095,7 +1095,7 @@ Partial Class VehicleForm
'
'tbVehIdlingSpeed
'
- Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(169, 3)
+ Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(185, 4)
Me.tbVehIdlingSpeed.Name = "tbVehIdlingSpeed"
Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(57, 20)
Me.tbVehIdlingSpeed.TabIndex = 0
@@ -1103,7 +1103,7 @@ Partial Class VehicleForm
'Label18
'
Me.Label18.AutoSize = true
- Me.Label18.Location = New System.Drawing.Point(229, 6)
+ Me.Label18.Location = New System.Drawing.Point(241, 7)
Me.Label18.Name = "Label18"
Me.Label18.Size = New System.Drawing.Size(30, 13)
Me.Label18.TabIndex = 24
@@ -1112,7 +1112,7 @@ Partial Class VehicleForm
'Label19
'
Me.Label19.AutoSize = true
- Me.Label19.Location = New System.Drawing.Point(69, 6)
+ Me.Label19.Location = New System.Drawing.Point(82, 6)
Me.Label19.Name = "Label19"
Me.Label19.Size = New System.Drawing.Size(94, 13)
Me.Label19.TabIndex = 8
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index f6829c24af3f5d6ced7bd63aa978aed819fff6f5..7c60bb966a0f181f6bd72653da81a8a1eb31cfec 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -83,7 +83,7 @@ Public Class VehicleForm
CbAxleConfig.DisplayMember = "Label"
If (cfg.DeclMode) Then
CbAxleConfig.DataSource = DeclarationData.Segments.GetAxleConfigurations() _
- .Cast(Of AxleConfiguration) _
+ .Cast(Of AxleConfiguration) _
.Select(Function(category) New With {Key .Value = category, .Label = category.GetName()}).ToList()
else
CbAxleConfig.DataSource = [Enum].GetValues(GetType(AxleConfiguration)) _
@@ -922,5 +922,13 @@ Public Class VehicleForm
End If
_torqueLimitDlog.tbGear.ReadOnly = False
End Sub
+
+ Private Sub Label18_Click(sender As Object, e As EventArgs) Handles Label18.Click
+
+ End Sub
+
+ Private Sub tbVehIdlingSpeed_TextChanged(sender As Object, e As EventArgs) Handles tbVehIdlingSpeed.TextChanged
+
+ End Sub
End Class
diff --git a/VectoCore/VectoCore/Models/Declaration/HVAC.cs b/VectoCore/VectoCore/Models/Declaration/HVAC.cs
index 650b6c576ca488b4616201e3a868c3e430517f8b..d7ea6d3ee4f5b3254bb44b707689cb8c0d0dc762 100644
--- a/VectoCore/VectoCore/Models/Declaration/HVAC.cs
+++ b/VectoCore/VectoCore/Models/Declaration/HVAC.cs
@@ -58,11 +58,11 @@ namespace TUGraz.VectoCore.Models.Declaration
protected override void ParseData(DataTable table)
{
foreach (DataRow row in table.Rows) {
- var hdvClass = VehicleClassHelper.Parse(row.Field<string>("hdvclass"));
+ var hdvClass = VehicleClassHelper.Parse(row.Field<string>("hdvgroup"));
var technology = row.Field<string>("technology");
foreach (DataColumn col in table.Columns) {
var value = row.ParseDoubleOrGetDefault(col.Caption, double.NaN);
- if (col.Caption != "hdvclass" && col.Caption != "technology" && !double.IsNaN(value)) {
+ if (col.Caption != "hdvgroup" && col.Caption != "technology" && !double.IsNaN(value)) {
Data[Tuple.Create(col.Caption.ParseEnum<MissionType>(), technology, hdvClass)] = new AuxDemandEntry() {
PowerDemand = value.SI<Watt>()
};
diff --git a/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs b/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs
index 2089c310f32077c1d6e54338a784dd03a9e089c8..1f3dd68140befee267dbc6dcb5a9fad11f937e2e 100644
--- a/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs
+++ b/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs
@@ -85,9 +85,9 @@ namespace TUGraz.VectoCore.Models.Declaration
protected override void ParseData(DataTable table)
{
foreach (DataRow row in table.Rows) {
- var hdvClass = VehicleClassHelper.Parse(row.Field<string>("hdvclass"));
+ var hdvClass = VehicleClassHelper.Parse(row.Field<string>("hdvgroup"));
foreach (DataColumn col in table.Columns) {
- if (col.Caption == "hdvclass" || string.IsNullOrWhiteSpace(row.Field<string>(col.Caption))) {
+ if (col.Caption == "hdvgroup" || string.IsNullOrWhiteSpace(row.Field<string>(col.Caption))) {
continue;
}
var values = row.Field<string>(col.Caption).Split('/')
diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
index 083376b1da77bccb6dd3acbd766c65394efae385..2c854573408e2563c79e2b3bfda6f042982cc5f8 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
@@ -1,4 +1,4 @@
-Technology , HDV Class , Long haul , Regional delivery , Urban delivery , Municipal utility , Construction
+Technology , HDV Group , Long haul , Regional delivery , Urban delivery , Municipal utility , Construction
None , 1 , 0 , 0 , 0 , 0 , 0
None , 2 , 0 , 0 , 0 , 0 , 0
None , 3 , 0 , 0 , 0 , 0 , 0
diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
index 870c6627161f4e732e41c3400342a87d01e93827..b769bdae86b0e17c753be6f1e0a46cef12df3441 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
@@ -1,4 +1,4 @@
-HDV Class , Long haul , Regional delivery , Urban delivery , Municipal utility , Construction
+HDV Group , Long haul , Regional delivery , Urban delivery , Municipal utility , Construction
1 , , 240/20/20 , 220/20/30 , ,
2 , 340/30/0 , 290/30/20 , 260/20/30 , ,
3 , , 310/30/30 , 280/30/40 , ,