From c995999d260642b3eddf530bb22f308bb6f9172c Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Wed, 3 Nov 2021 17:31:03 +0100 Subject: [PATCH] add column in user manual for vsum, avoid SI-NaN/infinity value in shift strategy --- Documentation/User Manual/5-input-and-output-files/VSUM.md | 1 + VectoCore/VectoCore/Models/Declaration/TruckSegments.cs | 1 + .../Models/SimulationComponent/Impl/AMTShiftStrategy.cs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/User Manual/5-input-and-output-files/VSUM.md b/Documentation/User Manual/5-input-and-output-files/VSUM.md index cf7499f1eb..2f9d695576 100644 --- a/Documentation/User Manual/5-input-and-output-files/VSUM.md +++ b/Documentation/User Manual/5-input-and-output-files/VSUM.md @@ -64,6 +64,7 @@ The .vsum file includes total / average results for each calculation run in one | E_air | [kWh] | Total work of air resistance | | E_roll | [kWh] | Total work of rolling resistance | | E_grad | [kWh] | Total work of gradient resistance | +| E_aux_ESS_missing | [kWh] | Total work of auxiliaries missing due to ICE off during ESS events. Used for fuel consumption correction in the post-processing. | | n_EM_\<POS>-em_avg | [rpm] | Average angular speed of the electric machine | | E_EM_\<POS>-em_drive | [kWh] | Mechanical energy at the electric motor shaft applied by the electric machine at position *POS* to drive the vehicle | | E_EM_\<POS>-em_gen | [kWh] | Mechanical energy at the electric motor shaft recuperated by the electric machine at position *POS* | diff --git a/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs b/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs index 623c4f7af9..9b098394ba 100644 --- a/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs +++ b/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs @@ -32,6 +32,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.IO; using System.Linq; using TUGraz.VectoCommon.Exceptions; using TUGraz.VectoCommon.Models; diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs index 3019637148..ccbe4d9cf6 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs @@ -313,7 +313,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl ? double.MaxValue.SI<NewtonMeter>() : GearboxModelData.Gears[currentGear.Gear].ShiftPolygon .InterpolateDownshift(response.Engine.EngineSpeed)); - var reserve = 1 - inTorque / maxTorque; + var reserve = 1 - inTorque.Value() / maxTorque.Value(); if (reserve >= 0 /*ModelData.TorqueReserve */ && IsAboveDownShiftCurve(currentGear, inTorque, inAngularVelocity)) { continue; -- GitLab