From 33a526965e5bb41e7916e952f1e6ca5a9e957efc Mon Sep 17 00:00:00 2001 From: Daniel Schwen Date: Thu, 12 Dec 2019 14:53:58 -0700 Subject: [PATCH] Fix breakage from TIMPI refactor (#407) --- include/userobjects/RadialGreensConvolution.h | 10 +++------- src/userobjects/RadialGreensConvolution.C | 9 +++------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/include/userobjects/RadialGreensConvolution.h b/include/userobjects/RadialGreensConvolution.h index 82411d4c..3db00af4 100644 --- a/include/userobjects/RadialGreensConvolution.h +++ b/include/userobjects/RadialGreensConvolution.h @@ -20,7 +20,7 @@ #include #include -using namespace libMesh::Parallel; +using namespace TIMPI; class RadialGreensConvolution; class ThreadedRadialGreensConvolutionLoop; @@ -167,9 +167,7 @@ template <> const Point & PointListAdaptor::getPoint( const RadialGreensConvolution::QPData & item) const; -namespace libMesh -{ -namespace Parallel +namespace TIMPI { template <> @@ -180,6 +178,4 @@ class StandardType : public DataType StandardType(const StandardType & t); ~StandardType() { this->free(); } }; -} -} - +} // namespace TIMPI diff --git a/src/userobjects/RadialGreensConvolution.C b/src/userobjects/RadialGreensConvolution.C index 9f602775..ac85458c 100644 --- a/src/userobjects/RadialGreensConvolution.C +++ b/src/userobjects/RadialGreensConvolution.C @@ -270,7 +270,7 @@ RadialGreensConvolution::finalize() { // inspect incoming message Parallel::Status status(_communicator.probe(Parallel::any_source, send_tag)); - const auto source_pid = cast_int(status.source()); + const auto source_pid = TIMPI::cast_int(status.source()); const auto message_size = status.size(item_type); // resize receive buffer accordingly and receive data @@ -543,9 +543,7 @@ RadialGreensConvolution::updateCommunicationLists() _update_communication_lists = false; } -namespace libMesh -{ -namespace Parallel +namespace TIMPI { StandardType::StandardType( @@ -595,8 +593,7 @@ StandardType::StandardType( #endif // LIBMESH_HAVE_MPI } -} // namespace Parallel -} // namespace libMesh +} // namespace TIMPI StandardType::StandardType( const StandardType & t)