From 1d33180f3ad79f2ed96e5644f13f7f5b82a02c3e Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 5 Nov 2015 09:02:50 -0500 Subject: [PATCH] fix tests - use std_cxx11::bind instead of std::bind - require Trilinos if we use it - fe/bdm_*: do not set matrix entries <1e-14 to zero (different on different machines) and always print 0 entries - use check_solver_within_range where needed --- tests/fe/bdm_8.cc | 19 +- tests/fe/bdm_8.output | 211 +++++++++--------- tests/fe/bdm_9.cc | 14 +- tests/fe/bdm_9.output | 25 +-- .../mpi/cell_weights_01_back_and_forth_01.cc | 12 +- .../mpi/cell_weights_01_back_and_forth_02.cc | 6 +- tests/mpi/cell_weights_02.cc | 6 +- tests/mpi/cell_weights_03.cc | 6 +- tests/mpi/cell_weights_04.cc | 6 +- tests/mpi/cell_weights_05.cc | 6 +- tests/mpi/cell_weights_06.cc | 6 +- ...fer_04.with_trilinos=true.mpirun=1.output} | 0 ...fer_04.with_trilinos=true.mpirun=2.output} | 0 ....with_trilinos=true.mpirun=1.debug.output} | 0 ....with_trilinos=true.mpirun=2.debug.output} | 0 15 files changed, 152 insertions(+), 165 deletions(-) rename tests/multigrid/{transfer_04.mpirun=1.output => transfer_04.with_trilinos=true.mpirun=1.output} (100%) rename tests/multigrid/{transfer_04.mpirun=2.output => transfer_04.with_trilinos=true.mpirun=2.output} (100%) rename tests/multigrid/{transfer_04a.mpirun=1.debug.output => transfer_04a.with_trilinos=true.mpirun=1.debug.output} (100%) rename tests/multigrid/{transfer_04a.mpirun=2.debug.output => transfer_04a.with_trilinos=true.mpirun=2.debug.output} (100%) diff --git a/tests/fe/bdm_8.cc b/tests/fe/bdm_8.cc index de8f98129d..7ba8dfabcf 100644 --- a/tests/fe/bdm_8.cc +++ b/tests/fe/bdm_8.cc @@ -73,26 +73,23 @@ test (const unsigned int degree) += (fe.shape_value_component(i,q_point,d) * fe.shape_value_component(j,q_point,d) * fe.JxW(q_point)); - for (unsigned int i=0; i vector_memory; - SolverCG<> cg (solver_control, vector_memory); + SolverCG<> solver (solver_control, vector_memory); Vector tmp1(dofs_per_cell), tmp2(dofs_per_cell); for (unsigned int i=0; i vector_memory; - SolverCG<> cg (solver_control, vector_memory); + SolverCG<> solver (solver_control, vector_memory); Vector tmp1(dofs_per_cell), tmp2(dofs_per_cell); for (unsigned int i=0; i