Fix stencil

lbmpy_tests/test_fluctuating_lb.py

@@ -262,10 +262,11 @@ def test_point_force(target=Target.CPU):
 @pytest.mark.parametrize('assume_inner_stride_one', (True, False))
 @pytest.mark.parametrize('assume_sufficient_line_padding', (True, False))
 def test_vectorization(data_type, assume_aligned, assume_inner_stride_one, assume_sufficient_line_padding):
-    pdfs, pdfs_tmp = ps.fields(f"pdfs(19), pdfs_tmp(19): {data_type}[3D]", layout='fzyx')
+    stencil = LBStencil(Stencil.D3Q19)
+    pdfs, pdfs_tmp = ps.fields(f"pdfs({stencil.Q}), pdfs_tmp({stencil.Q}): {data_type}[3D]", layout='fzyx')
 
     method = create_mrt_orthogonal(
-        stencil=LBStencil(Stencil.D2Q9),
+        stencil=stencil,
         compressible=True,
         weighted=True,
         relaxation_rates=rr_getter)
@@ -273,7 +274,7 @@ def test_vectorization(data_type, assume_aligned, assume_inner_stride_one, assum
     rng_node = ps.rng.PhiloxTwoDoubles if data_type == "float64" else ps.rng.PhiloxFourFloats
     lbm_config = LBMConfig(lb_method=method, fluctuating={'temperature': sp.Symbol("kT"),
                                                           'rng_node': rng_node,
-                                                          'block_offsets': (0, 0)},
+                                                          'block_offsets': tuple([0] * stencil.D)},
                            compressible=True, zero_centered=False, 
                            stencil=method.stencil, kernel_type='collide_only')
     lbm_opt = LBMOptimisation(cse_global=True, symbolic_field=pdfs, symbolic_temporary_field=pdfs_tmp)
@@ -311,15 +312,16 @@ def test_vectorization(data_type, assume_aligned, assume_inner_stride_one, assum
 @pytest.mark.parametrize('assume_sufficient_line_padding', (True, False))
 def test_fluctuating_lb_issue_188_wlb(data_type, assume_aligned,
                                       assume_inner_stride_one, assume_sufficient_line_padding):
+    stencil = LBStencil(Stencil.D3Q19)
     temperature = sp.symbols("temperature")
-    pdfs, pdfs_tmp = ps.fields(f"pdfs(19), pdfs_tmp(19): {data_type}[3D]", layout='fzyx')
+    pdfs, pdfs_tmp = ps.fields(f"pdfs({stencil.Q}), pdfs_tmp({stencil.Q}): {data_type}[3D]", layout='fzyx')
 
     rng_node = ps.rng.PhiloxTwoDoubles if data_type == "float64" else ps.rng.PhiloxFourFloats
     fluctuating = {'temperature': temperature,
                    'block_offsets': 'walberla',
                    'rng_node': rng_node}
 
-    lbm_config = LBMConfig(stencil=LBStencil(Stencil.D3Q19), method=Method.MRT, compressible=True,
+    lbm_config = LBMConfig(stencil=stencil, method=Method.MRT, compressible=True,
                            weighted=True, zero_centered=False, relaxation_rate=1.4,
                            fluctuating=fluctuating)
     lbm_opt = LBMOptimisation(symbolic_field=pdfs, symbolic_temporary_field=pdfs_tmp, cse_global=True)