From 98b703aa2d0a584646804fb9a022d533791ad60b Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 29 Aug 2016 11:56:23 +0200
Subject: [PATCH] VSUM: Corrected wrong P_TC_loss column
---
.../VectoCore/Models/Simulation/Data/ModalResult.cs | 9 ++++-----
VectoCore/VectoCore/OutputData/IModalDataContainer.cs | 4 ++--
VectoCore/VectoCore/OutputData/SummaryDataContainer.cs | 5 ++---
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs b/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
index 429ba2493a..3aa7a3e484 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
@@ -329,6 +329,10 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
[ModalResultField(typeof(double), name: "TCmu")] TorqueConverterTorqueRatio,
[ModalResultField(typeof(SI), "P_TC_out [kW]", outputFactor: 1e-3)] P_TC_out,
+
+ /// <summary>
+ /// [kW] Power loss at the torque converter.
+ /// </summary>
[ModalResultField(typeof(SI), "P_TC_loss [kW]", outputFactor: 1e-3)] P_TC_loss,
/// <summary>
@@ -351,11 +355,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
/// </summary>
[ModalResultField(typeof(SI), "n_TC_in")] TC_angularSpeedIn,
- /// <summary>
- /// [kW] Power loss at the torque converter.
- /// </summary>
- [ModalResultField(typeof(SI), caption: "P_tc_loss [kW]", outputFactor: 1e-3)] P_tc_loss,
-
/// <summary>
/// [m] Altitude
/// </summary>
diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
index a057334de6..49e825daa1 100644
--- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
@@ -246,7 +246,7 @@ namespace TUGraz.VectoCore.OutputData
public static WattSecond WorkTorqueConverter(this IModalDataContainer data)
{
- return data.TimeIntegral<WattSecond>(ModalResultField.P_tc_loss);
+ return data.TimeIntegral<WattSecond>(ModalResultField.P_TC_loss);
}
public static Second Duration(this IModalDataContainer data)
@@ -317,7 +317,7 @@ namespace TUGraz.VectoCore.OutputData
public static Watt PowerTorqueConverter(this IModalDataContainer data)
{
- return data.TimeIntegral<WattSecond>(ModalResultField.P_tc_loss) / data.Duration();
+ return data.TimeIntegral<WattSecond>(ModalResultField.P_TC_loss) / data.Duration();
}
public static Watt PowerWheelPositive(this IModalDataContainer data)
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index 9b5ac0d7b5..5f9fc989dd 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -132,9 +132,7 @@ namespace TUGraz.VectoCore.OutputData
FCAAUX_H, FCAAUX_KM, FCFINAL_H, FCFINAL_KM, FCFINAL_LITERPER100KM, FCFINAL_LITERPER100TKM, CO2_KM, CO2_TKM,
P_WHEEL_POS, P_BRAKE_LOSS, P_ANGLE_LOSS, P_TC_LOSS, P_CLUTCH_POS, P_CLUTCH_NEG, P_FCMAP_POS, E_AUX, E_AIR, E_ROLL,
E_GRAD, E_INERTIA, E_BRAKE, E_GBX_AXL_LOSS, E_RET_LOSS, E_TC_LOSS, E_ANGLE_LOSS, E_CLUTCH_POS, E_CLUTCH_NEG,
- E_FCMAP_POS, ACC,
- ACC_POS,
- ACC_NEG, ACC_TIMESHARE, DEC_TIMESHARE, CRUISE_TIMESHARE, STOP_TIMESHARE
+ E_FCMAP_POS, ACC, ACC_POS, ACC_NEG, ACC_TIMESHARE, DEC_TIMESHARE, CRUISE_TIMESHARE, STOP_TIMESHARE
}.Select(x => new DataColumn(x, typeof(SI))).ToArray());
}
@@ -227,6 +225,7 @@ namespace TUGraz.VectoCore.OutputData
row[P_BRAKE_LOSS] = modData.PowerBrake().ConvertTo().Kilo.Watt;
row[P_ANGLE_LOSS] = modData.PowerAngle().ConvertTo().Kilo.Watt;
+
row[P_TC_LOSS] = modData.PowerTorqueConverter().ConvertTo().Kilo.Watt;
row[P_CLUTCH_POS] = modData.EnginePowerPositiveAverage().ConvertTo().Kilo.Watt;
--
GitLab