diff --git a/Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md b/Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md
index 514a32d00d56b924edb5cd74d469db759d446f45..8f15bcde0b97b3a4d3e67ee577cfc8a445dcf38b 100644
--- a/Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md
+++ b/Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md
@@ -9,8 +9,6 @@
The Auxiliary Dialog is used to configure auxiliaries. In [Declaration Mode](#declaration-mode) the set of auxiliaries and their power demand is pre-defined. For every auxiliary the user has to select the technology from a given list.
-In [Engineering Mode](#engineering-mode) the set of auxiliaries can be specified by the user. Auxiliary efficieny is defined using an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux). See [Auxiliaries](#auxiliaries) for details on how the power demand for each auxiliary is calculated.
-
###Settings
Technology
diff --git a/Documentation/User Manual/1-user-interface/K0_VECTO-AdvancedAux.md b/Documentation/User Manual/1-user-interface/K0_VECTO-AdvancedAux.md
deleted file mode 100644
index b3f70bda7bab575a21868ecccf9524277e643c7b..0000000000000000000000000000000000000000
--- a/Documentation/User Manual/1-user-interface/K0_VECTO-AdvancedAux.md
+++ /dev/null
@@ -1,54 +0,0 @@
-##Advanced Auxiliary Dialog
-
-<div class="engineering">
-
-
-
-
-###Description
-
-In the VECTO Job Editor dialog you need to select "BusAuxiliaries" in the drop down list on the left to configure the advanced auxiliaries.
-
-The Advance Auxiliaries Editor File (.aaux) defines all the auxiliary related parameters and input files like Alternator and Compressor Maps and HVAC steady state model outputs.
-
-The Advance Auxiliaries Editor contains four tabs/sub-modules where the different advanced auxiliary types can be configured:
-
-- General
- : Currently empty – reserved for potential future expansion.
-
-- [Electrics](#electrical-auxiliaries-editor)
- : The "Electrics" tab defines various parameters for electric auxiliaries used on the vehicle.
-
-- [Pneumatics](#pneumatic-auxiliaries-editor)
- : The "Pneumatic" tab defines various pneumatic auxiliaries data and pneumatic variables
-
-- [HVAC](#hvac-auxiliaries-editor)
- : The "HVAC" tab defines the steady state output values, which can also be loaded via the Steady State Model File (.AHSM)
-
-
-###Important notes
-
-Note that the cycle file name used should ideally respect the following syntax to be correctly associated with the pneumatic actuations map (.apac), otherwise the number of actuations will be set to 0 by default:
-
-- "AnyOtherText _X_Bus.vdri", with "X" = "Urban", "Heavy urban", “Suburban", or "Interurban"
-- "AnyOtherText_Coach.vdri"
-
-Some flexibility in syntax is allowable (the model looks for 'Bus', 'Coach', 'Urban', etc. in the file name), meaning that the standard default cycles are fully/correctly supported. However, for newly created cycles (i.e. for use in Engineering Mode) it is recommended to follow the above convention to guarantee correct functionality.
-
-###File Format
-
-The file uses the VECTO JSON format.
-
-The new file types have also defined to support the new Advanced Auxiliaries module in VECTO include:
-
-| File EXT NAME | Storage Type | Description |
-|---------------|--------------|-------------|
-| .AAUX | JSON | Overall configuration information for Electrical, Pneumatic and HVAC. Top of the tree for Advanced Auxiliaries |
-| .AALT | CSV | Advanced Combined Alternators: Contains combined map plus source maps. |
-| .ACMP | CSV | Advanced Compressor Map. |
-| .APAC | CSV | Pneumatic Actuations Map: Stores number of actuations per cycle |
-| .AHSM | JSON | Stores Steady State Model results, and also the configuration which resulted in the final result. UI to calculate various heat/cool/ventilate properties resulting in Electrical and Mechanical Power as well as cooling based on environmental conditions. |
-| .ABDB | CSV | Bus Parameter Database: Contains a list of the default parameters for different buses. |
-| .AENV | CSV | Stores a number of environmental conditions to be used by HVAC model when in batch-mode. |
-
-</div>
\ No newline at end of file
diff --git a/Documentation/User Manual/1-user-interface/K1_VECTO-AdvancedAux_EL.md b/Documentation/User Manual/1-user-interface/K1_VECTO-AdvancedAux_EL.md
deleted file mode 100644
index 7d3db62212f8f7efc75be269185a0b8b47c9c1c7..0000000000000000000000000000000000000000
--- a/Documentation/User Manual/1-user-interface/K1_VECTO-AdvancedAux_EL.md
+++ /dev/null
@@ -1,103 +0,0 @@
-##Electrical Auxiliaries Editor
-
-
-
-###Description
-
-The "Electrics" tab defines various parameters for electric auxiliaries used on the vehicle:
-
-- Powernet Voltage [locked field/fixed value]
-- Alternator Map, including filepath to the new Combined Alternator Map (.AALT) file
- : Files can be imported (blank field)/the [Combined Alternator Map editor](#combined-alternator-map-file-.aalt) opened (file present) by clicking on the ‘browse’ button adjacent to the “Alternator Map†text box.
-- Alternator Pulley Efficiency [locked field/fixed value]
-- Door Actuation Time(S) [locked field/fixed value]
-- Stored Energy Efficiency [locked field/fixed value]
-- Smart Electrics [On/Off]
- : Smart electrics are enabled by checking the "Smart Electrics" box
-- Electrical Consumables
- : The "Electrical Consumables" table contains a list electrical equipment that place demand on the engine. Check boxes enable the user to select whether the energy demanded by each consumable is included in the calculation of the base vehicle. The user can modify only the number of consumables of each type installed on the vehicle*. The Nominal Consumption (amps) for each consumer, and the percentage of time each consumer is active during the cycle are locked default values as agreed with the project steering group.
-
-* Note: for certain fields the allowable values are also controlled/prescribed according to the requirements of the project steering group.
-
-###Results Cards
-
-Upon activation of Smart Electrics using the check box, the user may enter Result Card values according to the methodology proposed by the steering group. Until the certification procedure to determine the correct values is agreed, it is recommended to use the following default values:
-
-Example Default Results Card values
-
-| Amps | SmartAmps |
-|------|-------------|
-| 40 | 0 |
-| 50 | 0 |
-| 60 | 54 |
-| 70 | 64 |
-| 80 | 30 |
-
- : Result Card: Idle
-
-
-| Amps | SmartAmps |
-|-------|-----------------|
-| 40 | 0 |
-| 50 | 0 |
-| 60 | 83 |
-| 70 | 94 |
-| 80 | 45 |
-
- : Result Card: TractionON
-
-
-| Amps | SmartAmps |
-|-------|--------------|
-| 40 | 0 |
-| 50 | 0 |
-| 60 | 172 |
-| 70 | 182 |
-| 80 | 90 |
-
- : Result Card: Overrun
-
-###Default Values
-
-The following table provides a summary of the default values that are populated whenever a new advanced auxiliaries (.AAUX) file is created from scratch (nominal consumption and % active are always fixed defaults, so are not shown). The table also indicates the editable/default status of the relevant parameters in the VECTO UI in Engineering mode, and the recommended status in Declaration mode (not currently implemented). The default values / parameter status has been agreed with the project steering group.
-
-*Default parameter values and editable status for the Electrical module*
-
-*General Inputs*
-
-| Category | Name | Default value | Engineering | Declaration |
-|------------------------------|------------------------------|------------------|----------------|----------------|
-| Powernet Voltage | Powernet Voltage | 28.3 | Locked default | Locked default |
-| Alternator Map | Alternator Map | blank | Open/editable | Open/OEM data |
-| Alternator Pulley Efficiency | Alternator Pulley Efficiency | 0.92 | Locked default | Locked default |
-| Door Actuation Time (s) | Door Actuation Time (s) | 4.0 | Locked default | Locked default |
-| Smart Electrics | Smart Electrics | No (/Yes) | Open/editable | Open/OEM data |
-
-
-*List of Electrical Consumables*
-
-
-
-| Category | Name | No. in Vehicle, Default Value | Engineering | Declaration |
-|------------------------------|-----------------------------------------------------------|------------------|----------------|----------------|
-| Doors | Doors per vehicle | 3 | Open/editable | Open/OEM data |
-| Veh Electronics &Engine | Controllers, Valves, etc | 1 | Locked default | Locked default |
-| Vehicle basic equipment | Radio City | 1 | Open/editable | Open/OEM data |
-| Vehicle basic equipment | Radio Intercity | 0 | Open/editable | Open/OEM data |
-| Vehicle basic equipment | Radio/Audio Tourism | 0 | Open/editable | Open/OEM data |
-| Vehicle basic equipment | Fridge | 0 | Open/editable | Open/OEM data |
-| Vehicle basic equipment | Kitchen Standard | 0 | Open/editable | Open/OEM data |
-| Vehicle basic equipment | Interior lights City/ Intercity + Doorlights [1/m] | 12 | Open/editable | Locked default |
-| Vehicle basic equipment | LED Interior lights ceiling city/ontercity + door [1/m] | 0 | Open/editable | Locked default |
-| Vehicle basic equipment | Interior lights Tourism + reading [1/m] | 0 | Open/editable | Locked default |
-| Vehicle basic equipment | LED Interior lights ceiling Tourism + LED reading [1/m] | 0 | Open/editable | Locked default |
-| Customer Specific Equipment | External Displays Font/Side/Rear | 4 | Open/editable | Open/OEM data |
-| Customer Specific Equipment | Internal display per unit ( front side rear) | 1 | Open/editable | Open/OEM data |
-| Customer Specific Equipment | CityBus Ref EBSF Table4 Devices ITS No Displays | 1 | Open/editable | Open/OEM data |
-| Lights | Exterior Lights BULB | 1 | Locked default | Locked default |
-| Lights | Day running lights LED bonus | 1 | Open/editable | Open/OEM data |
-| Lights | Antifog rear lights LED bonus | 1 | Open/editable | Open/OEM data |
-| Lights | Position lights LED bonus | 1 | Open/editable | Open/OEM data |
-| Lights | Direction lights LED bonus | 1 | Open/editable | Open/OEM data |
-| Lights | Brake Lights LED bonus | 1 | Open/editable | Open/OEM data |
-
diff --git a/Documentation/User Manual/1-user-interface/K2_VECTO-AdvancedAux_EL-ALT.md b/Documentation/User Manual/1-user-interface/K2_VECTO-AdvancedAux_EL-ALT.md
deleted file mode 100644
index 513fd53838e5d42549a7dd5197e11442013dc808..0000000000000000000000000000000000000000
--- a/Documentation/User Manual/1-user-interface/K2_VECTO-AdvancedAux_EL-ALT.md
+++ /dev/null
@@ -1,45 +0,0 @@
-##Combined Alternator Map File (.aalt)
-
-The Combined Alternator Map (.AALT) file contains data relating to the efficiency of the alternator at various engine speeds and current demand. The .AALT file is a CSV file containing three fields: “Ampâ€, “RPM†(engine speed), and “Efficiencyâ€. It can be created via the select file button, or an existing map directly imported into VECTO via the File Browser.
-
-
-
-
-A new combined alternator map can be created or an existing one edited using the Combined Alternators editor module (see below). This module enables the creation of a combined average alternator efficiency map by the advanced auxiliaries module, using input data for one or more alternators (Pully Ratio, Efficiency at different RPM/AMP combinations):
-
-
-
-Alternators may be added/deleted from the list. Data for existing alternators can be loaded into the form by double-clicking on the relevant alternator, and the data may then be updated and saved back down.
-
-The 'Diagnostics' tab provides a summary of the input data that is fed into combined alternator map calculations:
-
-
-
-The methodology for calculating the combined efficiency map is summarised below (and also included in the full schematics file included with the User Manual). Note: A simplified calculation is performed using the average of the user input efficiency values in the model pre-run only, to keep total run-time to a minimum (with negligible impact on the final result). :
-
-
-
-
-###File Format
-
-The file uses the VECTO CSV format.
-
-Several example default alternator maps are provided for use until a finalised certification procedure is in place for OEM-specific data.
-
-*Example Default Alternator Configuration for Advanced Alternator Map*
-
----------------------
-Pulley Ratio: 3.6
----------------------
-
-
-| | | | | | | |
-|---------|------|------------|------|------------|------|----------|
-| *RPM* | *2000* | *2000* | *4000* | *4000* | *6000* | *6000* |
-| | **Amps** | **Efficiency** | **Amps** | **Efficiency** | **Amps** | **Efficiency** |
-| | **10.00** | 62.00 | **10.00** | 64.00 | **10.00** | 53.00 |
-| I_max/2 | 27.00 | 70.00 | 63.00 | 74.00 | 68.00 | 70.00 |
-| I_max | 53.00 | 30.00 | 125.00 | 68.00 | 136.00 | 62.00 |
-
-Notes: Bold values are locked/fixed values; I_max = the maximum current in Amps.
-
diff --git a/Documentation/User Manual/1-user-interface/K3_VECTO-AdvancedAux_PNEU.md b/Documentation/User Manual/1-user-interface/K3_VECTO-AdvancedAux_PNEU.md
deleted file mode 100644
index fc56a7b2c9b3e6d2af93028df203c4cc0c08d234..0000000000000000000000000000000000000000
--- a/Documentation/User Manual/1-user-interface/K3_VECTO-AdvancedAux_PNEU.md
+++ /dev/null
@@ -1,59 +0,0 @@
-##Pneumatic Auxiliaries Editor
-
-
-
-
-###Description
-
-The "Pneumatics" tab defines various parameters for pneumatic auxiliaries used on the vehicle:
-
-- Pneumatic Auxiliaries Data/Variables
- : Data for various pneumatic auxiliaries and the relevant pneumatic variables can be edited in the adjacent text boxes.
-- Filepath to the Compressor Map (.ACMP) file
- : Files can be imported by clicking the browse button adjacent to the “Compressor Map†text box.
-- Filepath to the Actuations Map (.APAC) file
- : Files can be imported by clicking the browse button adjacent to the “Actuations Map†text box.
-- The “Retarder Brakeâ€, “Smart Pneumatics†and “Smart Regeneration†and enable via check boxes.
-
-
-###Default Values
-
-The following table provides a summary of the default values that are populated whenever a new advanced auxiliaries (.AAUX) file is created from scratch. The table also indicates the editable/default status of the relevant parameters in the VECTO UI in Engineering mode, and the recommended status in Declaration mode (not currently implemented). The default values / parameter status has been agreed with the project steering group.
-
-**Default parameter values and editable status for the Pneumatic module**
-
-*Pneumatic Auxiliaries Data*
-
-| Category | Default value | Engineering | Declaration | Comments |
-|----------|---------------|-------------|-------------|----------|
-| AdBlue NI per minute | 21.25 | Open/editable | Locked default | Only relevant for Pneumatic AdBlue Dosing, also needs drive cycle duration |
-| Air Controlled Suspension NI/Minute | 15 | Open/editable | Locked default | Only relevant for Pneumatic Air Suspension Control, also needs drive cycle duration |
-| Breaking No Retarder NI/KG | 0.00081 | Open/editable | Locked default | also needs vehicle weight |
-| Braking with Retarder NI/KG | 0.0006 | Open/editable | Locked default | Also needs vehicle weight |
-| Air demand per Kneeling NI/Kg mm | 0.000066 | Open/editable | Locked default | Also needs vehicle weight and kneeling height |
-| Dead Vol Blowouts/L/Hour | 24 | Open/editable | Locked default | |
-| Dead Volume Litres | 30 | Open/editable | Locked default | |
-| Non Smart Regen Fraction Total Air Demand | 0.26 | Open/editable | Locked default | |
-| Overrun Utilisation for Compression Fraction | 0.97 | Open/editable | Locked default | Taken directly from White Book |
-| Per Door Opening NI | 12.7 | Open/editable | Locked default | Only relevant for Pneumatic Door Operation, also needs number of door openings |
-| Per Stop Brake Actuation NI/KG | 0.00064 | Open/editable | Locked default | Also needs vehicle weight |
-| Smart Regen Fraction Total Air Demand | 0.12 | Open/editable | Locked default |
-
-
-
-*Pneumatic Variables*
-
-| Category | Default value | Engineering | Declaration | Comments |
-|----------|---------------|-------------|-------------|----------|
-| Compressor Map | <blank> | Open/editable | Locked default | A number of pre-set defaults will be provided; later value from test procedure. |
-| Compressor Gear Ratio | 1.00 | Open/editable | Open/OEM data | Related compressor shaft speed to engine shaft speed |
-| Compressor Gear Efficiency | 0.97 | Open/editable | Locked default | |
-| AdBlue Dosing | Pneumatic | Open/editable | Open/OEM data | Pneumatic (/Electric) |
-| Air Suspension Control | Mechanically | Open/editable | Open/OEM data | Mechanically (/Electrically) |
-| Door Operation | Pneumatic | Open/editable | Open/OEM data | Pneumatic (/Electric) |
-| Kneeling height millimeters | 70 | Open/editable | Open/OEM data | Used with air demand per kneeling |
-| Actuations Map | testPneumatic | ActuationsMap | Open/editable | Locked default | Determined by passenger stops |
-| Retarder brake | Yes | Open/editable | Open/OEM data | Yes (/No) |
-| Smart Pneumatics | No | Open/editable | Open/OEM data | No (/Yes) |
-| Smart Regeneration | No | Open/editable | Open/OEM data | No (/Yes) |
-
diff --git a/Documentation/User Manual/1-user-interface/K4_VECTO-AdvancedAux_HVAC.md b/Documentation/User Manual/1-user-interface/K4_VECTO-AdvancedAux_HVAC.md
deleted file mode 100644
index e9e3bc74fda1b4d4fb3cc7875541e6d6ef7981cf..0000000000000000000000000000000000000000
--- a/Documentation/User Manual/1-user-interface/K4_VECTO-AdvancedAux_HVAC.md
+++ /dev/null
@@ -1,237 +0,0 @@
-##HVAC Auxiliaries Editor
-
-
-
-###Description
-
-The "HVAC" tab defines various parameters for heating, ventilation and air conditioning (HVAC) auxiliaries used on the vehicle, calculated from the HVAC Steady State Model (HVAC SSM):
-- Disable HVAC Module [tickbox]
-- Filepath to the Steady State Model File (.AHSM)
- : Files can be imported by clicking the browse button adjacent to the HVAC "Steady State Model File (.AHSM)" text box.
-- Filepath to the Bus Parameter Database (.ABDB)
- " Files can be imported by clicking the browse button adjacent to the HVAC SSM bus parameters database file (.ABDB) text box. The bus parameter database contains a list of default parameters for a number of pre-existing/defined buses that can be quickly switched between within the HVAC SSM Editor module.
-
-Outputs from the HVAC SSM include:
-- Electrical Load Power Watts
-- Mechanical Load Power Watts
-- Fuelling Litres Per Hour
-
-
-###HVAC Steady-State Model Editor
-
-The HVAC Steady-State Model (HVAC SSM) Editor defines various data and parameters for calculation of HVAC auxiliary demands (electrical, mechanical and fuelling) from the vehicle, replicating the key inputs/functionality from the HVAC CO2SIM model developed for ACEA:
-
-- Bus Parameters
-- Boundary Conditions
-- Other
-- Tech List Input
-- Diagnostics
-
-At the top of the window, two sets of outputs are presented for electrical, mechanical and fuelling demand:
-
-- 'Base' values: These are the calculated resulting demands from the inputs on the 'Bus Parameters', 'Boundary Conditions' and 'Other' tabs.
-- 'Adjusted' values: these are the final values output from the model, which additionally factor in the HVAC technologies included in the 'Tech List Input' tab.
-
-###Bus Parameters
-
-
-
-Input bus parameters can be edited directly or imported/calculated from the Bus Parameter Database (.abdb) file via the '\<Select\>' drop-down box at the top of the page. Parameters in the accompanying database file (.abdb) include:
-
-- Bus Model Name (free text)
-- Registered passengers
-- Type (i.e. 'raised floor' = Class III, 'semi low floor' = Class II, or 'low floor' = Class I)
-- Is Double Decker [tick box]
-- Length in m,
-- Wide in m,
-- Height in m,
-- \[Engine Type (only 'diesel' is currently supported), only when creating a 'New' entry\]
-- Other fields, that are greyed out, are locked and not editable, containing fixed default values or calculations.
-
-
-###Boundary Conditions
-
-
-
-On this tab the various boundary conditions for the HVAC SSM calculations can be set. Certain fields (greyed out) are locked and not editable, containing fixed default values or calculations.
-
-###Other
-
-
-
-On this tab a number of other parameters for the HVAC SSM calculations can be set:
-- Environmental conditions: when in 'Batch Mode' a climatic conditions dataset (.aenv) file must be used containing a series of environmental conditions. Otherwise single values for temperature and solar load may be input (these fields are locked/not used when in batch mode).
-- AC System specifications/type: the AC-Compressor Type selection determines the COP value used, according to the specification of the project steering group.
-- Ventilation settings
-- Auxiliary Heater parameters: the power of the fuel fired heater may be included, other fields are provided for information only and are locked. The 'Engine Waste Heat' values are calculated during the actual model runs, which are determined via a pre-run of the model over the selected drive-cycle.
-
-###TechList Input
-
-
-
-To determine energy consumption of a certain bus-HVAC system combination, a customisable list of technologies may be added/edited on this tab to allow to take special features into account which have a reducing or increasing influence. Because several technologies are only available for certain bus types, the list has to be bus type-specific. The technologies list and the default values has been populated according to the steering group recommendations, however these may be deleted, edited or added to as required on this tab in Engineering mode.
-
-**Diagnostics**
-
-The final 'Diagnostics' tab provides a summary of the resulting outputs from the HVAC Tech List tab.
-
-
-###Default Values
-
-The following table provides a summary of the default values that are populated whenever a new advanced auxiliaries (.AAUX) file is created from scratch. The table also indicates the editable/default status of the relevant parameters in the VECTO UI in Engineering mode, and the recommended status in Declaration mode (not currently implemented). The default values / parameter status has been agreed with the project steering group.
-
-**Default parameter values and editable status for the HVAC module**
-
-**INP - BusParameters tab**
-
-*Bus Parameterisation*
-
-| Category/Input | Default value | Engineering | Declaration |
-|----------------|---------------|-------------|-------------|
-| Select | \<Select\> | | |
-| Bus Model | <ABDB or input> | Open/editable | Locked default |
-| Number of Passengers | \<ABDB or input\> | Open/editable | Locked default |
-| Bus Type | <ABDB or input> | Open/editable | Locked default |
-| Double Decker? | No | Open/editable | Open/OEM data |
-| Bus Length (m) | \<ABDB or input\> | Open/editable | Locked default |
-| Bus Width (m) | \<ABDB or input\> | Open/editable | Locked default |
-| Bus Height (m) | \<ABDB or input\> | Open/editable | Locked Calc |
-| Bus Floor Surface Area (m^2) | Calculation | Locked Calc | Locked Calc |
-| Bus Window Surface (m^2) | Calculation | Locked Calc | Locked Calc |
-| Bus Surface Area (m^2) | Calculation | Locked Calc | Locked Calc |
-| Bus Volume (m^3) | Calculation | Locked Calc | Locked Calc |
-
-**INP - Boundary Conditions tab**
-
-*Boundary Conditions*
-
-| Category/Input | Default value | Engineering | Declaration |
-|----------------|---------------|-------------|-------------|
-| G-Factor ** | 0.95 | Open/editable | Open/editable |
-| Solar Clouding | 0.8 | Locked Calc | Locked Calc |
-| Heat per Passenger into Cabin (W) | 80 | Locked Calc | Locked Calc |
-| Passenger Boundary Temperature (oC) | 12 | Open/editable | Locked default |
-| Passenger Density: Low Floor (Pass/m^2) | 3 | Locked Calc | Locked default |
-| Passenger Density: Semi Low Floor (Pass/m^2) | 2.2 | Locked Calc | Locked default |
-| Passenger Density: Raised Floor (Pass/m^2) | 1.4 | Locked Calc | Locked default |
-| Calculated Passenger Number | Calculation | Locked Calc | Locked Calc |
-| U-Values W/(K\*m^3) | Calculation | Locked Calc | Locked Calc |
-| Heating Boundary Temperature (oC) | 18 | Open/editable | Locked default |
-| Cooling Boundary Temperature (oC) | 23 | Open/editable | Locked default |
-| Temperature at which cooling turns OFF | 17 | Locked default | |
-| High Ventilation (l/h) | 20 | Open/editable | Locked default |
-| How Ventilation (l/h) | 7 | Open/editable | Locked default |
-| High (m^3/h) | Calculation | Locked Calc | Locked Calc |
-| low (m^3/h) | Calculation | Locked Calc | Locked Calc |
-| High Vent Power (W) | Calculation | Locked Calc | Locked Calc |
-| Low Vent Power (W) | Calculation | Locked Calc | Locked Calc |
-| Specific Ventilation Power (Wh/m3) | 0.56 | Open/editable | Locked default |
-| Aux. Heater Efficiency | 0.84 | Open/editable | Locked default |
-| GCV (Diesel / Heating oil) (kwh/kg) | 11.8 | Open/editable | Locked default |
-| Window Area per Unit Bus Length (m^2/m) | Calculation | Locked Calc | Locked Calc |
-| Front + Rear Window Area (m^2) | Calculation | Locked Calc | Locked Calc |
-| Max Temperature Delta for low Floor Busses (K) | 3 | Open/editable | Locked default |
-| Max Possible Benefit from Technology List (Fraction) | 0.5 | Open/editable | Locked default |
-
-**INP - Other**
-
-*Enviromental Conditions*
-
-| Category/Input | Default value | Engineering | Declaration |
-|----------------|---------------|-------------|-------------|
-| Enviromental Temperature (oC) | 25 | Open/editable | Locked default |
-| Solar (W/m²) | 400 | Open/editable | Locked default |
-| Batch-mode | ON | Open/editable | Locked default |
-| Environmental Conditions Database | TBC Default | Open/editable | Locked default |
-
-*AC-system*
-
-| Category/Input | Default value | Engineering | Declaration |
-|----------------|---------------|-------------|-------------|
-| AC-compressor type | 2-stage (0/100) | Open/editable | Open/OEM data |
-| AC-compressor type (Mechanical / Electrical) | Calculation | Locked Calc | Locked Calc |
-| AC-compressor capacity (kW) | 18 | Open/editable | Locked default |
-| COPCool | 3.50 | Locked Calc | Locked Calc |
-
-*Ventilation*
-
-| Category/Input | Default value | Engineering | Declaration |
-|----------------|---------------|-------------|-------------|
-| Ventilation during heating | Yes | Open/editable | Locked default |
-| Ventilation when both Heating and AC are inactive | Yes | Open/editable | Locked default |
-| Ventilation during AC | Yes | Open/editable | Locked default |
-| Ventilation flow setting when both Heating and AC are inactive | High | Open/editable | Locked default*** |
-| Ventilation during Heating | High | Open/editable | Locked default*** |
-| Ventilation during Cooling | High | Open/editable | Locked default*** |
-
-*Aux. Heater*
-
-| Category/Input | Default value | Engineering | Declaration |
-|----------------|---------------|-------------|-------------|
-| Fuel Fired Heater (kW) | 30 | Open/editable | Open/OEM data |
-
-*TechList Input**
-
-*Insulation*
-
-| Category/Input | Default value | Engineering | Declaration |
-|----------------|---------------|-------------|-------------|
-| Double-glazing | TF5 table* | Open/editable | Tick box only |
-| Tinted windows | TF5 table* | Open/editable | Tick box only |
-
-*Ventilation*
-
-| Category/Input | Default value | Engineering | Declaration |
-|----------------|---------------|-------------|-------------|
-| Fan controll strategy | TF5 table* | Open/editable | Tick box only |
-
-*Heating*
-
-| Category/Input | Default value | Engineering | Declaration |
-|----------------|---------------|-------------|-------------|
-| Heat pump systems | TF5 table* | Open/editable | Tick box only |
-| Adjustable coolant thermostat | TF5 table* | Open/editable | Tick box only |
-| Adjustable auxiliary heater | TF5 table* | Open/editable | Tick box only |
-| Engine waste-gas heat exchanger | TF5 table* | Open/editable | Tick box only |
-
-*Cooling*
-
-| Category/Input | Default value | Engineering | Declaration |
-|----------------|---------------|-------------|-------------|
-| Separate air distribution ducts | TF5 table* | Open/editable | Tick box only |
-
-**Notes: **
-
- \* Default parameter values for Technology List from ACEA TF5 proposal
-
-
-
-** Tinted Window: G-Factor/g-value (= "solar factor" = "total solar energy transmittance") according ISO 9050. ISO 9050 defines wind speed at the outside surface of 14 km/h.
-
-Definition of bins for transmission rates according to ACEA TF5 recommendation:
-
-| g-value | bonus |
-|---------|-------|
-| < 0,1 | To be simulated with g = 0,05 |
-| 0,11 – 0,20 | To be simulated with g = 0,15 |
-| 0,21 – 0,30 | To be simulated with g = 0,25 |
-| 0,31 – 0,40 | To be simulated with g = 0,35 |
-| 0,41 – 0,50 | To be simulated with g = 0,45 |
-| 0,51 – 0,60 | To be simulated with g = 0,55 |
-| 0,61 – 0,70 | To be simulated with g = 0,65 |
-| 0,71 – 0,80 | To be simulated with g = 0,75 |
-| 0,81 – 0,90 | To be simulated with g = 0,85 |
-| 0,91 - 1 | To be simulated with g = 0,95 |
-
-*** Air Flow Rate: recommended for future implementation in Declaration mode by ACEA TF5:
-
-| Phase | With thermal comfort roof mounted system | Without thermal comfort roof mounted system |
-|-------|------------------------------------------|---------------------------------------------|
-| **Cooling** | High (20x internal volume / h) | Low (7x internal volume / h) |
-| **Ventilation** | High (20x internal volume / h) | Low (7x internal volume / h) |
-| **Heating** | High (10x internal volume / h) | Low (7x internal volume / h)
-
-###File Format
-
-The HVAC SSM (.ahsm) and Bus Parameter Database (.abdb) files use the VECTO CSV format.
-
diff --git a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
index 6a5a08a627622e0672e782bd72effd03b6460890..1b8b90ace982692d466476babc29a10fcfecce87 100644
--- a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
+++ b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
@@ -22,26 +22,35 @@ Make and Model
Inertia \[kgm²\]
: Rotational inertia of the gearbox (constant for all gears). (Engineering mode only)
-Continuous Power \[W\]
-: The nominal power the electric machine can provide continuously
+Continuous Torque \[Nm\]
+: The nominal torque the electric machine can provide continuously
-Rated Speed (cont. Pwr) \[rpm\]
-: Speed applied when determining the continuous power. Used for determining the continuous losses in the overload model
+Test Speed Continous Torque \[rpm\]
+: Angular speed at which the continouos torque can be provided
-Peak Performance Time \[s\]
+Overload Torque \[Nm\]
+: Maximum torque above the continuous torque the electric motor can provide for a certain time
+
+Test Speed Overload Torque \[rpm\]
+: Angular speed at which the overload torque was measured
+
+Overload Duration \[s\]
: The time interval the electric machine can operate at its peak performance
Thermal Overload Recovery Factor
: The accumulated overload energy has to be below the max. overload capacity multiplied by this factor so that the peak power is available again.
-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))
+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))
+: 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 volatge levels.
+
+Voltage Level Low/High
+: Applicable voltage level for the electric power consumption map and max drive/generation torque curve
diff --git a/Documentation/User Manual/1-user-interface/M_BatteryPackEditor.md b/Documentation/User Manual/1-user-interface/M_BatteryPackEditor.md
index 6c21e6099e3b4397cc14f5bf1fa2348d5738454e..d43434ce63c3ca2a87979349f0d5c0745ee7b4b8 100644
--- a/Documentation/User Manual/1-user-interface/M_BatteryPackEditor.md
+++ b/Documentation/User Manual/1-user-interface/M_BatteryPackEditor.md
@@ -55,7 +55,7 @@ The Chart Area displays the battery's internal voltage (blue) and the internal r
Make and Model
: Free text defining the model, type, etc.
-Capacity \[F\]
+Capacitance \[F\]
: Nominal capacity of the capacitor
Min Voltage \[V\]
diff --git a/Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md b/Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md
index 1efff08b14a8225ee4d0b37a3ffde9758f7d76d8..a83b9288b127c4df46156702cb25a6f0186188d0 100644
--- a/Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md
+++ b/Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md
@@ -1,11 +1,6 @@
##Driver: Overspeed
-
-Both functions control the vehicle's behaviour on uneven road sections (slope ≠0) and can be configured in the [Job File](#job-file)'s Driver Assist Tab. Overspeed is designed to model an average driver's behaviour without the aid of driver assistance systems. Eco-Roll represents an optional driver assistance feature. For this reason vehicles without Eco-Roll should always have the Overspeed function enabled.
-
-
-###Overspeed
-
+Overspeed controls the vehicle's behaviour on uneven road sections (slope ≠0) and can be configured in the [Job File](#job-file)'s Driver Assist Tab. Overspeed is designed to model an average driver's behaviour without the aid of driver assistance systems. Eco-Roll represents an optional driver assistance feature. For this reason vehicles without Eco-Roll should always have the Overspeed function enabled.
Overspeed activates as soon as the total power demand at the wheels (Pwheel) falls below zero, i.e. the vehicle accelerates on a negative slope. The clutch remains closed, engine in motoring operation, and the vehicle accelerates beyond the cycle's target speed. When the speed limit (target speed plus **Max. Overspeed**) is reached the mechanical brakes are engaged to prevent further acceleration.
@@ -67,9 +62,9 @@ In Declaration Mode the energy demand of all auxiliaries except the engine cooli
**Auxiliary energy demand**
In Engineering Mode the energy demand of the auxiliaries can be specified for the cases:
- - ICE on
- - ICE off, vehicle standstill
- - ICE off, vehicle driving
+ - ICE on
+ - ICE off, vehicle standstill
+ - ICE off, vehicle driving
</div>
@@ -92,7 +87,12 @@ In Declaration Mode the energy demand of all auxiliaries is applied in the fuel
<div class="engineering">
**Auxiliary energy demand**
-In Engineering Mode the energy demand of all auxiliaries is assumed to be drawn also during engine-off periods and the fuel consumption is corrected in a post-processing step.
+In Engineering Mode the energy demand for the different states
+ - ICE on
+ - Vehicle driving, ICE off
+ - Vehicle standstill, ICE off
+
+can be specified. When the ICE is on, the auxiliary energy demand is directly applied. The auxiliary energy demand during ICE-off phases is [corrected in post-processing](#engine-fuel-consumption-correction).
</div>
diff --git a/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md b/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
index 752b107ad8c20294ceace0201ecaa0abdd5c9c29..2f65fef4a468ce39585b7201abe1bb0a6d5e82a9 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
+++ b/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
@@ -6,11 +6,11 @@ The final fuel consumption is corrected in a post-processing to reflect systems
As the energy demand of auxiliaries is modeled as an average power demand over the whole simulated cycle, the demand of certain auxiliaries during engine-off periods needs to be compensated during engine-on periods. This is done using the [Engine-Line approach](#engine-line-approach).
-During the simulation the combustion engine is allways off. In this phases the "missing" auxiliary demand is balanced in separate colums for the cases a) the ICE is really off, and b) the ICE would be on. This allows for an accurate correction of the fuel consumption taking into account that ESS is in reality not active in all possible cases due to e.g. auxiliary power demand, environmental conditions, etc.
+When either the driver model (eco-roll, engine stop/start) or the hybrid controller decides to turn off the combustion engine, it is fully off, i.e. the fuel consumption is 0 and no auxiliary power is provided. In this phases the "missing" auxiliary demand is balanced in separate colums for the cases a) the ICE is really off, and b) the ICE would be on. This allows for an accurate correction of the fuel consumption taking into account that ESS is in reality not active in all possible cases due to e.g. auxiliary power demand, environmental conditions, etc.
-A general goal is that the actual auxiliary demand matches the target auxiliary demand over the cycle. So in case the ICE is off, some systems still consume electric energy but no electric energy is created during ICE-off phases. Or in case of bus auxiliaries the total air demand is pre-calculated and thus leading to an average air demand over the cycle. During ICE-off phases, however, no compressed air is generated. This 'missing' compressed air is corrected in the post-processing.
+A general goal is that the actual auxiliary demand matches the target auxiliary demand over the cycle. So in case the ICE is off, some systems still consume electric energy but no electric energy is generated during ICE-off phases. Or in case of bus auxiliaries the total air demand is pre-calculated and thus leading to an average air demand over the cycle. During ICE-off phases, however, no compressed air is generated. This 'missing' compressed air is corrected in the post-processing.
-A utility factor (UF) considers that the ICE is not off in all cases. Therefore the fuel consumption for compensating the missing auxiliary demand consists of two parts. The first part considers the fuel consumption required for the 'missing' auxiliary demand if the ICE is really off. Here the according auxiliary energy demand is multiplied by the utility factor and the engine line. The second part considers the fuel consumption in case the ICE would not be switched off. Here the 'missing' auxiliary energy demand is multiplied by (1 - utility factor) and the engine line and the idle fuel consumption is added for time periods the ICE would be on.
+A utility factor (UF) considers that the ICE is not off in all cases. Therefore the fuel consumption for compensating the missing auxiliary demand consists of two parts. The first part considers the fuel consumption required for the 'missing' auxiliary demand if the ICE is really off. Here the according auxiliary energy demand is multiplied by the utility factor and the engine line. The second part considers the fuel consumption in case the ICE would not be turned off. Here the 'missing' auxiliary energy demand is multiplied by (1 - utility factor) and the engine line and the idle fuel consumption is added for time periods the ICE would be on.
For the post-processing two different utility factors are considered. One for ICE-off phases during vehicle standstill and one for ICE-off phases during driving.
@@ -71,7 +71,7 @@ air demand is calculated with an estimated cycle driving time, the first step is
The missing (or excessive) amout of air is transferred into mechanical energy demand using $k_\textrm{Air}$. This value depicts the delta energy demand for a certain delta compressed air.
$k_\textrm{Air}$ is derived from two points. on the one hand the compressor runs in idle mode, applying only the drag load and producing no compressed air and the second point is that the compressor
is always on, applying the always-on mechanical power demand and generating the maximum possible amount of compressed air.
-The mechanical energy is then corrected using the engineline.
+The mechanical energy is then corrected using the [engineline](#engine-fuel-consumption-correction) (below).
$\textrm{E\_busAux\_PS\_drag} = \sum_{\textrm{Nl\_busAux\_consumed}_i = \textrm{Nl\_busAux\_gen}_i}{\textrm{P\_busAux\_PS\_drag}\cdot dt}$
@@ -110,7 +110,7 @@ $$
####Bus Auxiliaries Correction -- Aux Heater
-The power demand for an additional fuel-fired heater is calculated in the post-processing. The HVAC steaty state model calculates the heating demand (weighted sum of different climatic conditions) and based on the engine's average waste heat over the cycle the power demand for the aux heater is calculated. The fuel consumption for the aux heater is only added for the main fuel:
+The power demand for an additional fuel-fired heater is calculated in the post-processing. The HVAC steaty state model calculates the heating demand (weighted sum of different climatic conditions) and based on the engine's average waste heat over the cycle the power demand for the aux heater is calculated. The fuel consumption for the aux heater is only added for the primary fuel:
$E_\textrm{ice,waste heat} = \sum_\textrm{fuels} FC_\textrm{final,sum}(fuel) * NCV_\textrm{fuel}$
diff --git a/Documentation/User Manual/3-simulation-models/Engine_Speed_Torque_limitations.md b/Documentation/User Manual/3-simulation-models/Engine_Speed_Torque_limitations.md
index 74f03f51517b3d260734f60996ff69a47508923e..ada33305df0b53e65fe31b920fa6d6002efff519 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_Speed_Torque_limitations.md
+++ b/Documentation/User Manual/3-simulation-models/Engine_Speed_Torque_limitations.md
@@ -1,5 +1,11 @@
-##Engine Torque and Engine Speed Limitations
+##Torque and Speed Limitations
+
+The torque and speeds in the powertrain can be limited by different components such as the gearbox, the electric motor or the combustion engine, depending on the powertrain configuration.
+
+Some additional limits can be defined in the vehicle configuration as described below.
+
+###Combustion engine limitations / Transmission Limiations
The engine's maximum speed and maximum torque may be limited by either the gearbox (due to mechanical constraints) or the vehicle control.
Engine torque limitations are modeled by limiting the engine full-load curve to the defined maximum torque, i.e., the original engine full-load curve is cropped at the defined maximum torque for a certain gear. Limits regarding the gearbox' maximum input speed are modeled by intersecting (and limiting) the upshift line with the max. input speed. In the last gear, where no upshifts are possible, the engine speed is limited to the gearbox' maximum input speed.
@@ -14,11 +20,11 @@ In Engineering Mode, speed and torque limits can be defined and will be effectiv
<div class="declaration">
In Declaration Mode, the following rules restrict the limitations of engine torque:
-###Transmission Input-Speed Limitations
+####Transmission Input-Speed Limitations
* Applicable for every gear
-###Transmission Torque Limitations
+####Transmission Torque Limitations
* For higher 50% of gears (i.e., gears 7 to 12 for a 12-gear transmission):
- Transmissions max torque > 90% of engine max torque: max. torque limitation *not* applicable (VECTO extrapolates loss-maps)
@@ -26,7 +32,7 @@ In Declaration Mode, the following rules restrict the limitations of engine torq
* For lower 50% of gears (i.e., gears 1 to 6 for a 12-gear transmission):
- Transmission torque limit is always applicable
-###Vehicle defined Torque Limitations
+####Vehicle defined Torque Limitations
* For higher 50% of gears (i.e., gears 7 to 12 for a 12-gear transmission):
- Torque limit > 95% of engine max torque: max. torque limitation *not* applicable (VECTO extrapolates loss-maps)
@@ -37,3 +43,47 @@ In Declaration Mode, the following rules restrict the limitations of engine torq
</div>
+###Electric Motor Limiations
+
+The electric motor's maximum drive and maximum recuperation curve can be overridden in the vehicle. Therefore, the same map for maximum drive and maximum recuperation needs to be provided. Such a limit directly overrides the eletric motors model parameters.
+
+###Vehicle Propulsion Limitations
+
+For hybrid electric vehicles the electric machine may provide additional torque to the powertrain and thus cause higher accelerations than a conventional vehicle. To limit such boosting by the electric motor.
+
+The input is the additional torque the electric motor is allowed to boost in addition to the ICE over ICE speed. Note: this boosting torque has to be provided from 0 rpm up to the max. ICE speed. The angular speed refers to the gearbox input shaft.
+
+
+####Example 1: No boosting
+
+
+
+The blue curve shows the ICE's full-load curve and the gray line represents the electric motors max drive torque.
+
+If the electric motor shall not be allowed to provide additional torque beyond the ICE's full-load curve the input for the boosting limitation looks as follows:
+
+~~~
+n [rpm] , T_drive [Nm]
+0 , 300
+599 , 300
+600 , 0
+2500 , 0
+~~~
+
+For speeds below idle speed the propulsion torque limit is set to the electric motor's maximum torque so that the vehicle can drive off without the combustion engine.
+
+####Example 2:
+
+
+
+In this example the electric motor is allowed to provide torque in addition to the combustion engine (in this example 100Nm). The boosting limitation for this example looks as follows:
+
+~~~
+n [rpm] , T_drive [Nm]
+0 , 300
+599 , 300
+600 , 100
+2500 , 100
+~~~
+
+For speeds above approx. 1700 rpm, the propulsion torque limit is limited by the electric motor's max drive curve as the electric motor cannot provide the allowed 100 Nm at this high angular speed.
diff --git a/Documentation/User Manual/3-simulation-models/Vehicle_CrossWindCorrection.md b/Documentation/User Manual/3-simulation-models/Vehicle_CrossWindCorrection.md
index 8a5069cfa5e7bd2b827a97e8a8d8c26da43e348c..0abf8e126dbf06170bd0ab506657e52e08998f41 100644
--- a/Documentation/User Manual/3-simulation-models/Vehicle_CrossWindCorrection.md
+++ b/Documentation/User Manual/3-simulation-models/Vehicle_CrossWindCorrection.md
@@ -32,7 +32,7 @@ The following table gives the coefficients per vehicle type:
In a pre-processing step VECTO calculates the function for $C_dA$ value as a function of vehicle speed. This is done by integration of all possible directions of the ambient wind from ground level to maximum vehicle height considering the boundary layer effect based on the following formulas:
-$C_{d,v}A(v_{veh}) = \frac{1}{2 \pi v_{veh}^2 h_{veh}}\int_{\alpha = 0°}^{\alpha = 360°}{\int_{h=0}^{h=h_{veh}}{C_dA(\beta)\cdot v_{air}(h, \alpha)^2} \text{d}h\ \text{d}\alpha}$
+$C_{d,v}A(v_{veh}) = \frac{1}{2 \pi v_{veh}^2 h_{veh}}\int_{\alpha = 0^{\circ}}^{\alpha = 360^{\circ}}{\int_{h=0}^{h=h_{veh}}{C_dA(\beta)\cdot v_{air}(h, \alpha)^2} \textit{d}h\ \textit{d}\alpha}$
$v_{air}(h) = \sqrt{(v_{wind}(h)\cdot\cos\alpha + v_{veh})^2 + (v_{wind}(h)\cdot\sin\alpha)^2}$
diff --git a/Documentation/User Manual/pics/VECTO_ElectricMotor.png b/Documentation/User Manual/pics/VECTO_ElectricMotor.png
index 62303f57c3c8f33514b5295e0fa9974fbf6f3d17..7704b12fc25adadd86a52e4ee24538920d5e4d90 100644
Binary files a/Documentation/User Manual/pics/VECTO_ElectricMotor.png and b/Documentation/User Manual/pics/VECTO_ElectricMotor.png differ
diff --git a/Documentation/User Manual/pics/VECTO_SuperCap.png b/Documentation/User Manual/pics/VECTO_SuperCap.png
index 9cbe502101ec9eec03e21ecabe2848c99950616e..af592016e7eafd61d79f7be36079c2728c49a3c3 100644
Binary files a/Documentation/User Manual/pics/VECTO_SuperCap.png and b/Documentation/User Manual/pics/VECTO_SuperCap.png differ