diff options
12 files changed, 14 insertions, 14 deletions
diff --git a/boltzgen/kernel/template/bounce_back_boundary.cl.mako b/boltzgen/kernel/template/bounce_back_boundary.cl.mako index 7e87a94..e1e7e02 100644 --- a/boltzgen/kernel/template/bounce_back_boundary.cl.mako +++ b/boltzgen/kernel/template/bounce_back_boundary.cl.mako @@ -4,7 +4,7 @@ import sympy subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True)) %> -<%call expr="pattern.operator_ab('bounce_back_boundary')"> +<%call expr="pattern.operator('bounce_back_boundary')"> % for i, expr in enumerate(subexpr): const ${float_type} ${expr[0]} = ${sympy.ccode(expr[1])}; % endfor diff --git a/boltzgen/kernel/template/bounce_back_boundary.cpp.mako b/boltzgen/kernel/template/bounce_back_boundary.cpp.mako index a53184e..ed146be 100644 --- a/boltzgen/kernel/template/bounce_back_boundary.cpp.mako +++ b/boltzgen/kernel/template/bounce_back_boundary.cpp.mako @@ -4,7 +4,7 @@ import sympy subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True)) %> -<%call expr="pattern.operator_ab('bounce_back_boundary')"> +<%call expr="pattern.operator('bounce_back_boundary')"> % for i, expr in enumerate(subexpr): const ${float_type} ${expr[0]} = ${sympy.ccode(expr[1])}; % endfor diff --git a/boltzgen/kernel/template/collect_moments.cl.mako b/boltzgen/kernel/template/collect_moments.cl.mako index 8adf295..2b5bf69 100644 --- a/boltzgen/kernel/template/collect_moments.cl.mako +++ b/boltzgen/kernel/template/collect_moments.cl.mako @@ -4,7 +4,7 @@ import sympy moments_subexpr, moments_assignment = model.moments() %> -<%call expr="pattern.functor_ab('collect_moments', [('__global %s*' % float_type, 'm')])"> +<%call expr="pattern.functor('collect_moments', [('__global %s*' % float_type, 'm')])"> % for i, expr in enumerate(moments_subexpr): const ${float_type} ${expr[0]} = ${sympy.ccode(expr[1])}; % endfor diff --git a/boltzgen/kernel/template/collect_moments.cpp.mako b/boltzgen/kernel/template/collect_moments.cpp.mako index 570cf92..80892fc 100644 --- a/boltzgen/kernel/template/collect_moments.cpp.mako +++ b/boltzgen/kernel/template/collect_moments.cpp.mako @@ -4,7 +4,7 @@ import sympy moments_subexpr, moments_assignment = model.moments() %> -<%call expr="pattern.functor_ab('collect_moments', [('%s&' % float_type, 'rho'), (float_type, 'u[%d]' % descriptor.d)])"> +<%call expr="pattern.functor('collect_moments', [('%s&' % float_type, 'rho'), (float_type, 'u[%d]' % descriptor.d)])"> % for i, expr in enumerate(moments_subexpr): const ${float_type} ${expr[0]} = ${sympy.ccode(expr[1])}; % endfor diff --git a/boltzgen/kernel/template/collide_and_stream.cl.mako b/boltzgen/kernel/template/collide_and_stream.cl.mako index e0c1c7f..3718ae7 100644 --- a/boltzgen/kernel/template/collide_and_stream.cl.mako +++ b/boltzgen/kernel/template/collide_and_stream.cl.mako @@ -4,7 +4,7 @@ import sympy subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True)) %> -<%call expr="pattern.operator_ab('collide_and_stream')"> +<%call expr="pattern.operator('collide_and_stream')"> % for i, expr in enumerate(subexpr): const ${float_type} ${expr[0]} = ${sympy.ccode(expr[1])}; % endfor diff --git a/boltzgen/kernel/template/collide_and_stream.cpp.mako b/boltzgen/kernel/template/collide_and_stream.cpp.mako index dec009f..9f4c1e6 100644 --- a/boltzgen/kernel/template/collide_and_stream.cpp.mako +++ b/boltzgen/kernel/template/collide_and_stream.cpp.mako @@ -4,7 +4,7 @@ import sympy subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True)) %> -<%call expr="pattern.operator_ab('collide_and_stream')"> +<%call expr="pattern.operator('collide_and_stream')"> % for i, expr in enumerate(subexpr): const ${float_type} ${expr[0]} = ${sympy.ccode(expr[1])}; % endfor diff --git a/boltzgen/kernel/template/equilibrilize.cl.mako b/boltzgen/kernel/template/equilibrilize.cl.mako index ba01712..3ffa39e 100644 --- a/boltzgen/kernel/template/equilibrilize.cl.mako +++ b/boltzgen/kernel/template/equilibrilize.cl.mako @@ -1,6 +1,6 @@ <%namespace name="pattern" file="${'/pattern/%s.cl.mako' % context['streaming']}"/> -<%call expr="pattern.operator_ab('equilibrilize')"> +<%call expr="pattern.operator('equilibrilize')"> % for i, w_i in enumerate(descriptor.w): ${float_type} f_next_${i} = ${w_i.evalf()}; % endfor diff --git a/boltzgen/kernel/template/equilibrilize.cpp.mako b/boltzgen/kernel/template/equilibrilize.cpp.mako index b7d6cde..74a6aa1 100644 --- a/boltzgen/kernel/template/equilibrilize.cpp.mako +++ b/boltzgen/kernel/template/equilibrilize.cpp.mako @@ -1,6 +1,6 @@ <%namespace name="pattern" file="${'/pattern/%s.cpp.mako' % context['streaming']}"/> -<%call expr="pattern.operator_ab('equilibrilize')"> +<%call expr="pattern.operator('equilibrilize')"> % for i, w_i in enumerate(descriptor.w): ${float_type} f_next_${i} = ${w_i.evalf()}; % endfor diff --git a/boltzgen/kernel/template/momenta_boundary.cl.mako b/boltzgen/kernel/template/momenta_boundary.cl.mako index 9b41a70..f22d950 100644 --- a/boltzgen/kernel/template/momenta_boundary.cl.mako +++ b/boltzgen/kernel/template/momenta_boundary.cl.mako @@ -6,7 +6,7 @@ collision_subexpr, collision_assignment = model.collision(f_eq = model.equilibri %> <%def name="momenta_boundary(name, params)"> -<%call expr="pattern.operator_ab('%s_momenta_boundary' % name, params)"> +<%call expr="pattern.operator('%s_momenta_boundary' % name, params)"> % for i, expr in enumerate(moments_subexpr): const ${float_type} ${expr[0]} = ${sympy.ccode(expr[1])}; % endfor diff --git a/boltzgen/kernel/template/momenta_boundary.cpp.mako b/boltzgen/kernel/template/momenta_boundary.cpp.mako index bea6cc1..48b0fa5 100644 --- a/boltzgen/kernel/template/momenta_boundary.cpp.mako +++ b/boltzgen/kernel/template/momenta_boundary.cpp.mako @@ -6,7 +6,7 @@ collision_subexpr, collision_assignment = model.collision(f_eq = model.equilibri %> <%def name="momenta_boundary(name, params)"> -<%call expr="pattern.operator_ab('%s_momenta_boundary' % name, params)"> +<%call expr="pattern.operator('%s_momenta_boundary' % name, params)"> % for i, expr in enumerate(moments_subexpr): const ${float_type} ${expr[0]} = ${sympy.ccode(expr[1])}; % endfor diff --git a/boltzgen/kernel/template/pattern/AB.cl.mako b/boltzgen/kernel/template/pattern/AB.cl.mako index c6391fa..d2d8b8a 100644 --- a/boltzgen/kernel/template/pattern/AB.cl.mako +++ b/boltzgen/kernel/template/pattern/AB.cl.mako @@ -1,4 +1,4 @@ -<%def name="operator_ab(name, params = None)"> +<%def name="operator(name, params = None)"> __kernel void ${name}( __global ${float_type}* f_next , __global ${float_type}* f_prev @@ -48,7 +48,7 @@ __kernel void ${name}_cells( % endif </%def> -<%def name="functor_ab(name, params = None)"> +<%def name="functor(name, params = None)"> __kernel void ${name}( __global ${float_type}* f , unsigned int gid diff --git a/boltzgen/kernel/template/pattern/AB.cpp.mako b/boltzgen/kernel/template/pattern/AB.cpp.mako index ced8524..380c4d5 100644 --- a/boltzgen/kernel/template/pattern/AB.cpp.mako +++ b/boltzgen/kernel/template/pattern/AB.cpp.mako @@ -1,4 +1,4 @@ -<%def name="operator_ab(name, params = None)"> +<%def name="operator(name, params = None)"> void ${name}( ${float_type}* f_next , const ${float_type}* f_prev @@ -24,7 +24,7 @@ void ${name}( } </%def> -<%def name="functor_ab(name, params = None)"> +<%def name="functor(name, params = None)"> void ${name}( const ${float_type}* f , std::size_t gid |