[pyfr] 55/88: Merge branch 'feature/gimmik' into feature/shocks.

[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 ec0d958dcad9170b23e749a0020d1e6b709bfc7b
Merge: 25e902d dbe1bd1
Author: Freddie Witherden <freddie at witherden.org>
Date:   Fri Jun 24 13:45:52 2016 -0700

    Merge branch 'feature/gimmik' into feature/shocks.

 doc/src/user_guide.rst                     |  13 +-
 pyfr/__main__.py                           | 254 +++++++++++++++++++++++++++-
 pyfr/backends/cuda/gimmik.py               |  21 +--
 pyfr/backends/opencl/base.py               |  10 +-
 pyfr/backends/opencl/gimmik.py             |  24 +--
 pyfr/backends/opencl/types.py              |   4 +-
 pyfr/backends/openmp/base.py               |   5 +-
 pyfr/backends/{opencl => openmp}/gimmik.py |  33 ++--
 pyfr/integrators/base.py                   |  23 ++-
 pyfr/nputil.py                             |  36 +++-
 pyfr/plugins/base.py                       |   2 +-
 pyfr/plugins/tavg.py                       |   2 +-
 pyfr/plugins/writer.py                     |   2 +-
 pyfr/polys.py                              |  12 +-
 pyfr/pyfr                                  |   1 +
 pyfr/rank_allocator.py                     |  51 +++---
 pyfr/scripts/__init__.py                   |   0
 pyfr/scripts/main.py                       | 257 -----------------------------
 pyfr/scripts/pyfr                          |   1 -
 pyfr/shapes.py                             |  12 +-
 pyfr/solvers/baseadvec/inters.py           |   8 +-
 pyfr/solvers/baseadvecdiff/inters.py       |   5 +-
 pyfr/solvers/euler/inters.py               |   6 +-
 pyfr/solvers/navstokes/inters.py           |  13 +-
 setup.py                                   |   4 +-
 25 files changed, 402 insertions(+), 397 deletions(-)

diff --cc pyfr/polys.py
index ce6f830,a08b8b6..e803e44
--- a/pyfr/polys.py
+++ b/pyfr/polys.py
@@@ -80,11 -80,6 +80,11 @@@ class BasePolyBasis(object)
      def vdm(self):
          return self.ortho_basis_at(self.pts)
  
 +    @lazyprop
-     @chop
++    @clean
 +    def invvdm(self):
 +        return np.linalg.inv(self.vdm)
 +
  
  class LinePolyBasis(BasePolyBasis):
      name = 'line'
diff --cc pyfr/solvers/baseadvecdiff/inters.py
index 516cddb,fffc1e6..fd3b44e
--- a/pyfr/solvers/baseadvecdiff/inters.py
+++ b/pyfr/solvers/baseadvecdiff/inters.py
@@@ -57,12 -50,11 +57,15 @@@ class BaseAdvectionDiffusionMPIInters(B
          # one side to take β = -β for the cflux and conu kernels. We
          # pick this side (arbitrarily) by comparing the physical ranks
          # of the two partitions.
-         self._tpl_c['ldg-beta'] *= 1.0 if lhsprank > rhsprank else -1.0
+         if (lhsprank + rhsprank) % 2:
+             self._tpl_c['ldg-beta'] *= 1.0 if lhsprank > rhsprank else -1.0
+         else:
+             self._tpl_c['ldg-beta'] *= 1.0 if rhsprank > lhsprank else -1.0
  
 +        # Null kernel generators
 +        null_mpi_kern = lambda: NullMPIKernel()
 +        null_comp_kern = lambda: NullComputeKernel()
 +
          # If we need to send our gradients to the RHS
          if self._tpl_c['ldg-beta'] != -0.5:
              self.kernels['vect_fpts_pack'] = lambda: be.kernel(

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