From e75398f3b75dd158f294c5963341e0ac82686c41 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Wed, 14 Nov 2018 09:18:59 +0100
Subject: [PATCH] Fixes in codegen files
---
tests/cuda/codegen/CudaJacobiKernel.py | 8 ++++----
tests/lbm/codegen/SrtWithForceFieldModel.gen.py | 7 ++++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tests/cuda/codegen/CudaJacobiKernel.py b/tests/cuda/codegen/CudaJacobiKernel.py
index 225593dcd..14e46d2b6 100644
--- a/tests/cuda/codegen/CudaJacobiKernel.py
+++ b/tests/cuda/codegen/CudaJacobiKernel.py
@@ -3,17 +3,17 @@ from pystencils_walberla.sweep import Sweep
def jacobi2D(sweep):
src = sweep.field("f1")
- dst = sweep.temporaryField(src)
+ dst = sweep.temporary_field(src)
- dst[0, 0] @= (src[1, 0] + src[-1, 0] + src[0, 1] + src[0, -1]) / (4 * sweep.constant.h ** 2)
+ dst[0, 0] @= (src[1, 0] + src[-1, 0] + src[0, 1] + src[0, -1]) / (4 * sweep.constant("h") ** 2)
def jacobi3D(sweep):
src = sweep.field("f1")
- dst = sweep.temporaryField(src)
+ dst = sweep.temporary_field(src)
dst[0, 0, 0] @= (src[1, 0, 0] + src[-1, 0, 0] + src[0, 1, 0] + src[0, -1, 0] + src[0, 0, 1] + src[0, 0, -1]) / \
- (6 * sweep.constant.h ** 2)
+ (6 * sweep.constant("h") ** 2)
Sweep.generate('CudaJacobiKernel2D', jacobi2D, dim=2, target='gpu')
diff --git a/tests/lbm/codegen/SrtWithForceFieldModel.gen.py b/tests/lbm/codegen/SrtWithForceFieldModel.gen.py
index f004d3840..72e10eb35 100644
--- a/tests/lbm/codegen/SrtWithForceFieldModel.gen.py
+++ b/tests/lbm/codegen/SrtWithForceFieldModel.gen.py
@@ -1,6 +1,6 @@
import sympy as sp
from lbmpy.boundaries import NoSlip, UBB
-from lbmpy_walberla import Field, generate_lattice_model_files, RefinementScaling
+from lbmpy_walberla import generate_lattice_model_files, RefinementScaling
from lbmpy.creationfunctions import create_lb_method
from lbmpy_walberla.boundary import create_boundary_class
from pystencils_walberla.cmake_integration import codegen
@@ -25,11 +25,12 @@ def genBoundary():
method = create_lb_method(stencil='D3Q19', method='srt')
return create_boundary_class(boundary, method)
+
def genNoSlip():
boundary = NoSlip(name='MyNoSlip')
method = create_lb_method(stencil='D3Q19', method='srt')
return create_boundary_class(boundary, method)
-codegen.register(['MyUBB.h', 'MyUBB.cpp'], genBoundary)
-codegen.register(['MyNoSlip.h', 'MyNoSlip.cpp',], genNoSlip)
+codegen.register(['MyUBB.h', 'MyUBB.cpp'], genBoundary)
+codegen.register(['MyNoSlip.h', 'MyNoSlip.cpp'], genNoSlip)
--
GitLab