diff options
| -rw-r--r-- | README.md | 6 | ||||
| -rwxr-xr-x | boltzgen.py | 2 | ||||
| -rw-r--r-- | boltzgen/kernel/template/collide.cl.mako (renamed from boltzgen/kernel/template/collide_and_stream.cl.mako) | 2 | ||||
| -rw-r--r-- | boltzgen/kernel/template/collide.cpp.mako (renamed from boltzgen/kernel/template/collide_and_stream.cpp.mako) | 2 | ||||
| -rw-r--r-- | boltzgen/kernel/template/collide.cuda.mako (renamed from boltzgen/kernel/template/collide_and_stream.cuda.mako) | 2 |
5 files changed, 7 insertions, 7 deletions
@@ -62,9 +62,9 @@ optional arguments: \ --layout AOS \ --tau 0.52 \ --functions default bounce_back_boundary | tee kernel.h -void collide_and_stream( double* f_next, - const double* f_prev, - std::size_t gid) +void collide(double* f_next, + const double* f_prev, + std::size_t gid) { double* preshifted_f_next = f_next + gid*9; const double* preshifted_f_prev = f_prev + gid*9; diff --git a/boltzgen.py b/boltzgen.py index c2eb297..aebd1fb 100755 --- a/boltzgen.py +++ b/boltzgen.py @@ -53,7 +53,7 @@ functions = sum(args.functions, []) if len(functions) == 0: functions += ['default'] if 'default' in functions: - for f in ['collide_and_stream', 'equilibrilize', 'collect_moments', 'momenta_boundary']: + for f in ['collide', 'equilibrilize', 'collect_moments', 'momenta_boundary']: functions.insert(functions.index('default'), f) functions.remove('default') diff --git a/boltzgen/kernel/template/collide_and_stream.cl.mako b/boltzgen/kernel/template/collide.cl.mako index 3718ae7..51b591a 100644 --- a/boltzgen/kernel/template/collide_and_stream.cl.mako +++ b/boltzgen/kernel/template/collide.cl.mako @@ -4,7 +4,7 @@ import sympy subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True)) %> -<%call expr="pattern.operator('collide_and_stream')"> +<%call expr="pattern.operator('collide')"> % 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.cpp.mako index 9f4c1e6..0ad7123 100644 --- a/boltzgen/kernel/template/collide_and_stream.cpp.mako +++ b/boltzgen/kernel/template/collide.cpp.mako @@ -4,7 +4,7 @@ import sympy subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True)) %> -<%call expr="pattern.operator('collide_and_stream')"> +<%call expr="pattern.operator('collide')"> % 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.cuda.mako b/boltzgen/kernel/template/collide.cuda.mako index b46cf0f..081beaa 100644 --- a/boltzgen/kernel/template/collide_and_stream.cuda.mako +++ b/boltzgen/kernel/template/collide.cuda.mako @@ -6,7 +6,7 @@ subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = %> -<%call expr="pattern.operator('collide_and_stream')"> +<%call expr="pattern.operator('collide')"> % for i, expr in enumerate(subexpr): const ${float_type} ${expr[0]} = ${ccode(expr[1])}; % endfor |