adding more fields for torque converter to mod-data

VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs

@@ -328,15 +328,28 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 		/// </summary>
 		[ModalResultField(typeof(double), name: "TCmu")] TorqueConverterTorqueRatio,
 
+		[ModalResultField(typeof(SI), "P_TC_out [kW]", outputFactor: 1e-3)] P_TC_out,
+		[ModalResultField(typeof(SI), "P_TC_loss [kW]", outputFactor: 1e-3)] P_TC_loss,
+
+		/// <summary>
+		///     [Nm]	Torque converter output torque
+		/// </summary>
+		[ModalResultField(typeof(SI), "T_TC_out")] TC_TorqueOut,
+
+		/// <summary>
+		///     [1/min]	Torque converter output speed
+		/// </summary>
+		[ModalResultField(typeof(SI), "n_TC_out")] TC_angularSpeedOut,
+
 		/// <summary>
 		///     [Nm]	Torque converter output torque
 		/// </summary>
-		[ModalResultField(typeof(SI))] TC_M_Out,
+		[ModalResultField(typeof(SI), "T_TC_out")] TC_TorqueIn,
 
 		/// <summary>
 		///     [1/min]	Torque converter output speed
 		/// </summary>
-		[ModalResultField(typeof(SI))] TC_n_Out,
+		[ModalResultField(typeof(SI), "n_TC_out")] TC_angularSpeedIn,
 
 		/// <summary>
 		///     [m]	Altitude

VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs

@@ -124,12 +124,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		protected override void DoWriteModalResults(IModalDataContainer container)
 		{
 			if (CurrentState.OperatingPoint == null) {
-				//container[ModalResultField.TorqueConverterTorqueRatio] = 1.0;
-				//container[ModalResultField.TorqueConverterSpeedRatio] = 1.0;
+				container[ModalResultField.TorqueConverterTorqueRatio] = 1.0;
+				container[ModalResultField.TorqueConverterSpeedRatio] = 1.0;
 			} else {
 				container[ModalResultField.TorqueConverterTorqueRatio] = CurrentState.OperatingPoint.TorqueRatio;
 				container[ModalResultField.TorqueConverterSpeedRatio] = CurrentState.OperatingPoint.SpeedRatio;
 			}
+			container[ModalResultField.TC_TorqueIn] = CurrentState.InTorque;
+			container[ModalResultField.TC_TorqueOut] =CurrentState.OutTorque;
+			container[ModalResultField.TC_angularSpeedIn] =CurrentState.InAngularVelocity;
+			container[ModalResultField.TC_angularSpeedOut] = CurrentState.OutAngularVelocity;
+
+			var avgOutVelocity = (PreviousState.OutAngularVelocity + CurrentState.OutAngularVelocity) / 2.0;
+			var avgInVelocity = (PreviousState.InAngularVelocity + CurrentState.InAngularVelocity) / 2.0;
+			container[ModalResultField.P_TC_out] = CurrentState.OutTorque * avgOutVelocity;
+			container[ModalResultField.P_TC_loss] = CurrentState.InTorque * avgInVelocity - CurrentState.OutTorque * avgOutVelocity;
 		}
 
 		protected override void DoCommitSimulationStep()

VectoCore/VectoCore/OutputData/ModalDataContainer.cs

@@ -133,8 +133,19 @@ namespace TUGraz.VectoCore.OutputData
 				ModalResultField.P_eng_drag,
 				ModalResultField.P_eng_inertia,
 				ModalResultField.P_eng_out,
-				ModalResultField.P_clutch_loss,
-				ModalResultField.P_clutch_out,
+			});
+			if (HasTorqueConverter) {
+				dataColumns.AddRange(new[] {
+					ModalResultField.P_TC_loss,
+					ModalResultField.P_TC_out,
+				});
+			} else {
+				dataColumns.AddRange(new[] {
+					ModalResultField.P_clutch_loss,
+					ModalResultField.P_clutch_out,
+				});
+			}
+			dataColumns.AddRange(new[] {
 				ModalResultField.P_aux
 			});
 
@@ -164,8 +175,10 @@ namespace TUGraz.VectoCore.OutputData
 					dataColumns.AddRange(new[] {
 						ModalResultField.TorqueConverterSpeedRatio,
 						ModalResultField.TorqueConverterTorqueRatio,
-						ModalResultField.TC_M_Out,
-						ModalResultField.TC_n_Out
+						ModalResultField.TC_TorqueOut,
+						ModalResultField.TC_angularSpeedOut,
+						ModalResultField.TC_TorqueIn,
+						ModalResultField.TC_angularSpeedIn,
 					});
 				}
 			}