Commit b4c79799 authored by Sebastian Eibl's avatar Sebastian Eibl
Browse files

clang-tidy -checks=-*,modernize-use-using

parent b2259fbd
......@@ -217,9 +217,9 @@ int main( int argc, char * argv[] )
typedef lbm::D3Q19<lbm::collision_model::SRT, false, lbm::force_model::SimpleConstant> LatticeModel_T;
typedef walberla::uint8_t flag_t;
typedef FlagField< flag_t > FlagField_T;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using flag_t = walberla::uint8_t;
using FlagField_T = FlagField<flag_t>;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
LatticeModel_T latticeModel{ lbm::collision_model::SRT( omega ), lbm::force_model::SimpleConstant( bodyForce ) };
......
......@@ -139,12 +139,12 @@ typedef lbm::D3Q27< lbm::collision_model::TRT, true > D3Q27_TRT_COMP;
template< typename LatticeModel_T >
struct Types
{
typedef typename LatticeModel_T::Stencil Stencil_T;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using Stencil_T = typename LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
};
typedef walberla::uint16_t flag_t;
typedef FlagField< flag_t > FlagField_T;
using flag_t = walberla::uint16_t;
using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = uint_t(4);
......@@ -399,7 +399,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::operator()( IBlock * const block ) const
{
typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
using PdfField_T = typename Types< LatticeModel_T >::PdfField_T;
FlagField_T * flagField = block->getData< FlagField_T >( flagFieldId_ );
PdfField_T * pdfField = block->getData< PdfField_T > ( pdfFieldId_ );
......@@ -457,7 +457,7 @@ class ErrorVTKWriter : public vtk::BlockCellDataWriter< OutputType, 3 >
{
public:
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using PdfField_T = lbm::PdfField< LatticeModel_T >;
ErrorVTKWriter( const ConstBlockDataID & pdfFieldId, const std::string & id, const Setup & setup ) :
vtk::BlockCellDataWriter< OutputType, 3 >( id ), bdid_( pdfFieldId ), pdf_( nullptr ), setup_( setup ) {}
......@@ -589,7 +589,7 @@ void addRefinementTimeStep( SweepTimeloop & timeloop, shared_ptr< blockforest::S
const bool syncComm, const bool fullComm, const bool linearExplosion,
shared_ptr< Sweep_T > & sweep, const std::string & info )
{
typedef typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T BH_T;
using BH_T = typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T;
auto ts = lbm::refinement::makeTimeStep< LatticeModel_T, BH_T >( blocks, sweep, pdfFieldId, boundaryHandlingId );
ts->asynchronousCommunication( !syncComm );
......@@ -612,7 +612,7 @@ struct AddRefinementTimeStep
{
if( pure )
{
typedef lbm::SplitPureSweep< LatticeModel_T > Sweep_T;
using Sweep_T = lbm::SplitPureSweep< LatticeModel_T >;
auto mySweep = make_shared< Sweep_T >( pdfFieldId );
addRefinementTimeStep< LatticeModel_T, Sweep_T >( timeloop, blocks, pdfFieldId, boundaryHandlingId, timingPool, levelwiseTimingPool,
......@@ -685,8 +685,8 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
Vector3< real_t >( initVelocity, real_c(0), real_c(0) ), real_t(1),
FieldGhostLayers, field::zyxf );
typedef typename lbm::Adaptor<LatticeModel_T>::VelocityVector VelocityAdaptor_T;
typedef typename lbm::Adaptor<LatticeModel_T>::Density DensityAdaptor_T;
using VelocityAdaptor_T = typename lbm::Adaptor< LatticeModel_T >::VelocityVector;
using DensityAdaptor_T = typename lbm::Adaptor< LatticeModel_T >::Density;
BlockDataID velocityAdaptorId = field::addFieldAdaptor< VelocityAdaptor_T >( blocks, pdfFieldId, "velocity adaptor" );
BlockDataID densityAdaptorId = field::addFieldAdaptor< DensityAdaptor_T >( blocks, pdfFieldId, "density adaptor" );
......
......@@ -80,11 +80,11 @@ using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
typedef LatticeModel_T::Stencil Stencil_T;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
typedef walberla::uint8_t flag_t;
typedef FlagField< flag_t > FlagField_T;
using flag_t = walberla::uint8_t;
using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 4;
......
......@@ -78,11 +78,11 @@ using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
typedef LatticeModel_T::Stencil Stencil_T;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
typedef walberla::uint8_t flag_t;
typedef FlagField< flag_t > FlagField_T;
using flag_t = walberla::uint8_t;
using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
typedef std::pair< pe::BodyID, real_t > BodyAndVolumeFraction_T;
......@@ -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;
typedef boost::tuple<pe::Sphere> BodyTypeTuple;
using BodyTypeTuple = boost::tuple<pe::Sphere>;
///////////
// FLAGS //
......@@ -1204,7 +1204,7 @@ int main( int argc, char **argv )
// reconstruct missing PDFs
typedef pe_coupling::SphereNormalExtrapolationDirectionFinder ExtrapolationFinder_T;
using ExtrapolationFinder_T = pe_coupling::SphereNormalExtrapolationDirectionFinder;
ExtrapolationFinder_T extrapolationFinder( blocks, bodyFieldID );
typedef pe_coupling::ExtrapolationReconstructor< LatticeModel_T, BoundaryHandling_T, ExtrapolationFinder_T > Reconstructor_T;
Reconstructor_T reconstructor( blocks, boundaryHandlingID, pdfFieldID, bodyFieldID, extrapolationFinder, true );
......
......@@ -105,12 +105,12 @@ typedef lbm::D3Q19< lbm::collision_model::D3Q19MRT, false > D3Q19_MRT_INCOMP;
template< typename LatticeModel_T >
struct Types
{
typedef typename LatticeModel_T::Stencil Stencil_T;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using Stencil_T = typename LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField< LatticeModel_T >;
};
typedef walberla::uint8_t flag_t;
typedef FlagField< flag_t > FlagField_T;
using flag_t = walberla::uint8_t;
using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = uint_t(4);
const uint_t BlockForestLevels = uint_t(4);
......@@ -443,12 +443,12 @@ class MyBoundaryHandling : public blockforest::AlwaysInitializeBlockDataHandling
{
public:
typedef typename MyBoundaryTypes< LatticeModel_T >::NoSlip_T NoSlip_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::UBB_T UBB_T;
using NoSlip_T = typename MyBoundaryTypes< LatticeModel_T >::NoSlip_T;
using UBB_T = typename MyBoundaryTypes< LatticeModel_T >::UBB_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::BoundaryConditions_T BoundaryConditions_T;
using BoundaryConditions_T = typename MyBoundaryTypes< LatticeModel_T >::BoundaryConditions_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::BoundaryHandling_T BoundaryHandling_T;
using BoundaryHandling_T = typename MyBoundaryTypes< LatticeModel_T >::BoundaryHandling_T;
......@@ -473,7 +473,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::initialize( IBlock * const block )
{
typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
using PdfField_T = typename Types<LatticeModel_T>::PdfField_T;
WALBERLA_ASSERT_NOT_NULLPTR( block );
......@@ -598,7 +598,7 @@ void addRefinementTimeStep( SweepTimeloop & timeloop, shared_ptr< blockforest::S
const bool syncComm, const bool fullComm, const bool linearExplosion,
shared_ptr< Sweep_T > & sweep, const std::string & info )
{
typedef typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T BH_T;
using BH_T = typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T;
auto ts = lbm::refinement::makeTimeStep< LatticeModel_T, BH_T >( blocks, sweep, pdfFieldId, boundaryHandlingId );
ts->asynchronousCommunication( !syncComm );
......@@ -621,7 +621,7 @@ struct AddRefinementTimeStep
{
if( pure )
{
typedef lbm::SplitPureSweep< LatticeModel_T > Sweep_T;
using Sweep_T = lbm::SplitPureSweep< LatticeModel_T >;
auto mySweep = make_shared< Sweep_T >( pdfFieldId );
addRefinementTimeStep< LatticeModel_T, Sweep_T >( timeloop, blocks, pdfFieldId, boundaryHandlingId, timingPool, levelwiseTimingPool,
......@@ -784,7 +784,7 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
}
else
{
typedef blockforest::DynamicLevelwiseDiffusionBalance< blockforest::NoPhantomData > DLDB;
using DLDB = blockforest::DynamicLevelwiseDiffusionBalance<blockforest::NoPhantomData>;
DLDB balancer( diffusionMaxIterations, diffusionFlowIterations );
if( diffusionMode == 0 )
balancer.setMode( DLDB::DIFFUSION_PUSH );
......
......@@ -35,7 +35,7 @@ namespace walberla {
using namespace walberla::pe;
using namespace walberla::timing;
typedef boost::tuple<Sphere> BodyTuple ;
using BodyTuple = boost::tuple<Sphere> ;
int main( int argc, char ** argv )
{
......
......@@ -127,12 +127,12 @@ typedef lbm::D3Q27< lbm::collision_model::TRT, true, lbm::force_model::SimpleCo
template< typename LatticeModel_T >
struct Types
{
typedef typename LatticeModel_T::Stencil Stencil_T;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using Stencil_T = typename LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
};
typedef walberla::uint16_t flag_t;
typedef FlagField< flag_t > FlagField_T;
using flag_t = walberla::uint16_t;
using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = uint_t(4);
......@@ -478,7 +478,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::operator()( IBlock * const block ) const
{
typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
using PdfField_T = typename Types< LatticeModel_T >::PdfField_T;
FlagField_T * flagField = block->getData< FlagField_T >( flagFieldId_ );
PdfField_T * pdfField = block->getData< PdfField_T > ( pdfFieldId_ );
......@@ -497,7 +497,7 @@ class CurvedDeltaValueCalculation
{
public:
typedef typename LatticeModel_T::Stencil Stencil;
using Stencil = typename LatticeModel_T::Stencil;
CurvedDeltaValueCalculation( const shared_ptr< StructuredBlockForest > & blocks, const IBlock & block, const Channel & channel ) :
blocks_( blocks ), block_( block ), channel_( channel ) {}
......@@ -587,7 +587,7 @@ class ErrorVTKWriter : public vtk::BlockCellDataWriter< OutputType, 3 >
{
public:
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using PdfField_T = lbm::PdfField< LatticeModel_T >;
ErrorVTKWriter( const ConstBlockDataID & pdfFieldId, const std::string & id, const Setup & setup ) :
vtk::BlockCellDataWriter< OutputType, 3 >( id ), bdid_( pdfFieldId ), pdf_( nullptr ), setup_( setup ) {}
......@@ -786,8 +786,8 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
Vector3< real_t >( initVelocity, real_c(0), real_c(0) ), real_t(1),
FieldGhostLayers, field::zyxf );
typedef typename lbm::Adaptor<LatticeModel_T>::VelocityVector VelocityAdaptor_T;
typedef typename lbm::Adaptor<LatticeModel_T>::Density DensityAdaptor_T;
using VelocityAdaptor_T = typename lbm::Adaptor< LatticeModel_T >::VelocityVector;
using DensityAdaptor_T = typename lbm::Adaptor< LatticeModel_T >::Density;
BlockDataID velocityAdaptorId = field::addFieldAdaptor< VelocityAdaptor_T >( blocks, pdfFieldId, "velocity adaptor" );
BlockDataID densityAdaptorId = field::addFieldAdaptor< DensityAdaptor_T >( blocks, pdfFieldId, "density adaptor" );
......@@ -834,7 +834,7 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
shared_ptr<WcTimingPool> refinementTimeStepTiming = make_shared<WcTimingPool>();
shared_ptr<WcTimingPool> refinementTimeStepLevelwiseTiming = make_shared<WcTimingPool>();
typedef typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T BH_T;
using BH_T = typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T;
auto mySweep = lbm::makeCellwiseSweep< LatticeModel_T, FlagField_T >( pdfFieldId, flagFieldId, Fluid_Flag );
auto ts = lbm::refinement::makeTimeStep< LatticeModel_T, BH_T >( blocks, mySweep, pdfFieldId, boundaryHandlingId );
......
......@@ -158,12 +158,12 @@ typedef lbm::D3Q27< lbm::collision_model::TRT, true > D3Q27_TRT_COMP;
template< typename LatticeModel_T >
struct Types
{
typedef typename LatticeModel_T::Stencil Stencil_T;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using Stencil_T = typename LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField< LatticeModel_T >;
};
typedef walberla::uint16_t flag_t;
typedef FlagField< flag_t > FlagField_T;
using flag_t = walberla::uint16_t;
using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = uint_t(4);
......@@ -799,17 +799,17 @@ class MyBoundaryHandling : public blockforest::AlwaysInitializeBlockDataHandling
{
public:
typedef typename MyBoundaryTypes< LatticeModel_T >::NoSlip_T NoSlip_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::Obstacle_T Obstacle_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::Curved_T Curved_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::DynamicUBB_T DynamicUBB_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::Outlet21_T Outlet21_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::Outlet43_T Outlet43_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::PressureOutlet_T PressureOutlet_T;
using NoSlip_T = typename MyBoundaryTypes<LatticeModel_T>::NoSlip_T;
using Obstacle_T = typename MyBoundaryTypes<LatticeModel_T>::Obstacle_T;
using Curved_T = typename MyBoundaryTypes<LatticeModel_T>::Curved_T;
using DynamicUBB_T = typename MyBoundaryTypes<LatticeModel_T>::DynamicUBB_T;
using Outlet21_T = typename MyBoundaryTypes<LatticeModel_T>::Outlet21_T;
using Outlet43_T = typename MyBoundaryTypes<LatticeModel_T>::Outlet43_T;
using PressureOutlet_T = typename MyBoundaryTypes<LatticeModel_T>::PressureOutlet_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::BoundaryConditions_T BoundaryConditions_T;
using BoundaryConditions_T = typename MyBoundaryTypes<LatticeModel_T>::BoundaryConditions_T;
typedef typename MyBoundaryTypes< LatticeModel_T >::BoundaryHandling_T BoundaryHandling_T;
using BoundaryHandling_T = typename MyBoundaryTypes<LatticeModel_T>::BoundaryHandling_T;
......@@ -837,7 +837,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::initialize( IBlock * const block )
{
typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
using PdfField_T = typename Types< LatticeModel_T >::PdfField_T;
FlagField_T * flagField = block->getData< FlagField_T >( flagFieldId_ );
PdfField_T * pdfField = block->getData< PdfField_T > ( pdfFieldId_ );
......@@ -866,7 +866,7 @@ class CurvedDeltaValueCalculation
{
public:
typedef typename LatticeModel_T::Stencil Stencil;
using Stencil = typename LatticeModel_T::Stencil;
CurvedDeltaValueCalculation( const shared_ptr< StructuredBlockForest > & blocks, const IBlock & block, const Cylinder & cylinder ) :
blocks_( blocks ), block_( block ), cylinder_( cylinder ) {}
......@@ -909,7 +909,7 @@ class BoundarySetter
{
public:
typedef typename MyBoundaryTypes< LatticeModel_T >::BoundaryHandling_T BoundaryHandling_T;
using BoundaryHandling_T = typename MyBoundaryTypes< LatticeModel_T >::BoundaryHandling_T;
BoundarySetter( const weak_ptr<StructuredBlockForest> & blockForest, const BlockDataID & boundaryHandlingId, const Setup & setup,
const int obstacleBoundary, const int outletType,
......@@ -1267,7 +1267,7 @@ class Pseudo2DPhantomWeight // used as a 'PhantomBlockForest::PhantomBlockDataAs
{
public:
typedef uint8_t weight_t;
using weight_t = uint8_t;
Pseudo2DPhantomWeight( const weight_t _weight ) : weight_( _weight ) {}
......@@ -1399,8 +1399,8 @@ class Evaluation
{
public:
typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
typedef typename LatticeModel_T::Stencil Stencil_T;
using PdfField_T = typename Types< LatticeModel_T >::PdfField_T;
using Stencil_T = typename LatticeModel_T::Stencil;
Evaluation( const weak_ptr< StructuredBlockStorage > & blocks, const uint_t checkFrequency,
const BlockDataID & pdfFieldId, const BlockDataID & flagFieldId, const FlagUID & fluid, const FlagUID & obstacle,
......@@ -2357,7 +2357,7 @@ void addRefinementTimeStep( SweepTimeloop & timeloop, shared_ptr< blockforest::S
const shared_ptr< Evaluation< LatticeModel_T > > & evaluation,
const shared_ptr< lbm::TimeTracker > & timeTracker )
{
typedef typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T BH_T;
using BH_T = typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T;
auto ts = lbm::refinement::makeTimeStep< LatticeModel_T, BH_T >( blocks, sweep, pdfFieldId, boundaryHandlingId, None, Empty );
ts->asynchronousCommunication( !syncComm );
......@@ -2386,7 +2386,7 @@ struct AddRefinementTimeStep
{
if( pure )
{
typedef lbm::SplitPureSweep< LatticeModel_T > Sweep_T;
using Sweep_T = lbm::SplitPureSweep< LatticeModel_T >;
auto mySweep = make_shared< Sweep_T >( pdfFieldId );
addRefinementTimeStep< LatticeModel_T, Sweep_T >( timeloop, blocks, pdfFieldId, boundaryHandlingId, timingPool, levelwiseTimingPool,
......@@ -2470,7 +2470,7 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
// add density adaptor
typedef typename lbm::Adaptor<LatticeModel_T>::Density DensityAdaptor_T;
using DensityAdaptor_T = typename lbm::Adaptor< LatticeModel_T >::Density;
BlockDataID densityAdaptorId = field::addFieldAdaptor< DensityAdaptor_T >( blocks, pdfFieldId, "density adaptor", None, Empty );
// add velocity field + initialize velocity field writer (only used for simulations with an adaptive block structure)
......
......@@ -112,13 +112,13 @@ typedef lbm::D3Q27< lbm::collision_model::D3Q27Cumulant, true > D3Q27_CUMULANT_
template< typename LatticeModel_T >
struct Types
{
typedef typename LatticeModel_T::Stencil Stencil_T;
typedef typename LatticeModel_T::CommunicationStencil CommunicationStencil_T;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using Stencil_T = typename LatticeModel_T::Stencil;
using CommunicationStencil_T = typename LatticeModel_T::CommunicationStencil;
using PdfField_T = lbm::PdfField< LatticeModel_T >;
};
typedef walberla::uint8_t flag_t;
typedef FlagField< flag_t > FlagField_T;
using flag_t = walberla::uint8_t;
using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = 1;
......@@ -368,7 +368,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::operator()( IBlock * const block, const StructuredBlockStorage * const storage ) const
{
typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
using PdfField_T = typename Types< LatticeModel_T >::PdfField_T;
WALBERLA_ASSERT_NOT_NULLPTR( block );
WALBERLA_ASSERT_NOT_NULLPTR( storage );
......@@ -487,8 +487,8 @@ void MyVTKOutput<LatticeModel_T>::operator()( std::vector< shared_ptr<vtk::Block
template< typename LatticeModel_T, class Enable = void >
struct AddLB
{
typedef typename Types<LatticeModel_T>::PdfField_T PdfField;
typedef typename Types<LatticeModel_T>::CommunicationStencil_T CommunicationStencil;
using PdfField = typename Types< LatticeModel_T >::PdfField_T;
using CommunicationStencil = typename Types< LatticeModel_T >::CommunicationStencil_T;
static void add( shared_ptr< blockforest::StructuredBlockForest > & blocks, SweepTimeloop & timeloop,
const BlockDataID & pdfFieldId, const BlockDataID & flagFieldId, const BlockDataID & boundaryHandlingId,
......@@ -551,7 +551,7 @@ struct AddLB
{
if( pure )
{
typedef lbm::SplitPureSweep< LatticeModel_T > Sweep_T;
using Sweep_T = lbm::SplitPureSweep< LatticeModel_T >;
auto sweep = make_shared< Sweep_T >( pdfFieldId );
timeloop.add() << Sweep( lbm::CollideSweep< Sweep_T >( sweep ), "split pure LB sweep (collide)" );
......@@ -591,8 +591,8 @@ struct AddLB< LatticeModel_T, typename boost::enable_if_c< boost::mpl::or_<
lbm::collision_model::Cumulant_tag >
>::value >::type >
{
typedef typename Types<LatticeModel_T>::PdfField_T PdfField;
typedef typename Types<LatticeModel_T>::CommunicationStencil_T CommunicationStencil;
using PdfField = typename Types< LatticeModel_T >::PdfField_T;
using CommunicationStencil = typename Types< LatticeModel_T >::CommunicationStencil_T;
static void add( shared_ptr< blockforest::StructuredBlockForest > & blocks, SweepTimeloop & timeloop,
const BlockDataID & pdfFieldId, const BlockDataID & flagFieldId, const BlockDataID & boundaryHandlingId,
......@@ -659,7 +659,7 @@ template< typename LatticeModel_T >
void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeModel,
const bool split, const bool pure, const bool fzyx, const bool fullComm, const bool fused, const bool directComm )
{
typedef typename Types<LatticeModel_T>::PdfField_T PdfField;
using PdfField = typename Types<LatticeModel_T>::PdfField_T;
Config::BlockHandle configBlock = config->getBlock( "UniformGrid" );
......
......@@ -77,14 +77,14 @@ const uint_t FieldGhostLayers( 1 );
typedef GhostLayerField< Matrix3<real_t>, 1 > TensorField_T;
typedef GhostLayerField< Vector3<real_t>, 1 > Vec3Field_T;
typedef GhostLayerField< real_t, 1 > ScalarField_T;
typedef lbm::force_model::GuoField< Vec3Field_T > ForceModel_T;
using ForceModel_T = lbm::force_model::GuoField<Vec3Field_T>;
typedef lbm::D3Q19< lbm::collision_model::SRTField<ScalarField_T>, false, ForceModel_T > LatticeModel_T;
typedef LatticeModel_T::Stencil Stencil_T;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
typedef walberla::uint8_t flag_t;
typedef FlagField< flag_t > FlagField_T;
using flag_t = walberla::uint8_t;
using FlagField_T = FlagField<flag_t>;
// boundary handling
typedef lbm::NoSlip< LatticeModel_T, flag_t > NoSlip_T;
......@@ -1374,7 +1374,7 @@ int main( int argc, char **argv ) {
std::function<void(void)> lubricationEvaluationFunction;
if( lubricationCutOffDistance > real_t(0) )
{
typedef pe_coupling::discrete_particle_methods::LubricationForceEvaluator LE_T;
using LE_T = pe_coupling::discrete_particle_methods::LubricationForceEvaluator;
shared_ptr<LE_T> lubEval = make_shared<LE_T>( blocks, globalBodyStorage, bodyStorageID, viscosity, lubricationCutOffDistance );
lubricationEvaluationFunction = std::bind(&LE_T::operator(), lubEval);
}
......
......@@ -33,14 +33,14 @@
namespace walberla {
typedef lbm::D2Q9< lbm::collision_model::SRT > LatticeModel_T;
typedef LatticeModel_T::Stencil Stencil_T;
typedef LatticeModel_T::CommunicationStencil CommunicationStencil_T;
using LatticeModel_T = lbm::D2Q9<lbm::collision_model::SRT>;
using Stencil_T = LatticeModel_T::Stencil;
using CommunicationStencil_T = LatticeModel_T::CommunicationStencil;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
typedef walberla::uint8_t flag_t;
typedef FlagField< flag_t > FlagField_T;
using flag_t = walberla::uint8_t;
using FlagField_T = FlagField<flag_t>;
......
......@@ -34,13 +34,13 @@ namespace walberla {
typedef lbm::D2Q9< lbm::collision_model::SRT, false, lbm::force_model::SimpleConstant > LatticeModel_T;
typedef LatticeModel_T::Stencil Stencil_T;
typedef LatticeModel_T::CommunicationStencil CommunicationStencil_T;
using Stencil_T = LatticeModel_T::Stencil;
using CommunicationStencil_T = LatticeModel_T::CommunicationStencil;
typedef lbm::PdfField< LatticeModel_T > PdfField_T;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
typedef walberla::uint8_t flag_t;
typedef FlagField< flag_t > FlagField_T;
using flag_t = walberla::uint8_t;
using FlagField_T = FlagField<flag_t>;
......
......@@ -63,15 +63,15 @@ namespace walberla {
// TYPEDEFS //
//////////////
typedef lbm::D3Q19< lbm::collision_model::SRT > LatticeModel_T; // the LB lattice model - here: D3Q19, SRT, incompressible, no additional forces
typedef LatticeModel_T::Stencil Stencil_T; // just the D3Q19 stencil without LB specific information
typedef LatticeModel_T::CommunicationStencil CommunicationStencil_T; // the stencil that is needed for the communication: This stencil determines which
using LatticeModel_T = lbm::D3Q19<lbm::collision_model::SRT>; // the LB lattice model - here: D3Q19, SRT, incompressible, no additional forces
using Stencil_T = LatticeModel_T::Stencil; // just the D3Q19 stencil without LB specific information
using CommunicationStencil_T = LatticeModel_T::CommunicationStencil; // the stencil that is needed for the communication: This stencil determines which
// neighbor blocks are involved during the communication.
typedef lbm::PdfField< LatticeModel_T > PdfField_T; // type of the PDF field that stores the 19 distribution functions
using PdfField_T = lbm::PdfField<LatticeModel_T>; // type of the PDF field that stores the 19 distribution functions
typedef walberla::uint8_t flag_t; // each flag consists of an 8 bit value and therefore can distinguish between 8 different markers/flags
typedef FlagField< flag_t > FlagField_T; // the flag field: used for marking cells as fluid or obstacle cells
using flag_t = walberla::uint8_t; // each flag consists of an 8 bit value and therefore can distinguish between 8 different markers/flags
using FlagField_T = FlagField<flag_t>; // the flag field: used for marking cells as fluid or obstacle cells
// (also used for distinguishing between different boundary conditions
// -> every boundary condition possesses its own, unique flag)
......
......@@ -39,7 +39,7 @@
namespace walberla {
typedef GhostLayerField<real_t,1> ScalarField;
typedef stencil::D2Q5 Stencil_T;
using Stencil_T = stencil::D2Q5;
// function to initialize the boundaries of the source and destination fields
......
......@@ -43,7 +43,7 @@ namespace walberla {