a)fixed engine work deviation warning, b)did refactoring

VECTO/GUI/VectoVTPJobForm.vb

@@ -49,6 +49,8 @@ Public Class VectoVTPJobForm
 
     Dim _vectoJob As IVTPEngineeringJobInputData
 
+    Private Const Mega As Integer = 1000000
+
     Enum AuxViewColumns
         AuxID = 0
         AuxType = 1
@@ -370,7 +372,7 @@ Public Class VectoVTPJobForm
             End If
         Next
 
-        vectoJob.FuelNCVs.Add(New FuelNCVData With {.Type = ftype, .NCV = (ncv * 1000000).SI(Of JoulePerKilogramm)})
+        vectoJob.FuelNCVs.Add(New FuelNCVData With {.Type = ftype, .NCV = (ncv * Mega).SI(Of JoulePerKilogramm)})
     End Sub
 
     'New file
@@ -465,14 +467,14 @@ Public Class VectoVTPJobForm
                         _ncvFuel1Lbl.Text = entry.FuelType.GetLabel()
                         _ncvFuel1Lbl.Visible = True
 
-                        _ncvFuel1Txtbox.Text = (fueldata.LowerHeatingValueVecto.Value / 1000000).ToString()
+                        _ncvFuel1Txtbox.Text = (fueldata.LowerHeatingValueVecto.Value / Mega).ToString()
                         _ncvFuel1Txtbox.Visible = True
                         _ncvFuel1UnitLbl.Visible = True
                     ElseIf (Not _ncvFuel2Lbl.Visible) Then
                         _ncvFuel2Lbl.Text = entry.FuelType.GetLabel()
                         _ncvFuel2Lbl.Visible = True
 
-                        _ncvFuel2Txtbox.Text = (fueldata.LowerHeatingValueVecto.Value / 1000000).ToString()
+                        _ncvFuel2Txtbox.Text = (fueldata.LowerHeatingValueVecto.Value / Mega).ToString()
                         _ncvFuel2Txtbox.Visible = True
                         _ncvFuel2UnitLbl.Visible = True
                     End If

VectoCore/VectoCore/Configuration/Constants.cs

@@ -42,6 +42,8 @@ namespace TUGraz.VectoCore.Configuration
 		public const double RPMToRad = 2 * Math.PI / 60;
 		public const double Kilo = 1000;
 		public const double MeterPerSecondToKMH = 3.6;
+		public const int GramsToMilligrams = 1000;
+		public const int Mega = 1000000;
 
 		public static class Auxiliaries
 		{
@@ -325,6 +327,12 @@ namespace TUGraz.VectoCore.Configuration
 
 			public static readonly MeterPerSecond HighwaySpeedThreshold = 70.KMPHtoMeterPerSecond();
 			public static readonly MeterPerSecond RuralSpeedThreshold = 50.KMPHtoMeterPerSecond();
+
+			/// <summary>
+			/// When the simulated (in VTP) positive engine work deviates more than this threshold
+			/// from the measured positive energy of the vdri, a warning is issued.
+			/// </summary>
+			public const double VTPEngineWorkDeviationThreshold = 0.005;
 		}
 
 		public static class XML

VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs

@@ -905,7 +905,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 						throw new Exception($"Job input data: {JsonKeys.Job_FuelNCVs}: invalid {JsonKeys.Job_FuelNCV_Type}: {type}");
                     }
 
-					fuelNCVs.Add(new FuelNCVData() { Type = matches.First(), NCV = (ncv * 1000000).SI<JoulePerKilogramm>() });
+					fuelNCVs.Add(new FuelNCVData() { Type = matches.First(), NCV = (ncv * Constants.Mega).SI<JoulePerKilogramm>() });
                 }
 
 				var fuels = JobInputData.Vehicle.Components.EngineInputData.EngineModes.First().Fuels;

VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs

