From e1d95f0115058f449a609bca6f17c42e6955f348 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Thu, 22 Jun 2017 18:15:57 +0200 Subject: [PATCH] bugfix: output in vsum file if no fueldensity is available --- .../VectoCore/OutputData/SummaryDataContainer.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs index 46c1d5b677..c5bcf423ce 100644 --- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs @@ -462,13 +462,15 @@ namespace TUGraz.VectoCore.OutputData if (fcfinal != null) { row[FCFINAL_KM] = fcfinal.ConvertTo().Gramm.Per.Kilo.Meter; } - row[FCFINAL_LITERPER100KM] = modData.FuelConsumptionFinalLiterPer100Kilometer(); - if (vehicleLoading != null && !vehicleLoading.IsEqual(0)) { - row[FCFINAL_LITERPER100TKM] = (modData.FuelConsumptionFinalLiterPer100Kilometer() ?? 0.SI()) / + + var fcPer100lkm = modData.FuelConsumptionFinalLiterPer100Kilometer(); + row[FCFINAL_LITERPER100KM] = fcPer100lkm; + if (vehicleLoading != null && !vehicleLoading.IsEqual(0) && fcPer100lkm != null) { + row[FCFINAL_LITERPER100TKM] = fcPer100lkm / vehicleLoading.ConvertTo().Ton; } - if (cargoVolume > 0) { - row[FCFINAL_LiterPer100M3KM] = (modData.FuelConsumptionFinalLiterPer100Kilometer() ?? 0.SI()) / cargoVolume; + if (cargoVolume > 0 && fcPer100lkm != null) { + row[FCFINAL_LiterPer100M3KM] = fcPer100lkm / cargoVolume; } var kilogramPerMeter = modData.CO2PerMeter(); -- GitLab