Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit a56bd7a9 authored by Markus QUARITSCH's avatar Markus QUARITSCH
Browse files

bugfix reading vehicle data: return correct jobtype, do not read aux for PEV

parent 6475a4df
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment