Harald Martini authored 2 years ago and Markus Quaritsch committed 2 years ago

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

* commit 'bf8802c0':
  updated build targets, added mockup suffix

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

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1671-declaration-mode-for-xev-buses to develop

* commit 'de5f7ef8':
  fix testcase: wait on all threads only if execution is done multithreaded

# Conflicts:
#	VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs

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

* commit '2410fa86':
  updating expected file in testproject

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1728-typo-in-vectodeclarationdefinitions.2.4.xsd to develop

* commit '34cc9c4b':
  correctiing typo

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

* commit 'd102ae30':
  removing no longer needed project
  shortening path for mockup testcases (liked from vectoCoreTest
  flattening directory structure in JSON xEV testdata
  allow hybrid testruns also for xml jobs in declaration mode

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev to develop

* commit 'eae0a0f7': (38 commits)
  updating version number in release notes
  updating generic P2 vehicle
  fix: battery data adapter: input is in mOhm for XML, in Ohm for CSV
  change in post-processing correction: EC_el_soc/final = 0 for charge depleting simulations
  correcting generic vehicles: internal resistance for batteries in XML files is in mOhm
  deleted console.writeline in LookupData
  update zip name (again)
  changed zip file name of nuget zip
  updated release notes
  bugfix creating relative path with space: remove escape characters (%20)
  bugfix saving declaration job
  update version number
  add missing model properties in testcase
  bugfix postprocessing: lookup vehicle operation only if necessary and mission is set to a declaration mission
  adding output field in vsum file: electric energy consumption considering re-charging losses for CD mode only
  remove generic ihpc jobs
  formatting generic XML declaration jobs, correct em-powermap (values in XML are in Watts), correct model data to avoid warning about negative overload buffer
  removing declaration files which are not needed
  adding generic XML jobs (xEV decl mode)
  combustion engine: only log info in case pt1 cannot be calculated in dryrun
  ...

bugfix postprocessing: lookup vehicle operation only if necessary and mission is set to a declaration mission

adding output field in vsum file: electric energy consumption considering re-charging losses for CD mode only

formatting generic XML declaration jobs, correct em-powermap (values in XML are in Watts), correct model data to avoid warning about negative overload buffer

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev