final debig

hysop/codegen/kernels/directional_stretching.py

@@ -393,13 +393,14 @@ class DirectionalStretchingKernel(KernelCodeGenerator):
                     i='kji'[i], fval=fval, gsize=gsize,N=N)) as ctx:
                     
                     if i==0:
-                        s.append('{} = {}+{}+{};'.format(global_id[i], 'kji'[i], local_id[0], ghosts))
+                        s.append('{} = {}+{};'.format(global_id[i], 'kji'[i], local_id[0]))
                     else:
                         s.append('{} = {}+{};'.format(global_id[i], 'kji'[i], ghosts))
                     
                     if i==0:
-                        active.declare(s, init='(k < {}+2*{})'.format(
-                            compute_grid_size[0],cache_ghosts()))
+                        active.declare(s, init='({} < {}+2*{})'.format(
+                            global_id[0], compute_grid_size[0], cache_ghosts()))
+                        s.append('{} += {};'.format(global_id[i], ghosts))
                     elif i==1:
                         first.declare(s)
 

hysop/codegen/kernels/tests/test_directional_stretching.py

@@ -17,7 +17,7 @@ class TestDirectionalStretching(object):
         queue = cl.CommandQueue(typegen.context)
         ctx = typegen.context
 
-        grid_size = np.asarray([16,2,2])
+        grid_size = np.asarray([100,10,10])
         compute_grid_ghosts = np.asarray([3*4,0,0])
         compute_grid_size   = grid_size + 2*compute_grid_ghosts
 
@@ -123,8 +123,8 @@ class TestDirectionalStretching(object):
         Lx = min(typegen.device.max_work_item_sizes[0], typegen.device.max_work_group_size)
         Lx = min(Lx, grid_size[0])
 
-        cls.local_work_size = np.asarray([8,1,1])
-        cls.work_load       = np.asarray([1,2,2])
+        cls.local_work_size = np.asarray([Lx/2,1,1])
+        cls.work_load       = np.asarray([1,2,3])
         cls.inv_dx = inv_dx
         cls.dt = dtype(0.5)