diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/DrivingCycleDataReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/DrivingCycleDataReader.cs
index 25e859061b110f2aca266a4fa1db42bab2f643f0..6af883fac19cea8345bdbb5467dfea55e3cf8ad9 100644
--- a/VectoCore/VectoCore/InputData/Reader/ComponentData/DrivingCycleDataReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/DrivingCycleDataReader.cs
@@ -596,8 +596,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
Gear = (uint)row.ParseDoubleOrGetDefault(Fields.Gear),
AngularVelocity = row.ParseDouble(Fields.EngineSpeed).RPMtoRad(),
AdditionalAuxPowerDemand = row.ParseDoubleOrGetDefault(Fields.AdditionalAuxPowerDemand).SI(Unit.SI.Kilo.Watt)
- .Cast<Watt>(),
- VehicleTargetSpeed = row.ParseDoubleOrGetDefault(Fields.VehicleSpeed).KMPHtoMeterPerSecond(),
+ .Cast<Watt>()
}).ToArray();
return entries;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatteryElectricMotorController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatteryElectricMotorController.cs
index f00038190c616d519dc547bec44b3d3fef75e750..6a36653972134c4717288f0b565cb696fc157aeb 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatteryElectricMotorController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatteryElectricMotorController.cs
@@ -9,7 +9,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
public class BatteryElectricMotorController : IElectricMotorControl
{
- private VehicleContainer DataBus;
+ protected VehicleContainer DataBus;
private ElectricSystem ElectricSystem;
protected ElectricMotorData ElectricMotorData;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
index dd37bc17dcad64c08544385ca33ae49909f8e021..657aa963d1ed8d29587ff9c2a6d968b11a75c854 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
@@ -371,6 +371,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
CurrentState.SetState(0.SI<NewtonMeter>(), disengagedResponse.Engine.EngineSpeed, 0.SI<NewtonMeter>(), outAngularVelocity);
CurrentState.Gear = Gear;
+ InvokeGearShiftTriggered();
+
return disengagedResponse;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
index d20f01a61e80f15a2ccfe9ed35bd5d59844c00fb..252658630ff824aa6be49436b05395259a15c20d 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
@@ -35,6 +35,7 @@ using System.Linq;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
@@ -72,6 +73,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected readonly IDrivingCycleData Data;
+ protected readonly VectoRunData RunData;
+
protected internal readonly DrivingCycleEnumerator CycleIterator;
protected Second AbsTime { get; set; }
@@ -93,6 +96,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
CurrentState = PreviousState.Clone();
AbsTime = Data.Entries.First().Time;
+
+ RunData = container.RunData;
}
public IResponse Initialize()
@@ -240,7 +245,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private void DetermineDriverAction(Second absTime)
{
- if (DataBus.EngineCtl == null) {
+ if (RunData.JobType == VectoSimulationJobType.BatteryElectricVehicle) {
DetermineDriverActionForBEV(absTime);
}
else {
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelBatteryElectricMotorController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelBatteryElectricMotorController.cs
index 6b8ab2659e7cc8d547164ac79d075befee169560..f3f0bd5c749893f9f947c74dd1ca1902f0ccdadd 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelBatteryElectricMotorController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelBatteryElectricMotorController.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.Configuration;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
@@ -15,7 +11,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected override bool CannotProvideMechanicalAssistAtLowSpeed(NewtonMeter outTorque)
{
- return false;
+ return DataBus.DrivingCycleInfo.CycleData.LeftSample.VehicleTargetSpeed.IsSmallerOrEqual(
+ GearboxModelData?.DisengageWhenHaltingSpeed ?? Constants.SimulationSettings.ClutchDisengageWhenHaltingSpeed)
+ && outTorque.IsSmaller(0);
}
}
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
index 5f3418f423a7fb4fa7a1fd6237d27ed3de57d23e..85a792007a621fa0525cc69b1ff94a0c85b4f8ce 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
@@ -30,9 +30,9 @@
*/
using System.Linq;
-using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
@@ -72,12 +72,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var axleRatio = (RunData.AxleGearData != null) ? RunData.AxleGearData.AxleGear.Ratio : 1;
var emData = (RunData.ElectricMachinesData.Count > 0) ? RunData.ElectricMachinesData.First().Item2 : null;
- var ratioADC = (RunData.JobType == VectoCommon.InputData.VectoSimulationJobType.BatteryElectricVehicle) ? emData.RatioADC : 1;
+ var ratioADC = (RunData.JobType == VectoSimulationJobType.BatteryElectricVehicle) ? emData.RatioADC : 1;
foreach (var entry in Data.Entries) {
entry.WheelAngularVelocity = entry.AngularVelocity / (axleRatio * gearRatios[entry.Gear] * ratioADC);
+
+ entry.VehicleTargetSpeed = entry.WheelAngularVelocity * RunData.VehicleData.DynamicTyreRadius;
- entry.Torque = ((entry.WheelAngularVelocity != null) && !entry.WheelAngularVelocity.IsEqual(0))
+ entry.Torque = !entry.WheelAngularVelocity.IsEqual(0)
? entry.PWheel / entry.WheelAngularVelocity
: 0.SI<NewtonMeter>();
}
@@ -85,6 +87,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override IResponse Initialize()
{
+ if (DataBus.GearboxCtl != null) {
+ DataBus.GearboxCtl.GearShiftTriggered -= GearShiftTriggered;
+ DataBus.GearboxCtl.GearShiftTriggered += GearShiftTriggered;
+ }
+
if (FirstRun) {
InitializeCycleData();
@@ -96,6 +103,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return response;
}
+ private void GearShiftTriggered()
+ {
+ if (DrivingAction == DrivingAction.Accelerate) {
+ DriverBehavior = DrivingBehavior.Driving;
+ DrivingAction = DrivingAction.Roll;
+ }
+ }
+
public override IResponse Request(Second absTime, Second dt)
{
if (CycleIterator.LastEntry && CycleIterator.RightSample.Time == absTime) {
@@ -165,7 +180,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private void DetermineDriverAction()
{
- if (DataBus.EngineInfo == null) {
+ if (RunData.JobType == VectoSimulationJobType.BatteryElectricVehicle) {
DetermineDriverActionForBEV();
}
}
@@ -176,13 +191,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
DrivingAction = DrivingAction.Halt;
DriverBehavior = DrivingBehavior.Halted;
}
- else if (CycleIterator.LeftSample.PWheel.Value() < 0) {
+ else if ((CycleIterator.LeftSample.PWheel.Value() < 0) && (DrivingAction != DrivingAction.Roll)) {
DrivingAction = DrivingAction.Brake;
DriverBehavior = DrivingBehavior.Braking;
}
else {
- DrivingAction = DrivingAction.Accelerate;
- DriverBehavior = DrivingBehavior.Accelerating;
+ DrivingAction = DataBus.GearboxInfo.GearEngaged(DataBus.AbsTime) ? DrivingAction.Accelerate : DrivingAction.Roll;
+ DriverBehavior = DrivingBehavior.Driving;
}
}
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs
index 620f4c824476184370361c982ed65e1f836a2817..5b4cbba903a5038d0e5f2808bae9a775dabd1d56 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs
@@ -34,27 +34,27 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
TestCase(E2_JOB, 6, 0, 1.128, 120.0374, TestName = "E2 BEV TimeRun MeasuredSpeedGear LongHaul"),
TestCase(E2_JOB, 7, 1, 4.3124, 117.0889, TestName = "E2 BEV TimeRun MeasuredSpeedGear RegionalDelivery"),
- TestCase(E2_JOB, 8, 2, 28.7993, 125.4735, TestName = "E2 BEV TimeRun MeasuredSpeedGear UrbanDelivery"),
+ TestCase(E2_JOB, 8, 2, 28.8197, 125.4709, TestName = "E2 BEV TimeRun MeasuredSpeedGear UrbanDelivery"),
- TestCase(E2_JOB, 9, 0, 1.1561, 119.9885, TestName = "E2 BEV TimeRun MeasuredSpeedPWheel LongHaul"),
- TestCase(E2_JOB, 10, 1, 4.6791, 117.2513, TestName = "E2 BEV TimeRun MeasuredSpeedPWheel RegionalDelivery"),
- TestCase(E2_JOB, 11, 2, 31.6519, 126.6695, TestName = "E2 BEV TimeRun MeasuredSpeedPWheel UrbanDelivery"),
+ TestCase(E2_JOB, 9, 0, 1.1568, 119.989, TestName = "E2 BEV TimeRun MeasuredSpeedPWheel LongHaul"),
+ TestCase(E2_JOB, 10, 1, 4.6931, 117.2523, TestName = "E2 BEV TimeRun MeasuredSpeedPWheel RegionalDelivery"),
+ TestCase(E2_JOB, 11, 2, 31.8158, 126.7559, TestName = "E2 BEV TimeRun MeasuredSpeedPWheel UrbanDelivery"),
TestCase(E3_JOB, 0, 0, 0.7916, 101.6194, TestName = "E3 BEV TimeRun MeasuredSpeed LongHaul"),
TestCase(E3_JOB, 1, 1, 3.3777, 104.792, TestName = "E3 BEV TimeRun MeasuredSpeed RegionalDelivery"),
TestCase(E3_JOB, 2, 2, 28.1637, 128.3685, TestName = "E3 BEV TimeRun MeasuredSpeed UrbanDelivery"),
- TestCase(E3_JOB, 6, 0, 0.8476, 101.5911, TestName = "E3 BEV TimeRun MeasuredSpeedPWheel LongHaul"),
- TestCase(E3_JOB, 7, 1, 3.611, 104.7354, TestName = "E3 BEV TimeRun MeasuredSpeedPWheel RegionalDelivery"),
- TestCase(E3_JOB, 8, 2, 30.5738, 127.6631, TestName = "E3 BEV TimeRun MeasuredSpeedPWheel UrbanDelivery"),
+ TestCase(E3_JOB, 6, 0, 0.8144, 101.6097, TestName = "E3 BEV TimeRun MeasuredSpeedPWheel LongHaul"),
+ TestCase(E3_JOB, 7, 1, 3.5103, 104.7876, TestName = "E3 BEV TimeRun MeasuredSpeedPWheel RegionalDelivery"),
+ TestCase(E3_JOB, 8, 2, 29.6221, 128.1818, TestName = "E3 BEV TimeRun MeasuredSpeedPWheel UrbanDelivery"),
TestCase(E4_JOB, 0, 0, 0.9165, 97.3067, TestName = "E4 BEV TimeRun MeasuredSpeed LongHaul"),
TestCase(E4_JOB, 1, 1, 3.7896, 100.3712, TestName = "E4 BEV TimeRun MeasuredSpeed RegionalDelivery"),
TestCase(E4_JOB, 2, 2, 30.1342, 123.7528, TestName = "E4 BEV TimeRun MeasuredSpeed UrbanDelivery"),
- TestCase(E4_JOB, 6, 0, 0.9741, 97.2793, TestName = "E4 BEV TimeRun MeasuredSpeedPWheel LongHaul"),
- TestCase(E4_JOB, 7, 1, 4.0286, 100.3147, TestName = "E4 BEV TimeRun MeasuredSpeedPWheel RegionalDelivery"),
- TestCase(E4_JOB, 8, 2, 32.6304, 123.0436, TestName = "E4 BEV TimeRun MeasuredSpeedPWheel UrbanDelivery")
+ TestCase(E4_JOB, 6, 0, 0.94, 97.3005, TestName = "E4 BEV TimeRun MeasuredSpeedPWheel LongHaul"),
+ TestCase(E4_JOB, 7, 1, 3.9236, 100.3755, TestName = "E4 BEV TimeRun MeasuredSpeedPWheel RegionalDelivery"),
+ TestCase(E4_JOB, 8, 2, 31.6158, 123.6378, TestName = "E4 BEV TimeRun MeasuredSpeedPWheel UrbanDelivery")
]
public void TestBEVTimeRunCycle(string jobFile, int cycleIdx, int distanceCycleIdx, double charge, double discharge)
{