From f1bce61258f18cf00cc435be75dcc15a12b805f6 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Tue, 11 Feb 2020 18:35:17 +0100 Subject: [PATCH] Fix MueLu periodicity test --- tests/mpi/muelu_periodicity.cc | 12 ++++++------ ...elu=on.with_64bit_indices=off.mpirun=3.output | 16 ++++++++-------- ...elu=on.with_64bit_indices=off.mpirun=5.output | 16 ++++++++-------- ...elu=on.with_64bit_indices=off.mpirun=7.output | 16 ++++++++-------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/mpi/muelu_periodicity.cc b/tests/mpi/muelu_periodicity.cc index b70717adf0..5050cec963 100644 --- a/tests/mpi/muelu_periodicity.cc +++ b/tests/mpi/muelu_periodicity.cc @@ -323,10 +323,8 @@ namespace Step22 block_component[dim] = 1; DoFRenumbering::component_wise(dof_handler, block_component); - std::vector dofs_per_block(2); - DoFTools::count_dofs_per_fe_block(dof_handler, - dofs_per_block, - block_component); + std::vector dofs_per_block = + DoFTools::count_dofs_per_fe_block(dof_handler, block_component); const unsigned int n_u = dofs_per_block[0], n_p = dofs_per_block[1]; { @@ -387,8 +385,10 @@ namespace Step22 dof_handler, 2, 3, 1, periodicity_vector, Tensor<1, dim>(), matrix); DoFTools::make_periodicity_constraints>( - periodicity_vector, constraints, fe.component_mask(velocities)), - first_vector_components; + periodicity_vector, + constraints, + fe.component_mask(velocities), + first_vector_components); #endif } diff --git a/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=3.output b/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=3.output index aa60359f7a..28a69ac154 100644 --- a/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=3.output +++ b/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=3.output @@ -13,8 +13,8 @@ Refinement cycle 1 0.00000 0.562500 -1.77778 0.00000 0.00000 0.625000 -1.60000 0.00000 0.00000 0.687500 -1.45455 0.00000 -0.00000 0.750000 -1.33333 5.49010e-13 -0.00000 0.812500 -1.23077 2.80537e-13 +0.00000 0.750000 -1.33333 0.00000 +0.00000 0.812500 -1.23077 0.00000 0.00000 0.875000 -1.14286 0.00000 0.00000 0.937500 -1.06667 0.00000 @@ -28,13 +28,13 @@ Refinement cycle 2 0.00000 0.625000 -1.60000 0.00000 0.00000 0.656250 -1.52381 0.00000 0.00000 0.687500 -1.45455 0.00000 -0.00000 0.718750 -1.39130 1.95566e-17 -0.00000 0.750000 -1.33333 5.49063e-13 +0.00000 0.718750 -1.39130 0.00000 +0.00000 0.750000 -1.33333 0.00000 0.00000 0.781250 -1.28000 0.00000 -0.00000 0.812500 -1.23077 2.80586e-13 -0.00000 0.843750 -1.18519 1.69980e-17 +0.00000 0.812500 -1.23077 0.00000 +0.00000 0.843750 -1.18519 0.00000 0.00000 0.875000 -1.14286 0.00000 -0.00000 0.906250 -1.10357 0.00000 +0.00000 0.906250 -1.10345 0.00000 0.00000 0.937500 -1.06667 0.00000 -0.00000 0.968750 -1.03214 0.00000 +0.00000 0.968750 -1.03226 0.00000 diff --git a/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=5.output b/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=5.output index aa60359f7a..28a69ac154 100644 --- a/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=5.output +++ b/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=5.output @@ -13,8 +13,8 @@ Refinement cycle 1 0.00000 0.562500 -1.77778 0.00000 0.00000 0.625000 -1.60000 0.00000 0.00000 0.687500 -1.45455 0.00000 -0.00000 0.750000 -1.33333 5.49010e-13 -0.00000 0.812500 -1.23077 2.80537e-13 +0.00000 0.750000 -1.33333 0.00000 +0.00000 0.812500 -1.23077 0.00000 0.00000 0.875000 -1.14286 0.00000 0.00000 0.937500 -1.06667 0.00000 @@ -28,13 +28,13 @@ Refinement cycle 2 0.00000 0.625000 -1.60000 0.00000 0.00000 0.656250 -1.52381 0.00000 0.00000 0.687500 -1.45455 0.00000 -0.00000 0.718750 -1.39130 1.95566e-17 -0.00000 0.750000 -1.33333 5.49063e-13 +0.00000 0.718750 -1.39130 0.00000 +0.00000 0.750000 -1.33333 0.00000 0.00000 0.781250 -1.28000 0.00000 -0.00000 0.812500 -1.23077 2.80586e-13 -0.00000 0.843750 -1.18519 1.69980e-17 +0.00000 0.812500 -1.23077 0.00000 +0.00000 0.843750 -1.18519 0.00000 0.00000 0.875000 -1.14286 0.00000 -0.00000 0.906250 -1.10357 0.00000 +0.00000 0.906250 -1.10345 0.00000 0.00000 0.937500 -1.06667 0.00000 -0.00000 0.968750 -1.03214 0.00000 +0.00000 0.968750 -1.03226 0.00000 diff --git a/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=7.output b/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=7.output index aa60359f7a..28a69ac154 100644 --- a/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=7.output +++ b/tests/mpi/muelu_periodicity.with_trilinos_with_muelu=on.with_64bit_indices=off.mpirun=7.output @@ -13,8 +13,8 @@ Refinement cycle 1 0.00000 0.562500 -1.77778 0.00000 0.00000 0.625000 -1.60000 0.00000 0.00000 0.687500 -1.45455 0.00000 -0.00000 0.750000 -1.33333 5.49010e-13 -0.00000 0.812500 -1.23077 2.80537e-13 +0.00000 0.750000 -1.33333 0.00000 +0.00000 0.812500 -1.23077 0.00000 0.00000 0.875000 -1.14286 0.00000 0.00000 0.937500 -1.06667 0.00000 @@ -28,13 +28,13 @@ Refinement cycle 2 0.00000 0.625000 -1.60000 0.00000 0.00000 0.656250 -1.52381 0.00000 0.00000 0.687500 -1.45455 0.00000 -0.00000 0.718750 -1.39130 1.95566e-17 -0.00000 0.750000 -1.33333 5.49063e-13 +0.00000 0.718750 -1.39130 0.00000 +0.00000 0.750000 -1.33333 0.00000 0.00000 0.781250 -1.28000 0.00000 -0.00000 0.812500 -1.23077 2.80586e-13 -0.00000 0.843750 -1.18519 1.69980e-17 +0.00000 0.812500 -1.23077 0.00000 +0.00000 0.843750 -1.18519 0.00000 0.00000 0.875000 -1.14286 0.00000 -0.00000 0.906250 -1.10357 0.00000 +0.00000 0.906250 -1.10345 0.00000 0.00000 0.937500 -1.06667 0.00000 -0.00000 0.968750 -1.03214 0.00000 +0.00000 0.968750 -1.03226 0.00000 -- 2.39.5