From 8bc6a640b55818134ffcbcab0911b77ae3d42b08 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 24 Feb 2020 17:14:34 +0100
Subject: [PATCH] engineering data adapter: use default height in case no
vehicle category is found
---
.../DataObjectAdapter/EngineeringDataAdapter.cs | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index 5a59379421..6db127ed4e 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -129,9 +129,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var airDragArea = airdragData.AirDragArea ??
DeclarationData.TruckSegments.LookupCdA(
data.VehicleCategory, data.AxleConfiguration, data.GrossVehicleMassRating, false);
- var height = data.Height ?? DeclarationData.TruckSegments.LookupHeight(
- data.VehicleCategory, data.AxleConfiguration,
- data.GrossVehicleMassRating, false);
+ var height = data.Height ?? (data.VehicleCategory.IsTruck()
+ ? DeclarationData.TruckSegments.LookupHeight(
+ data.VehicleCategory, data.AxleConfiguration,
+ data.GrossVehicleMassRating, false)
+ : 4.SI<Meter>());
retVal.CrossWindCorrectionCurve = new CrosswindCorrectionCdxALookup(
airDragArea,
DeclarationDataAdapterHeavyLorry.GetDeclarationAirResistanceCurve(
@@ -155,9 +157,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
return "MediumLorriesVan";
case VehicleCategory.RigidTruck: return numAxles > axles.NumAxles() ? "RigidTrailer" : "RigidSolo";
case VehicleCategory.Tractor: return "TractorSemitrailer";
- //case VehicleCategory.CityBus:
+ case VehicleCategory.CityBus:
//case VehicleCategory.InterurbanBus:
- //case VehicleCategory.Coach: return "CoachBus";
+ case VehicleCategory.Coach: return "CoachBus";
default: throw new ArgumentOutOfRangeException("vehicleCategory", vehicleCategory, null);
}
}
--
GitLab