From 6db732c0797f948884bce5f23b54fb483a4d7e3b Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Mon, 13 Jun 2022 15:46:01 +0200 Subject: [PATCH] loading /saving busaux params fir iepc --- VECTO/GUI/BusAuxiliariesEngParametersForm.vb | 2 +- VECTO/Input Files/BusParamsEngineering.vb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VECTO/GUI/BusAuxiliariesEngParametersForm.vb b/VECTO/GUI/BusAuxiliariesEngParametersForm.vb index 3f940a3a26..c6cc99d90a 100644 --- a/VECTO/GUI/BusAuxiliariesEngParametersForm.vb +++ b/VECTO/GUI/BusAuxiliariesEngParametersForm.vb @@ -199,7 +199,7 @@ Public Class BusAuxiliariesEngParametersForm tbCurrentDemandEngineOffDriving.Text = inputData.ElectricSystem.CurrentDemandEngineOffDriving.ToGUIFormat() tbCurrentDemandEngineOffStandstill.Text = inputData.ElectricSystem.CurrentDemandEngineOffStandstill.ToGUIFormat() tbDCDCEff.Text = inputData.ElectricSystem.DCDCConverterEfficiency.ToGUIFormat() - if (JobType <> VectoSimulationJobType.BatteryElectricVehicle) Then + if (JobType <> VectoSimulationJobType.BatteryElectricVehicle AndAlso JobType <> VectoSimulationJobType.IEPC_E) Then tbAlternatorEfficiency.Text = inputData.ElectricSystem.AlternatorEfficiency.ToGUIFormat() cbAlternatorTechnology.SelectedValue = inputData.ElectricSystem.AlternatorType tbMaxAlternatorPower.Text = inputData.ElectricSystem.MaxAlternatorPower.ToGUIFormat() diff --git a/VECTO/Input Files/BusParamsEngineering.vb b/VECTO/Input Files/BusParamsEngineering.vb index 0bebd1d4f9..45884dff8b 100644 --- a/VECTO/Input Files/BusParamsEngineering.vb +++ b/VECTO/Input Files/BusParamsEngineering.vb @@ -131,7 +131,7 @@ Public Class BusAuxEngineeringParams Public ReadOnly Property PS_CompressorMap As TableData Implements IBusAuxPneumaticSystemEngineeringData.CompressorMap get - if JobType =VectoSimulationJobType.BatteryElectricVehicle then + if JobType =VectoSimulationJobType.BatteryElectricVehicle OrElse JobType = VectoSimulationJobType.IEPC_E then return Nothing End If if Not file.Exists(CompressorMap.FullPath) Then -- GitLab