Commit 4c164e56 authored by Christoph Rettinger's avatar Christoph Rettinger
Browse files

Pecoupling: Tidied up template parameters, removed first order (Stokes) approximation

parent 21d91964
......@@ -361,7 +361,7 @@ private:
};
void initializeCouetteProfile( const shared_ptr< StructuredBlockStorage > & blocks, const BlockDataID & pdfFieldID, const BlockDataID & boundaryHandlingID,
const real_t & substrateHeight, const real_t & domainHeight, const real_t wallVelocity )
const real_t & domainHeight, const real_t wallVelocity )
{
const real_t rho = real_c(1);
......@@ -377,10 +377,8 @@ void initializeCouetteProfile( const shared_ptr< StructuredBlockStorage > & bloc
Vector3< real_t > velocity( real_c(0) );
if( coord[2] >= substrateHeight )
{
velocity[0] = wallVelocity * (coord[2] - substrateHeight) / ( domainHeight - substrateHeight);
}
velocity[0] = wallVelocity * coord[2] / domainHeight;
pdfField->setToEquilibrium( x, y, z, velocity, rho );
)
}
......@@ -632,7 +630,7 @@ int main( int argc, char **argv )
// initialize Couette velocity profile in whole domain
if( !zeroShearTest ) initializeCouetteProfile(blocks, pdfFieldID, boundaryHandlingID, diameter, domainHeight, wallVelocity);
if( !zeroShearTest ) initializeCouetteProfile(blocks, pdfFieldID, boundaryHandlingID, domainHeight, wallVelocity);
///////////////
// TIME LOOP //
......
......@@ -62,7 +62,6 @@ namespace hindered_settling_dynamics_dpm
using namespace walberla;
using walberla::uint_t;
///////////////
// CONSTANTS //
///////////////
......
......@@ -61,7 +61,6 @@ namespace sphere_wall_collision_behavior_dpm
using namespace walberla;
using walberla::uint_t;
///////////////
// CONSTANTS //
///////////////
......
......@@ -73,11 +73,10 @@ namespace drag_force_sphere_mem
using namespace walberla;
using walberla::uint_t;
using lbm::force_model::SimpleConstant;
// PDF field, flag field & body field
using ForceModel_T = lbm::force_model::LuoConstant;
typedef lbm::D3Q19< lbm::collision_model::TRT, false, ForceModel_T, 1> LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT, false, ForceModel_T > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -83,10 +83,9 @@ namespace drag_force_sphere_mem_refinement
using namespace walberla;
using walberla::uint_t;
using lbm::force_model::SimpleConstant;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false, lbm::force_model::SimpleConstant, 1> LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT, false, lbm::force_model::SimpleConstant > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......@@ -531,7 +530,8 @@ int main( int argc, char **argv )
////////////////////////
// create the lattice model
LatticeModel_T latticeModel = LatticeModel_T( lbm::collision_model::TRT::constructWithMagicNumber( omega ), SimpleConstant( Vector3<real_t> ( setup.extForce, 0, 0 ) ) );
LatticeModel_T latticeModel = LatticeModel_T( lbm::collision_model::TRT::constructWithMagicNumber( omega ),
lbm::force_model::SimpleConstant( Vector3<real_t> ( setup.extForce, 0, 0 ) ) );
// add PDF field ( uInit = <0,0,0>, rhoInit = 1 )
BlockDataID pdfFieldID = lbm::addPdfFieldToStorage< LatticeModel_T >( blocks, "pdf field (zyxf)", latticeModel,
......
......@@ -79,7 +79,7 @@ using walberla::uint_t;
//////////////
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -77,8 +77,7 @@ using walberla::uint_t;
//////////////
// pdf field & flag field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -78,14 +78,12 @@ namespace periodic_particle_channel_mem
using namespace walberla;
using walberla::uint_t;
//////////////
// TYPEDEFS //
//////////////
// pdf field & flag field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -76,14 +76,13 @@ namespace segre_silberberg_mem
using namespace walberla;
using walberla::uint_t;
using lbm::force_model::SimpleConstant;
//////////////
// TYPEDEFS //
//////////////
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false, SimpleConstant > LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT, false, lbm::force_model::SimpleConstant > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......@@ -582,7 +581,8 @@ int main( int argc, char **argv )
////////////////////////
// create the lattice model
LatticeModel_T latticeModel = LatticeModel_T( lbm::collision_model::TRT::constructWithMagicNumber( omega ), SimpleConstant( Vector3<real_t> ( setup.forcing, real_t(0), real_t(0) ) ) );
LatticeModel_T latticeModel = LatticeModel_T( lbm::collision_model::TRT::constructWithMagicNumber( omega ),
lbm::force_model::SimpleConstant( Vector3<real_t> ( setup.forcing, real_t(0), real_t(0) ) ) );
// add PDF field
BlockDataID pdfFieldID = lbm::addPdfFieldToStorage< LatticeModel_T >( blocks, "pdf field (zyxf)", latticeModel,
......
......@@ -80,7 +80,7 @@ using walberla::uint_t;
//////////////
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -86,7 +86,7 @@ using walberla::uint_t;
//////////////
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -82,7 +82,7 @@ using walberla::uint_t;
//////////////
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -80,8 +80,7 @@ using namespace walberla;
using walberla::uint_t;
// PDF field, flag field & body field
using ForceModel_T = lbm::force_model::None;
typedef lbm::D3Q19<lbm::collision_model::TRT, false, ForceModel_T> LatticeModel_T;
typedef lbm::D3Q19<lbm::collision_model::TRT> LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -69,14 +69,12 @@ namespace taylor_coette_flow_mem
using namespace walberla;
using walberla::uint_t;
//////////////
// TYPEDEFS //
//////////////
// pdf field & flag field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -76,7 +76,7 @@ using namespace walberla;
using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false, lbm::force_model::None, 1> LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::TRT > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -73,11 +73,10 @@ namespace drag_force_sphere_psm
using namespace walberla;
using walberla::uint_t;
using lbm::force_model::SimpleConstant;
// PDF field, flag field & body field
using ForceModel_T = lbm::force_model::LuoConstant;
typedef lbm::D3Q19< lbm::collision_model::SRT, false, ForceModel_T, 1> LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::SRT, false, ForceModel_T> LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
......@@ -83,10 +83,9 @@ namespace drag_force_sphere_psm_refinement
using namespace walberla;
using walberla::uint_t;
using lbm::force_model::SimpleConstant;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::SRT, false, lbm::force_model::SimpleConstant, 1> LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::SRT, false, lbm::force_model::SimpleConstant > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......@@ -536,7 +535,7 @@ int main( int argc, char **argv )
////////////////////////
// create the lattice model
LatticeModel_T latticeModel = LatticeModel_T( omega, SimpleConstant( Vector3<real_t> ( setup.extForce, 0, 0 ) ) );
LatticeModel_T latticeModel = LatticeModel_T( omega, lbm::force_model::SimpleConstant( Vector3<real_t> ( setup.extForce, 0, 0 ) ) );
// add PDF field ( uInit = <0,0,0>, rhoInit = 1 )
BlockDataID pdfFieldID = lbm::addPdfFieldToStorage< LatticeModel_T >( blocks, "pdf field (zyxf)", latticeModel,
......
......@@ -76,14 +76,13 @@ namespace segre_silberberg_psm
using namespace walberla;
using walberla::uint_t;
using lbm::force_model::SimpleConstant;
//////////////
// TYPEDEFS //
//////////////
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::SRT, false, SimpleConstant > LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::SRT, false, lbm::force_model::SimpleConstant > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......@@ -532,7 +531,7 @@ int main( int argc, char **argv )
////////////////////////
// create the lattice model
LatticeModel_T latticeModel = LatticeModel_T( omega, SimpleConstant( Vector3<real_t> ( setup.forcing, real_c(0), real_c(0) ) ) );
LatticeModel_T latticeModel = LatticeModel_T( omega, lbm::force_model::SimpleConstant( Vector3<real_t> ( setup.forcing, real_c(0), real_c(0) ) ) );
// add PDF field
BlockDataID pdfFieldID = lbm::addPdfFieldToStorage< LatticeModel_T >( blocks, "pdf field (zyxf)", latticeModel,
......
......@@ -75,7 +75,7 @@ using namespace walberla;
using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::SRT, false, lbm::force_model::None, 1> LatticeModel_T;
typedef lbm::D3Q19< lbm::collision_model::SRT, false > LatticeModel_T;
using Stencil_T = LatticeModel_T::Stencil;
using PdfField_T = lbm::PdfField<LatticeModel_T>;
......
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