From: Bruno Turcksin Date: Mon, 4 May 2015 14:33:44 +0000 (-0500) Subject: Deprecate TrilinosWrappers constructors instead of the whole class to silence warnings. X-Git-Tag: v8.3.0-rc1~196^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cff92b25475a646ce08a24e8f715bb7259a93a9;p=dealii.git Deprecate TrilinosWrappers constructors instead of the whole class to silence warnings. --- diff --git a/examples/step-36/step-36.cc b/examples/step-36/step-36.cc index 438ae79a62..8456556e08 100644 --- a/examples/step-36/step-36.cc +++ b/examples/step-36/step-36.cc @@ -205,11 +205,11 @@ namespace Step36 // an IndexSet where every valid index is part of the set. Note that this // program can only be run sequentially and will throw an exception if used // in parallel. - IndexSet eigenfunction_partitioning = complete_index_set(dof_handler.n_dofs ()); + IndexSet eigenfunction_index_set = dof_handler.locally_owned_dofs (); eigenfunctions .resize (parameters.get_integer ("Number of eigenvalues/eigenfunctions")); for (unsigned int i=0; i &partitioner); + explicit BlockVector (const std::vector &partitioner DEAL_II_DEPRECATED); /** * Constructor. Generate a block vector with as many blocks as there are @@ -109,26 +109,26 @@ namespace TrilinosWrappers * partitioning is not used, just the global size of the partitioner. */ explicit BlockVector (const std::vector &partitioner, - const MPI_Comm &communicator = MPI_COMM_WORLD); + const MPI_Comm &communicator = MPI_COMM_WORLD) DEAL_II_DEPRECATED; /** * Copy-Constructor. Set all the properties of the non-%parallel vector to * those of the given %parallel vector and import the elements. */ - BlockVector (const MPI::BlockVector &V); + BlockVector (const MPI::BlockVector &V) DEAL_II_DEPRECATED; /** * Copy-Constructor. Set all the properties of the vector to those of the * given input vector and copy the elements. */ - BlockVector (const BlockVector &V); + BlockVector (const BlockVector &V) DEAL_II_DEPRECATED; /** * Creates a block vector consisting of num_blocks components, * but there is no content in the individual components and the user has * to fill appropriate data using a reinit of the blocks. */ - explicit BlockVector (const size_type num_blocks); + explicit BlockVector (const size_type num_blocks) DEAL_II_DEPRECATED; /** * Constructor. Set the number of blocks to n.size() and @@ -136,7 +136,7 @@ namespace TrilinosWrappers * * References BlockVector.reinit(). */ - explicit BlockVector (const std::vector &N); + explicit BlockVector (const std::vector &N) DEAL_II_DEPRECATED; /** * Constructor. Set the number of blocks to n.size(). Initialize @@ -149,7 +149,7 @@ namespace TrilinosWrappers template BlockVector (const std::vector &n, const InputIterator first, - const InputIterator end); + const InputIterator end) DEAL_II_DEPRECATED; /** * Destructor. Clears memory @@ -303,7 +303,7 @@ namespace TrilinosWrappers << "local_size = global_size is a necessary condition, but" << arg1 << " != " << arg2 << " was given!"); - } DEAL_II_DEPRECATED; + }; diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 447065b813..c02d502127 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -741,12 +741,12 @@ namespace TrilinosWrappers * function reinit() will have to give the vector the correct * size. */ - Vector (); + Vector () DEAL_II_DEPRECATED; /** * This constructor takes as input the number of elements in the vector. */ - explicit Vector (const size_type n); + explicit Vector (const size_type n) DEAL_II_DEPRECATED; /** * This constructor takes as input the number of elements in the vector. @@ -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); + explicit Vector (Const Epetra_Map &partitioning) DEAL_II_DEPRECATED; /** * This constructor takes as input the number of elements in the vector. @@ -769,20 +769,20 @@ namespace TrilinosWrappers * size of the index space described by this argument. */ explicit Vector (const IndexSet &partitioning, - const MPI_Comm &communicator = MPI_COMM_WORLD); + const MPI_Comm &communicator = MPI_COMM_WORLD) DEAL_II_DEPRECATED; /** * This constructor takes a (possibly parallel) Trilinos Vector and * generates a localized version of the whole content on each processor. */ - explicit Vector (const VectorBase &V); + explicit Vector (const VectorBase &V) DEAL_II_DEPRECATED; /** * Copy-constructor from deal.II vectors. Sets the dimension to that of * the given vector, and copies all elements. */ template - explicit Vector (const dealii::Vector &v); + explicit Vector (const dealii::Vector &v) DEAL_II_DEPRECATED; /** * Reinit function that resizes the vector to the size specified by @@ -870,7 +870,7 @@ namespace TrilinosWrappers * thus an empty function. */ void update_ghost_values () const; - } DEAL_II_DEPRECATED; + };