Skip to content
Snippets Groups Projects
Commit 790b8aa0 authored by Christoph Rettinger's avatar Christoph Rettinger
Browse files

Added asserts to coupling boundary conditions and added compressibility to higher order ones

parent f4d9d851
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/pe_coupling/momentum_exchange_method/boundary/CurvedLinear.h
+ 21
− 7
View file @ 790b8aa0
......@@ -64,8 +64,6 @@ namespace pe_coupling {
template< typename LatticeModel_T, typename FlagField_T >
class CurvedLinear : public Boundary< typename FlagField_T::flag_t >
{
static_assert( LatticeModel_T::compressible == false, "Only works with incompressible models!" );
typedef lbm::PdfField< LatticeModel_T > PDFField_T;
typedef typename LatticeModel_T::Stencil Stencil_T;
typedef typename FlagField_T::flag_t flag_t;
......@@ -170,6 +168,9 @@ inline void CurvedLinear< LatticeModel_T, FlagField_T >::treatDirection( const c
// depending on the implementation for the specific body, either an analytical formula (e.g. for the sphere) or a line search algorithm is used
real_t delta = lbm::intersectionRatio( body, cellCenter, direction, tolerance );
WALBERLA_ASSERT_LESS_EQUAL( delta, real_t(1));
WALBERLA_ASSERT_GREATER_EQUAL( delta, real_t(0));
real_t pdf_new = real_t(0);
real_t alpha = real_t(0);
......@@ -178,7 +179,7 @@ inline void CurvedLinear< LatticeModel_T, FlagField_T >::treatDirection( const c
const cell_idx_t yff = y - cell_idx_c( stencil::cy[ dir ] );
const cell_idx_t zff = z - cell_idx_c( stencil::cz[ dir ] );
// check if this cell is a valid (i.e. fluid) cell
// check if CLI can be applied, i.e. the further-away-cell has to be a valid (i.e. fluid) cell
if( flagField_->isPartOfMaskSet( xff, yff, zff, domainMask_ ) )
{
// apply CLI scheme
......@@ -211,9 +212,21 @@ inline void CurvedLinear< LatticeModel_T, FlagField_T >::treatDirection( const c
auto boundaryVelocity = body.velFromWF( boundaryPosition );
// include effect of boundary velocity
pdf_new -= real_c(3.0) * alpha * LatticeModel_T::w[ Stencil_T::idx[dir] ] * ( real_c( stencil::cx[ dir ] ) * boundaryVelocity[0] +
real_c( stencil::cy[ dir ] ) * boundaryVelocity[1] +
real_c( stencil::cz[ dir ] ) * boundaryVelocity[2] );
if( LatticeModel_T::compressible )
{
const auto density = pdfField_->getDensity(x,y,z);
pdf_new -= real_c(3.0) * alpha * density * LatticeModel_T::w[ Stencil_T::idx[dir] ] *
( real_c( stencil::cx[ dir ] ) * boundaryVelocity[0] +
real_c( stencil::cy[ dir ] ) * boundaryVelocity[1] +
real_c( stencil::cz[ dir ] ) * boundaryVelocity[2] );
}
else
{
pdf_new -= real_c(3.0) * alpha * LatticeModel_T::w[ Stencil_T::idx[dir] ] *
( real_c( stencil::cx[ dir ] ) * boundaryVelocity[0] +
real_c( stencil::cy[ dir ] ) * boundaryVelocity[1] +
real_c( stencil::cz[ dir ] ) * boundaryVelocity[2] );
}
// carry out the boundary handling
pdfField_->get( nx, ny, nz, Stencil_T::invDirIdx(dir) ) = pdf_new;
......@@ -246,6 +259,7 @@ inline void CurvedLinear< LatticeModel_T, FlagField_T >::treatDirection( const c
// add the force onto the body at the obstacle boundary
body.addForceAtPos( force, boundaryPosition );
/*
WALBERLA_LOG_DETAIL_SECTION() {
std::stringstream ss;
ss << "MOBoundary in cell <" << x << ", " << y << ", " << z << "> in dir <"
......@@ -255,7 +269,7 @@ inline void CurvedLinear< LatticeModel_T, FlagField_T >::treatDirection( const c
<< ", with pdf_old=" << pdf_old << ", pdf_new=" << pdf_new;
WALBERLA_LOG_DETAIL( ss.str() );
}
*/
}
} // namespace pe_coupling
......
src/pe_coupling/momentum_exchange_method/boundary/CurvedQuadratic.h
+ 21
− 6
View file @ 790b8aa0
......@@ -73,7 +73,6 @@ template< typename LatticeModel_T, typename FlagField_T >
class CurvedQuadratic : public Boundary< typename FlagField_T::flag_t >
{
static_assert( (boost::is_same< typename LatticeModel_T::CollisionModel::tag, lbm::collision_model::TRT_tag >::value), "Only works with TRT!" ); // to access lambda_d
static_assert( LatticeModel_T::compressible == false, "Only works with incompressible models!" );
typedef lbm::PdfField< LatticeModel_T > PDFField_T;
typedef typename LatticeModel_T::Stencil Stencil_T;
......@@ -185,6 +184,9 @@ inline void CurvedQuadratic< LatticeModel_T, FlagField_T >::treatDirection( cons
// depending on the implementation for the specific body, either an analytical formula (e.g. for the sphere) or a line search algorithm is used
const real_t delta = lbm::intersectionRatio( body, cellCenter, direction, tolerance );
WALBERLA_ASSERT_LESS_EQUAL( delta, real_t(1));
WALBERLA_ASSERT_GREATER_EQUAL( delta, real_t(0));
bool useMR1full = false;
real_t pdf_new = real_c(0);
......@@ -197,7 +199,7 @@ inline void CurvedQuadratic< LatticeModel_T, FlagField_T >::treatDirection( cons
auto domainWithGhostlayer = pdfField_->xyzSizeWithGhostLayer();
// check if this cell is a valid (i.e. fluid) cell
// check if MR can be applied, i.e. the further-away-cell has to be a valid (i.e. fluid) cell
if( flagField_->isPartOfMaskSet( xff, yff, zff, domainMask_ ) )
{
// MR1 scheme can be applied
......@@ -320,9 +322,21 @@ inline void CurvedQuadratic< LatticeModel_T, FlagField_T >::treatDirection( cons
auto boundaryVelocity = body.velFromWF( boundaryPosition );
// include effect of boundary velocity
pdf_new -= real_c(3.0) * alpha * LatticeModel_T::w[ Stencil_T::idx[dir] ] * ( real_c( stencil::cx[ dir ] ) * boundaryVelocity[0] +
real_c( stencil::cy[ dir ] ) * boundaryVelocity[1] +
real_c( stencil::cz[ dir ] ) * boundaryVelocity[2] );
if( LatticeModel_T::compressible )
{
const auto density = pdfField_->getDensity(x,y,z);
pdf_new -= real_c(3.0) * alpha * density * LatticeModel_T::w[ Stencil_T::idx[dir] ] *
( real_c( stencil::cx[ dir ] ) * boundaryVelocity[0] +
real_c( stencil::cy[ dir ] ) * boundaryVelocity[1] +
real_c( stencil::cz[ dir ] ) * boundaryVelocity[2] );
}
else
{
pdf_new -= real_c(3.0) * alpha * LatticeModel_T::w[ Stencil_T::idx[dir] ] *
( real_c( stencil::cx[ dir ] ) * boundaryVelocity[0] +
real_c( stencil::cy[ dir ] ) * boundaryVelocity[1] +
real_c( stencil::cz[ dir ] ) * boundaryVelocity[2] );
}
// carry out the boundary handling
pdfField_->get( nx, ny, nz, Stencil_T::invDirIdx(dir) ) = pdf_new;
......@@ -355,6 +369,7 @@ inline void CurvedQuadratic< LatticeModel_T, FlagField_T >::treatDirection( cons
// add the force onto the body at the obstacle boundary
body.addForceAtPos( force, boundaryPosition );
/*
WALBERLA_LOG_DETAIL_SECTION() {
std::stringstream ss;
ss << "MOBoundary in cell <" << x << ", " << y << ", " << z << "> in dir <"
......@@ -364,7 +379,7 @@ inline void CurvedQuadratic< LatticeModel_T, FlagField_T >::treatDirection( cons
<< ", with pdf_old=" << pdf_old << ", pdf_new=" << pdf_new;
WALBERLA_LOG_DETAIL( ss.str() );
}
*/
}
} // namespace pe_coupling
......
src/pe_coupling/momentum_exchange_method/boundary/SimpleBB.h
+ 2
− 1
View file @ 790b8aa0
......@@ -217,7 +217,7 @@ inline void SimpleBB< LatticeModel_T, FlagField_T >::treatDirection( const cell_
// add the force onto the body at the obstacle boundary
body.addForceAtPos( force, boundaryPosition );
/*
WALBERLA_LOG_DETAIL_SECTION() {
std::stringstream ss;
ss << "MOBoundary in cell <" << x << ", " << y << ", " << z << "> in dir <"
......@@ -227,6 +227,7 @@ inline void SimpleBB< LatticeModel_T, FlagField_T >::treatDirection( const cell_
<< ", with pdf_old=" << pdf_old << ", pdf_new=" << pdf_new;
WALBERLA_LOG_DETAIL( ss.str() );
}
*/
}
} // namespace pe_coupling
......
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