diff --git a/VectoCommon/VectoCommon/Models/AxleConfiguration.cs b/VectoCommon/VectoCommon/Models/AxleConfiguration.cs
index 4c8205788ec12d0402f111f86674579194e4b07b..22d1988c55d0bcf089163242b7531993aa236fd2 100644
--- a/VectoCommon/VectoCommon/Models/AxleConfiguration.cs
+++ b/VectoCommon/VectoCommon/Models/AxleConfiguration.cs
@@ -112,6 +112,7 @@ namespace TUGraz.VectoCommon.Models
{
switch (self) {
case AxleConfiguration.AxleConfig_4x2:
+ case AxleConfiguration.AxleConfig_4x2F:
case AxleConfiguration.AxleConfig_6x2:
case AxleConfiguration.AxleConfig_8x2:
return 1;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeBusVectoRunDataFactory.cs
index 181505dd7b419c0ab374f169f4a942fb0ee952d2..0d62ebcaf1caa6d19c7b9d08c3187dd95204fc7e 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeBusVectoRunDataFactory.cs
@@ -105,7 +105,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
DriverData = _driverdata,
ExecutionMode = ExecutionMode.Declaration,
JobName = InputDataProvider.JobInputData.JobName,
- ModFileSuffix = (engineModes.Count > 1 ? string.Format("_EngineMode{0}_", modeIdx) : "") + loading.Key.ToString(),
+ ModFileSuffix = (engineModes.Count > 1 ? string.Format("_EngineMode{0}_", modeIdx) : "") + "_" + mission.BusParameter.BusGroup.GetClassNumber() + "_" + loading.Key.ToString(),
Report = Report,
Mission = mission,
InputDataHash = InputDataProvider.XMLHash,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
index 4ae184fe5a3c7bc2debcdf6f2c86b0ce39fd8618..f8da5927c15cdc87d67e4e74260e02a791a65813 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl {
DriverData = _driverdata,
ExecutionMode = ExecutionMode.Declaration,
JobName = InputDataProvider.JobInputData.JobName,
- ModFileSuffix = (engineModes.Count > 1 ? string.Format("_EngineMode{0}_", modeIdx) : "") + loading.Key.ToString(),
+ ModFileSuffix = (engineModes.Count > 1 ? string.Format("_EngineMode{0}_", modeIdx) : "") + "_" + mission.BusParameter.BusGroup.GetClassNumber() + "_" + loading.Key.ToString(),
Report = Report,
Mission = mission,
InputDataHash = InputDataProvider.XMLHash,
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs
index 41f77b25c0344bcd14b4605bd5d08d2c0a205f81..d10d3aee110b78c15ecf524f6ec0f22a18aaaa16 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs
@@ -81,6 +81,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries
if (auxConfig == null) {
throw new VectoException("Auxiliary configuration missing!");
}
+
var ssmTool = new SSMTOOL(auxConfig.SSMInputs);
var M14 = new M14aImpl(ssmTool);
return M14.AuxHeaterDemand(cycleTime, engineWasteHeatTotal);
@@ -197,7 +198,8 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries
public NormLiter PSAirGenerated
{
get {
- if (M6.OverrunFlag && Signals.ClutchEngaged && !Signals.InNeutral) {
+ if (auxConfig.PneumaticUserInputsConfig.SmartAirCompression && M6.OverrunFlag && Signals.ClutchEngaged &&
+ !Signals.InNeutral) {
if (M8.CompressorFlag) {
return M4.GetFlowRate() *
auxConfig.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction
@@ -299,6 +301,5 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries
foreach (var moduel in modules)
moduel.ResetCalculations();
}
-
}
}
diff --git a/VectoCore/VectoCore/Models/Declaration/BusSegments.cs b/VectoCore/VectoCore/Models/Declaration/BusSegments.cs
index 34015fd2a4b92516883e7f5251c927ec5b569499..bcc604c908c34aa8e0a907c89ec0916626259ddd 100644
--- a/VectoCore/VectoCore/Models/Declaration/BusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/BusSegments.cs
@@ -122,6 +122,7 @@ namespace TUGraz.VectoCore.Models.Declaration
TotalCargoVolume = 0.SI<CubicMeter>(),
DefaultCDxA = row.ParseDouble("cdxastandard").SI<SquareMeter>(),
BusParameter = new BusParameters() {
+ BusGroup = VehicleClassHelper.Parse(row.Field<string>("hdvgroup")),
VehicleLength = row.ParseDouble("length").SI<Meter>(),
VehicleWidth = row.ParseDouble("width").SI<Meter>(),
BodyHeight = row.ParseDouble("bodyheight").SI<Meter>(),
diff --git a/VectoCore/VectoCore/Models/Declaration/Mission.cs b/VectoCore/VectoCore/Models/Declaration/Mission.cs
index 7246046f673d1d1ed341d23e5b9088dd5d7ed1fa..3c36958916f7c461c8a6640867156a34fd00c485 100644
--- a/VectoCore/VectoCore/Models/Declaration/Mission.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Mission.cs
@@ -121,6 +121,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public bool HVACSeparateAirDistributionDucts { get; internal set; }
public PerSquareMeter PassengerDensity { get; internal set; }
+ public VehicleClass BusGroup { get; internal set; }
}
public class MissionTrailer
diff --git a/VectoCore/VectoCore/Models/Declaration/VehicleClass.cs b/VectoCore/VectoCore/Models/Declaration/VehicleClass.cs
index 21e6230b5c32ebd08be94faa8090e089a9064e88..79772bb4979ff89201ebbba7d134526f1e7d65e4 100644
--- a/VectoCore/VectoCore/Models/Declaration/VehicleClass.cs
+++ b/VectoCore/VectoCore/Models/Declaration/VehicleClass.cs
@@ -61,6 +61,26 @@ namespace TUGraz.VectoCore.Models.Declaration
Class15,
Class16,
Class17,
+ ClassP31SD,
+ ClassP31DD,
+ ClassP32SD,
+ ClassP32DD,
+ ClassP33SD,
+ ClassP33DD,
+ ClassP34SD,
+ ClassP34DD,
+ ClassP35SD,
+ ClassP35DD,
+ ClassP36SD,
+ ClassP36DD,
+ ClassP37SD,
+ ClassP37DD,
+ ClassP38SD,
+ ClassP38DD,
+ ClassP39SD,
+ ClassP39DD,
+ ClassP40SD,
+ ClassP40DD,
ClassPB41,
ClassPB42,
ClassPB43,
diff --git a/VectoCore/VectoCore/OutputData/DeclarationReport.cs b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
index c3f6109b4a90934f196a66238f01fe4040e673d4..44156fa6266dd2183d16ee21a1f3ed05037de220 100644
--- a/VectoCore/VectoCore/OutputData/DeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
@@ -63,7 +63,8 @@ namespace TUGraz.VectoCore.OutputData
* called after the simulation run providing the modal data of the simulation
* for the given configuration
*/
- void AddResult(LoadingType loadingType, Mission mission, int fuelMode, VectoRunData runData, IModalDataContainer modData);
+ void AddResult(
+ LoadingType loadingType, Mission mission, int fuelMode, VectoRunData runData, IModalDataContainer modData);
}
public interface IResultEntry
@@ -87,7 +88,7 @@ namespace TUGraz.VectoCore.OutputData
/// <summary>
/// Class for creating a declaration report.
/// </summary>
- public abstract class DeclarationReport<T> : IDeclarationReport where T : IResultEntry, new()
+ public abstract class DeclarationReport<T> : IDeclarationReport where T : IResultEntry, new()
{
public class ResultContainer<TEntry>
{
@@ -104,7 +105,6 @@ namespace TUGraz.VectoCore.OutputData
// new Dictionary<MissionType, ResultContainer<T>>();
//protected readonly Dictionary<int, Dictionary<MissionType, ResultContainer<T>>> Missions =
//new Dictionary<int, Dictionary<MissionType, ResultContainer<T>>>();
-
protected readonly List<T> Results = new List<T>();
/// <summary>
@@ -116,8 +116,6 @@ namespace TUGraz.VectoCore.OutputData
///// The declaration segment from the segment table
///// </summary>
//internal Segment? Segment { get; set; }
-
-
/// <summary>
/// The result count determines how many results must be given before the report gets written.
/// </summary>
@@ -167,11 +165,13 @@ namespace TUGraz.VectoCore.OutputData
_resultCount--;
if (_resultCount == 0) {
DoWriteReport();
+
//Flc = null;
}
}
- public void AddResult(LoadingType loadingType, Mission mission, int fuelMode, VectoRunData runData,
+ public void AddResult(
+ LoadingType loadingType, Mission mission, int fuelMode, VectoRunData runData,
IModalDataContainer modData)
{
//if (!Missions.ContainsKey(fuelMode)) {
@@ -184,7 +184,6 @@ namespace TUGraz.VectoCore.OutputData
// throw new VectoException("Unknown loading type {0} for mission {1}", loadingType, mission.MissionType);
//}
-
//if (mission.MissionType != MissionType.ExemptedMission) {
// DoAddResult(Missions[fuelMode][mission.MissionType].ResultEntry[loadingType], runData, modData);
//}
@@ -199,6 +198,7 @@ namespace TUGraz.VectoCore.OutputData
entry.TotalVehicleWeight = runData.VehicleData.TotalVehicleMass;
entry.CargoVolume = runData.VehicleData.CargoVolume;
entry.VehicleClass = runData.VehicleData.VehicleClass;
+
// subtract driver!
entry.PassengerCount = (runData.BusAuxiliaries?.SSMInputs.NumberOfPassengers ?? 0) - 1;
Results.Add(entry);
@@ -231,4 +231,4 @@ namespace TUGraz.VectoCore.OutputData
public abstract void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes);
}
-}
\ No newline at end of file
+}
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index ee350ca28cbf380e062adaaac822878f7e1abd1e..d968799e596d9d960098899ad6a16796310fc980 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -389,7 +389,9 @@ namespace TUGraz.VectoCore.OutputData
(current, fuel) => current + modData.TotalFuelConsumption(ModalResultField.FCFinal, fuel) *
fuel.LowerHeatingValueVecto);
- var auxHeaterDemand = modData.AuxHeaterDemandCalc(duration, engineWasteheatSum);
+ var auxHeaterDemand = modData.AuxHeaterDemandCalc == null
+ ? 0.SI<Joule>()
+ : modData.AuxHeaterDemandCalc(duration, engineWasteheatSum);
row[Fields.E_BusAux_AuxHeater] = auxHeaterDemand.Cast<WattSecond>().ConvertToKiloWattHour();
@@ -668,7 +670,7 @@ namespace TUGraz.VectoCore.OutputData
private void WriteFullPowertrain(VectoRunData runData, DataRow row)
{
- WriteVehicleData(runData.VehicleData, runData.GearboxData.Type, row);
+ WriteVehicleData(runData, row);
if (runData.BusAuxiliaries != null) {
// subtract driver!
@@ -696,13 +698,16 @@ namespace TUGraz.VectoCore.OutputData
}
- private static void WriteVehicleData(VehicleData data, GearboxType gbxType, DataRow row)
+ private static void WriteVehicleData(VectoRunData runData, DataRow row)
{
+ var data = runData.VehicleData;
+ var gbxType = runData.GearboxData.Type;
+
row[Fields.VEHICLE_MANUFACTURER] = data.Manufacturer;
row[Fields.VIN_NUMBER] = data.VIN;
row[Fields.VEHICLE_MODEL] = data.ModelName;
- row[Fields.HDV_CO2_VEHICLE_CLASS] = data.VehicleClass.GetClassNumber();
+ row[Fields.HDV_CO2_VEHICLE_CLASS] = runData.Mission.BusParameter?.BusGroup.GetClassNumber() ?? data.VehicleClass.GetClassNumber();
row[Fields.CURB_MASS] = (ConvertedSI)data.CurbMass;
// - (data.BodyAndTrailerWeight ?? 0.SI<Kilogram>());
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index 43ccbc3dbe6994407a2c5320ba87f62957213949..3328d48277d597527723433ecf5578e381c66d62 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -177,7 +177,9 @@ namespace TUGraz.VectoCore.OutputData.XML
(current, fuel) => current + data.TotalFuelConsumption(ModalResultField.FCFinal, fuel) *
fuel.LowerHeatingValueVecto);
- var auxHeaterDemand = data.AuxHeaterDemandCalc(data.Duration, engineWasteheatSum);
+ var auxHeaterDemand = data.AuxHeaterDemandCalc == null
+ ? 0.SI<Joule>()
+ : data.AuxHeaterDemandCalc(data.Duration, engineWasteheatSum);
var firstFuel = true;
foreach (var entry in data.FuelData) {
@@ -227,8 +229,8 @@ namespace TUGraz.VectoCore.OutputData.XML
private static WattSecond WorkBusAuxCorrection(VectoRunData runData, IModalDataContainer data)
{
var workBusAuxPSCompOff = data.EnergyPneumaticCompressorPowerOff();
- var workBusAuxPSCompOn = data.EnergyPneumaticCompressorOn();
- var airBusAuxPSON = data.AirGenerated();
+ var workBusAuxPSCompOn = data.EnergyPneumaticCompressorAlwaysOn();
+ var airBusAuxPSON = data.AirGeneratedAlwaysOn();
var deltaAir = data.AirConsumed() - data.AirGenerated();
var kAir = (workBusAuxPSCompOn - workBusAuxPSCompOff) / (airBusAuxPSON - 0.SI<NormLiter>());
diff --git a/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv
index 27a9d77fdbee2e73f4b440b1f0fee40448d354da..32f87e1ba103d57988d71838a2b7ceff0801720b 100644
--- a/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv
@@ -3,24 +3,24 @@ HDV group , Production Stage , Vehicle Category , HDV SuperGroup , Articulated ,
P31SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 4.9 , 37.5/62.5 , 2.55 , 12 , 2.8 , 10000 , 80 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P31DD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.2 , 37.5/62.5 , 2.55 , 10.5 , 3.8 , 10000 , 60 , 40 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P32SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.6 , 37.5/62.5 , 2.55 , 12 , 3.15 , 10000 , 45 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P32SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.2 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 10000 , 25 , 35 , , , , 3 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P32DD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.2 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 10000 , 25 , 35 , , , , 3 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
##
P33SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.0 , 27.3/45.4/27.3 , 2.55 , 14.2 , 2.8 , 12000 , 104 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P33DD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.3 , 27.3/45.4/27.3 , 2.55 , 13.5 , 3.8 , 12000 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P34SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.7 , 27.3/45.4/27.3 , 2.55 , 13.8 , 3.15 , 12000 , 59 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P34SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.3 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 12000 , 33 , 46 , , , , 3 , 2 , 1 , 4 , 1 , 1.0 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P34DD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.3 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 12000 , 33 , 46 , , , , 3 , 2 , 1 , 4 , 1 , 1.0 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
#
P35SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.1 , 24.3/35.2/40.5 , 2.55 , 18.2 , 2.8 , 12000 , 104 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P35DD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.8 , 12000 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P36SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.8 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.15 , 12000 , 59 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P36SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 12000 , 33 , 46 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P36DD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 12000 , 33 , 46 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
## ,
P37SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.1 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 2.8 , 14000 , 125 , 0 , 3 , 3 , 3 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P37DD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.8 , 14000 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P38SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.8 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.15 , 14000 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P38SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 14000 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P38DD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 14000 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
#
P39SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.2 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 2.6 , 14000 , 125 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P39DD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.8 , 14000 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P40SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.9 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.15 , 14000 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P40SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 14000 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P40DD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 14000 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
index e2cd2a56c4a025fb2d218a37147965a94d9643cd..2fd99fcc83cf746d185f3a88cfe634f8c92c3cc5 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
@@ -467,7 +467,7 @@
<xs:documentation>P036 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType">
+ <xs:element name="AxleConfiguration" type="tns:VehicleAxleConfigurationDeclarationType">
<xs:annotation>
<xs:documentation>P037 - enum</xs:documentation>
</xs:annotation>
@@ -608,6 +608,7 @@
</xs:annotation>
<xs:restriction base="xs:string">
<xs:enumeration value="4x2"/>
+ <xs:enumeration value="4x2F"/>
<xs:enumeration value="6x2"/>
<xs:enumeration value="6x4"/>
<xs:enumeration value="8x2"/>
diff --git a/VectoCore/VectoCore/VersionNumber.t4 b/VectoCore/VectoCore/VersionNumber.t4
index f612f62eaa48609de900c3a2da5478b52cd7dd56..ae5ddf49befe5f2329eabb22cb348a6eba7d9dd0 100644
--- a/VectoCore/VectoCore/VersionNumber.t4
+++ b/VectoCore/VectoCore/VersionNumber.t4
@@ -6,6 +6,6 @@ int GetBuildNumber()
string GetVectoCoreVersionNumber()
{
- return "0.5.0." + GetBuildNumber();
+ return "0.6.0." + GetBuildNumber();
}
#>
\ No newline at end of file