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

Merge pull request #847 in VECTO/vecto-sim from VECTO/mq_vecto-sim:bugfix/VECTO-1372-deviation-of-cdxa-input-vs-output-for-hdv16 to develop

* commit '1c9027d0':
  introduce new field with CdxA from input. required to write correct CdxA value to MRF

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs

@@ -502,6 +502,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			var retVal = SetCommonAirdragData(airdragInputData);
 
 			retVal.DeclaredAirdragArea = mission.MissionType == MissionType.Construction ? mission.DefaultCDxA : airdragInputData.AirDragArea;
+			retVal.DeclaredAirdragAreaInput = airdragInputData.AirDragArea;
 
 			var aerodynamicDragArea = retVal.DeclaredAirdragArea + mission.Trailer.Sum(t => t.DeltaCdA).DefaultIfNull(0);
 
@@ -519,6 +520,8 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			return new AirdragData() {
 				CertificationMethod = CertificationMethod.StandardValues,
 				DeclaredAirdragArea = mission.DefaultCDxA,
+				DeclaredAirdragAreaInput = mission.DefaultCDxA,
+
 				CrossWindCorrectionCurve = new CrosswindCorrectionCdxALookup(aerodynamicDragArea,
 					GetDeclarationAirResistanceCurve(mission.CrossWindCorrectionParameters, aerodynamicDragArea, segment.VehicleHeight),
 					CrossWindCorrectionMode.DeclarationModeCorrection)

VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs

@@ -53,6 +53,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 
 		public SquareMeter DeclaredAirdragArea { get; internal set; }
 
+		public SquareMeter DeclaredAirdragAreaInput { get; internal set; }
+
 		// ReSharper disable once UnusedMember.Global  -- used via Validation
 		public static ValidationResult ValidateAirDragData(AirdragData airDragData, ValidationContext validationContext)
 		{

VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs

@@ -237,7 +237,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 			if (airdragData.CertificationMethod == CertificationMethod.StandardValues) {
 				return new XElement(tns + XMLNames.Component_AirDrag,
 					new XElement(tns + XMLNames.Report_Component_CertificationMethod, airdragData.CertificationMethod.ToXMLFormat()),
-					new XElement(tns + XMLNames.Report_AirDrag_CdxA, airdragData.DeclaredAirdragArea.ToXMLFormat(2))
+					new XElement(tns + XMLNames.Report_AirDrag_CdxA, airdragData.DeclaredAirdragAreaInput.ToXMLFormat(2))
 					);
 			}
 			return new XElement(tns + XMLNames.Component_AirDrag,
@@ -245,7 +245,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 				new XElement(tns + XMLNames.Report_Component_CertificationMethod, airdragData.CertificationMethod.ToXMLFormat()),
 				new XElement(tns + XMLNames.Report_Component_CertificationNumber, airdragData.CertificationNumber),
 				new XElement(tns + XMLNames.DI_Signature_Reference_DigestValue, airdragData.DigestValueInput),
-				new XElement(tns + XMLNames.Report_AirDrag_CdxA, airdragData.DeclaredAirdragArea.ToXMLFormat(2))
+				new XElement(tns + XMLNames.Report_AirDrag_CdxA, airdragData.DeclaredAirdragAreaInput.ToXMLFormat(2))
 				);
 		}