avoid custom ubb

CMakeLists.txt

@@ -421,6 +421,15 @@ else()
   endfunction()
 endif()
 
+# mpiexec argument to disable pinning of processes to cores. Used in test suite
+# as several tests are run at the same time.
+if(NOT APPLE)
+  set(ESPRESSO_MPIEXEC_DONT_PIN --bind-to none)
+else()
+  # not supported on Apple
+  set(ESPRESSO_MPIEXEC_DONT_PIN "")
+endif()
+
 #
 # Boost
 #

maintainer/walberla_kernels/generate_lb_kernels.py

@@ -218,7 +218,7 @@ def paramlist(parameters, keys):
                 f.write(content)
 
     # boundary conditions
-    ubb_dynamic = lbmpy_espresso.UBB(
+    ubb_dynamic = lbmpy.boundaries.UBB(
         lambda *args: None, dim=3, data_type=config.data_type.default_factory())
     ubb_data_handler = lbmpy_espresso.BounceBackSlipVelocityUBB(
         method.stencil, ubb_dynamic)
@@ -227,7 +227,7 @@ def paramlist(parameters, keys):
         lbmpy_walberla.generate_boundary(
             ctx, f"Dynamic_UBB_{precision_suffix}{target_suffix}", ubb_dynamic,
             method, additional_data_handler=ubb_data_handler,
-            streaming_pattern=streaming_pattern, target=target)
+            streaming_pattern="pull", target=target)
 
         with open(f"Dynamic_UBB_{precision_suffix}{target_suffix}.h", "r+") as f:
             content = f.read()

maintainer/walberla_kernels/lbmpy_espresso.py

@@ -17,10 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import pystencils as ps
-
-import lbmpy.boundaries
-import lbmpy.custom_code_nodes
 
 import lbmpy_walberla.additional_data_handler
 
@@ -53,34 +49,3 @@ def data_initialisation(self, direction):
             "element.vel_2 = InitialisationAdditionalData[2];",
         ]
         return "\n".join(code)
-
-
-class UBB(lbmpy.boundaries.UBB):
-    '''
-    Velocity bounce back boundary condition, enforcing specified velocity at
-    obstacle. This is a patched version of ``lbmpy.boundaries.UBB``, which
-    currently doesn't support the bounce back scheme we need.
-    '''
-
-    def __call__(self, f_out, f_in, dir_symbol,
-                 inv_dir, lb_method, index_field):
-        '''
-        Modify the assignments such that the source and target pdfs are swapped.
-        '''
-        assignments = super().__call__(
-            f_out, f_in, dir_symbol, inv_dir, lb_method, index_field)
-
-        assert len(assignments) > 0
-
-        out = []
-        if len(assignments) > 1:
-            out.extend(assignments[:-1])
-
-        neighbor_offset = lbmpy.custom_code_nodes.NeighbourOffsetArrays.neighbour_offset(
-            dir_symbol, lb_method.stencil)
-
-        assignment = assignments[-1]
-        assert assignment.lhs.field == f_in
-        out.append(ps.Assignment(assignment.lhs.get_shifted(*neighbor_offset),
-                                 assignment.rhs - f_out(dir_symbol) + f_in(dir_symbol)))
-        return out

src/walberla_bridge/src/lattice_boltzmann/generated_kernels/CollideSweepDoublePrecisionLeesEdwards.h

@@ -19,7 +19,7 @@
 
 // kernel generated with pystencils v1.3.3, lbmpy v1.3.3,
 // lbmpy_walberla/pystencils_walberla from waLBerla commit
-// b0842e1a493ce19ef1bbb8d2cf382fc343970a7f
+// 04f4adbdfc0af983e2d9b72e244d775f37d77034
 
 #pragma once
 #include "core/DataTypes.h"

src/walberla_bridge/src/lattice_boltzmann/generated_kernels/CollideSweepDoublePrecisionLeesEdwardsAVX.h

@@ -19,7 +19,7 @@
 
 // kernel generated with pystencils v1.3.3, lbmpy v1.3.3,
 // lbmpy_walberla/pystencils_walberla from waLBerla commit
-// b0842e1a493ce19ef1bbb8d2cf382fc343970a7f
+// 04f4adbdfc0af983e2d9b72e244d775f37d77034
 
 #pragma once
 #include "core/DataTypes.h"

src/walberla_bridge/src/lattice_boltzmann/generated_kernels/CollideSweepDoublePrecisionLeesEdwardsCUDA.h

@@ -19,7 +19,7 @@
 
 // kernel generated with pystencils v1.3.3, lbmpy v1.3.3,
 // lbmpy_walberla/pystencils_walberla from waLBerla commit
-// b0842e1a493ce19ef1bbb8d2cf382fc343970a7f
+// 04f4adbdfc0af983e2d9b72e244d775f37d77034
 
 #pragma once
 #include "core/DataTypes.h"

src/walberla_bridge/src/lattice_boltzmann/generated_kernels/CollideSweepDoublePrecisionThermalized.h

@@ -19,7 +19,7 @@
 
 // kernel generated with pystencils v1.3.3, lbmpy v1.3.3,
 // lbmpy_walberla/pystencils_walberla from waLBerla commit
-// b0842e1a493ce19ef1bbb8d2cf382fc343970a7f
+// 04f4adbdfc0af983e2d9b72e244d775f37d77034
 
 #pragma once
 #include "core/DataTypes.h"

src/walberla_bridge/src/lattice_boltzmann/generated_kernels/CollideSweepDoublePrecisionThermalizedAVX.h

@@ -19,7 +19,7 @@
 
 // kernel generated with pystencils v1.3.3, lbmpy v1.3.3,
 // lbmpy_walberla/pystencils_walberla from waLBerla commit
-// b0842e1a493ce19ef1bbb8d2cf382fc343970a7f
+// 04f4adbdfc0af983e2d9b72e244d775f37d77034
 
 #pragma once
 #include "core/DataTypes.h"

src/walberla_bridge/src/lattice_boltzmann/generated_kernels/CollideSweepDoublePrecisionThermalizedCUDA.h

@@ -19,7 +19,7 @@
 
 // kernel generated with pystencils v1.3.3, lbmpy v1.3.3,
 // lbmpy_walberla/pystencils_walberla from waLBerla commit
-// b0842e1a493ce19ef1bbb8d2cf382fc343970a7f
+// 04f4adbdfc0af983e2d9b72e244d775f37d77034
 
 #pragma once
 #include "core/DataTypes.h"

src/walberla_bridge/src/lattice_boltzmann/generated_kernels/CollideSweepSinglePrecisionLeesEdwards.h

@@ -19,7 +19,7 @@
 
 // kernel generated with pystencils v1.3.3, lbmpy v1.3.3,
 // lbmpy_walberla/pystencils_walberla from waLBerla commit
-// b0842e1a493ce19ef1bbb8d2cf382fc343970a7f
+// 04f4adbdfc0af983e2d9b72e244d775f37d77034
 
 #pragma once
 #include "core/DataTypes.h"

src/walberla_bridge/src/lattice_boltzmann/generated_kernels/CollideSweepSinglePrecisionLeesEdwardsAVX.h

@@ -19,7 +19,7 @@
 
 // kernel generated with pystencils v1.3.3, lbmpy v1.3.3,
 // lbmpy_walberla/pystencils_walberla from waLBerla commit
-// b0842e1a493ce19ef1bbb8d2cf382fc343970a7f
+// 04f4adbdfc0af983e2d9b72e244d775f37d77034
 
 #pragma once
 #include "core/DataTypes.h"