]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Some more cleanup
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 29 Dec 2012 21:10:56 +0000 (21:10 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 29 Dec 2012 21:10:56 +0000 (21:10 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_deprecated@27869 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/grid/tria.h
deal.II/source/base/mpi.cc
deal.II/source/lac/block_matrix_array.cc

index 86eace851c61a0f44560a5dc025882a59596b11e..4e744b407cf56d62a9e26e22ff41d3af6fd73f44 100644 (file)
@@ -1561,7 +1561,7 @@ public:
     void
     create_notification (const Triangulation<dim, spacedim> &tria) DEAL_II_DEPRECATED;
 
-  } DEAL_II_DEPRECATED;
+  };
 
   /**
    * A structure that is used as an
index 15917ddfb9858a393fb928d74e85aa66a9e7c22b..4ad632d34835a9a36f79e663c4ba834d3651496a 100644 (file)
@@ -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())
index ae8a5a3a80b87aa31cd2dc79c4f18c1ba8bf7838..3e1cb14ed04d1ad48b80849fe455e0f76c794409 100644 (file)
@@ -385,12 +385,12 @@ BlockTrianglePrecondition<number>::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;
     }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.