From 898a762ee9a4d50d82de974c3d9b3cd8d17a1963 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 5 Oct 2015 16:48:27 +0200
Subject: [PATCH] adapt testcases to new vehicle data structure
---
VectoCoreTest/Integration/CoachPowerTrain.cs | 3 +--
VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs | 3 +--
VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs | 3 +--
VectoCoreTest/Integration/Truck40tPowerTrain.cs | 3 +--
VectoCoreTest/Models/SimulationComponent/DriverTest.cs | 3 +--
5 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCoreTest/Integration/CoachPowerTrain.cs
index 0e99089da4..b7198c8870 100644
--- a/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -134,9 +134,8 @@ namespace TUGraz.VectoCore.Tests.Integration
};
return new VehicleData {
AxleConfiguration = AxleConfiguration.AxleConfig_6x2,
- CrossSectionArea = 3.2634.SI<SquareMeter>(),
+ AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
- DragCoefficient = 1,
CurbWeight = 15700.SI<Kilogram>(),
CurbWeigthExtra = 0.SI<Kilogram>(),
Loading = loading,
diff --git a/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
index 24895eb4d2..aba67766a0 100644
--- a/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
+++ b/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
@@ -351,9 +351,8 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
};
return new VehicleData {
AxleConfiguration = AxleConfiguration.AxleConfig_6x2,
- CrossSectionArea = 3.2634.SI<SquareMeter>(),
+ AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
- DragCoefficient = 1,
CurbWeight = 15700.SI<Kilogram>(),
CurbWeigthExtra = 0.SI<Kilogram>(),
Loading = loading,
diff --git a/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs b/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
index b913f47b4e..e0099a5c78 100644
--- a/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
+++ b/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
@@ -251,9 +251,8 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
};
return new VehicleData {
AxleConfiguration = AxleConfiguration.AxleConfig_6x2,
- CrossSectionArea = 3.2634.SI<SquareMeter>(),
+ AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
- DragCoefficient = 1,
CurbWeight = 15700.SI<Kilogram>(),
CurbWeigthExtra = 0.SI<Kilogram>(),
Loading = loading,
diff --git a/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCoreTest/Integration/Truck40tPowerTrain.cs
index 576ea99097..b3d3daa92c 100644
--- a/VectoCoreTest/Integration/Truck40tPowerTrain.cs
+++ b/VectoCoreTest/Integration/Truck40tPowerTrain.cs
@@ -160,9 +160,8 @@ namespace TUGraz.VectoCore.Tests.Integration
};
return new VehicleData {
AxleConfiguration = AxleConfiguration.AxleConfig_4x2,
- CrossSectionArea = 6.2985.SI<SquareMeter>(),
+ AerodynamicDragAera = 6.2985.SI<SquareMeter>(),
CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
- DragCoefficient = 1,
CurbWeight = 7100.SI<Kilogram>(),
CurbWeigthExtra = massExtra,
Loading = loading,
diff --git a/VectoCoreTest/Models/SimulationComponent/DriverTest.cs b/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
index 03e87a4fb4..b62b473de3 100644
--- a/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
+++ b/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
@@ -360,9 +360,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
};
return new VehicleData {
AxleConfiguration = AxleConfiguration.AxleConfig_4x2,
- CrossSectionArea = 3.2634.SI<SquareMeter>(),
+ AerodynamicDragAera = 3.2634.SI<SquareMeter>(),
CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
- DragCoefficient = 1,
CurbWeight = 15700.SI<Kilogram>(),
CurbWeigthExtra = 0.SI<Kilogram>(),
Loading = loading,
--
GitLab