--- /dev/null
+Removed: The deprecated member functions domain_partitioner(),
+vector_partitioner() and range_partitioner() in TrilinosWrappers classes have
+been removed.
+<br>
+(Daniel Arndt, 2020/04/24)
MPI_Comm
get_mpi_communicator() const;
- /**
- * Return a vector of the underlying Trilinos Epetra_Map that sets the
- * partitioning of the domain space of this block matrix, i.e., the
- * partitioning of the individual block vectors this matrix has to be
- * multiplied with.
- *
- * @deprecated Use the methods of the individual matrices based on
- * IndexSet arguments.
- */
- DEAL_II_DEPRECATED
- std::vector<Epetra_Map>
- domain_partitioner() const;
-
- /**
- * Return a vector of the underlying Trilinos Epetra_Map that sets the
- * partitioning of the range space of this block matrix, i.e., the
- * partitioning of the individual block vectors that are the result from
- * matrix-vector products.
- *
- * @deprecated Use the methods of the individual matrices based on
- * IndexSet arguments.
- */
- DEAL_II_DEPRECATED
- std::vector<Epetra_Map>
- range_partitioner() const;
-
/**
* Return the partitioning of the domain space for the individual blocks of
* this matrix, i.e., the partitioning of the block vectors this matrix has
const Epetra_CrsGraph &
trilinos_sparsity_pattern() const;
- /**
- * Return a const reference to the underlying Trilinos Epetra_Map that
- * sets the partitioning of the domain space of this matrix, i.e., the
- * partitioning of the vectors this matrix has to be multiplied with.
- *
- * @deprecated Use locally_owned_domain_indices() instead.
- */
- DEAL_II_DEPRECATED
- const Epetra_Map &
- domain_partitioner() const;
-
- /**
- * Return a const reference to the underlying Trilinos Epetra_Map that
- * sets the partitioning of the range space of this matrix, i.e., the
- * partitioning of the vectors that are result from matrix-vector
- * products.
- *
- * @deprecated Use locally_owned_range_indices() instead.
- */
- DEAL_II_DEPRECATED
- const Epetra_Map &
- range_partitioner() const;
-
- /**
- * Return a const reference to the underlying Trilinos Epetra_Map that
- * sets the partitioning of the matrix rows. Equal to the partitioning of
- * the range.
- *
- * @deprecated Use locally_owned_range_indices() instead.
- */
- DEAL_II_DEPRECATED
- const Epetra_Map &
- row_partitioner() const;
-
- /**
- * Return a const reference to the underlying Trilinos Epetra_Map that
- * sets the partitioning of the matrix columns. This is in general not
- * equal to the partitioner Epetra_Map for the domain because of overlap
- * in the matrix.
- *
- * @deprecated Usually not necessary. If desired, access it via the
- * Epetra_CrsMatrix.
- */
- DEAL_II_DEPRECATED
- const Epetra_Map &
- col_partitioner() const;
//@}
/**
Epetra_FEVector &
trilinos_vector();
- /**
- * Return a const reference to the underlying Trilinos Epetra_Map that
- * sets the parallel partitioning of the vector.
- *
- * @deprecated Use trilinos_partitioner() instead.
- */
- DEAL_II_DEPRECATED
- const Epetra_Map &
- vector_partitioner() const;
-
/**
* Return a const reference to the underlying Trilinos Epetra_BlockMap
* that sets the parallel partitioning of the vector.
- inline const Epetra_Map &
- Vector::vector_partitioner() const
- {
- // TODO A dynamic_cast fails here. This is suspicious.
- return static_cast<const Epetra_Map &>(vector->Map()); // NOLINT
- }
-
-
-
inline const Epetra_BlockMap &
Vector::trilinos_partitioner() const
{
- std::vector<Epetra_Map>
- BlockSparseMatrix::domain_partitioner() const
- {
- Assert(this->n_block_cols() != 0, ExcNotInitialized());
- Assert(this->n_block_rows() != 0, ExcNotInitialized());
-
- std::vector<Epetra_Map> domain_partitioner;
- for (size_type c = 0; c < this->n_block_cols(); ++c)
- domain_partitioner.push_back(
- this->sub_objects[0][c]->domain_partitioner());
-
- return domain_partitioner;
- }
-
-
-
- std::vector<Epetra_Map>
- BlockSparseMatrix::range_partitioner() const
- {
- Assert(this->n_block_cols() != 0, ExcNotInitialized());
- Assert(this->n_block_rows() != 0, ExcNotInitialized());
-
- std::vector<Epetra_Map> range_partitioner;
- for (size_type r = 0; r < this->n_block_rows(); ++r)
- range_partitioner.push_back(this->sub_objects[r][0]->range_partitioner());
-
- return range_partitioner;
- }
-
-
-
MPI_Comm
BlockSparseMatrix::get_mpi_communicator() const
{
Assert(A.trilinos_matrix().Filled(),
ExcMessage("Matrix is not compressed. Call compress() method."));
- Epetra_Vector ep_x(View, A.domain_partitioner(), x.begin());
+ Epetra_Vector ep_x(View, A.trilinos_matrix().DomainMap(), x.begin());
Epetra_Vector ep_b(View,
- A.range_partitioner(),
+ A.trilinos_matrix().RangeMap(),
const_cast<double *>(b.begin()));
// We need an Epetra_LinearProblem object to let the AztecOO solver know
{
// In case we call the solver with deal.II vectors, we create views of the
// vectors in Epetra format.
- AssertDimension(x.local_size(), A.domain_partitioner().NumMyElements());
- AssertDimension(b.local_size(), A.range_partitioner().NumMyElements());
+ AssertDimension(x.local_size(),
+ A.trilinos_matrix().DomainMap().NumMyElements());
+ AssertDimension(b.local_size(),
+ A.trilinos_matrix().RangeMap().NumMyElements());
- Epetra_Vector ep_x(View, A.domain_partitioner(), x.begin());
+ Epetra_Vector ep_x(View, A.trilinos_matrix().DomainMap(), x.begin());
Epetra_Vector ep_b(View,
- A.range_partitioner(),
+ A.trilinos_matrix().RangeMap(),
const_cast<double *>(b.begin()));
// We need an Epetra_LinearProblem object to let the AztecOO solver know
Assert(b.size() == A.m(), ExcDimensionMismatch(b.size(), A.m()));
Assert(A.local_range().second == A.m(),
ExcMessage("Can only work in serial when using deal.II vectors."));
- Epetra_Vector ep_x(View, A.domain_partitioner(), x.begin());
+ Epetra_Vector ep_x(View, A.trilinos_matrix().DomainMap(), x.begin());
Epetra_Vector ep_b(View,
- A.range_partitioner(),
+ A.trilinos_matrix().RangeMap(),
const_cast<double *>(b.begin()));
// We need an Epetra_LinearProblem object to let the Amesos solver know
dealii::LinearAlgebra::distributed::Vector<double> & x,
const dealii::LinearAlgebra::distributed::Vector<double> &b)
{
- AssertDimension(x.local_size(), A.domain_partitioner().NumMyElements());
- AssertDimension(b.local_size(), A.range_partitioner().NumMyElements());
- Epetra_Vector ep_x(View, A.domain_partitioner(), x.begin());
+ AssertDimension(x.local_size(),
+ A.trilinos_matrix().DomainMap().NumMyElements());
+ AssertDimension(b.local_size(),
+ A.trilinos_matrix().RangeMap().NumMyElements());
+ Epetra_Vector ep_x(View, A.trilinos_matrix().DomainMap(), x.begin());
Epetra_Vector ep_b(View,
- A.range_partitioner(),
+ A.trilinos_matrix().RangeMap(),
const_cast<double *>(b.begin()));
// We need an Epetra_LinearProblem object to let the Amesos solver know
if (needs_deep_copy)
{
column_space_map =
- std_cxx14::make_unique<Epetra_Map>(rhs.domain_partitioner());
+ std_cxx14::make_unique<Epetra_Map>(rhs.trilinos_matrix().DomainMap());
// release memory before reallocation
matrix = std_cxx14::make_unique<Epetra_FECrsMatrix>(*rhs.matrix);
if (this == &sparse_matrix)
return;
- column_space_map =
- std_cxx14::make_unique<Epetra_Map>(sparse_matrix.domain_partitioner());
+ column_space_map = std_cxx14::make_unique<Epetra_Map>(
+ sparse_matrix.trilinos_matrix().DomainMap());
matrix.reset();
nonlocal_matrix_exporter.reset();
matrix = std_cxx14::make_unique<Epetra_FECrsMatrix>(
{
Assert(inputleft.n() == inputright.m(),
ExcDimensionMismatch(inputleft.n(), inputright.m()));
- Assert(inputleft.domain_partitioner().SameAs(
- inputright.range_partitioner()),
+ Assert(inputleft.trilinos_matrix().DomainMap().SameAs(
+ inputright.trilinos_matrix().RangeMap()),
ExcMessage("Parallel partitioning of A and B does not fit."));
}
else
{
Assert(inputleft.m() == inputright.m(),
ExcDimensionMismatch(inputleft.m(), inputright.m()));
- Assert(inputleft.range_partitioner().SameAs(
- inputright.range_partitioner()),
+ Assert(inputleft.trilinos_matrix().RangeMap().SameAs(
+ inputright.trilinos_matrix().RangeMap()),
ExcMessage("Parallel partitioning of A and B does not fit."));
}
mod_B = Teuchos::rcp(
new Epetra_CrsMatrix(Copy, inputright.trilinos_sparsity_pattern()),
true);
- mod_B->FillComplete(inputright.domain_partitioner(),
- inputright.range_partitioner());
+ mod_B->FillComplete(inputright.trilinos_matrix().DomainMap(),
+ inputright.trilinos_matrix().RangeMap());
Assert(inputright.local_range() == V.local_range(),
ExcMessage("Parallel distribution of matrix B and vector V "
"does not match."));
- const Epetra_Map &
- SparseMatrix::domain_partitioner() const
- {
- return matrix->DomainMap();
- }
-
-
-
- const Epetra_Map &
- SparseMatrix::range_partitioner() const
- {
- return matrix->RangeMap();
- }
-
-
-
- const Epetra_Map &
- SparseMatrix::row_partitioner() const
- {
- return matrix->RowMap();
- }
-
-
-
- const Epetra_Map &
- SparseMatrix::col_partitioner() const
- {
- return matrix->ColMap();
- }
-
-
-
MPI_Comm
SparseMatrix::get_mpi_communicator() const
{
projects / dealii.git / commitdiff