From d85b90850c3f4631bc57d3c46552dadadc87fe81 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 8 Oct 2020 16:13:49 +0200
Subject: [PATCH] started working on E2: shift strategy for electric vehicles
---
.../1-user-interface/L_ElectricMotor.md | 2 +-
.../5-input-and-output-files/VSUM.md | 163 +++++-----
VECTO/GUI/ElectricMotorForm.vb | 2 +-
.../ElectricFullLoadCurveReader.cs | 6 +-
.../Models/Declaration/DeclarationData.cs | 38 ++-
.../Simulation/Data/ModalResultField.cs | 5 +-
.../Simulation/DataBus/IElectricMotorInfo.cs | 1 +
.../Data/ElectricMotor/ElectricMotorData.cs | 2 +-
...Curve.cs => ElectricMotorFullLoadCurve.cs} | 26 +-
.../SimulationComponent/IShiftStrategy.cs | 2 +-
.../Impl/AMTShiftStrategy.cs | 2 +-
.../Impl/AMTShiftStrategyACEA.cs | 2 +-
.../Impl/AMTShiftStrategyOptimized.cs | 4 +-
.../Impl/ATShiftStrategy.cs | 4 +-
.../Impl/ATShiftStrategyOptimized.cs | 5 +-
.../Impl/BaseShiftStrategy.cs | 5 +-
.../SimulationComponent/Impl/CycleGearbox.cs | 2 +-
.../SimulationComponent/Impl/ElectricMotor.cs | 7 +-
.../SimulationComponent/Impl/Gearbox.cs | 45 ++-
.../Impl/HybridController.cs | 2 +-
.../Impl/PEVAMTShiftStrategy.cs | 298 ++++++++++++++++++
VectoCore/VectoCore/VectoCore.csproj | 3 +-
.../BatteryElectric/BatteryElectricTest.cs | 204 +++++++++++-
23 files changed, 703 insertions(+), 127 deletions(-)
rename VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/{ElectricFullLoadCurve.cs => ElectricMotorFullLoadCurve.cs} (74%)
create mode 100644 VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
diff --git a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
index 9105dbc87a..54d8032deb 100644
--- a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
+++ b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
@@ -35,7 +35,7 @@ Electric Power Consumption Map
###Chart Area
-The Chart Area displays the electric machine's max. drive curve and max. generation curve (blue), the drag curve (green) and the entries provided in the electric power consumption map.
+The Chart Area displays the electric machine's max. drive curve and max. generation curve (blue), the drag curve (green) and the entries provided in the electric power consumption map (red).
###Controls
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 355d7bdcab..cb0b2366ad 100644
--- a/Documentation/User Manual/5-input-and-output-files/VSUM.md
+++ b/Documentation/User Manual/5-input-and-output-files/VSUM.md
@@ -5,80 +5,95 @@ The .vsum file includes total / average results for each calculation run in one
**Note:** For dual-fuel vehicles the fuel consumption columns are present for each fuel (e.g., FC-Map_Diesel CI, FC-Map_NG CI).
-| Name | Unit | Description |
-| ----------------------- | -------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Job | [-] | Job number in the format "X-Y" (with X as filenumber, and Y as cycle number) |
-| Input File | [-] | Name of the input job file (.vecto) |
-| Cycle | [-] | Name of the cycle file (or cycle name in declaration mode) |
-| Status | [-] | The result status of the run (Success, Aborted) |
-| Mass | [kg] | Vehicle mass (**Corected Actual Curb Mass Vehicle** + **Curb Mass Extra Trailer/Body**, see [Vehicle Editor](#vehicle-editor)) |
-| Loading | [kg] | Vehicle loading (see [Vehicle Editor](#vehicle-editor)) |
-| Cargo Volume | [m^3] | Vehicle cargo volume (Declaration Mode only!) |
-| time | [s] | Total simulation time |
-| distance | [km] | Total traveled distance |
-| speed | [km/h] | Average vehicle speed |
-| altitudeDelta | [m] | Altitude difference between start and end of cycle |
-| FC-Map<\_FuelName> | [g/h], [g/km] | Average fuel consumption before all corrections, interpolated from [Fuel Map](#engine-fuel-consumption-calculation), based on torque and engine speed. |
-| FC-NCVc<\_FuelName> | [g/h], [g/km] | Average fuel consumption after correcting for the [net calorific value](#engine-correction-factors) (Based on FC-Map from .vmod) |
-| FC-WHTCc<\_FuelName> | [g/h], [g/km] | Average fuel consumption after [WHTC Correction](#engine-fuel-consumption-calculation) (Based on FC-NCVc from .vmod) |
-| FC-ESS<\_FuelName> | [g/h], [g/km] | Average fuel consumption including fuel consumption during engine-off periods (Based on FC-ESS from .vmod) |
-| FC-ESS_Corr<\_FuelName> | [g/h], [g/km] | Average fuel consumption including fuel consumption during engine-off periods corrected for energy demand during engine-off periods not accounted (FC-ESS_Corr = FC-WHR_Corr + (E_aux_ess_mech + E_ice_start) * k_vehline) |
-| FC-BusAux_PS_Corr<\_FuelName> | [g/h], [g/km] | Average fuel consumption corrected for the excessive/missing energy for the smart pneumatic system |
-| FC-BusAux_ES_Corr<\_FuelName> | [g/h], [g/km] | Average fuel consumption corrected for the excessive/missing energy for the smart electric system |
-| FC-WHR_Corr<\_FuelName> | [g/h], [g/km] | Average fuel consumption including fuel consumption deduction due to electric power generated by an electric WHR system (FC-WHR_Corr = FC-ESS - E_WHR_el / eta_alternator * k_vehline) |
-| FC-BusAux\_AuxHeater<\_FuelName> | [g/h], [g/km] | Average fuel consumption of the additionalheater. In case of dual-fuel vehicles the aux heater is fueled with the primary fuel |
-| FC-BusAux\_AuxHeater\_Corr<\_FuelName> | [g/h], [g/km] | Average fuel consumptioncorrected for the aux heater fuel demand |
-| FC-Final<\_FuelName> | [g/h], [g/km], [l/100km], [l/100tkm], [l/100m^3km] | Final average fuel consumption after ALL corrections (FC-Final = FC-ESS_Corr). Fuel consumption for calculation of CO~2~ value. If Loading = 0[kg] the column [l/100tkm] is left empty. |
-| CO2 | [g/km], [g/tkm], [g/m^3km] | Average CO~2~ emissions (based on FC-Final value). Output for [l/100tkm] is empty when Loading = 0[kg]. |
-| P_wheel_in_pos | [kW] | Average positive power at the wheels |
-| P_wheel_in | [kW] | Average power at the wheels |
-| P_fcmap_pos | [kW] | Average positive power at engine (all non-negative values averaged over the whole cycle duration) |
-| P_fcmap_pos | [kW] | Average power at engine (both, positive and negative values, averaged over the whole cycle duration) |
-| E_fcmap_pos | [kWh] | Total positive work provided by the combustion engine. |
-| E_fcmap_neg | [kWh] | Total energy |
-| E_powertrain_inertia | [kWh] | Total work of engine, torqueconverter, and gearbox inertia |
-| E_aux_xxx | [kWh] | Energy demand of auxiliary with ID xxx applied as torque demand to the engine (i.e. mechanical energy demand). See also [Aux Dialog](#auxiliary-dialog) and [Driving Cycle](#driving-cycles-.vdri). In Declaration Mode the following auxiliaries always exists: E_aux_FAN (Fan), E_aux_PS (Pneumatic System), E_aux_STP (Steering Pump), E_aux_ES (Electrical System), E_aux_AC (Air Condition). In case of fully electrical auxiliaries for trucks the electrical power demand is converted to mechanical power using the alternator efficiency. For Buses with fully electrical auxiliaries the consumer is connected to the electrical system and thus the according column reports 0 power demand. |
-| E_aux_sum | [kWh] | Total energy demand of all auxiliaries. This is the sum for all E_aux_xxx columns and the bus auxiliaires. |
-| E_clutch_loss | [kWh] | Total energy loss in the clutch |
-| E_tc_loss | [kWh] | Total torque converter energy loss |
-| E_gbx_loss | [kWh] | Total transmission energy losses at gearbox (includes loss-map, inertia, and gear-shifts). E_shift_loss is already included here. |
-| E_shift_loss | [kWh] | Total energy losses due to gearshifts |
-| E_ret_loss | [kWh] | Total retarder energy loss |
-| E_angle_loss | [kWh] | Total torque converter energy loss |
-| E_axl_loss | [kWh] | Total transmission energy losses at the axlegear |
-| E_brake | [kWh] | Total work dissipated in mechanical braking (sum of service brakes, retader and additional engine exhaust brakes) |
-| E_vehicle_inertia | [kWh] | Total work of wheels inertia and vehicle mass |
-| E_air | [kWh] | Total work of air resistance |
-| E_roll | [kWh] | Total work of rolling resistance |
-| E_grad | [kWh] | Total work of gradient resistance |
-| BusAux PS air consumed | [Nl] | Total air consumed by the pneumatic system. |
-| BusAux PS air generated | [Nl] | Total air generated by the pneumatic compressor. Difference to "BusAux PS air consumed" is corrected in the [post-processing](#engine-fuel-consumption-correction) |
-| E_PS_compressorOff | [kWh] | Total energy demand for the pneumatic compressor if no air would be generated (compressor always in drag) |
-| E_PS_compressorOn | [kWh] | Total mechanical work for the pneumatic compressor to generate "BusAux PS air generated" |
-| E_BusAux_ES_consumed | [kWh] | Total electric energy for all electric consumers |
-| E_BusAux_ES_generated | [kWh] | Total electric energy generated |
-| ΔE_BusAux_Bat | [kWh] | In case of smart electrics, the difference of energy stored in the RESS between the beginning and end of the driving cycle. This energy difference is corrected in the post-processing |
-| E_BusAux_PS_corr | [kWh] | Mechanical energy of the pneumatic system that needs to be considered in the post-processing to [correct the total fuel consumption](#engine-fuel-consumption-correction) |
-| E_BusAux_ES_mech_corr | [kWh] | Mechanical energy of the electric system that needs to be considered in the post-processing to [correct the total fuel consumption](#engine-fuel-consumption-correction) |
-| E_BusAux_HVAC_mech | [kWh] | Mechancial energy demand of the HVAC system |
-| E_BusAux_HVAC_el | [kWh] | Electrical energy demand of the HVAC system |
-| E_BusAux_AuxhHeater | [kWh] | Energy demand of an additional aux heater. |
-| E_PTO_CONSUM | [kWh] | Total energy demand of the pto consumer (if a pto consumer was used). |
-| E_PTO_TRANSM | [kWh] | Total energy demand of the pto transmission (if a pto transmission was used). |
-| E_WHR_el | [kWh] | Total electric energy generated by an electrical WHR system |
-| E_WHR_mech | [kWh] | Total electric energy generated by an electrical WHR system |
-| E_aux_ess_mech | [kWh] | Total work of auxiliaries during engine stop and thus not considered in FC-Map and FC-AAUX. Considered in FC-ESS_Corr via [fuel consumption correction](#engine-fuel-consumption-correction) (Based on P_aux_ESS_mech in .vmod) |
-| E_ice_start | [kWh] | Total work for starting the combustion engine, not considered in FC-Map and FC-AAUX. Considered in FC-ESS_Corr via [fuel consumption correction](#engine-fuel-consumption-correction) (Based on P_ice_start in .vmod) |
-| ice_starts | [-] | Number of times the combustion engine is started |
-| k_vehline | [g/kWh] | Slope of the regression line derived from all operating points P_wheel vs. FC_final_mod where P_wheel > 0 and FC_final_mod > 0 |
-| k_engline | [g/kWh] | Slope of the regression line used for the [fuel consumption correction](#engine-fuel-consumption-correction) |
-| a | [m/s^2^] | Average acceleration |
-| a_pos | [m/s^2^] | Average acceleration in acceleration phases (a~3s~ \> 0.125 \[m/s^2^\], a~3s~Â = 3-seconds-averaged acceleration) |
-| a_neg | [m/s^2^] | Average deceleration in deceleration phases (a~3s~ \< 0.125 \[m/s^2^\], a~3s~Â = 3-seconds-averaged acceleration) |
-| AccelerationTimeShare | [%] | Time share of acceleration phases (a~3s~ \> 0.125 \[m/s^2^\], a~3s~Â = 3-seconds-averaged acceleration) |
-| DecelerationTimeShare | [%] | Time share of deceleration phases (a~3s~ \< 0.125 \[m/s^2^\], a~3s~Â = 3-seconds-averaged acceleration) |
-| CruiseTimeShare | [%] | Time share of cruise phases (-0.125 ≤ a~3s~ ≤ 0.125 \[m/s^2^\]) |
-| StopTimeShare | [%] | Time share of stop phases (v \< 0.1 \[m/s\]) |
+| Name | Unit | Description |
+| ----------------------- | -------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Job | [-] | Job number in the format "X-Y" (with X as filenumber, and Y as cycle number) |
+| Input File | [-] | Name of the input job file (.vecto) |
+| Cycle | [-] | Name of the cycle file (or cycle name in declaration mode) |
+| Status | [-] | The result status of the run (Success, Aborted) |
+| Mass | [kg] | Vehicle mass (**Corected Actual Curb Mass Vehicle** + **Curb Mass Extra Trailer/Body**, see [Vehicle Editor](#vehicle-editor)) |
+| Loading | [kg] | Vehicle loading (see [Vehicle Editor](#vehicle-editor)) |
+| Cargo Volume | [m^3] | Vehicle cargo volume (Declaration Mode only!) |
+| time | [s] | Total simulation time |
+| distance | [km] | Total traveled distance |
+| speed | [km/h] | Average vehicle speed |
+| altitudeDelta | [m] | Altitude difference between start and end of cycle |
+| FC-Map<\_FuelName> | [g/h], [g/km] | Average fuel consumption before all corrections, interpolated from [Fuel Map](#engine-fuel-consumption-calculation), based on torque and engine speed. |
+| FC-NCVc<\_FuelName> | [g/h], [g/km] | Average fuel consumption after correcting for the [net calorific value](#engine-correction-factors) (Based on FC-Map from .vmod) |
+| FC-WHTCc<\_FuelName> | [g/h], [g/km] | Average fuel consumption after [WHTC Correction](#engine-fuel-consumption-calculation) (Based on FC-NCVc from .vmod) |
+| FC-ESS<\_FuelName> | [g/h], [g/km] | Average fuel consumption including fuel consumption during engine-off periods (Based on FC-ESS from .vmod) |
+| FC-ESS_Corr<\_FuelName> | [g/h], [g/km] | Average fuel consumption including fuel consumption during engine-off periods corrected for energy demand during engine-off periods not accounted (FC-ESS_Corr = FC-WHR_Corr + (E_aux_ess_mech + E_ice_start) * k_vehline) |
+| FC-BusAux_PS_Corr<\_FuelName> | [g/h], [g/km] | Average fuel consumption corrected for the excessive/missing energy for the smart pneumatic system |
+| FC-BusAux_ES_Corr<\_FuelName> | [g/h], [g/km] | Average fuel consumption corrected for the excessive/missing energy for the smart electric system |
+| FC-WHR_Corr<\_FuelName> | [g/h], [g/km] | Average fuel consumption including fuel consumption deduction due to electric power generated by an electric WHR system (FC-WHR_Corr = FC-ESS - E_WHR_el / eta_alternator * k_vehline) |
+| FC-BusAux\_AuxHeater<\_FuelName> | [g/h], [g/km] | Average fuel consumption of the additionalheater. In case of dual-fuel vehicles the aux heater is fueled with the primary fuel |
+| FC-BusAux\_AuxHeater\_Corr<\_FuelName> | [g/h], [g/km] | Average fuel consumptioncorrected for the aux heater fuel demand |
+| FC-Final<\_FuelName> | [g/h], [g/km], [l/100km], [l/100tkm], [l/100m^3km] | Final average fuel consumption after ALL corrections (FC-Final = FC-ESS_Corr). Fuel consumption for calculation of CO~2~ value. If Loading = 0[kg] the column [l/100tkm] is left empty. |
+| CO2 | [g/km], [g/tkm], [g/m^3km] | Average CO~2~ emissions (based on FC-Final value). Output for [l/100tkm] is empty when Loading = 0[kg]. |
+| P_wheel_in_pos | [kW] | Average positive power at the wheels |
+| P_wheel_in | [kW] | Average power at the wheels |
+| P_fcmap_pos | [kW] | Average positive power at engine (all non-negative values averaged over the whole cycle duration) |
+| P_fcmap_pos | [kW] | Average power at engine (both, positive and negative values, averaged over the whole cycle duration) |
+| E_fcmap_pos | [kWh] | Total positive work provided by the combustion engine. |
+| E_fcmap_neg | [kWh] | Total energy |
+| E_powertrain_inertia | [kWh] | Total work of engine, torqueconverter, and gearbox inertia |
+| E_aux_xxx | [kWh] | Energy demand of auxiliary with ID xxx applied as torque demand to the engine (i.e. mechanical energy demand). See also [Aux Dialog](#auxiliary-dialog) and [Driving Cycle](#driving-cycles-.vdri). In Declaration Mode the following auxiliaries always exists: E_aux_FAN (Fan), E_aux_PS (Pneumatic System), E_aux_STP (Steering Pump), E_aux_ES (Electrical System), E_aux_AC (Air Condition). In case of fully electrical auxiliaries for trucks the electrical power demand is converted to mechanical power using the alternator efficiency. For Buses with fully electrical auxiliaries the consumer is connected to the electrical system and thus the according column reports 0 power demand. |
+| E_aux_sum | [kWh] | Total energy demand of all auxiliaries. This is the sum for all E_aux_xxx columns and the bus auxiliaires. |
+| E_clutch_loss | [kWh] | Total energy loss in the clutch |
+| E_tc_loss | [kWh] | Total torque converter energy loss |
+| E_gbx_loss | [kWh] | Total transmission energy losses at gearbox (includes loss-map, inertia, and gear-shifts). E_shift_loss is already included here. |
+| E_shift_loss | [kWh] | Total energy losses due to gearshifts |
+| E_ret_loss | [kWh] | Total retarder energy loss |
+| E_angle_loss | [kWh] | Total torque converter energy loss |
+| E_axl_loss | [kWh] | Total transmission energy losses at the axlegear |
+| E_brake | [kWh] | Total work dissipated in mechanical braking (sum of service brakes, retader and additional engine exhaust brakes) |
+| E_vehicle_inertia | [kWh] | Total work of wheels inertia and vehicle mass |
+| E_air | [kWh] | Total work of air resistance |
+| E_roll | [kWh] | Total work of rolling resistance |
+| E_grad | [kWh] | Total work of gradient resistance |
+| BusAux PS air consumed | [Nl] | Total air consumed by the pneumatic system. |
+| BusAux PS air generated | [Nl] | Total air generated by the pneumatic compressor. Difference to "BusAux PS air consumed" is corrected in the [post-processing](#engine-fuel-consumption-correction) |
+| E_PS_compressorOff | [kWh] | Total energy demand for the pneumatic compressor if no air would be generated (compressor always in drag) |
+| E_PS_compressorOn | [kWh] | Total mechanical work for the pneumatic compressor to generate "BusAux PS air generated" |
+| E_BusAux_ES_consumed | [kWh] | Total electric energy for all electric consumers |
+| E_BusAux_ES_generated | [kWh] | Total electric energy generated |
+| ΔE_BusAux_Bat | [kWh] | In case of smart electrics, the difference of energy stored in the RESS between the beginning and end of the driving cycle. This energy difference is corrected in the post-processing |
+| E_BusAux_PS_corr | [kWh] | Mechanical energy of the pneumatic system that needs to be considered in the post-processing to [correct the total fuel consumption](#engine-fuel-consumption-correction) |
+| E_BusAux_ES_mech_corr | [kWh] | Mechanical energy of the electric system that needs to be considered in the post-processing to [correct the total fuel consumption](#engine-fuel-consumption-correction) |
+| E_BusAux_HVAC_mech | [kWh] | Mechancial energy demand of the HVAC system |
+| E_BusAux_HVAC_el | [kWh] | Electrical energy demand of the HVAC system |
+| E_BusAux_AuxhHeater | [kWh] | Energy demand of an additional aux heater. |
+| E_PTO_CONSUM | [kWh] | Total energy demand of the pto consumer (if a pto consumer was used). |
+| E_PTO_TRANSM | [kWh] | Total energy demand of the pto transmission (if a pto transmission was used). |
+| E_WHR_el | [kWh] | Total electric energy generated by an electrical WHR system |
+| E_WHR_mech | [kWh] | Total electric energy generated by an electrical WHR system |
+| E_aux_ess_mech | [kWh] | Total work of auxiliaries during engine stop and thus not considered in FC-Map and FC-AAUX. Considered in FC-ESS_Corr via [fuel consumption correction](#engine-fuel-consumption-correction) (Based on P_aux_ESS_mech in .vmod) |
+| E_ice_start | [kWh] | Total work for starting the combustion engine, not considered in FC-Map and FC-AAUX. Considered in FC-ESS_Corr via [fuel consumption correction](#engine-fuel-consumption-correction) (Based on P_ice_start in .vmod) |
+| ice_starts | [-] | Number of times the combustion engine is started |
+| k_vehline | [g/kWh] | Slope of the regression line derived from all operating points P_wheel vs. FC_final_mod where P_wheel > 0 and FC_final_mod > 0 |
+| k_engline | [g/kWh] | Slope of the regression line used for the [fuel consumption correction](#engine-fuel-consumption-correction) |
+| a | [m/s^2^] | Average acceleration |
+| a_pos | [m/s^2^] | Average acceleration in acceleration phases (a~3s~ \> 0.125 \[m/s^2^\], a~3s~Â = 3-seconds-averaged acceleration) |
+| a_neg | [m/s^2^] | Average deceleration in deceleration phases (a~3s~ \< 0.125 \[m/s^2^\], a~3s~Â = 3-seconds-averaged acceleration) |
+| AccelerationTimeShare | [%] | Time share of acceleration phases (a~3s~ \> 0.125 \[m/s^2^\], a~3s~Â = 3-seconds-averaged acceleration) |
+| DecelerationTimeShare | [%] | Time share of deceleration phases (a~3s~ \< 0.125 \[m/s^2^\], a~3s~Â = 3-seconds-averaged acceleration) |
+| CruiseTimeShare | [%] | Time share of cruise phases (-0.125 ≤ a~3s~ ≤ 0.125 \[m/s^2^\]) |
+| StopTimeShare | [%] | Time share of stop phases (v \< 0.1 \[m/s\]) |
+| E_EM_<\_POS>\_drive | [kWh] | Mechanical energy applied by the electric machine at position *POS* to drive the vehicle |
+| E_EM_<\_POS>\_gen | [kWh] | Mechanical energy recuperated by the electric machine at position *POS* |
+| n_EM_<\_POS>\_avg | [rpm] | Average angular speed of the electric machine |
+| η_EM_<\_POS>\_mot | [-] | Average efficiency of the electric machine when the electric machine drives the vehicle |
+| η_EM_<\_POS>\_gen | [-] | Average efficiency of the electric machine when the electric machine generates electric energy |
+| E_EM_<\_POS>\_off_loss | [kWh] | Total losses added by the electric machine when the electric machine is not energized (i.e., the electric machine's drag losses) |
+| Battery Start SoC | [%] | Battery state of charge at the beginning of the simulation run |
+| Battery End SoC | [%] | Battery state of charge at the end of the simulation run |
+| Battery Delta SoC | [kWh] | Difference of the energy stored in the battery between the beginning and end of the simulation run |
+| E_Batt_loss | [kWh] | Total losses in the battery due to its internal resistance |
+| E_Batt_T_chg | [kWh] | |
+| E_Batt_T_dischg | [kWh] | |
+| E_Batt_int_chg | [kWh] | |
+| E_Batt_int_dischg | [kWh] | |
+
**Note:** The fuel name is only added to the fuel consumption signals for vehicles with dual-fuel engines. In case single-fuel and dual-fuel vehicles are simulated in one simulation run, the fuel consumption for single-fuel vehicles is reported without the fuel name suffix while the fuel consumption of dual fuel vehicles contains the fuel name suffix!
diff --git a/VECTO/GUI/ElectricMotorForm.vb b/VECTO/GUI/ElectricMotorForm.vb
index 84e2887700..7f052e3eb5 100644
--- a/VECTO/GUI/ElectricMotorForm.vb
+++ b/VECTO/GUI/ElectricMotorForm.vb
@@ -346,7 +346,7 @@ Public Class ElectricMotorForm
End Sub
Private Sub UpdatePic()
- Dim fullLoadCurve As ElectricFullLoadCurve = Nothing
+ Dim fullLoadCurve As ElectricMotorFullLoadCurve = Nothing
Dim dragCurve As DragCurve = Nothing
Dim fcMap As EfficiencyMap = Nothing
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricFullLoadCurveReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricFullLoadCurveReader.cs
index 5a76680543..9db308adb0 100644
--- a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricFullLoadCurveReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricFullLoadCurveReader.cs
@@ -9,7 +9,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
{
public static class ElectricFullLoadCurveReader
{
- public static ElectricFullLoadCurve Create(DataTable data, double ratio, int count, double efficiency)
+ public static ElectricMotorFullLoadCurve Create(DataTable data, double ratio, int count, double efficiency)
{
if (data.Columns.Count < 3) {
throw new VectoException("Motor FullLoadCurve Data must contain at least 3 columns");
@@ -24,9 +24,9 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
data.Columns[2].ColumnName = Fields.GenerationTorque;
}
- return new ElectricFullLoadCurve(
+ return new ElectricMotorFullLoadCurve(
(from DataRow row in data.Rows
- select new ElectricFullLoadCurve.FullLoadEntry {
+ select new ElectricMotorFullLoadCurve.FullLoadEntry {
MotorSpeed = row.ParseDouble(Fields.MotorSpeed).RPMtoRad() / ratio,
FullDriveTorque = row.ParseDouble(Fields.DrivingTorque).SI<NewtonMeter>() * count * ratio * efficiency,
FullGenerationTorque = row.ParseDouble(Fields.GenerationTorque).SI<NewtonMeter>() * count * ratio / efficiency
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index c86439a6fb..c062db89f4 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -638,8 +638,8 @@ namespace TUGraz.VectoCore.Models.Declaration
: ComputeManualTransmissionShiftPolygon(gearIdx, fullLoadCurve, gears, engine, axlegearRatio, dynamicTyreRadius);
}
- public static ShiftPolygon ComputeEfficiencyShiftPolygon(
- int gearIdx, EngineFullLoadCurve fullLoadCurve, IList<ITransmissionInputData> gears, CombustionEngineData engine,
+ public static ShiftPolygon ComputeElectricMotorShiftPolygon(int gearIdx,
+ ElectricMotorFullLoadCurve fullLoadCurve, IList<ITransmissionInputData> gears,
double axlegearRatio, Meter dynamicTyreRadius)
{
if (gears.Count < 2)
@@ -647,6 +647,30 @@ namespace TUGraz.VectoCore.Models.Declaration
throw new VectoException("ComputeShiftPolygon needs at least 2 gears. {0} gears given.", gears.Count);
}
+ var downShift = new List<ShiftPolygon.ShiftPolygonEntry>();
+ var upShift = new List<ShiftPolygon.ShiftPolygonEntry>();
+ if (gearIdx > 0) {
+ downShift.Add(new ShiftPolygon.ShiftPolygonEntry(fullLoadCurve.MaxGenerationTorque * 1.1, fullLoadCurve.MaxSpeed * 0.9));
+ downShift.Add(new ShiftPolygon.ShiftPolygonEntry(fullLoadCurve.MaxDriveTorque * 1.1, fullLoadCurve.MaxSpeed * 0.9));
+
+ }
+ if (gearIdx >= gears.Count - 1) {
+ return new ShiftPolygon(downShift, upShift);
+ }
+
+ upShift.Add(new ShiftPolygon.ShiftPolygonEntry(fullLoadCurve.MaxGenerationTorque * 1.1, fullLoadCurve.MaxSpeed * 0.9));
+ upShift.Add(new ShiftPolygon.ShiftPolygonEntry(fullLoadCurve.MaxDriveTorque * 1.1, fullLoadCurve.MaxSpeed * 0.9));
+ return new ShiftPolygon(downShift, upShift);
+ }
+
+ public static ShiftPolygon ComputeEfficiencyShiftPolygon(
+ int gearIdx, EngineFullLoadCurve fullLoadCurve, IList<ITransmissionInputData> gears, CombustionEngineData engine,
+ double axlegearRatio, Meter dynamicTyreRadius)
+ {
+ if (gears.Count < 2) {
+ throw new VectoException("ComputeShiftPolygon needs at least 2 gears. {0} gears given.", gears.Count);
+ }
+
var clutchClosingSpeed = (engine.FullLoadCurves[0].RatedSpeed - engine.IdleSpeed) *
Constants.SimulationSettings.ClutchClosingSpeedNorm + engine.IdleSpeed;
@@ -665,8 +689,7 @@ namespace TUGraz.VectoCore.Models.Declaration
new Point(fldEntry.EngineSpeed.Value(), fldEntry.TorqueFullLoad.Value() * ShiftPolygonEngineFldMargin))
.ToList();
downShift.Add(new ShiftPolygon.ShiftPolygonEntry(fullLoadCurve.MaxDragTorque * 1.1, p2.X.SI<PerSecond>()));
- if (downShiftPoints.Count == 0)
- {
+ if (downShiftPoints.Count == 0) {
// coarse grid points in FLD
downShift.Add(
new ShiftPolygon.ShiftPolygonEntry(
@@ -676,11 +699,8 @@ namespace TUGraz.VectoCore.Models.Declaration
new ShiftPolygon.ShiftPolygonEntry(
fullLoadCurve.FullLoadStationaryTorque(p3.X.SI<PerSecond>()) * ShiftPolygonEngineFldMargin,
p3.X.SI<PerSecond>()));
- }
- else
- {
- if (downShiftPoints.Min(x => x.X) > p2.X)
- {
+ } else {
+ if (downShiftPoints.Min(x => x.X) > p2.X) {
downShift.Add(
new ShiftPolygon.ShiftPolygonEntry(
fullLoadCurve.FullLoadStationaryTorque(p2.X.SI<PerSecond>()) * ShiftPolygonEngineFldMargin,
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs b/VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs
index 4d73a002e6..9dd32494cb 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs
@@ -406,9 +406,12 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
[ModalResultField(typeof(SI), caption: "P_em-B3_mech [kW]", outputFactor: 1e-3)]
P_electricMotor_mech_B3,
+
+ [ModalResultField(typeof(SI), caption: "P_em-B2_mech [kW]", outputFactor: 1e-3)]
+ P_electricMotor_mech_B2,
// -->
- [ModalResultField(typeof(SI), caption: "P_reess_T [kW]", outputFactor: 1e-3)] P_reess_terminal,
+ [ModalResultField(typeof(SI), caption: "P_reess_T [kW]", outputFactor: 1e-3)] P_reess_terminal,
[ModalResultField(typeof(SI), caption: "P_reess_int [kW]", outputFactor: 1e-3)] P_reess_int,
[ModalResultField(typeof(SI), caption: "P_reess_loss [kW]", outputFactor: 1e-3)] P_reess_loss,
[ModalResultField(typeof(SI), caption: "REESS SOC [%]", outputFactor: 100)] REESSStateOfCharge,
diff --git a/VectoCore/VectoCore/Models/Simulation/DataBus/IElectricMotorInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IElectricMotorInfo.cs
index 2398bcf773..0415b9820d 100644
--- a/VectoCore/VectoCore/Models/Simulation/DataBus/IElectricMotorInfo.cs
+++ b/VectoCore/VectoCore/Models/Simulation/DataBus/IElectricMotorInfo.cs
@@ -11,5 +11,6 @@ namespace TUGraz.VectoCore.Models.Simulation.DataBus
PowertrainPosition Position { get; }
PerSecond MaxSpeed { get; }
Watt DragPower(PerSecond electricMotorSpeed);
+ Watt MaxPowerDrive(PerSecond inAngularVelocity);
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
index 0ec72943bb..fe6417b85e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
@@ -8,7 +8,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public EfficiencyMap EfficiencyMap { get; internal set; }
[ValidateObject]
- public ElectricFullLoadCurve FullLoadCurve { get; internal set; }
+ public ElectricMotorFullLoadCurve FullLoadCurve { get; internal set; }
[SIRange(double.MinValue, double.MaxValue)]
public KilogramSquareMeter Inertia { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricFullLoadCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorFullLoadCurve.cs
similarity index 74%
rename from VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricFullLoadCurve.cs
rename to VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorFullLoadCurve.cs
index f88db2d6c8..a3d4b07165 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricFullLoadCurve.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorFullLoadCurve.cs
@@ -4,12 +4,15 @@ using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data {
- public class ElectricFullLoadCurve
+ public class ElectricMotorFullLoadCurve
{
internal readonly List<FullLoadEntry> FullLoadEntries;
+ private NewtonMeter _maxDriveTorque;
+ private NewtonMeter _maxGenerationTorque;
+ private PerSecond _maxSpeed;
- internal ElectricFullLoadCurve(List<FullLoadEntry> entries)
+ internal ElectricMotorFullLoadCurve(List<FullLoadEntry> entries)
{
FullLoadEntries = entries;
}
@@ -53,6 +56,25 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data {
}
+ public NewtonMeter MaxDriveTorque
+ {
+ get { return _maxDriveTorque ?? (_maxDriveTorque = FullLoadEntries.Min(x => x.FullDriveTorque)); }
+ }
+
+ public NewtonMeter MaxGenerationTorque
+ {
+ get
+ {
+ return _maxGenerationTorque ??
+ (_maxGenerationTorque = FullLoadEntries.Max(x => x.FullGenerationTorque));
+ }
+ }
+
+ public PerSecond MaxSpeed
+ {
+ get { return _maxSpeed ?? (_maxSpeed = FullLoadEntries.Max(x => x.MotorSpeed)); }
+ }
+
internal class FullLoadEntry
{
public PerSecond MotorSpeed { get; set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
index bd58506402..3923ba203f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
@@ -113,7 +113,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve,
IList<ITransmissionInputData> gearboxGears, CombustionEngineData engineData, double axlegearRatio,
- Meter dynamicTyreRadius);
+ Meter dynamicTyreRadius, ElectricMotorData electricMotorData = null);
}
public class GearInfo
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
index 5335d59718..95798b3ac1 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
@@ -92,7 +92,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve, IList<ITransmissionInputData> gearboxGears,
- CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius)
+ CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius, ElectricMotorData electricMotorData = null)
{
return DeclarationData.Gearbox.ComputeManualTransmissionShiftPolygon(
i, engineDataFullLoadCurve, gearboxGears, engineData, axlegearRatio, dynamicTyreRadius);
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyACEA.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyACEA.cs
index 8af2ba5b95..9f2e27f468 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyACEA.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyACEA.cs
@@ -748,7 +748,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve, IList<ITransmissionInputData> gearboxGears,
- CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius)
+ CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius, ElectricMotorData electricMotorData = null)
{
return null;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs
index 48e02f8c79..59b2e953a7 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs
@@ -327,8 +327,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve,
- IList<ITransmissionInputData> gearboxGears,
- CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius)
+ IList<ITransmissionInputData> gearboxGears, CombustionEngineData engineData, double axlegearRatio,
+ Meter dynamicTyreRadius, ElectricMotorData electricMotorData = null)
{
return DeclarationData.Gearbox.ComputeEfficiencyShiftPolygon(
i, engineDataFullLoadCurve, gearboxGears, engineData, axlegearRatio, dynamicTyreRadius);
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
index f61a0b709c..98dcc2e7e2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
@@ -72,8 +72,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve,
- IList<ITransmissionInputData> gearboxGears,
- CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius)
+ IList<ITransmissionInputData> gearboxGears, CombustionEngineData engineData, double axlegearRatio,
+ Meter dynamicTyreRadius, ElectricMotorData electricMotorData = null)
{
return DeclarationData.TorqueConverter.ComputeShiftPolygon(
engineDataFullLoadCurve, i == 0, i >= gearboxGears.Count - 1);
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs
index 952855064a..70a2a73848 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs
@@ -482,8 +482,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve,
- IList<ITransmissionInputData> gearboxGears,
- CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius)
+ IList<ITransmissionInputData> gearboxGears, CombustionEngineData engineData, double axlegearRatio,
+ Meter dynamicTyreRadius, ElectricMotorData electricMotorData = null)
{
var shiftLine = DeclarationData.Gearbox.ComputeEfficiencyShiftPolygon(
Math.Max(i, 2), engineDataFullLoadCurve, gearboxGears, engineData, axlegearRatio, dynamicTyreRadius);
@@ -499,6 +499,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
upshift.Add(new ShiftPolygon.ShiftPolygonEntry(maxDragTorque, speed));
upshift.Add(new ShiftPolygon.ShiftPolygonEntry(maxTorque, speed));
}
+
return new ShiftPolygon(shiftLine.Downshift.ToList(), upshift);
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BaseShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BaseShiftStrategy.cs
index 212ab57289..913568659c 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BaseShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BaseShiftStrategy.cs
@@ -85,7 +85,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public abstract ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve, IList<ITransmissionInputData> gearboxGears,
- CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius);
+ CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius, ElectricMotorData electricMotorData = null);
protected MeterPerSquareSecond EstimateAccelerationForGear(uint gear, PerSecond gbxAngularVelocityOut)
{
@@ -117,8 +117,5 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return acceleration.Cast<MeterPerSquareSecond>();
}
-
-
-
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
index bed13391ca..5b55589b6b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
@@ -571,7 +571,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve, IList<ITransmissionInputData> gearboxGears,
- CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius)
+ CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius, ElectricMotorData electricMotorData = null)
{
return null;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
index cfb0a98852..56ff09768a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
@@ -60,7 +60,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return ModelData.DragCurve.Lookup(electricMotorSpeed) * electricMotorSpeed;
}
- public IResponse Initialize(NewtonMeter outTorque, PerSecond outAngularVelocity)
+ public Watt MaxPowerDrive(PerSecond electricMotorSpeed)
+ {
+ return ModelData.FullLoadCurve.FullLoadDriveTorque(electricMotorSpeed) * electricMotorSpeed;
+ }
+
+ public IResponse Initialize(NewtonMeter outTorque, PerSecond outAngularVelocity)
{
PreviousState.OutAngularVelocity = outAngularVelocity;
PreviousState.OutTorque = outTorque;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
index 5337cd01a6..6007e93f42 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
@@ -30,6 +30,7 @@
*/
using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
@@ -135,7 +136,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
get { return true; }
}
- internal ResponseDryRun Initialize(Second absTime, uint gear, NewtonMeter outTorque, PerSecond outAngularVelocity)
+ protected internal virtual ResponseDryRun Initialize(Second absTime, uint gear, NewtonMeter outTorque, PerSecond outAngularVelocity)
{
var oldGear = Gear;
Gear = gear;
@@ -527,4 +528,46 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
get { return EngageTime; }
}
}
+
+ public class PEVGearbox : Gearbox
+ {
+ public PEVGearbox(IVehicleContainer container, IShiftStrategy strategy, VectoRunData runData) : base(container, strategy, runData) { }
+
+ protected internal override ResponseDryRun Initialize(Second absTime, uint gear, NewtonMeter outTorque, PerSecond outAngularVelocity)
+ {
+ var oldGear = Gear;
+ Gear = gear;
+ var inAngularVelocity = outAngularVelocity * ModelData.Gears[gear].Ratio;
+ var torqueLossResult = ModelData.Gears[gear].LossMap.GetTorqueLoss(outAngularVelocity, outTorque);
+ CurrentState.TorqueLossResult = torqueLossResult;
+ var inTorque = outTorque / ModelData.Gears[gear].Ratio + torqueLossResult.Value;
+
+ if (!inAngularVelocity.IsEqual(0)) {
+ var alpha = ModelData.Inertia.IsEqual(0)
+ ? 0.SI<PerSquareSecond>()
+ : outTorque / ModelData.Inertia;
+
+ var inertiaPowerLoss = Formulas.InertiaPower(inAngularVelocity, alpha, ModelData.Inertia,
+ Constants.SimulationSettings.TargetTimeInterval);
+ inTorque += inertiaPowerLoss / inAngularVelocity;
+ }
+
+ var response =
+ NextComponent.Request(absTime, Constants.SimulationSettings.TargetTimeInterval, inTorque,
+ inAngularVelocity, true); //NextComponent.Initialize(inTorque, inAngularVelocity);
+
+ var fullLoad = -DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricB2).MaxPowerDrive(inAngularVelocity);
+
+ Gear = oldGear;
+ return new ResponseDryRun(this) {
+ ElectricMotor = {
+ PowerRequest = response.ElectricMotor.PowerRequest
+ },
+ Gearbox = {
+ PowerRequest = outTorque * outAngularVelocity,
+ },
+ DeltaFullLoad = response.ElectricMotor.PowerRequest - fullLoad
+ };
+ }
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
index 10a42b1d59..72a8907499 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
@@ -254,7 +254,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override ShiftPolygon ComputeDeclarationShiftPolygon(GearboxType gearboxType, int i,
EngineFullLoadCurve engineDataFullLoadCurve,
IList<ITransmissionInputData> gearboxGears, CombustionEngineData engineData, double axlegearRatio,
- Meter dynamicTyreRadius)
+ Meter dynamicTyreRadius, ElectricMotorData electricMotorData = null)
{
return DeclarationData.Gearbox.ComputeEfficiencyShiftPolygon(
i, engineDataFullLoadCurve, gearboxGears, engineData, axlegearRatio, dynamicTyreRadius);
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
new file mode 100644
index 0000000000..e88ff8b4bd
--- /dev/null
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
@@ -0,0 +1,298 @@
+using System.Collections.Generic;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
+using TUGraz.VectoCore.Models.Connector.Ports.Impl;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.Simulation.DataBus;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
+using TUGraz.VectoCore.OutputData;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
+{
+ public class PEVAMTShiftStrategy : IShiftStrategy
+ {
+ protected readonly IDataBus DataBus;
+ protected readonly GearboxData ModelData;
+ protected Gearbox _gearbox;
+ protected uint _nextGear;
+
+ public bool EarlyShiftUp { get; }
+
+ public bool SkipGears { get; }
+
+ public PEVAMTShiftStrategy(GearboxData data, IDataBus dataBus)
+ {
+ ModelData = data;
+ DataBus = dataBus;
+
+ EarlyShiftUp = true;
+ SkipGears = true;
+ }
+
+ public bool ShiftRequired(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
+ NewtonMeter inTorque,
+ PerSecond inAngularVelocity, uint gear, Second lastShiftTime, IResponse response)
+ {
+ CheckGearshiftRequired = true;
+ var retVal = DoCheckShiftRequired(absTime, dt, outTorque, outAngularVelocity, inTorque, inAngularVelocity,
+ gear, lastShiftTime, response);
+ CheckGearshiftRequired = false;
+ return retVal;
+ }
+
+ private bool DoCheckShiftRequired(Second absTime, Second dt, NewtonMeter outTorque,
+ PerSecond outAngularVelocity, NewtonMeter inTorque, PerSecond inAngularVelocity, uint gear,
+ Second lastShiftTime, IResponse response)
+ {
+ // no shift when vehicle stands
+ if (DataBus.VehicleInfo.VehicleStopped) {
+ return false;
+ }
+
+ // emergency shift to not stall the engine ------------------------
+ while (_nextGear < ModelData.Gears.Count &&
+ SpeedTooHighForEngine(_nextGear, inAngularVelocity / ModelData.Gears[gear].Ratio)) {
+ _nextGear++;
+ }
+ if (_nextGear != gear) {
+ return true;
+ }
+
+ // normal shift when all requirements are fullfilled ------------------
+ var minimumShiftTimePassed = (lastShiftTime + ModelData.ShiftTime).IsSmallerOrEqual(absTime);
+ if (!minimumShiftTimePassed) {
+ return false;
+ }
+
+ _nextGear = CheckDownshift(absTime, dt, outTorque, outAngularVelocity, inTorque, inAngularVelocity, gear, response);
+ if (_nextGear != gear) {
+ return true;
+ }
+
+ _nextGear = CheckUpshift(absTime, dt, outTorque, outAngularVelocity, inTorque, inAngularVelocity, gear, response);
+
+ //if ((ModelData.Gears[_nextGear].Ratio * outAngularVelocity - DataBus.EngineIdleSpeed) /
+ // (DataBus.EngineRatedSpeed - DataBus.EngineIdleSpeed) <
+ // Constants.SimulationSettings.ClutchClosingSpeedNorm && _nextGear > 1) {
+ // _nextGear--;
+ //}
+
+ return _nextGear != gear;
+ }
+
+ protected virtual uint CheckUpshift(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, NewtonMeter inTorque, PerSecond inAngularVelocity, uint currentGear, IResponse response)
+ {
+ // if the driver's intention is _not_ to accelerate or drive along then don't upshift
+ if (DataBus.DriverInfo.DriverBehavior != DrivingBehavior.Accelerating && DataBus.DriverInfo.DriverBehavior != DrivingBehavior.Driving) {
+ return currentGear;
+ }
+ if ((absTime - _gearbox.LastDownshift).IsSmaller(_gearbox.ModelData.UpshiftAfterDownshiftDelay)) {
+ return currentGear;
+ }
+ var nextGear = DoCheckUpshift(absTime, dt, outTorque, outAngularVelocity, inTorque, inAngularVelocity, currentGear, response);
+ if (nextGear == currentGear) {
+ return nextGear;
+ }
+
+ // estimate acceleration for selected gear
+ if (EstimateAccelerationForGear(nextGear, outAngularVelocity).IsSmaller(_gearbox.ModelData.UpshiftMinAcceleration)) {
+ // if less than 0.1 for next gear, don't shift
+ if (nextGear - currentGear == 1) {
+ return currentGear;
+ }
+ // if a gear is skipped but acceleration is less than 0.1, try for next gear. if acceleration is still below 0.1 don't shift!
+ if (nextGear > currentGear &&
+ EstimateAccelerationForGear(currentGear + 1, outAngularVelocity)
+ .IsSmaller(_gearbox.ModelData.UpshiftMinAcceleration)) {
+ return currentGear;
+ }
+ nextGear = currentGear + 1;
+ }
+
+ return nextGear;
+ }
+
+ protected virtual uint DoCheckUpshift(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, NewtonMeter inTorque, PerSecond inAngularVelocity, uint currentGear, IResponse response1)
+ {
+ // upshift
+ if (IsAboveUpShiftCurve(currentGear, inTorque, inAngularVelocity)) {
+ currentGear++;
+
+ while (SkipGears && currentGear < ModelData.Gears.Count) {
+ currentGear++;
+ var response = RequestDryRunWithGear(absTime, dt, outTorque, outAngularVelocity, currentGear);
+
+ inAngularVelocity = response.Engine.EngineSpeed; //ModelData.Gears[currentGear].Ratio * outAngularVelocity;
+ inTorque = response.Clutch.PowerRequest / inAngularVelocity;
+
+ var maxTorque = VectoMath.Min(response.Engine.DynamicFullLoadPower / ((DataBus.EngineInfo.EngineSpeed + response.Engine.EngineSpeed) / 2),
+ currentGear > 1
+ ? ModelData.Gears[currentGear].ShiftPolygon.InterpolateDownshift(response.Engine.EngineSpeed)
+ : double.MaxValue.SI<NewtonMeter>());
+ var reserve = 1 - inTorque / maxTorque;
+
+ if (reserve >= 0 /*ModelData.TorqueReserve */ && IsAboveDownShiftCurve(currentGear, inTorque, inAngularVelocity)) {
+ continue;
+ }
+
+ currentGear--;
+ break;
+ }
+ }
+
+ // early up shift to higher gear ---------------------------------------
+ if (EarlyShiftUp && currentGear < ModelData.Gears.Count) {
+ currentGear = CheckEarlyUpshift(absTime, dt, outTorque, outAngularVelocity, currentGear, response1);
+ }
+ return currentGear;
+ }
+
+ protected ResponseDryRun RequestDryRunWithGear(
+ Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, uint tryNextGear)
+ {
+ LogEnabled = false;
+ TestContainerGbx.Disengaged = false;
+ TestContainerGbx.Gear = tryNextGear;
+
+ TestContainer.GearboxOutPort.Initialize(outTorque, outAngularVelocity);
+ var response = (ResponseDryRun)TestContainer.GearboxOutPort.Request(
+ 0.SI<Second>(), dt, outTorque, outAngularVelocity, true);
+ LogEnabled = true;
+ return response;
+ }
+
+ protected MeterPerSquareSecond EstimateAccelerationForGear(uint gear, PerSecond gbxAngularVelocityOut)
+ {
+ if (gear == 0 || gear > ModelData.Gears.Count) {
+ throw new VectoSimulationException("EstimateAccelerationForGear: invalid gear: {0}", gear);
+ }
+
+ var vehicleSpeed = DataBus.VehicleInfo.VehicleSpeed;
+
+ var nextEngineSpeed = gbxAngularVelocityOut * ModelData.Gears[gear].Ratio;
+ var maxEnginePower = DataBus.EngineInfo.EngineStationaryFullPower(nextEngineSpeed);
+
+ var avgSlope =
+ ((DataBus.DrivingCycleInfo.CycleLookAhead(Constants.SimulationSettings.GearboxLookaheadForAccelerationEstimation).Altitude -
+ DataBus.DrivingCycleInfo.Altitude) / Constants.SimulationSettings.GearboxLookaheadForAccelerationEstimation).Value().SI<Radian>();
+
+ var airDragLoss = DataBus.VehicleInfo.AirDragResistance(vehicleSpeed, vehicleSpeed) * DataBus.VehicleInfo.VehicleSpeed;
+ var rollResistanceLoss = DataBus.VehicleInfo.RollingResistance(avgSlope) * DataBus.VehicleInfo.VehicleSpeed;
+ var gearboxLoss = ModelData.Gears[gear].LossMap.GetTorqueLoss(gbxAngularVelocityOut,
+ maxEnginePower / nextEngineSpeed * ModelData.Gears[gear].Ratio).Value * nextEngineSpeed;
+ //DataBus.GearboxLoss();
+ var slopeLoss = DataBus.VehicleInfo.SlopeResistance(avgSlope) * DataBus.VehicleInfo.VehicleSpeed;
+ var axleLoss = DataBus.AxlegearInfo.AxlegearLoss();
+
+ var accelerationPower = maxEnginePower - gearboxLoss - axleLoss - airDragLoss - rollResistanceLoss - slopeLoss;
+
+ var acceleration = accelerationPower / DataBus.VehicleInfo.VehicleSpeed / (DataBus.VehicleInfo.TotalMass + DataBus.WheelsInfo.ReducedMassWheels);
+
+ return acceleration.Cast<MeterPerSquareSecond>();
+ }
+
+ protected virtual uint CheckDownshift(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, NewtonMeter inTorque, PerSecond inAngularVelocity, uint currentGear, IResponse response)
+ {
+ if ((absTime - _gearbox.LastUpshift).IsSmaller(_gearbox.ModelData.DownshiftAfterUpshiftDelay)) {
+ return currentGear;
+ }
+ return DoCheckDownshift(absTime, dt, outTorque, outAngularVelocity, inTorque, inAngularVelocity, currentGear, response);
+ }
+
+ public uint InitGear(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity)
+ {
+ if (DataBus.VehicleInfo.VehicleSpeed.IsEqual(0)) {
+ _nextGear = 1;
+ return 1;
+ }
+
+ for (var gear = (uint)ModelData.Gears.Count; gear > 1; gear--) {
+ var response = _gearbox.Initialize(absTime, gear, outTorque, outAngularVelocity);
+
+ var inAngularSpeed = outAngularVelocity * ModelData.Gears[gear].Ratio;
+ var inTorque = response.ElectricMotor.PowerRequest / inAngularSpeed;
+
+ // if in shift curve and torque reserve is provided: return the current gear
+ if (!IsBelowDownShiftCurve(gear, inTorque, inAngularSpeed) && !IsAboveUpShiftCurve(gear, inTorque, inAngularSpeed)) {
+ _nextGear = gear;
+ return gear;
+ }
+ }
+ // fallback: return first gear
+ _nextGear = 1;
+ return 1;
+ }
+
+
+
+ protected bool IsBelowDownShiftCurve(uint gear, NewtonMeter inTorque, PerSecond inEngineSpeed)
+ {
+ if (gear <= 1) {
+ return false;
+ }
+ return ModelData.Gears[gear].ShiftPolygon.IsBelowDownshiftCurve(inTorque, inEngineSpeed);
+ }
+
+ protected bool IsAboveUpShiftCurve(uint gear, NewtonMeter inTorque, PerSecond inEngineSpeed)
+ {
+ if (gear >= ModelData.Gears.Count) {
+ return false;
+ }
+ return ModelData.Gears[gear].ShiftPolygon.IsAboveUpshiftCurve(inTorque, inEngineSpeed);
+ }
+
+ public uint Engage(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity)
+ {
+
+ while (_nextGear < ModelData.Gears.Count && SpeedTooHighForEngine(_nextGear, outAngularVelocity)) {
+ _nextGear++;
+ }
+
+ return _nextGear;
+ }
+
+
+ protected bool SpeedTooHighForEngine(uint gear, PerSecond outAngularSpeed)
+ {
+ return
+ (outAngularSpeed * ModelData.Gears[gear].Ratio).IsGreaterOrEqual(VectoMath.Min(ModelData.Gears[gear].MaxSpeed,
+ DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricB2).MaxSpeed));
+ }
+
+ public void Disengage(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity) { }
+
+ public IGearbox Gearbox {
+ get { return _gearbox; }
+ set {
+ var myGearbox = value as Gearbox;
+ if (myGearbox == null) {
+ throw new VectoException("This shift strategy can't handle gearbox of type {0}", value.GetType());
+ }
+ _gearbox = myGearbox;
+ }
+ }
+
+ public GearInfo NextGear {
+ get { return new GearInfo(_nextGear, false); }
+ }
+
+
+ public bool CheckGearshiftRequired { get; protected set; }
+
+ public void Request(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity) { }
+
+ public void WriteModalResults(IModalDataContainer container) { }
+
+ public ShiftPolygon ComputeDeclarationShiftPolygon(GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve,
+ IList<ITransmissionInputData> gearboxGears, CombustionEngineData engineData, double axlegearRatio, Meter dynamicTyreRadius, ElectricMotorData electricMotorData)
+ {
+ return DeclarationData.Gearbox.ComputeElectricMotorShiftPolygon(i, electricMotorData.FullLoadCurve, gearboxGears, axlegearRatio, dynamicTyreRadius);
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index a27f528c11..8915f99f20 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -389,7 +389,7 @@
<Compile Include="Models\Declaration\SteeringPumpBus.cs" />
<Compile Include="Models\SimulationComponent\Data\ElectricMotor\DragCurve.cs" />
<Compile Include="Models\SimulationComponent\Data\ElectricMotor\EfficiencyMap.cs" />
- <Compile Include="Models\SimulationComponent\Data\ElectricMotor\ElectricFullLoadCurve.cs" />
+ <Compile Include="Models\SimulationComponent\Data\ElectricMotor\ElectricMotorFullLoadCurve.cs" />
<Compile Include="Models\SimulationComponent\Data\ElectricMotor\ElectricMotorData.cs" />
<Compile Include="Models\SimulationComponent\Data\Engine\WHRPowerMap.cs" />
<Compile Include="InputData\Reader\ComponentData\WHRPowerReader.cs" />
@@ -399,6 +399,7 @@
<Compile Include="Models\SimulationComponent\IElectricMotor.cs" />
<Compile Include="Models\SimulationComponent\IElectricMotorControl.cs" />
<Compile Include="Models\SimulationComponent\IHybridControlledGearbox.cs" />
+ <Compile Include="Models\SimulationComponent\Impl\PEVAMTShiftStrategy.cs" />
<Compile Include="Models\Simulation\DataBus\IHybridControllerInfo.cs" />
<Compile Include="Models\SimulationComponent\IHybridControlStrategy.cs" />
<Compile Include="Models\SimulationComponent\Impl\Battery.cs" />
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
index b4f6dfde76..9ee7c3154d 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
@@ -360,6 +360,165 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
graphWriter.Write(modFilename + ".vmod");
}
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ [
+ TestCase(30, 0.7, 0, 0, TestName = "BEV E2 ConstantSpeed 30km/h SoC: 0.7, level"),
+ TestCase(50, 0.7, 0, 0, TestName = "BEV E2 ConstantSpeed 50km/h SoC: 0.7, level"),
+ //TestCase(80, 0.7, 0, 0, TestName = "BEV E2 ConstantSpeed 80km/h SoC: 0.7, level"),
+
+ TestCase(30, 0.25, 0, 0, TestName = "BEV E2 ConstantSpeed 30km/h SoC: 0.25, level"),
+ TestCase(50, 0.25, 0, 0, TestName = "BEV E2 ConstantSpeed 50km/h SoC: 0.25, level"),
+ //TestCase(80, 0.25, 0, 0, TestName = "BEV E2 ConstantSpeed 80km/h SoC: 0.25, level"),
+
+ TestCase(30, 0.5, 5, 0, TestName = "BEV E2 ConstantSpeed 30km/h SoC: 0.5, UH 5%"),
+ TestCase(50, 0.5, 5, 0, TestName = "BEV E2 ConstantSpeed 50km/h SoC: 0.5, UH 5%"),
+ //TestCase(80, 0.5, 5, 0, TestName = "BEV E2 ConstantSpeed 80km/h SoC: 0.5, UH 5%"),
+
+ TestCase(30, 0.5, -5, 0, TestName = "BEV E2 ConstantSpeed 30km/h SoC: 0.5, DH 5%"),
+ TestCase(50, 0.5, -5, 0, TestName = "BEV E2 ConstantSpeed 50km/h SoC: 0.5, DH 5%"),
+ //TestCase(80, 0.5, -5, 0, TestName = "BEV E2 ConstantSpeed 80km/h SoC: 0.5, DH 5%"),
+
+ TestCase(30, 0.25, 0, 1000, TestName = "BEV E2 ConstantSpeed 30km/h SoC: 0.25, level P_auxEl: 1kW"),
+ TestCase(30, 0.25, 0, 5000, TestName = "BEV E2 ConstantSpeed 30km/h SoC: 0.25, level P_auxEl: 5kW"),
+ ] // the vehicle can drive max. 56km/h!! 80km/h testcase makes no sense
+ public void B2BEVConstantSpeed(double vmax, double initialSoC, double slope, double pAuxEl)
+ {
+ var cycleData = string.Format(
+ @" 0, {0}, {1}, 0
+ 7000, {0}, {1}, 0", vmax, slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
+
+ const bool largeMotor = true;
+
+ var modFilename = string.Format("SimpleBatteryElectric-B2_constant_{0}-{1}_{2}_{3}", vmax, initialSoC, slope, pAuxEl);
+ const PowertrainPosition pos = PowertrainPosition.BatteryElectricB2;
+ var job = CreateEngineeringRun(
+ cycle, modFilename, initialSoC, pos, 2, 2, largeMotor: true, pAuxEl: pAuxEl);
+ var run = job.Runs.First().Run;
+ var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+ var data = run.GetContainer().RunData;
+ //File.WriteAllText(
+ // $"{modFilename}.json",
+ // JsonConvert.SerializeObject(data, Formatting.Indented));
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+
+ Assert.IsTrue(modData.Rows.Count > 0);
+
+ var graphWriter = GetGraphWriter(new[] { ModalResultField.P_electricMotor_mech_B2 });
+ graphWriter.Write(modFilename + ".vmod");
+ }
+
+
+ [
+ TestCase(30, 0.7, 0, TestName = "BEV E2 DriveOff 30km/h SoC: 0.7, level"),
+ TestCase(80, 0.7, 0, TestName = "BEV E2 DriveOff 80km/h SoC: 0.7, level"),
+ TestCase(30, 0.25, 0, TestName = "BEV E2 DriveOff 30km/h SoC: 0.25, level")
+ ]
+ public void B2BEVDriveOff(double vmax, double initialSoC, double slope)
+ {
+ var cycleData = string.Format(
+ @" 0, 0, {1}, 3
+ 700, {0}, {1}, 0", vmax, slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
+
+ const bool largeMotor = true;
+
+ var modFilename = string.Format("SimpleBatteryElectric-B2_acc_{0}-{1}_{2}", vmax, initialSoC, slope);
+ const PowertrainPosition pos = PowertrainPosition.BatteryElectricB2;
+ var job = CreateEngineeringRun(
+ cycle, modFilename, initialSoC, pos, 2, 2, largeMotor: true);
+ var run = job.Runs.First().Run;
+ var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+
+ Assert.IsTrue(modData.Rows.Count > 0);
+
+ var graphWriter = GetGraphWriter(new[] { ModalResultField.P_electricMotor_mech_B2 });
+ graphWriter.Write(modFilename + ".vmod");
+ }
+
+ [
+ TestCase("LongHaul", 2000, 0.8, 0, TestName = "BEV E2 DriveCycle LongHaul, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
+ TestCase("RegionalDelivery", 2000, 0.8, 0, TestName = "BEV E2 DriveCycle RegionalDelivery, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
+ TestCase("UrbanDelivery", 2000, 0.8, 0, TestName = "BEV E2 DriveCycle UrbanDelivery, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
+ TestCase("Construction", 2000, 0.8, 0, TestName = "BEV E2 DriveCycle Construction, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
+ TestCase("Urban", 2000, 0.8, 0, TestName = "BEV E2 DriveCycle Urban, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
+ TestCase("Suburban", 2000, 0.8, 0, TestName = "BEV E2 DriveCycle SubUrban, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
+ TestCase("Interurban", 2000, 0.8, 0, TestName = "BEV E2 DriveCycle InterUrban, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
+ TestCase("Coach", 2000, 0.8, 0, TestName = "BEV E2 DriveCycle Coach, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
+ ]
+ public void B2BEVDriveCycle(string declarationMission, double payload, double initialSoC, double pAuxEl)
+ {
+ var cycleData = RessourceHelper.ReadStream(
+ DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
+ declarationMission +
+ Constants.FileExtensions.CycleFile);
+ var cycle = DrivingCycleDataReader.ReadFromStream(cycleData, CycleType.DistanceBased, "", false);
+
+ const bool largeMotor = true;
+
+ var modFilename = string.Format("SimpleParallelHybrid-B2_cycle_{0}-{1}_{2}_{3}", declarationMission, initialSoC, payload, pAuxEl);
+ const PowertrainPosition pos = PowertrainPosition.BatteryElectricB2;
+ var job = CreateEngineeringRun(
+ cycle, modFilename, initialSoC, pos, 2, 2, largeMotor: true);
+ var run = job.Runs.First().Run;
+ var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+ //var data = run.GetContainer().RunData;
+ //File.WriteAllText(
+ // $"{modFilename}.json",
+ // JsonConvert.SerializeObject(data, Formatting.Indented));
+
+ //run.Run();
+ job.Execute();
+ job.WaitFinished();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+ Assert.IsTrue(modData.Rows.Count > 0);
+
+ var graphWriter = GetGraphWriter(new[] { ModalResultField.P_electricMotor_mech_B2 });
+ graphWriter.Write(modFilename + ".vmod");
+ }
+
+ //[
+ //TestCase(BEV_Job_E2, 0, TestName = "BEV E2 Job RD"),
+ //TestCase(BEV_Job_Cont30kW, 0, TestName = "BEV E2 Job Cont. 80kW RD")
+ //]
+ public void B2BEVRunJob(string jobFile, int cycleIdx)
+ {
+ var inputProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
+
+ var writer = new FileOutputWriter(jobFile);
+ var factory = new SimulatorFactory(ExecutionMode.Engineering, inputProvider, writer)
+ {
+ Validate = false,
+ WriteModalResults = true,
+ };
+
+ var sumContainer = new SummaryDataContainer(writer);
+ var jobContainer = new JobContainer(sumContainer);
+
+ factory.SumData = sumContainer;
+
+ var run = factory.SimulationRuns().ToArray()[cycleIdx];
+
+ Assert.NotNull(run);
+
+ var pt = run.GetContainer();
+
+ Assert.NotNull(pt);
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+ }
+
+
+
// =================================================
@@ -383,7 +542,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
double initialBatCharge, int count, double ratio, bool largeMotor, double pAuxEl, PowertrainPosition pos,
Kilogram payload = null)
{
- var gearboxData = CreateGearboxData();
+ var gearboxData = CreateGearboxData_2Speed();
var axleGearData = CreateAxleGearData();
var vehicleData = CreateVehicleData(payload ?? 3300.SI<Kilogram>());
@@ -395,14 +554,10 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
var batteryData = MockSimulationDataFactory.CreateBatteryData(BatFile, initialBatCharge);
- var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(
- Truck40tPowerTrain.EngineFile, gearboxData.Gears.Count);
+ //var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(
+ //Truck40tPowerTrain.EngineFile, gearboxData.Gears.Count);
- foreach (var entry in gearboxData.Gears) {
- entry.Value.ShiftPolygon = DeclarationData.Gearbox.ComputeEfficiencyShiftPolygon(
- (int)entry.Key, engineData.FullLoadCurves[entry.Key], new TransmissionInputData().Repeat(gearboxData.Gears.Count + 1).Cast<ITransmissionInputData>().ToList(), engineData, axleGearData.AxleGear.Ratio,
- vehicleData.DynamicTyreRadius);
- }
+
var runData = new VectoRunData() {
JobRunId = 0,
@@ -419,7 +574,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
ElectricMachinesData = electricMotorData,
//EngineData = engineData,
BatteryData = batteryData,
- GearshiftParameters = CreateGearshiftData(gearboxData, axleGearData.AxleGear.Ratio, engineData.IdleSpeed),
+ GearshiftParameters = CreateGearshiftData(gearboxData, axleGearData.AxleGear.Ratio),
ElectricAuxDemand = pAuxEl.SI<Watt>()
};
@@ -439,7 +594,15 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
var container = new VehicleContainer(
ExecutionMode.Engineering, modData, x => { sumData?.Write(x, 1, 1, runData); });
-
+
+ var strategy = new PEVAMTShiftStrategy(gearboxData, container);
+
+ foreach (var entry in gearboxData.Gears) {
+ entry.Value.ShiftPolygon = strategy.ComputeDeclarationShiftPolygon(GearboxType.AMT,
+ (int)entry.Key, null, new TransmissionInputData().Repeat(gearboxData.Gears.Count + 1).Cast<ITransmissionInputData>().ToList(), null, axleGearData.AxleGear.Ratio,
+ vehicleData.DynamicTyreRadius, electricMotorData.First().Item2);
+ }
+
container.RunData = runData;
var es = new ElectricSystem(container);
@@ -488,7 +651,14 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
new ATClutchInfo(container);
break;
case PowertrainPosition.BatteryElectricB2:
- throw new VectoException("Battery Electric configuration B2 currently not supported");
+
+ powertrain.AddComponent(new AxleGear(container, runData.AxleGearData))
+ .AddComponent(new PEVGearbox(container, strategy, runData))
+ .AddComponent(
+ GetElectricMachine(PowertrainPosition.BatteryElectricB2, runData.ElectricMachinesData, container, es, ctl));
+ new ATClutchInfo(container);
+ break;
+ //throw new VectoException("Battery Electric configuration B2 currently not supported");
default: throw new ArgumentOutOfRangeException(nameof(pos), pos, null);
}
@@ -511,9 +681,9 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
return motor;
}
- private static GearboxData CreateGearboxData()
+ private static GearboxData CreateGearboxData_2Speed()
{
- var ratios = new[] { 14.93, 11.64, 9.02, 7.04, 5.64, 4.4, 3.39, 2.65, 2.05, 1.6, 1.28, 1.0 };
+ var ratios = new[] { 3.86, 1.93 };
return new GearboxData {
Gears = ratios.Select(
@@ -525,7 +695,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
ratio.IsEqual(1) ? GearboxIndirectLoss : GearboxDirectLoss, ratio,
string.Format("Gear {0}", i)),
Ratio = ratio,
- //ShiftPolygon = DeclarationData.Gearbox.ComputeEfficiencyShiftPolygon(i,)
+ //ShiftPolygon = shiftStrategy.ComputeDeclarationShiftPolygon(GearboxType.AMT, i, null, )
})).ToDictionary(k => k.Item1 + 1, v => v.Item2),
ShiftTime = 2.SI<Second>(),
Inertia = 0.SI<KilogramSquareMeter>(),
@@ -617,7 +787,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
};
}
- public static ShiftStrategyParameters CreateGearshiftData(GearboxData gbx, double axleRatio, PerSecond engineIdlingSpeed)
+ public static ShiftStrategyParameters CreateGearshiftData(GearboxData gbx, double axleRatio/*, PerSecond engineIdlingSpeed*/)
{
var retVal = new ShiftStrategyParameters {
StartVelocity = DeclarationData.GearboxTCU.StartSpeed,
@@ -653,8 +823,8 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
LoadStageThresoldsUp = DeclarationData.GearboxTCU.LoadStageThresholdsUp,
LoadStageThresoldsDown = DeclarationData.GearboxTCU.LoadStageThresoldsDown,
- ShiftSpeedsTCToLocked = DeclarationData.GearboxTCU.ShiftSpeedsTCToLocked
- .Select(x => x.Select(y => y + engineIdlingSpeed.AsRPM).ToArray()).ToArray(),
+ //ShiftSpeedsTCToLocked = DeclarationData.GearboxTCU.ShiftSpeedsTCToLocked
+ //.Select(x => x.Select(y => y + engineIdlingSpeed.AsRPM).ToArray()).ToArray(),
};
return retVal;
--
GitLab