From a56bd7a9f4a67ddc6b35031ebce3989bdd068426 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Thu, 9 Mar 2023 16:01:35 +0100
Subject: [PATCH] bugfix reading vehicle data: return correct jobtype, do not
read aux for PEV
---
.../v24/XMLDeclarationMediumLorryVehicleDataProvider.cs | 4 ++--
.../SimulationComponents/AuxiliaryDataAdapter.cs | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationMediumLorryVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationMediumLorryVehicleDataProvider.cs
index aab7009536..3157dd0616 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationMediumLorryVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationMediumLorryVehicleDataProvider.cs
@@ -198,7 +198,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public XMLDeclarationIepcMediumLorryDataProviderV24(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile)
: base(jobData, xmlNode, sourceFile) { }
- public override VectoSimulationJobType VehicleType => VectoSimulationJobType.BatteryElectricVehicle;
+ public override VectoSimulationJobType VehicleType => VectoSimulationJobType.IEPC_E;
#region Overrides of XMLDeclarationVehicleDataProviderV10
@@ -250,7 +250,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
#endregion
- public override VectoSimulationJobType VehicleType => VectoSimulationJobType.SerialHybridVehicle;
+ public override VectoSimulationJobType VehicleType => VectoSimulationJobType.IEPC_S;
public override bool HybridElectricHDV => true;
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/AuxiliaryDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/AuxiliaryDataAdapter.cs
index e35b7b26c4..413dcc3761 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/AuxiliaryDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/AuxiliaryDataAdapter.cs
@@ -1329,7 +1329,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
var retVal = GetDefaultElectricalUserConfig();
var primaryBusAuxiliaries = primaryVehicle.Components.BusAuxiliaries;
- retVal.AlternatorType = primaryBusAuxiliaries.ElectricSupply.AlternatorTechnology;
+ retVal.AlternatorType = primaryVehicle.VehicleType == VectoSimulationJobType.BatteryElectricVehicle
+ ? AlternatorType.None
+ : primaryBusAuxiliaries.ElectricSupply.AlternatorTechnology;
+ //primaryBusAuxiliaries.ElectricSupply.AlternatorTechnology;
retVal.ElectricalConsumers = (Dictionary<string, AuxiliaryDataAdapter.ElectricConsumerEntry>)currentDemand;
retVal.AlternatorMap = new SimpleAlternator(
_primaryBusDataAdapter.CalculateAlternatorEfficiency(
--
GitLab