Skip to content
Snippets Groups Projects
Commit f9723112 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'leap-method-builder' into 'master'

Track leap Method->MethodBuilder change

See merge request !46
parents eee015be 0e4254b6
No related branches found
No related tags found
No related merge requests found
...@@ -52,7 +52,7 @@ from pymbolic.mapper.evaluator import EvaluationMapper \ ...@@ -52,7 +52,7 @@ from pymbolic.mapper.evaluator import EvaluationMapper \
from pytools import memoize from pytools import memoize
from grudge import sym, bind, DGDiscretizationWithBoundaries from grudge import sym, bind, DGDiscretizationWithBoundaries
from leap.rk import LSRK4Method from leap.rk import LSRK4MethodBuilder
from pyopencl.tools import ( # noqa from pyopencl.tools import ( # noqa
pytest_generate_tests_for_pyopencl as pytest_generate_tests) pytest_generate_tests_for_pyopencl as pytest_generate_tests)
...@@ -267,7 +267,7 @@ class RK4TimeStepperBase(object): ...@@ -267,7 +267,7 @@ class RK4TimeStepperBase(object):
def set_up_stepper(self, discr, field_var_name, sym_rhs, num_fields, def set_up_stepper(self, discr, field_var_name, sym_rhs, num_fields,
function_registry=base_function_registry, function_registry=base_function_registry,
exec_mapper_factory=ExecutionMapper): exec_mapper_factory=ExecutionMapper):
dt_method = LSRK4Method(component_id=field_var_name) dt_method = LSRK4MethodBuilder(component_id=field_var_name)
dt_code = dt_method.generate() dt_code = dt_method.generate()
self.field_var_name = field_var_name self.field_var_name = field_var_name
self.state_name = f"input_{field_var_name}" self.state_name = f"input_{field_var_name}"
......
...@@ -29,10 +29,10 @@ import pyopencl as cl ...@@ -29,10 +29,10 @@ import pyopencl as cl
def set_up_rk4(field_var_name, dt, fields, rhs, t_start=0): def set_up_rk4(field_var_name, dt, fields, rhs, t_start=0):
from leap.rk import LSRK4Method from leap.rk import LSRK4MethodBuilder
from dagrt.codegen import PythonCodeGenerator from dagrt.codegen import PythonCodeGenerator
dt_method = LSRK4Method(component_id=field_var_name) dt_method = LSRK4MethodBuilder(component_id=field_var_name)
dt_code = dt_method.generate() dt_code = dt_method.generate()
dt_stepper_class = PythonCodeGenerator("TimeStep").get_class(dt_code) dt_stepper_class = PythonCodeGenerator("TimeStep").get_class(dt_code)
dt_stepper = dt_stepper_class({"<func>"+dt_method.component_id: rhs}) dt_stepper = dt_stepper_class({"<func>"+dt_method.component_id: rhs})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment