From 12a9332173ba4bc7e6e131a39f51acc0a6373e4e Mon Sep 17 00:00:00 2001 From: Lei Qiao Date: Thu, 8 Oct 2015 15:38:44 -0500 Subject: [PATCH] refactor TrilonosWrapper::PreconditionAMG::initialize --- source/lac/trilinos_precondition_ml.cc | 41 +++++++++++++------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/source/lac/trilinos_precondition_ml.cc b/source/lac/trilinos_precondition_ml.cc index 32bd5f82b4..df79ff867b 100644 --- a/source/lac/trilinos_precondition_ml.cc +++ b/source/lac/trilinos_precondition_ml.cc @@ -182,33 +182,32 @@ namespace TrilinosWrappers if (constant_modes_dimension > 0) { - const size_type n_rows = n_global_rows(matrix); - const bool constant_modes_are_global = - additional_data.constant_modes[0].size() == n_rows; - const size_type n_relevant_rows = - constant_modes_are_global ? n_rows : additional_data.constant_modes[0].size(); - const size_type my_size = domain_map.NumMyElements(); - if (constant_modes_are_global == false) - Assert (n_relevant_rows == my_size, - ExcDimensionMismatch(n_relevant_rows, my_size)); - Assert (n_rows == + const size_type global_size = n_global_rows(matrix); + Assert (global_size == static_cast(global_length(distributed_constant_modes)), - ExcDimensionMismatch(n_rows, + ExcDimensionMismatch(global_size, global_length(distributed_constant_modes))); - - (void)n_relevant_rows; - (void)global_length; + const bool constant_modes_are_global + = additional_data.constant_modes[0].size() == global_size; + const size_type my_size = domain_map.NumMyElements(); // Reshape null space as a contiguous vector of doubles so that // Trilinos can read from it. + const size_type expected_mode_size = + constant_modes_are_global ? global_size : my_size; for (size_type d=0; d