Commit 9893c79b authored by Sebastian Eibl's avatar Sebastian Eibl
Browse files

Merge branch 'remove_boost_tuple_from_pe' into 'master'

replace boost::tuple with std::tuple in pe

See merge request walberla/walberla!187
parents e9146847 acc8a6ca
......@@ -109,7 +109,7 @@ typedef pe_coupling::CurvedLinear< LatticeModel_T, FlagField_T > MO_T;
typedef boost::tuples::tuple< NoSlip_T, MO_T > BoundaryConditions_T;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
typedef boost::tuple<pe::Sphere, pe::Ellipsoid, pe::Plane> BodyTypeTuple;
typedef std::tuple<pe::Sphere, pe::Ellipsoid, pe::Plane> BodyTypeTuple;
///////////
// FLAGS //
......
......@@ -103,7 +103,7 @@ typedef pe_coupling::CurvedLinear< LatticeModel_T, FlagField_T > MO_CLI_T;
typedef boost::tuples::tuple<MO_CLI_T > BoundaryConditions_T;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
typedef boost::tuple<pe::Sphere, pe::Ellipsoid, pe::Plane> BodyTypeTuple;
typedef std::tuple<pe::Sphere, pe::Ellipsoid, pe::Plane> BodyTypeTuple;
///////////
// FLAGS //
......
......@@ -25,6 +25,7 @@
#include <core/DataTypes.h>
#include <string>
#include <tuple>
namespace walberla {
......@@ -47,7 +48,7 @@ int main( int argc, char** argv )
using namespace walberla;
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
typedef std::tuple<Sphere, Plane> BodyTuple ;
walberla::MPIManager::instance()->initializeMPI( &argc, &argv );
......
......@@ -98,7 +98,7 @@ typedef pe_coupling::CurvedLinear< LatticeModel_T, FlagField_T > MO_CLI_T;
typedef boost::tuples::tuple< MO_SBB_T, MO_CLI_T > BoundaryConditions_T;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
typedef boost::tuple< pe::Sphere, pe::Plane > BodyTypeTuple;
typedef std::tuple< pe::Sphere, pe::Plane > BodyTypeTuple;
///////////
// FLAGS //
......
......@@ -101,7 +101,7 @@ typedef pe_coupling::CurvedQuadratic< LatticeModel_T, FlagField_T > MEM_MR_T;
typedef boost::tuples::tuple< UBB_T, Outlet_T, MEM_BB_T, MEM_CLI_T, MEM_MR_T > BoundaryConditions_T;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
using BodyTypeTuple = boost::tuple<pe::Sphere>;
using BodyTypeTuple = std::tuple<pe::Sphere>;
///////////
// FLAGS //
......
......@@ -33,12 +33,13 @@
#include <functional>
#include <memory>
#include <tuple>
namespace walberla {
using namespace walberla::pe;
using namespace walberla::timing;
using BodyTuple = boost::tuple<Sphere> ;
using BodyTuple = std::tuple<Sphere> ;
int main( int argc, char ** argv )
{
......
......@@ -101,7 +101,7 @@ typedef lbm::SimplePressure< LatticeModel_T, flag_t > Outflow_T
typedef boost::tuples::tuple< NoSlip_T, Inflow_T, Outflow_T > BoundaryConditions_T;
typedef BoundaryHandling<FlagField_T, Stencil_T, BoundaryConditions_T> BoundaryHandling_T;
typedef boost::tuple<pe::Plane, pe::Sphere> BodyTypeTuple ;
typedef std::tuple<pe::Plane, pe::Sphere> BodyTypeTuple ;
///////////
// FLAGS //
......
......@@ -27,13 +27,15 @@
#include <core/grid_generator/SCIterator.h>
#include <core/logging/Logging.h>
#include <core/math/Random.h>
#include <tuple>
//! [Includes]
namespace walberla {
using namespace walberla::pe;
//! [BodyTypeTuple]
typedef boost::tuple<Sphere, Plane> BodyTypeTuple ;
typedef std::tuple<Sphere, Plane> BodyTypeTuple ;
//! [BodyTypeTuple]
int main( int argc, char ** argv )
......
......@@ -36,13 +36,14 @@
#include <vtk/VTKOutput.h>
#include <functional>
#include <tuple>
namespace walberla {
using namespace walberla::pe;
using namespace walberla::timing;
using namespace walberla::pe::raytracing;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
typedef std::tuple<Sphere, Plane> BodyTuple ;
int main( int argc, char ** argv )
{
......
......@@ -140,7 +140,7 @@ private:
//** friend declaration
/// needed to be able to set static type ids with setStaticTypeID
template <class T>
template <class T, int N>
friend struct walberla::pe::SetBodyTypeIDs;
};
//*************************************************************************************************
......
......@@ -38,7 +38,7 @@
#include "core/Abort.h"
#include <boost/tuple/tuple.hpp>
#include <tuple>
namespace walberla {
......
......@@ -37,7 +37,7 @@
#include "core/math/Shims.h"
#include "geometry/GeometricalFunctions.h"
#include <boost/tuple/tuple.hpp>
#include <tuple>
namespace walberla {
namespace pe {
......
......@@ -28,7 +28,7 @@
#include "pe/rigidbody/Plane.h"
#include "pe/rigidbody/Union.h"
#include <pe/Thresholds.h>
#include <boost/tuple/tuple.hpp>
#include <tuple>
namespace walberla{
namespace pe{
......
......@@ -23,8 +23,7 @@
#include "AnalyticCollisionDetection.h"
#include "GenericFCD.h"
#include <boost/type_traits/is_base_of.hpp>
#include <boost/tuple/tuple.hpp>
#include <tuple>
namespace walberla{
namespace pe{
......
......@@ -72,7 +72,7 @@ you should call RigidBody::getTopSuperBody() and then RigidBody::getMass()
(RigidBody::getInertia()) using the returned rigid body.
\subsection SyncCalls How can I dynamically switch between sync calls?
You can bind the function to a boost function and call this one.
You can bind the function to a std::function and call this one.
\snippet 02_ConfinedGasExtended.cpp Bind Sync Call
\section CommonFunctions Important Classes and Functions
......
......@@ -30,7 +30,7 @@
#include "pe/rigidbody/Union.h"
#include "pe/utility/BodyCast.h"
#include <core/math/Utility.h>
#include <boost/tuple/tuple.hpp>
#include <tuple>
#include <pe/raytracing/Ray.h>
......
......@@ -161,7 +161,7 @@ private:
//** friend declaration
/// needed to be able to set static type ids with setStaticTypeID
template <class T>
template <class T, int N>
friend struct SetBodyTypeIDs;
};
//*************************************************************************************************
......
......@@ -158,7 +158,7 @@ private:
//** friend declaration
/// needed to be able to set static type ids with setStaticTypeID
template <class T>
template <class T, int N>
friend struct SetBodyTypeIDs;
};
//*************************************************************************************************
......
......@@ -113,7 +113,7 @@ private:
//** friend declaration
/// needed to be able to set static type ids with setStaticTypeID
template <class T>
template <class T, int N>
friend struct SetBodyTypeIDs;
};
//*************************************************************************************************
......
......@@ -149,7 +149,7 @@ private:
//** friend declaration
/// needed to be able to set static type ids with setStaticTypeID
template <class T>
template <class T, int N>
friend struct SetBodyTypeIDs;
};
//*************************************************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment