From ff7ce5f436d372829c40abd550d39fb19ce80390 Mon Sep 17 00:00:00 2001 From: heister Date: Wed, 3 Jul 2013 23:13:31 +0000 Subject: [PATCH] remove unused functions, clean up usage of explicit git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@29933 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/lac/trilinos_vector.h | 31 ++++++------------- .../deal.II/lac/trilinos_vector_base.h | 9 ------ deal.II/source/lac/trilinos_vector_base.cc | 5 --- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/deal.II/include/deal.II/lac/trilinos_vector.h b/deal.II/include/deal.II/lac/trilinos_vector.h index fac54aeba6..c8ea03e1a4 100644 --- a/deal.II/include/deal.II/lac/trilinos_vector.h +++ b/deal.II/include/deal.II/lac/trilinos_vector.h @@ -404,7 +404,7 @@ namespace TrilinosWrappers * this is all we need to * generate a parallel vector. */ - Vector (const Epetra_Map ¶llel_partitioning); + explicit Vector (const Epetra_Map ¶llel_partitioning); /** * Copy constructor from the @@ -417,7 +417,7 @@ namespace TrilinosWrappers * that sets the partitioning * details. */ - explicit Vector (const Epetra_Map ¶llel_partitioning, + Vector (const Epetra_Map ¶llel_partitioning, const VectorBase &v); /** @@ -446,7 +446,7 @@ namespace TrilinosWrappers * elements. */ template - explicit Vector (const Epetra_Map ¶llel_partitioning, + Vector (const Epetra_Map ¶llel_partitioning, const dealii::Vector &v); //@} /** @@ -463,7 +463,7 @@ namespace TrilinosWrappers * need to generate a %parallel * vector. */ - Vector (const IndexSet ¶llel_partitioning, + explicit Vector (const IndexSet ¶llel_partitioning, const MPI_Comm &communicator = MPI_COMM_WORLD); /** @@ -484,7 +484,7 @@ namespace TrilinosWrappers * communicator that set the * partitioning details. */ - explicit Vector (const IndexSet ¶llel_partitioning, + Vector (const IndexSet ¶llel_partitioning, const VectorBase &v, const MPI_Comm &communicator = MPI_COMM_WORLD); @@ -495,7 +495,7 @@ namespace TrilinosWrappers * copies all the elements. */ template - explicit Vector (const IndexSet ¶llel_partitioning, + Vector (const IndexSet ¶llel_partitioning, const dealii::Vector &v, const MPI_Comm &communicator = MPI_COMM_WORLD); @@ -663,7 +663,7 @@ namespace TrilinosWrappers * input the number of elements * in the vector. */ - Vector (const size_type n); + explicit Vector (const size_type n); /** * This constructor takes as @@ -677,7 +677,7 @@ namespace TrilinosWrappers * map will be generated * internally. */ - Vector (const Epetra_Map &partitioning); + explicit Vector (const Epetra_Map &partitioning); /** * This constructor takes as input @@ -690,19 +690,9 @@ namespace TrilinosWrappers * taken and a localized version will * be generated internally. */ - Vector (const IndexSet &partitioning, + explicit Vector (const IndexSet &partitioning, const MPI_Comm &communicator = MPI_COMM_WORLD); - /** - * This constructor creates a vector - * using the IndexSet local as our - * own unknowns, add optional ghost - * values ghost. - */ - Vector (const MPI_Comm &communicator, - const IndexSet &local, - const IndexSet &ghost); - /** * This constructor takes a * (possibly parallel) Trilinos @@ -768,8 +758,6 @@ namespace TrilinosWrappers const MPI_Comm &communicator = MPI_COMM_WORLD, const bool fast = false); - - /** * Reinit function. Takes the * information of a Vector and copies @@ -780,7 +768,6 @@ namespace TrilinosWrappers const bool fast = false, const bool allow_different_maps = false); - /** * Set all components of the * vector to the given number @p diff --git a/deal.II/include/deal.II/lac/trilinos_vector_base.h b/deal.II/include/deal.II/lac/trilinos_vector_base.h index fc257d1016..69a0457bc8 100644 --- a/deal.II/include/deal.II/lac/trilinos_vector_base.h +++ b/deal.II/include/deal.II/lac/trilinos_vector_base.h @@ -935,14 +935,6 @@ namespace TrilinosWrappers */ void ratio (const VectorBase &a, const VectorBase &b); - - - /** - * Empty function; added to allow - * PETSc and Trilinos Vectors to - * be used interchangeably - */ - void update_ghost_values() const; //@} @@ -1034,7 +1026,6 @@ namespace TrilinosWrappers std::size_t memory_consumption () const; //@} - /** * Exception */ diff --git a/deal.II/source/lac/trilinos_vector_base.cc b/deal.II/source/lac/trilinos_vector_base.cc index 17e2b41c0c..c2695901ee 100644 --- a/deal.II/source/lac/trilinos_vector_base.cc +++ b/deal.II/source/lac/trilinos_vector_base.cc @@ -450,11 +450,6 @@ namespace TrilinosWrappers sizeof(TrilinosWrappers::types::int_type) ); } - void - VectorBase::update_ghost_values() const - { - } - } /* end of namespace TrilinosWrappers */ -- 2.39.5