From 0a64777ddc063d9b3f4abd68383e4ef998977bb7 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Fri, 30 Aug 2019 17:00:26 +0200
Subject: Adapt examples to new material interface

---
 ldc_2d_benchmark.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'ldc_2d_benchmark.py')

diff --git a/ldc_2d_benchmark.py b/ldc_2d_benchmark.py
index df697ea..88041b8 100644
--- a/ldc_2d_benchmark.py
+++ b/ldc_2d_benchmark.py
@@ -15,13 +15,13 @@ relaxation_time = 0.52
 def MLUPS(cells, steps, time):
     return cells * steps / time * 1e-6
 
-def cavity(geometry, x, y):
-    if x == 1 or y == 1 or x == geometry.size_x-2:
-        return 2
-    elif y == geometry.size_y-2:
-        return 3
-    else:
-        return 1
+def get_cavity_material_map(geometry):
+    return [
+        (lambda x, y: x > 0 and x < geometry.size_x-1 and y > 0 and y < geometry.size_y-1,  1), # bulk fluid
+        (lambda x, y: x == 1 or y == 1 or x == geometry.size_x-2,                           2), # left, right, bottom walls
+        (lambda x, y: y == geometry.size_y-2,                                               3), # lid
+        (lambda x, y: x == 0 or x == geometry.size_x-1 or y == 0 or y == geometry.size_y-1, 0)  # ghost cells
+    ]
 
 boundary = Template("""
     if ( m == 2 ) {
@@ -89,7 +89,9 @@ for size, layout, precision, opti, align in base_2_configs + align_configs + pad
         moments = lbm.moments(optimize = opti),
         collide = lbm.bgk(f_eq = lbm.equilibrium(), tau = relaxation_time, optimize = opti),
         boundary_src = boundary)
-    lattice.setup_geometry(cavity)
+    lattice.apply_material_map(
+        get_cavity_material_map(lattice.geometry))
+    lattice.sync_material()
 
     nUpdates = 500
     nStat = 100
-- 
cgit v1.2.3