diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs index addf852baa6a28db2dceb8f3190acf07d52f3761..c4530d72f8abd5e040524e54e16d70beaca14782 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs +++ b/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) diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs index 65bcb06ab18aca87d9f66ddd7dab1ccefcfb83b0..aa5045f28ec32f07a41bc0b160e3b354fee07f2d 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs +++ b/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) { diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs index 59cad7f46a28d1e64b1270abceef73cd20a52e35..03586c20a8715391c33adb52a9790e86b8171d37 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs +++ b/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)) ); }