Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Utilities::MPI::Partitioner::get_communicator() #9747

Merged
merged 1 commit into from
Mar 27, 2020
Merged

Remove Utilities::MPI::Partitioner::get_communicator() #9747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions doc/news/changes/incompatibilities/20200326DanielArndt-3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Removed: The deprecated function Utilities::MPI_Partitioner::get_communicator()
has been removed. Use Utilities::MPI::Partitioner::get_mpi_communicator()
instead.
<br>
(Daniel Arndt, 2020/03/26)
15 changes: 0 additions & 15 deletions include/deal.II/base/partitioner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,13 +437,6 @@ namespace Utilities
unsigned int
n_mpi_processes() const;

/**
* Return the MPI communicator underlying the partitioner object.
*/
DEAL_II_DEPRECATED
const MPI_Comm &
get_communicator() const;

/**
* Return the MPI communicator underlying the partitioner object.
*/
Expand Down Expand Up @@ -944,14 +937,6 @@ namespace Utilities



inline const MPI_Comm &
Partitioner::get_communicator() const
{
return communicator;
}



inline const MPI_Comm &
Partitioner::get_mpi_communicator() const
{
Expand Down
23 changes: 12 additions & 11 deletions include/deal.II/lac/la_parallel_block_vector.templates.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ namespace LinearAlgebra

if (this->block(0).partitioner->n_mpi_processes() > 1)
return -Utilities::MPI::max(
local_result, this->block(0).partitioner->get_communicator());
local_result, this->block(0).partitioner->get_mpi_communicator());
else
return local_result;
}
Expand All @@ -606,7 +606,7 @@ namespace LinearAlgebra

if (this->block(0).partitioner->n_mpi_processes() > 1)
return Utilities::MPI::sum(
local_result, this->block(0).partitioner->get_communicator());
local_result, this->block(0).partitioner->get_mpi_communicator());
else
return local_result;
}
Expand All @@ -627,7 +627,8 @@ namespace LinearAlgebra

if (this->block(0).partitioner->n_mpi_processes() > 1)
return Utilities::MPI::sum(
local_result, this->block(0).partitioner->get_communicator()) /
local_result,
this->block(0).partitioner->get_mpi_communicator()) /
static_cast<real_type>(this->size());
else
return local_result / static_cast<real_type>(this->size());
Expand All @@ -647,7 +648,7 @@ namespace LinearAlgebra

if (this->block(0).partitioner->n_mpi_processes() > 1)
return Utilities::MPI::sum(
local_result, this->block(0).partitioner->get_communicator());
local_result, this->block(0).partitioner->get_mpi_communicator());
else
return local_result;
}
Expand All @@ -666,7 +667,7 @@ namespace LinearAlgebra

if (this->block(0).partitioner->n_mpi_processes() > 1)
return Utilities::MPI::sum(
local_result, this->block(0).partitioner->get_communicator());
local_result, this->block(0).partitioner->get_mpi_communicator());
else
return local_result;
}
Expand All @@ -693,10 +694,10 @@ namespace LinearAlgebra
local_result += std::pow(this->block(i).lp_norm_local(p), p);

if (this->block(0).partitioner->n_mpi_processes() > 1)
return std::pow(
Utilities::MPI::sum(local_result,
this->block(0).partitioner->get_communicator()),
static_cast<real_type>(1.0 / p));
return std::pow(Utilities::MPI::sum(
local_result,
this->block(0).partitioner->get_mpi_communicator()),
static_cast<real_type>(1.0 / p));
else
return std::pow(local_result, static_cast<real_type>(1.0 / p));
}
Expand All @@ -716,7 +717,7 @@ namespace LinearAlgebra

if (this->block(0).partitioner->n_mpi_processes() > 1)
return Utilities::MPI::max(
local_result, this->block(0).partitioner->get_communicator());
local_result, this->block(0).partitioner->get_mpi_communicator());
else
return local_result;
}
Expand Down Expand Up @@ -750,7 +751,7 @@ namespace LinearAlgebra

if (this->block(0).partitioner->n_mpi_processes() > 1)
return Utilities::MPI::sum(
local_result, this->block(0).partitioner->get_communicator());
local_result, this->block(0).partitioner->get_mpi_communicator());
else
return local_result;
}
Expand Down