diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs index 448907ed6a76df6d4d07ce1ebadae0ed35034a31..a0fba2af5b95f295c1a8c44ecd40784397c469ff 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs @@ -38,7 +38,6 @@ using TUGraz.VectoCore.Models.Connector.Ports; using TUGraz.VectoCore.Models.Connector.Ports.Impl; using TUGraz.VectoCore.Models.Simulation; using TUGraz.VectoCore.Models.Simulation.Data; -using TUGraz.VectoCore.Models.Simulation.DataBus; using TUGraz.VectoCore.Models.SimulationComponent.Data; using TUGraz.VectoCore.OutputData; using TUGraz.VectoCore.Utils; @@ -339,8 +338,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl container[ModalResultField.Tq_drag] = CurrentState.FullDragTorque; try { - var fc = ModelData.ConsumptionMap.GetFuelConsumption(CurrentState.EngineTorque, avgEngineSpeed, - allowExtrapolation: (DataBus.ExecutionMode != ExecutionMode.Declaration)); + var fc = ModelData.ConsumptionMap.GetFuelConsumption(CurrentState.EngineTorque, avgEngineSpeed); //TODO mk-2015-11-11: calculate aux start stop correction var fcAux = fc; @@ -354,19 +352,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl container[ModalResultField.FCWHTCc] = fcWHTC; container[ModalResultField.FCAAUX] = fcAAUX; container[ModalResultField.FCFinal] = fcFinal; - - if (ModelData.ConsumptionMap.Extrapolated) { - Log.Warn("FuelMap Extrapolated: n_eng_avg: {0} Tq: {1}, FC: {2}", avgEngineSpeed.ConvertTo().Rounds.Per.Minute, - CurrentState.EngineTorque, fc); - } - } catch (VectoException ex) { - Log.Warn("FuelMap: {0} n_eng_avg: {1} Tq: {2}", ex.Message, avgEngineSpeed.ConvertTo().Rounds.Per.Minute, + } catch (Exception) { + Log.Error("FuelMap Extrapolated: n_eng_avg: {0} Tq: {1}", avgEngineSpeed.ConvertTo().Rounds.Per.Minute, CurrentState.EngineTorque); - container[ModalResultField.FCMap] = null; - container[ModalResultField.FCAUXc] = null; - container[ModalResultField.FCWHTCc] = null; - container[ModalResultField.FCAAUX] = null; - container[ModalResultField.FCFinal] = null; + throw; } } diff --git a/VectoCore/VectoCore/Utils/DelaunayMap.cs b/VectoCore/VectoCore/Utils/DelaunayMap.cs index 321c0aa3ba4c2dcafe40748dea24340b74caeed2..d5cad22b24aa5a90ef78fffa6aa42150cfca9248 100644 --- a/VectoCore/VectoCore/Utils/DelaunayMap.cs +++ b/VectoCore/VectoCore/Utils/DelaunayMap.cs @@ -36,7 +36,6 @@ using System.Drawing; using System.IO; using System.Linq; using System.Threading; -using System.Threading.Tasks; using System.Windows.Forms.DataVisualization.Charting; using TUGraz.VectoCommon.Exceptions; using TUGraz.VectoCommon.Models;