From 76ce10d88148fbe6b315a4aedba439af9a9a81a9 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Tue, 5 May 2015 13:57:33 -0500 Subject: [PATCH] Don't throw an exception recommanding to use mpirun -np 1 in the tutorials. --- examples/step-31/step-31.cc | 2 +- examples/step-36/step-36.cc | 2 +- examples/step-41/step-41.cc | 2 +- examples/step-43/step-43.cc | 2 +- include/deal.II/lac/trilinos_vector.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/step-31/step-31.cc b/examples/step-31/step-31.cc index be44f33ef5..697e36439b 100644 --- a/examples/step-31/step-31.cc +++ b/examples/step-31/step-31.cc @@ -2215,7 +2215,7 @@ int main (int argc, char *argv[]) // This program can only be run in serial. Otherwise, throw an exception. AssertThrow(Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD)==1, - ExcMessage("This program can only be run in serial, use mpirun -np 1 ./step-31")); + ExcMessage("This program can only be run in serial, use ./step-31")); BoussinesqFlowProblem<2> flow_problem; flow_problem.run (); diff --git a/examples/step-36/step-36.cc b/examples/step-36/step-36.cc index 8456556e08..7482a29c15 100644 --- a/examples/step-36/step-36.cc +++ b/examples/step-36/step-36.cc @@ -481,7 +481,7 @@ int main (int argc, char **argv) // This program can only be run in serial. Otherwise, throw an exception. AssertThrow(Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD)==1, - ExcMessage("This program can only be run in serial, use mpirun -np 1 ./step-36")); + ExcMessage("This program can only be run in serial, use ./step-36")); { deallog.depth_console (0); diff --git a/examples/step-41/step-41.cc b/examples/step-41/step-41.cc index 842d38f2ca..cc804370d9 100644 --- a/examples/step-41/step-41.cc +++ b/examples/step-41/step-41.cc @@ -674,7 +674,7 @@ int main (int argc, char *argv[]) // This program can only be run in serial. Otherwise, throw an exception. AssertThrow(Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD)==1, - ExcMessage("This program can only be run in serial, use mpirun -np 1 ./step-41")); + ExcMessage("This program can only be run in serial, use ./step-41")); ObstacleProblem<2> obstacle_problem; obstacle_problem.run (); diff --git a/examples/step-43/step-43.cc b/examples/step-43/step-43.cc index d17e8db85b..8fc3d5b112 100644 --- a/examples/step-43/step-43.cc +++ b/examples/step-43/step-43.cc @@ -2253,7 +2253,7 @@ int main (int argc, char *argv[]) // This program can only be run in serial. Otherwise, throw an exception. AssertThrow(Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD)==1, - ExcMessage("This program can only be run in serial, use mpirun -np 1 ./step-43")); + ExcMessage("This program can only be run in serial, use ./step-43")); TwoPhaseFlowProblem<2> two_phase_flow_problem(1); two_phase_flow_problem.run (); diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index c02d502127..9571613ddb 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -757,7 +757,7 @@ namespace TrilinosWrappers * ignored, the only thing that matters is the size of the index space * described by this argument. */ - explicit Vector (Const Epetra_Map &partitioning) DEAL_II_DEPRECATED; + explicit Vector (const Epetra_Map &partitioning) DEAL_II_DEPRECATED; /** * This constructor takes as input the number of elements in the vector. -- 2.39.5