[pyfr] 63/88: Cleanups.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository pyfr.

commit 107312b33e143c69986708461932e243f426ae10
Author: Freddie Witherden <freddie at witherden.org>
Date:   Tue Jul 12 12:07:34 2016 -0700

    Cleanups.
---
 pyfr/solvers/base/elements.py | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/pyfr/solvers/base/elements.py b/pyfr/solvers/base/elements.py
index 650c0a8..46e840a 100644
--- a/pyfr/solvers/base/elements.py
+++ b/pyfr/solvers/base/elements.py
@@ -193,7 +193,14 @@ class BaseElements(object, metaclass=ABCMeta):
 
     @memoize
     def smat_at_np(self, name):
-        return self._get_smats(getattr(self.basis, name))
+        smats_mpts, _ = self._smats_djacs_mpts
+
+        # Interpolation matrix to pts
+        m0 = self.basis.mbasis.nodal_basis_at(getattr(self.basis, name))
+
+        # Interpolate the smats
+        smats = np.array([np.dot(m0, smat) for smat in smats_mpts])
+        return smats.reshape(self.ndims, -1, self.ndims, self.neles)
 
     @memoize
     def smat_at(self, name):
@@ -201,7 +208,13 @@ class BaseElements(object, metaclass=ABCMeta):
 
     @memoize
     def rcpdjac_at_np(self, name):
-        _, djac = self._get_smats(getattr(self.basis, name), retdets=True)
+        _, djacs_mpts = self._smats_djacs_mpts
+
+        # Interpolation matrix to pts
+        m0 = self.basis.mbasis.nodal_basis_at(getattr(self.basis, name))
+
+        # Interpolate the djacs
+        djac = np.dot(m0, djacs_mpts)
 
         if np.any(djac < -1e-5):
             raise RuntimeError('Negative mesh Jacobians detected')
@@ -226,7 +239,7 @@ class BaseElements(object, metaclass=ABCMeta):
         return self._be.const_matrix(self.ploc_at_np(name), tags={'align'})
 
     def _gen_pnorm_fpts(self):
-        smats = self._get_smats(self.basis.fpts).transpose(1, 3, 0, 2)
+        smats = self.smat_at_np('fpts').transpose(1, 3, 0, 2)
 
         # We need to compute |J|*[(J^{-1})^{T}.N] where J is the
         # Jacobian and N is the normal for each fpt.  Using
@@ -255,22 +268,6 @@ class BaseElements(object, metaclass=ABCMeta):
         self._gen_pnorm_fpts()
         return self._mag_pnorm_fpts
 
-    def _get_smats(self, pts, retdets=False):
-        npts = len(pts)
-        smats_mpts, djacs_mpts = self._smats_djacs_mpts
-
-        # Interpolation matrix to pts
-        m0 = self.basis.mbasis.nodal_basis_at(pts)
-
-        # Interpolate smats
-        smats = np.array([np.dot(m0, smat) for smat in smats_mpts])
-        smats = smats.reshape(self.ndims, npts, self.ndims, -1)
-
-        if retdets:
-            return smats, np.dot(m0, djacs_mpts)
-        else:
-            return smats
-
     @lazyprop
     def _smats_djacs_mpts(self):
         # Metric basis with grid point (q<=p) or pseudo grid points (q>p)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfr.git