Skip to content
Snippets Groups Projects
Commit c37d7827 authored by Martin Bauer's avatar Martin Bauer
Browse files

Merge branch 'master' into 'master'

bugfixes and extensions for free_surface support

See merge request !3
parents 3e3ed84c 41c2a8b9
Branches
No related merge requests found
This diff is collapsed.
...@@ -42,6 +42,13 @@ ...@@ -42,6 +42,13 @@
namespace walberla { namespace walberla {
namespace lbm { namespace lbm {
template< typename LM_AdvDiff, typename VelocityAdapter_T, typename FlagField_T, typename VectorField_T, class Enable = void >
class AdvectionDiffusionSweep
{
static_assert(never_true<LM_AdvDiff>::value, "Instantiating 'lbm::AdvectionDiffusionSweep' failed");
};
template< typename LM_AdvDiff, typename VelocityAdapter_T, typename FlagField_T, typename VectorField_T > template< typename LM_AdvDiff, typename VelocityAdapter_T, typename FlagField_T, typename VectorField_T >
class AdvectionDiffusionSweep< LM_AdvDiff, VelocityAdapter_T, FlagField_T, VectorField_T, class AdvectionDiffusionSweep< LM_AdvDiff, VelocityAdapter_T, FlagField_T, VectorField_T,
......
...@@ -95,18 +95,18 @@ int main( int argc, char ** argv ) ...@@ -95,18 +95,18 @@ int main( int argc, char ** argv )
auto vec3Field = blockIt->getData<GhostLayerField<Vector3<int>,1 > >( vec3FieldID ); auto vec3Field = blockIt->getData<GhostLayerField<Vector3<int>,1 > >( vec3FieldID );
{ {
forAllCells2(scaIt, sca2Field, vecIt, vec2Field) { WALBERLA_FOR_ALL_CELLS(scaIt, sca2Field, vecIt, vec2Field,
WALBERLA_ASSERT_EQUAL(scaIt[0], (*vecIt)[0]); WALBERLA_ASSERT_EQUAL(scaIt[0], (*vecIt)[0]);
WALBERLA_ASSERT_EQUAL(scaIt[1], (*vecIt)[1]); WALBERLA_ASSERT_EQUAL(scaIt[1], (*vecIt)[1]);
} )
} }
{ {
forAllCells2(scaIt, sca3Field, vecIt, vec3Field) { WALBERLA_FOR_ALL_CELLS(scaIt, sca3Field, vecIt, vec3Field,
WALBERLA_ASSERT_EQUAL(scaIt[0], (*vecIt)[0]); WALBERLA_ASSERT_EQUAL(scaIt[0], (*vecIt)[0]);
WALBERLA_ASSERT_EQUAL(scaIt[1], (*vecIt)[1]); WALBERLA_ASSERT_EQUAL(scaIt[1], (*vecIt)[1]);
WALBERLA_ASSERT_EQUAL(scaIt[2], (*vecIt)[2]); WALBERLA_ASSERT_EQUAL(scaIt[2], (*vecIt)[2]);
} )
} }
} }
......
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