Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

# Conflicts:
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/BatteryElectricMotorController.cs

Michael KRISPER authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:feature/VECTO-1540-axlegearinputretarder to develop

* commit '78589981': (93 commits)
  AbstractSimulationDataAdapter.SetCommonRetarderData: moved access to ratio back to the place when we are sure that the retarder exists.
  RetarderTest: Added additional test for creation of different retarder types and powertrainPositions
  AbstractSimulationDataAdapter: Added check for correct retarder positions
  JSONRetarderInputData: Removed check if retarder is allowed. Now it just reads the retarder, if it is defined in the file.
  Removed DummyRetarder
  UserManual: Added Axelgear Input Retarder in description
  JSONInputData: minor formatting
  JsonFileWriter: Reformated file and refactored to use collectioninitializer syntax
  Gearbox.vb: MockEngineeringVehicle: Removed readonly from VehicleType to set it in initializer
  VectoJob.vb: Corrected bug when gearboxInputData is nothing (e.g. E3)
  VectoJobForm: Corrected bug when GearboxInputData is empty (e.g. E3)
  BatteryElectricMotorController: Corrected Bug when GearboxModelData is null (e.g. E3)
  Added E3 and S3 Tests for Retarder
  BatteryElectricTest: Added Retarder to test cases
  Added example retarder in test case
  Formatting
  Code Formatting
  Added retarder test data
  merge again
  Resolve Conflicts while merge
  ...

AbstractSimulationDataAdapter.SetCommonRetarderData: moved access to ratio back to the place when we are sure that the retarder exists.

RetarderTest: Added additional test for creation of different retarder types and powertrainPositions

JSONRetarderInputData: Removed check if retarder is allowed. Now it just reads the retarder, if it is defined in the file.

handle the case that in the first simulation interval (if the vehicle does not start from standstill) no sulution is available
aa

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1564-xml-schema-adaptations to develop

* commit '3458680f':
  update sample data and testdata: remove torque limits element for HEV-S and PEV sample files
  bugfix xml schema for vehicles: no boosting limits for HEV-IEPC-S, not Engien Torque Limits for PEV, HEV-S, HEV-IEPC-S

bugfix xml schema for vehicles: no boosting limits for HEV-IEPC-S, not Engien Torque Limits for PEV, HEV-S, HEV-IEPC-S

bugfix for serial and pue electric vehicles: GearboxData.DisengageWhenHalting speed is not available - use constant as before

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1563-electric-motor-derating-calculation to develop

* commit '60e1ed95':
  update user manual on electric motor
  limit thermal buffer to the overload buffer (i.e., overload can't go above 100%)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1456-cycle-cache-in-engineering-mode to develop

* commit '958249d7':
  add modification date in cycle cache of engineering mode vecto rundata factory

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1559-battery-internal-resistance-curve to develop

* commit '44c35f76':
  bugfix reading internal resistance curve with 5 columns
  adding testcase reading internal resistance with 5 columns (R_i 120s)