From f8938250064dd07fa2569f848eded3b25083750a Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Wed, 15 Jun 2016 10:47:22 +0200 Subject: [PATCH] Use new namespace qualifications of distributed vectors in library --- cmake/config/template-arguments.in | 14 +-- examples/step-48/step-48.cc | 28 ++--- include/deal.II/lac/block_vector_base.h | 2 +- .../deal.II/lac/constraint_matrix.templates.h | 12 +-- include/deal.II/lac/trilinos_precondition.h | 26 ++--- include/deal.II/lac/trilinos_solver.h | 14 +-- include/deal.II/lac/trilinos_sparse_matrix.h | 8 +- include/deal.II/matrix_free/matrix_free.h | 22 ++-- include/deal.II/multigrid/mg_transfer.h | 26 ++--- .../deal.II/multigrid/mg_transfer.templates.h | 30 +++--- .../multigrid/mg_transfer_matrix_free.h | 20 ++-- .../numerics/error_estimator.templates.h | 4 +- .../deal.II/numerics/vector_tools.templates.h | 4 +- source/algorithms/operator.cc | 4 +- source/base/mpi.cc | 12 +-- source/base/time_stepping.cc | 4 +- source/base/time_stepping.inst.in | 8 +- source/distributed/solution_transfer.cc | 4 +- source/distributed/solution_transfer.inst.in | 11 +- source/dofs/dof_accessor_get.cc | 4 +- source/dofs/dof_accessor_set.cc | 4 +- source/dofs/dof_tools_constraints.cc | 4 +- source/fe/fe_tools_interpolate.cc | 12 +-- source/fe/fe_values.cc | 4 +- source/lac/constraint_matrix.cc | 4 +- source/lac/constraint_matrix.inst.in | 21 ++-- source/lac/solver.cc | 4 +- source/lac/sparse_matrix.cc | 2 +- source/lac/sparse_matrix.inst.in | 8 +- source/lac/sparse_matrix_inst2.cc | 2 +- source/lac/trilinos_precondition.cc | 8 +- source/lac/trilinos_solver.cc | 12 +-- source/lac/trilinos_sparse_matrix.cc | 18 ++-- source/lac/vector_memory.cc | 4 +- .../meshworker/mesh_worker_vector_selector.cc | 4 +- source/multigrid/mg_base.cc | 4 +- source/multigrid/mg_level_global_transfer.cc | 14 +-- .../mg_level_global_transfer.inst.in | 14 +-- source/multigrid/mg_transfer_matrix_free.cc | 24 ++--- source/multigrid/mg_transfer_prebuilt.cc | 4 +- source/multigrid/multigrid.cc | 4 +- source/numerics/data_out_dof_data.cc | 4 +- source/numerics/derivative_approximation.cc | 4 +- source/numerics/dof_output_operator.cc | 4 +- source/numerics/error_estimator_1d.cc | 4 +- source/numerics/fe_field_function.cc | 4 +- source/numerics/point_value_history.cc | 4 +- source/numerics/solution_transfer.cc | 4 +- tests/bits/fe_tools_06b.cc | 6 +- tests/gla/extract_subvector_to_parallel.cc | 10 +- tests/lac/vector_reinit_01.cc | 6 +- tests/matrix_free/matrix_vector_10.cc | 4 +- tests/matrix_free/matrix_vector_11.cc | 8 +- tests/matrix_free/matrix_vector_12.cc | 18 ++-- tests/matrix_free/matrix_vector_13.cc | 18 ++-- tests/matrix_free/matrix_vector_mf.h | 2 +- tests/matrix_free/parallel_multigrid.cc | 68 ++++++------ .../parallel_multigrid_adaptive.cc | 100 +++++++++--------- .../parallel_multigrid_adaptive_mf.cc | 94 ++++++++-------- tests/matrix_free/parallel_multigrid_mf.cc | 66 ++++++------ tests/matrix_free/step-48.cc | 24 ++--- tests/matrix_free/step-48b.cc | 24 ++--- tests/matrix_free/step-48c.cc | 24 ++--- tests/mpi/constraint_matrix_crash_01.cc | 4 +- tests/mpi/constraint_matrix_set_zero_02.cc | 6 +- tests/mpi/parallel_block_vector_01.cc | 14 +-- tests/mpi/parallel_block_vector_02.cc | 12 +-- tests/mpi/parallel_vector_01.cc | 4 +- tests/mpi/parallel_vector_02.cc | 4 +- tests/mpi/parallel_vector_03.cc | 4 +- tests/mpi/parallel_vector_04.cc | 4 +- tests/mpi/parallel_vector_05.cc | 4 +- tests/mpi/parallel_vector_06.cc | 8 +- tests/mpi/parallel_vector_07.cc | 4 +- tests/mpi/parallel_vector_08.cc | 6 +- tests/mpi/parallel_vector_09.cc | 4 +- tests/mpi/parallel_vector_10.cc | 6 +- tests/mpi/parallel_vector_11.cc | 10 +- tests/mpi/parallel_vector_12.cc | 14 +-- tests/mpi/parallel_vector_13.cc | 4 +- tests/mpi/parallel_vector_14.cc | 10 +- tests/mpi/parallel_vector_15.cc | 6 +- tests/mpi/parallel_vector_16.cc | 4 +- tests/mpi/parallel_vector_17.cc | 6 +- tests/mpi/parallel_vector_back_interpolate.cc | 4 +- tests/mpi/parallel_vector_interpolate.cc | 10 +- tests/mpi/point_value_01.cc | 4 +- tests/mpi/trilinos_matvec_01.cc | 4 +- tests/mpi/trilinos_matvec_02.cc | 4 +- tests/mpi/trilinos_matvec_03.cc | 4 +- tests/mpi/trilinos_sparse_matrix_01.cc | 2 +- tests/mpi/trilinos_sparse_matrix_02.cc | 2 +- tests/mpi/trilinos_sparse_matrix_03.cc | 2 +- tests/mpi/trilinos_sparse_matrix_04.cc | 2 +- tests/mpi/trilinos_sparse_matrix_05.cc | 2 +- tests/multigrid/step-16-04.cc | 46 ++++---- tests/multigrid/transfer_matrix_free_01.cc | 12 +-- tests/multigrid/transfer_matrix_free_02.cc | 12 +-- tests/multigrid/transfer_matrix_free_03.cc | 12 +-- tests/multigrid/transfer_matrix_free_04.cc | 12 +-- tests/multigrid/transfer_matrix_free_05.cc | 12 +-- tests/multigrid/transfer_matrix_free_06.cc | 12 +-- tests/multigrid/transfer_prebuilt_04.cc | 4 +- tests/petsc/copy_to_dealvec.cc | 6 +- tests/petsc/copy_to_dealvec_block.cc | 10 +- tests/petsc_complex/fe_get_function_values.cc | 6 +- tests/trilinos/copy_to_dealvec.cc | 8 +- tests/trilinos/copy_to_dealvec_block.cc | 10 +- tests/trilinos/sparse_matrix_vector_10.cc | 10 +- tests/trilinos/sparse_matrix_vector_11.cc | 10 +- 110 files changed, 645 insertions(+), 647 deletions(-) diff --git a/cmake/config/template-arguments.in b/cmake/config/template-arguments.in index ec553ea34d..a9d69a2c2a 100644 --- a/cmake/config/template-arguments.in +++ b/cmake/config/template-arguments.in @@ -26,8 +26,8 @@ SERIAL_VECTORS := { Vector; LinearAlgebra::distributed::Vector; LinearAlgebra::distributed::Vector ; - parallel::distributed::BlockVector; - parallel::distributed::BlockVector ; + LinearAlgebra::distributed::BlockVector; + LinearAlgebra::distributed::BlockVector ; @DEAL_II_EXPAND_TRILINOS_VECTOR@; @DEAL_II_EXPAND_TRILINOS_MPI_VECTOR@; @@ -46,11 +46,11 @@ REAL_SERIAL_VECTORS := { Vector; BlockVector; BlockVector; - parallel::distributed::Vector; - parallel::distributed::Vector ; + LinearAlgebra::distributed::Vector; + LinearAlgebra::distributed::Vector ; - parallel::distributed::BlockVector; - parallel::distributed::BlockVector ; + LinearAlgebra::distributed::BlockVector; + LinearAlgebra::distributed::BlockVector ; @DEAL_II_EXPAND_TRILINOS_VECTOR@; @DEAL_II_EXPAND_TRILINOS_MPI_VECTOR@; @@ -81,7 +81,7 @@ VECTORS_WITH_MATRIX := { Vector; BlockVector; BlockVector; - parallel::distributed::Vector; + LinearAlgebra::distributed::Vector; @DEAL_II_EXPAND_TRILINOS_VECTOR@; @DEAL_II_EXPAND_TRILINOS_MPI_VECTOR@; diff --git a/examples/step-48/step-48.cc b/examples/step-48/step-48.cc index df18653e27..7233333d54 100644 --- a/examples/step-48/step-48.cc +++ b/examples/step-48/step-48.cc @@ -38,7 +38,7 @@ // This includes the data structures for the efficient implementation of // matrix-free methods. -#include +#include #include #include @@ -83,17 +83,17 @@ namespace Step48 SineGordonOperation(const MatrixFree &data_in, const double time_step); - void apply (parallel::distributed::Vector &dst, - const std::vector*> &src) const; + void apply (LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src) const; private: const MatrixFree &data; const VectorizedArray delta_t_sqr; - parallel::distributed::Vector inv_mass_matrix; + LinearAlgebra::distributed::Vector inv_mass_matrix; void local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const std::vector*> &src, + LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src, const std::pair &cell_range) const; }; @@ -169,7 +169,7 @@ namespace Step48 // one destination vector, even if we happen to use many vectors like the two // in this case. Note that the cell loop accepts any valid class for input and // output, which does not only include vectors but general data types. - // However, only in case it encounters a parallel::distributed::Vector + // However, only in case it encounters a LinearAlgebra::distributed::Vector // or a std::vector collecting these vectors, it calls functions that // exchange data at the beginning and the end of the loop. In the loop over // the cells, we first have to read in the values in the vectors related to @@ -181,8 +181,8 @@ namespace Step48 template void SineGordonOperation:: local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const std::vector*> &src, + LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src, const std::pair &cell_range) const { AssertDimension (src.size(), 2); @@ -228,8 +228,8 @@ namespace Step48 // provide a function with the same signature that is not part of a class. template void SineGordonOperation:: - apply (parallel::distributed::Vector &dst, - const std::vector*> &src) const + apply (LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src) const { dst = 0; data.cell_loop (&SineGordonOperation::local_apply, @@ -303,7 +303,7 @@ namespace Step48 MatrixFree matrix_free_data; - parallel::distributed::Vector solution, old_solution, old_old_solution; + LinearAlgebra::distributed::Vector solution, old_solution, old_old_solution; const unsigned int n_global_refinements; double time, time_step; @@ -442,7 +442,7 @@ namespace Step48 // the integrate_difference function as well as in DataOut. We only need to // make sure that we tell the vector to update its ghost values before we // read them. This is a feature present only in the - // parallel::distributed::Vector class. Distributed vectors with PETSc and + // LinearAlgebra::distributed::Vector class. Distributed vectors with PETSc and // Trilinos, on the other hand, need to be copied to special vectors // including ghost values (see the relevant section in step-40). If we // wanted to access all degrees of freedom on ghost cells, too (e.g. when @@ -556,7 +556,7 @@ namespace Step48 old_solution); output_results (0); - std::vector*> previous_solutions; + std::vector*> previous_solutions; previous_solutions.push_back(&old_solution); previous_solutions.push_back(&old_old_solution); diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h index 9884463502..135253b2fc 100644 --- a/include/deal.II/lac/block_vector_base.h +++ b/include/deal.II/lac/block_vector_base.h @@ -814,7 +814,7 @@ public: * The reason this function exists is that this operation involves less * memory transfer than calling the two functions separately on deal.II's * vector classes (Vector and - * parallel::distributed::Vector). This method only needs to load + * LinearAlgebra::distributed::Vector). This method only needs to load * three vectors, @p this, @p V, @p W, whereas calling separate methods * means to load the calling vector @p this twice. Since most vector * operations are memory transfer limited, this reduces the time by 25\% (or diff --git a/include/deal.II/lac/constraint_matrix.templates.h b/include/deal.II/lac/constraint_matrix.templates.h index bf2ee1b0f5..4d9da589f8 100644 --- a/include/deal.II/lac/constraint_matrix.templates.h +++ b/include/deal.II/lac/constraint_matrix.templates.h @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -532,7 +532,7 @@ namespace internal } template - void set_zero_parallel(const std::vector &cm, parallel::distributed::Vector &vec, size_type shift = 0) + void set_zero_parallel(const std::vector &cm, LinearAlgebra::distributed::Vector &vec, size_type shift = 0) { for (typename std::vector::const_iterator it = cm.begin(); it != cm.end(); ++it) @@ -777,15 +777,15 @@ namespace internal template void - import_vector_with_ghost_elements (const parallel::distributed::Vector &vec, + import_vector_with_ghost_elements (const LinearAlgebra::distributed::Vector &vec, const IndexSet &locally_owned_elements, const IndexSet &needed_elements, - parallel::distributed::Vector &output, + LinearAlgebra::distributed::Vector &output, const internal::bool2type /*is_block_vector*/) { // TODO: the in vector might already have all elements. need to find a // way to efficiently avoid the copy then - const_cast&>(vec).zero_out_ghosts(); + const_cast&>(vec).zero_out_ghosts(); output.reinit (locally_owned_elements, needed_elements, vec.get_mpi_communicator()); output = vec; output.update_ghost_values(); diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h index 303d95ac29..5f4b67250c 100644 --- a/include/deal.II/lac/trilinos_precondition.h +++ b/include/deal.II/lac/trilinos_precondition.h @@ -25,7 +25,7 @@ # include # include -# include +# include DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # ifdef DEAL_II_WITH_MPI @@ -142,15 +142,15 @@ namespace TrilinosWrappers * Apply the preconditioner on deal.II parallel data structures instead of * the ones provided in the Trilinos wrapper class. */ - virtual void vmult (dealii::parallel::distributed::Vector &dst, - const dealii::parallel::distributed::Vector &src) const; + virtual void vmult (dealii::LinearAlgebra::distributed::Vector &dst, + const dealii::LinearAlgebra::distributed::Vector &src) const; /** * Apply the transpose preconditioner on deal.II parallel data structures * instead of the ones provided in the Trilinos wrapper class. */ - virtual void Tvmult (dealii::parallel::distributed::Vector &dst, - const dealii::parallel::distributed::Vector &src) const; + virtual void Tvmult (dealii::LinearAlgebra::distributed::Vector &dst, + const dealii::LinearAlgebra::distributed::Vector &src) const; /** * Return a reference to the underlaying Trilinos Epetra_Operator. So you @@ -1834,16 +1834,16 @@ namespace TrilinosWrappers * Apply the preconditioner on deal.II parallel data structures instead of * the ones provided in the Trilinos wrapper class, i.e., dst = src. */ - void vmult (parallel::distributed::Vector &dst, - const dealii::parallel::distributed::Vector &src) const; + void vmult (LinearAlgebra::distributed::Vector &dst, + const dealii::LinearAlgebra::distributed::Vector &src) const; /** * Apply the transpose preconditioner on deal.II parallel data structures * instead of the ones provided in the Trilinos wrapper class, i.e., dst = * src. */ - void Tvmult (parallel::distributed::Vector &dst, - const dealii::parallel::distributed::Vector &src) const; + void Tvmult (LinearAlgebra::distributed::Vector &dst, + const dealii::LinearAlgebra::distributed::Vector &src) const; }; @@ -1936,8 +1936,8 @@ namespace TrilinosWrappers inline void - PreconditionBase::vmult (parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + PreconditionBase::vmult (LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { AssertDimension (static_cast(dst.local_size()), preconditioner->OperatorDomainMap().NumMyElements()); @@ -1954,8 +1954,8 @@ namespace TrilinosWrappers inline void - PreconditionBase::Tvmult (parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + PreconditionBase::Tvmult (LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { AssertDimension (static_cast(dst.local_size()), preconditioner->OperatorDomainMap().NumMyElements()); diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h index 084bf77a41..04c07684ea 100644 --- a/include/deal.II/lac/trilinos_solver.h +++ b/include/deal.II/lac/trilinos_solver.h @@ -25,7 +25,7 @@ # include # include # include -# include +# include DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include @@ -188,8 +188,8 @@ namespace TrilinosWrappers */ void solve (const SparseMatrix &A, - dealii::parallel::distributed::Vector &x, - const dealii::parallel::distributed::Vector &b, + dealii::LinearAlgebra::distributed::Vector &x, + const dealii::LinearAlgebra::distributed::Vector &b, const PreconditionBase &preconditioner); /** @@ -201,8 +201,8 @@ namespace TrilinosWrappers */ void solve (Epetra_Operator &A, - dealii::parallel::distributed::Vector &x, - const dealii::parallel::distributed::Vector &b, + dealii::LinearAlgebra::distributed::Vector &x, + const dealii::LinearAlgebra::distributed::Vector &b, const PreconditionBase &preconditioner); @@ -613,8 +613,8 @@ namespace TrilinosWrappers */ void solve (const SparseMatrix &A, - dealii::parallel::distributed::Vector &x, - const dealii::parallel::distributed::Vector &b); + dealii::LinearAlgebra::distributed::Vector &x, + const dealii::LinearAlgebra::distributed::Vector &b); /** * Access to object that controls convergence. diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index 4b0c73e64d..8c6a324801 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -1468,7 +1468,7 @@ namespace TrilinosWrappers * This function can be called with several different vector objects, * namely TrilinosWrappers::Vector, TrilinosWrappers::MPI::Vector as well * as deal.II's own vector classes Vector and - * parallel::distributed::Vector. + * LinearAlgebra::distributed::Vector. * * Note that both vectors have to be distributed vectors generated using * the same Map as was used for the matrix in case you work on a @@ -1494,7 +1494,7 @@ namespace TrilinosWrappers * This function can be called with several different vector objects, * namely TrilinosWrappers::Vector, TrilinosWrappers::MPI::Vector as well * as deal.II's own vector classes Vector and - * parallel::distributed::Vector. + * LinearAlgebra::distributed::Vector. * * Note that both vectors have to be distributed vectors generated using * the same Map as was used for the matrix in case you work on a @@ -1519,7 +1519,7 @@ namespace TrilinosWrappers * This function can be called with several different vector objects, * namely TrilinosWrappers::Vector, TrilinosWrappers::MPI::Vector as well * as deal.II's own vector classes Vector and - * parallel::distributed::Vector. + * LinearAlgebra::distributed::Vector. * * When using a vector of type TrilinosWrappers::MPI::Vector, both vectors * have to be distributed vectors generated using the same Map as was used @@ -1547,7 +1547,7 @@ namespace TrilinosWrappers * This function can be called with several different vector objects, * namely TrilinosWrappers::Vector, TrilinosWrappers::MPI::Vector as well * as deal.II's own vector classes Vector and - * parallel::distributed::Vector. + * LinearAlgebra::distributed::Vector. * * When using a vector of type TrilinosWrappers::MPI::Vector, both vectors * have to be distributed vectors generated using the same Map as was used diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index eec524e6f6..6ebcf60474 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -506,7 +506,7 @@ public: /** * Initialize function for a general vector. The length of the vector is * equal to the total number of degrees in the DoFHandler. If the vector is - * of class parallel::distributed::Vector@, the ghost entries are + * of class LinearAlgebra::distributed::Vector@, the ghost entries are * set accordingly. For vector-valued problems with several DoFHandlers * underlying this class, the parameter @p vector_component defines which * component is to be used. @@ -518,13 +518,13 @@ public: /** * Initialize function for a distributed vector. The length of the vector is * equal to the total number of degrees in the DoFHandler. If the vector is - * of class parallel::distributed::Vector@, the ghost entries are + * of class LinearAlgebra::distributed::Vector@, the ghost entries are * set accordingly. For vector-valued problems with several DoFHandlers * underlying this class, the parameter @p vector_component defines which * component is to be used. */ template - void initialize_dof_vector(parallel::distributed::Vector &vec, + void initialize_dof_vector(LinearAlgebra::distributed::Vector &vec, const unsigned int vector_component=0) const; /** @@ -953,7 +953,7 @@ template template inline void -MatrixFree::initialize_dof_vector(parallel::distributed::Vector &vec, +MatrixFree::initialize_dof_vector(LinearAlgebra::distributed::Vector &vec, const unsigned int comp) const { AssertIndexRange (comp, n_components()); @@ -1685,7 +1685,7 @@ namespace internal template inline - bool update_ghost_values_start (const parallel::distributed::Vector &vec, + bool update_ghost_values_start (const LinearAlgebra::distributed::Vector &vec, const unsigned int channel = 0) { bool return_value = !vec.has_ghost_elements(); @@ -1749,11 +1749,11 @@ namespace internal template inline - void reset_ghost_values (const parallel::distributed::Vector &vec, + void reset_ghost_values (const LinearAlgebra::distributed::Vector &vec, const bool zero_out_ghosts) { if (zero_out_ghosts) - const_cast&>(vec).zero_out_ghosts(); + const_cast&>(vec).zero_out_ghosts(); } @@ -1804,7 +1804,7 @@ namespace internal template inline - void update_ghost_values_finish (const parallel::distributed::Vector &vec) + void update_ghost_values_finish (const LinearAlgebra::distributed::Vector &vec) { vec.update_ghost_values_finish(); } @@ -1855,7 +1855,7 @@ namespace internal template inline - void compress_start (parallel::distributed::Vector &vec, + void compress_start (LinearAlgebra::distributed::Vector &vec, const unsigned int channel = 0) { vec.compress_start(channel); @@ -1907,7 +1907,7 @@ namespace internal template inline - void compress_finish (parallel::distributed::Vector &vec) + void compress_finish (LinearAlgebra::distributed::Vector &vec) { vec.compress_finish(::dealii::VectorOperation::add); } diff --git a/include/deal.II/multigrid/mg_transfer.h b/include/deal.II/multigrid/mg_transfer.h index 4f44a5cc12..4712d6fe55 100644 --- a/include/deal.II/multigrid/mg_transfer.h +++ b/include/deal.II/multigrid/mg_transfer.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include @@ -58,7 +58,7 @@ namespace internal #ifdef DEAL_II_WITH_TRILINOS template - struct MatrixSelector > + struct MatrixSelector > { typedef ::dealii::TrilinosWrappers::SparsityPattern Sparsity; typedef ::dealii::TrilinosWrappers::SparseMatrix Matrix; @@ -259,7 +259,7 @@ protected: * Implementation of transfer between the global vectors and the multigrid * levels for use in the derived class MGTransferPrebuilt and other classes. * This class is a specialization for the case of - * parallel::distributed::Vector that requires a few different calling + * LinearAlgebra::distributed::Vector that requires a few different calling * routines as compared to the %parallel vectors in the PETScWrappers and * TrilinosWrappers namespaces. * @@ -267,7 +267,7 @@ protected: * @date 2016 */ template -class MGLevelGlobalTransfer > : public MGTransferBase > +class MGLevelGlobalTransfer > : public MGTransferBase > { public: @@ -283,8 +283,8 @@ public: template void copy_to_mg (const DoFHandler &mg_dof, - MGLevelObject > &dst, - const parallel::distributed::Vector &src) const; + MGLevelObject > &dst, + const LinearAlgebra::distributed::Vector &src) const; /** * Transfer from multi-level vector to normal vector. @@ -296,8 +296,8 @@ public: template void copy_from_mg (const DoFHandler &mg_dof, - parallel::distributed::Vector &dst, - const MGLevelObject > &src) const; + LinearAlgebra::distributed::Vector &dst, + const MGLevelObject > &src) const; /** * Add a multi-level vector to a normal vector. @@ -307,8 +307,8 @@ public: template void copy_from_mg_add (const DoFHandler &mg_dof, - parallel::distributed::Vector &dst, - const MGLevelObject > &src) const; + LinearAlgebra::distributed::Vector &dst, + const MGLevelObject > &src) const; /** * If this object operates on BlockVector objects, we need to describe how @@ -398,20 +398,20 @@ protected: /** * The mg_constrained_dofs of the level systems. */ - SmartPointer > > mg_constrained_dofs; + SmartPointer > > mg_constrained_dofs; /** * In the function copy_to_mg, we need to access ghosted entries of the * global vector for inserting into the level vectors. This vector is * populated with those entries. */ - mutable parallel::distributed::Vector ghosted_global_vector; + mutable LinearAlgebra::distributed::Vector ghosted_global_vector; /** * In the function copy_from_mg, we access all level vectors with certain * ghost entries for inserting the result into a global vector. */ - mutable MGLevelObject > ghosted_level_vector; + mutable MGLevelObject > ghosted_level_vector; }; diff --git a/include/deal.II/multigrid/mg_transfer.templates.h b/include/deal.II/multigrid/mg_transfer.templates.h index ead4d5e596..2555013d39 100644 --- a/include/deal.II/multigrid/mg_transfer.templates.h +++ b/include/deal.II/multigrid/mg_transfer.templates.h @@ -108,7 +108,7 @@ namespace void reinit_vector (const dealii::DoFHandler &mg_dof, const std::vector &, - MGLevelObject > &v) + MGLevelObject > &v) { const parallel::Triangulation *tria = (dynamic_cast*> @@ -368,15 +368,15 @@ set_component_to_block_map (const std::vector &map) -/* --------- MGLevelGlobalTransfer ------- */ +/* --------- MGLevelGlobalTransfer ------- */ template template void -MGLevelGlobalTransfer >::copy_to_mg +MGLevelGlobalTransfer >::copy_to_mg (const DoFHandler &mg_dof_handler, - MGLevelObject > &dst, - const parallel::distributed::Vector &src) const + MGLevelObject > &dst, + const LinearAlgebra::distributed::Vector &src) const { AssertIndexRange(dst.max_level(), mg_dof_handler.get_triangulation().n_global_levels()); AssertIndexRange(dst.min_level(), dst.max_level()+1); @@ -415,7 +415,7 @@ MGLevelGlobalTransfer >::copy_to_mg --level; typedef std::vector >::const_iterator dof_pair_iterator; - parallel::distributed::Vector &dst_level = dst[level]; + LinearAlgebra::distributed::Vector &dst_level = dst[level]; // first copy local unknowns for (dof_pair_iterator i = copy_indices[level].begin(); @@ -444,10 +444,10 @@ MGLevelGlobalTransfer >::copy_to_mg template template void -MGLevelGlobalTransfer >::copy_from_mg +MGLevelGlobalTransfer >::copy_from_mg (const DoFHandler &mg_dof_handler, - parallel::distributed::Vector &dst, - const MGLevelObject > &src) const + LinearAlgebra::distributed::Vector &dst, + const MGLevelObject > &src) const { (void)mg_dof_handler; AssertIndexRange(src.max_level(), mg_dof_handler.get_triangulation().n_global_levels()); @@ -481,7 +481,7 @@ MGLevelGlobalTransfer >::copy_from_mg // the first time around, we copy the source vector to the temporary // vector that we hold for the purpose of data exchange - parallel::distributed::Vector &ghosted_vector = + LinearAlgebra::distributed::Vector &ghosted_vector = ghosted_level_vector[level]; ghosted_vector = src[level]; ghosted_vector.update_ghost_values(); @@ -505,10 +505,10 @@ MGLevelGlobalTransfer >::copy_from_mg template template void -MGLevelGlobalTransfer >::copy_from_mg_add +MGLevelGlobalTransfer >::copy_from_mg_add (const DoFHandler &/*mg_dof_handler*/, - parallel::distributed::Vector &dst, - const MGLevelObject > &src) const + LinearAlgebra::distributed::Vector &dst, + const MGLevelObject > &src) const { // For non-DG: degrees of freedom in the refinement face may need special // attention, since they belong to the coarse level, but have fine level @@ -526,7 +526,7 @@ MGLevelGlobalTransfer >::copy_from_mg_add // the first time around, we copy the source vector to the temporary // vector that we hold for the purpose of data exchange - parallel::distributed::Vector &ghosted_vector = + LinearAlgebra::distributed::Vector &ghosted_vector = ghosted_level_vector[level]; ghosted_vector = src[level]; ghosted_vector.update_ghost_values(); @@ -549,7 +549,7 @@ MGLevelGlobalTransfer >::copy_from_mg_add template void -MGLevelGlobalTransfer >:: +MGLevelGlobalTransfer >:: set_component_to_block_map (const std::vector &map) { component_to_block_map = map; diff --git a/include/deal.II/multigrid/mg_transfer_matrix_free.h b/include/deal.II/multigrid/mg_transfer_matrix_free.h index a56fd061ef..86d39cc0af 100644 --- a/include/deal.II/multigrid/mg_transfer_matrix_free.h +++ b/include/deal.II/multigrid/mg_transfer_matrix_free.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include @@ -50,7 +50,7 @@ DEAL_II_NAMESPACE_OPEN * @date 2016 */ template -class MGTransferMatrixFree : public MGLevelGlobalTransfer > +class MGTransferMatrixFree : public MGLevelGlobalTransfer > { public: /** @@ -97,8 +97,8 @@ public: * finer level. */ virtual void prolongate (const unsigned int to_level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const; + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const; /** * Restrict a vector from level from_level to level @@ -116,8 +116,8 @@ public: * coarser level. */ virtual void restrict_and_add (const unsigned int from_level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const; + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const; /** * Finite element does not provide prolongation matrices. @@ -216,16 +216,16 @@ private: */ template void do_prolongate_add(const unsigned int to_level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const; + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const; /** * Performs templated restriction operation */ template void do_restrict_add(const unsigned int from_level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const; + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const; }; diff --git a/include/deal.II/numerics/error_estimator.templates.h b/include/deal.II/numerics/error_estimator.templates.h index c94dbad4d6..3bb11b7d20 100644 --- a/include/deal.II/numerics/error_estimator.templates.h +++ b/include/deal.II/numerics/error_estimator.templates.h @@ -19,9 +19,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h index f5c046b61c..cfe4a5756c 100644 --- a/include/deal.II/numerics/vector_tools.templates.h +++ b/include/deal.II/numerics/vector_tools.templates.h @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/algorithms/operator.cc b/source/algorithms/operator.cc index 475f6ea1f6..c147f2331c 100644 --- a/source/algorithms/operator.cc +++ b/source/algorithms/operator.cc @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/base/mpi.cc b/source/base/mpi.cc index b9825a379a..e78b50806f 100644 --- a/source/base/mpi.cc +++ b/source/base/mpi.cc @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -439,13 +439,13 @@ namespace Utilities #ifdef DEAL_II_WITH_MPI // Start with the deal.II MPI vectors (need to do this before finalizing // PETSc because it finalizes MPI). Delete vectors from the pools: - GrowingVectorMemory > + GrowingVectorMemory > ::release_unused_memory (); - GrowingVectorMemory > + GrowingVectorMemory > ::release_unused_memory (); - GrowingVectorMemory > + GrowingVectorMemory > ::release_unused_memory (); - GrowingVectorMemory > + GrowingVectorMemory > ::release_unused_memory (); // Next with Trilinos: diff --git a/source/base/time_stepping.cc b/source/base/time_stepping.cc index a75b30b586..cc86489861 100644 --- a/source/base/time_stepping.cc +++ b/source/base/time_stepping.cc @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/base/time_stepping.inst.in b/source/base/time_stepping.inst.in index 29d71738ec..f9da377ef9 100644 --- a/source/base/time_stepping.inst.in +++ b/source/base/time_stepping.inst.in @@ -24,10 +24,10 @@ for (S : REAL_SCALARS; V : DEAL_II_VEC_TEMPLATES) for (S : REAL_SCALARS; V : DEAL_II_VEC_TEMPLATES) { - template class RungeKutta >; - template class ExplicitRungeKutta >; - template class ImplicitRungeKutta >; - template class EmbeddedExplicitRungeKutta >; + template class RungeKutta >; + template class ExplicitRungeKutta >; + template class ImplicitRungeKutta >; + template class EmbeddedExplicitRungeKutta >; } for (V : EXTERNAL_SEQUENTIAL_VECTORS) diff --git a/source/distributed/solution_transfer.cc b/source/distributed/solution_transfer.cc index 8abc708ae0..4713e5593a 100644 --- a/source/distributed/solution_transfer.cc +++ b/source/distributed/solution_transfer.cc @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/distributed/solution_transfer.inst.in b/source/distributed/solution_transfer.inst.in index 248a52a590..a5cc1a5fef 100644 --- a/source/distributed/solution_transfer.inst.in +++ b/source/distributed/solution_transfer.inst.in @@ -24,10 +24,10 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) #if deal_II_dimension > 1 #if deal_II_dimension <= deal_II_space_dimension template class SolutionTransfer, DoFHandler >; - template class SolutionTransfer, DoFHandler >; - template class SolutionTransfer, DoFHandler >; - template class SolutionTransfer, DoFHandler >; - template class SolutionTransfer, DoFHandler >; + template class SolutionTransfer, DoFHandler >; + template class SolutionTransfer, DoFHandler >; + template class SolutionTransfer, DoFHandler >; + template class SolutionTransfer, DoFHandler >; #ifdef DEAL_II_WITH_PETSC @@ -49,11 +49,10 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) template class SolutionTransfer >; #endif - + #endif #endif \} \} } - diff --git a/source/dofs/dof_accessor_get.cc b/source/dofs/dof_accessor_get.cc index b8a77812c8..2bc7ebe4bd 100644 --- a/source/dofs/dof_accessor_get.cc +++ b/source/dofs/dof_accessor_get.cc @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/dofs/dof_accessor_set.cc b/source/dofs/dof_accessor_set.cc index a97193cfe8..1748a5ffcf 100644 --- a/source/dofs/dof_accessor_set.cc +++ b/source/dofs/dof_accessor_set.cc @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/dofs/dof_tools_constraints.cc b/source/dofs/dof_tools_constraints.cc index 8531af2a56..8cb4a96b87 100644 --- a/source/dofs/dof_tools_constraints.cc +++ b/source/dofs/dof_tools_constraints.cc @@ -35,7 +35,7 @@ #include #ifdef DEAL_II_WITH_MPI -#include +#include #endif #include @@ -2504,7 +2504,7 @@ namespace DoFTools unsigned int dofs_per_cell; std::vector parameter_dof_indices; #ifdef DEAL_II_WITH_MPI - std::vector > global_parameter_representation; + std::vector > global_parameter_representation; #else std::vector > global_parameter_representation; #endif diff --git a/source/fe/fe_tools_interpolate.cc b/source/fe/fe_tools_interpolate.cc index 5d5c68c3d4..f95e4e2a05 100644 --- a/source/fe/fe_tools_interpolate.cc +++ b/source/fe/fe_tools_interpolate.cc @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -471,21 +471,21 @@ namespace FETools } #endif - // special version for parallel::distributed::Vector + // special version for LinearAlgebra::distributed::Vector template void back_interpolate (const DoFHandler &dof1, const ConstraintMatrix &constraints1, - const parallel::distributed::Vector &u1, + const LinearAlgebra::distributed::Vector &u1, const DoFHandler &dof2, const ConstraintMatrix &constraints2, - parallel::distributed::Vector &u1_interpolated) + LinearAlgebra::distributed::Vector &u1_interpolated) { IndexSet dof2_locally_owned_dofs = dof2.locally_owned_dofs(); IndexSet dof2_locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs (dof2, dof2_locally_relevant_dofs); - parallel::distributed::Vector + LinearAlgebra::distributed::Vector u2 (dof2_locally_owned_dofs, dof2_locally_relevant_dofs, u1.get_mpi_communicator()); diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc index 4392910aea..5274b76bf9 100644 --- a/source/fe/fe_values.cc +++ b/source/fe/fe_values.cc @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/lac/constraint_matrix.cc b/source/lac/constraint_matrix.cc index 2ed652a1c5..6a5f5a3af1 100644 --- a/source/lac/constraint_matrix.cc +++ b/source/lac/constraint_matrix.cc @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/lac/constraint_matrix.inst.in b/source/lac/constraint_matrix.inst.in index 5010a6f75c..3fd397a5dd 100644 --- a/source/lac/constraint_matrix.inst.in +++ b/source/lac/constraint_matrix.inst.in @@ -18,7 +18,7 @@ for (S: REAL_SCALARS; T : DEAL_II_VEC_TEMPLATES) template void ConstraintMatrix::condense >(const T &, T &) const; template void ConstraintMatrix::condense >(T &vec) const; template void ConstraintMatrix::distribute_local_to_global > ( - const Vector&, const std::vector &, T &, const FullMatrix&) const; + const Vector&, const std::vector &, T &, const FullMatrix&) const; template void ConstraintMatrix::distribute_local_to_global > ( const Vector&, const std::vector &, const std::vector &, T &, const FullMatrix&, bool) const; template void ConstraintMatrix::set_zero >(T &) const; @@ -27,13 +27,13 @@ for (S: REAL_SCALARS; T : DEAL_II_VEC_TEMPLATES) for (S: REAL_SCALARS; T : DEAL_II_VEC_TEMPLATES) { - template void ConstraintMatrix::condense >(const parallel::distributed::T &, parallel::distributed::T &) const; - template void ConstraintMatrix::condense >(parallel::distributed::T &vec) const; - template void ConstraintMatrix::distribute_local_to_global > ( - const Vector&, const std::vector &, parallel::distributed::T &, const FullMatrix&) const; - template void ConstraintMatrix::distribute_local_to_global > ( - const Vector&, const std::vector &, const std::vector &, parallel::distributed::T &, const FullMatrix&, bool) const; - template void ConstraintMatrix::set_zero >(parallel::distributed::T &) const; + template void ConstraintMatrix::condense >(const LinearAlgebra::distributed::T &, LinearAlgebra::distributed::T &) const; + template void ConstraintMatrix::condense >(LinearAlgebra::distributed::T &vec) const; + template void ConstraintMatrix::distribute_local_to_global > ( + const Vector&, const std::vector &, LinearAlgebra::distributed::T &, const FullMatrix&) const; + template void ConstraintMatrix::distribute_local_to_global > ( + const Vector&, const std::vector &, const std::vector &, LinearAlgebra::distributed::T &, const FullMatrix&, bool) const; + template void ConstraintMatrix::set_zero >(LinearAlgebra::distributed::T &) const; } @@ -67,7 +67,7 @@ for (S1 : REAL_SCALARS; S2 : REAL_SCALARS) template void ConstraintMatrix::condense >(SparseMatrix&, Vector&) const; template void ConstraintMatrix::condense >(BlockSparseMatrix&, BlockVector&) const; } - + for (S1 : COMPLEX_SCALARS) { template void ConstraintMatrix::condense >(SparseMatrix&, Vector&) const; @@ -78,9 +78,8 @@ for (Vec : SERIAL_VECTORS) { template void ConstraintMatrix::distribute(Vec &) const; } - + for (S: COMPLEX_SCALARS; T : DEAL_II_VEC_TEMPLATES) { template void ConstraintMatrix::distribute >(T &) const; } - diff --git a/source/lac/solver.cc b/source/lac/solver.cc index 2819e220fd..d7d803fba8 100644 --- a/source/lac/solver.cc +++ b/source/lac/solver.cc @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/sparse_matrix.cc b/source/lac/sparse_matrix.cc index 21f590a2b5..8a7d544652 100644 --- a/source/lac/sparse_matrix.cc +++ b/source/lac/sparse_matrix.cc @@ -15,7 +15,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/sparse_matrix.inst.in b/source/lac/sparse_matrix.inst.in index dee0b31bf5..010e8791f1 100644 --- a/source/lac/sparse_matrix.inst.in +++ b/source/lac/sparse_matrix.inst.in @@ -140,13 +140,13 @@ for (S1, S2, S3 : REAL_SCALARS; for (S1 : REAL_SCALARS) { template void SparseMatrix:: - vmult (parallel::distributed::Vector &, const parallel::distributed::Vector &) const; + vmult (LinearAlgebra::distributed::Vector &, const LinearAlgebra::distributed::Vector &) const; template void SparseMatrix:: - Tvmult (parallel::distributed::Vector &, const parallel::distributed::Vector &) const; + Tvmult (LinearAlgebra::distributed::Vector &, const LinearAlgebra::distributed::Vector &) const; template void SparseMatrix:: - vmult_add (parallel::distributed::Vector &, const parallel::distributed::Vector &) const; + vmult_add (LinearAlgebra::distributed::Vector &, const LinearAlgebra::distributed::Vector &) const; template void SparseMatrix:: - Tvmult_add (parallel::distributed::Vector &, const parallel::distributed::Vector &) const; + Tvmult_add (LinearAlgebra::distributed::Vector &, const LinearAlgebra::distributed::Vector &) const; } for (S1, S2, S3: REAL_SCALARS) diff --git a/source/lac/sparse_matrix_inst2.cc b/source/lac/sparse_matrix_inst2.cc index 2452756243..5ac1629a06 100644 --- a/source/lac/sparse_matrix_inst2.cc +++ b/source/lac/sparse_matrix_inst2.cc @@ -16,7 +16,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_precondition.cc b/source/lac/trilinos_precondition.cc index 09457ef9ab..b15fe1e265 100644 --- a/source/lac/trilinos_precondition.cc +++ b/source/lac/trilinos_precondition.cc @@ -703,15 +703,15 @@ namespace TrilinosWrappers } void - PreconditionIdentity::vmult(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + PreconditionIdentity::vmult(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { dst = src; } void - PreconditionIdentity::Tvmult(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + PreconditionIdentity::Tvmult(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { dst = src; } diff --git a/source/lac/trilinos_solver.cc b/source/lac/trilinos_solver.cc index b28637bc55..3c343844f7 100644 --- a/source/lac/trilinos_solver.cc +++ b/source/lac/trilinos_solver.cc @@ -163,8 +163,8 @@ namespace TrilinosWrappers void SolverBase::solve (const SparseMatrix &A, - dealii::parallel::distributed::Vector &x, - const dealii::parallel::distributed::Vector &b, + dealii::LinearAlgebra::distributed::Vector &x, + const dealii::LinearAlgebra::distributed::Vector &b, const PreconditionBase &preconditioner) { linear_problem.reset(); @@ -192,8 +192,8 @@ namespace TrilinosWrappers void SolverBase::solve (Epetra_Operator &A, - dealii::parallel::distributed::Vector &x, - const dealii::parallel::distributed::Vector &b, + dealii::LinearAlgebra::distributed::Vector &x, + const dealii::LinearAlgebra::distributed::Vector &b, const PreconditionBase &preconditioner) { linear_problem.reset(); @@ -616,8 +616,8 @@ namespace TrilinosWrappers void SolverDirect::solve (const SparseMatrix &A, - dealii::parallel::distributed::Vector &x, - const dealii::parallel::distributed::Vector &b) + dealii::LinearAlgebra::distributed::Vector &x, + const dealii::LinearAlgebra::distributed::Vector &b) { AssertDimension (static_cast(x.local_size()), A.domain_partitioner().NumMyElements()); diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc index b8e96e7a2a..9017181b30 100644 --- a/source/lac/trilinos_sparse_matrix.cc +++ b/source/lac/trilinos_sparse_matrix.cc @@ -23,7 +23,7 @@ # include # include # include -# include +# include DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include @@ -2500,8 +2500,8 @@ namespace TrilinosWrappers SparseMatrix::vmult (dealii::Vector &, const dealii::Vector &) const; template void - SparseMatrix::vmult (dealii::parallel::distributed::Vector &, - const dealii::parallel::distributed::Vector &) const; + SparseMatrix::vmult (dealii::LinearAlgebra::distributed::Vector &, + const dealii::LinearAlgebra::distributed::Vector &) const; template void SparseMatrix::Tvmult (VectorBase &, const VectorBase &) const; @@ -2515,8 +2515,8 @@ namespace TrilinosWrappers SparseMatrix::Tvmult (dealii::Vector &, const dealii::Vector &) const; template void - SparseMatrix::Tvmult (dealii::parallel::distributed::Vector &, - const dealii::parallel::distributed::Vector &) const; + SparseMatrix::Tvmult (dealii::LinearAlgebra::distributed::Vector &, + const dealii::LinearAlgebra::distributed::Vector &) const; template void SparseMatrix::vmult_add (VectorBase &, const VectorBase &) const; @@ -2530,8 +2530,8 @@ namespace TrilinosWrappers SparseMatrix::vmult_add (dealii::Vector &, const dealii::Vector &) const; template void - SparseMatrix::vmult_add (dealii::parallel::distributed::Vector &, - const dealii::parallel::distributed::Vector &) const; + SparseMatrix::vmult_add (dealii::LinearAlgebra::distributed::Vector &, + const dealii::LinearAlgebra::distributed::Vector &) const; template void SparseMatrix::Tvmult_add (VectorBase &, const VectorBase &) const; @@ -2545,8 +2545,8 @@ namespace TrilinosWrappers SparseMatrix::Tvmult_add (dealii::Vector &, const dealii::Vector &) const; template void - SparseMatrix::Tvmult_add (dealii::parallel::distributed::Vector &, - const dealii::parallel::distributed::Vector &) const; + SparseMatrix::Tvmult_add (dealii::LinearAlgebra::distributed::Vector &, + const dealii::LinearAlgebra::distributed::Vector &) const; } DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/vector_memory.cc b/source/lac/vector_memory.cc index 9e38ad9b39..5330c0365e 100644 --- a/source/lac/vector_memory.cc +++ b/source/lac/vector_memory.cc @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/meshworker/mesh_worker_vector_selector.cc b/source/meshworker/mesh_worker_vector_selector.cc index b73025c81d..111572ef51 100644 --- a/source/meshworker/mesh_worker_vector_selector.cc +++ b/source/meshworker/mesh_worker_vector_selector.cc @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/multigrid/mg_base.cc b/source/multigrid/mg_base.cc index f2dd74ded2..64c3f71cbc 100644 --- a/source/multigrid/mg_base.cc +++ b/source/multigrid/mg_base.cc @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/multigrid/mg_level_global_transfer.cc b/source/multigrid/mg_level_global_transfer.cc index 12c2ed4698..a74eb04a7a 100644 --- a/source/multigrid/mg_level_global_transfer.cc +++ b/source/multigrid/mg_level_global_transfer.cc @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -385,7 +385,7 @@ MGLevelGlobalTransfer::memory_consumption () const template template void -MGLevelGlobalTransfer >::fill_and_communicate_copy_indices +MGLevelGlobalTransfer >::fill_and_communicate_copy_indices (const DoFHandler &mg_dof) { // first go to the usual routine... @@ -516,7 +516,7 @@ MGLevelGlobalTransfer >::fill_and_communic template void -MGLevelGlobalTransfer >::clear() +MGLevelGlobalTransfer >::clear() { sizes.resize(0); copy_indices.clear(); @@ -532,7 +532,7 @@ MGLevelGlobalTransfer >::clear() template void -MGLevelGlobalTransfer >::print_indices (std::ostream &os) const +MGLevelGlobalTransfer >::print_indices (std::ostream &os) const { for (unsigned int level = 0; level >::print_indices (st template std::size_t -MGLevelGlobalTransfer >::memory_consumption () const +MGLevelGlobalTransfer >::memory_consumption () const { std::size_t result = sizeof(*this); result += MemoryConsumption::memory_consumption(sizes); @@ -581,7 +581,7 @@ MGLevelGlobalTransfer >::memory_consumptio // create an additional instantiation currently not supported by the automatic // template instantiation scheme -template class MGLevelGlobalTransfer >; +template class MGLevelGlobalTransfer >; DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_level_global_transfer.inst.in b/source/multigrid/mg_level_global_transfer.inst.in index 4fee9d260e..908bb1b665 100644 --- a/source/multigrid/mg_level_global_transfer.inst.in +++ b/source/multigrid/mg_level_global_transfer.inst.in @@ -43,21 +43,21 @@ for (deal_II_dimension : DIMENSIONS; V1,V2 : DEAL_II_VEC_TEMPLATES; S1, S2 : REA for (deal_II_dimension : DIMENSIONS) { template - void MGLevelGlobalTransfer< parallel::distributed::Vector >::fill_and_communicate_copy_indices( + void MGLevelGlobalTransfer< LinearAlgebra::distributed::Vector >::fill_and_communicate_copy_indices( const DoFHandler &mg_dof); } for (deal_II_dimension : DIMENSIONS; S1, S2 : REAL_SCALARS) { template void - MGLevelGlobalTransfer >::copy_to_mg ( - const DoFHandler&, MGLevelObject >&, const parallel::distributed::Vector&) const; + MGLevelGlobalTransfer >::copy_to_mg ( + const DoFHandler&, MGLevelObject >&, const LinearAlgebra::distributed::Vector&) const; template void - MGLevelGlobalTransfer >::copy_from_mg (const DoFHandler&, parallel::distributed::Vector&, - const MGLevelObject >&) const; + MGLevelGlobalTransfer >::copy_from_mg (const DoFHandler&, LinearAlgebra::distributed::Vector&, + const MGLevelObject >&) const; template void - MGLevelGlobalTransfer >::copy_from_mg_add (const DoFHandler&, parallel::distributed::Vector&, - const MGLevelObject >&) const; + MGLevelGlobalTransfer >::copy_from_mg_add (const DoFHandler&, LinearAlgebra::distributed::Vector&, + const MGLevelObject >&) const; } for(deal_II_dimension : DIMENSIONS) diff --git a/source/multigrid/mg_transfer_matrix_free.cc b/source/multigrid/mg_transfer_matrix_free.cc index 07efec3005..3c727441cc 100644 --- a/source/multigrid/mg_transfer_matrix_free.cc +++ b/source/multigrid/mg_transfer_matrix_free.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include @@ -77,7 +77,7 @@ void MGTransferMatrixFree::initialize_constraints template void MGTransferMatrixFree::clear () { - this->MGLevelGlobalTransfer >::clear(); + this->MGLevelGlobalTransfer >::clear(); fe_degree = 0; element_is_continuous = false; n_components = 0; @@ -164,7 +164,7 @@ namespace reinit_ghosted_vector(const IndexSet &locally_owned, std::vector &ghosted_level_dofs, const MPI_Comm &communicator, - parallel::distributed::Vector &ghosted_level_vector, + LinearAlgebra::distributed::Vector &ghosted_level_vector, std::vector > ©_indices_global_mine) { std::sort(ghosted_level_dofs.begin(), ghosted_level_dofs.end()); @@ -547,8 +547,8 @@ void MGTransferMatrixFree::build template void MGTransferMatrixFree ::prolongate (const unsigned int to_level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { Assert ((to_level >= 1) && (to_level<=level_dof_indices.size()), ExcIndexRange (to_level, 1, level_dof_indices.size()+1)); @@ -610,8 +610,8 @@ void MGTransferMatrixFree template void MGTransferMatrixFree ::restrict_and_add (const unsigned int from_level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { Assert ((from_level >= 1) && (from_level<=level_dof_indices.size()), ExcIndexRange (from_level, 1, level_dof_indices.size()+1)); @@ -747,8 +747,8 @@ template template void MGTransferMatrixFree ::do_prolongate_add (const unsigned int to_level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { const unsigned int vec_size = VectorizedArray::n_array_elements; const unsigned int n_child_dofs_1d = 2*(fe_degree+1) - element_is_continuous; @@ -835,8 +835,8 @@ template template void MGTransferMatrixFree ::do_restrict_add (const unsigned int from_level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { const unsigned int vec_size = VectorizedArray::n_array_elements; const unsigned int n_child_dofs_1d = 2*(fe_degree+1) - element_is_continuous; @@ -928,7 +928,7 @@ template std::size_t MGTransferMatrixFree::memory_consumption() const { - std::size_t memory = MGLevelGlobalTransfer >::memory_consumption(); + std::size_t memory = MGLevelGlobalTransfer >::memory_consumption(); memory += MemoryConsumption::memory_consumption(level_dof_indices); memory += MemoryConsumption::memory_consumption(parent_child_connect); memory += MemoryConsumption::memory_consumption(n_owned_level_cells); diff --git a/source/multigrid/mg_transfer_prebuilt.cc b/source/multigrid/mg_transfer_prebuilt.cc index ec27b7f8d1..95c6d32a65 100644 --- a/source/multigrid/mg_transfer_prebuilt.cc +++ b/source/multigrid/mg_transfer_prebuilt.cc @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/multigrid/multigrid.cc b/source/multigrid/multigrid.cc index 7d83ea17da..33658dcee1 100644 --- a/source/multigrid/multigrid.cc +++ b/source/multigrid/multigrid.cc @@ -15,8 +15,8 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/source/numerics/data_out_dof_data.cc b/source/numerics/data_out_dof_data.cc index 92a859dff4..7253049b44 100644 --- a/source/numerics/data_out_dof_data.cc +++ b/source/numerics/data_out_dof_data.cc @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/numerics/derivative_approximation.cc b/source/numerics/derivative_approximation.cc index 055a71e985..1490100651 100644 --- a/source/numerics/derivative_approximation.cc +++ b/source/numerics/derivative_approximation.cc @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/numerics/dof_output_operator.cc b/source/numerics/dof_output_operator.cc index c91b21b775..ce11b428a6 100644 --- a/source/numerics/dof_output_operator.cc +++ b/source/numerics/dof_output_operator.cc @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/numerics/error_estimator_1d.cc b/source/numerics/error_estimator_1d.cc index 788488570a..88e335fcd9 100644 --- a/source/numerics/error_estimator_1d.cc +++ b/source/numerics/error_estimator_1d.cc @@ -18,9 +18,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/source/numerics/fe_field_function.cc b/source/numerics/fe_field_function.cc index 12e2eec2c9..3117a90d8c 100644 --- a/source/numerics/fe_field_function.cc +++ b/source/numerics/fe_field_function.cc @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/numerics/point_value_history.cc b/source/numerics/point_value_history.cc index 3ef392f964..21109d40ea 100644 --- a/source/numerics/point_value_history.cc +++ b/source/numerics/point_value_history.cc @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/source/numerics/solution_transfer.cc b/source/numerics/solution_transfer.cc index 1419ce7a31..6e1dc4def2 100644 --- a/source/numerics/solution_transfer.cc +++ b/source/numerics/solution_transfer.cc @@ -21,11 +21,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/tests/bits/fe_tools_06b.cc b/tests/bits/fe_tools_06b.cc index 0ce140eb42..46fc19ee24 100644 --- a/tests/bits/fe_tools_06b.cc +++ b/tests/bits/fe_tools_06b.cc @@ -16,7 +16,7 @@ #include "../tests.h" #include "fe_tools_common.h" -#include +#include #include // check @@ -56,9 +56,9 @@ check_this (const FiniteElement &fe1, cm1.close (); cm2.close (); - parallel::distributed::Vector in (dof1->n_dofs()); + LinearAlgebra::distributed::Vector in (dof1->n_dofs()); for (unsigned int i=0; i out (dof1->n_dofs()); + LinearAlgebra::distributed::Vector out (dof1->n_dofs()); FETools::back_interpolate (*dof1, cm1, in, *dof2, cm2, out); output_vector (out); diff --git a/tests/gla/extract_subvector_to_parallel.cc b/tests/gla/extract_subvector_to_parallel.cc index 926ea8559e..85b0ebdc5f 100644 --- a/tests/gla/extract_subvector_to_parallel.cc +++ b/tests/gla/extract_subvector_to_parallel.cc @@ -21,7 +21,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -87,9 +87,9 @@ int main (int argc, char **argv) { deallog.push("deal.II"); - parallel::distributed::Vector w(local, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector w(local, MPI_COMM_WORLD); set (w); - parallel::distributed::Vector v(local, dense_local, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local, dense_local, MPI_COMM_WORLD); v = w; // get copy of vector including ghost elements test (v); deallog.pop(); @@ -149,9 +149,9 @@ int main (int argc, char **argv) { deallog.push("deal.II"); - parallel::distributed::BlockVector w(partitioning, MPI_COMM_WORLD); + LinearAlgebra::distributed::BlockVector w(partitioning, MPI_COMM_WORLD); set (w); - parallel::distributed::BlockVector v(partitioning, dense_partitioning, MPI_COMM_WORLD); + LinearAlgebra::distributed::BlockVector v(partitioning, dense_partitioning, MPI_COMM_WORLD); v = w; // get copy of vector including ghost elements test (v); deallog.pop(); diff --git a/tests/lac/vector_reinit_01.cc b/tests/lac/vector_reinit_01.cc index c34325ddbf..1bce780f72 100644 --- a/tests/lac/vector_reinit_01.cc +++ b/tests/lac/vector_reinit_01.cc @@ -14,14 +14,14 @@ // --------------------------------------------------------------------- -// check that parallel::distributed::Vector::reinit does not carry over any +// check that LinearAlgebra::distributed::Vector::reinit does not carry over any // state that can lead to invalid memory access. In this test, the MPI // communicator is deleted. #include "../tests.h" #include -#include +#include #include template @@ -103,5 +103,5 @@ int main (int argc, char **argv) initlog(); - do_test >(); + do_test >(); } diff --git a/tests/matrix_free/matrix_vector_10.cc b/tests/matrix_free/matrix_vector_10.cc index a6733055bc..731fc34db6 100644 --- a/tests/matrix_free/matrix_vector_10.cc +++ b/tests/matrix_free/matrix_vector_10.cc @@ -116,8 +116,8 @@ void test () mf_data.reinit (dof, constraints, quad, data); } - MatrixFreeTest > mf (mf_data); - parallel::distributed::Vector in, out, ref; + MatrixFreeTest > mf (mf_data); + LinearAlgebra::distributed::Vector in, out, ref; mf_data.initialize_dof_vector (in); out.reinit (in); ref.reinit (in); diff --git a/tests/matrix_free/matrix_vector_11.cc b/tests/matrix_free/matrix_vector_11.cc index 70770c2453..e1bae7227f 100644 --- a/tests/matrix_free/matrix_vector_11.cc +++ b/tests/matrix_free/matrix_vector_11.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -109,8 +109,8 @@ void test () mf_data.reinit (dof, constraints, quad, data); } - MatrixFreeTest > mf (mf_data); - parallel::distributed::Vector in, out, ref; + MatrixFreeTest > mf (mf_data); + LinearAlgebra::distributed::Vector in, out, ref; mf_data.initialize_dof_vector (in); out.reinit (in); ref.reinit (in); @@ -152,7 +152,7 @@ void test () data.tasks_block_size = 3; mf_data.reinit (dof, constraints, quad, data); - MatrixFreeTest > mf (mf_data); + MatrixFreeTest > mf (mf_data); deallog << "Norm of difference:"; // run 10 times to make a possible error more diff --git a/tests/matrix_free/matrix_vector_12.cc b/tests/matrix_free/matrix_vector_12.cc index 4bda2828ad..5e4cf2ad3a 100644 --- a/tests/matrix_free/matrix_vector_12.cc +++ b/tests/matrix_free/matrix_vector_12.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -45,8 +45,8 @@ template void helmholtz_operator (const MatrixFree &data, - std::vector > &dst, - const std::vector > &src, + std::vector > &dst, + const std::vector > &src, const std::pair &cell_range) { FEEvaluation fe_eval (data); @@ -82,14 +82,14 @@ public: data (data_in) {}; - void vmult (std::vector > &dst, - const std::vector > &src) const + void vmult (std::vector > &dst, + const std::vector > &src) const { for (unsigned int i=0; i &, - std::vector > &, - const std::vector > &, + std::vector > &, + const std::vector > &, const std::pair &)> wrap = helmholtz_operator; data.cell_loop (wrap, dst, src); @@ -172,8 +172,8 @@ void test () } MatrixFreeTest mf (mf_data); - parallel::distributed::Vector ref; - std::vector > in(2), out(2); + LinearAlgebra::distributed::Vector ref; + std::vector > in(2), out(2); for (unsigned int i=0; i<2; ++i) { mf_data.initialize_dof_vector (in[i]); diff --git a/tests/matrix_free/matrix_vector_13.cc b/tests/matrix_free/matrix_vector_13.cc index e7a0917c6d..f8d863cc32 100644 --- a/tests/matrix_free/matrix_vector_13.cc +++ b/tests/matrix_free/matrix_vector_13.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -46,8 +46,8 @@ template void helmholtz_operator (const MatrixFree &data, - parallel::distributed::BlockVector &dst, - const parallel::distributed::BlockVector &src, + LinearAlgebra::distributed::BlockVector &dst, + const LinearAlgebra::distributed::BlockVector &src, const std::pair &cell_range) { FEEvaluation fe_eval (data); @@ -83,13 +83,13 @@ public: data (data_in) {}; - void vmult (parallel::distributed::BlockVector &dst, - const parallel::distributed::BlockVector &src) const + void vmult (LinearAlgebra::distributed::BlockVector &dst, + const LinearAlgebra::distributed::BlockVector &src) const { dst = 0; const std_cxx11::function &, - parallel::distributed::BlockVector &, - const parallel::distributed::BlockVector &, + LinearAlgebra::distributed::BlockVector &, + const LinearAlgebra::distributed::BlockVector &, const std::pair &)> wrap = helmholtz_operator; data.cell_loop (wrap, dst, src); @@ -172,8 +172,8 @@ void test () } MatrixFreeTest mf (mf_data); - parallel::distributed::Vector ref; - parallel::distributed::BlockVector in(2), out(2); + LinearAlgebra::distributed::Vector ref; + LinearAlgebra::distributed::BlockVector in(2), out(2); for (unsigned int i=0; i<2; ++i) { mf_data.initialize_dof_vector (in.block(i)); diff --git a/tests/matrix_free/matrix_vector_mf.h b/tests/matrix_free/matrix_vector_mf.h index e3efc81c0d..3b713a16e6 100644 --- a/tests/matrix_free/matrix_vector_mf.h +++ b/tests/matrix_free/matrix_vector_mf.h @@ -15,7 +15,7 @@ #include #include -#include +#include template diff --git a/tests/matrix_free/parallel_multigrid.cc b/tests/matrix_free/parallel_multigrid.cc index 8b70abe32b..56a5099934 100644 --- a/tests/matrix_free/parallel_multigrid.cc +++ b/tests/matrix_free/parallel_multigrid.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -110,28 +110,28 @@ public: compute_inverse_diagonal(); } - void vmult(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { dst = 0; vmult_add(dst, src); } - void Tvmult(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void Tvmult(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { dst = 0; vmult_add(dst, src); } - void Tvmult_add(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void Tvmult_add(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { vmult_add(dst, src); } - void vmult_add(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult_add(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { data.cell_loop (&LaplaceOperator::local_apply, this, dst, src); @@ -159,7 +159,7 @@ public: } void - initialize_dof_vector(parallel::distributed::Vector &vector) const + initialize_dof_vector(LinearAlgebra::distributed::Vector &vector) const { if (!vector.partitioners_are_compatible(*data.get_dof_info(0).vector_partitioner)) data.initialize_dof_vector(vector); @@ -167,7 +167,7 @@ public: ExcInternalError()); } - const parallel::distributed::Vector & + const LinearAlgebra::distributed::Vector & get_matrix_diagonal_inverse() const { Assert(inverse_diagonal_entries.size() > 0, ExcNotInitialized()); @@ -178,8 +178,8 @@ public: private: void local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src, + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src, const std::pair &cell_range) const { FEEvaluation phi (data); @@ -213,7 +213,7 @@ private: void local_diagonal_cell (const MatrixFree &data, - parallel::distributed::Vector &dst, + LinearAlgebra::distributed::Vector &dst, const unsigned int &, const std::pair &cell_range) const { @@ -242,13 +242,13 @@ private: } MatrixFree data; - parallel::distributed::Vector inverse_diagonal_entries; + LinearAlgebra::distributed::Vector inverse_diagonal_entries; }; template -class MGTransferPrebuiltMF : public MGTransferPrebuilt > +class MGTransferPrebuiltMF : public MGTransferPrebuilt > { public: MGTransferPrebuiltMF(const MGLevelObject &laplace) @@ -263,13 +263,13 @@ public: template void copy_to_mg (const DoFHandler &mg_dof, - MGLevelObject > &dst, + MGLevelObject > &dst, const InVector &src) const { for (unsigned int level=dst.min_level(); level<=dst.max_level(); ++level) laplace_operator[level].initialize_dof_vector(dst[level]); - MGTransferPrebuilt >::copy_to_mg(mg_dof, dst, src); + MGTransferPrebuilt >::copy_to_mg(mg_dof, dst, src); } private: @@ -279,7 +279,7 @@ private: template -class MGCoarseIterative : public MGCoarseGridBase > +class MGCoarseIterative : public MGCoarseGridBase > { public: MGCoarseIterative() {} @@ -290,11 +290,11 @@ public: } virtual void operator() (const unsigned int level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { ReductionControl solver_control (1e4, 1e-50, 1e-10); - SolverCG > solver_coarse (solver_control); + SolverCG > solver_coarse (solver_control); solver_coarse.solve (*coarse_matrix, dst, src, PreconditionIdentity()); } @@ -327,7 +327,7 @@ void do_test (const DoFHandler &dof) dirichlet_boundaries.insert(0); fine_matrix.initialize(mapping, dof, dirichlet_boundaries); - parallel::distributed::Vector in, sol; + LinearAlgebra::distributed::Vector in, sol; fine_matrix.initialize_dof_vector(in); fine_matrix.initialize_dof_vector(sol); @@ -350,8 +350,8 @@ void do_test (const DoFHandler &dof) MGCoarseIterative mg_coarse; mg_coarse.initialize(mg_matrices[0]); - typedef PreconditionChebyshev > SMOOTHER; - MGSmootherPrecondition > + typedef PreconditionChebyshev > SMOOTHER; + MGSmootherPrecondition > mg_smoother; MGLevelObject smoother_data; @@ -366,22 +366,22 @@ void do_test (const DoFHandler &dof) } mg_smoother.initialize(mg_matrices, smoother_data); - mg::Matrix > + mg::Matrix > mg_matrix(mg_matrices); - Multigrid > mg(dof, - mg_matrix, - mg_coarse, - mg_transfer, - mg_smoother, - mg_smoother); - PreconditionMG, + Multigrid > mg(dof, + mg_matrix, + mg_coarse, + mg_transfer, + mg_smoother, + mg_smoother); + PreconditionMG, MGTransferPrebuiltMF > preconditioner(dof, mg, mg_transfer); { ReductionControl control(30, 1e-20, 1e-7); - SolverCG > solver(control); + SolverCG > solver(control); solver.solve(fine_matrix, sol, in, preconditioner); } diff --git a/tests/matrix_free/parallel_multigrid_adaptive.cc b/tests/matrix_free/parallel_multigrid_adaptive.cc index c71f490db8..b134b460b5 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -103,28 +103,28 @@ public: compute_inverse_diagonal(); } - void vmult(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { dst = 0; vmult_add(dst, src); } - void Tvmult(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void Tvmult(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { dst = 0; vmult_add(dst, src); } - void Tvmult_add(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void Tvmult_add(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { vmult_add(dst, src); } - void vmult_add(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult_add(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { Assert(src.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); Assert(dst.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); @@ -136,7 +136,7 @@ public: edge_constrained_values[i] = std::pair(src.local_element(edge_constrained_indices[i]), dst.local_element(edge_constrained_indices[i])); - const_cast&>(src).local_element(edge_constrained_indices[i]) = 0.; + const_cast&>(src).local_element(edge_constrained_indices[i]) = 0.; } data.cell_loop (&LaplaceOperator::local_apply, @@ -151,13 +151,13 @@ public: // destination for (unsigned int i=0; i&>(src).local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; + const_cast&>(src).local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; dst.local_element(edge_constrained_indices[i]) = edge_constrained_values[i].second + edge_constrained_values[i].first; } } - void vmult_interface_down(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult_interface_down(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { Assert(src.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); Assert(dst.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); @@ -172,7 +172,7 @@ public: for (unsigned int i=0; i&>(src).local_element(edge_constrained_indices[i]) = 0.; + const_cast&>(src).local_element(edge_constrained_indices[i]) = 0.; edge_constrained_values[i] = std::pair(src_val, dst.local_element(edge_constrained_indices[i])); } @@ -188,14 +188,14 @@ public: ++c; // reset the src values - const_cast&>(src).local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; + const_cast&>(src).local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; } for ( ; c &dst, - const parallel::distributed::Vector &src) const + void vmult_interface_up(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { Assert(src.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); Assert(dst.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); @@ -205,7 +205,7 @@ public: if (!have_interface_matrices) return; - parallel::distributed::Vector src_cpy (src); + LinearAlgebra::distributed::Vector src_cpy (src); unsigned int c=0; for (unsigned int i=0; i &vector) const + initialize_dof_vector(LinearAlgebra::distributed::Vector &vector) const { if (!vector.partitioners_are_compatible(*data.get_dof_info(0).vector_partitioner)) data.initialize_dof_vector(vector); @@ -249,7 +249,7 @@ public: ExcInternalError()); } - const parallel::distributed::Vector & + const LinearAlgebra::distributed::Vector & get_matrix_diagonal_inverse() const { Assert(inverse_diagonal_entries.size() > 0, ExcNotInitialized()); @@ -260,8 +260,8 @@ public: private: void local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src, + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src, const std::pair &cell_range) const { FEEvaluation phi (data); @@ -305,7 +305,7 @@ private: void local_diagonal_cell (const MatrixFree &data, - parallel::distributed::Vector &dst, + LinearAlgebra::distributed::Vector &dst, const unsigned int &, const std::pair &cell_range) const { @@ -334,7 +334,7 @@ private: } MatrixFree data; - parallel::distributed::Vector inverse_diagonal_entries; + LinearAlgebra::distributed::Vector inverse_diagonal_entries; std::vector edge_constrained_indices; mutable std::vector > edge_constrained_values; bool have_interface_matrices; @@ -351,14 +351,14 @@ public: this->laplace = &laplace; } - void vmult (parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult (LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { laplace->vmult_interface_down(dst, src); } - void Tvmult (parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void Tvmult (LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { laplace->vmult_interface_up(dst, src); } @@ -370,15 +370,15 @@ private: template -class MGTransferMF : public MGTransferPrebuilt > +class MGTransferMF : public MGTransferPrebuilt > { public: MGTransferMF(const MGLevelObject &laplace, const ConstraintMatrix &hanging_node_constraints, const MGConstrainedDoFs &mg_constrained_dofs) : - MGTransferPrebuilt >(hanging_node_constraints, - mg_constrained_dofs), + MGTransferPrebuilt >(hanging_node_constraints, + mg_constrained_dofs), laplace_operator (laplace) { } @@ -391,13 +391,13 @@ public: template void copy_to_mg (const DoFHandler &mg_dof_handler, - MGLevelObject > &dst, + MGLevelObject > &dst, const InVector &src) const { for (unsigned int level=dst.min_level(); level<=dst.max_level(); ++level) laplace_operator[level].initialize_dof_vector(dst[level]); - MGTransferPrebuilt >:: + MGTransferPrebuilt >:: copy_to_mg(mg_dof_handler, dst, src); } @@ -408,7 +408,7 @@ private: template -class MGCoarseIterative : public MGCoarseGridBase > +class MGCoarseIterative : public MGCoarseGridBase > { public: MGCoarseIterative() {} @@ -419,11 +419,11 @@ public: } virtual void operator() (const unsigned int level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { ReductionControl solver_control (1e4, 1e-50, 1e-10); - SolverCG > solver_coarse (solver_control); + SolverCG > solver_coarse (solver_control); solver_coarse.solve (*coarse_matrix, dst, src, PreconditionIdentity()); } @@ -468,7 +468,7 @@ void do_test (const DoFHandler &dof) fine_matrix.initialize(mapping, dof, mg_constrained_dofs, dirichlet_boundary, numbers::invalid_unsigned_int); - parallel::distributed::Vector in, sol; + LinearAlgebra::distributed::Vector in, sol; fine_matrix.initialize_dof_vector(in); fine_matrix.initialize_dof_vector(sol); @@ -500,8 +500,8 @@ void do_test (const DoFHandler &dof) MGCoarseIterative mg_coarse; mg_coarse.initialize(mg_matrices[0]); - typedef PreconditionChebyshev > SMOOTHER; - MGSmootherPrecondition > + typedef PreconditionChebyshev > SMOOTHER; + MGSmootherPrecondition > mg_smoother; MGLevelObject smoother_data; @@ -516,25 +516,25 @@ void do_test (const DoFHandler &dof) } mg_smoother.initialize(mg_matrices, smoother_data); - mg::Matrix > + mg::Matrix > mg_matrix(mg_matrices); - mg::Matrix > + mg::Matrix > mg_interface(mg_interface_matrices); - Multigrid > mg(dof, - mg_matrix, - mg_coarse, - mg_transfer, - mg_smoother, - mg_smoother); + Multigrid > mg(dof, + mg_matrix, + mg_coarse, + mg_transfer, + mg_smoother, + mg_smoother); mg.set_edge_matrices(mg_interface, mg_interface); - PreconditionMG, + PreconditionMG, MGTransferMF > preconditioner(dof, mg, mg_transfer); { ReductionControl control(30, 1e-20, 1e-7); - SolverCG > solver(control); + SolverCG > solver(control); solver.solve(fine_matrix, sol, in, preconditioner); } diff --git a/tests/matrix_free/parallel_multigrid_adaptive_mf.cc b/tests/matrix_free/parallel_multigrid_adaptive_mf.cc index 10e5099e66..bcd35df53d 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_mf.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_mf.cc @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -102,28 +102,28 @@ public: compute_inverse_diagonal(); } - void vmult(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { dst = 0; vmult_add(dst, src); } - void Tvmult(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void Tvmult(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { dst = 0; vmult_add(dst, src); } - void Tvmult_add(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void Tvmult_add(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { vmult_add(dst, src); } - void vmult_add(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult_add(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { Assert(src.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); Assert(dst.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); @@ -135,7 +135,7 @@ public: edge_constrained_values[i] = std::pair(src.local_element(edge_constrained_indices[i]), dst.local_element(edge_constrained_indices[i])); - const_cast&>(src).local_element(edge_constrained_indices[i]) = 0.; + const_cast&>(src).local_element(edge_constrained_indices[i]) = 0.; } data.cell_loop (&LaplaceOperator::local_apply, @@ -150,13 +150,13 @@ public: // destination for (unsigned int i=0; i&>(src).local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; + const_cast&>(src).local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; dst.local_element(edge_constrained_indices[i]) = edge_constrained_values[i].second + edge_constrained_values[i].first; } } - void vmult_interface_down(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult_interface_down(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { Assert(src.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); Assert(dst.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); @@ -171,7 +171,7 @@ public: for (unsigned int i=0; i&>(src).local_element(edge_constrained_indices[i]) = 0.; + const_cast&>(src).local_element(edge_constrained_indices[i]) = 0.; edge_constrained_values[i] = std::pair(src_val, dst.local_element(edge_constrained_indices[i])); } @@ -187,14 +187,14 @@ public: ++c; // reset the src values - const_cast&>(src).local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; + const_cast&>(src).local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; } for ( ; c &dst, - const parallel::distributed::Vector &src) const + void vmult_interface_up(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { Assert(src.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); Assert(dst.partitioners_are_globally_compatible(*data.get_dof_info(0).vector_partitioner), ExcInternalError()); @@ -204,7 +204,7 @@ public: if (!have_interface_matrices) return; - parallel::distributed::Vector src_cpy (src); + LinearAlgebra::distributed::Vector src_cpy (src); unsigned int c=0; for (unsigned int i=0; i &vector) const + initialize_dof_vector(LinearAlgebra::distributed::Vector &vector) const { if (!vector.partitioners_are_compatible(*data.get_dof_info(0).vector_partitioner)) data.initialize_dof_vector(vector); @@ -248,7 +248,7 @@ public: ExcInternalError()); } - const parallel::distributed::Vector & + const LinearAlgebra::distributed::Vector & get_matrix_diagonal_inverse() const { Assert(inverse_diagonal_entries.size() > 0, ExcNotInitialized()); @@ -259,8 +259,8 @@ public: private: void local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src, + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src, const std::pair &cell_range) const { FEEvaluation phi (data); @@ -304,7 +304,7 @@ private: void local_diagonal_cell (const MatrixFree &data, - parallel::distributed::Vector &dst, + LinearAlgebra::distributed::Vector &dst, const unsigned int &, const std::pair &cell_range) const { @@ -333,7 +333,7 @@ private: } MatrixFree data; - parallel::distributed::Vector inverse_diagonal_entries; + LinearAlgebra::distributed::Vector inverse_diagonal_entries; std::vector edge_constrained_indices; mutable std::vector > edge_constrained_values; bool have_interface_matrices; @@ -350,14 +350,14 @@ public: this->laplace = &laplace; } - void vmult (parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult (LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { laplace->vmult_interface_down(dst, src); } - void Tvmult (parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void Tvmult (LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { laplace->vmult_interface_up(dst, src); } @@ -388,13 +388,13 @@ public: template void copy_to_mg (const DoFHandler &mg_dof_handler, - MGLevelObject > &dst, + MGLevelObject > &dst, const InVector &src) const { for (unsigned int level=dst.min_level(); level<=dst.max_level(); ++level) laplace_operator[level].initialize_dof_vector(dst[level]); - MGLevelGlobalTransfer >:: + MGLevelGlobalTransfer >:: copy_to_mg(mg_dof_handler, dst, src); } @@ -405,7 +405,7 @@ private: template -class MGCoarseIterative : public MGCoarseGridBase > +class MGCoarseIterative : public MGCoarseGridBase > { public: MGCoarseIterative() {} @@ -416,11 +416,11 @@ public: } virtual void operator() (const unsigned int level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { ReductionControl solver_control (1e4, 1e-50, 1e-10); - SolverCG > solver_coarse (solver_control); + SolverCG > solver_coarse (solver_control); solver_coarse.solve (*coarse_matrix, dst, src, PreconditionIdentity()); } @@ -455,7 +455,7 @@ void do_test (const DoFHandler &dof) fine_matrix.initialize(mapping, dof, mg_constrained_dofs, dirichlet_boundary, numbers::invalid_unsigned_int); - parallel::distributed::Vector in, sol; + LinearAlgebra::distributed::Vector in, sol; fine_matrix.initialize_dof_vector(in); fine_matrix.initialize_dof_vector(sol); @@ -486,8 +486,8 @@ void do_test (const DoFHandler &dof) MGCoarseIterative mg_coarse; mg_coarse.initialize(mg_matrices[0]); - typedef PreconditionChebyshev > SMOOTHER; - MGSmootherPrecondition > + typedef PreconditionChebyshev > SMOOTHER; + MGSmootherPrecondition > mg_smoother; MGLevelObject smoother_data; @@ -506,19 +506,19 @@ void do_test (const DoFHandler &dof) deallog.depth_file(0); mg_smoother.initialize(mg_matrices, smoother_data); - mg::Matrix > + mg::Matrix > mg_matrix(mg_matrices); - mg::Matrix > + mg::Matrix > mg_interface(mg_interface_matrices); - Multigrid > mg(dof, - mg_matrix, - mg_coarse, - mg_transfer, - mg_smoother, - mg_smoother); + Multigrid > mg(dof, + mg_matrix, + mg_coarse, + mg_transfer, + mg_smoother, + mg_smoother); mg.set_edge_matrices(mg_interface, mg_interface); - PreconditionMG, + PreconditionMG, MGTransferMF > preconditioner(dof, mg, mg_transfer); @@ -526,7 +526,7 @@ void do_test (const DoFHandler &dof) // avoid output from inner (coarse-level) solver deallog.depth_file(2); ReductionControl control(30, 1e-20, 1e-7); - SolverCG > solver(control); + SolverCG > solver(control); solver.solve(fine_matrix, sol, in, preconditioner); } } diff --git a/tests/matrix_free/parallel_multigrid_mf.cc b/tests/matrix_free/parallel_multigrid_mf.cc index 1674f7c430..5ff611f1cf 100644 --- a/tests/matrix_free/parallel_multigrid_mf.cc +++ b/tests/matrix_free/parallel_multigrid_mf.cc @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -109,28 +109,28 @@ public: compute_inverse_diagonal(); } - void vmult(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { dst = 0; vmult_add(dst, src); } - void Tvmult(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void Tvmult(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { dst = 0; vmult_add(dst, src); } - void Tvmult_add(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void Tvmult_add(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { vmult_add(dst, src); } - void vmult_add(parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + void vmult_add(LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { data.cell_loop (&LaplaceOperator::local_apply, this, dst, src); @@ -158,7 +158,7 @@ public: } void - initialize_dof_vector(parallel::distributed::Vector &vector) const + initialize_dof_vector(LinearAlgebra::distributed::Vector &vector) const { if (!vector.partitioners_are_compatible(*data.get_dof_info(0).vector_partitioner)) data.initialize_dof_vector(vector); @@ -166,7 +166,7 @@ public: ExcInternalError()); } - const parallel::distributed::Vector & + const LinearAlgebra::distributed::Vector & get_matrix_diagonal_inverse() const { Assert(inverse_diagonal_entries.size() > 0, ExcNotInitialized()); @@ -177,8 +177,8 @@ public: private: void local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src, + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src, const std::pair &cell_range) const { FEEvaluation phi (data); @@ -212,7 +212,7 @@ private: void local_diagonal_cell (const MatrixFree &data, - parallel::distributed::Vector &dst, + LinearAlgebra::distributed::Vector &dst, const unsigned int &, const std::pair &cell_range) const { @@ -241,7 +241,7 @@ private: } MatrixFree data; - parallel::distributed::Vector inverse_diagonal_entries; + LinearAlgebra::distributed::Vector inverse_diagonal_entries; }; @@ -264,13 +264,13 @@ public: template void copy_to_mg (const DoFHandler &mg_dof, - MGLevelObject > &dst, + MGLevelObject > &dst, const InVector &src) const { for (unsigned int level=dst.min_level(); level<=dst.max_level(); ++level) laplace_operator[level].initialize_dof_vector(dst[level]); - MGLevelGlobalTransfer >::copy_to_mg(mg_dof, dst, src); + MGLevelGlobalTransfer >::copy_to_mg(mg_dof, dst, src); } private: @@ -280,7 +280,7 @@ private: template -class MGCoarseIterative : public MGCoarseGridBase > +class MGCoarseIterative : public MGCoarseGridBase > { public: MGCoarseIterative() {} @@ -291,11 +291,11 @@ public: } virtual void operator() (const unsigned int level, - parallel::distributed::Vector &dst, - const parallel::distributed::Vector &src) const + LinearAlgebra::distributed::Vector &dst, + const LinearAlgebra::distributed::Vector &src) const { ReductionControl solver_control (1e4, 1e-50, 1e-10); - SolverCG > solver_coarse (solver_control); + SolverCG > solver_coarse (solver_control); solver_coarse.solve (*coarse_matrix, dst, src, PreconditionIdentity()); } @@ -318,7 +318,7 @@ void do_test (const DoFHandler &dof) dirichlet_boundaries.insert(0); fine_matrix.initialize(mapping, dof, dirichlet_boundaries); - parallel::distributed::Vector in, sol; + LinearAlgebra::distributed::Vector in, sol; fine_matrix.initialize_dof_vector(in); fine_matrix.initialize_dof_vector(sol); @@ -347,8 +347,8 @@ void do_test (const DoFHandler &dof) MGCoarseIterative mg_coarse; mg_coarse.initialize(mg_matrices[0]); - typedef PreconditionChebyshev > SMOOTHER; - MGSmootherPrecondition > + typedef PreconditionChebyshev > SMOOTHER; + MGSmootherPrecondition > mg_smoother; MGLevelObject smoother_data; @@ -367,16 +367,16 @@ void do_test (const DoFHandler &dof) deallog.depth_file(0); mg_smoother.initialize(mg_matrices, smoother_data); - mg::Matrix > + mg::Matrix > mg_matrix(mg_matrices); - Multigrid > mg(dof, - mg_matrix, - mg_coarse, - mg_transfer, - mg_smoother, - mg_smoother); - PreconditionMG, + Multigrid > mg(dof, + mg_matrix, + mg_coarse, + mg_transfer, + mg_smoother, + mg_smoother); + PreconditionMG, MGTransferPrebuiltMF > preconditioner(dof, mg, mg_transfer); @@ -384,7 +384,7 @@ void do_test (const DoFHandler &dof) // avoid output from inner (coarse-level) solver deallog.depth_file(2); ReductionControl control(30, 1e-20, 1e-7); - SolverCG > solver(control); + SolverCG > solver(control); solver.solve(fine_matrix, sol, in, preconditioner); } } diff --git a/tests/matrix_free/step-48.cc b/tests/matrix_free/step-48.cc index 20484692cd..38976a6666 100644 --- a/tests/matrix_free/step-48.cc +++ b/tests/matrix_free/step-48.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -62,17 +62,17 @@ namespace Step48 SineGordonOperation(const MatrixFree &data_in, const double time_step); - void apply (parallel::distributed::Vector &dst, - const std::vector*> &src) const; + void apply (LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src) const; private: const MatrixFree &data; const VectorizedArray delta_t_sqr; - parallel::distributed::Vector inv_mass_matrix; + LinearAlgebra::distributed::Vector inv_mass_matrix; void local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const std::vector*> &src, + LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src, const std::pair &cell_range) const; }; @@ -118,8 +118,8 @@ namespace Step48 template void SineGordonOperation:: local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const std::vector*> &src, + LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src, const std::pair &cell_range) const { AssertDimension (src.size(), 2); @@ -156,8 +156,8 @@ namespace Step48 template void SineGordonOperation:: - apply (parallel::distributed::Vector &dst, - const std::vector*> &src) const + apply (LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src) const { dst = 0; data.cell_loop (&SineGordonOperation::local_apply, @@ -220,7 +220,7 @@ namespace Step48 MatrixFree matrix_free_data; - parallel::distributed::Vector solution, old_solution, old_old_solution; + LinearAlgebra::distributed::Vector solution, old_solution, old_old_solution; const unsigned int n_global_refinements; double time, time_step; @@ -360,7 +360,7 @@ namespace Step48 old_solution); output_results (0); - std::vector*> previous_solutions; + std::vector*> previous_solutions; previous_solutions.push_back(&old_solution); previous_solutions.push_back(&old_old_solution); diff --git a/tests/matrix_free/step-48b.cc b/tests/matrix_free/step-48b.cc index 99f46480a4..57f2cb0c87 100644 --- a/tests/matrix_free/step-48b.cc +++ b/tests/matrix_free/step-48b.cc @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include @@ -57,17 +57,17 @@ namespace Step48 SineGordonOperation(const MatrixFree &data_in, const double time_step); - void apply (parallel::distributed::Vector &dst, - const std::vector*> &src) const; + void apply (LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src) const; private: const MatrixFree &data; const VectorizedArray delta_t_sqr; - parallel::distributed::Vector inv_mass_matrix; + LinearAlgebra::distributed::Vector inv_mass_matrix; void local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const std::vector*> &src, + LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src, const std::pair &cell_range) const; }; @@ -113,8 +113,8 @@ namespace Step48 template void SineGordonOperation:: local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const std::vector*> &src, + LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src, const std::pair &cell_range) const { AssertDimension (src.size(), 2); @@ -164,8 +164,8 @@ namespace Step48 template void SineGordonOperation:: - apply (parallel::distributed::Vector &dst, - const std::vector*> &src) const + apply (LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src) const { dst = 0; data.cell_loop (&SineGordonOperation::local_apply, @@ -214,7 +214,7 @@ namespace Step48 MatrixFree matrix_free_data; - parallel::distributed::Vector solution, old_solution, old_old_solution; + LinearAlgebra::distributed::Vector solution, old_solution, old_old_solution; const unsigned int n_global_refinements; double time, time_step; @@ -322,7 +322,7 @@ namespace Step48 old_solution); output_norm (); - std::vector*> previous_solutions; + std::vector*> previous_solutions; previous_solutions.push_back(&old_solution); previous_solutions.push_back(&old_old_solution); diff --git a/tests/matrix_free/step-48c.cc b/tests/matrix_free/step-48c.cc index 2a44a04b8b..37737ac297 100644 --- a/tests/matrix_free/step-48c.cc +++ b/tests/matrix_free/step-48c.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -62,17 +62,17 @@ namespace Step48 SineGordonOperation(const MatrixFree &data_in, const double time_step); - void apply (parallel::distributed::Vector &dst, - const std::vector*> &src) const; + void apply (LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src) const; private: const MatrixFree &data; const VectorizedArray delta_t_sqr; - parallel::distributed::Vector inv_mass_matrix; + LinearAlgebra::distributed::Vector inv_mass_matrix; void local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const std::vector*> &src, + LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src, const std::pair &cell_range) const; }; @@ -118,8 +118,8 @@ namespace Step48 template void SineGordonOperation:: local_apply (const MatrixFree &data, - parallel::distributed::Vector &dst, - const std::vector*> &src, + LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src, const std::pair &cell_range) const { AssertDimension (src.size(), 2); @@ -155,8 +155,8 @@ namespace Step48 template void SineGordonOperation:: - apply (parallel::distributed::Vector &dst, - const std::vector*> &src) const + apply (LinearAlgebra::distributed::Vector &dst, + const std::vector*> &src) const { dst = 0; data.cell_loop (&SineGordonOperation::local_apply, @@ -209,7 +209,7 @@ namespace Step48 MatrixFree matrix_free_data; - parallel::distributed::Vector solution, old_solution, old_old_solution; + LinearAlgebra::distributed::Vector solution, old_solution, old_old_solution; const unsigned int n_global_refinements; double time, time_step; @@ -331,7 +331,7 @@ namespace Step48 old_solution); output_results (0); - std::vector*> previous_solutions; + std::vector*> previous_solutions; previous_solutions.push_back(&old_solution); previous_solutions.push_back(&old_old_solution); diff --git a/tests/mpi/constraint_matrix_crash_01.cc b/tests/mpi/constraint_matrix_crash_01.cc index 61888f2355..abe2ffbf76 100644 --- a/tests/mpi/constraint_matrix_crash_01.cc +++ b/tests/mpi/constraint_matrix_crash_01.cc @@ -19,10 +19,10 @@ #include "../tests.h" #include -#include +#include #include #include -#include +#include #include diff --git a/tests/mpi/constraint_matrix_set_zero_02.cc b/tests/mpi/constraint_matrix_set_zero_02.cc index 1d69296cc7..237bbf8436 100644 --- a/tests/mpi/constraint_matrix_set_zero_02.cc +++ b/tests/mpi/constraint_matrix_set_zero_02.cc @@ -19,10 +19,10 @@ #include "../tests.h" #include -#include +#include #include #include -#include +#include #include @@ -42,7 +42,7 @@ void test () local_active[1].set_size(2*numproc); local_active[1].add_range(myid*2,myid*2+2); - parallel::distributed::BlockVector v(2); + LinearAlgebra::distributed::BlockVector v(2); v.block(0).reinit(local_active[0], complete_index_set(numproc), MPI_COMM_WORLD); v.block(1).reinit(local_active[1], complete_index_set(2*numproc), MPI_COMM_WORLD); v.collect_sizes(); diff --git a/tests/mpi/parallel_block_vector_01.cc b/tests/mpi/parallel_block_vector_01.cc index e76fda085d..4da9868d35 100644 --- a/tests/mpi/parallel_block_vector_01.cc +++ b/tests/mpi/parallel_block_vector_01.cc @@ -20,8 +20,8 @@ #include "../tests.h" #include #include -#include -#include +#include +#include #include #include #include @@ -46,8 +46,8 @@ void test () local_relevant = local_owned; local_relevant.add_range(1,2); - parallel::distributed::Vector v(local_owned, local_relevant, - MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, + MPI_COMM_WORLD); // set local values if (myid < 8) @@ -63,7 +63,7 @@ void test () AssertThrow (v(myid*2+1) == myid*4.0+2.0, ExcInternalError()); } - parallel::distributed::BlockVector w(3); + LinearAlgebra::distributed::BlockVector w(3); for (unsigned int i=0; i<3; ++i) w.block(i) = v; w.collect_sizes(); @@ -121,7 +121,7 @@ void test () const double norm_sqr = w.l2_norm() * w.l2_norm(); AssertThrow (std::fabs(w * w - norm_sqr) < 1e-12, ExcInternalError()); - parallel::distributed::BlockVector w2; + LinearAlgebra::distributed::BlockVector w2; w2 = w; AssertThrow (std::fabs(w2 * w - norm_sqr) < 1e-12, ExcInternalError()); @@ -138,7 +138,7 @@ void test () bool allzero = w.all_zero(); if (myid == 0) deallog << " v==0 ? " << allzero << std::endl; - parallel::distributed::BlockVector w2; + LinearAlgebra::distributed::BlockVector w2; w2.reinit (w); allzero = w2.all_zero(); if (myid == 0) diff --git a/tests/mpi/parallel_block_vector_02.cc b/tests/mpi/parallel_block_vector_02.cc index e90bcd8b04..0007eda4ff 100644 --- a/tests/mpi/parallel_block_vector_02.cc +++ b/tests/mpi/parallel_block_vector_02.cc @@ -19,8 +19,8 @@ #include "../tests.h" #include #include -#include -#include +#include +#include #include #include #include @@ -43,8 +43,8 @@ void test () local_relevant = local_owned; local_relevant.add_range(1,2); - parallel::distributed::Vector v(local_owned, local_relevant, - MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, + MPI_COMM_WORLD); // set local values if (myid < 8) @@ -54,7 +54,7 @@ void test () } v.compress(VectorOperation::insert); - parallel::distributed::BlockVector w(3); + LinearAlgebra::distributed::BlockVector w(3); for (unsigned int i=0; i<3; ++i) { w.block(i) = v; @@ -95,7 +95,7 @@ void test () // create a vector copy that gets the entries from w. First, it should not // have updated the ghosts because it is created from an empty state. - parallel::distributed::BlockVector x(w); + LinearAlgebra::distributed::BlockVector x(w); Assert(x.has_ghost_elements() == false, ExcInternalError()); for (unsigned int i=0; i<3; ++i) if (myid == 0) diff --git a/tests/mpi/parallel_vector_01.cc b/tests/mpi/parallel_vector_01.cc index 1ceb26b976..1ef0f987c2 100644 --- a/tests/mpi/parallel_vector_01.cc +++ b/tests/mpi/parallel_vector_01.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -38,7 +38,7 @@ void test () IndexSet local_owned(numproc*2); local_owned.add_range(myid*2,myid*2+2); - parallel::distributed::Vector v(local_owned, local_owned, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_owned, MPI_COMM_WORLD); // set local values v(myid*2)=myid*2.0; diff --git a/tests/mpi/parallel_vector_02.cc b/tests/mpi/parallel_vector_02.cc index 709e50ac9c..815ca49156 100644 --- a/tests/mpi/parallel_vector_02.cc +++ b/tests/mpi/parallel_vector_02.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ void test () local_relevant = local_owned; local_relevant.add_range(1,2); - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); // set local values and check them v(myid*2)=myid*2.0; diff --git a/tests/mpi/parallel_vector_03.cc b/tests/mpi/parallel_vector_03.cc index 75a2e1e438..b45e6dee99 100644 --- a/tests/mpi/parallel_vector_03.cc +++ b/tests/mpi/parallel_vector_03.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ void test () local_relevant = local_owned; local_relevant.add_range(1,2); - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); // set local values and check them v(myid*2)=myid*2.0; diff --git a/tests/mpi/parallel_vector_04.cc b/tests/mpi/parallel_vector_04.cc index 161a944a83..e893fd1b97 100644 --- a/tests/mpi/parallel_vector_04.cc +++ b/tests/mpi/parallel_vector_04.cc @@ -20,7 +20,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -42,7 +42,7 @@ void test () local_relevant = local_owned; local_relevant.add_range(1,2); - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); // set local values and check them v(myid*2)=myid*2.0; diff --git a/tests/mpi/parallel_vector_05.cc b/tests/mpi/parallel_vector_05.cc index 8c940956f1..02cfce54ed 100644 --- a/tests/mpi/parallel_vector_05.cc +++ b/tests/mpi/parallel_vector_05.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ void test () local_relevant = local_owned; local_relevant.add_range(1,2); - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); // set local values and check them v(myid*2)=myid*2.0; diff --git a/tests/mpi/parallel_vector_06.cc b/tests/mpi/parallel_vector_06.cc index 0ad8c1e430..83e3a1c025 100644 --- a/tests/mpi/parallel_vector_06.cc +++ b/tests/mpi/parallel_vector_06.cc @@ -20,7 +20,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -45,7 +45,7 @@ void test () local_relevant = local_owned; local_relevant.add_range(1,2); - parallel::distributed::Vector v(local_owned, local_owned, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_owned, MPI_COMM_WORLD); // set local values if (myid < 8) @@ -108,7 +108,7 @@ void test () const double norm_sqr = v.l2_norm() * v.l2_norm(); AssertThrow (std::fabs(v * v - norm_sqr) < 1e-15, ExcInternalError()); - parallel::distributed::Vector v2; + LinearAlgebra::distributed::Vector v2; v2 = v; AssertThrow (std::fabs(v2 * v - norm_sqr) < 1e-15, ExcInternalError()); @@ -125,7 +125,7 @@ void test () bool allzero = v.all_zero(); if (myid == 0) deallog << " v==0 ? " << allzero << std::endl; - parallel::distributed::Vector v2; + LinearAlgebra::distributed::Vector v2; v2.reinit (v); allzero = v2.all_zero(); if (myid == 0) diff --git a/tests/mpi/parallel_vector_07.cc b/tests/mpi/parallel_vector_07.cc index b31dfd46d0..6f79349bde 100644 --- a/tests/mpi/parallel_vector_07.cc +++ b/tests/mpi/parallel_vector_07.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -57,7 +57,7 @@ void test () }; local_relevant.add_indices (&ghost_indices[0], &ghost_indices[0]+10); - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); // set a few of the local elements for (unsigned i=0; i #include -#include +#include #include #include #include @@ -61,8 +61,8 @@ void test () // v has ghosts, w has none. set some entries // on w, copy into v and check if they are // there - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); - parallel::distributed::Vector w(local_owned, local_owned, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector w(local_owned, local_owned, MPI_COMM_WORLD); // set a few of the local elements for (unsigned i=0; i #include -#include +#include #include #include #include @@ -57,7 +57,7 @@ void test () }; local_relevant.add_indices (&ghost_indices[0], &ghost_indices[0]+10); - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); // check number of ghosts everywhere (counted // the above) diff --git a/tests/mpi/parallel_vector_10.cc b/tests/mpi/parallel_vector_10.cc index 3dcbb463f4..7dc8da68fc 100644 --- a/tests/mpi/parallel_vector_10.cc +++ b/tests/mpi/parallel_vector_10.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -41,8 +41,8 @@ void test () local_relevant = local_owned; local_relevant.add_range(1,2); - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); - parallel::distributed::Vector w(v); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector w(v); // set local values and check them v(myid*2)=myid*2.0; diff --git a/tests/mpi/parallel_vector_11.cc b/tests/mpi/parallel_vector_11.cc index e9bc30d53e..21b5dc5405 100644 --- a/tests/mpi/parallel_vector_11.cc +++ b/tests/mpi/parallel_vector_11.cc @@ -20,7 +20,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -49,10 +49,10 @@ void test () local_relevant = local_owned; local_relevant.add_index (2); - parallel::distributed::Vector v(local_owned, local_relevant, - MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, + MPI_COMM_WORLD); AssertDimension (static_cast(actual_local_size), v.local_size()); - parallel::distributed::Vector w (v), x(v), y(v); + LinearAlgebra::distributed::Vector w (v), x(v), y(v); // set local elements for (int i=0; i (factor, vector): "; - parallel::distributed::Vector z; + LinearAlgebra::distributed::Vector z; z = v; y = z; for (int i=0; i #include -#include +#include #include #include #include @@ -54,8 +54,8 @@ void test () if (numproc > 2) local_relevant0.add_index(8); - parallel::distributed::Vector v0(local_owned0, local_relevant0, - MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v0(local_owned0, local_relevant0, + MPI_COMM_WORLD); // vector1: local size 4 const unsigned int local_size1 = 4; @@ -76,8 +76,8 @@ void test () local_relevant1.add_index(10); } - parallel::distributed::Vector v1(local_owned1, local_relevant1, - MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v1(local_owned1, local_relevant1, + MPI_COMM_WORLD); v0 = 1; v1 = 2; @@ -147,7 +147,7 @@ void test () if (myid==0) deallog << "Ghost values after re-set OK" << std::endl; // swap with an empty vector - parallel::distributed::Vector v2; + LinearAlgebra::distributed::Vector v2; v2.swap (v0); AssertDimension (v0.size(), 0); AssertDimension (v2.size(), global_size1); diff --git a/tests/mpi/parallel_vector_13.cc b/tests/mpi/parallel_vector_13.cc index 75f69f7a57..0d530d3d00 100644 --- a/tests/mpi/parallel_vector_13.cc +++ b/tests/mpi/parallel_vector_13.cc @@ -21,7 +21,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -44,7 +44,7 @@ void test () local_relevant.add_range(1,2); local_relevant.add_range(4,5); - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); // set local values and check them v(myid*2)=myid*2.0; diff --git a/tests/mpi/parallel_vector_14.cc b/tests/mpi/parallel_vector_14.cc index 23ea2c68f0..5ed1452a92 100644 --- a/tests/mpi/parallel_vector_14.cc +++ b/tests/mpi/parallel_vector_14.cc @@ -20,7 +20,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ void test () // and once where they have not for (unsigned int run = 0; run < 2; ++run) { - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); // set local values if (myid < 2) @@ -60,7 +60,7 @@ void test () v.compress(VectorOperation::insert); - parallel::distributed::Vector w(v), u(v); + LinearAlgebra::distributed::Vector w(v), u(v); u = 0; v*=2.0; @@ -80,8 +80,8 @@ void test () } // copy vector content to non-ghosted vectors, manually created. - parallel::distributed::Vector v_dist(local_owned, MPI_COMM_WORLD), - w_dist(v_dist), u_dist(v_dist); + LinearAlgebra::distributed::Vector v_dist(local_owned, MPI_COMM_WORLD), + w_dist(v_dist), u_dist(v_dist); v_dist = v; w_dist = w; diff --git a/tests/mpi/parallel_vector_15.cc b/tests/mpi/parallel_vector_15.cc index 2aa6b8b942..2b3f4be7b1 100644 --- a/tests/mpi/parallel_vector_15.cc +++ b/tests/mpi/parallel_vector_15.cc @@ -21,7 +21,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -45,7 +45,7 @@ void test () if (numproc > 1) local_relevant.add_range(3,4); - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); // set local values if (myid < 2) @@ -59,7 +59,7 @@ void test () if (myid==0) deallog << "v has ghost elements: " << v.has_ghost_elements() << std::endl; - parallel::distributed::Vector w, x; + LinearAlgebra::distributed::Vector w, x; w = v; if (myid==0) deallog << "w has ghost elements: " << w.has_ghost_elements() << std::endl; diff --git a/tests/mpi/parallel_vector_16.cc b/tests/mpi/parallel_vector_16.cc index c6d0eeefa0..5e15c24c53 100644 --- a/tests/mpi/parallel_vector_16.cc +++ b/tests/mpi/parallel_vector_16.cc @@ -22,7 +22,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -47,7 +47,7 @@ void test () local_relevant.add_range(min_index+38,min_index+40); local_relevant.add_range(min_index+41,min_index+43); - parallel::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); deallog << "Local range of proc 0: " << v.local_range().first << " " << v.local_range().second << std::endl; diff --git a/tests/mpi/parallel_vector_17.cc b/tests/mpi/parallel_vector_17.cc index 5146d6fec8..aa74ecfe53 100644 --- a/tests/mpi/parallel_vector_17.cc +++ b/tests/mpi/parallel_vector_17.cc @@ -14,13 +14,13 @@ // --------------------------------------------------------------------- -// check parallel::distributed::Vector::partitioners_are_compatible and +// check LinearAlgebra::distributed::Vector::partitioners_are_compatible and // partitioners_are_globally_compatible #include "../tests.h" #include #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ void test () local_relevant = local_owned; local_relevant.add_range(1,2); - parallel::distributed::Vector v1, v2, v3, v4, v5, v6; + LinearAlgebra::distributed::Vector v1, v2, v3, v4, v5, v6; v1.reinit(local_owned, MPI_COMM_WORLD); v2.reinit(local_owned, local_relevant, MPI_COMM_WORLD); v3.reinit(local_owned, local_relevant, MPI_COMM_WORLD); diff --git a/tests/mpi/parallel_vector_back_interpolate.cc b/tests/mpi/parallel_vector_back_interpolate.cc index e4a4fd3737..97ac8f6d40 100644 --- a/tests/mpi/parallel_vector_back_interpolate.cc +++ b/tests/mpi/parallel_vector_back_interpolate.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -58,7 +58,7 @@ void test () DoFTools::extract_locally_relevant_dofs (dof2, locally_relevant_dofs2); - parallel::distributed::Vector + LinearAlgebra::distributed::Vector v2(dof2.locally_owned_dofs(), locally_relevant_dofs2, MPI_COMM_WORLD), v2_interpolated(v2); diff --git a/tests/mpi/parallel_vector_interpolate.cc b/tests/mpi/parallel_vector_interpolate.cc index c79730a3d0..c80f19e575 100644 --- a/tests/mpi/parallel_vector_interpolate.cc +++ b/tests/mpi/parallel_vector_interpolate.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -52,10 +52,10 @@ void test () DoFTools::extract_locally_relevant_dofs (dof2, locally_relevant_dofs2); - parallel::distributed::Vector v1(dof1.locally_owned_dofs(), - locally_relevant_dofs1, - MPI_COMM_WORLD), - v2(dof2.locally_owned_dofs(), locally_relevant_dofs2, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector v1(dof1.locally_owned_dofs(), + locally_relevant_dofs1, + MPI_COMM_WORLD), + v2(dof2.locally_owned_dofs(), locally_relevant_dofs2, MPI_COMM_WORLD); // set first vector to 1 VectorTools::interpolate(dof1, ConstantFunction(1.), v1); diff --git a/tests/mpi/point_value_01.cc b/tests/mpi/point_value_01.cc index e682835cf8..76e2e306d1 100644 --- a/tests/mpi/point_value_01.cc +++ b/tests/mpi/point_value_01.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -58,7 +58,7 @@ void test() dof_handler.distribute_dofs (fe); IndexSet locally_owned_dofs = dof_handler.locally_owned_dofs (); - parallel::distributed::Vector locally_owned_solution + LinearAlgebra::distributed::Vector locally_owned_solution (locally_owned_dofs, MPI_COMM_WORLD); locally_owned_solution=1; diff --git a/tests/mpi/trilinos_matvec_01.cc b/tests/mpi/trilinos_matvec_01.cc index e8020c6d83..a9438b3cc2 100644 --- a/tests/mpi/trilinos_matvec_01.cc +++ b/tests/mpi/trilinos_matvec_01.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -92,7 +92,7 @@ void test () x.reinit (col_partitioning, MPI_COMM_WORLD); y.reinit (row_partitioning, MPI_COMM_WORLD); - parallel::distributed::Vector + LinearAlgebra::distributed::Vector dx (col_partitioning, col_partitioning, MPI_COMM_WORLD), dy (row_partitioning, row_partitioning, MPI_COMM_WORLD); diff --git a/tests/mpi/trilinos_matvec_02.cc b/tests/mpi/trilinos_matvec_02.cc index 3113685470..77c573f702 100644 --- a/tests/mpi/trilinos_matvec_02.cc +++ b/tests/mpi/trilinos_matvec_02.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -92,7 +92,7 @@ void test () x.reinit (col_partitioning, MPI_COMM_WORLD); y.reinit (row_partitioning, MPI_COMM_WORLD); - parallel::distributed::Vector + LinearAlgebra::distributed::Vector dx (col_partitioning, col_partitioning, MPI_COMM_WORLD), dy (row_partitioning, row_partitioning, MPI_COMM_WORLD); diff --git a/tests/mpi/trilinos_matvec_03.cc b/tests/mpi/trilinos_matvec_03.cc index d6f7970e06..60319da74f 100644 --- a/tests/mpi/trilinos_matvec_03.cc +++ b/tests/mpi/trilinos_matvec_03.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -86,7 +86,7 @@ void test () x.reinit (col_partitioning, MPI_COMM_WORLD); y.reinit (row_partitioning, MPI_COMM_WORLD); - parallel::distributed::Vector + LinearAlgebra::distributed::Vector dx (col_partitioning, col_partitioning, MPI_COMM_WORLD), dy (row_partitioning, row_partitioning, MPI_COMM_WORLD); diff --git a/tests/mpi/trilinos_sparse_matrix_01.cc b/tests/mpi/trilinos_sparse_matrix_01.cc index 17996eaa7b..962df7ae04 100644 --- a/tests/mpi/trilinos_sparse_matrix_01.cc +++ b/tests/mpi/trilinos_sparse_matrix_01.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/mpi/trilinos_sparse_matrix_02.cc b/tests/mpi/trilinos_sparse_matrix_02.cc index ae8ee3dda6..beaf52cab0 100644 --- a/tests/mpi/trilinos_sparse_matrix_02.cc +++ b/tests/mpi/trilinos_sparse_matrix_02.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/mpi/trilinos_sparse_matrix_03.cc b/tests/mpi/trilinos_sparse_matrix_03.cc index 466671164e..32f0e91513 100644 --- a/tests/mpi/trilinos_sparse_matrix_03.cc +++ b/tests/mpi/trilinos_sparse_matrix_03.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/mpi/trilinos_sparse_matrix_04.cc b/tests/mpi/trilinos_sparse_matrix_04.cc index 387b4f8c95..223e55d696 100644 --- a/tests/mpi/trilinos_sparse_matrix_04.cc +++ b/tests/mpi/trilinos_sparse_matrix_04.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/mpi/trilinos_sparse_matrix_05.cc b/tests/mpi/trilinos_sparse_matrix_05.cc index 3586b44708..6b14a7501c 100644 --- a/tests/mpi/trilinos_sparse_matrix_05.cc +++ b/tests/mpi/trilinos_sparse_matrix_05.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/multigrid/step-16-04.cc b/tests/multigrid/step-16-04.cc index c6c7d77f6c..65b4d65071 100644 --- a/tests/multigrid/step-16-04.cc +++ b/tests/multigrid/step-16-04.cc @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- // Similar to step-16-03 (starting the mg hierarchy at level 2 rather than -// level 0) but for parallel::distributed::Vector that has a different code +// level 0) but for LinearAlgebra::distributed::Vector that has a different code // path #include "../tests.h" @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include @@ -85,8 +85,8 @@ private: ConstraintMatrix hanging_node_constraints; ConstraintMatrix constraints; - parallel::distributed::Vector solution; - parallel::distributed::Vector system_rhs; + LinearAlgebra::distributed::Vector solution; + LinearAlgebra::distributed::Vector system_rhs; const unsigned int degree; const unsigned int min_level; @@ -371,20 +371,20 @@ void LaplaceProblem::assemble_multigrid () template void LaplaceProblem::solve () { - MGTransferPrebuilt > + MGTransferPrebuilt > mg_transfer(hanging_node_constraints, mg_constrained_dofs); mg_transfer.build_matrices(mg_dof_handler); SolverControl coarse_solver_control (1000, 1e-10, false, false); - SolverCG > coarse_solver(coarse_solver_control); + SolverCG > coarse_solver(coarse_solver_control); PreconditionIdentity id; - MGCoarseGridLACIteration >,parallel::distributed::Vector > + MGCoarseGridLACIteration >,LinearAlgebra::distributed::Vector > coarse_grid_solver(coarse_solver, mg_matrices[min_level], id); deallog << " Size of coarse grid matrix: " << mg_matrices[min_level].m() << std::endl; - typedef PreconditionChebyshev,parallel::distributed::Vector > Smoother; - GrowingVectorMemory > vector_memory; - MGSmootherPrecondition, Smoother, parallel::distributed::Vector > + typedef PreconditionChebyshev,LinearAlgebra::distributed::Vector > Smoother; + GrowingVectorMemory > vector_memory; + MGSmootherPrecondition, Smoother, LinearAlgebra::distributed::Vector > mg_smoother; typename Smoother::AdditionalData smoother_data; smoother_data.smoothing_range = 20.; @@ -392,24 +392,24 @@ void LaplaceProblem::solve () smoother_data.eig_cg_n_iterations = 20; mg_smoother.initialize(mg_matrices, smoother_data); - mg::Matrix > mg_matrix(mg_matrices); - mg::Matrix > mg_interface_up(mg_interface_matrices); - mg::Matrix > mg_interface_down(mg_interface_matrices); - - Multigrid > mg(min_level, - triangulation.n_global_levels()-1, - mg_matrix, - coarse_grid_solver, - mg_transfer, - mg_smoother, - mg_smoother); + mg::Matrix > mg_matrix(mg_matrices); + mg::Matrix > mg_interface_up(mg_interface_matrices); + mg::Matrix > mg_interface_down(mg_interface_matrices); + + Multigrid > mg(min_level, + triangulation.n_global_levels()-1, + mg_matrix, + coarse_grid_solver, + mg_transfer, + mg_smoother, + mg_smoother); mg.set_edge_matrices(mg_interface_down, mg_interface_up); - PreconditionMG, MGTransferPrebuilt > > + PreconditionMG, MGTransferPrebuilt > > preconditioner(mg_dof_handler, mg, mg_transfer); SolverControl solver_control (1000, 1e-12); - SolverCG > cg (solver_control); + SolverCG > cg (solver_control); solution = 0; diff --git a/tests/multigrid/transfer_matrix_free_01.cc b/tests/multigrid/transfer_matrix_free_01.cc index 99043dde5b..22980e61ae 100644 --- a/tests/multigrid/transfer_matrix_free_01.cc +++ b/tests/multigrid/transfer_matrix_free_01.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include -#include +#include #include #include #include @@ -70,7 +70,7 @@ void check(const unsigned int fe_degree) mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); // build reference - MGTransferPrebuilt > + MGTransferPrebuilt > transfer_ref(hanging_node_constraints, mg_constrained_dofs); transfer_ref.build_matrices(mgdof); @@ -81,8 +81,8 @@ void check(const unsigned int fe_degree) // check prolongation for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); @@ -99,8 +99,8 @@ void check(const unsigned int fe_degree) // check restriction for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); diff --git a/tests/multigrid/transfer_matrix_free_02.cc b/tests/multigrid/transfer_matrix_free_02.cc index 475eadf04c..2aa638c5cd 100644 --- a/tests/multigrid/transfer_matrix_free_02.cc +++ b/tests/multigrid/transfer_matrix_free_02.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include -#include +#include #include #include #include @@ -96,7 +96,7 @@ void check(const unsigned int fe_degree) mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); // build reference - MGTransferPrebuilt > + MGTransferPrebuilt > transfer_ref(hanging_node_constraints, mg_constrained_dofs); transfer_ref.build_matrices(mgdof); @@ -107,8 +107,8 @@ void check(const unsigned int fe_degree) // check prolongation for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); @@ -125,8 +125,8 @@ void check(const unsigned int fe_degree) // check restriction for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); diff --git a/tests/multigrid/transfer_matrix_free_03.cc b/tests/multigrid/transfer_matrix_free_03.cc index 4ae35320e2..63dfee45d9 100644 --- a/tests/multigrid/transfer_matrix_free_03.cc +++ b/tests/multigrid/transfer_matrix_free_03.cc @@ -20,7 +20,7 @@ #include "../tests.h" #include -#include +#include #include #include #include @@ -73,7 +73,7 @@ void check(const unsigned int fe_degree) mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); // build reference - MGTransferPrebuilt > + MGTransferPrebuilt > transfer_ref(hanging_node_constraints, mg_constrained_dofs); transfer_ref.build_matrices(mgdof); @@ -84,8 +84,8 @@ void check(const unsigned int fe_degree) // check prolongation for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); @@ -102,8 +102,8 @@ void check(const unsigned int fe_degree) // check restriction for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); diff --git a/tests/multigrid/transfer_matrix_free_04.cc b/tests/multigrid/transfer_matrix_free_04.cc index c85ea33c28..ed8c5f8e22 100644 --- a/tests/multigrid/transfer_matrix_free_04.cc +++ b/tests/multigrid/transfer_matrix_free_04.cc @@ -20,7 +20,7 @@ #include "../tests.h" #include -#include +#include #include #include #include @@ -64,7 +64,7 @@ void check(const unsigned int fe_degree) mgdof.distribute_mg_dofs(fe); // build reference - MGTransferPrebuilt > transfer_ref; + MGTransferPrebuilt > transfer_ref; transfer_ref.build_matrices(mgdof); // build matrix-free transfer @@ -74,8 +74,8 @@ void check(const unsigned int fe_degree) // check prolongation for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); @@ -92,8 +92,8 @@ void check(const unsigned int fe_degree) // check restriction for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); diff --git a/tests/multigrid/transfer_matrix_free_05.cc b/tests/multigrid/transfer_matrix_free_05.cc index 7fdda041d5..433c5fa3ce 100644 --- a/tests/multigrid/transfer_matrix_free_05.cc +++ b/tests/multigrid/transfer_matrix_free_05.cc @@ -20,7 +20,7 @@ #include "../tests.h" #include -#include +#include #include #include #include @@ -83,7 +83,7 @@ void check(const unsigned int fe_degree) mgdof.distribute_mg_dofs(fe); // build reference - MGTransferPrebuilt > transfer_ref; + MGTransferPrebuilt > transfer_ref; transfer_ref.build_matrices(mgdof); // build matrix-free transfer @@ -93,8 +93,8 @@ void check(const unsigned int fe_degree) // check prolongation for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); @@ -111,8 +111,8 @@ void check(const unsigned int fe_degree) // check restriction for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); diff --git a/tests/multigrid/transfer_matrix_free_06.cc b/tests/multigrid/transfer_matrix_free_06.cc index acb60f93fd..a27626bc8c 100644 --- a/tests/multigrid/transfer_matrix_free_06.cc +++ b/tests/multigrid/transfer_matrix_free_06.cc @@ -20,7 +20,7 @@ #include "../tests.h" #include -#include +#include #include #include #include @@ -98,7 +98,7 @@ void check(const unsigned int fe_degree) mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); // build reference - MGTransferPrebuilt > + MGTransferPrebuilt > transfer_ref(hanging_node_constraints, mg_constrained_dofs); transfer_ref.build_matrices(mgdof); @@ -109,8 +109,8 @@ void check(const unsigned int fe_degree) // check prolongation for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); @@ -127,8 +127,8 @@ void check(const unsigned int fe_degree) // check restriction for all levels using random vector for (unsigned int level=1; level v1, v2; - parallel::distributed::Vector v1_cpy, v2_cpy, v3; + LinearAlgebra::distributed::Vector v1, v2; + LinearAlgebra::distributed::Vector v1_cpy, v2_cpy, v3; v1.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); v2.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level-1), MPI_COMM_WORLD); diff --git a/tests/multigrid/transfer_prebuilt_04.cc b/tests/multigrid/transfer_prebuilt_04.cc index b59d9ef4aa..15e61789e0 100644 --- a/tests/multigrid/transfer_prebuilt_04.cc +++ b/tests/multigrid/transfer_prebuilt_04.cc @@ -21,7 +21,7 @@ #include "../tests.h" #include -#include +#include #include #include #include @@ -84,7 +84,7 @@ void check() grid_out.write_svg (tr, grid_output); } - MGTransferPrebuilt > + MGTransferPrebuilt > transfer_ref(hanging_node_constraints, mg_constrained_dofs); transfer_ref.build_matrices(mgdof); } diff --git a/tests/petsc/copy_to_dealvec.cc b/tests/petsc/copy_to_dealvec.cc index 3e1c7dbad3..c76e21268b 100644 --- a/tests/petsc/copy_to_dealvec.cc +++ b/tests/petsc/copy_to_dealvec.cc @@ -15,11 +15,11 @@ -// Test parallel::distributed::Vector::operator=(PETScWrappers::MPI::Vector&) +// Test LinearAlgebra::distributed::Vector::operator=(PETScWrappers::MPI::Vector&) #include "../tests.h" #include -#include +#include #include #include #include @@ -46,7 +46,7 @@ void test () PETScWrappers::MPI::Vector vb(local_active, MPI_COMM_WORLD); PETScWrappers::MPI::Vector v(local_active, local_relevant, MPI_COMM_WORLD); - parallel::distributed::Vector copied(local_active, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector copied(local_active, local_relevant, MPI_COMM_WORLD); // set local values vb(myid*2)=myid*2.0; diff --git a/tests/petsc/copy_to_dealvec_block.cc b/tests/petsc/copy_to_dealvec_block.cc index af52deb2ed..2cccd11711 100644 --- a/tests/petsc/copy_to_dealvec_block.cc +++ b/tests/petsc/copy_to_dealvec_block.cc @@ -15,12 +15,12 @@ -// Test parallel::distributed::Vector::operator=(PETScWrappers::MPI::BlockVector&) +// Test LinearAlgebra::distributed::Vector::operator=(PETScWrappers::MPI::BlockVector&) #include "../tests.h" #include -#include -#include +#include +#include #include #include #include @@ -48,7 +48,7 @@ void test () PETScWrappers::MPI::Vector vb_one(local_active, MPI_COMM_WORLD); PETScWrappers::MPI::Vector v_one(local_active, local_relevant, MPI_COMM_WORLD); - parallel::distributed::Vector copied_one(local_active, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector copied_one(local_active, local_relevant, MPI_COMM_WORLD); // set local values vb_one(myid*2)=myid*2.0; @@ -61,7 +61,7 @@ void test () PETScWrappers::MPI::BlockVector vb, v; vb.reinit(2); v.reinit(2); - parallel::distributed::BlockVector copied(2); + LinearAlgebra::distributed::BlockVector copied(2); for (unsigned int bl=0; bl<2; ++bl) { vb.block(bl) = vb_one; diff --git a/tests/petsc_complex/fe_get_function_values.cc b/tests/petsc_complex/fe_get_function_values.cc index bdd58ede8c..b3081b998b 100644 --- a/tests/petsc_complex/fe_get_function_values.cc +++ b/tests/petsc_complex/fe_get_function_values.cc @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include @@ -84,8 +84,8 @@ void test () DoFTools::extract_locally_relevant_dofs (dof_handler,locally_relevant_dofs); PETScWrappers::MPI::Vector vector, vector_locally_relevant; - parallel::distributed::Vector< double > vector_Re, vector_Re_locally_relevant, - vector_Im, vector_Im_locally_relevant; + LinearAlgebra::distributed::Vector< double > vector_Re, vector_Re_locally_relevant, + vector_Im, vector_Im_locally_relevant; vector.reinit(locally_owned_dofs, mpi_communicator); vector_locally_relevant.reinit (locally_owned_dofs, locally_relevant_dofs,mpi_communicator); diff --git a/tests/trilinos/copy_to_dealvec.cc b/tests/trilinos/copy_to_dealvec.cc index 2b98057cc1..beee564d8b 100644 --- a/tests/trilinos/copy_to_dealvec.cc +++ b/tests/trilinos/copy_to_dealvec.cc @@ -15,11 +15,11 @@ -// Test parallel::distributed::Vector::operator=(TrilinosWrappers::MPI::Vector&) +// Test LinearAlgebra::distributed::Vector::operator=(TrilinosWrappers::MPI::Vector&) #include "../tests.h" #include -#include +#include #include #include #include @@ -46,7 +46,7 @@ void test () TrilinosWrappers::MPI::Vector vb(local_active, MPI_COMM_WORLD); TrilinosWrappers::MPI::Vector v(local_active, local_relevant, MPI_COMM_WORLD); - parallel::distributed::Vector copied(local_active, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector copied(local_active, local_relevant, MPI_COMM_WORLD); // set local values vb(myid*2)=myid*2.0; @@ -72,7 +72,7 @@ void test () Assert(copied(myid*2) == myid*4.0, ExcInternalError()); Assert(copied(myid*2+1) == myid*4.0+2.0, ExcInternalError()); - copied = v; + copied.update_ghost_values(); // check ghost values if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) diff --git a/tests/trilinos/copy_to_dealvec_block.cc b/tests/trilinos/copy_to_dealvec_block.cc index 2152ae255f..34900c67b4 100644 --- a/tests/trilinos/copy_to_dealvec_block.cc +++ b/tests/trilinos/copy_to_dealvec_block.cc @@ -15,12 +15,12 @@ -// Test parallel::distributed::Vector::operator=(TrilinosWrappers::MPI::BlockVector&) +// Test LinearAlgebra::distributed::Vector::operator=(TrilinosWrappers::MPI::BlockVector&) #include "../tests.h" #include -#include -#include +#include +#include #include #include #include @@ -48,7 +48,7 @@ void test () TrilinosWrappers::MPI::Vector vb_one(local_active, MPI_COMM_WORLD); TrilinosWrappers::MPI::Vector v_one(local_active, local_relevant, MPI_COMM_WORLD); - parallel::distributed::Vector copied_one(local_active, local_relevant, MPI_COMM_WORLD); + LinearAlgebra::distributed::Vector copied_one(local_active, local_relevant, MPI_COMM_WORLD); // set local values vb_one(myid*2)=myid*2.0; @@ -59,7 +59,7 @@ void test () v_one=vb_one; TrilinosWrappers::MPI::BlockVector vb(2), v(2); - parallel::distributed::BlockVector copied(2); + LinearAlgebra::distributed::BlockVector copied(2); for (unsigned int bl=0; bl<2; ++bl) { vb.block(bl) = vb_one; diff --git a/tests/trilinos/sparse_matrix_vector_10.cc b/tests/trilinos/sparse_matrix_vector_10.cc index f6e782b7ba..87c7c9ec84 100644 --- a/tests/trilinos/sparse_matrix_vector_10.cc +++ b/tests/trilinos/sparse_matrix_vector_10.cc @@ -20,15 +20,15 @@ #include "../tests.h" #include -#include +#include #include #include #include #include -void test (parallel::distributed::Vector &v, - parallel::distributed::Vector &w) +void test (LinearAlgebra::distributed::Vector &v, + LinearAlgebra::distributed::Vector &w) { TrilinosWrappers::SparseMatrix m(w.size(),v.size(),v.size()); for (unsigned int i=0; i v (100); - parallel::distributed::Vector w (95); + LinearAlgebra::distributed::Vector v (100); + LinearAlgebra::distributed::Vector w (95); test (v,w); } } diff --git a/tests/trilinos/sparse_matrix_vector_11.cc b/tests/trilinos/sparse_matrix_vector_11.cc index b3734eb82d..592b8b840c 100644 --- a/tests/trilinos/sparse_matrix_vector_11.cc +++ b/tests/trilinos/sparse_matrix_vector_11.cc @@ -19,15 +19,15 @@ #include "../tests.h" #include -#include +#include #include #include #include #include -void test (parallel::distributed::Vector &v, - parallel::distributed::Vector &w) +void test (LinearAlgebra::distributed::Vector &v, + LinearAlgebra::distributed::Vector &w) { TrilinosWrappers::SparseMatrix m(v.size(),w.size(),w.size()); for (unsigned int i=0; i v (95); - parallel::distributed::Vector w (100); + LinearAlgebra::distributed::Vector v (95); + LinearAlgebra::distributed::Vector w (100); test (v,w); } } -- 2.39.5