Skip to content

Commit

Permalink
Fix breakage from TIMPI refactor (idaholab#407)
Browse files Browse the repository at this point in the history
  • Loading branch information
dschwen committed Dec 12, 2019
1 parent 0530545 commit 33a5269
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 13 deletions.
10 changes: 3 additions & 7 deletions include/userobjects/RadialGreensConvolution.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <memory>
#include <tuple>

using namespace libMesh::Parallel;
using namespace TIMPI;

class RadialGreensConvolution;
class ThreadedRadialGreensConvolutionLoop;
Expand Down Expand Up @@ -167,9 +167,7 @@ template <>
const Point & PointListAdaptor<RadialGreensConvolution::QPData>::getPoint(
const RadialGreensConvolution::QPData & item) const;

namespace libMesh
{
namespace Parallel
namespace TIMPI
{

template <>
Expand All @@ -180,6 +178,4 @@ class StandardType<RadialGreensConvolution::QPData> : public DataType
StandardType(const StandardType<RadialGreensConvolution::QPData> & t);
~StandardType() { this->free(); }
};
}
}

} // namespace TIMPI
9 changes: 3 additions & 6 deletions src/userobjects/RadialGreensConvolution.C
Original file line number Diff line number Diff line change
Expand Up @@ -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<processor_id_type>(status.source());
const auto source_pid = TIMPI::cast_int<processor_id_type>(status.source());
const auto message_size = status.size(item_type);

// resize receive buffer accordingly and receive data
Expand Down Expand Up @@ -543,9 +543,7 @@ RadialGreensConvolution::updateCommunicationLists()
_update_communication_lists = false;
}

namespace libMesh
{
namespace Parallel
namespace TIMPI
{

StandardType<RadialGreensConvolution::QPData>::StandardType(
Expand Down Expand Up @@ -595,8 +593,7 @@ StandardType<RadialGreensConvolution::QPData>::StandardType(

#endif // LIBMESH_HAVE_MPI
}
} // namespace Parallel
} // namespace libMesh
} // namespace TIMPI

StandardType<RadialGreensConvolution::QPData>::StandardType(
const StandardType<RadialGreensConvolution::QPData> & t)
Expand Down

0 comments on commit 33a5269

Please sign in to comment.