[pyfr] 52/88: Merge branch 'develop' into feature/gimmik.

[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 ab8917347fbb8e16cf9ad4f679cb65f4702d82d6
Merge: fb36487 0c3d402
Author: Freddie Witherden <freddie at witherden.org>
Date:   Fri Jun 10 09:55:11 2016 -0700

    Merge branch 'develop' into feature/gimmik.

 doc/src/user_guide.rst               |  2 +-
 pyfr/backends/opencl/base.py         | 10 +++----
 pyfr/backends/opencl/types.py        |  4 +--
 pyfr/integrators/base.py             |  5 ++++
 pyfr/nputil.py                       | 36 +++++++++++++++++++------
 pyfr/plugins/base.py                 |  2 +-
 pyfr/polys.py                        | 10 +++----
 pyfr/rank_allocator.py               | 51 ++++++++++++++++++++----------------
 pyfr/shapes.py                       | 12 ++++-----
 pyfr/solvers/baseadvecdiff/inters.py |  5 +++-
 10 files changed, 84 insertions(+), 53 deletions(-)


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