Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit ab62b305 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

always use default value for construction cycle

parent 09af0eb8
No related branches found
No related tags found
No related merge requests found
......@@ -500,9 +500,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
}
var retVal = SetCommonAirdragData(airdragInputData);
var aerodynamicDragArea = airdragInputData.AirDragArea + mission.Trailer.Sum(t => t.DeltaCdA).DefaultIfNull(0);
retVal.DeclaredAirdragArea = airdragInputData.AirDragArea;
retVal.DeclaredAirdragArea = mission.MissionType == MissionType.Construction ? mission.DefaultCDxA : airdragInputData.AirDragArea;
var aerodynamicDragArea = retVal.DeclaredAirdragArea + mission.Trailer.Sum(t => t.DeltaCdA).DefaultIfNull(0);
retVal.CrossWindCorrectionCurve =
new CrosswindCorrectionCdxALookup(aerodynamicDragArea,
GetDeclarationAirResistanceCurve(mission.CrossWindCorrectionParameters, aerodynamicDragArea, segment.VehicleHeight),
......@@ -512,13 +514,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
private AirdragData DefaultAirdragData(Mission mission, Segment segment)
{
var aerodynamicDragArea = mission.MissionType == MissionType.Construction
? segment.CdAConstruction
: segment.CdADefault + mission.Trailer.Sum(t => t.DeltaCdA).DefaultIfNull(0);
var aerodynamicDragArea = mission.DefaultCDxA + mission.Trailer.Sum(t => t.DeltaCdA).DefaultIfNull(0);
return new AirdragData() {
CertificationMethod = CertificationMethod.StandardValues,
DeclaredAirdragArea = mission.MissionType == MissionType.Construction ? segment.CdAConstruction : segment.CdADefault,
DeclaredAirdragArea = mission.DefaultCDxA,
CrossWindCorrectionCurve = new CrosswindCorrectionCdxALookup(aerodynamicDragArea,
GetDeclarationAirResistanceCurve(mission.CrossWindCorrectionParameters, aerodynamicDragArea, segment.VehicleHeight),
CrossWindCorrectionMode.DeclarationModeCorrection)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment