From 9f3705b5180adc838eea381e048f7b203b999d3c Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Mon, 15 May 2023 17:46:39 +0200
Subject: [PATCH] bugfix: pass along ADC Lossmap
---
.../InputData/DeclarationInputData.cs | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 53a12ceda6..e152ab3587 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -853,6 +853,9 @@ namespace TUGraz.VectoCommon.InputData
public PowertrainPosition Position { get; set; }
private double? _ratioADC = null;
+
+ private TableData _lossMapADC = null;
+
/// <summary>
/// If not overridden RatioADC == ADC?.Ratio ?? 1;
/// Can only be overridden when ADC == null;
@@ -874,7 +877,21 @@ namespace TUGraz.VectoCommon.InputData
public double MechanicalTransmissionEfficiency { get; set; }
- public TableData MechanicalTransmissionLossMap { get; set; }
+ public TableData MechanicalTransmissionLossMap
+ {
+ get
+ {
+ if (_lossMapADC != null && ADC == null) {
+ return _lossMapADC;
+ } else {
+ return ADC?.LossMap;
+ }
+ }
+ set
+ {
+ _lossMapADC = value;
+ }
+ }
public IADCDeclarationInputData ADC {get; set; }
}
--
GitLab