bugfix completed bus simulation with NG fuel types: store tank system from completed vehicle

VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs

@@ -19,6 +19,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
 	public class XMLCustomerReportCompletedBus : XMLCustomerReport
 	{
 		private int _resultCount = 0;
+		protected TankSystem? _tankSystem;
 
 		public IPrimaryVehicleInformationInputDataProvider PrimaryVehicleRecordFile { get; set; }
 
@@ -26,6 +27,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
 
 		public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
 		{
+			_tankSystem = modelData.VehicleData.InputData.TankSystem;
 			VehiclePart.Add(
 				new XAttribute(xsi + "type", "VehicleCompletedBusType"),
 				new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
@@ -160,7 +162,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
 			var co2Sum = 0.SI<KilogramPerMeter>();
 			foreach (var entry in primaryResult.EnergyConsumption) {
 				var fcEnergy = entry.Value * factor;  // J/m
-				var fuelData = FuelData.Instance().Lookup(entry.Key);
+				var fuelData = FuelData.Instance().Lookup(entry.Key, _tankSystem);
 				var fcMass = fcEnergy / fuelData.LowerHeatingValueVecto; // kg/m
 				co2Sum += fcMass * fuelData.CO2PerFuelWeight;
 

VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs

@@ -17,6 +17,7 @@ using TUGraz.VectoCore.Utils;
 namespace TUGraz.VectoCore.OutputData.XML {
 	public class XMLManufacturerReportCompletedBus : AbstractXMLManufacturerReport
 	{
+		protected TankSystem? _tankSystem;
 
 		public IPrimaryVehicleInformationInputDataProvider PrimaryVehicleRecordFile { get; set; }
 
@@ -27,6 +28,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
 
 		public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
 		{
+			_tankSystem = modelData.VehicleData.InputData.TankSystem;
 			VehiclePart.Add(
 				new XAttribute(xsi + "type", "VehicleCompletedBusType"),
 				GetPrimaryVehicleInformation(),
@@ -226,7 +228,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
 			//retVal.Add(new XElement(tns + "FuelConsumptionFactor", factor.ToMinSignificantDigits(4)));
 			foreach (var entry in primaryResult.EnergyConsumption) {
 				var fcEnergy = entry.Value * factor;  // J/m
-				var fuelData = FuelData.Instance().Lookup(entry.Key);
+				var fuelData = FuelData.Instance().Lookup(entry.Key, _tankSystem);
 				var fcMass = fcEnergy / fuelData.LowerHeatingValueVecto; // kg/m
 				co2Sum += fcMass * fuelData.CO2PerFuelWeight;