Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 0e934967 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge pull request #490 in VECTO/vecto-sim from...

Merge pull request #490 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-552-set-engine-rated-power-rated-speed to master

* commit '77fd308a':
  use FLD values if declared speed/power are 0
parents e9900af1 77fd308a
No related branches found
No related tags found
No related merge requests found
......@@ -521,11 +521,11 @@ namespace TUGraz.VectoCore.OutputData
row[ENGINE_MANUFACTURER] = runData.EngineData.Manufacturer;
row[ENGINE_MODEL] = runData.EngineData.ModelName;
row[ENGINE_FUEL_TYPE] = runData.EngineData.FuelType.GetLabel();
row[ENGINE_RATED_POWER] = runData.EngineData.RatedPowerDeclared != null
row[ENGINE_RATED_POWER] = runData.EngineData.RatedPowerDeclared != null && runData.EngineData.RatedPowerDeclared > 0
? runData.EngineData.RatedPowerDeclared.ConvertTo().Kilo.Watt
: runData.EngineData.FullLoadCurves[0].MaxPower.ConvertTo().Kilo.Watt;
row[ENGINE_IDLING_SPEED] = runData.EngineData.IdleSpeed.AsRPM.SI<Scalar>();
row[ENGINE_RATED_SPEED] = runData.EngineData.RatedSpeedDeclared != null
row[ENGINE_RATED_SPEED] = runData.EngineData.RatedSpeedDeclared != null && runData.EngineData.RatedSpeedDeclared > 0
? runData.EngineData.RatedSpeedDeclared.AsRPM.SI<Scalar>()
: runData.EngineData.FullLoadCurves[0].RatedSpeed.AsRPM.SI<Scalar>();
row[ENGINE_DISPLACEMENT] = runData.EngineData.Displacement.ConvertTo().Cubic.Centi.Meter;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment