From 7a6a0ff5a4bc796d403f2ef627ac8729d5056e43 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 29 Dec 2012 21:10:56 +0000 Subject: [PATCH] Some more cleanup git-svn-id: https://svn.dealii.org/branches/branch_deprecated@27869 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/grid/tria.h | 2 +- deal.II/source/base/mpi.cc | 2 +- deal.II/source/lac/block_matrix_array.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deal.II/include/deal.II/grid/tria.h b/deal.II/include/deal.II/grid/tria.h index 86eace851c..4e744b407c 100644 --- a/deal.II/include/deal.II/grid/tria.h +++ b/deal.II/include/deal.II/grid/tria.h @@ -1561,7 +1561,7 @@ public: void create_notification (const Triangulation &tria) DEAL_II_DEPRECATED; - } DEAL_II_DEPRECATED; + }; /** * A structure that is used as an diff --git a/deal.II/source/base/mpi.cc b/deal.II/source/base/mpi.cc index 15917ddfb9..4ad632d348 100644 --- a/deal.II/source/base/mpi.cc +++ b/deal.II/source/base/mpi.cc @@ -392,7 +392,7 @@ namespace Utilities int MPI_has_been_started = 0; MPI_Initialized(&MPI_has_been_started); - if (Utilities::System::program_uses_mpi() == true && owns_mpi == true && + if (Utilities::System::job_supports_mpi() == true && owns_mpi == true && MPI_has_been_started != 0) { if (std::uncaught_exception()) diff --git a/deal.II/source/lac/block_matrix_array.cc b/deal.II/source/lac/block_matrix_array.cc index ae8a5a3a80..3e1cb14ed0 100644 --- a/deal.II/source/lac/block_matrix_array.cc +++ b/deal.II/source/lac/block_matrix_array.cc @@ -385,12 +385,12 @@ BlockTrianglePrecondition::do_row ( // First, divide by the current // factor, such that we can // multiply by it later. - aux.scale(1./m->prefix); + aux /= m->prefix; if (m->transpose) m->matrix->Tvmult_add(aux, dst.block(row_num)); else m->matrix->vmult_add(aux, dst.block(row_num)); - aux.scale(m->prefix); + aux *= m->prefix; } dst.block(row_num) = aux; } -- 2.39.5