[pyfr] 40/88: Merge branch 'develop' 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 709a633e99820137dd1f98c6611d15f645fa3c68
Merge: 989131e 7971909
Author: Freddie Witherden <freddie at witherden.org>
Date:   Mon May 23 12:15:48 2016 +0100

    Merge branch 'develop' into feature/shocks.

 doc/src/conf.py                           |   4 +-
 doc/src/home.rst                          |   5 +-
 doc/src/user_guide.rst                    |  31 +++++-
 pyfr/_version.py                          |   2 +-
 pyfr/backends/cuda/base.py                |   5 +
 pyfr/backends/cuda/blasext.py             |  41 ++++---
 pyfr/backends/cuda/cublas.py              |   2 +-
 pyfr/backends/cuda/kernels/axnpby.mako    |  41 ++++---
 pyfr/backends/cuda/packing.py             |  57 ++++++----
 pyfr/backends/cuda/types.py               |  24 +++-
 pyfr/backends/mic/blasext.py              |  21 ++--
 pyfr/backends/mic/cblas.py                |   2 +-
 pyfr/backends/mic/compiler.py             |  22 ++--
 pyfr/backends/mic/kernels/axnpby.mako     |  55 +++++-----
 pyfr/backends/mic/kernels/errest.mako     |  14 ++-
 pyfr/backends/mic/packing.py              |   2 +-
 pyfr/backends/mic/types.py                |   1 -
 pyfr/backends/opencl/base.py              |   4 +
 pyfr/backends/opencl/blasext.py           |  30 ++---
 pyfr/backends/opencl/kernels/__init__.py  |   2 +-
 pyfr/backends/opencl/kernels/axnpby.mako  |  39 ++++---
 pyfr/backends/openmp/blasext.py           |  26 +++--
 pyfr/backends/openmp/cblas.py             |   2 +-
 pyfr/backends/openmp/kernels/axnpby.mako  |  49 ++++-----
 pyfr/backends/openmp/kernels/errest.mako  |  14 ++-
 pyfr/ctypesutil.py                        |   2 +-
 pyfr/integrators/__init__.py              |  37 +++++--
 pyfr/integrators/base.py                  | 119 +++++++++++++++++---
 pyfr/integrators/dual/__init__.py         |   5 +
 pyfr/integrators/dual/base.py             |  35 ++++++
 pyfr/integrators/dual/controllers.py      |  62 +++++++++++
 pyfr/integrators/dual/pseudosteppers.py   | 177 ++++++++++++++++++++++++++++++
 pyfr/integrators/dual/steppers.py         |  62 +++++++++++
 pyfr/integrators/std/__init__.py          |   4 +
 pyfr/integrators/std/base.py              |  24 ++++
 pyfr/integrators/{ => std}/controllers.py |  96 +++++-----------
 pyfr/integrators/{ => std}/steppers.py    |  45 ++------
 pyfr/partitioners/base.py                 |  24 +++-
 pyfr/plugins/base.py                      |  40 +++++++
 pyfr/plugins/residual.py                  |  14 ++-
 pyfr/plugins/sampler.py                   |   2 +-
 pyfr/plugins/tavg.py                      |   2 +-
 pyfr/plugins/writer.py                    |   9 +-
 pyfr/polys.py                             |   4 +-
 pyfr/progress_bar.py                      |   6 +-
 pyfr/quadrules/__init__.py                |   6 +-
 pyfr/readers/cgns.py                      |   4 +-
 pyfr/readers/native.py                    |   2 +
 pyfr/readers/nodemaps.py                  |  31 +++---
 pyfr/scripts/main.py                      |  33 +++---
 pyfr/shapes.py                            |  16 +--
 pyfr/solvers/base/elements.py             |  47 ++++----
 pyfr/solvers/euler/elements.py            |   4 +
 pyfr/template.py                          |   2 +-
 pyfr/tests/__init__.py                    |   1 -
 pyfr/writers/native.py                    |   3 +
 setup.py                                  |  10 +-
 57 files changed, 1004 insertions(+), 419 deletions(-)


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