diff --git a/src/walberla_bridge/src/lattice_boltzmann/LBWalberlaImpl.hpp b/src/walberla_bridge/src/lattice_boltzmann/LBWalberlaImpl.hpp index 346614465a..e51117d239 100644 --- a/src/walberla_bridge/src/lattice_boltzmann/LBWalberlaImpl.hpp +++ b/src/walberla_bridge/src/lattice_boltzmann/LBWalberlaImpl.hpp @@ -457,7 +457,6 @@ class LBWalberlaImpl : public LBWalberlaBase { void integrate_pull_scheme() { auto const &blocks = get_lattice().get_blocks(); - integrate_reset_force(blocks); // Handle boundaries integrate_boundaries(blocks); // LB stream @@ -465,6 +464,7 @@ class LBWalberlaImpl : public LBWalberlaBase { // LB collide integrate_collide(blocks); // Refresh ghost layers + integrate_reset_force(blocks); ghost_communication_pdfs(); } diff --git a/testsuite/python/lb_lees_edwards_particle_coupling.py b/testsuite/python/lb_lees_edwards_particle_coupling.py index fa004de1d6..bae98e1fcd 100644 --- a/testsuite/python/lb_lees_edwards_particle_coupling.py +++ b/testsuite/python/lb_lees_edwards_particle_coupling.py @@ -163,8 +163,6 @@ def lb_node(idx): return lbf[fold_index(idx, lbf.shape)] return unshifted_nodes, shifted_nodes, unshifted_weights, shifted_weights -# print(le_aware_lb_nodes_around_pos(np.array((0.5,9.99999,0)),mock_lbf,0.51,0,1)) -# exit() @utx.skipIfMissingFeatures("WALBERLA") @@ -336,15 +334,9 @@ def test_momentum_conservation(self): system.integrator.run(1) initial_mom = np.copy(system.analysis.linear_momentum()) for i in range(100): - before = (p.pos_folded,p.v,lbf.get_interpolated_velocity(pos=p.pos_folded)) system.integrator.run(1) - after = (p.pos_folded,p.v,lbf.get_interpolated_velocity(pos=p.pos_folded)) np.testing.assert_allclose(-np.copy(p.f), np.copy(np.sum(lbf[:,:,:].last_applied_force,axis=(0,1,2))),atol=1E-9) - print("b", before) - print("a",after) current_mom = np.copy(system.analysis.linear_momentum()) - print("m" ,(initial_mom-current_mom)[1:]) - print() np.testing.assert_allclose(initial_mom[1:], current_mom[1:], atol=2E-7)