added MODFile fields for angular gear: P_angle_in, P_angle_loss

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

@@ -245,6 +245,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 		/// </summary>
 		[ModalResultField(typeof(SI), name: "Ploss Diff", caption: "P_axle_loss [kW]", outputFactor: 1e-3)] P_axle_loss,
 
+		/// <summary>
+		///     [kW]	Losses in angle transmission.
+		/// </summary>
+		[ModalResultField(typeof(SI), name: "Ploss Angle", caption: "P_angle_loss [kW]", outputFactor: 1e-3)] P_angle_loss,
+
 		/// <summary>
 		///     [kW]	Retarder losses.
 		/// </summary>
@@ -291,6 +296,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 
 		[ModalResultField(typeof(SI), caption: "P_axle_in [kW]", outputFactor: 1e-3)] P_axle_in,
 
+		[ModalResultField(typeof(SI), caption: "P_angle_in [kW]", outputFactor: 1e-3)] P_angle_in,
+
 		[ModalResultField(typeof(SI), caption: "P_ret_in [kW]", outputFactor: 1e-3)] P_retarder_in,
 
 		[ModalResultField(typeof(SI), caption: "P_gbx_in [kW]", outputFactor: 1e-3)] P_gbx_in,

VectoCore/VectoCore/Models/SimulationComponent/Impl/AngularGear.cs

 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Models.Simulation;
+using TUGraz.VectoCore.Models.Simulation.Data;
 using TUGraz.VectoCore.Models.SimulationComponent.Data;
 using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
 using TUGraz.VectoCore.OutputData;
 
 namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 {
-	// todo mk-2016-07-12: add dummy angular gear?
-
 	public class AngularGear : TransmissionComponent
 	{
 		public AngularGear(IVehicleContainer container, AngularGearData modelData) : base(container, modelData.AngularGear) {}
@@ -23,10 +22,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		protected override void DoWriteModalResults(IModalDataContainer container)
 		{
-			//todo mk 2016-07-12: write angular gear modal results
 			var avgAngularVelocity = (PreviousState.InAngularVelocity + CurrentState.InAngularVelocity) / 2.0;
-			//container[ModalResultField.P_axle_loss] = (CurrentState.InTorque - CurrentState.OutTorque / ModelData.Ratio) *avgAngularVelocity;
-			//container[ModalResultField.P_axle_in] = CurrentState.InTorque * avgAngularVelocity;
+			container[ModalResultField.P_angle_loss] = (CurrentState.InTorque - CurrentState.OutTorque / ModelData.Ratio) *
+														avgAngularVelocity;
+			container[ModalResultField.P_angle_in] = CurrentState.InTorque * avgAngularVelocity;
 		}
 	}
 }
\ No newline at end of file

VectoCore/VectoCore/OutputData/ModalDataContainer.cs

@@ -142,6 +142,8 @@ namespace TUGraz.VectoCore.OutputData
 					ModalResultField.P_gbx_inertia,
 					ModalResultField.P_retarder_in,
 					ModalResultField.P_ret_loss,
+					ModalResultField.P_angle_in,
+					ModalResultField.P_angle_loss,
 					ModalResultField.P_axle_in,
 					ModalResultField.P_axle_loss,
 					ModalResultField.P_brake_in,