From 48999882bdaccc5475fa443372b4783adb65ff9c Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Mon, 2 Apr 2018 21:08:36 +0200
Subject: [PATCH] PEP8 naming

---
 boundaries/boundaryconditions.py | 4 ++--
 boundaries/boundaryhandling.py   | 6 +++---
 creationfunctions.py             | 4 ++--
 fieldaccess.py                   | 2 +-
 session.py                       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/boundaries/boundaryconditions.py b/boundaries/boundaryconditions.py
index 86b085eb..89359f23 100644
--- a/boundaries/boundaryconditions.py
+++ b/boundaries/boundaryconditions.py
@@ -2,7 +2,7 @@ import sympy as sp
 from pystencils import Field, Assignment
 from pystencils.astnodes import SympyAssignment
 from pystencils.sympyextensions import get_symmetric_part
-from pystencils.data_types import createType
+from pystencils.data_types import create_type
 from lbmpy.simplificationfactory import createSimplificationStrategy
 from lbmpy.boundaries.boundaryhandling import BoundaryOffsetInfo, LbmWeightInfo
 
@@ -100,7 +100,7 @@ class UBB(Boundary):
     @property
     def additionalData(self):
         if callable(self._velocity):
-            return [('vel_%d' % (i,), createType("double")) for i in range(self.dim)]
+            return [('vel_%d' % (i,), create_type("double")) for i in range(self.dim)]
         else:
             return []
 
diff --git a/boundaries/boundaryhandling.py b/boundaries/boundaryhandling.py
index 2e793592..cf3e490b 100644
--- a/boundaries/boundaryhandling.py
+++ b/boundaries/boundaryhandling.py
@@ -91,13 +91,13 @@ class LbmWeightInfo(CustomCppCode):
     def __init__(self, lbMethod):
         weights = [str(w.evalf()) for w in lbMethod.weights]
         code = "const double %s [] = { %s };\n" % (LbmWeightInfo.WEIGHTS_SYMBOL.name, ",".join(weights))
-        super(LbmWeightInfo, self).__init__(code, symbolsRead=set(),
-                                            symbolsDefined=set([LbmWeightInfo.WEIGHTS_SYMBOL]))
+        super(LbmWeightInfo, self).__init__(code, symbols_read=set(),
+                                            symbols_defined=set([LbmWeightInfo.WEIGHTS_SYMBOL]))
 
 
 def createLatticeBoltzmannBoundaryKernel(pdfField, indexField, lbMethod, boundaryFunctor, target='cpu', openMP=True):
     elements = [BoundaryOffsetInfo(lbMethod.stencil), LbmWeightInfo(lbMethod)]
-    indexArrDtype = indexField.dtype.numpyDtype
+    indexArrDtype = indexField.dtype.numpy_dtype
     dirSymbol = TypedSymbol("dir", indexArrDtype.fields['dir'][0])
     elements += [Assignment(dirSymbol, indexField[0]('dir'))]
     elements += boundaryFunctor(pdfField=pdfField, directionSymbol=dirSymbol, lbMethod=lbMethod, indexField=indexField)
diff --git a/creationfunctions.py b/creationfunctions.py
index fd58cc00..8db2eb23 100644
--- a/creationfunctions.py
+++ b/creationfunctions.py
@@ -153,7 +153,7 @@ import sympy as sp
 from copy import copy
 
 from pystencils.cache import diskcacheNoFallback
-from pystencils.data_types import collateTypes
+from pystencils.data_types import collate_types
 from pystencils.assignment_collection.assignment_collection import AssignmentCollection
 from pystencils.field import getLayoutOfArray, Field
 from pystencils import createKernel, Assignment
@@ -193,7 +193,7 @@ def createLatticeBoltzmannAst(updateRule=None, optimizationParams={}, **kwargs):
         updateRule = createLatticeBoltzmannUpdateRule(**params)
 
     fieldTypes = set(fa.field.dtype for fa in updateRule.defined_symbols if isinstance(fa, Field.Access))
-    res = createKernel(updateRule, target=optParams['target'], dataType=collateTypes(fieldTypes),
+    res = createKernel(updateRule, target=optParams['target'], dataType=collate_types(fieldTypes),
                        cpuOpenMP=optParams['openMP'], cpuVectorizeInfo=optParams['vectorization'],
                        gpuIndexing=optParams['gpuIndexing'], gpuIndexingParams=optParams['gpuIndexingParams'],
                        ghostLayers=1)
diff --git a/fieldaccess.py b/fieldaccess.py
index 8857a827..b48e7f33 100644
--- a/fieldaccess.py
+++ b/fieldaccess.py
@@ -94,7 +94,7 @@ class PeriodicTwoFieldsAccessor(PdfFieldAccessor):
                 lowerLimit = self._ghostLayers
                 upperLimit = field.spatialShape[coordId] - 1 - self._ghostLayers
                 limitDiff = upperLimit - lowerLimit
-                loopCounter = LoopOverCoordinate.getLoopCounterSymbol(coordId)
+                loopCounter = LoopOverCoordinate.get_loop_counter_symbol(coordId)
                 if dirElement == 0:
                     periodicPullDirection.append(0)
                 elif dirElement == 1:
diff --git a/session.py b/session.py
index 9eaa55b5..cc403b4d 100644
--- a/session.py
+++ b/session.py
@@ -2,7 +2,7 @@ import sympy as sp
 import numpy as np
 from lbmpy.scenarios import *
 from lbmpy.creationfunctions import *
-from pystencils import makeSlice, showCode
+from pystencils import makeSlice, show_code
 from lbmpy.boundaries import *
 from lbmpy.postprocessing import *
 from lbmpy.lbstep import LatticeBoltzmannStep
-- 
GitLab