[pyfr] 02/32: Merge remote-tracking branch 'upstream/develop' into develop.

[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 14508a5a82fae39a527351a70144623c221f14f4
Merge: 5383037 2d54d57
Author: Freddie Witherden <freddie at witherden.org>
Date:   Thu Jan 7 11:28:54 2016 +0000

    Merge remote-tracking branch 'upstream/develop' into develop.

 doc/src/user_guide.rst                       |   5 +-
 pyfr/backends/base/__init__.py               |   5 +-
 pyfr/backends/base/backend.py                |  25 +-----
 pyfr/backends/base/kernels.py                |   4 +
 pyfr/backends/cuda/base.py                   |   5 +-
 pyfr/backends/cuda/cublas.py                 |   3 +-
 pyfr/backends/cuda/gimmik.py                 |  57 ++++++++++++
 pyfr/backends/opencl/base.py                 |   5 +-
 pyfr/backends/opencl/clblas.py               |   3 +-
 pyfr/backends/opencl/gimmik.py               |  51 +++++++++++
 pyfr/backends/openmp/cblas.py                |   3 +-
 pyfr/mputil.py                               |  35 --------
 pyfr/nputil.py                               |   2 +-
 pyfr/plugins/fluidforce.py                   |   6 +-
 pyfr/plugins/sampler.py                      |   2 +-
 pyfr/plugins/tavg.py                         |   4 +-
 pyfr/plugins/writer.py                       |   2 +-
 pyfr/polys.py                                | 117 ++++++++++++++----------
 pyfr/quadrules/__init__.py                   |   3 +-
 pyfr/scripts/main.py                         |  16 ++--
 pyfr/shapes.py                               | 127 +++++++++++++++------------
 pyfr/solvers/base/elements.py                |  78 +++++++++++-----
 pyfr/solvers/baseadvec/inters.py             |   1 -
 pyfr/solvers/euler/elements.py               |   8 +-
 pyfr/solvers/euler/inters.py                 |   3 +-
 pyfr/solvers/euler/kernels/intcflux.mako     |   5 +-
 pyfr/solvers/navstokes/inters.py             |   3 +-
 pyfr/solvers/navstokes/kernels/intcflux.mako |   5 +-
 pyfr/writers/vtk.py                          | 116 +++++++++++++++++++-----
 setup.py                                     |   1 -
 30 files changed, 447 insertions(+), 253 deletions(-)

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