diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
index f7e7f4fb251ef24f17bb8d57cfe663491a7d2b43..907dfe1cd9b74343b62e34ed77cbe6874f196c4e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
@@ -392,6 +392,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
get { return 1; }
}
+
public string Manufacturer
{
@@ -403,6 +404,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return Body.GetEx<string>(JsonKeys.Engine_ModelName); }
}
+
public string Date
{
get { return Constants.NOT_AVAILABLE; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index bb757828fa3b6238e80f4c1d624972a48f0064ce..97b3ebd1f7f0d685bec364a9ced5003d34e5de47 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -933,7 +933,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Implementation of IVTPDeclarationInputDataProvider
- IVTPDeclarationJobInputData IVTPDeclarationInputDataProvider.JobInputData
+ IVTPDeclarationJobInputData IVTPDeclarationInputDataProvider.JobInputData
{
get { return JobInputData; }
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs b/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
index 36ea70b5635c7be4bc09436eb3807337cefa232c..b15b533525c08d37709f4c69379c62c6c315404e 100644
--- a/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
@@ -361,7 +361,6 @@ namespace TUGraz.VectoCore.InputData.Reader
public const string PTOActive = "PTO";
public const string PTODuringDrivePower = "PTO_Power";
public const string Highway = "HW";
- public const string VTPPSCompressorActive = "PS_comp_active";
public const string FanElectricalPower = "Pel_fan";
public const string CombustionEngineTorque = "tq_eng";
public const string CH4MassFlow = "CH4";
@@ -870,7 +869,7 @@ namespace TUGraz.VectoCore.InputData.Reader
? row.ParseDoubleOrGetDefault(Fields.FanSpeed).RPMtoRad()
: null,
Gear = (uint)row.ParseDoubleOrGetDefault(Fields.Gear),
- VTPFuelconsumption = fc,
+ Fuelconsumption = fc,
TorqueConverterActive = row.ParseBooleanOrGetDefault(Fields.TorqueConverterActive),
TorqueWheelLeft = tqLeft,
TorqueWheelRight = tqRight,
@@ -925,7 +924,6 @@ namespace TUGraz.VectoCore.InputData.Reader
Fields.WheelTorqueRight,
Fields.Gear,
Fields.TorqueConverterActive,
- Fields.VTPPSCompressorActive,
Fields.FanElectricalPower,
Fields.CombustionEngineTorque,
Fields.CH4MassFlow,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
index 7810e7792797d0a00be55901dbb6fe57a82a7fb3..33c542ce52225fe025f21dfb103b627ef68f0310 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
@@ -58,7 +58,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
protected RetarderData RetarderData;
protected PTOData PTOTransmissionData;
protected List<VectoRunData.AuxData> AuxVTP;
- protected AuxFanData AuxFanData;
protected Segment Segment;
protected bool allowVocational;
protected DeclarationDataAdapter Dao;
@@ -107,7 +106,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Segment.Missions.First().MissionType,
Segment.VehicleClass,
JobInputData.Vehicle.Components.AxleWheels.NumSteeredAxles),
- FanData = AuxFanData
};
powertrainConfig.VehicleData.VehicleClass = Segment.VehicleClass;
Report.InputDataHash = JobInputData.VectoJobHash;
@@ -169,11 +167,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
GearboxData, AxlegearData.AxleGear.Ratio * (AngledriveData?.Angledrive.Ratio ?? 1.0), EngineData.IdleSpeed);
AuxVTP = CreateVTPAuxData(vehicle);
-
- AuxFanData = new AuxFanData() {
- FanDiameter = JobInputData.FanDiameter,
- FanCoefficients = JobInputData.FanPowerCoefficents.ToArray()
- };
}
#region Implementation of IVectoRunDataFactory
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
index afdfa5f5adb5befc6ca0bda79d0f926417ad7eb1..3a6f8bfc1eaabd046a69369445b0091806ede848 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
@@ -184,7 +184,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
get { return (Math.Tan(RoadGradient.Value()) * 100).SI<Scalar>(); }
}
- public Dictionary<FuelType, KilogramPerSecond> VTPFuelconsumption;
+ public Dictionary<FuelType, KilogramPerSecond> Fuelconsumption;
/// <summary>
/// relative altitude of the driving cycle over distance
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCombustionEngine.cs
index f55a7237167c70d9d3cccde8ac74a1e4082884af..7d2acc51ce33ead6942e90873f2a5f2f2818c75e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCombustionEngine.cs
@@ -80,7 +80,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
// Engine speed and fuel consumption determine whether we consider the engine is on or off.
// This cut-off point affects calculations and Response (stop-start functionality, see base.Request)
- var fuelConsumption = DataBus.DrivingCycleInfo.CycleData.LeftSample.VTPFuelconsumption.Sum(c => c.Value);
+ var fuelConsumption = DataBus.DrivingCycleInfo.CycleData.LeftSample.Fuelconsumption.Sum(c => c.Value);
CombustionEngineOn = (DataBus.DrivingCycleInfo.CycleData.LeftSample.EngineSpeed >= EngineIdleSpeed) || fuelConsumption.IsGreater(0);
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCycle.cs
index 94f4e96f8c0ff34e5ff099184b6a3f379fba53af..64d781afcf67a25e36b9cc30026dc56d33c0113d 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCycle.cs
@@ -116,7 +116,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
foreach (var entry in Data.Entries.Pairwise()) {
var dt = entry.Item2.Time - entry.Item1.Time;
+ var fc = entry.Item1.Fuelconsumption.Sum(x => x.Value) * dt;
var eWheel = entry.Item1.PWheel > 0 ? entry.Item1.PWheel * dt : 0.SI<WattSecond>();
+ window[idx % count] = new {FC= fc, EWheel = eWheel};
sumFC += window[idx % count].FC;
sumFC -= window[(idx + 1) % count].FC;
sumEWheel += window[idx % count].EWheel;
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
index 7008e2ea22936d7924ddd2a215781fb3ea8fed9c..6ab29d73f82e839b4da73d641769e477bc9c5f32 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
@@ -118,14 +118,13 @@ namespace TUGraz.VectoCore.OutputData.XML
x => new {
PWheel = x.Item1.PWheel > 0 ? x.Item1.PWheel : 0.SI<Watt>(),
dt = x.Item2.Time - x.Item1.Time,
- FC = x.Item1.VTPFuelconsumption
+ FC = x.Item1.Fuelconsumption
}).ToArray();
VTPWorPWheelSimPos = data.WorkWheelsPos();
VTPWorkPWheelPos = cycleEntries.Sum(x => x.PWheel * x.dt).Cast<WattSecond>();
foreach (var fuel in cycleEntries.First().FC.Keys) {
VTPFcMeasured[fuel] = cycleEntries.Sum(x => x.FC[fuel] * x.dt);
}
- //VTPFcMeasured = cycleEntries.Sum(x => x.FC * x.dt).Cast<Kilogram>();
foreach (var entry in data.FuelData) {
var col = data.GetColumnName(entry, ModalResultField.FCFinal);
@@ -133,7 +132,6 @@ namespace TUGraz.VectoCore.OutputData.XML
VTPFcFinalSimulated[entry.FuelType] = fcSum;
}
- //VTPFcFinalSimulated = data.TimeIntegral<Kilogram>(ModalResultField.FCFinal);
VTPFcCorrectionFactors = runData.VTPData.CorrectionFactors;
FuelNCVs = runData.VTPData.FuelNCVs;
diff --git a/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs b/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
index 525dcd762a67c6b36f9bedfb6b2760d9219ef941..9c8a3d61c3c85dffe03af24b42347df55a7e8731 100644
--- a/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
@@ -92,7 +92,6 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
private const string DUAL_FUEL_STOP_START_JOB = @"TestData\Integration\VTPMode\DualFuelVehicle\VTP_StopStart_DualFuel.vecto";
private const string TORQUE_DRIFT_JOB = @"TestData\Integration\VTPMode\Group2_RigidTruck_4x2\Class2_RigidTruck_VTP_TorqueDrift.vecto";
- [Category("JRC")]
[Category("LongRunning")]
[Category("Integration")]
[