diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx
index c5b09e569937ca9c9c65a83d47b83d53dfb2d4a1..b79c5b08654ccd73b0a372060e7bf0e04de844c0 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx and b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx differ
diff --git a/Documentation/User Manual/5-input-and-output-files/VEMx.md b/Documentation/User Manual/5-input-and-output-files/VEMx.md
index 4d99f951ae769d35523f7e9c2715f5cc6c8fe26b..7b6011be026c939bf8c53bcca46a8b6e5be4465b 100644
--- a/Documentation/User Manual/5-input-and-output-files/VEMx.md
+++ b/Documentation/User Manual/5-input-and-output-files/VEMx.md
@@ -41,13 +41,13 @@ n [rpm] , T_drag [Nm]
This file is used to interpolate the electric power required for a certain mechanical power at the eletric motor's shaft. The file uses the [VECTO CSV format](#csv).
- Filetype: .vemo
-- Header: **n [rpm] , T [Nm] , P_el [Nm]**
+- Header: **n [rpm] , T [Nm] , P_el [kW]**
- Requires at least 2 data entries
**Example:**
~~~
-n [rpm], T [Nm], P_el [W]
+n [rpm], T [Nm], P_el [kW]
0 , -1600 , 19.6898
0 , -1550 , 18.5438
0 , -1500 , 17.4322
diff --git a/Documentation/User Manual/5-input-and-output-files/VMOD.md b/Documentation/User Manual/5-input-and-output-files/VMOD.md
index 5b98fd21e62d036b4d38b62ac37d69d42694119c..57c15347bb35f4bff5bbfc7398e971874bdb0c52 100644
--- a/Documentation/User Manual/5-input-and-output-files/VMOD.md
+++ b/Documentation/User Manual/5-input-and-output-files/VMOD.md
@@ -97,26 +97,26 @@ $P_{avg} = \frac{1}{simulation interval} \int{P(t) dt}$.
| PCCSegment | | 1 if a PCC segment was identified in the pre-processing (gradient below threshold where vehicle accelerates on its own without engine power) , 0 otherwise |
| PCCState | | 0: not inside PCC segment, 1: inside PCC segment, 2: PCC use-case 1 active, 3: PCC use-case 2 active |
| ICE On | | 0 if the combustion engine is switched off (either during stand-still or eco-roll), 1 otherwise |
-| i\_<POS}-em | [-] | Ratio between drivetrain and electric motor shaft
-| n\_<POS>-em_avg | [rpm] | Angular speed of the electric motor at position *POS* |
-| T\_<POS>-em | [Nm] | Torque at the shaft of electric motor at position *POS*. Positive values mean that the electric motor acts as generator, negative torque values mean that the electric motor propels the vehicle |
-| T\_<POS>-em_map | [Nm] | Torque internal torque of the electric motor at posision *POS*. Takes into account the electric motor's intertia. Positive values mean that the electric motor acts as generator, negative torque values mean that the electric motor propels the vehicle |
-| T\_<POS>-em_drive_max | [Nm] | Maximum torque the electric machine can apply to propel the vehicle. This already considers the maximum current the battery can provide |
-| T\_<POS>-em_gen_max | [Nm] | Maximum torque the electric machine can apply to generate electric power. This already considers the maximum charge current the battery can handle. |
-| P\_<POS>-em_drive_max | [kW] | Maximum power the electric motor can provide to drive the vehicle. This already considers the maximum electric power the battery can provide. |
-| P\_<POS>-em_gen_max | [kW] | Maximum power the electric machine can generate. This already considers the maximum charge power the battery can handle. |
-| P\_<POS>-em_mech | [kW] | Power at the shaft of the electric motor at position *POS* |
-| P\_<POS>-em_mech_map | [kW] | Mechanical powerthe electric motor at position *POS* applies for driving or recuperation, including the electric motor's inertia |
-| P\_<POS>-em_el | [kW] | Electric power generated or consumed by the elctric machine |
-| P\_<POS>-em_loss | [kW] | Losses in the electric machine due to converting electric power to mechanical power |
-| P\_<POS>-em_inertia_loss | [kW] | Inertia loses of the electric machine |
-| P\_<POS>\_in | [kW] | Power at the electric machine's input shaft (drivetrain) |
-| P\_<POS>\_out | [kW] | Power at the electric machine's output shaft (drivetrain) |
-| P\_<POS>\_mech | [kW] | Mechanical power the electric machine applies to the drivetrain. Positive values mean that electric energy is generated while negative values mean that the electric machine drives the vehicle. |
-| P\_<POS>\_loss | [kW] | The total sum of losses of the electric motor at position *POS*. Calcualted as the difference of mecanical power applied at the drivetrain and the electrical power drawn from the REESS. |
-| P\_<POS>\_transm_loss | [kW] | Losses of the transmission stage inside the electric motor component |
-| EM_OVL-<POS>-em | [%] | Used capacity of the thermal overload buffer of the thermal derating model |
-| EM_<POS>_off | [-] | Indicates if the electric motor at position *POS* is energized or not. |
+| i_\<POS}-em | [-] | Ratio between drivetrain and electric motor shaft
+| n_\<POS>-em_avg | [rpm] | Angular speed of the electric motor at position *POS* |
+| T_\<POS>-em | [Nm] | Torque at the shaft of electric motor at position *POS*. Positive values mean that the electric motor acts as generator, negative torque values mean that the electric motor propels the vehicle |
+| T_\<POS>-em_map | [Nm] | Torque internal torque of the electric motor at posision *POS*. Takes into account the electric motor's intertia. Positive values mean that the electric motor acts as generator, negative torque values mean that the electric motor propels the vehicle |
+| T_\<POS>-em_drive_max | [Nm] | Maximum torque the electric machine can apply to propel the vehicle. This already considers the maximum current the battery can provide |
+| T_\<POS>-em_gen_max | [Nm] | Maximum torque the electric machine can apply to generate electric power. This already considers the maximum charge current the battery can handle. |
+| P_\<POS>-em_drive_max | [kW] | Maximum power the electric motor can provide to drive the vehicle. This already considers the maximum electric power the battery can provide. |
+| P_\<POS>-em_gen_max | [kW] | Maximum power the electric machine can generate. This already considers the maximum charge power the battery can handle. |
+| P_\<POS>-em_mech | [kW] | Power at the shaft of the electric motor at position *POS* |
+| P_\<POS>-em_mech_map | [kW] | Mechanical powerthe electric motor at position *POS* applies for driving or recuperation, including the electric motor's inertia |
+| P_\<POS>-em_el | [kW] | Electric power generated or consumed by the elctric machine |
+| P_\<POS>-em_loss | [kW] | Losses in the electric machine due to converting electric power to mechanical power |
+| P_\<POS>-em_inertia_loss | [kW] | Inertia loses of the electric machine |
+| P_\<POS>\_in | [kW] | Power at the electric machine's input shaft (drivetrain) |
+| P_\<POS>\_out | [kW] | Power at the electric machine's output shaft (drivetrain) |
+| P_\<POS>\_mech | [kW] | Mechanical power the electric machine applies to the drivetrain. Positive values mean that electric energy is generated while negative values mean that the electric machine drives the vehicle. |
+| P_\<POS>\_loss | [kW] | The total sum of losses of the electric motor at position *POS*. Calcualted as the difference of mecanical power applied at the drivetrain and the electrical power drawn from the REESS. |
+| P_\<POS>\_transm_loss | [kW] | Losses of the transmission stage inside the electric motor component |
+| EM_OVL-\<POS>-em | [%] | Used capacity of the thermal overload buffer of the thermal derating model |
+| EM_\<POS>_off | [-] | Indicates if the electric motor at position *POS* is energized or not. |
| P_bat_T | [kW] | Electric power provided at the battery's connector |
| P_bat_int | [kW] | Internal battery power |
| P_bat_loss | [kW] | Losses of the battery due to its internal resistance. |
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 2e5fa9092d8980385394acc33afa4e7a294b4435..e3e55fe3bd15823388a4d8f5f50dcc9ccc1bc36a 100644
--- a/Documentation/User Manual/5-input-and-output-files/VSUM.md
+++ b/Documentation/User Manual/5-input-and-output-files/VSUM.md
@@ -79,20 +79,20 @@ The .vsum file includes total / average results for each calculation run in one
| 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 at the drivetrain by the electric machine at position *POS* to drive the vehicle |
-| E_EM_<POS>\_gen | [kWh] | Mechanical energy at the drivetrain recuperated by the electric machine at position *POS* |
-| η_EM_<POS>\_drive | [-] | Average efficiency at the drivetrain of the electric machine when the electric machine drives the vehicle. Based on the mechanical energy at the drivetrain and the electric power. |
-| η_EM_<POS>\_gen | [-] | Average efficiency at the drivetrain of the electric machine when the electric machine generates electric energy. Based on the mechanical energy at the drivetrain and the electric power |
-| 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* |
-| η_EM_<POS>-em_drive | [-] | Average efficiency of the electric machine when the electric machine drives the vehicle. Based on the mechanical energy at the electric motor shaft and the electric energy. |
-| η_EM_<POS>-em_gen | [-] | Average efficiency of the electric machine when the electric machine generates electric energy. Based on the mechanical energy at the electric motor shaft and the electric energy. |
-| n_EM_<POS>\_avg | [rpm] | Average angular speed of the electric machine |
-| 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) |
-| E_EM_<POS>\_transm_loss | [kWh] | Losses of the transmission stage in the electric motor component. |
-| E_EM_<POS>-em_loss | [kWh] | Total losses of the electric motor component. Calculated from P_<POS>-em_loss |
-| E_EM_<POS>\_loss | [kWh] | Losses of the electric machine. Calculated from P_<POS>_loss |
-| EM <POS> off time share | [%] | Time share the electric motor is not energized during the cycle.
+| E_EM_\<POS>_drive | [kWh] | Mechanical energy applied at the drivetrain by the electric machine at position *POS* to drive the vehicle |
+| E_EM_\<POS>_gen | [kWh] | Mechanical energy at the drivetrain recuperated by the electric machine at position *POS* |
+| η_EM_\<POS>_drive | [-] | Average efficiency at the drivetrain of the electric machine when the electric machine drives the vehicle. Based on the mechanical energy at the drivetrain and the electric power. |
+| η_EM_\<POS>_gen | [-] | Average efficiency at the drivetrain of the electric machine when the electric machine generates electric energy. Based on the mechanical energy at the drivetrain and the electric power |
+| 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* |
+| η_EM_\<POS>-em_drive | [-] | Average efficiency of the electric machine when the electric machine drives the vehicle. Based on the mechanical energy at the electric motor shaft and the electric energy. |
+| η_EM_\<POS>-em_gen | [-] | Average efficiency of the electric machine when the electric machine generates electric energy. Based on the mechanical energy at the electric motor shaft and the electric energy. |
+| n_EM_\<POS>_avg | [rpm] | Average angular speed of the electric machine |
+| 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) |
+| E_EM_\<POS>\_transm_loss | [kWh] | Losses of the transmission stage in the electric motor component. |
+| E_EM_\<POS>-em_loss | [kWh] | Total losses of the electric motor component. Calculated from P_<POS>-em_loss |
+| E_EM_\<POS>\_loss | [kWh] | Losses of the electric machine. Calculated from P_<POS>_loss |
+| EM \<POS> off time share | [%] | Time share the electric motor is not energized during the cycle.
| 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 |
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 30a70b1a2ff888ba1101cb5573db7ff8515661c5..936439e746fcd699c1a3aa34feff13666c0e5837 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -971,6 +971,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
PerSecond currOutAngularVelocity, NewtonMeter maxDriveTorque, NewtonMeter maxRecuperationTorque,
PowertrainPosition position, bool dryRun)
{
+ if (dryRun) {
+ return -outTorque;
+ }
return (-outTorque).LimitTo(maxDriveTorque, maxRecuperationTorque);
}
}
diff --git a/VectoCore/VectoCore/VersionNumber.t4 b/VectoCore/VectoCore/VersionNumber.t4
index 78a96f6169560f0f5d7f47d12b833d0bc18f4f0f..7d9bd4d0811fbd48721eb56afb8abdb6ce7afd18 100644
--- a/VectoCore/VectoCore/VersionNumber.t4
+++ b/VectoCore/VectoCore/VersionNumber.t4
@@ -6,6 +6,6 @@ int GetBuildNumber()
string GetVectoCoreVersionNumber()
{
- return "0.7.2." + GetBuildNumber();
+ return "0.7.3." + GetBuildNumber();
}
#>
\ No newline at end of file