diff --git a/src/pystencils_autodiff/wald_und_wiesen_simulation.py b/src/pystencils_autodiff/simulation.py similarity index 98% rename from src/pystencils_autodiff/wald_und_wiesen_simulation.py rename to src/pystencils_autodiff/simulation.py index 72f50881e66bec00a42dfa2d371504e34b58e033..9cc7c682eb8ff00208bc171e3a2a4f34c07b2dfd 100644 --- a/src/pystencils_autodiff/wald_und_wiesen_simulation.py +++ b/src/pystencils_autodiff/simulation.py @@ -22,7 +22,7 @@ from pystencils_autodiff.walberla import ( SweepCreation, SweepOverAllBlocks, UniformBlockforestFromConfig, WalberlaMain, WalberlaModule) -class WaldUndWiesenSimulation(): +class Simulation(): def _get_sweep_class_name(prefix='Kernel'): ctr = 0 @@ -46,7 +46,7 @@ class WaldUndWiesenSimulation(): self._boundary_handling = boundary_handling self._lb_model_name = 'GeneratedLatticeModel' self._flag_field_dtype = 'uint32_t' - self._kernel_class_generator = WaldUndWiesenSimulation._get_sweep_class_name() + self._kernel_class_generator = Simulation._get_sweep_class_name() self._with_gui = False self._with_gui_default = False self._boundary_kernels = {} diff --git a/tests/test_walberla.py b/tests/test_walberla.py index 13e5c8d041e160a16ecfc38e9906e163b28dbdba..d0bbd43d5fc22f8fdabb5af7040d8228f864bb52 100644 --- a/tests/test_walberla.py +++ b/tests/test_walberla.py @@ -21,7 +21,7 @@ from pystencils_autodiff.graph_datahandling import GraphDataHandling from pystencils_autodiff.walberla import ( DefinitionsHeader, FieldAllocation, FlagFieldAllocation, GetParameter, ResolveUndefinedSymbols, UniformBlockforestFromConfig, WalberlaMain, WalberlaModule) -from pystencils_autodiff.wald_und_wiesen_simulation import WaldUndWiesenSimulation +from pystencils_autodiff.wald_und_wiesen_simulation import Simulation from pystencils_walberla.cmake_integration import ManualCodeGenerationContext @@ -66,7 +66,7 @@ def test_wald_wiesen_simulation(): dh.add_arrays('x, y') dh.add_arrays('w, z', gpu=True) - sim = WaldUndWiesenSimulation(dh, ctx) + sim = Simulation(dh, ctx) print(sim._create_module()) @@ -82,7 +82,7 @@ def test_wald_wiesen_lbm(): del lbm_step.data_handling.gpu_arrays.ldc_pdf_tmp - sim = WaldUndWiesenSimulation(lbm_step.data_handling, + sim = Simulation(lbm_step.data_handling, ctx, lbm_step.boundary_handling, create_lb_collision_rule(lbm_step.method, optimization=opt_params))