[pyfr] 22/88: Whitespace.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Nov 16 12:05:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository pyfr.
commit 46961567dce98973e4332752e069de9cf36598b2
Author: Freddie Witherden <freddie at witherden.org>
Date: Sat Apr 23 18:36:19 2016 -0700
Whitespace.
---
pyfr/backends/cuda/blasext.py | 1 -
pyfr/backends/mic/cblas.py | 2 +-
pyfr/backends/mic/compiler.py | 20 ++++++++++----------
pyfr/backends/opencl/blasext.py | 1 -
pyfr/backends/opencl/kernels/__init__.py | 2 +-
pyfr/backends/openmp/cblas.py | 2 +-
pyfr/integrators/std/steppers.py | 3 ++-
pyfr/plugins/tavg.py | 2 +-
pyfr/polys.py | 4 ++--
pyfr/readers/cgns.py | 4 ++--
pyfr/readers/nodemaps.py | 31 ++++++++++++++++---------------
pyfr/template.py | 2 +-
pyfr/tests/__init__.py | 1 -
13 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/pyfr/backends/cuda/blasext.py b/pyfr/backends/cuda/blasext.py
index 30d64dd..bc4df16 100644
--- a/pyfr/backends/cuda/blasext.py
+++ b/pyfr/backends/cuda/blasext.py
@@ -82,5 +82,4 @@ class CUDABlasExtKernels(CUDAKernelProvider):
self._retarr = rkern(xarr, yarr, zarr, atol, rtol,
stream=queue.cuda_stream_comp)
-
return ErrestKernel()
diff --git a/pyfr/backends/mic/cblas.py b/pyfr/backends/mic/cblas.py
index 2037e77..4aa7cf9 100644
--- a/pyfr/backends/mic/cblas.py
+++ b/pyfr/backends/mic/cblas.py
@@ -1,4 +1,4 @@
- # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
import numpy as np
diff --git a/pyfr/backends/mic/compiler.py b/pyfr/backends/mic/compiler.py
index 393ef38..e98588b 100644
--- a/pyfr/backends/mic/compiler.py
+++ b/pyfr/backends/mic/compiler.py
@@ -31,16 +31,16 @@ class MICSourceModule(object):
# Compile and link
cmd = [
'icc',
- '-shared', # Create a shared library
- '-std=c99', # Enable C99 support
- '-Ofast', # Optimise
- '-mmic', # Compile for the MIC
- '-fopenmp', # Enable OpenMP support
- '-L{0}/lib/mic'.format(mklroot), # MKL stuff
- '-lmkl_intel_lp64', # ...
- '-lmkl_core', # ...
- '-lmkl_intel_thread', # ...
- '-fPIC', # Position-independent code
+ '-shared', # Create a shared library
+ '-std=c99', # Enable C99 support
+ '-Ofast', # Optimise
+ '-mmic', # Compile for the MIC
+ '-fopenmp', # Enable OpenMP support
+ '-L{0}/lib/mic'.format(mklroot), # MKL stuff
+ '-lmkl_intel_lp64', # ...
+ '-lmkl_core', # ...
+ '-lmkl_intel_thread', # ...
+ '-fPIC', # Position-independent code
'-o', ln, cn
]
call_capture_output(cmd, cwd=tmpdir)
diff --git a/pyfr/backends/opencl/blasext.py b/pyfr/backends/opencl/blasext.py
index 8fa5a11..c4e378a 100644
--- a/pyfr/backends/opencl/blasext.py
+++ b/pyfr/backends/opencl/blasext.py
@@ -79,5 +79,4 @@ class OpenCLBlasExtKernels(OpenCLKernelProvider):
self._retarr = rkern(xarr, yarr, zarr, atol, rtol,
queue=qcomp)
-
return ErrestKernel()
diff --git a/pyfr/backends/opencl/kernels/__init__.py b/pyfr/backends/opencl/kernels/__init__.py
index f4d7bc6..40a96af 100644
--- a/pyfr/backends/opencl/kernels/__init__.py
+++ b/pyfr/backends/opencl/kernels/__init__.py
@@ -1 +1 @@
- # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
diff --git a/pyfr/backends/openmp/cblas.py b/pyfr/backends/openmp/cblas.py
index 3e1431f..b6c63ac 100644
--- a/pyfr/backends/openmp/cblas.py
+++ b/pyfr/backends/openmp/cblas.py
@@ -1,4 +1,4 @@
- # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
from ctypes import CDLL, cast, c_int, c_double, c_float, c_void_p
diff --git a/pyfr/integrators/std/steppers.py b/pyfr/integrators/std/steppers.py
index 319cac9..b1c60aa 100644
--- a/pyfr/integrators/std/steppers.py
+++ b/pyfr/integrators/std/steppers.py
@@ -83,7 +83,8 @@ class StdTVDRK3Stepper(BaseStdStepper):
rhs(t + dt, r1, r2)
add(0.25, r1, 0.75, r0, 0.25*dt, r2)
- # Third stage; r2 = -∇·f(r1); r1 = 1.0/3.0*r0 + 2.0/3.0*r1 + 2.0/3.0*dt*r2
+ # Third stage; r2 = -∇·f(r1);
+ # r1 = 1.0/3.0*r0 + 2.0/3.0*r1 + 2.0/3.0*dt*r2
rhs(t + 0.5*dt, r1, r2)
add(2.0/3.0, r1, 1.0/3.0, r0, 2.0/3.0*dt, r2)
diff --git a/pyfr/plugins/tavg.py b/pyfr/plugins/tavg.py
index 09eaffb..45bbe08 100644
--- a/pyfr/plugins/tavg.py
+++ b/pyfr/plugins/tavg.py
@@ -54,7 +54,7 @@ class TavgPlugin(BasePlugin):
# Get the primitive variable names and solutions
pnames = self.elementscls.privarmap[self.ndims]
psolns = self.elementscls.con_to_pri(soln.swapaxes(0, 1),
- self.cfg)
+ self.cfg)
# Prepare the substitutions dictionary
ploc = dict(zip('xyz', ploc.swapaxes(0, 1)))
diff --git a/pyfr/polys.py b/pyfr/polys.py
index dee65ce..2f2b6b0 100644
--- a/pyfr/polys.py
+++ b/pyfr/polys.py
@@ -19,7 +19,7 @@ def jacobi(n, a, b, z):
for q in range(2, n + 1):
qapbpq, apbp2q = q*(apb + q), apb + 2*q
- apbp2qm1, apbp2qm2 = apbp2q - 1, apbp2q - 2
+ apbp2qm1, apbp2qm2 = apbp2q - 1, apbp2q - 2
aq = apbp2q*apbp2qm1/(2*qapbpq)
bq = apbp2qm1*bbmaa/(2*qapbpq*apbp2qm2)
@@ -156,7 +156,7 @@ class QuadPolyBasis(BasePolyBasis):
return [pi*pj for pi in pa for pj in pb]
- def jac_ortho_basis_at_py(self, p , q):
+ def jac_ortho_basis_at_py(self, p, q):
sk = [sqrt(k + 0.5) for k in range(self.order)]
pa = [c*jp for c, jp in zip(sk, jacobi(self.order - 1, 0, 0, p))]
pb = [c*jp for c, jp in zip(sk, jacobi(self.order - 1, 0, 0, q))]
diff --git a/pyfr/readers/cgns.py b/pyfr/readers/cgns.py
index 92dacbd..dfb6e90 100644
--- a/pyfr/readers/cgns.py
+++ b/pyfr/readers/cgns.py
@@ -178,8 +178,8 @@ class CGNSWrappers(object):
# http://cgns.github.io/CGNS_docs_current/midlevel/grid.html
datatype = self.RealDouble
- self.lib.cg_coord_read(file, base, zone, bytes(name, 'utf-8'), datatype,
- i, j, x.ctypes.data)
+ self.lib.cg_coord_read(file, base, zone, bytes(name, 'utf-8'),
+ datatype, i, j, x.ctypes.data)
def nbocos(self, zone):
file = zone['base']['file']
diff --git a/pyfr/readers/nodemaps.py b/pyfr/readers/nodemaps.py
index 07ac26a..2a964e0 100644
--- a/pyfr/readers/nodemaps.py
+++ b/pyfr/readers/nodemaps.py
@@ -196,8 +196,8 @@ class CGNSNodeMaps(object):
('tet', 20): np.array([0, 3, 9, 19, 1, 2, 6, 8, 7, 4, 10, 16, 12, 17,
15, 18, 5, 11, 14, 13]),
('tet', 35): np.array([0, 4, 14, 34, 1, 2, 3, 8, 11, 13, 12, 9, 5, 15,
- 25, 31, 18, 27, 32, 24, 30, 33, 6, 7, 10, 16, 17,
- 26, 21, 23, 29, 22, 19, 28, 20]),
+ 25, 31, 18, 27, 32, 24, 30, 33, 6, 7, 10, 16,
+ 17, 26, 21, 23, 29, 22, 19, 28, 20]),
('pri', 6): np.array([0, 1, 2, 3, 4, 5]),
('pri', 18): np.array([0, 2, 5, 12, 14, 17, 1, 4, 3, 6, 8, 11, 13, 16,
15, 7, 10, 9]),
@@ -207,30 +207,31 @@ class CGNSNodeMaps(object):
15, 25]),
('pri', 75): np.array([0, 4, 14, 60, 64, 74, 1, 2, 3, 8, 11, 13, 12, 9,
5, 15, 30, 45, 19, 34, 49, 29, 44, 59, 61, 62,
- 63, 68, 71, 73, 72, 69, 65, 6, 7, 10, 16, 17, 18,
- 33, 48, 47, 46, 31, 32, 23, 26, 28, 43, 58, 56,
- 53, 38, 41, 27, 24, 20, 35, 50, 54, 57, 42, 39,
- 66, 67, 70, 21, 22, 25, 36, 37, 40, 51, 52, 55]),
+ 63, 68, 71, 73, 72, 69, 65, 6, 7, 10, 16, 17,
+ 18, 33, 48, 47, 46, 31, 32, 23, 26, 28, 43, 58,
+ 56, 53, 38, 41, 27, 24, 20, 35, 50, 54, 57, 42,
+ 39, 66, 67, 70, 21, 22, 25, 36, 37, 40, 51, 52,
+ 55]),
('pyr', 5): np.array([0, 1, 3, 2, 4]),
('pyr', 14): np.array([0, 2, 8, 6, 13, 1, 5, 7, 3, 9, 10, 12, 11, 4]),
('pyr', 30): np.array([0, 3, 15, 12, 29, 1, 2, 7, 11, 14, 13, 8, 4, 16,
25, 18, 26, 24, 28, 22, 27, 5, 6, 10, 9, 17, 21,
23, 19, 20]),
('pyr', 55): np.array([0, 4, 24, 20, 54, 1, 2, 3, 9, 14, 19, 23, 22,
- 21, 15, 10, 5, 25, 41, 50, 28, 43, 51, 40, 49,
- 53, 37, 47, 52, 6, 7, 8, 13, 18, 17, 16, 11, 12,
- 26, 27, 42, 32, 36, 46, 39, 38, 48, 33, 29, 44,
- 30, 31, 35, 34, 45]),
+ 21, 15, 10, 5, 25, 41, 50, 28, 43, 51, 40, 49,
+ 53, 37, 47, 52, 6, 7, 8, 13, 18, 17, 16, 11,
+ 12, 26, 27, 42, 32, 36, 46, 39, 38, 48, 33, 29,
+ 44, 30, 31, 35, 34, 45]),
('hex', 8): np.array([0, 1, 3, 2, 4, 5, 7, 6]),
('hex', 27): np.array([0, 2, 8, 6, 18, 20, 26, 24, 1, 5, 7, 3, 9, 11,
17, 15, 19, 23, 25, 21, 4, 10, 14, 16, 12, 22,
13]),
('hex', 64): np.array([0, 3, 15, 12, 48, 51, 63, 60, 1, 2, 7, 11, 14,
- 13, 8, 4, 16, 32, 19, 35, 31, 47, 28, 44, 49, 50,
- 55, 59, 62, 61, 56, 52, 5, 6, 10, 9, 17, 18, 34,
- 33, 23, 27, 43, 39, 30, 29, 45, 46, 24, 20, 36,
- 40, 53, 54, 58, 57, 21, 22, 26, 25, 37, 38, 42,
- 41]),
+ 13, 8, 4, 16, 32, 19, 35, 31, 47, 28, 44, 49,
+ 50, 55, 59, 62, 61, 56, 52, 5, 6, 10, 9, 17, 18,
+ 34, 33, 23, 27, 43, 39, 30, 29, 45, 46, 24, 20,
+ 36, 40, 53, 54, 58, 57, 21, 22, 26, 25, 37, 38,
+ 42, 41]),
('hex', 125): np.array([0, 4, 24, 20, 100, 104, 124, 120, 1, 2, 3, 9,
14, 19, 23, 22, 21, 15, 10, 5, 25, 50, 75, 29,
54, 79, 49, 74, 99, 45, 70, 95, 101, 102, 103,
diff --git a/pyfr/template.py b/pyfr/template.py
index 546315f..7505a14 100644
--- a/pyfr/template.py
+++ b/pyfr/template.py
@@ -1,4 +1,4 @@
- # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
import pkgutil
diff --git a/pyfr/tests/__init__.py b/pyfr/tests/__init__.py
index 633f866..40a96af 100644
--- a/pyfr/tests/__init__.py
+++ b/pyfr/tests/__init__.py
@@ -1,2 +1 @@
# -*- coding: utf-8 -*-
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfr.git
More information about the debian-science-commits
mailing list