From 607fede5c9b3f8e6d70b46174686124cf24ca83c Mon Sep 17 00:00:00 2001 From: Stephan Seitz <stephan.seitz@fau.de> Date: Fri, 31 Jan 2020 15:59:48 +0100 Subject: [PATCH] Rename: WaldUndWiesenSimulation -> Simulation --- .../{wald_und_wiesen_simulation.py => simulation.py} | 4 ++-- tests/test_walberla.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/pystencils_autodiff/{wald_und_wiesen_simulation.py => simulation.py} (98%) 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 72f5088..9cc7c68 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 13e5c8d..d0bbd43 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)) -- GitLab