Merge pull request #714 in VECTO/vecto-sim from...

Merge pull request #714 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-831-addition-of-indication-to-be-added-for-lng to ReleaseCandidates/v3.3.1.1463

* commit 'daccb130':
  removed NG CI as supported fuel type, update testcases accordingly
  update documentation with explicit statement for CNG/LNG vehicles
  update user manual and release notes with more details on the input parameters for CNG/LNG vehicles.

Documentation/User Manual/3-simulation-models/FuelProperties.md

@@ -13,3 +13,6 @@
 Specifications are based on a recent analysis (2018) performed by CONCAWE/EUCAR and shall reflect typical fuel on the European market. The data is scheduled to be published in March 2019 in the context of the study:
 Well-To-Wheels Analysis Of Future Automotive Fuels And Powertrains in the European Context – Heavy Duty vehicles
 
+###VECTO Input for CNG/LNG Vehicles
+
+Currently only the fuel type 'NG PI' for the engine certification is allowed according to Regulation (EU) 2017/2400. For LNG vehicles, therefore, the engine fuel type has to be set to 'NG PI' and at the vehicle level NgTankSystem has to be set to 'liquefied'. For CNG vehicles the same engine fuel type is provided but NgTankSystem has to be set to 'compressed'.

VectoCore/VectoCore/Resources/Declaration/FuelTypes.csv

@@ -6,5 +6,5 @@ Ethanol PI ,            , 786                 , 2.10
 LPG PI     ,            ,                     , 3.02                              , 46000                 , 46000
 NG PI      , compressed ,                     , 2.69                              , 45100                 , 48000
 NG PI      , liquefied  ,                     , 2.77                              , 45100                 , 49100
-NG CI      , compressed ,                     , 1000                              , 100000                , 100000
-NG CI      , liquefied  ,                     , 1000                              , 100000                , 100000
\ No newline at end of file
+##NG CI      , compressed ,                     , 1000                              , 100000                , 100000
+##NG CI      , liquefied  ,                     , 1000                              , 100000                , 100000
\ No newline at end of file

VectoCore/VectoCoreTest/VectoCoreTest.csproj

@@ -2812,8 +2812,11 @@
     <Content Include="TestData\Jobs\Tractor_4x2_vehicle-class-5_Generic vehicle.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\XML\XMLReaderDeclaration\vecto_engine-input_sample.xml" />
     <Content Include="TestData\XML\XMLReaderDeclaration\vecto_engine-sample.xml" />
     <Content Include="TestData\XML\XMLReaderDeclaration\vecto_gearbox-sample.xml" />
+    <Content Include="TestData\XML\XMLReaderDeclaration\vecto_vehicle-exempted-sample.xml" />
+    <Content Include="TestData\XML\XMLReaderDeclaration\vecto_vehicle-new_parameters-sample.xml" />
     <Content Include="TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample_exempted.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs

@@ -118,6 +118,11 @@ namespace TUGraz.VectoCore.Tests.XML
 					// new fuel labels end either with CI or PI, others are for backward compatibility. separate testcase
 					continue;
 				}
+
+				if (fuel.Equals("NG CI")) {
+					// not supported at the moment - can't be certified for engines
+					continue;
+				}
 				var reader = XmlReader.Create(SampleVehicleDecl);
 
 				var doc = new XmlDocument();
@@ -127,14 +132,14 @@ namespace TUGraz.VectoCore.Tests.XML
 				var helper = new XPathHelper(ExecutionMode.Declaration);
 				helper.AddNamespaces(manager);
 
-				var EngineFuelType = nav.SelectSingleNode(helper.QueryAbs(
+				var engineFuelType = nav.SelectSingleNode(helper.QueryAbs(
 						helper.NSPrefix(XMLNames.VectoInputDeclaration,
 							Constants.XML.RootNSPrefix),
 						XMLNames.Component_Vehicle,
 						XMLNames.Vehicle_Components,
 						XMLNames.Component_Engine, XMLNames.ComponentDataWrapper, XMLNames.Engine_FuelType),
 					manager);
-				EngineFuelType.SetValue(fuel);
+				engineFuelType.SetValue(fuel);
 				var modified = XmlReader.Create(new StringReader(nav.OuterXml));
 
 				var inputDataProvider = new XMLDeclarationInputDataProvider(modified,
@@ -146,6 +151,40 @@ namespace TUGraz.VectoCore.Tests.XML
 			}
 		}
 
+		[TestCase("NG CI", TankSystem.Liquefied),
+		TestCase("NG CI", TankSystem.Compressed),]
+		public void TestUnsupportedEngineFuelTypes(string fuel, TankSystem? tankSystem)
+		{
+			
+			var reader = XmlReader.Create(SampleVehicleDecl);
+
+			var doc = new XmlDocument();
+			doc.Load(reader);
+			var nav = doc.CreateNavigator();
+			var manager = new XmlNamespaceManager(nav.NameTable);
+			var helper = new XPathHelper(ExecutionMode.Declaration);
+			helper.AddNamespaces(manager);
+
+			var engineFuelType = nav.SelectSingleNode(helper.QueryAbs(
+														helper.NSPrefix(XMLNames.VectoInputDeclaration,
+																		Constants.XML.RootNSPrefix),
+														XMLNames.Component_Vehicle,
+														XMLNames.Vehicle_Components,
+														XMLNames.Component_Engine, XMLNames.ComponentDataWrapper, XMLNames.Engine_FuelType),
+													manager);
+			engineFuelType.SetValue(fuel);
+			var modified = XmlReader.Create(new StringReader(nav.OuterXml));
+
+			var inputDataProvider = new XMLDeclarationInputDataProvider(modified,
+																		true);
+			var fuelTyle = inputDataProvider.JobInputData.Vehicle.EngineInputData.FuelType;
+			Assert.AreEqual(fuel, fuelTyle.ToXMLFormat());
+			AssertHelper.Exception<VectoException>(
+				() => {
+					DeclarationData.FuelData.Lookup(fuelTyle, tankSystem);
+				});			
+		}
+
 		[TestCase]
 		public void TestXMLInputGbx()
 		{