@@ -824,8 +824,6 @@ namespace TUGraz.VectoCore.InputData.Reader
 			{
 				ValidateHeader(table.Columns);
 
-				const uint GRAMS_PER_KILO = 1000;
-				
 				var fuels = table.Columns.Cast<DataColumn>().Where(x => x.ColumnName.StartsWith("fc_"))
 					.Select(x => x.ColumnName.Replace("fc_", "").ParseEnum<FuelType>()).ToArray();
 				var entries = table.Rows.Cast<DataRow>().Select(
@@ -852,7 +850,6 @@ namespace TUGraz.VectoCore.InputData.Reader
 								: null,
 							Gear = (uint)row.ParseDoubleOrGetDefault(Fields.Gear),
 							VTPFuelconsumption = fc,
-							VTPPSCompressorActive = row.ParseBooleanOrGetDefault(Fields.VTPPSCompressorActive) ?? false,
 							TorqueConverterActive = row.ParseBooleanOrGetDefault(Fields.TorqueConverterActive),
 							TorqueWheelLeft = tqLeft,
 							TorqueWheelRight = tqRight,
@@ -863,15 +860,15 @@ namespace TUGraz.VectoCore.InputData.Reader
 								: null,
 							CombustionEngineTorque = row.ParseDouble(Fields.CombustionEngineTorque).SI<NewtonMeter>(),
 							CH4MassFlow = table.Columns.Contains(Fields.CH4MassFlow)
-								? (row.ParseDouble(Fields.CH4MassFlow) / GRAMS_PER_KILO).SI<KilogramPerSecond>()
+								? (row.ParseDouble(Fields.CH4MassFlow) / Constants.Kilo).SI<KilogramPerSecond>()
 								: null,
-							COMassFlow = (row.ParseDouble(Fields.COMassFlow) / GRAMS_PER_KILO).SI<KilogramPerSecond>(),
+							COMassFlow = (row.ParseDouble(Fields.COMassFlow) / Constants.Kilo).SI<KilogramPerSecond>(),
 							NMHCMassFlow = table.Columns.Contains(Fields.NMHCMassFlow)
-								? (row.ParseDouble(Fields.NMHCMassFlow) / GRAMS_PER_KILO).SI<KilogramPerSecond>()
+								? (row.ParseDouble(Fields.NMHCMassFlow) / Constants.Kilo).SI<KilogramPerSecond>()
 								: null,
-							NOxMassFlow = (row.ParseDouble(Fields.NOxMassFlow) / GRAMS_PER_KILO).SI<KilogramPerSecond>(),
-							THCMassFlow = (row.ParseDouble(Fields.THCMassFlow) / GRAMS_PER_KILO).SI<KilogramPerSecond>(),
-							CO2MassFlow = (row.ParseDouble(Fields.CO2MassFlow) / GRAMS_PER_KILO).SI<KilogramPerSecond>(),
+							NOxMassFlow = (row.ParseDouble(Fields.NOxMassFlow) / Constants.Kilo).SI<KilogramPerSecond>(),
+							THCMassFlow = (row.ParseDouble(Fields.THCMassFlow) / Constants.Kilo).SI<KilogramPerSecond>(),
+							CO2MassFlow = (row.ParseDouble(Fields.CO2MassFlow) / Constants.Kilo).SI<KilogramPerSecond>(),
 							PMNumberFlow = row.ParseDouble(Fields.PMNumberFlow).SI<PerSecond>()
 						};
 					}).ToArray();

VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs

@@ -287,8 +287,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 
 			public PerSecond WheelSpeedRight;
 
-			public bool VTPPSCompressorActive;
-
 			// road sweeper application
 			public Watt PTOPowerDemandDuringDrive;
 		}

VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs

@@ -62,8 +62,6 @@ namespace TUGraz.VectoCore.OutputData.XML
 	{
 		public const string CURRENT_SCHEMA_VERSION = "0.1";
 
-		private const double ENERGY_THRESHOLD_RANGE = 0.005;
-
 		private const string VTPReportTartetName = "VTPReportTarget";
 		
 		protected XElement VehiclePart;
@@ -91,7 +89,6 @@ namespace TUGraz.VectoCore.OutputData.XML
 			public WattSecond VTPWorPWheelSimPos;
 			public TankSystem? TankSystem;
 
-			private const int MILLIGRAMS_PER_GRAM = 1000;
 			public Scalar CH4Emissions { protected set; get; } = null;
 			public Scalar COEmissions { protected set; get; } = null;
 			public Scalar NMHCEmissions { protected set; get; } = null;
@@ -99,7 +96,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 			public Scalar THCEmissions { protected set; get; } = null;
 			public Scalar CO2Emissions { protected set; get; } = null;
 			public Scalar PMFlow { protected set; get; } = null;
-			public Scalar ICEEnergyRatio { protected set; get; } = null;
+			public Scalar PositiveEngineWorkDeviation { protected set; get; } = null;
 
 			#region Overrides of ResultEntry
 
@@ -136,42 +133,56 @@ namespace TUGraz.VectoCore.OutputData.XML
 				//VTPFcFinalSimulated = data.TimeIntegral<Kilogram>(ModalResultField.FCFinal);
 				VTPFcCorrectionFactors = runData.VTPData.CorrectionFactors;
 
-				CalculateEmissions(runData, data);
+				var measuredPositiveEngineWork = CalculateMeasuredPositiveEngineWork(runData);
+
+				CalculateEmissions(runData, measuredPositiveEngineWork);
+				CalculatePositiveEngineWorkDeviation(data, measuredPositiveEngineWork);
 			}
 
