Merge branch 'develop' into...

Merge branch 'develop' into feature/VECTO-1606-modal-data-results-only-provide-necessary-columns-in-output

Directory.Build.props

@@ -8,7 +8,7 @@
     <!--<DefineConstants>CERTIFICATION_RELEASE</DefineConstants>-->
 
     <!-- Global VECTO Version -->
-    <MainProductVersion>0.7.8</MainProductVersion>
+    <MainProductVersion>0.7.9</MainProductVersion>
     <VersionSuffix>DEV</VersionSuffix>
 
     <!-- The following settings are used as default values for ALL projects -->

Directory.Build.targets

@@ -20,13 +20,14 @@
 
 		<ItemGroup>
 			<!-- All files for net45 -->
-			<Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.exe*"/>
+			<Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.exe"/>
 			<Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.dll*"/>
-			<Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.exe*"/>
+			<Net45Vecto Include="$(SolutionDir)VECTO\bin\Release\net45\nlog.config"/>
+			<Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.exe"/>
 			<Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.dll*"/>
-			<Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.exe*"/>
+			<Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.exe"/>
 			<Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.dll*"/>
-			<Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net45\*.exe*"/>
+			<Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net45\*.exe"/>
 			<Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net45\*.dll*"/>
 		</ItemGroup>
 		<Copy SourceFiles="@(Net45VectoCommandLine)" DestinationFolder="$(DeployPath)net45"/>
@@ -35,13 +36,14 @@
 
 		<ItemGroup>
 			<!-- All files for net48 -->
-			<Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.exe*"/>
+			<Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.exe"/>
 			<Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.dll*"/>
-			<Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.exe*"/>
+			<Net48Vecto Include="$(SolutionDir)VECTO\bin\Release\net48\nlog.config"/>
+			<Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.exe"/>
 			<Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.dll*"/>
-			<Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net48\*.exe*"/>
+			<Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net48\*.exe"/>
 			<Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net48\*.dll*"/>
-			<Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net48\*.exe*"/>
+			<Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net48\*.exe"/>
 			<Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net48\*.dll*"/>
 		</ItemGroup>
 		<Copy SourceFiles="@(Net48VectoCommandLine)" DestinationFolder="$(DeployPath)net48"/>
@@ -53,6 +55,7 @@
 			<!-- All files for net6.0 -->
 			<Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\VECTO.*" Exclude="*.dev.json"/>
 			<Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\*.dll"/>
+			<Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\nlog.config"/>
 			<VectoRuntimes Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\runtimes\**\*.*"/>
 			<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\vectocmd.*" Exclude="*.dev.json"/>
 			<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\*.dll"/>

Documentation/User Manual/1-user-interface/A_index.md

