Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-125-comparison-of-vecto2.2-and-vecto3

VectoCore/Models/SimulationComponent/Impl/Vehicle.cs

@@ -265,36 +265,25 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		protected Point[] CalculateAirResistanceCurve(AirDrag.AirDragEntry values)
 		{
-			// todo: get from vehicle or move whole procedure to vehicle
-			var cdA0Actual = _data.AerodynamicDragAera;
-
-			var betaValues = new Dictionary<int, SquareMeter>();
-			for (var beta = 0; beta <= 12; beta++) {
-				var deltaCdA = values.A1 * beta + values.A2 * beta * beta + values.A3 * beta * beta * beta;
-				betaValues[beta] = deltaCdA.SI<SquareMeter>();
-			}
-
 			var points = new List<Point> { new Point { X = 0.SI<MeterPerSecond>(), Y = 0.SI<SquareMeter>() } };
 
-			for (var vVeh = 60.KMPHtoMeterPerSecond();
-				vVeh.IsSmallerOrEqual(100.KMPHtoMeterPerSecond());
-				vVeh += 5.KMPHtoMeterPerSecond()) {
+			for (var speed = 60; speed <= 100; speed += 5) {
+				var vVeh = speed.KMPHtoMeterPerSecond();
 				var cdASum = 0.0.SI<SquareMeter>();
 				for (var alpha = 0; alpha <= 180; alpha += 10) {
 					var vWindX = Physics.BaseWindSpeed * Math.Cos(alpha.ToRadian());
 					var vWindY = Physics.BaseWindSpeed * Math.Sin(alpha.ToRadian());
 					var vAirX = vVeh + vWindX;
 					var vAirY = vWindY;
-					var vAir = VectoMath.Sqrt<MeterPerSecond>(vAirX * vAirX + vAirY * vAirY);
+//					var vAir = VectoMath.Sqrt<MeterPerSecond>(vAirX * vAirX + vAirY * vAirY);
 					var beta = Math.Atan((vAirY / vAirX).Value()).ToDegree();
-
-					var sec = betaValues.GetSection(b => b.Key < beta);
-					var deltaCdA = VectoMath.Interpolate(sec.Item1.Key, sec.Item2.Key, sec.Item1.Value, sec.Item2.Value, beta);
-					var cdA = cdA0Actual + deltaCdA;
+					var deltaCdA = ComputeDeltaCd(beta, values);
+					var cdA = _data.AerodynamicDragAera + deltaCdA;
 
 					var degreeShare = ((alpha != 0 && alpha != 180) ? 10.0 / 180.0 : 5.0 / 180.0);
 
-					cdASum += degreeShare * cdA * (vAir * vAir / (vVeh * vVeh)).Cast<Scalar>();
+//					cdASum += degreeShare * cdA * (vAir * vAir / (vVeh * vVeh)).Cast<Scalar>();
+					cdASum += degreeShare * cdA * ((vAirX * vAirX + vAirY * vAirY) / (vVeh * vVeh)).Cast<Scalar>();
 				}
 				points.Add(new Point { X = vVeh, Y = cdASum });
 			}
@@ -303,6 +292,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			return points.ToArray();
 		}
 
+		protected SquareMeter ComputeDeltaCd(double beta, AirDrag.AirDragEntry values)
+		{
+			return (values.A1 * beta + values.A2 * beta * beta + values.A3 * beta * beta * beta).SI<SquareMeter>();
+		}
 
 		public class VehicleState
 		{

VectoCoreTest/Models/SimulationComponent/VehicleTest.cs

@@ -45,7 +45,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 
 			var retVal = requestPort.Request(absTime, dt, accell, gradient);
 
-			Assert.AreEqual(-2428.0412094587, mockPort.Force.Value(), 0.0001);
+			Assert.AreEqual(-2428.0205, mockPort.Force.Value(), 0.0001);
 			Assert.AreEqual(16.954303841, mockPort.Velocity.Value(), 0.0001);
 		}
 
@@ -70,19 +70,19 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			Assert.AreEqual(8.12204, tmp.Value(), Tolerance);
 
 			tmp = vehicle.ComputeEffectiveAirDragArea(75.KMPHtoMeterPerSecond());
-			Assert.AreEqual(7.67232, tmp.Value(), Tolerance);
+			Assert.AreEqual(7.67058, tmp.Value(), Tolerance);
 
 			tmp = vehicle.ComputeEffectiveAirDragArea(100.KMPHtoMeterPerSecond());
-			Assert.AreEqual(7.23949, tmp.Value(), Tolerance);
+			Assert.AreEqual(7.23735, tmp.Value(), Tolerance);
 
 			tmp = vehicle.ComputeEffectiveAirDragArea(52.1234.KMPHtoMeterPerSecond());
-			Assert.AreEqual(8.12204, tmp.Value(), Tolerance);
+			Assert.AreEqual(8.12196, tmp.Value(), Tolerance);
 
 			tmp = vehicle.ComputeEffectiveAirDragArea(73.5432.KMPHtoMeterPerSecond());
-			Assert.AreEqual(7.70967, tmp.Value(), Tolerance);
+			Assert.AreEqual(7.70815, tmp.Value(), Tolerance);
 
 			tmp = vehicle.ComputeEffectiveAirDragArea(92.8765.KMPHtoMeterPerSecond());
-			Assert.AreEqual(7.33617, tmp.Value(), Tolerance);
+			Assert.AreEqual(7.33443, tmp.Value(), Tolerance);
 
 			// ====================
 
@@ -90,24 +90,24 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			vehicle.Initialize(60.KMPHtoMeterPerSecond(), 0.SI<Radian>());
 
 			var avgForce = vehicle.AirDragResistance(0.SI<MeterPerSquareSecond>(), dt);
-			Assert.AreEqual(1340.13618774784, avgForce.Value(), Tolerance);
+			Assert.AreEqual(1340.12357, avgForce.Value(), Tolerance);
 
 			avgForce = vehicle.AirDragResistance(1.SI<MeterPerSquareSecond>(), dt);
-			Assert.AreEqual(1375.658146, avgForce.Value(), Tolerance);
+			Assert.AreEqual(1375.63226, avgForce.Value(), Tolerance);
 
 			avgForce = vehicle.AirDragResistance(0.5.SI<MeterPerSquareSecond>(), dt);
-			Assert.AreEqual(1357.785735, avgForce.Value(), Tolerance);
+			Assert.AreEqual(1357.76658, avgForce.Value(), Tolerance);
 
 			// - - - - - - 
 			vehicle.Initialize(72.KMPHtoMeterPerSecond(), 0.SI<Radian>());
 
 			avgForce = vehicle.AirDragResistance(0.5.SI<MeterPerSquareSecond>(), dt);
-			Assert.AreEqual(1861.603488, avgForce.Value(), Tolerance);
+			Assert.AreEqual(1861.2734, avgForce.Value(), Tolerance);
 
 			dt = 3.SI<Second>();
 
 			avgForce = vehicle.AirDragResistance(1.SI<MeterPerSquareSecond>(), dt);
-			Assert.AreEqual(2102.13153, avgForce.Value(), Tolerance);
+			Assert.AreEqual(2101.63000, avgForce.Value(), Tolerance);
 		}
 
 		[TestMethod]
@@ -133,11 +133,11 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var retVal = vehicle.Request(absTime, dt, 0.SI<MeterPerSquareSecond>(), 0.SI<Radian>());
 			vehicle.CommitSimulationStep(writer);
 
-			Assert.AreEqual(48213.70, ((SI)writer[ModalResultField.Pair]).Value(), 0.1);
+			Assert.AreEqual(48201.2777, ((SI)writer[ModalResultField.Pair]).Value(), 0.1);
 
 			retVal = vehicle.Request(absTime, dt, 1.SI<MeterPerSquareSecond>(), 0.SI<Radian>());
 			vehicle.CommitSimulationStep(writer);
-			Assert.AreEqual(49747.8535, ((SI)writer[ModalResultField.Pair]).Value(), 0.1);
+			Assert.AreEqual(49735.26379, ((SI)writer[ModalResultField.Pair]).Value(), 0.1);
 		}
 	}
 }
\ No newline at end of file