From 9b6eeedf0450b5a3fc9496b27b5bcb47288d4379 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 29 Jun 2023 16:13:51 -0400 Subject: [PATCH] Remove deprecated Vector member functions --- include/deal.II/base/partitioner.h | 21 ---- .../deal.II/lac/la_parallel_block_vector.h | 14 --- .../lac/la_parallel_block_vector.templates.h | 9 -- include/deal.II/lac/la_parallel_vector.h | 32 ------ .../lac/la_parallel_vector.templates.h | 9 -- include/deal.II/lac/petsc_vector_base.h | 48 --------- include/deal.II/lac/read_write_vector.h | 20 ---- include/deal.II/lac/trilinos_vector.h | 34 +------ source/lac/petsc_vector_base.cc | 71 -------------- source/lac/trilinos_solver.cc | 14 +-- source/lac/trilinos_vector.cc | 37 ++++--- tests/hp/field_transfer_02.cc | 6 +- tests/hp/field_transfer_04.cc | 2 +- tests/lac/parallel_vector_11.cc | 3 +- tests/lac/parallel_vector_12.cc | 10 +- tests/lac/parallel_vector_21.cc | 2 +- tests/lac/readwritevector_assignment.cc | 10 +- tests/lac/readwritevector_print.cc | 4 +- tests/lac/utilities_02.cc | 2 +- tests/mappings/mapping_q_eulerian_09.cc | 2 +- tests/matrix_free/dg_pbc_01.cc | 4 +- tests/matrix_free/face_setup_01.cc | 6 +- ...e_setup_01.with_p4est=true.mpirun=1.output | 12 +-- ...e_setup_01.with_p4est=true.mpirun=2.output | 24 ++--- tests/matrix_free/laplace_operator_01.cc | 2 +- tests/matrix_free/laplace_operator_02.cc | 2 +- tests/matrix_free/laplace_operator_03.cc | 2 +- tests/matrix_free/laplace_operator_05.cc | 2 +- tests/matrix_free/loop_boundary.cc | 2 +- tests/matrix_free/loop_boundary_02.cc | 2 +- tests/matrix_free/mass_operator_01.cc | 2 +- tests/matrix_free/mass_operator_02.cc | 6 +- tests/matrix_free/mass_operator_03.cc | 6 +- tests/matrix_free/mass_operator_04.cc | 2 +- .../matrix_free_device_matrix_vector_10.cc | 2 +- .../matrix_free_device_matrix_vector_10a.cc | 2 +- .../matrix_free_device_matrix_vector_19.cc | 2 +- .../matrix_free_device_matrix_vector_25.cc | 2 +- .../matrix_free_device_matrix_vector_26.cc | 2 +- ...trix_free_device_precondition_chebyshev.cc | 6 +- tests/matrix_free/matrix_vector_10.cc | 2 +- tests/matrix_free/matrix_vector_11.cc | 2 +- tests/matrix_free/matrix_vector_12.cc | 2 +- tests/matrix_free/matrix_vector_13.cc | 2 +- tests/matrix_free/matrix_vector_19.cc | 2 +- tests/matrix_free/matrix_vector_20.cc | 2 +- tests/matrix_free/matrix_vector_21.cc | 2 +- tests/matrix_free/matrix_vector_22.cc | 2 +- tests/matrix_free/matrix_vector_23.cc | 2 +- tests/matrix_free/matrix_vector_blocks.cc | 3 +- tests/matrix_free/matrix_vector_faces_10.cc | 2 +- tests/matrix_free/matrix_vector_faces_11.cc | 2 +- tests/matrix_free/matrix_vector_faces_13.cc | 2 +- tests/matrix_free/matrix_vector_faces_14.cc | 2 +- tests/matrix_free/matrix_vector_faces_15.cc | 6 +- tests/matrix_free/matrix_vector_faces_16.cc | 6 +- tests/matrix_free/matrix_vector_faces_17.cc | 6 +- tests/matrix_free/matrix_vector_faces_18.cc | 6 +- tests/matrix_free/matrix_vector_faces_19.cc | 2 +- tests/matrix_free/matrix_vector_faces_20.cc | 2 +- tests/matrix_free/matrix_vector_faces_21.cc | 2 +- tests/matrix_free/matrix_vector_faces_22.cc | 2 +- tests/matrix_free/matrix_vector_faces_23.cc | 2 +- tests/matrix_free/matrix_vector_faces_24.cc | 2 +- tests/matrix_free/matrix_vector_faces_29.cc | 2 +- tests/matrix_free/matrix_vector_faces_30.cc | 2 +- tests/matrix_free/matrix_vector_faces_31.cc | 2 +- tests/matrix_free/matrix_vector_faces_32.cc | 2 +- tests/matrix_free/multigrid_dg_periodic.cc | 3 +- tests/matrix_free/multigrid_dg_sip_01.cc | 3 +- tests/matrix_free/multigrid_dg_sip_02.cc | 3 +- tests/matrix_free/parallel_multigrid.cc | 3 +- .../parallel_multigrid_adaptive_01.cc | 9 +- .../parallel_multigrid_adaptive_02.cc | 2 +- .../parallel_multigrid_adaptive_03.cc | 9 +- .../parallel_multigrid_adaptive_04.cc | 2 +- .../parallel_multigrid_adaptive_05.cc | 9 +- .../parallel_multigrid_adaptive_06.cc | 2 +- .../parallel_multigrid_adaptive_06ref.cc | 2 +- .../parallel_multigrid_adaptive_07.cc | 2 +- .../parallel_multigrid_adaptive_08.cc | 11 ++- .../parallel_multigrid_fullydistributed.cc | 3 +- .../parallel_multigrid_interleave.cc | 3 +- .../parallel_multigrid_interleave_renumber.cc | 3 +- tests/matrix_free/parallel_multigrid_mf.cc | 3 +- tests/matrix_free/pre_and_post_loops_01.cc | 2 +- tests/matrix_free/pre_and_post_loops_02.cc | 2 +- tests/matrix_free/pre_and_post_loops_03.cc | 2 +- tests/matrix_free/pre_and_post_loops_04.cc | 2 +- tests/matrix_free/pre_and_post_loops_05.cc | 2 +- tests/matrix_free/pre_and_post_loops_06.cc | 2 +- tests/matrix_free/pre_and_post_loops_07.cc | 2 +- tests/matrix_free/pre_and_post_loops_08.cc | 2 +- tests/matrix_free/step-37-inhomogeneous-1.cc | 2 +- tests/matrix_free/step-48.cc | 2 +- tests/matrix_free/step-48b.cc | 2 +- tests/matrix_free/step-48c.cc | 2 +- tests/matrix_free/stokes_computation.cc | 4 +- tests/mpi/parallel_block_vector_05.cc | 4 +- tests/mpi/parallel_block_vector_06.cc | 4 +- tests/mpi/parallel_block_vector_07.cc | 2 +- tests/mpi/parallel_block_vector_08.cc | 2 +- tests/mpi/parallel_block_vector_09.cc | 2 +- tests/mpi/parallel_block_vector_10.cc | 2 +- tests/mpi/parallel_block_vector_11.cc | 2 +- tests/mpi/parallel_block_vector_12.cc | 4 +- tests/mpi/parallel_vector_11.cc | 3 +- tests/mpi/parallel_vector_12.cc | 10 +- tests/mpi/parallel_vector_21.cc | 2 +- tests/mpi/parallel_vector_back_interpolate.cc | 4 +- tests/mpi/parallel_vector_interpolate.cc | 4 +- tests/mpi/petsc_distribute_01.cc | 2 +- tests/mpi/petsc_distribute_01_block.cc | 4 +- tests/mpi/petsc_distribute_01_inhomogenous.cc | 2 +- tests/mpi/petsc_locally_owned_elements.cc | 4 +- tests/mpi/trilinos_distribute_01.cc | 2 +- tests/mpi/trilinos_distribute_01_block.cc | 4 +- .../trilinos_distribute_01_inhomogenous.cc | 2 +- tests/mpi/trilinos_vector_non_negative.cc | 2 +- tests/multigrid/transfer_05.cc | 5 +- tests/multigrid/transfer_06.cc | 5 +- tests/multigrid/transfer_matrix_free_01.cc | 4 +- tests/multigrid/transfer_matrix_free_02.cc | 4 +- .../transfer_matrix_free_02_block.cc | 6 +- .../transfer_matrix_free_02_block_02.cc | 6 +- tests/multigrid/transfer_matrix_free_03.cc | 4 +- tests/multigrid/transfer_matrix_free_04.cc | 4 +- tests/multigrid/transfer_matrix_free_05.cc | 4 +- tests/multigrid/transfer_matrix_free_06.cc | 4 +- tests/multigrid/transfer_matrix_free_07.cc | 4 +- tests/multigrid/transfer_matrix_free_11.cc | 4 +- tests/numerics/no_flux_18.cc | 9 +- tests/particles/step-68.cc | 2 +- tests/petsc/57.cc | 97 ------------------- tests/petsc/57.output | 2 - .../vector_tools_evaluate_at_points_01.cc | 4 +- .../vector_tools_evaluate_at_points_02.cc | 4 +- .../vector_tools_evaluate_at_points_03.cc | 4 +- .../vector_tools_evaluate_at_points_04.cc | 4 +- .../vector_tools_evaluate_at_points_05.cc | 4 +- tests/simplex/step-67.cc | 2 +- tests/simplex/step-68.cc | 2 +- ...allel_block_vector_copy_01.mpirun=2.output | 8 +- tests/trilinos/print_01.mpirun=2.output | 8 +- .../readwritevector_02.mpirun=2.output | 12 +-- .../readwritevector_03.mpirun=2.output | 8 +- .../readwritevector_04.mpirun=2.output | 12 +-- 147 files changed, 298 insertions(+), 618 deletions(-) delete mode 100644 tests/petsc/57.cc delete mode 100644 tests/petsc/57.output diff --git a/include/deal.II/base/partitioner.h b/include/deal.II/base/partitioner.h index 693415729a..73c23b1cc1 100644 --- a/include/deal.II/base/partitioner.h +++ b/include/deal.II/base/partitioner.h @@ -285,19 +285,6 @@ namespace Utilities types::global_dof_index size() const; - /** - * Return the number of locally owned indices, - * i.e., local_range().second minus local_range().first. - * The returned numbers need to add up to the total number of indices when - * summed over all processes - * - * @deprecated Use the more clearly named function locally_owned_size() - * instead. - */ - DEAL_II_DEPRECATED - unsigned int - local_size() const; - /** * Return the number of locally owned indices, * i.e., local_range().second minus local_range().first. @@ -826,14 +813,6 @@ namespace Utilities - inline unsigned int - Partitioner::local_size() const - { - return locally_owned_size(); - } - - - inline unsigned int Partitioner::locally_owned_size() const { diff --git a/include/deal.II/lac/la_parallel_block_vector.h b/include/deal.II/lac/la_parallel_block_vector.h index 73be633f89..f0946bfb0f 100644 --- a/include/deal.II/lac/la_parallel_block_vector.h +++ b/include/deal.II/lac/la_parallel_block_vector.h @@ -413,20 +413,6 @@ namespace LinearAlgebra void update_ghost_values() const; - /** - * This method zeros the entries on ghost dofs, but does not touch - * locally owned DoFs. - * - * After calling this method, read access to ghost elements of the - * vector is forbidden and an exception is thrown. Only write access to - * ghost elements is allowed in this state. - * - * @deprecated Use zero_out_ghost_values() instead. - */ - DEAL_II_DEPRECATED void - zero_out_ghosts() const; - - /** * This method zeros the entries on ghost dofs, but does not touch * locally owned DoFs. diff --git a/include/deal.II/lac/la_parallel_block_vector.templates.h b/include/deal.II/lac/la_parallel_block_vector.templates.h index fd417fcd05..923c297a88 100644 --- a/include/deal.II/lac/la_parallel_block_vector.templates.h +++ b/include/deal.II/lac/la_parallel_block_vector.templates.h @@ -470,15 +470,6 @@ namespace LinearAlgebra - template - void - BlockVector::zero_out_ghosts() const - { - this->zero_out_ghost_values(); - } - - - template void BlockVector::zero_out_ghost_values() const diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h index 8777d0ce28..99cee4a4f4 100644 --- a/include/deal.II/lac/la_parallel_vector.h +++ b/include/deal.II/lac/la_parallel_vector.h @@ -636,19 +636,6 @@ namespace LinearAlgebra void update_ghost_values_finish() const; - /** - * This method zeros the entries on ghost dofs, but does not touch - * locally owned DoFs. - * - * After calling this method, read access to ghost elements of the - * vector is forbidden and an exception is thrown. Only write access to - * ghost elements is allowed in this state. - * - * @deprecated Use zero_out_ghost_values() instead. - */ - DEAL_II_DEPRECATED void - zero_out_ghosts() const; - /** * This method zeros the entries on ghost dofs, but does not touch * locally owned DoFs. @@ -981,16 +968,6 @@ namespace LinearAlgebra */ /** @{ */ - /** - * Return the local size of the vector, i.e., the number of indices - * owned locally. - * - * @deprecated Use locally_owned_size() instead. - */ - DEAL_II_DEPRECATED - size_type - local_size() const; - /** * Return the local size of the vector, i.e., the number of indices * owned locally. @@ -1491,15 +1468,6 @@ namespace LinearAlgebra - template - inline typename Vector::size_type - Vector::local_size() const - { - return locally_owned_size(); - } - - - template inline typename Vector::size_type Vector::locally_owned_size() const diff --git a/include/deal.II/lac/la_parallel_vector.templates.h b/include/deal.II/lac/la_parallel_vector.templates.h index 848aa0446a..e1343ab797 100644 --- a/include/deal.II/lac/la_parallel_vector.templates.h +++ b/include/deal.II/lac/la_parallel_vector.templates.h @@ -947,15 +947,6 @@ namespace LinearAlgebra - template - void - Vector::zero_out_ghosts() const - { - this->zero_out_ghost_values(); - } - - - template void Vector::zero_out_ghost_values() const diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index 8dfe3ebf33..66b2cc4f8b 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -357,20 +357,6 @@ namespace PETScWrappers size_type size() const; - /** - * Return the local dimension of the vector, i.e. the number of elements - * stored on the present MPI process. For sequential vectors, this number - * is the same as size(), but for parallel vectors it may be smaller. - * - * To figure out which elements exactly are stored locally, use - * local_range() or locally_owned_elements(). - * - * @deprecated use locally_owned_size() instead. - */ - DEAL_II_DEPRECATED - size_type - local_size() const; - /** * Return the local dimension of the vector, i.e. the number of elements * stored on the present MPI process. For sequential vectors, this number @@ -627,28 +613,6 @@ namespace PETScWrappers PetscScalar add_and_dot(const PetscScalar a, const VectorBase &V, const VectorBase &W); - /** - * Return the value of the vector element with the largest negative value. - * - * @deprecated This function has been deprecated to improve compatibility - * with other classes inheriting from VectorSpaceVector. If you need to - * use this functionality then use the PETSc function VecMin instead. - */ - DEAL_II_DEPRECATED - real_type - min() const; - - /** - * Return the value of the vector element with the largest positive value. - * - * @deprecated This function has been deprecated to improve compatibility - * with other classes inheriting from VectorSpaceVector. If you need to - * use this functionality then use the PETSc function VecMax instead. - */ - DEAL_II_DEPRECATED - real_type - max() const; - /** * Return whether the vector contains only elements with value zero. This * is a collective operation. This function is expensive, because @@ -657,18 +621,6 @@ namespace PETScWrappers bool all_zero() const; - /** - * Return @p true if the vector has no negative entries, i.e. all entries - * are zero or positive. This function is used, for example, to check - * whether refinement indicators are really all positive (or zero). - * - * @deprecated This function has been deprecated to improve compatibility - * with other classes inheriting from VectorSpaceVector. - */ - DEAL_II_DEPRECATED - bool - is_non_negative() const; - /** * Multiply the entire vector by a fixed factor. */ diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h index c3464594cf..d4746d3d46 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -539,17 +539,6 @@ namespace LinearAlgebra size_type size() const; - /** - * This function returns the number of elements stored. It is smaller or - * equal to the dimension of the vector space that is modeled by an object - * of this kind. This dimension is return by size(). - * - * @deprecated use locally_owned_size() instead. - */ - DEAL_II_DEPRECATED - size_type - n_elements() const; - /** * Return the local size of the vector, i.e., the number of indices * owned locally. @@ -968,15 +957,6 @@ namespace LinearAlgebra - template - inline typename ReadWriteVector::size_type - ReadWriteVector::n_elements() const - { - return stored_elements.n_elements(); - } - - - template inline typename ReadWriteVector::size_type ReadWriteVector::locally_owned_size() const diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 1d77616a1e..9f25d3d175 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -762,23 +762,6 @@ namespace TrilinosWrappers size_type size() const; - /** - * Return the local dimension of the vector, i.e. the number of elements - * stored on the present MPI process. For sequential vectors, this number - * is the same as size(), but for parallel vectors it may be smaller. - * - * To figure out which elements exactly are stored locally, use - * local_range(). - * - * If the vector contains ghost elements, they are included in this - * number. - * - * @deprecated This function is deprecated. - */ - DEAL_II_DEPRECATED - size_type - local_size() const; - /** * Return the local size of the vector, i.e., the number of indices * owned locally. @@ -792,9 +775,10 @@ namespace TrilinosWrappers * stored, the second the index of the one past the last one that is * stored locally. If this is a sequential vector, then the result will be * the pair (0,N), otherwise it will be a pair - * (i,i+n), where n=local_size() and - * i is the first element of the vector stored on this - * processor, corresponding to the half open interval $[i,i+n)$ + * (i,i+n), where n is the number of elements + * stored on this processor and and i is the first element of + * the vector stored on this processor, corresponding to the half open + * interval $[i,i+n)$ * * @note The description above is true most of the time, but not always. * In particular, Trilinos vectors need not store contiguous ranges of @@ -1052,8 +1036,6 @@ namespace TrilinosWrappers * corresponds to the one given by the global indices in case the vector * is constructed from an IndexSet or other methods in deal.II (note that * an Epetra_Map can contain elements in arbitrary orders, though). - * - * It holds that end() - begin() == local_size(). */ iterator begin(); @@ -1775,14 +1757,6 @@ namespace TrilinosWrappers - inline Vector::size_type - Vector::local_size() const - { - return vector->Map().NumMyElements(); - } - - - inline Vector::size_type Vector::locally_owned_size() const { diff --git a/source/lac/petsc_vector_base.cc b/source/lac/petsc_vector_base.cc index b39b919b34..c8e0946464 100644 --- a/source/lac/petsc_vector_base.cc +++ b/source/lac/petsc_vector_base.cc @@ -448,18 +448,6 @@ namespace PETScWrappers - VectorBase::size_type - VectorBase::local_size() const - { - PetscInt sz; - const PetscErrorCode ierr = VecGetLocalSize(vector, &sz); - AssertThrow(ierr == 0, ExcPETScError(ierr)); - - return sz; - } - - - std::pair VectorBase::local_range() const { @@ -749,33 +737,6 @@ namespace PETScWrappers - VectorBase::real_type - VectorBase::min() const - { - PetscInt p; - real_type d; - - const PetscErrorCode ierr = VecMin(vector, &p, &d); - AssertThrow(ierr == 0, ExcPETScError(ierr)); - - return d; - } - - - VectorBase::real_type - VectorBase::max() const - { - PetscInt p; - real_type d; - - const PetscErrorCode ierr = VecMax(vector, &p, &d); - AssertThrow(ierr == 0, ExcPETScError(ierr)); - - return d; - } - - - bool VectorBase::all_zero() const { @@ -830,38 +791,6 @@ namespace PETScWrappers - bool - VectorBase::is_non_negative() const - { - // get a representation of the vector and - // loop over all the elements - const PetscScalar *start_ptr; - PetscErrorCode ierr = VecGetArrayRead(vector, &start_ptr); - AssertThrow(ierr == 0, ExcPETScError(ierr)); - - const PetscScalar *ptr = start_ptr, - *eptr = start_ptr + locally_owned_size(); - bool flag = true; - while (ptr != eptr) - { - if (!internal::is_non_negative(*ptr)) - { - flag = false; - break; - } - ++ptr; - } - - // restore the representation of the - // vector - ierr = VecRestoreArrayRead(vector, &start_ptr); - AssertThrow(ierr == 0, ExcPETScError(ierr)); - - return flag; - } - - - VectorBase & VectorBase::operator*=(const PetscScalar a) { diff --git a/source/lac/trilinos_solver.cc b/source/lac/trilinos_solver.cc index 231b55476f..1a73295d1a 100644 --- a/source/lac/trilinos_solver.cc +++ b/source/lac/trilinos_solver.cc @@ -232,9 +232,9 @@ namespace TrilinosWrappers { // In case we call the solver with deal.II vectors, we create views of the // vectors in Epetra format. - AssertDimension(x.local_size(), + AssertDimension(x.locally_owned_size(), A.trilinos_matrix().DomainMap().NumMyElements()); - AssertDimension(b.local_size(), + AssertDimension(b.locally_owned_size(), A.trilinos_matrix().RangeMap().NumMyElements()); Epetra_Vector ep_x(View, A.trilinos_matrix().DomainMap(), x.begin()); @@ -258,8 +258,10 @@ namespace TrilinosWrappers const dealii::LinearAlgebra::distributed::Vector &b, const PreconditionBase &preconditioner) { - AssertDimension(x.local_size(), A.OperatorDomainMap().NumMyElements()); - AssertDimension(b.local_size(), A.OperatorRangeMap().NumMyElements()); + AssertDimension(x.locally_owned_size(), + A.OperatorDomainMap().NumMyElements()); + AssertDimension(b.locally_owned_size(), + A.OperatorRangeMap().NumMyElements()); Epetra_Vector ep_x(View, A.OperatorDomainMap(), x.begin()); Epetra_Vector ep_b(View, @@ -858,9 +860,9 @@ namespace TrilinosWrappers dealii::LinearAlgebra::distributed::Vector & x, const dealii::LinearAlgebra::distributed::Vector &b) { - AssertDimension(x.local_size(), + AssertDimension(x.locally_owned_size(), A.trilinos_matrix().DomainMap().NumMyElements()); - AssertDimension(b.local_size(), + AssertDimension(b.locally_owned_size(), A.trilinos_matrix().RangeMap().NumMyElements()); Epetra_Vector ep_x(View, A.trilinos_matrix().DomainMap(), x.begin()); Epetra_Vector ep_b(View, diff --git a/source/lac/trilinos_vector.cc b/source/lac/trilinos_vector.cc index b678ad6cb3..a862ec2c03 100644 --- a/source/lac/trilinos_vector.cc +++ b/source/lac/trilinos_vector.cc @@ -56,7 +56,7 @@ namespace TrilinosWrappers Assert(local_index >= 0, MPI::Vector::ExcAccessToNonLocalElement( index, - vector.local_size(), + vector.vector->Map().NumMyElements(), vector.vector->Map().MinMyGID(), vector.vector->Map().MaxMyGID())); @@ -290,14 +290,15 @@ namespace TrilinosWrappers // vector. need to manually create an Epetra_Map. size_type n_elements = 0, added_elements = 0, block_offset = 0; for (size_type block = 0; block < v.n_blocks(); ++block) - n_elements += v.block(block).local_size(); + n_elements += v.block(block).vector->Map().NumMyElements(); std::vector global_ids(n_elements, -1); for (size_type block = 0; block < v.n_blocks(); ++block) { TrilinosWrappers::types::int_type *glob_elements = TrilinosWrappers::my_global_elements( v.block(block).trilinos_partitioner()); - for (size_type i = 0; i < v.block(block).local_size(); ++i) + size_type vector_size = v.block(block).vector->Map().NumMyElements(); + for (size_type i = 0; i < vector_size; ++i) global_ids[added_elements++] = glob_elements[i] + block_offset; owned_elements.add_indices(v.block(block).owned_elements, block_offset); @@ -317,7 +318,7 @@ namespace TrilinosWrappers for (size_type block = 0; block < v.n_blocks(); ++block) { v.block(block).trilinos_vector().ExtractCopy(entries, 0); - entries += v.block(block).local_size(); + entries += v.block(block).vector->Map().NumMyElements(); } if (import_data == true) @@ -680,7 +681,7 @@ namespace TrilinosWrappers { Assert(false, ExcAccessToNonLocalElement(index, - local_size(), + vector->Map().NumMyElements(), vector->Map().MinMyGID(), vector->Map().MaxMyGID())); } @@ -731,11 +732,11 @@ namespace TrilinosWrappers Vector::operator==(const Vector &v) const { Assert(size() == v.size(), ExcDimensionMismatch(size(), v.size())); - if (local_size() != v.local_size()) + if (vector->Map().NumMyElements() != v.vector->Map().NumMyElements()) return false; - size_type i; - for (i = 0; i < local_size(); ++i) + size_type vector_size = vector->Map().NumMyElements(); + for (size_type i = 0; i < vector_size; ++i) if ((*(v.vector))[0][i] != (*vector)[0][i]) return false; @@ -760,8 +761,9 @@ namespace TrilinosWrappers // get a representation of the vector and // loop over all the elements TrilinosScalar * start_ptr = (*vector)[0]; - const TrilinosScalar *ptr = start_ptr, *eptr = start_ptr + local_size(); - unsigned int flag = 0; + const TrilinosScalar *ptr = start_ptr, + *eptr = start_ptr + vector->Map().NumMyElements(); + unsigned int flag = 0; while (ptr != eptr) { if (*ptr != 0) @@ -789,8 +791,9 @@ namespace TrilinosWrappers // get a representation of the vector and // loop over all the elements TrilinosScalar * start_ptr = (*vector)[0]; - const TrilinosScalar *ptr = start_ptr, *eptr = start_ptr + local_size(); - unsigned int flag = 0; + const TrilinosScalar *ptr = start_ptr, + *eptr = start_ptr + vector->Map().NumMyElements(); + unsigned int flag = 0; while (ptr != eptr) { if (*ptr < 0.0) @@ -826,14 +829,16 @@ namespace TrilinosWrappers else out.setf(std::ios::fixed, std::ios::floatfield); - if (size() != local_size()) + size_type vector_size = vector->Map().NumMyElements(); + if (size() != vector_size) { auto global_id = [&](const size_type index) { return gid(vector->Map(), index); }; - out << "size:" << size() << " local_size:" << local_size() << " :" + out << "size:" << size() + << " locally_owned_size:" << vector->Map().NumMyElements() << " :" << std::endl; - for (size_type i = 0; i < local_size(); ++i) + for (size_type i = 0; i < vector_size; ++i) out << "[" << global_id(i) << "]: " << (*(vector))[0][i] << std::endl; } @@ -880,7 +885,7 @@ namespace TrilinosWrappers // one index and the value per local // entry. return sizeof(*this) + - this->local_size() * + this->vector->Map().NumMyElements() * (sizeof(double) + sizeof(TrilinosWrappers::types::int_type)); } diff --git a/tests/hp/field_transfer_02.cc b/tests/hp/field_transfer_02.cc index 1c8a65a861..605d6b4d74 100644 --- a/tests/hp/field_transfer_02.cc +++ b/tests/hp/field_transfer_02.cc @@ -72,7 +72,7 @@ main(int argc, char *argv[]) LinearAlgebra::distributed::Vector solution( dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); const double old_value = 10.; - for (unsigned int i = 0; i < solution.local_size(); ++i) + for (unsigned int i = 0; i < solution.locally_owned_size(); ++i) solution.local_element(i) = old_value; parallel::distributed::experimental:: @@ -108,13 +108,13 @@ main(int argc, char *argv[]) unsigned int myid = Utilities::MPI::this_mpi_process(MPI_COMM_WORLD); if (myid == 0) { - for (unsigned int i = 0; i < new_solution.local_size(); ++i) + for (unsigned int i = 0; i < new_solution.locally_owned_size(); ++i) AssertThrow(new_solution.local_element(i) == old_value, ExcInternalError()); } else if (myid == 1) { - for (unsigned int i = 0; i < new_solution.local_size(); ++i) + for (unsigned int i = 0; i < new_solution.locally_owned_size(); ++i) AssertThrow(new_solution.local_element(i) == new_value, ExcInternalError()); } diff --git a/tests/hp/field_transfer_04.cc b/tests/hp/field_transfer_04.cc index 735604a4c5..d034f6a4ee 100644 --- a/tests/hp/field_transfer_04.cc +++ b/tests/hp/field_transfer_04.cc @@ -75,7 +75,7 @@ main(int argc, char *argv[]) LinearAlgebra::distributed::Vector solution( dof_handler.locally_owned_dofs(), locally_relevant_dofs, MPI_COMM_WORLD); const double old_value = 1.; - for (unsigned int i = 0; i < solution.local_size(); ++i) + for (unsigned int i = 0; i < solution.locally_owned_size(); ++i) solution.local_element(i) = old_value; { diff --git a/tests/lac/parallel_vector_11.cc b/tests/lac/parallel_vector_11.cc index 817c246360..ac872a33a7 100644 --- a/tests/lac/parallel_vector_11.cc +++ b/tests/lac/parallel_vector_11.cc @@ -57,7 +57,8 @@ test() LinearAlgebra::distributed::Vector v( local_owned, local_relevant, MPI_COMM_WORLD); - AssertDimension(static_cast(actual_local_size), v.local_size()); + AssertDimension(static_cast(actual_local_size), + v.locally_owned_size()); LinearAlgebra::distributed::Vector w(v), x(v), y(v); diff --git a/tests/lac/parallel_vector_12.cc b/tests/lac/parallel_vector_12.cc index 4a02b9c3a0..96c73eafc0 100644 --- a/tests/lac/parallel_vector_12.cc +++ b/tests/lac/parallel_vector_12.cc @@ -93,10 +93,10 @@ test() v0_rw.import_elements(v0, VectorOperation::insert); LinearAlgebra::ReadWriteVector v1_rw(local_owned1); v1_rw.import_elements(v1, VectorOperation::insert); - for (unsigned int i = 0; i < v0.local_size(); ++i) + for (unsigned int i = 0; i < v0.locally_owned_size(); ++i) AssertThrow(v0_rw.local_element(i) == 1., ExcNonEqual(v0_rw.local_element(i), 1.)); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) AssertThrow(v1_rw.local_element(i) == 2., ExcNonEqual(v1_rw.local_element(i), 2.)); @@ -123,8 +123,8 @@ test() // now swap v1 and v0 v0.swap(v1); - AssertDimension(v0.local_size(), local_size1); - AssertDimension(v1.local_size(), actual_local_size0); + AssertDimension(v0.locally_owned_size(), local_size1); + AssertDimension(v1.locally_owned_size(), actual_local_size0); AssertDimension(v0.size(), global_size1); AssertDimension(v1.size(), global_size0); v1_rw.import_elements(v0, VectorOperation::insert); @@ -183,7 +183,7 @@ test() v2.swap(v0); AssertDimension(v0.size(), 0); AssertDimension(v2.size(), global_size1); - AssertDimension(v2.local_size(), local_size1); + AssertDimension(v2.locally_owned_size(), local_size1); v1_rw.import_elements(v2, VectorOperation::insert); for (int i = my_start1; i < my_end1; ++i) AssertThrow(v1_rw(i) == 7., ExcNonEqual(v1_rw(i), 7.)); diff --git a/tests/lac/parallel_vector_21.cc b/tests/lac/parallel_vector_21.cc index d861af1fc2..d669008160 100644 --- a/tests/lac/parallel_vector_21.cc +++ b/tests/lac/parallel_vector_21.cc @@ -51,7 +51,7 @@ test() // set locally owned range of v2 manually Kokkos::View v2_view( - v2.get_values(), v2.local_size()); + v2.get_values(), v2.locally_owned_size()); Kokkos::deep_copy(v2_view, 1.); // add entries to ghost values diff --git a/tests/lac/readwritevector_assignment.cc b/tests/lac/readwritevector_assignment.cc index c777bbed48..d458fbeea9 100644 --- a/tests/lac/readwritevector_assignment.cc +++ b/tests/lac/readwritevector_assignment.cc @@ -34,13 +34,13 @@ test() is.add_range(10, 15); LinearAlgebra::ReadWriteVector double_vector(is); LinearAlgebra::ReadWriteVector float_vector(float_size); - deallog << "double_size " << double_vector.n_elements() << std::endl; - deallog << "float_size " << float_vector.n_elements() << std::endl; + deallog << "double_size " << double_vector.locally_owned_size() << std::endl; + deallog << "float_size " << float_vector.locally_owned_size() << std::endl; double_vector = 0.; - for (unsigned int i = 0; i < double_vector.n_elements(); ++i) + for (unsigned int i = 0; i < double_vector.locally_owned_size(); ++i) double_vector.local_element(i) += i; - for (unsigned int i = 0; i < float_vector.n_elements(); ++i) + for (unsigned int i = 0; i < float_vector.locally_owned_size(); ++i) float_vector[i] = i; double_vector.print(deallog.get_file_stream()); @@ -52,7 +52,7 @@ test() LinearAlgebra::ReadWriteVector double_vector2(double_vector); double_vector2.print(deallog.get_file_stream()); - for (unsigned int i = 0; i < double_vector.n_elements(); ++i) + for (unsigned int i = 0; i < double_vector.locally_owned_size(); ++i) double_vector2.local_element(i) += i; double_vector = double_vector2; double_vector.print(deallog.get_file_stream()); diff --git a/tests/lac/readwritevector_print.cc b/tests/lac/readwritevector_print.cc index d3c8707da7..18799006eb 100644 --- a/tests/lac/readwritevector_print.cc +++ b/tests/lac/readwritevector_print.cc @@ -29,10 +29,10 @@ test() is.add_range(1, 3); is.add_index(7); LinearAlgebra::ReadWriteVector vec(is); - deallog << "size: " << vec.n_elements() << std::endl; + deallog << "size: " << vec.locally_owned_size() << std::endl; vec = 0.; - for (unsigned int i = 0; i < vec.n_elements(); ++i) + for (unsigned int i = 0; i < vec.locally_owned_size(); ++i) vec.local_element(i) += i; vec.print(deallog.get_file_stream()); diff --git a/tests/lac/utilities_02.cc b/tests/lac/utilities_02.cc index 5035a6d205..82ba843d5f 100644 --- a/tests/lac/utilities_02.cc +++ b/tests/lac/utilities_02.cc @@ -150,7 +150,7 @@ test() fe_eval.distribute_local_to_global(inv_mass_matrix); } inv_mass_matrix.compress(VectorOperation::add); - for (unsigned int k = 0; k < inv_mass_matrix.local_size(); ++k) + for (unsigned int k = 0; k < inv_mass_matrix.locally_owned_size(); ++k) if (inv_mass_matrix.local_element(k) > 1e-15) { inv_mass_matrix.local_element(k) = diff --git a/tests/mappings/mapping_q_eulerian_09.cc b/tests/mappings/mapping_q_eulerian_09.cc index 70bf2f0630..f0148eaf48 100644 --- a/tests/mappings/mapping_q_eulerian_09.cc +++ b/tests/mappings/mapping_q_eulerian_09.cc @@ -160,7 +160,7 @@ test() matrix_free->initialize_dof_vector(dst3); matrix_free->initialize_dof_vector(dst4); - for (unsigned int i = 0; i < src.local_size(); ++i) + for (unsigned int i = 0; i < src.locally_owned_size(); ++i) src.local_element(i) = random_value(); MatrixFreeOperators::MassOperator< diff --git a/tests/matrix_free/dg_pbc_01.cc b/tests/matrix_free/dg_pbc_01.cc index 1d8950d119..bab8f3ed06 100644 --- a/tests/matrix_free/dg_pbc_01.cc +++ b/tests/matrix_free/dg_pbc_01.cc @@ -103,7 +103,7 @@ test() { Vector solution_gather0(sol.size()); double * sol_gather_ptr = solution_gather0.begin(); - for (unsigned int i = 0; i < sol.local_size(); ++i) + for (unsigned int i = 0; i < sol.locally_owned_size(); ++i) *sol_gather_ptr++ = sol.local_element(i); for (unsigned int i = 1; i < Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD); @@ -122,7 +122,7 @@ test() } else MPI_Send(sol.begin(), - sol.local_size(), + sol.locally_owned_size(), MPI_DOUBLE, 0, Utilities::MPI::this_mpi_process(MPI_COMM_WORLD), diff --git a/tests/matrix_free/face_setup_01.cc b/tests/matrix_free/face_setup_01.cc index 0e05039081..8d7062a9cc 100644 --- a/tests/matrix_free/face_setup_01.cc +++ b/tests/matrix_free/face_setup_01.cc @@ -78,13 +78,13 @@ main(int argc, char **argv) deallog << "main partitioner: size=" << matrix_free.get_dof_info().vector_partitioner->size() - << " local_size=" - << matrix_free.get_dof_info().vector_partitioner->local_size() + << " locally_owned_size=" + << matrix_free.get_dof_info().vector_partitioner->locally_owned_size() << " n_ghosts=" << matrix_free.get_dof_info().vector_partitioner->n_ghost_indices() << std::endl; for (auto &p : matrix_free.get_dof_info().vector_exchanger_face_variants) deallog << "partitioner: size=" << p->size() - << " local_size=" << p->locally_owned_size() + << " locally_owned_size=" << p->locally_owned_size() << " n_ghosts=" << p->n_ghost_indices() << std::endl; } diff --git a/tests/matrix_free/face_setup_01.with_p4est=true.mpirun=1.output b/tests/matrix_free/face_setup_01.with_p4est=true.mpirun=1.output index 86e0e01e6c..4aa4cbb0d2 100644 --- a/tests/matrix_free/face_setup_01.with_p4est=true.mpirun=1.output +++ b/tests/matrix_free/face_setup_01.with_p4est=true.mpirun=1.output @@ -1,7 +1,7 @@ -DEAL:0::main partitioner: size=2506 local_size=2506 n_ghosts=0 -DEAL:0::partitioner: size=2506 local_size=2506 n_ghosts=0 -DEAL:0::partitioner: size=2506 local_size=2506 n_ghosts=0 -DEAL:0::partitioner: size=2506 local_size=2506 n_ghosts=0 -DEAL:0::partitioner: size=2506 local_size=2506 n_ghosts=0 -DEAL:0::partitioner: size=2506 local_size=2506 n_ghosts=0 +DEAL:0::main partitioner: size=2506 locally_owned_size=2506 n_ghosts=0 +DEAL:0::partitioner: size=2506 locally_owned_size=2506 n_ghosts=0 +DEAL:0::partitioner: size=2506 locally_owned_size=2506 n_ghosts=0 +DEAL:0::partitioner: size=2506 locally_owned_size=2506 n_ghosts=0 +DEAL:0::partitioner: size=2506 locally_owned_size=2506 n_ghosts=0 +DEAL:0::partitioner: size=2506 locally_owned_size=2506 n_ghosts=0 diff --git a/tests/matrix_free/face_setup_01.with_p4est=true.mpirun=2.output b/tests/matrix_free/face_setup_01.with_p4est=true.mpirun=2.output index 205ec4c86e..9a6f712ab6 100644 --- a/tests/matrix_free/face_setup_01.with_p4est=true.mpirun=2.output +++ b/tests/matrix_free/face_setup_01.with_p4est=true.mpirun=2.output @@ -1,15 +1,15 @@ -DEAL:0::main partitioner: size=2506 local_size=1492 n_ghosts=273 -DEAL:0::partitioner: size=2506 local_size=1492 n_ghosts=0 -DEAL:0::partitioner: size=2506 local_size=1492 n_ghosts=273 -DEAL:0::partitioner: size=2506 local_size=1492 n_ghosts=273 -DEAL:0::partitioner: size=2506 local_size=1492 n_ghosts=0 -DEAL:0::partitioner: size=2506 local_size=1492 n_ghosts=0 +DEAL:0::main partitioner: size=2506 locally_owned_size=1492 n_ghosts=273 +DEAL:0::partitioner: size=2506 locally_owned_size=1492 n_ghosts=0 +DEAL:0::partitioner: size=2506 locally_owned_size=1492 n_ghosts=273 +DEAL:0::partitioner: size=2506 locally_owned_size=1492 n_ghosts=273 +DEAL:0::partitioner: size=2506 locally_owned_size=1492 n_ghosts=0 +DEAL:0::partitioner: size=2506 locally_owned_size=1492 n_ghosts=0 -DEAL:1::main partitioner: size=2506 local_size=1014 n_ghosts=442 -DEAL:1::partitioner: size=2506 local_size=1014 n_ghosts=169 -DEAL:1::partitioner: size=2506 local_size=1014 n_ghosts=442 -DEAL:1::partitioner: size=2506 local_size=1014 n_ghosts=442 -DEAL:1::partitioner: size=2506 local_size=1014 n_ghosts=0 -DEAL:1::partitioner: size=2506 local_size=1014 n_ghosts=0 +DEAL:1::main partitioner: size=2506 locally_owned_size=1014 n_ghosts=442 +DEAL:1::partitioner: size=2506 locally_owned_size=1014 n_ghosts=169 +DEAL:1::partitioner: size=2506 locally_owned_size=1014 n_ghosts=442 +DEAL:1::partitioner: size=2506 locally_owned_size=1014 n_ghosts=442 +DEAL:1::partitioner: size=2506 locally_owned_size=1014 n_ghosts=0 +DEAL:1::partitioner: size=2506 locally_owned_size=1014 n_ghosts=0 diff --git a/tests/matrix_free/laplace_operator_01.cc b/tests/matrix_free/laplace_operator_01.cc index f7c0da4f75..951cd611a8 100644 --- a/tests/matrix_free/laplace_operator_01.cc +++ b/tests/matrix_free/laplace_operator_01.cc @@ -130,7 +130,7 @@ test() out.reinit(in); ref.reinit(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/laplace_operator_02.cc b/tests/matrix_free/laplace_operator_02.cc index 1c49149a7d..cfa713ab62 100644 --- a/tests/matrix_free/laplace_operator_02.cc +++ b/tests/matrix_free/laplace_operator_02.cc @@ -191,7 +191,7 @@ test() out.reinit(in); ref.reinit(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/laplace_operator_03.cc b/tests/matrix_free/laplace_operator_03.cc index 0338181cfb..b17b20469b 100644 --- a/tests/matrix_free/laplace_operator_03.cc +++ b/tests/matrix_free/laplace_operator_03.cc @@ -141,7 +141,7 @@ test() out.reinit(in); ref.reinit(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/laplace_operator_05.cc b/tests/matrix_free/laplace_operator_05.cc index 401134a0e8..6460fc584d 100644 --- a/tests/matrix_free/laplace_operator_05.cc +++ b/tests/matrix_free/laplace_operator_05.cc @@ -133,7 +133,7 @@ test() out.reinit(in); ref.reinit(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/loop_boundary.cc b/tests/matrix_free/loop_boundary.cc index 2712dbe450..edd49406d2 100644 --- a/tests/matrix_free/loop_boundary.cc +++ b/tests/matrix_free/loop_boundary.cc @@ -66,7 +66,7 @@ do_test(const unsigned int n_refine, const bool overlap_communication) LinearAlgebra::distributed::Vector in, ref, test; matrix_free.initialize_dof_vector(in); - for (unsigned int i = 0; i < in.get_partitioner()->local_size(); ++i) + for (unsigned int i = 0; i < in.get_partitioner()->locally_owned_size(); ++i) in.local_element(i) = in.get_partitioner()->local_to_global(i); matrix_free.initialize_dof_vector(ref); matrix_free.initialize_dof_vector(test); diff --git a/tests/matrix_free/loop_boundary_02.cc b/tests/matrix_free/loop_boundary_02.cc index 5a4a3b27d9..81301a46bf 100644 --- a/tests/matrix_free/loop_boundary_02.cc +++ b/tests/matrix_free/loop_boundary_02.cc @@ -68,7 +68,7 @@ do_test(const unsigned int n_refine) LinearAlgebra::distributed::Vector in, test; matrix_free.initialize_dof_vector(in); - for (unsigned int i = 0; i < in.get_partitioner()->local_size(); ++i) + for (unsigned int i = 0; i < in.get_partitioner()->locally_owned_size(); ++i) in.local_element(i) = in.get_partitioner()->local_to_global(i); matrix_free.initialize_dof_vector(test); diff --git a/tests/matrix_free/mass_operator_01.cc b/tests/matrix_free/mass_operator_01.cc index 637b49c0ee..4d2dcca3b6 100644 --- a/tests/matrix_free/mass_operator_01.cc +++ b/tests/matrix_free/mass_operator_01.cc @@ -136,7 +136,7 @@ test() out.reinit(in); ref.reinit(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/mass_operator_02.cc b/tests/matrix_free/mass_operator_02.cc index fd0d58bb88..259f5b9167 100644 --- a/tests/matrix_free/mass_operator_02.cc +++ b/tests/matrix_free/mass_operator_02.cc @@ -104,7 +104,7 @@ test() out.reinit(in); ref.reinit(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) @@ -169,7 +169,7 @@ test() sparse_matrix.compress(VectorOperation::add); // Check the diagonal: - for (unsigned int i = 0; i < ref.local_size(); ++i) + for (unsigned int i = 0; i < ref.locally_owned_size(); ++i) { const auto glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) @@ -190,7 +190,7 @@ test() mf.compute_lumped_diagonal(); out = mf.get_matrix_lumped_diagonal_inverse()->get_vector(); sparse_matrix.vmult(ref, in); - for (unsigned int i = 0; i < ref.local_size(); ++i) + for (unsigned int i = 0; i < ref.locally_owned_size(); ++i) { const auto glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/mass_operator_03.cc b/tests/matrix_free/mass_operator_03.cc index bbb735e4b2..af52f3bca1 100644 --- a/tests/matrix_free/mass_operator_03.cc +++ b/tests/matrix_free/mass_operator_03.cc @@ -101,7 +101,7 @@ test() out.reinit(in); ref.reinit(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) @@ -166,7 +166,7 @@ test() sparse_matrix.compress(VectorOperation::add); // Check the diagonal: - for (unsigned int i = 0; i < ref.local_size(); ++i) + for (unsigned int i = 0; i < ref.locally_owned_size(); ++i) { const auto glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) @@ -187,7 +187,7 @@ test() mf.compute_lumped_diagonal(); out = mf.get_matrix_lumped_diagonal_inverse()->get_vector(); sparse_matrix.vmult(ref, in); - for (unsigned int i = 0; i < ref.local_size(); ++i) + for (unsigned int i = 0; i < ref.locally_owned_size(); ++i) { const auto glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/mass_operator_04.cc b/tests/matrix_free/mass_operator_04.cc index 198162da6b..c6dae57401 100644 --- a/tests/matrix_free/mass_operator_04.cc +++ b/tests/matrix_free/mass_operator_04.cc @@ -100,7 +100,7 @@ test() LinearAlgebra::distributed::Vector in, out, ref; mf_data_0->initialize_dof_vector(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) in.local_element(i) = random_value(); mf_c0.initialize_dof_vector(out); diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_10.cc b/tests/matrix_free/matrix_free_device_matrix_vector_10.cc index 16146e9214..b3b7b040d9 100644 --- a/tests/matrix_free/matrix_free_device_matrix_vector_10.cc +++ b/tests/matrix_free/matrix_free_device_matrix_vector_10.cc @@ -129,7 +129,7 @@ test() mf_data.initialize_dof_vector(out_dev); LinearAlgebra::ReadWriteVector rw_in(owned_set); - for (unsigned int i = 0; i < in_dev.local_size(); ++i) + for (unsigned int i = 0; i < in_dev.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_10a.cc b/tests/matrix_free/matrix_free_device_matrix_vector_10a.cc index 54b6be51e9..9b79c0aa02 100644 --- a/tests/matrix_free/matrix_free_device_matrix_vector_10a.cc +++ b/tests/matrix_free/matrix_free_device_matrix_vector_10a.cc @@ -131,7 +131,7 @@ test() mf_data.initialize_dof_vector(in_dev); mf_data.initialize_dof_vector(out_dev); LinearAlgebra::ReadWriteVector rw_in(owned_set); - for (unsigned int i = 0; i < in_dev.local_size(); ++i) + for (unsigned int i = 0; i < in_dev.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_19.cc b/tests/matrix_free/matrix_free_device_matrix_vector_19.cc index cea9e145f9..b96b9dc104 100644 --- a/tests/matrix_free/matrix_free_device_matrix_vector_19.cc +++ b/tests/matrix_free/matrix_free_device_matrix_vector_19.cc @@ -125,7 +125,7 @@ test() owned_set, MPI_COMM_WORLD); LinearAlgebra::ReadWriteVector rw_in(owned_set); - for (unsigned int i = 0; i < in_dev.local_size(); ++i) + for (unsigned int i = 0; i < in_dev.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_25.cc b/tests/matrix_free/matrix_free_device_matrix_vector_25.cc index d0742618aa..846dfd6fb9 100644 --- a/tests/matrix_free/matrix_free_device_matrix_vector_25.cc +++ b/tests/matrix_free/matrix_free_device_matrix_vector_25.cc @@ -132,7 +132,7 @@ test() mf_data.initialize_dof_vector(out_dev); LinearAlgebra::ReadWriteVector rw_in(owned_set); - for (unsigned int i = 0; i < in_dev.local_size(); ++i) + for (unsigned int i = 0; i < in_dev.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_26.cc b/tests/matrix_free/matrix_free_device_matrix_vector_26.cc index a6ea74120b..17ce91d662 100644 --- a/tests/matrix_free/matrix_free_device_matrix_vector_26.cc +++ b/tests/matrix_free/matrix_free_device_matrix_vector_26.cc @@ -138,7 +138,7 @@ test() mf_data.initialize_dof_vector(out_dev); LinearAlgebra::ReadWriteVector rw_in(owned_set); - for (unsigned int i = 0; i < in_dev.local_size(); ++i) + for (unsigned int i = 0; i < in_dev.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_free_device_precondition_chebyshev.cc b/tests/matrix_free/matrix_free_device_precondition_chebyshev.cc index c1aa6bef6f..3cefe101ae 100644 --- a/tests/matrix_free/matrix_free_device_precondition_chebyshev.cc +++ b/tests/matrix_free/matrix_free_device_precondition_chebyshev.cc @@ -108,13 +108,13 @@ test() MappingQ mapping(fe_degree); CUDAWrappers::MatrixFree mf_data; - const QGauss<1> quad(fe_degree + 1); + const QGauss<1> uad(fe_degree + 1); typename CUDAWrappers::MatrixFree::AdditionalData additional_data; additional_data.mapping_update_flags = update_values | update_gradients | update_JxW_values | update_quadrature_points; - mf_data.reinit(mapping, dof, constraints, quad, additional_data); + mf_data.reinit(mapping, dof, constraints, uad, additional_data); const unsigned int coef_size = tria.n_locally_owned_active_cells() * std::pow(fe_degree + 1, dim); @@ -131,7 +131,7 @@ test() owned_set, MPI_COMM_WORLD); LinearAlgebra::ReadWriteVector rw_in(owned_set); - for (unsigned int i = 0; i < in_dev.local_size(); ++i) + for (unsigned int i = 0; i < in_dev.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_vector_10.cc b/tests/matrix_free/matrix_vector_10.cc index fcf28f0708..f60cb23fc8 100644 --- a/tests/matrix_free/matrix_vector_10.cc +++ b/tests/matrix_free/matrix_vector_10.cc @@ -131,7 +131,7 @@ test() out.reinit(in); ref.reinit(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_vector_11.cc b/tests/matrix_free/matrix_vector_11.cc index d25b701136..efe6627224 100644 --- a/tests/matrix_free/matrix_vector_11.cc +++ b/tests/matrix_free/matrix_vector_11.cc @@ -124,7 +124,7 @@ test() out.reinit(in); ref.reinit(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_vector_12.cc b/tests/matrix_free/matrix_vector_12.cc index 0d35c5e19b..4d72016c9e 100644 --- a/tests/matrix_free/matrix_vector_12.cc +++ b/tests/matrix_free/matrix_vector_12.cc @@ -189,7 +189,7 @@ test() } mf_data.initialize_dof_vector(ref); - for (unsigned int i = 0; i < in[0].local_size(); ++i) + for (unsigned int i = 0; i < in[0].locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_vector_13.cc b/tests/matrix_free/matrix_vector_13.cc index 5770be7e87..96e358118f 100644 --- a/tests/matrix_free/matrix_vector_13.cc +++ b/tests/matrix_free/matrix_vector_13.cc @@ -190,7 +190,7 @@ test() mf_data.initialize_dof_vector(ref); - for (unsigned int i = 0; i < in.block(0).local_size(); ++i) + for (unsigned int i = 0; i < in.block(0).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_vector_19.cc b/tests/matrix_free/matrix_vector_19.cc index ebe1085ddf..3e97adc248 100644 --- a/tests/matrix_free/matrix_vector_19.cc +++ b/tests/matrix_free/matrix_vector_19.cc @@ -125,7 +125,7 @@ test() out.reinit(in); ref.reinit(in); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_vector_20.cc b/tests/matrix_free/matrix_vector_20.cc index 22d5b90d37..bdfa86fba9 100644 --- a/tests/matrix_free/matrix_vector_20.cc +++ b/tests/matrix_free/matrix_vector_20.cc @@ -195,7 +195,7 @@ test() out.collect_sizes(); mf_data.initialize_dof_vector(ref); - for (unsigned int i = 0; i < in.block(0).local_size(); ++i) + for (unsigned int i = 0; i < in.block(0).locally_owned_size(); ++i) { if (constraints.is_constrained( dof.locally_owned_dofs().index_within_set(i))) diff --git a/tests/matrix_free/matrix_vector_21.cc b/tests/matrix_free/matrix_vector_21.cc index 051b6da361..8534a2006e 100644 --- a/tests/matrix_free/matrix_vector_21.cc +++ b/tests/matrix_free/matrix_vector_21.cc @@ -185,7 +185,7 @@ test() out.collect_sizes(); mf_data.initialize_dof_vector(ref); - for (unsigned int i = 0; i < in.block(0).local_size(); ++i) + for (unsigned int i = 0; i < in.block(0).locally_owned_size(); ++i) { if (constraints.is_constrained( dof.locally_owned_dofs().index_within_set(i))) diff --git a/tests/matrix_free/matrix_vector_22.cc b/tests/matrix_free/matrix_vector_22.cc index 9024633c7a..5ded5f1a0c 100644 --- a/tests/matrix_free/matrix_vector_22.cc +++ b/tests/matrix_free/matrix_vector_22.cc @@ -190,7 +190,7 @@ test() } mf_data.initialize_dof_vector(ref); - for (unsigned int i = 0; i < in[0].local_size(); ++i) + for (unsigned int i = 0; i < in[0].locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_vector_23.cc b/tests/matrix_free/matrix_vector_23.cc index aff768c059..855ba70854 100644 --- a/tests/matrix_free/matrix_vector_23.cc +++ b/tests/matrix_free/matrix_vector_23.cc @@ -201,7 +201,7 @@ test() } mf_data.initialize_dof_vector(ref); - for (unsigned int i = 0; i < in[0].local_size(); ++i) + for (unsigned int i = 0; i < in[0].locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_vector_blocks.cc b/tests/matrix_free/matrix_vector_blocks.cc index fbf0251f03..cb273177bb 100644 --- a/tests/matrix_free/matrix_vector_blocks.cc +++ b/tests/matrix_free/matrix_vector_blocks.cc @@ -187,7 +187,8 @@ test() // matrix-vector product for reference for (unsigned int block = 0; block < n_blocks; ++block) { - for (unsigned int i = 0; i < in.block(block).local_size(); ++i) + for (unsigned int i = 0; i < in.block(block).locally_owned_size(); + ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/matrix_free/matrix_vector_faces_10.cc b/tests/matrix_free/matrix_vector_faces_10.cc index b616c68077..5e328a9f18 100644 --- a/tests/matrix_free/matrix_vector_faces_10.cc +++ b/tests/matrix_free/matrix_vector_faces_10.cc @@ -96,7 +96,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_11.cc b/tests/matrix_free/matrix_vector_faces_11.cc index 7f42390cd1..c99113ea9e 100644 --- a/tests/matrix_free/matrix_vector_faces_11.cc +++ b/tests/matrix_free/matrix_vector_faces_11.cc @@ -97,7 +97,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_13.cc b/tests/matrix_free/matrix_vector_faces_13.cc index 525d43ae37..9a539428d2 100644 --- a/tests/matrix_free/matrix_vector_faces_13.cc +++ b/tests/matrix_free/matrix_vector_faces_13.cc @@ -103,7 +103,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_14.cc b/tests/matrix_free/matrix_vector_faces_14.cc index 4aaa2847f2..6029cddd49 100644 --- a/tests/matrix_free/matrix_vector_faces_14.cc +++ b/tests/matrix_free/matrix_vector_faces_14.cc @@ -109,7 +109,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_15.cc b/tests/matrix_free/matrix_vector_faces_15.cc index 33632d3567..1d6e7a6cef 100644 --- a/tests/matrix_free/matrix_vector_faces_15.cc +++ b/tests/matrix_free/matrix_vector_faces_15.cc @@ -113,7 +113,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in_orig.local_size(); ++i) + for (unsigned int i = 0; i < in_orig.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in_orig.local_element(i) = entry; @@ -136,7 +136,7 @@ test() mf2(mf_data); mf2.vmult(out, in); - for (unsigned int i = 0; i < out.local_size(); ++i) + for (unsigned int i = 0; i < out.locally_owned_size(); ++i) out(renumbering[i]) -= out_orig.local_element(i); double diff_norm = out.linfty_norm() / out_orig.linfty_norm(); @@ -145,7 +145,7 @@ test() // test again, now doing matrix-vector product twice mf2.vmult(out, in); mf2.vmult(out, in); - for (unsigned int i = 0; i < out.local_size(); ++i) + for (unsigned int i = 0; i < out.locally_owned_size(); ++i) out(renumbering[i]) -= out_orig.local_element(i); diff_norm = out.linfty_norm() / out_orig.linfty_norm(); deallog << diff_norm << std::endl; diff --git a/tests/matrix_free/matrix_vector_faces_16.cc b/tests/matrix_free/matrix_vector_faces_16.cc index 8113b1080f..4c5de90f09 100644 --- a/tests/matrix_free/matrix_vector_faces_16.cc +++ b/tests/matrix_free/matrix_vector_faces_16.cc @@ -91,7 +91,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; @@ -108,14 +108,14 @@ test() mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); mf_data.initialize_dof_vector(in2); mf_data.initialize_dof_vector(out2); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { in2(renumbering[i]) = in.local_element(i); } mf.vmult(out2, in2); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) out2(renumbering[i]) -= out.local_element(i); double diff_norm = out2.linfty_norm() / out.linfty_norm(); diff --git a/tests/matrix_free/matrix_vector_faces_17.cc b/tests/matrix_free/matrix_vector_faces_17.cc index 9258e356bf..cdf9766f1c 100644 --- a/tests/matrix_free/matrix_vector_faces_17.cc +++ b/tests/matrix_free/matrix_vector_faces_17.cc @@ -108,7 +108,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in_orig.local_size(); ++i) + for (unsigned int i = 0; i < in_orig.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in_orig.local_element(i) = entry; @@ -131,7 +131,7 @@ test() mf2(mf_data); mf2.vmult(out, in); - for (unsigned int i = 0; i < out.local_size(); ++i) + for (unsigned int i = 0; i < out.locally_owned_size(); ++i) out(renumbering[i]) -= out_orig.local_element(i); double diff_norm = out.linfty_norm() / out_orig.linfty_norm(); @@ -140,7 +140,7 @@ test() // test again, now doing matrix-vector product twice mf2.vmult(out, in); mf2.vmult(out, in); - for (unsigned int i = 0; i < out.local_size(); ++i) + for (unsigned int i = 0; i < out.locally_owned_size(); ++i) out(renumbering[i]) -= out_orig.local_element(i); diff_norm = out.linfty_norm() / out_orig.linfty_norm(); deallog << diff_norm << std::endl; diff --git a/tests/matrix_free/matrix_vector_faces_18.cc b/tests/matrix_free/matrix_vector_faces_18.cc index 07881ce478..e2b1007359 100644 --- a/tests/matrix_free/matrix_vector_faces_18.cc +++ b/tests/matrix_free/matrix_vector_faces_18.cc @@ -200,7 +200,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in_orig.local_size(); ++i) + for (unsigned int i = 0; i < in_orig.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in_orig.local_element(i) = entry; @@ -223,7 +223,7 @@ test() mf2(mf_data); mf2.vmult(out, in); - for (unsigned int i = 0; i < out.local_size(); ++i) + for (unsigned int i = 0; i < out.locally_owned_size(); ++i) out(renumbering[i]) -= out_orig.local_element(i); double diff_norm = out.linfty_norm() / out_orig.linfty_norm(); @@ -232,7 +232,7 @@ test() // test again, now doing matrix-vector product twice mf2.vmult(out, in); mf2.vmult(out, in); - for (unsigned int i = 0; i < out.local_size(); ++i) + for (unsigned int i = 0; i < out.locally_owned_size(); ++i) out(renumbering[i]) -= out_orig.local_element(i); diff_norm = out.linfty_norm() / out_orig.linfty_norm(); deallog << diff_norm << std::endl; diff --git a/tests/matrix_free/matrix_vector_faces_19.cc b/tests/matrix_free/matrix_vector_faces_19.cc index 9948af1690..18488c2fa4 100644 --- a/tests/matrix_free/matrix_vector_faces_19.cc +++ b/tests/matrix_free/matrix_vector_faces_19.cc @@ -103,7 +103,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_20.cc b/tests/matrix_free/matrix_vector_faces_20.cc index 68f0f0a883..6fc35a5fad 100644 --- a/tests/matrix_free/matrix_vector_faces_20.cc +++ b/tests/matrix_free/matrix_vector_faces_20.cc @@ -105,7 +105,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_21.cc b/tests/matrix_free/matrix_vector_faces_21.cc index ae66a5a425..ea8ce159b4 100644 --- a/tests/matrix_free/matrix_vector_faces_21.cc +++ b/tests/matrix_free/matrix_vector_faces_21.cc @@ -115,7 +115,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_22.cc b/tests/matrix_free/matrix_vector_faces_22.cc index 0f271f4740..e6cd119aac 100644 --- a/tests/matrix_free/matrix_vector_faces_22.cc +++ b/tests/matrix_free/matrix_vector_faces_22.cc @@ -104,7 +104,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_23.cc b/tests/matrix_free/matrix_vector_faces_23.cc index 0371e4f319..68832694e1 100644 --- a/tests/matrix_free/matrix_vector_faces_23.cc +++ b/tests/matrix_free/matrix_vector_faces_23.cc @@ -115,7 +115,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_24.cc b/tests/matrix_free/matrix_vector_faces_24.cc index 6bed676539..f65f0eeaa4 100644 --- a/tests/matrix_free/matrix_vector_faces_24.cc +++ b/tests/matrix_free/matrix_vector_faces_24.cc @@ -89,7 +89,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_29.cc b/tests/matrix_free/matrix_vector_faces_29.cc index 36cebb6dcf..c5921e2a04 100644 --- a/tests/matrix_free/matrix_vector_faces_29.cc +++ b/tests/matrix_free/matrix_vector_faces_29.cc @@ -111,7 +111,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.block(0).local_size(); ++i) + for (unsigned int i = 0; i < in.block(0).locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.block(0).local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_30.cc b/tests/matrix_free/matrix_vector_faces_30.cc index 6ab6b2c7e2..8a3a2957f7 100644 --- a/tests/matrix_free/matrix_vector_faces_30.cc +++ b/tests/matrix_free/matrix_vector_faces_30.cc @@ -106,7 +106,7 @@ test() // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_31.cc b/tests/matrix_free/matrix_vector_faces_31.cc index f2295e473f..64973066ab 100644 --- a/tests/matrix_free/matrix_vector_faces_31.cc +++ b/tests/matrix_free/matrix_vector_faces_31.cc @@ -101,7 +101,7 @@ do_test(const unsigned int fe_degree) // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/matrix_vector_faces_32.cc b/tests/matrix_free/matrix_vector_faces_32.cc index 81765a14ad..587113b8ef 100644 --- a/tests/matrix_free/matrix_vector_faces_32.cc +++ b/tests/matrix_free/matrix_vector_faces_32.cc @@ -101,7 +101,7 @@ do_test(const unsigned int fe_degree) // Set random seed for reproducibility Testing::srand(42); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) { const double entry = Testing::rand() / (double)RAND_MAX; in.local_element(i) = entry; diff --git a/tests/matrix_free/multigrid_dg_periodic.cc b/tests/matrix_free/multigrid_dg_periodic.cc index 7ae65e2e52..2d3e3c2e39 100644 --- a/tests/matrix_free/multigrid_dg_periodic.cc +++ b/tests/matrix_free/multigrid_dg_periodic.cc @@ -281,7 +281,8 @@ private: inverse_diagonal_entries, dummy); - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); diff --git a/tests/matrix_free/multigrid_dg_sip_01.cc b/tests/matrix_free/multigrid_dg_sip_01.cc index 46747662bc..bcb67a2342 100644 --- a/tests/matrix_free/multigrid_dg_sip_01.cc +++ b/tests/matrix_free/multigrid_dg_sip_01.cc @@ -290,7 +290,8 @@ private: inverse_diagonal_entries, dummy); - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); diff --git a/tests/matrix_free/multigrid_dg_sip_02.cc b/tests/matrix_free/multigrid_dg_sip_02.cc index b8ef61ad96..fb5ac5cc66 100644 --- a/tests/matrix_free/multigrid_dg_sip_02.cc +++ b/tests/matrix_free/multigrid_dg_sip_02.cc @@ -291,7 +291,8 @@ private: inverse_diagonal_entries, dummy); - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); diff --git a/tests/matrix_free/parallel_multigrid.cc b/tests/matrix_free/parallel_multigrid.cc index a7078d2db6..f07fa4d709 100644 --- a/tests/matrix_free/parallel_multigrid.cc +++ b/tests/matrix_free/parallel_multigrid.cc @@ -228,7 +228,8 @@ private: inverse_diagonal_entries, dummy); - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_01.cc b/tests/matrix_free/parallel_multigrid_adaptive_01.cc index 6a5b765e3d..280bf0d983 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_01.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_01.cc @@ -226,7 +226,7 @@ public: .local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; } - for (; c < dst.local_size(); ++c) + for (; c < dst.locally_owned_size(); ++c) dst.local_element(c) = 0.; } @@ -255,7 +255,7 @@ public: src_cpy.local_element(c) = 0.; ++c; } - for (; c < src_cpy.local_size(); ++c) + for (; c < src_cpy.locally_owned_size(); ++c) src_cpy.local_element(c) = 0.; data.cell_loop(&LaplaceOperator::local_apply, this, dst, src_cpy); @@ -347,7 +347,8 @@ private: } - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); @@ -533,7 +534,7 @@ do_test(const DoFHandler &dof) fine_matrix.initialize_dof_vector(sol); // set constant rhs vector - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) if (!hanging_node_constraints.is_constrained( in.get_partitioner()->local_to_global(i))) in.local_element(i) = 1.; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.cc b/tests/matrix_free/parallel_multigrid_adaptive_02.cc index bcd99ec118..b011872bcb 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_02.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_02.cc @@ -194,7 +194,7 @@ do_test(const DoFHandler &dof) DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) if (!hanging_node_constraints.is_constrained( in.get_partitioner()->local_to_global(i))) in.local_element(i) = 1.; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.cc b/tests/matrix_free/parallel_multigrid_adaptive_03.cc index 760842f95c..d932c4211c 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_03.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_03.cc @@ -233,7 +233,7 @@ public: .local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; } - for (; c < dst.local_size(); ++c) + for (; c < dst.locally_owned_size(); ++c) dst.local_element(c) = 0.; } @@ -262,7 +262,7 @@ public: src_cpy.local_element(c) = 0.; ++c; } - for (; c < src_cpy.local_size(); ++c) + for (; c < src_cpy.locally_owned_size(); ++c) src_cpy.local_element(c) = 0.; data.cell_loop(&LaplaceOperator::local_apply, this, dst, src_cpy); @@ -354,7 +354,8 @@ private: } - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); @@ -542,7 +543,7 @@ do_test(const DoFHandler &dof, const bool threaded) fine_matrix.initialize_dof_vector(sol); // set constant rhs vector - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) if (!hanging_node_constraints.is_constrained( in.get_partitioner()->local_to_global(i))) in.local_element(i) = 1.; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_04.cc b/tests/matrix_free/parallel_multigrid_adaptive_04.cc index ebbd790bb9..45c1106b95 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_04.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_04.cc @@ -194,7 +194,7 @@ do_test(const DoFHandler &dof) DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) if (!hanging_node_constraints.is_constrained( in.get_partitioner()->local_to_global(i))) in.local_element(i) = 1.; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_05.cc b/tests/matrix_free/parallel_multigrid_adaptive_05.cc index d0b8c1338c..96b5394ad9 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_05.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_05.cc @@ -230,7 +230,7 @@ public: .local_element(edge_constrained_indices[i]) = edge_constrained_values[i].first; } - for (; c < dst.local_size(); ++c) + for (; c < dst.locally_owned_size(); ++c) dst.local_element(c) = 0.; } @@ -259,7 +259,7 @@ public: src_cpy.local_element(c) = 0.; ++c; } - for (; c < src_cpy.local_size(); ++c) + for (; c < src_cpy.locally_owned_size(); ++c) src_cpy.local_element(c) = 0.; data.cell_loop(&LaplaceOperator::local_apply, this, dst, src_cpy); @@ -351,7 +351,8 @@ private: } - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); @@ -539,7 +540,7 @@ do_test(const DoFHandler &dof, const bool threaded) fine_matrix.initialize_dof_vector(sol); // set constant rhs vector - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) if (!hanging_node_constraints.is_constrained( in.get_partitioner()->local_to_global(i))) in.local_element(i) = 1.; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06.cc b/tests/matrix_free/parallel_multigrid_adaptive_06.cc index d68633eb1b..59bc3445a7 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06.cc @@ -283,7 +283,7 @@ do_test(const DoFHandler &dof, const unsigned int nb) DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); - for (unsigned int i = 0; i < in.block(0).local_size(); ++i) + for (unsigned int i = 0; i < in.block(0).locally_owned_size(); ++i) if (!hanging_node_constraints.is_constrained( in.block(0).get_partitioner()->local_to_global(i))) in.block(0).local_element(i) = 1.; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc index fe6aea7d38..950889193d 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc @@ -195,7 +195,7 @@ do_test(const DoFHandler &dof) DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) if (!hanging_node_constraints.is_constrained( in.get_partitioner()->local_to_global(i))) in.local_element(i) = 1.; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_07.cc b/tests/matrix_free/parallel_multigrid_adaptive_07.cc index 87eb5faecf..d5accb855f 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_07.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_07.cc @@ -306,7 +306,7 @@ do_test(const std::vector *> &dof) hanging_node_constraints); hanging_node_constraints.close(); - for (unsigned int i = 0; i < in.block(b).local_size(); ++i) + for (unsigned int i = 0; i < in.block(b).locally_owned_size(); ++i) if (!hanging_node_constraints.is_constrained( in.block(b).get_partitioner()->local_to_global(i))) in.block(b).local_element(i) = 1.; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_08.cc b/tests/matrix_free/parallel_multigrid_adaptive_08.cc index b57ab0b5b5..39d4afd56c 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_08.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_08.cc @@ -160,10 +160,11 @@ private: this->data->get_dof_info(0).vector_partitioner.get()) return; - Assert(vec.get_partitioner()->local_size() == - this->data->get_dof_info(0).vector_partitioner->local_size(), - ExcMessage("The vector passed to the vmult() function does not have " - "the correct size for compatibility with MatrixFree.")); + Assert( + vec.get_partitioner()->locally_owned_size() == + this->data->get_dof_info(0).vector_partitioner->locally_owned_size(), + ExcMessage("The vector passed to the vmult() function does not have " + "the correct size for compatibility with MatrixFree.")); LinearAlgebra::distributed::Vector copy_vec(vec); this->data->initialize_dof_vector( const_cast &>(vec), 0); @@ -270,7 +271,7 @@ do_test(const DoFHandler &dof) DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); - for (unsigned int i = 0; i < in.local_size(); ++i) + for (unsigned int i = 0; i < in.locally_owned_size(); ++i) if (!hanging_node_constraints.is_constrained( in.get_partitioner()->local_to_global(i))) in.local_element(i) = 1.; diff --git a/tests/matrix_free/parallel_multigrid_fullydistributed.cc b/tests/matrix_free/parallel_multigrid_fullydistributed.cc index 4a29b0682d..fdb129600e 100644 --- a/tests/matrix_free/parallel_multigrid_fullydistributed.cc +++ b/tests/matrix_free/parallel_multigrid_fullydistributed.cc @@ -233,7 +233,8 @@ private: inverse_diagonal_entries, dummy); - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); diff --git a/tests/matrix_free/parallel_multigrid_interleave.cc b/tests/matrix_free/parallel_multigrid_interleave.cc index 582bddf8f6..8e85f40c4a 100644 --- a/tests/matrix_free/parallel_multigrid_interleave.cc +++ b/tests/matrix_free/parallel_multigrid_interleave.cc @@ -252,7 +252,8 @@ private: inverse_diagonal_entries, dummy); - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); diff --git a/tests/matrix_free/parallel_multigrid_interleave_renumber.cc b/tests/matrix_free/parallel_multigrid_interleave_renumber.cc index e3a901f876..96c27dcfda 100644 --- a/tests/matrix_free/parallel_multigrid_interleave_renumber.cc +++ b/tests/matrix_free/parallel_multigrid_interleave_renumber.cc @@ -293,7 +293,8 @@ private: inverse_diagonal_entries, dummy); - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); diff --git a/tests/matrix_free/parallel_multigrid_mf.cc b/tests/matrix_free/parallel_multigrid_mf.cc index c6181d13f9..ba94935293 100644 --- a/tests/matrix_free/parallel_multigrid_mf.cc +++ b/tests/matrix_free/parallel_multigrid_mf.cc @@ -228,7 +228,8 @@ private: inverse_diagonal_entries, dummy); - for (unsigned int i = 0; i < inverse_diagonal_entries.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal_entries.locally_owned_size(); + ++i) if (std::abs(inverse_diagonal_entries.local_element(i)) > 1e-10) inverse_diagonal_entries.local_element(i) = 1. / inverse_diagonal_entries.local_element(i); diff --git a/tests/matrix_free/pre_and_post_loops_01.cc b/tests/matrix_free/pre_and_post_loops_01.cc index 00c7e7fc2e..5dedb0c4b9 100644 --- a/tests/matrix_free/pre_and_post_loops_01.cc +++ b/tests/matrix_free/pre_and_post_loops_01.cc @@ -157,7 +157,7 @@ test() mf_data.initialize_dof_vector(vec2); mf_data.initialize_dof_vector(vec3); - for (unsigned int i = 0; i < vec1.local_size(); ++i) + for (unsigned int i = 0; i < vec1.locally_owned_size(); ++i) { // Multiply by 0.01 to make float error with roundoff less than the // numdiff absolute tolerance diff --git a/tests/matrix_free/pre_and_post_loops_02.cc b/tests/matrix_free/pre_and_post_loops_02.cc index 90994c6d11..d56227566b 100644 --- a/tests/matrix_free/pre_and_post_loops_02.cc +++ b/tests/matrix_free/pre_and_post_loops_02.cc @@ -166,7 +166,7 @@ test() mf_data.initialize_dof_vector(vec2); mf_data.initialize_dof_vector(vec3); - for (unsigned int i = 0; i < vec1.local_size(); ++i) + for (unsigned int i = 0; i < vec1.locally_owned_size(); ++i) { if (constraints.is_constrained( vec1.get_partitioner()->local_to_global(i))) diff --git a/tests/matrix_free/pre_and_post_loops_03.cc b/tests/matrix_free/pre_and_post_loops_03.cc index 38807a19e5..0ff0839277 100644 --- a/tests/matrix_free/pre_and_post_loops_03.cc +++ b/tests/matrix_free/pre_and_post_loops_03.cc @@ -159,7 +159,7 @@ test() mf_data.initialize_dof_vector(vec2); mf_data.initialize_dof_vector(vec3); - for (unsigned int i = 0; i < vec1.local_size(); ++i) + for (unsigned int i = 0; i < vec1.locally_owned_size(); ++i) { // Multiply by 0.01 to make float error with roundoff less than the // numdiff absolute tolerance diff --git a/tests/matrix_free/pre_and_post_loops_04.cc b/tests/matrix_free/pre_and_post_loops_04.cc index 4e052b54b4..124599d3ed 100644 --- a/tests/matrix_free/pre_and_post_loops_04.cc +++ b/tests/matrix_free/pre_and_post_loops_04.cc @@ -156,7 +156,7 @@ test() mf_data.initialize_dof_vector(vec2); mf_data.initialize_dof_vector(vec3); - for (unsigned int i = 0; i < vec1.local_size(); ++i) + for (unsigned int i = 0; i < vec1.locally_owned_size(); ++i) { // Multiply by 0.01 to make float error with roundoff less than the // numdiff absolute tolerance diff --git a/tests/matrix_free/pre_and_post_loops_05.cc b/tests/matrix_free/pre_and_post_loops_05.cc index ea8e956a18..d2a1ed0a21 100644 --- a/tests/matrix_free/pre_and_post_loops_05.cc +++ b/tests/matrix_free/pre_and_post_loops_05.cc @@ -174,7 +174,7 @@ test() mf_data.initialize_dof_vector(vec2, 1); mf_data.initialize_dof_vector(vec3, 1); - for (unsigned int i = 0; i < vec1.local_size(); ++i) + for (unsigned int i = 0; i < vec1.locally_owned_size(); ++i) { // Multiply by 0.01 to make float error with roundoff less than the // numdiff absolute tolerance diff --git a/tests/matrix_free/pre_and_post_loops_06.cc b/tests/matrix_free/pre_and_post_loops_06.cc index bac976e5f3..f7b2c248d6 100644 --- a/tests/matrix_free/pre_and_post_loops_06.cc +++ b/tests/matrix_free/pre_and_post_loops_06.cc @@ -159,7 +159,7 @@ test() mf_data.initialize_dof_vector(vec2); mf_data.initialize_dof_vector(vec3); - for (unsigned int i = 0; i < vec1.local_size(); ++i) + for (unsigned int i = 0; i < vec1.locally_owned_size(); ++i) { // Multiply by 0.01 to make float error with roundoff less than the // numdiff absolute tolerance diff --git a/tests/matrix_free/pre_and_post_loops_07.cc b/tests/matrix_free/pre_and_post_loops_07.cc index 184a2b33bd..3faf76e803 100644 --- a/tests/matrix_free/pre_and_post_loops_07.cc +++ b/tests/matrix_free/pre_and_post_loops_07.cc @@ -173,7 +173,7 @@ test() mf_data.initialize_dof_vector(vec2); mf_data.initialize_dof_vector(vec3); - for (unsigned int i = 0; i < vec1.local_size(); ++i) + for (unsigned int i = 0; i < vec1.locally_owned_size(); ++i) { // Multiply by 0.01 to make float error with roundoff less than the // numdiff absolute tolerance diff --git a/tests/matrix_free/pre_and_post_loops_08.cc b/tests/matrix_free/pre_and_post_loops_08.cc index 5056007eff..fb47a5668b 100644 --- a/tests/matrix_free/pre_and_post_loops_08.cc +++ b/tests/matrix_free/pre_and_post_loops_08.cc @@ -165,7 +165,7 @@ test() mf_data.initialize_dof_vector(vec1); mf_data.initialize_dof_vector(vec2); - for (unsigned int i = 0; i < vec1.local_size(); ++i) + for (unsigned int i = 0; i < vec1.locally_owned_size(); ++i) { // Multiply by 0.01 to make float error with roundoff less than the // numdiff absolute tolerance diff --git a/tests/matrix_free/step-37-inhomogeneous-1.cc b/tests/matrix_free/step-37-inhomogeneous-1.cc index 5b31b9b00b..d12fd0f88a 100644 --- a/tests/matrix_free/step-37-inhomogeneous-1.cc +++ b/tests/matrix_free/step-37-inhomogeneous-1.cc @@ -281,7 +281,7 @@ namespace Step37 this->set_constrained_entries_to_one(inverse_diagonal); - for (unsigned int i = 0; i < inverse_diagonal.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal.locally_owned_size(); ++i) { Assert(inverse_diagonal.local_element(i) > 0., ExcMessage("No diagonal entry in a positive definite operator " diff --git a/tests/matrix_free/step-48.cc b/tests/matrix_free/step-48.cc index 6422705bc4..acf7669b3a 100644 --- a/tests/matrix_free/step-48.cc +++ b/tests/matrix_free/step-48.cc @@ -107,7 +107,7 @@ namespace Step48 } inv_mass_matrix.compress(VectorOperation::add); - for (unsigned int k = 0; k < inv_mass_matrix.local_size(); ++k) + for (unsigned int k = 0; k < inv_mass_matrix.locally_owned_size(); ++k) if (inv_mass_matrix.local_element(k) > 1e-15) inv_mass_matrix.local_element(k) = 1. / inv_mass_matrix.local_element(k); diff --git a/tests/matrix_free/step-48b.cc b/tests/matrix_free/step-48b.cc index 53e40ebed0..8aa31a0c66 100644 --- a/tests/matrix_free/step-48b.cc +++ b/tests/matrix_free/step-48b.cc @@ -101,7 +101,7 @@ namespace Step48 } inv_mass_matrix.compress(VectorOperation::add); - for (unsigned int k = 0; k < inv_mass_matrix.local_size(); ++k) + for (unsigned int k = 0; k < inv_mass_matrix.locally_owned_size(); ++k) if (inv_mass_matrix.local_element(k) > 1e-15) inv_mass_matrix.local_element(k) = 1. / inv_mass_matrix.local_element(k); diff --git a/tests/matrix_free/step-48c.cc b/tests/matrix_free/step-48c.cc index 8b2a2982ee..9e749cce50 100644 --- a/tests/matrix_free/step-48c.cc +++ b/tests/matrix_free/step-48c.cc @@ -107,7 +107,7 @@ namespace Step48 } inv_mass_matrix.compress(VectorOperation::add); - for (unsigned int k = 0; k < inv_mass_matrix.local_size(); ++k) + for (unsigned int k = 0; k < inv_mass_matrix.locally_owned_size(); ++k) if (inv_mass_matrix.local_element(k) > 1e-15) inv_mass_matrix.local_element(k) = 1. / inv_mass_matrix.local_element(k); diff --git a/tests/matrix_free/stokes_computation.cc b/tests/matrix_free/stokes_computation.cc index 8ca1d28423..203f8c9814 100644 --- a/tests/matrix_free/stokes_computation.cc +++ b/tests/matrix_free/stokes_computation.cc @@ -692,7 +692,7 @@ namespace StokesClass this->set_constrained_entries_to_one(diagonal); inverse_diagonal = diagonal; - const unsigned int local_size = inverse_diagonal.local_size(); + const unsigned int local_size = inverse_diagonal.locally_owned_size(); for (unsigned int i = 0; i < local_size; ++i) { Assert(inverse_diagonal.local_element(i) > 0., @@ -865,7 +865,7 @@ namespace StokesClass this->set_constrained_entries_to_one(inverse_diagonal); - for (unsigned int i = 0; i < inverse_diagonal.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal.locally_owned_size(); ++i) { Assert(inverse_diagonal.local_element(i) > 0., ExcMessage("No diagonal entry in a positive definite operator " diff --git a/tests/mpi/parallel_block_vector_05.cc b/tests/mpi/parallel_block_vector_05.cc index 74c89a0fce..db48647b88 100644 --- a/tests/mpi/parallel_block_vector_05.cc +++ b/tests/mpi/parallel_block_vector_05.cc @@ -125,7 +125,7 @@ test(const unsigned int n_blocks = 5) mf_data->initialize_dof_vector(left.block(b)); mf_data->initialize_dof_vector(right.block(b)); - for (unsigned int i = 0; i < right.block(b).local_size(); ++i) + for (unsigned int i = 0; i < right.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) @@ -162,7 +162,7 @@ test(const unsigned int n_blocks = 5) for (unsigned int b = 0; b < left2.n_blocks(); ++b) { mf_data->initialize_dof_vector(left2.block(b)); - for (unsigned int i = 0; i < left2.block(b).local_size(); ++i) + for (unsigned int i = 0; i < left2.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/mpi/parallel_block_vector_06.cc b/tests/mpi/parallel_block_vector_06.cc index 9d5190e9a0..35ca303851 100644 --- a/tests/mpi/parallel_block_vector_06.cc +++ b/tests/mpi/parallel_block_vector_06.cc @@ -127,7 +127,7 @@ test(const unsigned int n_blocks = 5) mf_data->initialize_dof_vector(left.block(b)); mf_data->initialize_dof_vector(right.block(b)); - for (unsigned int i = 0; i < right.block(b).local_size(); ++i) + for (unsigned int i = 0; i < right.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) @@ -168,7 +168,7 @@ test(const unsigned int n_blocks = 5) for (unsigned int b = 0; b < left2.n_blocks(); ++b) { mf_data->initialize_dof_vector(left2.block(b)); - for (unsigned int i = 0; i < left2.block(b).local_size(); ++i) + for (unsigned int i = 0; i < left2.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/mpi/parallel_block_vector_07.cc b/tests/mpi/parallel_block_vector_07.cc index 578c2e68ab..2817d2fa92 100644 --- a/tests/mpi/parallel_block_vector_07.cc +++ b/tests/mpi/parallel_block_vector_07.cc @@ -126,7 +126,7 @@ test(const unsigned int n_blocks = 5) mf_data->initialize_dof_vector(right.block(b)); left.block(b) = 0.; right.block(b) = 0.; - for (unsigned int i = 0; i < right.block(b).local_size(); ++i) + for (unsigned int i = 0; i < right.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/mpi/parallel_block_vector_08.cc b/tests/mpi/parallel_block_vector_08.cc index 53e1a838cd..fadf905759 100644 --- a/tests/mpi/parallel_block_vector_08.cc +++ b/tests/mpi/parallel_block_vector_08.cc @@ -128,7 +128,7 @@ test(const unsigned int n_blocks = 5) left.block(b) = 0.; left2.block(b) = 0.; right.block(b) = 0.; - for (unsigned int i = 0; i < right.block(b).local_size(); ++i) + for (unsigned int i = 0; i < right.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/mpi/parallel_block_vector_09.cc b/tests/mpi/parallel_block_vector_09.cc index 4942486054..45aadfb41a 100644 --- a/tests/mpi/parallel_block_vector_09.cc +++ b/tests/mpi/parallel_block_vector_09.cc @@ -131,7 +131,7 @@ test(const unsigned int n_blocks = 5) left.block(b) = 0.; left2.block(b) = 0.; right.block(b) = 0.; - for (unsigned int i = 0; i < right.block(b).local_size(); ++i) + for (unsigned int i = 0; i < right.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/mpi/parallel_block_vector_10.cc b/tests/mpi/parallel_block_vector_10.cc index 495a34c079..1bb5730508 100644 --- a/tests/mpi/parallel_block_vector_10.cc +++ b/tests/mpi/parallel_block_vector_10.cc @@ -125,7 +125,7 @@ test(const unsigned int n_blocks = 5) mf_data->initialize_dof_vector(right.block(b)); left.block(b) = 0.; right.block(b) = 0.; - for (unsigned int i = 0; i < right.block(b).local_size(); ++i) + for (unsigned int i = 0; i < right.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/mpi/parallel_block_vector_11.cc b/tests/mpi/parallel_block_vector_11.cc index 0fd08ac8d7..1dc45f723c 100644 --- a/tests/mpi/parallel_block_vector_11.cc +++ b/tests/mpi/parallel_block_vector_11.cc @@ -127,7 +127,7 @@ test(const unsigned int n_blocks = 5) mf_data->initialize_dof_vector(right.block(b)); left.block(b) = 0.; right.block(b) = 0.; - for (unsigned int i = 0; i < right.block(b).local_size(); ++i) + for (unsigned int i = 0; i < right.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/mpi/parallel_block_vector_12.cc b/tests/mpi/parallel_block_vector_12.cc index 7dce2e2f1f..fda4e21f0c 100644 --- a/tests/mpi/parallel_block_vector_12.cc +++ b/tests/mpi/parallel_block_vector_12.cc @@ -126,7 +126,7 @@ test(const unsigned int n = 5, const unsigned int m = 3) mf_data->initialize_dof_vector(left2.block(b)); left.block(b) = 0.; left2.block(b) = 0.; - for (unsigned int i = 0; i < left.block(b).local_size(); ++i) + for (unsigned int i = 0; i < left.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) @@ -139,7 +139,7 @@ test(const unsigned int n = 5, const unsigned int m = 3) { mf_data->initialize_dof_vector(right.block(b)); right.block(b) = 0.; - for (unsigned int i = 0; i < right.block(b).local_size(); ++i) + for (unsigned int i = 0; i < right.block(b).locally_owned_size(); ++i) { const unsigned int glob_index = owned_set.nth_index_in_set(i); if (constraints.is_constrained(glob_index)) diff --git a/tests/mpi/parallel_vector_11.cc b/tests/mpi/parallel_vector_11.cc index d5ce0b59d4..c2decd7c35 100644 --- a/tests/mpi/parallel_vector_11.cc +++ b/tests/mpi/parallel_vector_11.cc @@ -56,7 +56,8 @@ test() LinearAlgebra::distributed::Vector v(local_owned, local_relevant, MPI_COMM_WORLD); - AssertDimension(static_cast(actual_local_size), v.local_size()); + AssertDimension(static_cast(actual_local_size), + v.locally_owned_size()); LinearAlgebra::distributed::Vector w(v), x(v), y(v); // set local elements diff --git a/tests/mpi/parallel_vector_12.cc b/tests/mpi/parallel_vector_12.cc index 2304514579..df533becf7 100644 --- a/tests/mpi/parallel_vector_12.cc +++ b/tests/mpi/parallel_vector_12.cc @@ -89,10 +89,10 @@ test() v0 = 1; v1 = 2; // check assignment in initial state - for (unsigned int i = 0; i < v0.local_size(); ++i) + for (unsigned int i = 0; i < v0.locally_owned_size(); ++i) AssertThrow(v0.local_element(i) == 1., ExcNonEqual(v0.local_element(i), 1.)); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) AssertThrow(v1.local_element(i) == 2., ExcNonEqual(v1.local_element(i), 2.)); @@ -115,8 +115,8 @@ test() // now swap v1 and v0 v0.swap(v1); - AssertDimension(v0.local_size(), local_size1); - AssertDimension(v1.local_size(), actual_local_size0); + AssertDimension(v0.locally_owned_size(), local_size1); + AssertDimension(v1.locally_owned_size(), actual_local_size0); AssertDimension(v0.size(), global_size1); AssertDimension(v1.size(), global_size0); for (unsigned int i = 0; i < local_size1; ++i) @@ -166,7 +166,7 @@ test() v2.swap(v0); AssertDimension(v0.size(), 0); AssertDimension(v2.size(), global_size1); - AssertDimension(v2.local_size(), local_size1); + AssertDimension(v2.locally_owned_size(), local_size1); for (int i = my_start1; i < my_end1; ++i) AssertThrow(v2(i) == 7., ExcNonEqual(v2(i), 7.)); if (myid == 0) diff --git a/tests/mpi/parallel_vector_21.cc b/tests/mpi/parallel_vector_21.cc index 2b35bf8274..007fbd31b3 100644 --- a/tests/mpi/parallel_vector_21.cc +++ b/tests/mpi/parallel_vector_21.cc @@ -50,7 +50,7 @@ test() v2.reinit(v, true); // set locally owned range of v2 manually - for (unsigned int i = 0; i < v2.local_size(); ++i) + for (unsigned int i = 0; i < v2.locally_owned_size(); ++i) v2.local_element(i) = 1.; // add entries to ghost values diff --git a/tests/mpi/parallel_vector_back_interpolate.cc b/tests/mpi/parallel_vector_back_interpolate.cc index 0c63680f26..02fc5a32dd 100644 --- a/tests/mpi/parallel_vector_back_interpolate.cc +++ b/tests/mpi/parallel_vector_back_interpolate.cc @@ -72,12 +72,12 @@ test() // set first vector to 1 VectorTools::interpolate(dof2, Functions::ConstantFunction(1.), v2); - for (unsigned int i = 0; i < v2.local_size(); ++i) + for (unsigned int i = 0; i < v2.locally_owned_size(); ++i) Assert(v2.local_element(i) == 1., ExcInternalError()); v2.update_ghost_values(); FETools::back_interpolate(dof2, c2, v2, dof1, c1, v2_interpolated); - for (unsigned int i = 0; i < v2_interpolated.local_size(); ++i) + for (unsigned int i = 0; i < v2_interpolated.locally_owned_size(); ++i) Assert(v2_interpolated.local_element(i) == 1., ExcInternalError()); } diff --git a/tests/mpi/parallel_vector_interpolate.cc b/tests/mpi/parallel_vector_interpolate.cc index 56bc3ca7f3..3815cd3a56 100644 --- a/tests/mpi/parallel_vector_interpolate.cc +++ b/tests/mpi/parallel_vector_interpolate.cc @@ -65,12 +65,12 @@ test() // set first vector to 1 VectorTools::interpolate(dof1, Functions::ConstantFunction(1.), v1); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) Assert(v1.local_element(i) == 1., ExcInternalError()); v1.update_ghost_values(); FETools::interpolate(dof1, v1, dof2, v2); - for (unsigned int i = 0; i < v2.local_size(); ++i) + for (unsigned int i = 0; i < v2.locally_owned_size(); ++i) Assert(v2.local_element(i) == 1., ExcInternalError()); v2.update_ghost_values(); diff --git a/tests/mpi/petsc_distribute_01.cc b/tests/mpi/petsc_distribute_01.cc index acc4c0776e..ef345d3feb 100644 --- a/tests/mpi/petsc_distribute_01.cc +++ b/tests/mpi/petsc_distribute_01.cc @@ -45,7 +45,7 @@ test() // create a vector that consists of elements indexed from 0 to n PETScWrappers::MPI::Vector vec(MPI_COMM_WORLD, 100 * n_processes, 100); - AssertThrow(vec.local_size() == 100, ExcInternalError()); + AssertThrow(vec.locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.local_range().second == 100 * myid + 100, ExcInternalError()); for (unsigned int i = vec.local_range().first; i < vec.local_range().second; diff --git a/tests/mpi/petsc_distribute_01_block.cc b/tests/mpi/petsc_distribute_01_block.cc index 0475050bd7..85c88a3d9a 100644 --- a/tests/mpi/petsc_distribute_01_block.cc +++ b/tests/mpi/petsc_distribute_01_block.cc @@ -45,12 +45,12 @@ test() vec.block(0).reinit(MPI_COMM_WORLD, 100 * n_processes, 100); vec.block(1).reinit(MPI_COMM_WORLD, 100 * n_processes, 100); vec.collect_sizes(); - AssertThrow(vec.block(0).local_size() == 100, ExcInternalError()); + AssertThrow(vec.block(0).locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.block(0).local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.block(0).local_range().second == 100 * myid + 100, ExcInternalError()); - AssertThrow(vec.block(1).local_size() == 100, ExcInternalError()); + AssertThrow(vec.block(1).locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.block(1).local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.block(1).local_range().second == 100 * myid + 100, diff --git a/tests/mpi/petsc_distribute_01_inhomogenous.cc b/tests/mpi/petsc_distribute_01_inhomogenous.cc index 37ba24c234..802f520bdc 100644 --- a/tests/mpi/petsc_distribute_01_inhomogenous.cc +++ b/tests/mpi/petsc_distribute_01_inhomogenous.cc @@ -37,7 +37,7 @@ test() // create a vector that consists of elements indexed from 0 to n PETScWrappers::MPI::Vector vec(MPI_COMM_WORLD, 100 * n_processes, 100); - AssertThrow(vec.local_size() == 100, ExcInternalError()); + AssertThrow(vec.locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.local_range().second == 100 * myid + 100, ExcInternalError()); for (unsigned int i = vec.local_range().first; i < vec.local_range().second; diff --git a/tests/mpi/petsc_locally_owned_elements.cc b/tests/mpi/petsc_locally_owned_elements.cc index 8f418f0eda..de704e1cb1 100644 --- a/tests/mpi/petsc_locally_owned_elements.cc +++ b/tests/mpi/petsc_locally_owned_elements.cc @@ -45,12 +45,12 @@ test() vec.block(0).reinit(MPI_COMM_WORLD, 100 * n_processes, 100); vec.block(1).reinit(MPI_COMM_WORLD, 100 * n_processes, 100); vec.collect_sizes(); - AssertThrow(vec.block(0).local_size() == 100, ExcInternalError()); + AssertThrow(vec.block(0).locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.block(0).local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.block(0).local_range().second == 100 * myid + 100, ExcInternalError()); - AssertThrow(vec.block(1).local_size() == 100, ExcInternalError()); + AssertThrow(vec.block(1).locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.block(1).local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.block(1).local_range().second == 100 * myid + 100, diff --git a/tests/mpi/trilinos_distribute_01.cc b/tests/mpi/trilinos_distribute_01.cc index 20b8d17375..2e8c2dd6b8 100644 --- a/tests/mpi/trilinos_distribute_01.cc +++ b/tests/mpi/trilinos_distribute_01.cc @@ -50,7 +50,7 @@ test() is.add_range(100 * myid, 100 * myid + 100); vec.reinit(is, MPI_COMM_WORLD); } - AssertThrow(vec.local_size() == 100, ExcInternalError()); + AssertThrow(vec.locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.local_range().second == 100 * myid + 100, ExcInternalError()); for (unsigned int i = vec.local_range().first; i < vec.local_range().second; diff --git a/tests/mpi/trilinos_distribute_01_block.cc b/tests/mpi/trilinos_distribute_01_block.cc index 5faef9d14d..b14517882a 100644 --- a/tests/mpi/trilinos_distribute_01_block.cc +++ b/tests/mpi/trilinos_distribute_01_block.cc @@ -46,12 +46,12 @@ test() vec.block(1).reinit(is, MPI_COMM_WORLD); } vec.collect_sizes(); - AssertThrow(vec.block(0).local_size() == 100, ExcInternalError()); + AssertThrow(vec.block(0).locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.block(0).local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.block(0).local_range().second == 100 * myid + 100, ExcInternalError()); - AssertThrow(vec.block(1).local_size() == 100, ExcInternalError()); + AssertThrow(vec.block(1).locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.block(1).local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.block(1).local_range().second == 100 * myid + 100, diff --git a/tests/mpi/trilinos_distribute_01_inhomogenous.cc b/tests/mpi/trilinos_distribute_01_inhomogenous.cc index 0e5ad835ef..919b495321 100644 --- a/tests/mpi/trilinos_distribute_01_inhomogenous.cc +++ b/tests/mpi/trilinos_distribute_01_inhomogenous.cc @@ -42,7 +42,7 @@ test() is.add_range(100 * myid, 100 * myid + 100); vec.reinit(is, MPI_COMM_WORLD); } - AssertThrow(vec.local_size() == 100, ExcInternalError()); + AssertThrow(vec.locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.local_range().second == 100 * myid + 100, ExcInternalError()); for (unsigned int i = vec.local_range().first; i < vec.local_range().second; diff --git a/tests/mpi/trilinos_vector_non_negative.cc b/tests/mpi/trilinos_vector_non_negative.cc index 8057e8de06..0a201d0123 100644 --- a/tests/mpi/trilinos_vector_non_negative.cc +++ b/tests/mpi/trilinos_vector_non_negative.cc @@ -43,7 +43,7 @@ test() is.add_range(100 * myid, 100 * myid + 100); vec.reinit(is, MPI_COMM_WORLD); } - AssertThrow(vec.local_size() == 100, ExcInternalError()); + AssertThrow(vec.locally_owned_size() == 100, ExcInternalError()); AssertThrow(vec.local_range().first == 100 * myid, ExcInternalError()); AssertThrow(vec.local_range().second == 100 * myid + 100, ExcInternalError()); for (unsigned int i = vec.local_range().first; i < vec.local_range().second; diff --git a/tests/multigrid/transfer_05.cc b/tests/multigrid/transfer_05.cc index ed4f9aeb70..9ac08277fb 100644 --- a/tests/multigrid/transfer_05.cc +++ b/tests/multigrid/transfer_05.cc @@ -144,7 +144,8 @@ check(const unsigned int fe_degree) // set values: for (unsigned int b = 0; b < nb; ++b) - for (unsigned int i = 0; i < lbv[l].block(b).local_size(); ++i) + for (unsigned int i = 0; i < lbv[l].block(b).locally_owned_size(); + ++i) lbv[l].block(b).local_element(i) = random_value(); lbv[l].compress(VectorOperation::insert); @@ -169,7 +170,7 @@ check(const unsigned int fe_degree) MGLevelObject> lbv2( 0, tr.n_global_levels() - 1); for (unsigned int b = 0; b < nb; ++b) - for (unsigned int i = 0; i < bv.block(b).local_size(); ++i) + for (unsigned int i = 0; i < bv.block(b).locally_owned_size(); ++i) bv.block(b).local_element(i) = random_value(); transfer.copy_to_mg(mgdof, lbv2, bv); diff --git a/tests/multigrid/transfer_06.cc b/tests/multigrid/transfer_06.cc index e9bbebe573..e7ab5cdc61 100644 --- a/tests/multigrid/transfer_06.cc +++ b/tests/multigrid/transfer_06.cc @@ -160,7 +160,8 @@ check(const unsigned int fe_degree) // set values: for (unsigned int b = 0; b < nb; ++b) - for (unsigned int i = 0; i < lbv[l].block(b).local_size(); ++i) + for (unsigned int i = 0; i < lbv[l].block(b).locally_owned_size(); + ++i) lbv[l].block(b).local_element(i) = random_value(); lbv[l].compress(VectorOperation::insert); @@ -191,7 +192,7 @@ check(const unsigned int fe_degree) MGLevelObject> lbv2( 0, tr.n_global_levels() - 1); for (unsigned int b = 0; b < nb; ++b) - for (unsigned int i = 0; i < bv.block(b).local_size(); ++i) + for (unsigned int i = 0; i < bv.block(b).locally_owned_size(); ++i) bv.block(b).local_element(i) = random_value(); transfer.copy_to_mg(mgdof_ptr, lbv2, bv); diff --git a/tests/multigrid/transfer_matrix_free_01.cc b/tests/multigrid/transfer_matrix_free_01.cc index 2a58d38fc1..e07a20c5f3 100644 --- a/tests/multigrid/transfer_matrix_free_01.cc +++ b/tests/multigrid/transfer_matrix_free_01.cc @@ -90,7 +90,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.prolongate(level, v2, v1); @@ -111,7 +111,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.restrict_and_add(level, v2, v1); diff --git a/tests/multigrid/transfer_matrix_free_02.cc b/tests/multigrid/transfer_matrix_free_02.cc index 35bc581031..e6f7245eda 100644 --- a/tests/multigrid/transfer_matrix_free_02.cc +++ b/tests/multigrid/transfer_matrix_free_02.cc @@ -119,7 +119,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.prolongate(level, v2, v1); @@ -140,7 +140,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.restrict_and_add(level, v2, v1); diff --git a/tests/multigrid/transfer_matrix_free_02_block.cc b/tests/multigrid/transfer_matrix_free_02_block.cc index 3ee18bedd5..efc82bd7c8 100644 --- a/tests/multigrid/transfer_matrix_free_02_block.cc +++ b/tests/multigrid/transfer_matrix_free_02_block.cc @@ -129,7 +129,8 @@ check(const unsigned int fe_degree) v3.block(b).reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); - for (unsigned int i = 0; i < v1.block(b).local_size(); ++i) + for (unsigned int i = 0; i < v1.block(b).locally_owned_size(); + ++i) v1.block(b).local_element(i) = random_value(); transfer_ref.prolongate(level, v2.block(b), v1.block(b)); @@ -157,7 +158,8 @@ check(const unsigned int fe_degree) v3.block(b).reinit(mgdof.locally_owned_mg_dofs(level - 1), MPI_COMM_WORLD); - for (unsigned int i = 0; i < v1.block(b).local_size(); ++i) + for (unsigned int i = 0; i < v1.block(b).locally_owned_size(); + ++i) v1.block(b).local_element(i) = random_value(); transfer_ref.restrict_and_add(level, v2.block(b), v1.block(b)); diff --git a/tests/multigrid/transfer_matrix_free_02_block_02.cc b/tests/multigrid/transfer_matrix_free_02_block_02.cc index b47e0f3546..472ba8dfa4 100644 --- a/tests/multigrid/transfer_matrix_free_02_block_02.cc +++ b/tests/multigrid/transfer_matrix_free_02_block_02.cc @@ -148,7 +148,8 @@ check(const unsigned int fe_degree) v3.block(b).reinit(mgdof_ptr[b]->locally_owned_mg_dofs(level), MPI_COMM_WORLD); - for (unsigned int i = 0; i < v1.block(b).local_size(); ++i) + for (unsigned int i = 0; i < v1.block(b).locally_owned_size(); + ++i) v1.block(b).local_element(i) = random_value(); transfer_ref[b].prolongate(level, v2.block(b), v1.block(b)); @@ -176,7 +177,8 @@ check(const unsigned int fe_degree) v3.block(b).reinit(mgdof_ptr[b]->locally_owned_mg_dofs(level - 1), MPI_COMM_WORLD); - for (unsigned int i = 0; i < v1.block(b).local_size(); ++i) + for (unsigned int i = 0; i < v1.block(b).locally_owned_size(); + ++i) v1.block(b).local_element(i) = random_value(); transfer_ref[b].restrict_and_add(level, v2.block(b), v1.block(b)); diff --git a/tests/multigrid/transfer_matrix_free_03.cc b/tests/multigrid/transfer_matrix_free_03.cc index ac749fcbf0..5be2508b4a 100644 --- a/tests/multigrid/transfer_matrix_free_03.cc +++ b/tests/multigrid/transfer_matrix_free_03.cc @@ -90,7 +90,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.prolongate(level, v2, v1); @@ -112,7 +112,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.restrict_and_add(level, v2, v1); diff --git a/tests/multigrid/transfer_matrix_free_04.cc b/tests/multigrid/transfer_matrix_free_04.cc index 0549f531f5..aa26e61e89 100644 --- a/tests/multigrid/transfer_matrix_free_04.cc +++ b/tests/multigrid/transfer_matrix_free_04.cc @@ -95,7 +95,7 @@ check(const unsigned int fe_degree) relevant_set, MPI_COMM_WORLD); v3.reinit(mgdof.locally_owned_mg_dofs(level), MPI_COMM_WORLD); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.prolongate(level, v2, v1); @@ -119,7 +119,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.restrict_and_add(level, v2, v1); diff --git a/tests/multigrid/transfer_matrix_free_05.cc b/tests/multigrid/transfer_matrix_free_05.cc index 562e5a1791..835871b181 100644 --- a/tests/multigrid/transfer_matrix_free_05.cc +++ b/tests/multigrid/transfer_matrix_free_05.cc @@ -116,7 +116,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.prolongate(level, v2, v1); @@ -138,7 +138,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.restrict_and_add(level, v2, v1); diff --git a/tests/multigrid/transfer_matrix_free_06.cc b/tests/multigrid/transfer_matrix_free_06.cc index a219acebee..7db0bdebe1 100644 --- a/tests/multigrid/transfer_matrix_free_06.cc +++ b/tests/multigrid/transfer_matrix_free_06.cc @@ -121,7 +121,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.prolongate(level, v2, v1); @@ -142,7 +142,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.restrict_and_add(level, v2, v1); diff --git a/tests/multigrid/transfer_matrix_free_07.cc b/tests/multigrid/transfer_matrix_free_07.cc index 0cdeea5b7e..c7fad39c37 100644 --- a/tests/multigrid/transfer_matrix_free_07.cc +++ b/tests/multigrid/transfer_matrix_free_07.cc @@ -114,7 +114,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.prolongate(level, v2, v1); @@ -135,7 +135,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.restrict_and_add(level, v2, v1); diff --git a/tests/multigrid/transfer_matrix_free_11.cc b/tests/multigrid/transfer_matrix_free_11.cc index 9f56af9fd1..463fbbd01d 100644 --- a/tests/multigrid/transfer_matrix_free_11.cc +++ b/tests/multigrid/transfer_matrix_free_11.cc @@ -82,7 +82,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.prolongate(level, v2, v1); @@ -111,7 +111,7 @@ check(const unsigned int fe_degree) 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); - for (unsigned int i = 0; i < v1.local_size(); ++i) + for (unsigned int i = 0; i < v1.locally_owned_size(); ++i) v1.local_element(i) = random_value(); v1_cpy = v1; transfer.restrict_and_add(level, v2, v1); diff --git a/tests/numerics/no_flux_18.cc b/tests/numerics/no_flux_18.cc index 7d06cc8c01..1ec3d14bc0 100644 --- a/tests/numerics/no_flux_18.cc +++ b/tests/numerics/no_flux_18.cc @@ -692,9 +692,10 @@ namespace StokesClass dummy); this->set_constrained_entries_to_one(diagonal); - inverse_diagonal = diagonal; - const unsigned int local_size = inverse_diagonal.local_size(); - for (unsigned int i = 0; i < local_size; ++i) + inverse_diagonal = diagonal; + const unsigned int locally_owned_size = + inverse_diagonal.locally_owned_size(); + for (unsigned int i = 0; i < locally_owned_size; ++i) { Assert(inverse_diagonal.local_element(i) > 0., ExcMessage("No diagonal entry in a positive definite operator " @@ -866,7 +867,7 @@ namespace StokesClass this->set_constrained_entries_to_one(inverse_diagonal); - for (unsigned int i = 0; i < inverse_diagonal.local_size(); ++i) + for (unsigned int i = 0; i < inverse_diagonal.locally_owned_size(); ++i) { Assert(inverse_diagonal.local_element(i) > 0., ExcMessage("No diagonal entry in a positive definite operator " diff --git a/tests/particles/step-68.cc b/tests/particles/step-68.cc index 7f2d6037ec..654a27572c 100644 --- a/tests/particles/step-68.cc +++ b/tests/particles/step-68.cc @@ -418,7 +418,7 @@ namespace Step68 void ParticleTracking::interpolate_function_to_field() { - velocity_field.zero_out_ghosts(); + velocity_field.zero_out_ghost_values(); VectorTools::interpolate(mapping, fluid_dh, velocity, velocity_field); velocity_field.update_ghost_values(); } diff --git a/tests/petsc/57.cc b/tests/petsc/57.cc deleted file mode 100644 index 00ad7a5920..0000000000 --- a/tests/petsc/57.cc +++ /dev/null @@ -1,97 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2004 - 2018 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE.md at -// the top level directory of deal.II. -// -// --------------------------------------------------------------------- - - - -// check PETScWrappers::MPI::Vector::is_non_zero - -#include - -#include -#include - -#include "../tests.h" - - -void -test(PETScWrappers::MPI::Vector &v) -{ - // set only certain elements of the - // vector. they are all positive - std::vector pattern(v.size(), false); - for (unsigned int i = 0; i < v.size(); i += 1 + i) - { - v(i) += i; - pattern[i] = true; - } - - v.compress(VectorOperation::add); - - // check that the vector is really - // non-negative - AssertThrow(v.is_non_negative() == true, ExcInternalError()); - - // then set a single element to a negative - // value and check again - v(v.size() / 2) = -1; - AssertThrow(v.is_non_negative() == false, ExcInternalError()); - - deallog << "OK" << std::endl; -} - - - -int -main(int argc, char **argv) -{ - initlog(); - - try - { - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - { - IndexSet indices(100); - indices.add_range(0, 100); - PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); - test(v); - } - } - catch (const std::exception &exc) - { - std::cerr << std::endl - << std::endl - << "----------------------------------------------------" - << std::endl; - std::cerr << "Exception on processing: " << std::endl - << exc.what() << std::endl - << "Aborting!" << std::endl - << "----------------------------------------------------" - << std::endl; - - return 1; - } - catch (...) - { - std::cerr << std::endl - << std::endl - << "----------------------------------------------------" - << std::endl; - std::cerr << "Unknown exception!" << std::endl - << "Aborting!" << std::endl - << "----------------------------------------------------" - << std::endl; - return 1; - }; -} diff --git a/tests/petsc/57.output b/tests/petsc/57.output deleted file mode 100644 index 0fd8fc12f0..0000000000 --- a/tests/petsc/57.output +++ /dev/null @@ -1,2 +0,0 @@ - -DEAL::OK diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_01.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_01.cc index 222f35a688..2c5f9aaf05 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_01.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_01.cc @@ -132,7 +132,7 @@ print(const Mapping & mapping, data_out.write_vtu_with_pvtu_record( "./", "example-1", counter, MPI_COMM_WORLD, 1, 1); - result.zero_out_ghosts(); + result.zero_out_ghost_values(); } template @@ -214,7 +214,7 @@ test() Utilities::MPI::RemotePointEvaluation evaluation_cache; const auto evaluation_point_results = VectorTools::point_values<1>( mapping_1, dof_handler_1, vector_1, evaluation_points, evaluation_cache); - vector_1.zero_out_ghosts(); + vector_1.zero_out_ghost_values(); LinearAlgebra::distributed::Vector vector_2( create_partitioner(dof_handler_2)); diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_02.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_02.cc index ad8a693dab..5f5685c6f9 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_02.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_02.cc @@ -108,7 +108,7 @@ print(const Mapping & mapping, data_out.write_vtu_with_pvtu_record( "./", "example-2", counter, MPI_COMM_WORLD, 1, 1); - result.zero_out_ghosts(); + result.zero_out_ghost_values(); } template @@ -186,7 +186,7 @@ public: solution_other, evaluation_points, evaluation_cache); - solution_other.zero_out_ghosts(); + solution_other.zero_out_ghost_values(); for (unsigned int i = 0; i < evaluation_points.size(); ++i) { if (global_ids[i] == numbers::invalid_size_type) diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_03.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_03.cc index 73d443025e..8c45c3ba19 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_03.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_03.cc @@ -101,7 +101,7 @@ print(const Mapping & mapping, data_out.write_vtu_with_pvtu_record( "./", "example-3", counter, MPI_COMM_WORLD, 1, 1); - result.zero_out_ghosts(); + result.zero_out_ghost_values(); } void @@ -192,7 +192,7 @@ test() Utilities::MPI::RemotePointEvaluation evaluation_cache; const auto evaluation_point_results = VectorTools::point_values<1>( mapping_1, dof_handler_1, vector_1, evaluation_points, evaluation_cache); - vector_1.zero_out_ghosts(); + vector_1.zero_out_ghost_values(); LinearAlgebra::distributed::Vector vector_2( create_partitioner(dof_handler_2)); diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_04.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_04.cc index 7efdda90f0..76315dd3b5 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_04.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_04.cc @@ -100,7 +100,7 @@ print(const Mapping & mapping, data_out.write_vtu_with_pvtu_record( "./", "example-1", counter, MPI_COMM_WORLD, 1, 1); - result.zero_out_ghosts(); + result.zero_out_ghost_values(); } template @@ -158,7 +158,7 @@ test() const auto evaluation_point_gradient_results = VectorTools::point_gradients<1>( mapping_1, dof_handler_1, vector_1, evaluation_points, evaluation_cache); - vector_1.zero_out_ghosts(); + vector_1.zero_out_ghost_values(); if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0) for (unsigned int i = 0; i <= n_intervals; ++i) diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc index a4b007ea0b..f80ba24aff 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc @@ -101,7 +101,7 @@ print(const Mapping & mapping, data_out.write_vtu_with_pvtu_record( "./", "example-1", counter, MPI_COMM_WORLD, 1, 1); - result.zero_out_ghosts(); + result.zero_out_ghost_values(); } template @@ -180,7 +180,7 @@ test() Utilities::MPI::RemotePointEvaluation evaluation_cache; const auto evaluation_point_results = VectorTools::point_values<1>( mapping_1, dof_handler_1, vector_1, evaluation_points, evaluation_cache); - vector_1.zero_out_ghosts(); + vector_1.zero_out_ghost_values(); // fill a global (slice) vector LinearAlgebra::distributed::Vector vector_2( diff --git a/tests/simplex/step-67.cc b/tests/simplex/step-67.cc index d26aaec31e..f38c50742a 100644 --- a/tests/simplex/step-67.cc +++ b/tests/simplex/step-67.cc @@ -1658,7 +1658,7 @@ namespace Euler_DG FEEvaluation phi(data, 0, 1); MatrixFreeOperators::CellwiseInverseMassMatrix inverse(phi); - solution.zero_out_ghosts(); + solution.zero_out_ghost_values(); for (unsigned int cell = 0; cell < data.n_cell_batches(); ++cell) { phi.reinit(cell); diff --git a/tests/simplex/step-68.cc b/tests/simplex/step-68.cc index 897fa26657..0946659817 100644 --- a/tests/simplex/step-68.cc +++ b/tests/simplex/step-68.cc @@ -316,7 +316,7 @@ namespace Step68 void ParticleTracking::interpolate_function_to_field() { - velocity_field.zero_out_ghosts(); + velocity_field.zero_out_ghost_values(); VectorTools::interpolate(mapping, fluid_dh, velocity, velocity_field); velocity_field.update_ghost_values(); } diff --git a/tests/trilinos/parallel_block_vector_copy_01.mpirun=2.output b/tests/trilinos/parallel_block_vector_copy_01.mpirun=2.output index 9a2236bf14..599420c500 100644 --- a/tests/trilinos/parallel_block_vector_copy_01.mpirun=2.output +++ b/tests/trilinos/parallel_block_vector_copy_01.mpirun=2.output @@ -2,13 +2,13 @@ DEAL:0::Locally owned indices {[0,4], [10,14]} DEAL:0::Parallel vector -C0:size:10 local_size:5 : +C0:size:10 locally_owned_size:5 : [0]: 0.000e+00 [1]: 1.000e+01 [2]: 2.000e+01 [3]: 3.000e+01 [4]: 4.000e+01 -C1:size:10 local_size:5 : +C1:size:10 locally_owned_size:5 : [0]: 1.000e+02 [1]: 1.100e+02 [2]: 1.200e+02 @@ -25,13 +25,13 @@ DEAL:0::OK DEAL:1::Locally owned indices {[5,9], [15,19]} DEAL:1::Parallel vector -C0:size:10 local_size:5 : +C0:size:10 locally_owned_size:5 : [5]: 5.000e+01 [6]: 6.000e+01 [7]: 7.000e+01 [8]: 8.000e+01 [9]: 9.000e+01 -C1:size:10 local_size:5 : +C1:size:10 locally_owned_size:5 : [5]: 1.500e+02 [6]: 1.600e+02 [7]: 1.700e+02 diff --git a/tests/trilinos/print_01.mpirun=2.output b/tests/trilinos/print_01.mpirun=2.output index c36302334a..9b2d1b5237 100644 --- a/tests/trilinos/print_01.mpirun=2.output +++ b/tests/trilinos/print_01.mpirun=2.output @@ -2,13 +2,13 @@ DEAL:0::owned IndexSet: {[0,3]} DEAL:0::ghosted IndexSet: {[2,5]} DEAL:0::trilinos vec: -size:8 local_size:4 : +size:8 locally_owned_size:4 : [0]: 0.000e+00 [1]: 1.000e+00 [2]: 2.000e+00 [3]: 3.000e+00 DEAL:0::trilinos vec ghosted: -size:8 local_size:6 : +size:8 locally_owned_size:6 : [0]: 0.000e+00 [1]: 1.000e+00 [2]: 2.000e+00 @@ -20,13 +20,13 @@ DEAL:0::OK DEAL:1::owned IndexSet: {[4,7]} DEAL:1::ghosted IndexSet: {[2,5]} DEAL:1::trilinos vec: -size:8 local_size:4 : +size:8 locally_owned_size:4 : [4]: 4.000e+00 [5]: 5.000e+00 [6]: 6.000e+00 [7]: 7.000e+00 DEAL:1::trilinos vec ghosted: -size:8 local_size:6 : +size:8 locally_owned_size:6 : [2]: 2.000e+00 [3]: 3.000e+00 [4]: 4.000e+00 diff --git a/tests/trilinos/readwritevector_02.mpirun=2.output b/tests/trilinos/readwritevector_02.mpirun=2.output index e5cdeb3aea..4e486dba86 100644 --- a/tests/trilinos/readwritevector_02.mpirun=2.output +++ b/tests/trilinos/readwritevector_02.mpirun=2.output @@ -2,13 +2,13 @@ DEAL:0::IS: {[0,3]} DEAL:0::IS_ghosted: {[2,5]} DEAL:0::trilinos vec: -size:8 local_size:4 : +size:8 locally_owned_size:4 : [0]: 0.000e+00 [1]: 1.000e+00 [2]: 2.000e+00 [3]: 3.000e+00 DEAL:0::trilinos vec ghosted: -size:8 local_size:6 : +size:8 locally_owned_size:6 : [0]: 0.000e+00 [1]: 1.000e+00 [2]: 2.000e+00 @@ -18,7 +18,7 @@ size:8 local_size:6 : DEAL:0::ghosted IS: {[0,5]} DEAL:0::tril_vector_ghosted.owned_elements() {[0,3]} DEAL:0::import of ghosted vector should fail: -DEAL:0::ExcMessage("Import() from TrilinosWrappers::MPI::Vector with ghost entries is not supported!") +DEAL:0::ExcMessage( "Import() from TrilinosWrappers::MPI::Vector with ghost entries is not supported!") DEAL:0::import of distributed vector should work: DEAL:0::RWVector contents: IndexSet: {[0,5]} @@ -34,13 +34,13 @@ DEAL:0::OK DEAL:1::IS: {[4,7]} DEAL:1::IS_ghosted: {[2,5]} DEAL:1::trilinos vec: -size:8 local_size:4 : +size:8 locally_owned_size:4 : [4]: 4.000e+00 [5]: 5.000e+00 [6]: 6.000e+00 [7]: 7.000e+00 DEAL:1::trilinos vec ghosted: -size:8 local_size:6 : +size:8 locally_owned_size:6 : [2]: 2.000e+00 [3]: 3.000e+00 [4]: 4.000e+00 @@ -50,7 +50,7 @@ size:8 local_size:6 : DEAL:1::ghosted IS: {[2,7]} DEAL:1::tril_vector_ghosted.owned_elements() {[4,7]} DEAL:1::import of ghosted vector should fail: -DEAL:1::ExcMessage("Import() from TrilinosWrappers::MPI::Vector with ghost entries is not supported!") +DEAL:1::ExcMessage( "Import() from TrilinosWrappers::MPI::Vector with ghost entries is not supported!") DEAL:1::import of distributed vector should work: DEAL:1::RWVector contents: IndexSet: {[2,7]} diff --git a/tests/trilinos/readwritevector_03.mpirun=2.output b/tests/trilinos/readwritevector_03.mpirun=2.output index b35304314d..ed6219a52e 100644 --- a/tests/trilinos/readwritevector_03.mpirun=2.output +++ b/tests/trilinos/readwritevector_03.mpirun=2.output @@ -2,13 +2,13 @@ DEAL:0::is: {[0,3]} DEAL:0::is_ghosted: {[2,5]} DEAL:0::trilinos vec: -size:8 local_size:4 : +size:8 locally_owned_size:4 : [0]: 0.000e+00 [1]: 1.000e+00 [2]: 2.000e+00 [3]: 3.000e+00 DEAL:0::trilinos vec ghosted: -size:8 local_size:6 : +size:8 locally_owned_size:6 : [0]: 0.000e+00 [1]: 1.000e+00 [2]: 2.000e+00 @@ -38,13 +38,13 @@ DEAL:0::OK DEAL:1::is: {[4,7]} DEAL:1::is_ghosted: {[2,5]} DEAL:1::trilinos vec: -size:8 local_size:4 : +size:8 locally_owned_size:4 : [4]: 4.000e+00 [5]: 5.000e+00 [6]: 6.000e+00 [7]: 7.000e+00 DEAL:1::trilinos vec ghosted: -size:8 local_size:6 : +size:8 locally_owned_size:6 : [2]: 2.000e+00 [3]: 3.000e+00 [4]: 4.000e+00 diff --git a/tests/trilinos/readwritevector_04.mpirun=2.output b/tests/trilinos/readwritevector_04.mpirun=2.output index 821a244c71..18c3dda966 100644 --- a/tests/trilinos/readwritevector_04.mpirun=2.output +++ b/tests/trilinos/readwritevector_04.mpirun=2.output @@ -8,19 +8,19 @@ IndexSet: {[0,3]} [2]: 2.000e+00 [3]: 3.000e+00 DEAL:0::trilinos vec: -size:8 local_size:4 : +size:8 locally_owned_size:4 : [0]: 0.000e+00 [1]: 1.000e+00 [2]: 2.000e+00 [3]: 3.000e+00 DEAL:0::trilinos vec (2x): -size:8 local_size:4 : +size:8 locally_owned_size:4 : [0]: 0.000e+00 [1]: 2.000e+00 [2]: 4.000e+00 [3]: 6.000e+00 DEAL:0::trilinos vec (1x): -size:8 local_size:4 : +size:8 locally_owned_size:4 : [0]: 0.000e+00 [1]: 1.000e+00 [2]: 2.000e+00 @@ -36,19 +36,19 @@ IndexSet: {[4,7]} [6]: 6.000e+00 [7]: 7.000e+00 DEAL:1::trilinos vec: -size:8 local_size:4 : +size:8 locally_owned_size:4 : [4]: 4.000e+00 [5]: 5.000e+00 [6]: 6.000e+00 [7]: 7.000e+00 DEAL:1::trilinos vec (2x): -size:8 local_size:4 : +size:8 locally_owned_size:4 : [4]: 8.000e+00 [5]: 1.000e+01 [6]: 1.200e+01 [7]: 1.400e+01 DEAL:1::trilinos vec (1x): -size:8 local_size:4 : +size:8 locally_owned_size:4 : [4]: 4.000e+00 [5]: 5.000e+00 [6]: 6.000e+00 -- 2.39.5