removed aerodynamicDragArea from vehicledata, only use lookup-table for airdrag

VectoCore/InputData/InputData.cs

@@ -168,7 +168,7 @@ namespace TUGraz.VectoCore.InputData
 	{
 		bool Enabled { get; }
 
-		RoundsPerMinute ReferenceRPM { get; }
+		PerSecond ReferenceRPM { get; }
 
 		KilogramSquareMeter Inertia { get; }
 

VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs

@@ -81,11 +81,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			retVal.DynamicTyreRadius =
 				DeclarationData.DynamicTyreRadius(data.Axles[DeclarationData.PoweredAxle()].Wheels, data.Rim);
 
-			retVal.AerodynamicDragAera = mission.UseCdA2
+			var aerodynamicDragAera = mission.UseCdA2
 				? data.AirDragAreaRigidTruck
 				: data.AirDragArea;
 
-			retVal.CrossWindCorrectionCurve = GetDeclarationAirResistanceCurve(retVal.VehicleCategory, retVal.AerodynamicDragAera);
+			retVal.CrossWindCorrectionCurve = GetDeclarationAirResistanceCurve(retVal.VehicleCategory, aerodynamicDragAera);
 			var axles = data.Axles;
 			if (axles.Count < mission.AxleWeightDistribution.Length) {
 				throw new VectoException("Vehicle does not contain sufficient axles. {0} axles defined, {1} axles required",

VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs

@@ -25,26 +25,25 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			retVal.CurbWeigthExtra = data.CurbWeightExtra;
 			retVal.Loading = data.Loading;
 			retVal.DynamicTyreRadius = data.DynamicTyreRadius;
-
 			switch (data.CrossWindCorrectionMode) {
 				case CrossWindCorrectionMode.NoCorrection:
-					retVal.CrossWindCorrectionCurve = CrossWindCorrectionCurve.GetNoCorrectionCurve(retVal.AerodynamicDragAera);
+					retVal.CrossWindCorrectionCurve = CrossWindCorrectionCurve.GetNoCorrectionCurve(data.AirDragArea);
 					break;
 				case CrossWindCorrectionMode.SpeedDependentCorrectionFactor:
 					retVal.CrossWindCorrectionCurve =
 						CrossWindCorrectionCurve.ReadSpeedDependentCorrectionCurve(data.CrosswindCorrectionMap,
-							retVal.AerodynamicDragAera);
+							data.AirDragArea);
 					break;
 				case CrossWindCorrectionMode.VAirBetaLookupTable:
 					throw new VectoException("CrosswindCorrection mode {0} not implemented", data.CrossWindCorrectionMode);
 				case CrossWindCorrectionMode.DeclarationModeCorrection:
 					retVal.CrossWindCorrectionCurve = DeclarationDataAdapter.GetDeclarationAirResistanceCurve(retVal.VehicleCategory,
-						retVal.AerodynamicDragAera);
+						data.AirDragArea);
 					break;
 				default:
 					throw new ArgumentOutOfRangeException();
 			}
-			retVal.AerodynamicDragAera = data.AirDragArea;
+
 
 			var axles = data.Axles;
 			retVal.AxleData = axles.Select(axle => new Axle {

VectoCore/Models/SimulationComponent/Data/VehicleData.cs

@@ -51,7 +51,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 		public Kilogram CurbWeigthExtra { get; internal set; }
 		public Kilogram Loading { get; internal set; }
 		public Kilogram GrossVehicleMassRating { get; internal set; }
-		public SquareMeter AerodynamicDragAera { get; internal set; }
 		public Meter DynamicTyreRadius { get; internal set; }
 		public Kilogram ReducedMassWheels { get; private set; }
 		public string Rim { get; internal set; }

VectoCoreTest/Integration/CoachPowerTrain.cs

@@ -153,7 +153,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			};
 			return new VehicleData {
 				AxleConfiguration = AxleConfiguration.AxleConfig_6x2,
-				AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
+				//AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
 				//CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
 				CrossWindCorrectionCurve = CrossWindCorrectionCurve.GetNoCorrectionCurve(3.2634.SI<SquareMeter>()),
 				CurbWeight = 15700.SI<Kilogram>(),

VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs

@@ -366,8 +366,6 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
 			};
 			return new VehicleData {
 				AxleConfiguration = AxleConfiguration.AxleConfig_6x2,
-				AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
-				//CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
 				CrossWindCorrectionCurve = CrossWindCorrectionCurve.GetNoCorrectionCurve(3.2634.SI<SquareMeter>()),
 				CurbWeight = 15700.SI<Kilogram>(),
 				CurbWeigthExtra = 0.SI<Kilogram>(),

VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs

@@ -263,8 +263,6 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
 			};
 			return new VehicleData {
 				AxleConfiguration = AxleConfiguration.AxleConfig_6x2,
-				AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
-				//CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
 				CrossWindCorrectionCurve = CrossWindCorrectionCurve.GetNoCorrectionCurve(3.2634.SI<SquareMeter>()),
 				CurbWeight = 15700.SI<Kilogram>(),
 				CurbWeigthExtra = 0.SI<Kilogram>(),

VectoCoreTest/Models/SimulationComponent/DriverTest.cs

@@ -374,8 +374,6 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			};
 			return new VehicleData {
 				AxleConfiguration = AxleConfiguration.AxleConfig_4x2,
-				AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
-				//CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
 				CrossWindCorrectionCurve = CrossWindCorrectionCurve.GetNoCorrectionCurve(3.2634.SI<SquareMeter>()),
 				CurbWeight = 15700.SI<Kilogram>(),
 				CurbWeigthExtra = 0.SI<Kilogram>(),

VectoCoreTest/Models/SimulationComponent/VehicleTest.cs

@@ -71,8 +71,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var container = new VehicleContainer();
 
 			var vehicleData = MockSimulationDataFactory.CreateVehicleDataFromFile(VehicleDataFileTruck);
-			vehicleData.AerodynamicDragAera = 6.46.SI<SquareMeter>();
-
+			//vehicleData.AerodynamicDragAera = 6.46.SI<SquareMeter>();
+			vehicleData.CrossWindCorrectionCurve =
+				DeclarationDataAdapter.GetDeclarationAirResistanceCurve(VehicleCategory.Tractor,
+					6.46.SI<SquareMeter>());
 			var vehicle = new Vehicle(container, vehicleData);
 
 			var mockPort = new MockFvOutPort();
@@ -110,11 +112,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var container = new VehicleContainer();
 
 			var vehicleData = MockSimulationDataFactory.CreateVehicleDataFromFile(VehicleDataFileTruck);
-			vehicleData.AerodynamicDragAera = 6.2985.SI<SquareMeter>();
 			vehicleData.CrossWindCorrectionCurve =
 				DeclarationDataAdapter.GetDeclarationAirResistanceCurve(VehicleCategory.Tractor,
-					vehicleData.AerodynamicDragAera);
-			//vehicleData.CrossWindCorrectionMode = CrossWindCorrectionMode.DeclarationModeCorrection;
+					6.2985.SI<SquareMeter>());
 
 			var vehicle = new Vehicle(container, vehicleData);