Merge branch 'origin_mq/feature/VECTO-1590-implement-ihpc-powertrain-architecture' into feature/VECTO-1579-create-json-filewriter-for-iepc

# Conflicts:
#	VECTO/GUI/MainForm.Designer.vb
#	VECTO/GUI/VectoJobForm.vb
#	VECTO/GUI/VehicleForm.Designer.vb
#	VECTO/GUI/VehicleForm.vb

Franz KOBER josef authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/fk_vecto-dev from feature/VECTO-1579-create-json-filewriter-for-iepc to develop

* commit '0db9cc49':
  solved some merge conflicts

Merge branch 'feature/VECTO-1590-implement-ihpc-powertrain-architecture' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1590-implement-ihpc-powertrain-architecture

Franz KOBER josef authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/fk_vecto-dev from feature/VECTO-1579-create-json-filewriter-for-iepc to develop

* commit '0f58ed03':
  fixed some typos
  fixed typo
  fixed merge conflict
  added json file writer for IEPC
  comment out json writer class
  finished first version of IEPC GUI
  removed iepc from other job menus
  rewrite IEPCInputData
  extended tool menu
  added validation methods and adjusted iepc gui
  typo
  added missing button code at EM-Form
  added additional iepc gui code
  added gui code
  started with IEPC GUI
  added some space at electric motor title
  Split Electric Powertrain Componetns Tab into Electric Machine and REESS Tab

# Conflicts:
#	VECTO/File Browser/FileBrowserModule.vb
#	VECTO/GUI/MainForm.Designer.vb
#	VECTO/GUI/MainForm.vb
#	VECTO/GUI/VehicleForm.Designer.vb
#	VECTO/GUI/VehicleForm.vb
#	VectoCommon/VectoCommon/InputData/EngineeringInputData.cs

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1590-implement-ihpc-powertrain-architecture to develop

* commit '0cdc4228':
  update testdata for ihpc with 6speed transmission
  rename efficiencymaps in em-data, remove gear parameter in full-load curve lookup
  correcting testdata ihpc-6spd
  adding testcase for IHPC with 6speed gearbox
  moving testfiles to subdirectory
  started with IHPC gui
  added json writer for ihpc
  removed full load curve entry from input file
  first implementation if IHPC simulation
  adding testcase and testdata for a simple IHPC vehicle (modified P2 Group 5 Vehicle)

Merge branch 'feature/VECTO-1590-implement-ihpc-powertrain-architecture' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1590-implement-ihpc-powertrain-architecture

Merge branch 'feature/VECTO-1580-adapt-gui-to-edit-iepc-component-data' into feature/VECTO-1579-create-json-filewriter-for-iepc

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1592-corrected-lenght-for-busaux-volume-calculation-wrong to develop

* commit 'd86d7f17':
  buffix in calculation of drivetrain volume length
  adding testcase for correction length of all bus classes

Pull request #215: allow extrapolation of the ADC loss-map when analyzing different hybrid configurations and during dry-runs

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1586-adc-needs-unreasonable-efficiency-envelope to develop

* commit '13225618':
  allow extrapolation of the ADC loss-map when analyzing different hybrid configurations and during dry-runs

allow extrapolation of the ADC loss-map when analyzing different hybrid configurations and during dry-runs

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit 'fd2072f0':

* commit 'ae18de8f':
  engineering data adapter for IEPC-S

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1588-implement-iepc-s to develop

* commit 'b10e3d87':
  engineering data adapter for IEPC-S
  implement powertrain builder for IEPC-S, necessary adaptations for IEPC-S simulations
  correcting iepc-s testjobs
  removed no longer needed classes
  allow to run all jobs in IEPC tests
  started implementation of IEPC-S
  adding testcases for IEPC-S
  adding testdata for IEPC-S