diff --git a/Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md b/Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md
index d9569dc2169c1ad49f99a11c1a3f59830df84070..2150c4730271c0932932665d5af64aa8e16b0b91 100644
--- a/Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md
+++ b/Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md
@@ -43,6 +43,16 @@ Filepath to the Engine File (.veng)
Filepath ot the Gearbox File(.vgbx)
: Files can be created and edited using the [Gearbox Editor](#gearbox-editor).
+Filepath ot the Shift Parameters File(.vtcu)
+
+Filepath ot the Hybrid Strategy Parameters File(.vhctl)
+: Files can be created and edited using the [Hybrid Strategy Parameters Editor](#hybrid-strategy-parameters-editor).
+
+
+###Auxiliaries Tab
+
+
+
<div class="declaration">
Auxiliaries
: This group contains input elements to define the vehicle's load from the auxiliaries.
@@ -63,8 +73,18 @@ The following list can be used to define the auxiliary load in more detail via a
:  Remove the selected Auxiliary from the list
</div>
+<div class="engineering">
+Electric Auxiliaries
+: In Engineering mode it is possible to add electric auxiliaires. These auxiliaries are connected to the high-voltage battery.
+</div>
+
See [Auxiliaries](#auxiliaries) for details.
+
+###Cycles Tab
+
+
+
Cycles
: List of cycles used for calculation. The .vdri format is described [here](#driving-cycles-.vdri).
**Double-click** an entry to open the file (see [File Open Command](#settings)).
diff --git a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
index c6bd5f8f1dc5d615efd84dec81cc79f425bd195a..4d98ed19de1e179555bf1a98e2f47a791f8276bd 100644
--- a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
+++ b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
@@ -96,6 +96,8 @@ For missions with a trailer predefined wheels and load-shares are added by Vecto
Doubleclick entries to edit existing axle configurations.
+###Powertrain Tab
+
###Retarder Losses
@@ -132,6 +134,20 @@ Three settings can be set:
- PTO Consumer Loss Map (.vptol): Here the [PTO Idle Loss Map](#pto-idle-consumption-map-.vptoi) of the pto consumer can be defined (adds power demand when the pto cycle is not active).
- PTO Cycle (.vptoc): Defines the [PTO Cycle](#pto-cycle-.vptoc) which is used when the pto-cycle is activated (when the PTO-Flag in the driving cycle is set).
+###Electric Components
+
+
+
+For hybrid vehicles and battery electric vehicles the input elements on the *electric components* tab are enabled. Here the component file for the eletric motor and battery pack can be loaded or created (see [Electric Motor Editor](#electric-motor-editor), [Electric Energy Storage Editor](#electric-energy-storage-editor))
+
+The position where the electric machine is positioned in the powertrain can be selected. It is possible that the electric machine is connected to the powertrain via a fixed gear ratio.
+At the moment electric machines are supported to be present at a single position only. It is not possible to have an electric motor at position P2 and another at position P4!
+However, it is possible that more than one electric machine is used at a certain position.
+The *Efficiency EM to Drivetrain* can be used to consider the efficiency of a transmission step between drivetrain and electric machine or to consider losses of a summation gear.
+
+For the electric energy storage multiple battery packs can be configured and the initial state of charge can be defined.
+
+
###Torque Limits
@@ -144,8 +160,6 @@ In case that the gearbox' maximum torque is lower than the engine's maximum torq
On the ADAS tab, the options for advanced driver assistant systems can be selected. See [ADAS: Overspeed](#driver-overspeed) and [ADAS Technologies](#vehicle-adas-technologies)
-
-
###Controls
diff --git a/Documentation/User Manual/1-user-interface/H_GBX-Editor.md b/Documentation/User Manual/1-user-interface/H_GBX-Editor.md
index 113ea22a0d516a6db2ea742171778f4090648477..3d91282d32400c70864236e65147185a71288024 100644
--- a/Documentation/User Manual/1-user-interface/H_GBX-Editor.md
+++ b/Documentation/User Manual/1-user-interface/H_GBX-Editor.md
@@ -9,7 +9,7 @@
-The [Gearbox File (.vgbx)](#gearbox-file-.vgbx) defines alls gearbox-related input parameters like gear ratios and transmission loss maps. See [Gear Shift Model](#gearbox-gear-shift-model) for details.
+The [Gearbox File (.vgbx)](#gearbox-file-.vgbx) defines all gearbox-related input parameters like gear ratios and transmission loss maps. See [Gear Shift Model](#gearbox-gear-shift-model) for details.
###Relative File Paths
diff --git a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
new file mode 100644
index 0000000000000000000000000000000000000000..9105dbc87af34370c21de1eb0775511af81b6907
--- /dev/null
+++ b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
@@ -0,0 +1,70 @@
+##Electric Motor Editor
+
+
+
+
+###Description
+
+The electric motor file defines all parameters relevant for the electric machine. These are the motor's maximum drive and recuperation torque, the drag torque as well as the electric power map.
+
+###Relative File Paths
+
+It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
+
+VECTO automatically uses relative paths if the input file (e.g. elctric power map) is in the same directory as the Electric Motor File. (The Electric Motor File must be saved before browsing for input files.)
+
+
+###Main Parameters
+
+Make and Model
+: Free text defining the gearbox model, type, etc.
+
+Inertia \[kgm²\]
+: Rotational inertia of the gearbox (constant for all gears). (Engineering mode only)
+
+Max. Drive and Max. Generation Torque Curve
+: Torque over engine speed the electric motor can apply on its output shaft. (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp))
+
+Drag Torque Curve
+: The motor's drag torque over engine speed when the motor is not energized. The torque values in the drag curve have to be negative. (see [Electric Motor Drag Curve File (.vemd)](#electric-motor-drag-curve-file-.vemd))
+
+Electric Power Consumption Map
+: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [Electric Motor Map (.vemo)](#electric-motor-map-.vemo))
+
+
+
+###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.
+
+
+###Controls
+
+
+
+ New file
+: Create a new empty .vem file
+
+Open existing file
+: Open an existing .vem file
+
+
+ ***Save current file***
+
+ ***Save file as...***
+
+ Send current file to the [VECTO Editor](#job-editor)
+: **Note:** If the current file was opened via the [VECTO Editor](#job-editor) the file will be sent automatically when saved.
+
+
+ ***Open file browser***
+
+ ***Open file*** (see [File Open Command)](#settings).
+
+ Save and close file
+: If necessary the file path in the [VECTO Editor](#job-editor) will
+be updated.
+
+
+ ***Cancel without saving***
+
diff --git a/Documentation/User Manual/1-user-interface/M_BatteryPackEditor.md b/Documentation/User Manual/1-user-interface/M_BatteryPackEditor.md
new file mode 100644
index 0000000000000000000000000000000000000000..47a3da566ebc05b2ffba78f656ab154023108219
--- /dev/null
+++ b/Documentation/User Manual/1-user-interface/M_BatteryPackEditor.md
@@ -0,0 +1,75 @@
+##Electric Energy Storage Editor
+
+
+
+
+###Description
+
+The electric energy storage editor allows to edit all model parameters relevant for the electric energy storage.
+
+###Relative File Paths
+
+It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
+
+VECTO automatically uses relative paths if the input file (e.g. SoC) is in the same directory as the Battery file. (The Battery File must be saved before browsing for input files.)
+
+
+###Main Parameters
+
+Make and Model
+: Free text defining the gearbox model, type, etc.
+
+Capacity \[Ah\]
+: Nominal capacity of the battery
+
+C-Factor \[-\]
+: Factor defining the battery's maximum current (derived from the capacity)
+
+SoC min \[%\]
+: Minimum allowed state of charge
+
+SoC max \[%\]
+: Maximum allowed state of charge
+
+SoC Curve
+: Battery internal voltage depending on the battery's state of charge (see [EBattery Internal Voltage File (.vbatv)](#battery-internal-voltage-file-.vbatv))
+
+Internal Resistance Curve
+: Defines the battery's internal resistance depending on its state of charge. The file must cover the SOC range from 0 to 100%! (see [Battery Internal Resistance File (.vbatr)](#battery-internal-resistance-file-.vbatv))
+
+
+###Chart Area
+
+The Chart Area displays the battery's internal voltage (blue) and the internal resistance (red) over its state of charge.
+
+
+###Controls
+
+
+
+ New file
+: Create a new empty .vbat file
+
+Open existing file
+: Open an existing .vbat file
+
+
+ ***Save current file***
+
+ ***Save file as...***
+
+ Send current file to the [VECTO Editor](#job-editor)
+: **Note:** If the current file was opened via the [VECTO Editor](#job-editor) the file will be sent automatically when saved.
+
+
+ ***Open file browser***
+
+ ***Open file*** (see [File Open Command)](#settings).
+
+ Save and close file
+: If necessary the file path in the [VECTO Editor](#job-editor) will
+be updated.
+
+
+ ***Cancel without saving***
+
diff --git a/Documentation/User Manual/5-input-and-output-files/VBATx.md b/Documentation/User Manual/5-input-and-output-files/VBATx.md
index 1799b706fb61b79a8c86882e2994a4be291c3376..e4dda5fefa36b7367f18999c5bca09de914d60ae 100644
--- a/Documentation/User Manual/5-input-and-output-files/VBATx.md
+++ b/Documentation/User Manual/5-input-and-output-files/VBATx.md
@@ -25,11 +25,11 @@ SOC , V
~~~
-##Battery Internal Resistance File (.vbatv)
+##Battery Internal Resistance File (.vbatr)
This file contains the battery's internal resistance as function of the state of charge (SoC). The file must cover the SOC range from 0 to 100%! The file uses the [VECTO CSV format](#csv).
-- Filetype: .vbatv
+- Filetype: .vbatr
- Header: **SOC, R**
- Requires at least 2 data entries
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 29dacc555622203cbfaa0b7dea32a18fa05c1737..65e207e96b249638aa7c9d693943d389cd8a1e0b 100644
--- a/Documentation/User Manual/5-input-and-output-files/VMOD.md
+++ b/Documentation/User Manual/5-input-and-output-files/VMOD.md
@@ -74,7 +74,7 @@ $P_{avg} = \frac{1}{simulation interval} \int{P(t) dt}$.
| P_busAux_PS_gen | [kW] | Mechanical power demand for the air compressor to produce Nl_busAux_gen air. *(only in .vmod file if bus auxiliaries are used)* |
| P_busAux_PS_gen_max | [kW] | Mechanical power demand for the air compressor to produce the maximum air volume. (Used for correcting the total fuel consumption in case of smart pneumatic system) *(only in .vmod file if bus auxiliaries are used)* |
| P_busAux_PS_gen_drag | [kW] | Mechanical power demand for the air compressor if no air is produced (compressor is in drag only, used for correcting the total fuel consumption in case of smart pneumatic system) *(only in .vmod file if bus auxiliaries are used)* |
-| P_aux_<XXX> | [kW] | Mechanical power demand for every individual auxiliary. Only if the run has auxiliaries. 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. |
+| P_aux_<XXX> | [kW] | Mechanical power demand for every individual auxiliary. Only if the run has auxiliaries. 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. |
| P_WHR_el | [kW] | Power generated by an electric WHR system, interpolated from WHR map. |
| P_WHR_el_corr | [kW] | Power generated by an electric WHR system after applying |
| P_aux_ESS_mech | [kW] | Power demand of the auxiliaries considered during engine off periods, multiplied by the engine start/stop utility factor. The final fuel consumption (.vsum) is correctedd for this power demand in a [post-processing step](#engine-fuel-consumption-correction). This power demand has no influence on FC-Map. |
@@ -97,6 +97,29 @@ $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 |
+| n_em<\_POS> | [rpm] | Angular speed of the electric motor at position *POS* |
+| T_em<\_POS> | [Nm] | Torque applied by the 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_em<\_POS>\_mot_max | [Nm] | Maximum torque the electric machine can apply to propel the vehicle. This already considers the maximum current the battery can provide |
+| T_em<\_POS>\_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_em<\_POS>\_in | [kW] | Power at the electric machine's input shaft |
+| P_em<\_POS>\_out | [kW] | Power at the electric machine's output shaft |
+| P_em<\_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_em<\_POS>\_el | [kW] | Electric power generated or consumed by the elctric machine |
+| P_em<\_POS>\_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_em<\_POS>\_gen_max | [kW] | Maximum power the electric machine can generate. This already considers the maximum charge power the battery can handle. |
+| P_em<\_POS>\_loss | [kW] | Losses in the electric machine due to converting electric power to mechanical power |
+| P_em<\_POS>\_inertia_loss | [kW] | Inertia loses of the electric machine |
+| 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. |
+| Battery SOC | [%] | The battery's current state of charge |
+| E_bat | [kWh] | The amount of energy currently stored in the battery |
+| P_bat charge max | [kW] | Maximum power the battery can be charged with |
+| P_bat discharge max | [kW] | Maximum power the battery can provide |
+| U_bat_T | [V] | Voltage at the battery's connector |
+| U_0_bat | [V] | Battery's internal voltage |
+| I_bat | [A] | Current charging/discharging the battery. |
+
**Note:** The fuel name is only added to the fuel-consumption signals in case of dual-fuel engines.
diff --git a/Documentation/User Manual/files.txt b/Documentation/User Manual/files.txt
index 6e83c849bcb29ace6f8d2cb2f4068b309e76fd8c..6b815a78fd5663748e85d31f257110f7cb0d23c2 100644
--- a/Documentation/User Manual/files.txt
+++ b/Documentation/User Manual/files.txt
@@ -5,14 +5,11 @@
1-user-interface/D1_VECTO-Job-Editor.md
1-user-interface/D2_VTP-Job-Editor.md
1-user-interface/E_VECTO-Editor_Aux.md
-1-user-interface/K0_VECTO-AdvancedAux.md
-1-user-interface/K1_VECTO-AdvancedAux_EL.md
-1-user-interface/K2_VECTO-AdvancedAux_EL-ALT.md
-1-user-interface/K3_VECTO-AdvancedAux_PNEU.md
-1-user-interface/K4_VECTO-AdvancedAux_HVAC.md
1-user-interface/F_VEH-Editor.md
1-user-interface/G_ENG-Editor.md
1-user-interface/H_GBX-Editor.md
+1-user-interface/L_ElectricMotor.md
+1-user-interface/M_BatteryPackEditor.md
1-user-interface/I_Graph.md
4-command-line-arguments/cmd.md
2-calculation-modes/calculation-modes.md
diff --git a/Documentation/User Manual/pics/JobForm_General.png b/Documentation/User Manual/pics/JobForm_General.png
index bcc6ae7c4862a9664fdd9af59c040394d9c2ad73..4f2c42c09d7648e6a2cfd76f76402aeae67ca5aa 100644
Binary files a/Documentation/User Manual/pics/JobForm_General.png and b/Documentation/User Manual/pics/JobForm_General.png differ
diff --git a/Documentation/User Manual/pics/VECTO_Battery.png b/Documentation/User Manual/pics/VECTO_Battery.png
new file mode 100644
index 0000000000000000000000000000000000000000..d10d8ae5d98f547f3e41b0ff7b7178e1b5de9c59
Binary files /dev/null and b/Documentation/User Manual/pics/VECTO_Battery.png differ
diff --git a/Documentation/User Manual/pics/VECTO_ElectricMotor.png b/Documentation/User Manual/pics/VECTO_ElectricMotor.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4e27a2f5f1cb90c9f70d3c1de14b24969efef57
Binary files /dev/null and b/Documentation/User Manual/pics/VECTO_ElectricMotor.png differ
diff --git a/Documentation/User Manual/pics/VECTO_JobEditor_Cycles.png b/Documentation/User Manual/pics/VECTO_JobEditor_Cycles.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0b1834ab6e5661dcb1711f8c63f9239b5bd9d6b
Binary files /dev/null and b/Documentation/User Manual/pics/VECTO_JobEditor_Cycles.png differ
diff --git a/Documentation/User Manual/pics/VECTO_JobEditor_ParHyb_Aux.png b/Documentation/User Manual/pics/VECTO_JobEditor_ParHyb_Aux.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bbb7a16fa6b86e56e4131f6b12a4d19d1e3cb88
Binary files /dev/null and b/Documentation/User Manual/pics/VECTO_JobEditor_ParHyb_Aux.png differ
diff --git a/Documentation/User Manual/pics/VECTO_VehicleEditor_ParHyb_El.png b/Documentation/User Manual/pics/VECTO_VehicleEditor_ParHyb_El.png
new file mode 100644
index 0000000000000000000000000000000000000000..44a017c328cdc65ff81f6f4b410ac8bb01c43f28
Binary files /dev/null and b/Documentation/User Manual/pics/VECTO_VehicleEditor_ParHyb_El.png differ
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
index c5a7004c98738116b77a814874c660e15b449f98..77b360af34420ea72441e4516394b7311bd7f6bb 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
@@ -15,6 +15,7 @@ using TUGraz.VectoCore.Tests.Integration.Declaration;
namespace TUGraz.VectoCore.Tests.FileIO
{
[TestFixture]
+ [Parallelizable(ParallelScope.All)]
public class JsonReadHybridTest
{