diff --git a/VectoCore/VectoCore/OutputData/ModFilter/ActualModalDataFilter.cs b/VectoCore/VectoCore/OutputData/ModFilter/ActualModalDataFilter.cs index ea7cc01dd18eb173feea972ca3a41d260b13857d..ccff3a29eef8e774b6d55c58a0c34321a6db8b7d 100644 --- a/VectoCore/VectoCore/OutputData/ModFilter/ActualModalDataFilter.cs +++ b/VectoCore/VectoCore/OutputData/ModFilter/ActualModalDataFilter.cs @@ -71,6 +71,7 @@ namespace TUGraz.VectoCore.OutputData.ModFilter ModalResultField.P_gbx_inertia, ModalResultField.P_gbx_loss, ModalResultField.P_angle_loss, + ModalResultField.P_retarder_in, ModalResultField.P_ret_loss, ModalResultField.P_veh_inertia, ModalResultField.P_roll, @@ -86,7 +87,12 @@ namespace TUGraz.VectoCore.OutputData.ModFilter ModalResultField.P_angle_loss, ModalResultField.P_trac); - SetConstantValues(current, start, end, ModalResultField.FCMap); + SetConstantValues(current, start, end, + ModalResultField.FCMap, + ModalResultField.FCAUXc, + ModalResultField.FCAAUX, + ModalResultField.FCWHTCc, + ModalResultField.FCFinal); //--- results.Rows.Add(start); @@ -111,6 +117,9 @@ namespace TUGraz.VectoCore.OutputData.ModFilter } else if (field.GetDataType() == typeof(int)) { start[(int)field] = current.Field<int>((int)field); end[(int)field] = current.Field<int>((int)field); + } else if (field.GetDataType() == typeof(uint)) { + start[(int)field] = current.Field<uint>((int)field); + end[(int)field] = current.Field<uint>((int)field); } } } diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs index bfcbf49898ca707617d459e1f8498cbedff33b2c..b878cfc527f942b94e77d9bd6e7489d8a5253a1e 100644 --- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs @@ -166,6 +166,8 @@ namespace TUGraz.VectoCore.OutputData ModalResultField.P_air, ModalResultField.P_roll, ModalResultField.P_veh_inertia, + ModalResultField.n_gbx_out_avg, + ModalResultField.T_gbx_out }); if (HasTorqueConverter) {