-			private void CalculateEmissions(VectoRunData runData, IModalDataContainer data)
+			private ConvertedSI CalculateMeasuredPositiveEngineWork(VectoRunData runData)
 			{
-				var energy = runData.Cycle.Entries.Pairwise()
+				return runData.Cycle.Entries.Pairwise()
 					.Where(x => x.Item1.CombustionEngineTorque.IsGreaterOrEqual(0))
-					.Sum(x => (x.Item1.EngineSpeed * x.Item1.CombustionEngineTorque) * (x.Item2.Time - x.Item1.Time)).ConvertToKiloWattHour();
+					.Sum(x => (x.Item1.EngineSpeed * x.Item1.CombustionEngineTorque) * (x.Item2.Time - x.Item1.Time))
+					.ConvertToKiloWattHour();
+			}
 
-				if (runData.Cycle.Entries.First().CH4MassFlow != null) {
-					var CH4 = runData.Cycle.Entries.Pairwise().Sum(x => (x.Item1.CH4MassFlow) * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
-					CH4Emissions = ((CH4 / energy) * MILLIGRAMS_PER_GRAM).SI<Scalar>();
+			private void CalculatePositiveEngineWorkDeviation(IModalDataContainer data, ConvertedSI measuredWork)
+			{ 
+				var simulatedWork = data.TotalEngineWorkPositive().ConvertToKiloWattHour();
+				PositiveEngineWorkDeviation = ((measuredWork - simulatedWork) / measuredWork).SI<Scalar>();
 			}
 
-				var CO = runData.Cycle.Entries.Pairwise().Sum(x => x.Item1.COMassFlow * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
-				COEmissions = ((CO / energy) * MILLIGRAMS_PER_GRAM).SI<Scalar>();
+			private void CalculateEmissions(VectoRunData runData, ConvertedSI measuredPositiveEngineWork)
+			{
+				var entries = runData.Cycle.Entries;
 
-				if (runData.Cycle.Entries.First().NMHCMassFlow != null) {
-					var NMHC = runData.Cycle.Entries.Pairwise().Sum(x => x.Item1.NMHCMassFlow * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
-					NMHCEmissions = ((NMHC / energy) * MILLIGRAMS_PER_GRAM).SI<Scalar>();
+				if (runData.Cycle.Entries.First().CH4MassFlow != null) {
+					var CH4 = entries.Pairwise().Sum(x => (x.Item1.CH4MassFlow) * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
+					CH4Emissions = ((CH4 / measuredPositiveEngineWork) * Constants.GramsToMilligrams).SI<Scalar>();
 				}
 
-				var NOx = runData.Cycle.Entries.Pairwise().Sum(x => x.Item1.NOxMassFlow * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
-				NOxEmissions = ((NOx / energy) * MILLIGRAMS_PER_GRAM).SI<Scalar>();
+				var CO = entries.Pairwise().Sum(x => x.Item1.COMassFlow * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
+				COEmissions = ((CO / measuredPositiveEngineWork) * Constants.GramsToMilligrams).SI<Scalar>();
 
-				var THC = runData.Cycle.Entries.Pairwise().Sum(x => x.Item1.THCMassFlow * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
-				THCEmissions = ((THC / energy) * MILLIGRAMS_PER_GRAM).SI<Scalar>();
+				if (entries.First().NMHCMassFlow != null) {
+					var NMHC = entries.Pairwise().Sum(x => x.Item1.NMHCMassFlow * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
+					NMHCEmissions = ((NMHC / measuredPositiveEngineWork) * Constants.GramsToMilligrams).SI<Scalar>();
+				}
+
+				var NOx = entries.Pairwise().Sum(x => x.Item1.NOxMassFlow * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
+				NOxEmissions = ((NOx / measuredPositiveEngineWork) * Constants.GramsToMilligrams).SI<Scalar>();
 
-				var CO2 = runData.Cycle.Entries.Pairwise().Sum(x => x.Item1.CO2MassFlow * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
-				CO2Emissions = ((CO2 / energy) * MILLIGRAMS_PER_GRAM).SI<Scalar>();
+				if (entries.First().THCMassFlow != null) {
+					var THC = entries.Pairwise().Sum(x => x.Item1.THCMassFlow * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
+					THCEmissions = ((THC / measuredPositiveEngineWork) * Constants.GramsToMilligrams).SI<Scalar>();
+				}
 	
-				var PN = runData.Cycle.Entries.Pairwise().Sum(x => (x.Item1.PMNumberFlow * (x.Item2.Time - x.Item1.Time)).Value()).SI<Scalar>();
-				PMFlow = PN / energy;
+				var CO2 = entries.Pairwise().Sum(x => x.Item1.CO2MassFlow * (x.Item2.Time - x.Item1.Time)).ConvertToGramm();
+				CO2Emissions = ((CO2 / measuredPositiveEngineWork) * Constants.GramsToMilligrams).SI<Scalar>();
 
-				var simulatedEnergy = data.TotalEngineWorkPositive().ConvertToKiloWattHour();
-				ICEEnergyRatio = (energy / simulatedEnergy).SI<Scalar>();
+				var PN = entries.Pairwise().Sum(x => (x.Item1.PMNumberFlow * (x.Item2.Time - x.Item1.Time)).Value()).SI<Scalar>();
+				PMFlow = PN / measuredPositiveEngineWork;
 			}
 
 			#endregion
@@ -312,8 +323,12 @@ namespace TUGraz.VectoCore.OutputData.XML
 				new XElement(tns + "C_VTP", cVtp.ToXMLFormat(4)),
 				CreatePollutantsElement(vtpResult));
 
-			if ((vtpResult.ICEEnergyRatio > 1 + ENERGY_THRESHOLD_RANGE) || (vtpResult.ICEEnergyRatio < 1 - ENERGY_THRESHOLD_RANGE)) {
-				LogList.Add($"Positive energy work differs too much from VECTO. ratio = {vtpResult.ICEEnergyRatio}");
+			var threshold = Constants.SimulationSettings.VTPEngineWorkDeviationThreshold;
+
+			if (Math.Abs(vtpResult.PositiveEngineWorkDeviation) > threshold) {
+				LogList.Add($@"Simulated positive engine work is deviating more than {threshold * 100}% 
+					from measured positive engine work through the vdri. 
+					Deviation = {(vtpResult.PositiveEngineWorkDeviation * 100).ToXMLFormat(2)}%");
 			}
 
 			if (LogList.Any()) {
@@ -331,35 +346,36 @@ namespace TUGraz.VectoCore.OutputData.XML
 				new XElement(tns + "NOx", new XAttribute(XMLNames.Report_Results_Unit_Attr, "mg/kWh"),
 					vtpResult.NOxEmissions.ToXMLFormat(3)
 				),
-				new XElement(tns + "THC", new XAttribute(XMLNames.Report_Results_Unit_Attr, "mg/kWh"),
-					vtpResult.THCEmissions.ToXMLFormat(3)
-				),
 				new XElement(tns + "CO2", new XAttribute(XMLNames.Report_Results_Unit_Attr, "mg/kWh"),
 					vtpResult.CO2Emissions.ToXMLFormat(3)
 				)
 			);
 
+			if (vtpResult.THCEmissions != null) {
+				pollutantsElement.Add(
+					new XElement(tns + "THC", new XAttribute(XMLNames.Report_Results_Unit_Attr, "mg/kWh"),
+						vtpResult.THCEmissions.ToXMLFormat(3)
+					));
+			}
+
 			if (vtpResult.CH4Emissions != null) {
 				pollutantsElement.Add(
 					new XElement(tns + "CH4", new XAttribute(XMLNames.Report_Results_Unit_Attr, "mg/kWh"),
 						vtpResult.CH4Emissions.ToXMLFormat(3)
-					)
-				);
+					));
 			}
 
 			if (vtpResult.NMHCEmissions != null) {
 				pollutantsElement.Add(
 					new XElement(tns + "NMHC", new XAttribute(XMLNames.Report_Results_Unit_Attr, "mg/kWh"),
 						vtpResult.NMHCEmissions.ToXMLFormat(3)
-					)
-				);
+					));
 			}
 
 			pollutantsElement.Add(
 				new XElement(tns + "PM", new XAttribute(XMLNames.Report_Results_Unit_Attr, "#/kWh"),
 					vtpResult.PMFlow.ToXMLFormat(3)
-				)
-			);
+				));
 
 			return pollutantsElement;
 		}