@@ -6,12 +6,16 @@ When VECTO starts the [Main Form](#main-form) is loaded. Closing this form will
 -	[Main Form](#main-form)
 -   [Settings](#settings)
 -	[Job Editor](#job-editor)
--	[Vehicle Editor](#vehicle-editor-general-tab)
--	[Vehicle Editor](#vehicle-editor-powertrain-tab)
--	[Vehicle Editor](#vehicle-editor-electric-components-tab)
--	[Vehicle Editor](#vehicle-editor-torque-limits-tab)
--	[Vehicle Editor](#vehicle-editor-adas-tab)
--	[Vehicle Editor](#vehicle-editor-pto-tab)
+-	[Vehicle Editor - General](#vehicle-editor-general-tab)
+-	[Vehicle Editor - Powertrain](#vehicle-editor-powertrain-tab)
+-	[Vehicle Editor - Electric Machine](#vehicle-editor-electric-machine-tab)
+-	[Vehicle Editor - REESS](#vehicle-editor-reess-tab)
+-	[Vehicle Editor - IEPC](#vehicle-editor-iepc-tab)
+-	[Vehicle Editor - IHPC](#vehicle-editor-ihpc-tab)
+-	[Vehicle Editor - GenSet](#vehicle-editor-genset-tab)
+-	[Vehicle Editor - Torque Limits](#vehicle-editor-torque-limits-tab)
+-	[Vehicle Editor - ADAS](#vehicle-editor-adas-tab)
+-	[Vehicle Editor - PTO](#vehicle-editor-pto-tab)
 -   [Aux Dialog](#auxiliary-dialog)
 -   [BusAux Dialog](#busauxiliary-dialog)
 -	[Engine Editor](#engine-editor)

Documentation/User Manual/1-user-interface/F_VEH-Editor.md

@@ -220,7 +220,7 @@ In case that the gearbox' maximum torque is lower than the engine's maximum torq
 
 Next, the maximum available torque for the electric machine can be reduced at the vehicle level, both for propulsion and recuperation. The input file is the same as the maximum drive and maximum recuperation curve (see [Electric Motor Max Torque File](#electric-motor-max-torque-file-.vemp))
 
-Last, the overall propulsion of the vehicle (i.e., HEV Px, electric motor plus combustion engine) can be limited. The "Propulsion Torque Limit" curve limits the maximum effective torque at the gearbox input shaft over the input speed. This curve is added to the combustion engine's maximum torque curve (only positive values are allowed!). For details on the file format see [Vehicle Boosting Limits](#vehcle-boosing-limits-.vemp). The propulsion torque limit has to be provided from 0 rpm to the maximum speed of the combustion engine. In case of P3 or P4 configuration, the torque at the gearbox input shaft is calculated assuming that the electric motor does not contribute to propelling the vehicle, considering the increased losses in the transmission components inbetween. For P2.5 powertrain configurations no special calculations are necessary as this architecture is internally anyhow modelled as P2 architecture.
+Last, the overall propulsion of the vehicle (i.e., HEV Px, electric motor plus combustion engine) can be limited. The "Propulsion Torque Limit" curve limits the maximum effective torque at the gearbox input shaft over the input speed. This curve is added to the combustion engine's maximum torque curve (only positive values are allowed!). For details on the file format see [Vehicle Boosting Limits](#vehicle-boosting-limits-.vtqp). The propulsion torque limit has to be provided from 0 rpm to the maximum speed of the combustion engine. In case of P3 or P4 configuration, the torque at the gearbox input shaft is calculated assuming that the electric motor does not contribute to propelling the vehicle, considering the increased losses in the transmission components inbetween. For P2.5 powertrain configurations no special calculations are necessary as this architecture is internally anyhow modelled as P2 architecture.
 
 ## Vehicle Editor -- ADAS Tab
 

Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md

@@ -6,7 +6,7 @@
 ### Description
 
 
-The [Hybrid Strategy Parameters File (.vhctl)](#hybrid-strategy-parameters-file-.vhctl) defines all parameters used by the [Hybrid Control Strategy](#hybrid-control-strategy) to evaluate the best option for splitting the demanded torque between electric motor and combustion engine.
+The [Hybrid Strategy Parameters File (.vhctl)](#hybrid-strategy-parameters-file-.vhctl) defines all parameters used by the [Parallel Hybrid Control Strategy](#parallel-hybrid-control-strategy)/[Serial Hybrid Control Strategy](#serial-hybrid-control-strategy) to evaluate the best option for splitting the demanded torque between electric motor and combustion engine.
 
 ### Strategy Parameters
 

Documentation/User Manual/1-user-interface/H_GBX-Editor.md

@@ -71,7 +71,7 @@ Automated Manual Transmission - Hybrid Electric vehicle
 :   Gearshift is handled by the hybrid controller. Shift lines (calculated in the same way as for conventional vehicles) are used as upper and lower boundary for allowed ICE operating points.
 
 Automated Manual Transmission - Pure Electric vehicle
-:   Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#FFOOO)
+:   Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#pev-gear-shift-model)
 
 Automatic Transmission - Conventional vehicle
 :   Efficiency shift. The calculation of gearshift lines and the gearshift rules are [described here](#shift-strategy-apt-gearshift-rules)
@@ -80,7 +80,7 @@ Automatic Transmission - Hybrid Electric vehicle
 :   Gearshift is handled by the hybrid controller. Shift lines (calculated in the same way as for conventional vehicles) are used as upper and lower boundary for allowed ICE operating points.
 
 Automatic Transmission (APT-N) - Pure Electric vehicle
-:    Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#FFOOO)
+:    Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#pev-gear-shift-model)
 
 <div class="engineering">
 

Documentation/User Manual/1-user-interface/L_ElectricMotor.md

@@ -47,7 +47,7 @@ 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)). The max drive and max generation torque have to be provided for two different voltage levels.
 
 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)). The power map has to be provided for two different voltage levels.
+:   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-power-map-.vemo)). The power map has to be provided for two different voltage levels.
 
 Voltage Level Low/High
 :    Applicable voltage level for the electric power consumption map and max drive/generation torque curve

Documentation/User Manual/1-user-interface/N_IEPC.md

@@ -54,7 +54,7 @@ Max. Drive and Max. Generation Torque Curve
 :   Torque over engine speed the electric motor can apply on its output shaft. (see [IEPC Max Torque File (.vemp)](#iepc-max-torque-file-.viepcp)). The max drive and max generation torque have to be provided for two different voltage levels.
 
 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 [IEPC Map (.viepco)](#iepc-map-.viepco)). The power map has to be provided for two different voltage levels and all gears.
+:   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 [IEPC Map (.viepco)](#iepc-power-map-.viepco)). The power map has to be provided for two different voltage levels and all gears.
 
 Voltage Level Low/High
 :    Applicable voltage level for the electric power consumption map and max drive/generation torque curve

Documentation/User Manual/1-user-interface/O_IHPC.md

@@ -51,7 +51,7 @@ 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)). The max drive and max generation torque have to be provided for two different voltage levels.
 
 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 (.viepco)](#electric-motor-map-.vemo)). The power map has to be provided for two different voltage levels and all gears.
+:   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 (.viepco)](#electric-motor-power-map-.vemo)). The power map has to be provided for two different voltage levels and all gears.
 
 Voltage Level Low/High
 :    Applicable voltage level for the electric power consumption map and max drive/generation torque curve

Documentation/User Manual/3-simulation-models/Electric_Motor.md

@@ -12,7 +12,7 @@ The electric motor is modeled by basically 4 map files:
  - Engine speed for overload torque  ($n_\textrm{T,ovl}$)
  - Maximum overload time ($t_\textrm{ovl}$)
 
-The first two curves are read from a .vemp file (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The drag curve is provided in a .vemd file (see [Electric Motor Drag Curve File (.vemd)](#electric-motor-drag-curve-file-.vemd)) and the electric power map in a .vemo file (see [Electric Motor Map (.vemo)](#electric-motor-map-.vemo)).
+The first two curves are read from a .vemp file (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The drag curve is provided in a .vemd file (see [Electric Motor Drag Curve File (.vemd)](#electric-motor-drag-curve-file-.vemd)) and the electric power map in a .vemo file (see [Electric Motor Map (.vemo)](#electric-motor-power-map-.vemo)).
 
 During the simulation the maximum drive torque, maximum generation torque, and electric power map is interpolated for both voltage levels and the actual value used is interpolated between both voltage levels with the current internal voltage of the REESS.
 

Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md

@@ -143,9 +143,9 @@ $$
 $\textbf{\textrm{FC\_WHR}} = - (\textrm{E\_WHR\_mech} + \textrm{E\_WHR\_el\_mech}) \cdot k_\textrm{engline}$
 
 
-#### Hybrid Vehicles: REESS SoC Correction
+#### Parallel Hybrid Vehicles: REESS SoC Correction
 
-If the REESS Soc at the end of the simulation is higher than the initial SoC the correction is done according to:
+If the REESS Soc at the end of the simulation is different than the initial SoC the correction is done according to:
 
 $$
 \textbf{\textrm{FC\_SoC}} = -\frac{\Delta\textrm{E\_REESS} \cdot k_\textrm{engline}}{\eta_{\textrm{EM}_\textrm{chg}} \cdot \eta_{\textrm{REESS}_\textrm{chg}}} 
@@ -164,6 +164,24 @@ $\eta_{\textrm{REESS}_\textrm{chg}} = \frac{\textrm{E\_REESS\_INT\_CHG}}{\textrm
 $\eta_{\textrm{REESS}_\textrm{dischg}} = \frac{\textrm{E\_REESS\_INT\_DISCHG}}{\textrm{E\_REEES\_T\_DISCHG}}$
 
 
+#### Serial Hybrid Vehicles: REESS SoC Correction
+
+If the REESS Soc at the end of the simulation is different than the initial SoC the correction is done according to:
+
+$FC_\textrm{gen,charging} = \sum{FC_\textrm{mod,final}\cdot dt}$
+
+$E_\textrm{gen,el} = \sum{P_\textrm{em,el}\cdot dt}$
+
+If the GenSet was on during the cycle, the SoC correction is done according to:
+
+$\textrm{FC\_SOC} = \Delta\textrm{E\_REESS} \cdot \frac{FC_\textrm{gen,charging}}{E_\textrm{gen,el}}$
+
+If the GenSet was never on during the cycle, the SoC correction is done according to:
+
+$\textrm{FC\_SOC} = \Delta\textrm{E\_REESS} \cdot \frac{FC_\textrm{gen,optimal}}{E_\textrm{gen,el,optimal}}$
+
+where $FC_\textrm{gen,optimal}$ and $E_\textrm{gen,el,optimal}$ are the fuel consumption and generated electric power in the optimal operating point of the GenSet
+
 ### Corrected Total Fuel Consumption
 
 The final fuel consumption after all corrections are applied is calcualted as follows:

Documentation/User Manual/3-simulation-models/GearShift.md

@@ -24,7 +24,28 @@ $a_{demand} = a_{act} * a_{red}$   for $(n_{act} > n_{T98h})$
 $a_{red} = 1+ (\textrm{AccelerationFactorNP98h} - 1) / (n_{P98h} - n_{T98h}) * (n - n_{T98h})$  for $(n_{act} > n_{T98h})$
 
 
+## PEV Gear Shift Model
 
+The gear shift lines for pure electric vehicles is different than for conventional vehicles and HEV as the shape of maximum torque curve is typically very different.
 
+The figure below depicts a typical maximum torque curve (orange) and maximum power curve (blue) for an electric motor. The downshift and upshift lines are plotted with a dot-dashed green line.
 
+**Basics:**
+
+  * Downshift for operation point left of green dot-dashed downshift lines
+  * Upshift for operation point right of green dot-dashed upshift line
+  * EffShift method applied for operation point between downshift and upshift lines (refer to user manual) 
+
+**Driving:**
+
+  * Maximum downshift speed always located at n_P80low (where 80% of max power is available)
+  * For EM in de-rating n_P80low is calculated from the de-rated power curve
+
+**Braking:**
+
+  * EffShift is suppressed for operation point within red shaded area(2% below max recuperation power)
+  * New gear after downshift is selected so that operation point is closest to and above n_brake_target_norm (or only closest to n_brake_target_norm in case no operation point with higher speed exists)
+
+
+![](pics/PEV_Gearshift.png)
 

Documentation/User Manual/3-simulation-models/IEPC.md

@@ -19,3 +19,6 @@ The first two curves are read from a .viepcp file (see [IEPC Max Torque File (.v
 
 In the VECTO simulation, the IEPC component is virtually split up into the electric machine (with gear-dependent electric power maps), an APT-N gearbox in case of a multi-speed gearbox or a single-speed gearbox in case the IEPC has only a single fixed transmission ratio, and optionally an axle gear. All virtual powertrain components (gearbox, axlegear) are modeled as loss-less components. Thus, the simulation of an IEPC is similar to E2 vehicles in case of a multi-speed gearbox or an E3 vehicle in case of a single-speed gearbox.
 
+![](pics/Structure_IEPC.png)
+
+All signals with the suffix "_int" refer to the electric motor, while signals without this suffix refer to the whole component.
\ No newline at end of file

Documentation/User Manual/3-simulation-models/HybridControlStrategy.md → Documentation/User Manual/3-simulation-models/ParallelHybridControlStrategy.md

-## Hybrid Control Strategy
+## Parallel Hybrid Control Strategy
 
 The basic principle of the hybrid control strategy is to evaluate different options of operating modes, i.e., different splits of the demanded torque at the wheels among the electric motor and the combustion engine. For every option a cost function is calculated, taking onto account the required electric energy and the fuel consumption. Out of the examined operating modes the best option, i.e, the option with the lowest cost value is selected.
 

Documentation/User Manual/3-simulation-models/SerialHybridControlStrategy.md

+## Serial Hybrid Control Strategy
+
+The basic principle of the serial hybrid strategy is to operate the GenSet in three different states, depending on the power demand of the drivetrain and the REESS' state of charge. So the serial hybrid strategy operates as a three-point controller with a hysteresis.
+
+The following picture illustrates the basic idea. If the SoC is above the target SoC, the GenSet is off and the vehicle drives solely from the battery. When the SoC gets lower and reaches the SoC_min threshold, the GenSet is switched on. As long as the SoC is between SoC_min and SoC_target, the GenSet operates in the optimal operating point. When the upper threshold SoC_target is reached, the GenSet is switched off. In case the power demand from the drivetrain is higher than what the GenSet can provide in the optimal point and the SoC falls below the lower threshold SoC_min, the GenSet operates either in the maximum power operating point (if the drivetrain power demand is higher than the power generated in the optimal point) or in the optimal point.
+
+![](pics/SerialHybrid_SoCBoundaries.png)
+
+The statemachine for the serial hybrid control strategy is depicted here:
+
+![](pics/SerialHybrid_Statemachine.png)
+
+**Note:** The SoC boundaries (SoC_target and SoC_min) shall be narrower than the batteries SoC limits so that on the one hand the vehicle can still recuperate even in case the REESS is charging and reaching the target SoC and on the other hand that there is a buffer available if the drivetrain power demand is high and the GenSet needs some time to ramp up to the maximal power operating point.
+
+### GenSet Pre-Processing
+
+The optimal and maximal GenSet operating points are calculated in a pre-processing step. The fuel consumption and generated electric power is calculated for 400 different operating points: from ICE idle speed up to the maximum speed (minimum of ICE and electric motor), and from 0 mechanical power up to the maximum mechanical power of the ICE. Out of this set of operating points the one with the highest electrical power and the operating point with the best fuel efficiency is selected. This is done for the GenSet operating in de-rating or not. 
\ No newline at end of file

Documentation/User Manual/5-input-and-output-files/VEMx.md

@@ -36,7 +36,7 @@ n [rpm] , T_drag [Nm]
 ~~~
 
 
-## Electric Motor Map (.vemo)
+## Electric Motor Power Map (.vemo)
 
 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).
 

Documentation/User Manual/files.txt

@@ -51,7 +51,8 @@
 3-simulation-models/IEPC.md
 3-simulation-models/IHPC.md
 3-simulation-models/Electric_Storage.md
-3-simulation-models/HybridControlStrategy.md
+3-simulation-models/ParallelHybridControlStrategy.md
+3-simulation-models/SerialHybridControlStrategy.md
 5-input-and-output-files/input-output.md
 5-input-and-output-files/XML_Job-File_DeclarationMode.md
 5-input-and-output-files/XML_DeclarationReport.md