[pyfr] 22/32: Whitespace.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Apr 21 08:21:52 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 2098bef6d7a9679c144e7f2a5cab444fa1421b5f
Author: Freddie Witherden <freddie at witherden.org>
Date: Wed Mar 30 06:47:18 2016 -0700
Whitespace.
---
pyfr/plugins/fluidforce.py | 10 ++++++----
pyfr/solvers/euler/inters.py | 4 +++-
pyfr/solvers/navstokes/elements.py | 4 +++-
pyfr/solvers/navstokes/kernels/intconu.mako | 2 +-
pyfr/solvers/navstokes/kernels/mpicflux.mako | 2 +-
5 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/pyfr/plugins/fluidforce.py b/pyfr/plugins/fluidforce.py
index d8042e9..b2a7ce8 100644
--- a/pyfr/plugins/fluidforce.py
+++ b/pyfr/plugins/fluidforce.py
@@ -156,8 +156,9 @@ class FluidForcePlugin(BasePlugin):
duupts = duupts.reshape(ndims, nupts, -1)
# Interpolate gradient to flux points
- dufpts = np.array([np.dot(m0, duupts[i]) for i in range(ndims)])
- dufpts = dufpts.reshape(ndims, nfpts, nvars, -1).swapaxes(1, 2)
+ dufpts = np.array([np.dot(m0, du) for du in duupts])
+ dufpts = dufpts.reshape(ndims, nfpts, nvars, -1)
+ dufpts = dufpts.swapaxes(1, 2)
# Viscous stress
vis = self.stress_tensor(ufpts, dufpts)
@@ -183,7 +184,7 @@ class FluidForcePlugin(BasePlugin):
def stress_tensor(self, u, du):
c = self._constants
- # Density, Energy
+ # Density, energy
rho, E = u[0], u[-1]
# Gradient of density and momentum
@@ -195,6 +196,7 @@ class FluidForcePlugin(BasePlugin):
# Bulk tensor
bulk = np.eye(self.ndims)[:, :, None, None]*np.trace(gradu)
+ # Viscosity
mu = c['mu']
if self._viscorr == 'sutherland':
@@ -202,4 +204,4 @@ class FluidForcePlugin(BasePlugin):
Trat = cpT/c['cpTref']
mu *= (c['cpTref'] + c['cpTs'])*Trat**1.5 / (cpT + c['cpTs'])
- return -mu*(gradu + gradu.swapaxes(0, 1) - 2 / 3*bulk)
+ return -mu*(gradu + gradu.swapaxes(0, 1) - 2/3*bulk)
diff --git a/pyfr/solvers/euler/inters.py b/pyfr/solvers/euler/inters.py
index 971e23f..257d80e 100644
--- a/pyfr/solvers/euler/inters.py
+++ b/pyfr/solvers/euler/inters.py
@@ -51,7 +51,8 @@ class EulerBaseBCInters(BaseAdvectionBCInters):
self.kernels['comm_flux'] = lambda: self._be.kernel(
'bccflux', tplargs, dims=[self.ninterfpts], ul=self._scal0_lhs,
- magnl=self._mag_pnorm_lhs, nl=self._norm_pnorm_lhs, ploc=self._ploc
+ magnl=self._mag_pnorm_lhs, nl=self._norm_pnorm_lhs,
+ ploc=self._ploc
)
@@ -80,5 +81,6 @@ class EulerCharRiemInvBCInters(EulerBaseBCInters):
self._tpl_c.update(tplc)
+
class EulerSlpAdiaWallBCInters(EulerBaseBCInters):
type = 'slp-adia-wall'
diff --git a/pyfr/solvers/navstokes/elements.py b/pyfr/solvers/navstokes/elements.py
index 6169117..638185f 100644
--- a/pyfr/solvers/navstokes/elements.py
+++ b/pyfr/solvers/navstokes/elements.py
@@ -48,7 +48,9 @@ class NavierStokesElements(BaseFluidElements, BaseAdvectionDiffusionElements):
(nfpts, 1, neles), aliases=avis_upts_temp, tags=tags
)
- backend.pointwise.register('pyfr.solvers.navstokes.kernels.entropy')
+ backend.pointwise.register(
+ 'pyfr.solvers.navstokes.kernels.entropy'
+ )
backend.pointwise.register('pyfr.solvers.navstokes.kernels.avis')
def artf_vis():
diff --git a/pyfr/solvers/navstokes/kernels/intconu.mako b/pyfr/solvers/navstokes/kernels/intconu.mako
index 606e387..f097faa 100644
--- a/pyfr/solvers/navstokes/kernels/intconu.mako
+++ b/pyfr/solvers/navstokes/kernels/intconu.mako
@@ -14,7 +14,7 @@
ulout[${i}] = urout[${i}] = urin[${i}];
% else:
ulout[${i}] = urout[${i}] = urin[${i}]*${0.5 + c['ldg-beta']}
- + ulin[${i}]*${0.5 - c['ldg-beta']};
+ + ulin[${i}]*${0.5 - c['ldg-beta']};
% endif
% endfor
</%pyfr:kernel>
diff --git a/pyfr/solvers/navstokes/kernels/mpicflux.mako b/pyfr/solvers/navstokes/kernels/mpicflux.mako
index 0f5291f..34ddb12 100644
--- a/pyfr/solvers/navstokes/kernels/mpicflux.mako
+++ b/pyfr/solvers/navstokes/kernels/mpicflux.mako
@@ -49,6 +49,6 @@
fvcomm += ${tau}*(ul[${i}] - ur[${i}]);
% endif
- ul[${i}] = magnl*(ficomm[${i}] + fvcomm);
+ ul[${i}] = magnl*(ficomm[${i}] + fvcomm);
% endfor
</%pyfr:kernel>
--
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