From e0e39caad4974973a51255bdf76e7605f31b5ccb Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Fri, 9 Nov 2018 08:41:05 +0100 Subject: [PATCH] reading deprecated fuel type names and convert to current fuel type names --- .../Declaration/XMLDeclarationEngineDataProvider.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs index 84738d48b3..e7466e8c37 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs @@ -29,6 +29,7 @@ * Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology */ +using System; using TUGraz.IVT.VectoXML; using TUGraz.VectoCommon.InputData; using TUGraz.VectoCommon.Models; @@ -61,7 +62,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration public FuelType FuelType { - get { return GetElementValue(XMLNames.Engine_FuelType).ParseEnum<FuelType>(); } + get { + var value = GetElementValue(XMLNames.Engine_FuelType); + if ("LPG".Equals(value, StringComparison.InvariantCultureIgnoreCase)) { + return FuelType.LPGPI; + } + if ("NG".Equals(value, StringComparison.InvariantCultureIgnoreCase)) { + return FuelType.NGPI; + } + + return value.ParseEnum<FuelType>(); + } } public TableData FuelConsumptionMap -- GitLab