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 aab700953600f621527ef5582d7b8be64d4e0b3d..3157dd061624198e93749c0ec719faac206e6353 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 e35b7b26c42015625b2d4dd89224145fe28affa3..413dcc376168e76f458718887ee1776e5dfda161 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(