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

(cherry picked from commit 7e4750d4)

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

(cherry picked from commit 1072afa7)

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

(cherry picked from commit 7fafd126)

Pull request #275: adding correct battery charging efficiency calculation for PEV range /energy consumption calc

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1651-result-generation-method-for-xml to develop

* commit 'fe2bdc52':
  adding correct battery charging efficiency calculation for PEV range /energy consumption calc

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

* commit '0f5ced0b':
  Results sorting for hashing + testcases and test files Elements in results now get sorted. Results by Mission and Total Vehicle Mass Other Elements that get sorted: Electric Consumption, FuelConsumption, CO2, Fuel Types, FC_ZEV_AuxHeater, Summary, OVC Mode, CO2_Zev_AuxHeater

Results sorting for hashing + testcases and test files

See merge request em/vecto-dev!6

Elements in results now get sorted.
Results by Mission and Total Vehicle Mass
Other Elements that get sorted:
Electric Consumption, FuelConsumption, CO2, Fuel Types, FC_ZEV_AuxHeater, Summary, OVC Mode, CO2_Zev_AuxHeater

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1651-result-generation-method-for-xml to develop

* commit 'ab99a2a5': (81 commits)
  refactoring CD/CS weighting, change calculation according to latest execl version
  adding testcase for PEV range calculation
  Adding testcase for calculating electric ranges (using mock data) finish implementation calculating weighted results (ovc/non-ovc)
  move initialization of result entry to result entry itself (new method in interface), remove setter in interface
  add calculating usable stored energy in battery
  implementation of realworld usage factors (ovc range calculation) implementation of weighted result (OVC + non-OVC run), extending/refactoring vehicle operation lookup tables implementation of summary calculation (ovc and non-OVC)
  create fullload curve before voltage level data for iepc
  added iepc to conditioning
  extrapolate iepc map with factor 1.2 from fld entry
  re-added debuggerhidden attribute in SI
  moved extrapolationfactor and ratedspeedgradientdelta to Constants
  added lookup class for medium lorry electric system
  added es-tech table for medium lorries
  enabled simulation for IEPC_E
  add epto and el aux to IEPC_E, IEPC_S
  cleaned tests
  enabled IEPC_S simulation (fails because of line search exception)
  use IIEPCDeclarationInput data in IEPCGearboxInputData helper class
  store subresponse in abstract response
  removed unit from REESS modalresult fields
  ...

finish implementation calculating weighted results (ovc/non-ovc)

move initialization of result entry to result entry itself (new method in interface), remove setter in interface

implementation of weighted result (OVC + non-OVC run), extending/refactoring vehicle operation lookup tables
implementation of summary calculation (ovc and non-OVC)

Merge remote-tracking branch 'IVT-GIT/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' into feature/VECTO-1651-result-generation-method-for-xml

# Conflicts:
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs
#	VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryFactory.cs
#	VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
#	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
#	VectoCore/VectoCoreTest/InputData/DeclarationDataAdapterTest/DeclarationDataAdapterTest.cs
#	VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1697_refactoring-shiftstrategy-startgeear to develop

* commit '286a6cb5':
  adding missing fields in the runData for some testcases
  extend rundata used in testcase, necessary to create test-powertrain
  regression fix after refactoring: use testpowertrain to get fulll-load power

Merge in VECTO/vecto-dev from VECTO/fk_vecto-dev:feature/VECTO-1640-e-motor-data-xev to develop

* commit '607eb1e8':
  added tests for generic data classes, minor adjustments
  Set the number of columns for the battery resistance depending on the battery type
  added class to generate generic super cap data
  added class to generate generic battery system data
  added class to generate generic IHPC
  introduced base class for common methods
  added class to generate generic IEPC
  adjusted generic rated point helper for iepc
  update generic maps
  Replacing data tables with structs for handling values
  added generic efficience map for IEPC  ASM and PSM electric machine type
  added class to create generic electric motor data
  added helper class to get rated point at electric motor full load curve

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1697_refactoring-shiftstrategy-startgeear to develop

* commit 'd0de88ca':
  remove no longer needed class
  refactoring updateComponent method: make sure only components on a testpowertrain are updated implemented this check in the base class for all components
  do not require a hybrid controller, so the test-powertrain class can be used for other purposes as well
  remove initialize method in gearbox that takes a gear as argument and issues a dry-run request with a different gear. this approach caused errors because the internal 'previous state' of components might be modified. instead, a separate simple test-powertrain is used to calculate the necessary values without altering the state of the actual powertrain
  bugfix in PCC preprocessor for IEPCs with integrated axlegear (axlegeardata is null)

implemented this check in the base class for all components

do not require a hybrid controller, so the test-powertrain class can be used for other purposes as well

remove initialize method in gearbox that takes a gear as argument and issues a dry-run request with a different gear.
this approach caused errors because the internal 'previous state' of components might be modified.
instead, a separate simple test-powertrain is used to calculate the necessary values without altering the state of the actual powertrain

(cherry picked from commit 571fe081)

Pull request #268: bugfix in PCC preprocessor for IEPCs with integrated axlegear (axlegeardata is null)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1695-adas-problems-in-vecto-0.7.9.2836 to develop

* commit '571fe081':
  bugfix in PCC preprocessor for IEPCs with integrated axlegear (axlegeardata is null)