Commit 9e66da8f authored by Markus Holzer's avatar Markus Holzer
Browse files

Fix Small problem

parent cb20dcdb
Pipeline #38688 failed with stages
in 27 minutes and 50 seconds
......@@ -43,6 +43,7 @@ delete_loop = """
}}
"""
# the target will enter the jinja filters as string. The reason for that is, that is not easy to work with the
# enum in the template files.
def translate_target(target):
......
......@@ -522,13 +522,13 @@ class GhostLayerField<T, fSize_> : public Field<T, fSize_> {
xs, ys, zs, 1 );
}
void getGhostRegion(stencil::Direction d, CellInterval & ci, cell_idx_t thickness, bool fullSlice ) const
void getGhostRegion(stencil::Direction d, CellInterval & ci, cell_idx_t thickness, bool fullSlice = false ) const
{
ci = field::getGhostRegion( *this, d, thickness, fullSlice );
}
void getSliceBeforeGhostLayer(stencil::Direction d, CellInterval & ci,
cell_idx_t thickness, bool fullSlice ) const
cell_idx_t thickness = 1, bool fullSlice = false ) const
{
ci = field::getSliceBeforeGhostLayer( *this, d, thickness, fullSlice );
}
......@@ -611,7 +611,7 @@ class GhostLayerField<T, fSize_> : public Field<T, fSize_> {
/*!\brief Iterates only over ghost layers of a given direction, only over xyz coordinates, f is fixed
*******************************************************************************************************************/
inline typename GhostLayerField<T,fSize_>::iterator
beginGhostLayerOnlyXYZ( stencil::Direction dir, cell_idx_t f, bool fullSlice = false )
beginGhostLayerOnlyXYZ( stencil::Direction dir, cell_idx_t f = 0, bool fullSlice = false )
{
CellInterval ci;
getGhostRegion( dir, ci, cell_idx_c(gl_) , fullSlice );
......@@ -627,7 +627,7 @@ class GhostLayerField<T, fSize_> : public Field<T, fSize_> {
/*!\brief Const version of beginGhostLayersOnlyXYZ()
*******************************************************************************************************************/
inline typename GhostLayerField<T,fSize_>::const_iterator
beginGhostLayerOnlyXYZ( stencil::Direction dir, cell_idx_t f, bool fullSlice = false ) const
beginGhostLayerOnlyXYZ( stencil::Direction dir, cell_idx_t f = 0, bool fullSlice = false ) const
{
CellInterval ci;
getGhostRegion(dir, ci, cell_idx_c(gl_), fullSlice );
......@@ -641,7 +641,7 @@ class GhostLayerField<T, fSize_> : public Field<T, fSize_> {
/*!\brief Iterates only over ghost layers of a given direction, only over xyz coordinates, f is fixed
*******************************************************************************************************************/
inline typename GhostLayerField<T,fSize_>::iterator
beginGhostLayerOnlyXYZ( uint_t thickness, stencil::Direction dir, cell_idx_t f, bool fullSlice = false )
beginGhostLayerOnlyXYZ( uint_t thickness, stencil::Direction dir, cell_idx_t f = 0, bool fullSlice = false )
{
CellInterval ci;
getGhostRegion( dir, ci, cell_idx_c(thickness) , fullSlice );
......@@ -657,7 +657,7 @@ class GhostLayerField<T, fSize_> : public Field<T, fSize_> {
/*!\brief Const version of beginGhostLayersOnlyXYZ()
*******************************************************************************************************************/
inline typename GhostLayerField<T,fSize_>::const_iterator
beginGhostLayerOnlyXYZ( uint_t thickness, stencil::Direction dir, cell_idx_t f, bool fullSlice = false ) const
beginGhostLayerOnlyXYZ( uint_t thickness, stencil::Direction dir, cell_idx_t f = 0, bool fullSlice = false ) const
{
CellInterval ci;
getGhostRegion(dir, ci, cell_idx_c(thickness), fullSlice );
......
......@@ -108,8 +108,8 @@ MyBoundaryHandling<LatticeModel_T>::operator()( IBlock * const block, const Stru
{
using PdfField_T = lbm::PdfField< LatticeModel_T >;
WALBERLA_ASSERT_NOT_NULLPTR( block );
WALBERLA_ASSERT_NOT_NULLPTR( storage );
WALBERLA_ASSERT_NOT_NULLPTR( block )
WALBERLA_ASSERT_NOT_NULLPTR( storage )
FlagField_T * flagField = block->getData< FlagField_T >( flagField_ );
PdfField_T * pdfField = block->getData< PdfField_T > ( pdfField_ );
......@@ -195,7 +195,8 @@ template< uint_t StencilSize >
void check( const shared_ptr< StructuredBlockForest > & blocks, const ConstBlockDataID & flagFieldId,
const ConstBlockDataID & pdf1, const ConstBlockDataID & pdf2 )
{
typedef GhostLayerField< real_t, StencilSize > Field_T;
// TODO PDF Field is not a child of the old GLF. I would say it is an edge case, however, technically it is API breaking here
using Field_T = GhostLayerField< real_t >;
for( auto block = blocks->begin(); block != blocks->end(); ++block )
{
......@@ -388,8 +389,8 @@ int main( int argc, char ** argv )
WcTimingPool timeloopTiming;
timeloop.run( timeloopTiming );
timeloopTiming.logResultOnRoot();
WALBERLA_MPI_WORLD_BARRIER();
WALBERLA_MPI_WORLD_BARRIER()
check<19>( blocks, flagFieldId1, pdfFieldId1, pdfFieldId2 );
check<27>( blocks, flagFieldId3, pdfFieldId3, pdfFieldId4 );
......
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