From c78e46507e7d5c0221ec6341f9af55f8eb0dc400 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 5 Feb 2016 08:02:50 -0500 Subject: [PATCH] fix several tests --- tests/hp/fe_nothing_12.cc | 4 +++- tests/hp/fe_nothing_13.cc | 4 +++- tests/hp/fe_nothing_14.cc | 4 +++- tests/petsc/different_matrix_preconditioner.cc | 12 +++++++----- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/hp/fe_nothing_12.cc b/tests/hp/fe_nothing_12.cc index cc9b9629ad..c9f4fa5da7 100644 --- a/tests/hp/fe_nothing_12.cc +++ b/tests/hp/fe_nothing_12.cc @@ -57,7 +57,9 @@ void test () std::vector sub(dim, 1); sub[dim-1] = 2; - GridGenerator::subdivided_hyper_rectangle (triangulation, sub, Point(), Point()); + Point<2> p1; + Point<2> p2(1.0, 2.0); + GridGenerator::subdivided_hyper_rectangle (triangulation, sub, p1, p2); triangulation.begin_active()->set_refine_flag(); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/hp/fe_nothing_13.cc b/tests/hp/fe_nothing_13.cc index ab972f9ad8..162d4dddca 100644 --- a/tests/hp/fe_nothing_13.cc +++ b/tests/hp/fe_nothing_13.cc @@ -62,7 +62,9 @@ void test () std::vector sub(dim, 1); sub[dim-1] = 2; - GridGenerator::subdivided_hyper_rectangle (triangulation, sub, Point(), Point()); + Point<2> p1; + Point<2> p2(1.0, 2.0); + GridGenerator::subdivided_hyper_rectangle (triangulation, sub, p1, p2); triangulation.begin_active()->set_refine_flag(); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/hp/fe_nothing_14.cc b/tests/hp/fe_nothing_14.cc index a75b0a3a71..e88b50911a 100644 --- a/tests/hp/fe_nothing_14.cc +++ b/tests/hp/fe_nothing_14.cc @@ -74,7 +74,9 @@ void test () std::vector sub(dim, 1); sub[dim-1] = 2; - GridGenerator::subdivided_hyper_rectangle (triangulation, sub, Point(), Point()); + Point<2> p1; + Point<2> p2(1.0, 2.0); + GridGenerator::subdivided_hyper_rectangle (triangulation, sub, p1, p2); triangulation.begin_active()->set_refine_flag(); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/petsc/different_matrix_preconditioner.cc b/tests/petsc/different_matrix_preconditioner.cc index 9f9645487c..05135b2866 100644 --- a/tests/petsc/different_matrix_preconditioner.cc +++ b/tests/petsc/different_matrix_preconditioner.cc @@ -70,12 +70,14 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A2; A.reinit(sparsity_pattern); A2.reinit(sparsity_pattern); - for (auto it : A_tmp) + + SparseMatrix::iterator it = A_tmp.begin(), endit = A_tmp.end(); + for (; it!=endit; ++it) { - const auto row = it.row(); - const auto column = it.column(); - A.set(row, column, it.value()); - A2.set(row, column, 1000. * it.value()); // scale A2 by 1000. + const auto row = it->row(); + const auto column = it->column(); + A.set(row, column, it->value()); + A2.set(row, column, 1000. * it->value()); // scale A2 by 1000. } A.compress(VectorOperation::insert); A2.compress(VectorOperation::insert); -- 2.39.5