[pyfr] 46/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 fb364873da59a326b4b5bcfe18632e3a0acfcbfa
Merge: 40bfd58 24ace85
Author: Freddie Witherden <freddie at witherden.org>
Date:   Thu Jun 2 10:54:54 2016 -0700

    Merge branch 'develop' into feature/gimmik.

 doc/src/user_guide.rst           |  13 +-
 pyfr/__main__.py                 | 254 +++++++++++++++++++++++++++++++++++++-
 pyfr/integrators/base.py         |  18 ++-
 pyfr/plugins/base.py             |  40 ++++++
 pyfr/plugins/tavg.py             |   2 +-
 pyfr/plugins/writer.py           |  11 +-
 pyfr/pyfr                        |   1 +
 pyfr/readers/native.py           |   2 +
 pyfr/scripts/__init__.py         |   0
 pyfr/scripts/main.py             | 257 ---------------------------------------
 pyfr/scripts/pyfr                |   1 -
 pyfr/solvers/baseadvec/inters.py |   8 +-
 pyfr/solvers/euler/inters.py     |   6 +-
 pyfr/solvers/navstokes/inters.py |  13 +-
 pyfr/writers/native.py           |   3 +
 setup.py                         |   5 +-
 16 files changed, 348 insertions(+), 286 deletions(-)

diff --cc doc/src/user_guide.rst
index 7be6872,cae9d0a..414e4a2
--- a/doc/src/user_guide.rst
+++ b/doc/src/user_guide.rst
@@@ -21,12 -21,11 +21,12 @@@ Overvie
  PyFR |release| has a hard dependency on Python 3.3+ and the following
  Python packages:
  
 -1. `h5py <http://www.h5py.org/>`_ >= 2.6
 -2. `mako <http://www.makotemplates.org/>`_ >= 1.0.0
 -3. `mpi4py <http://mpi4py.scipy.org/>`_ >= 2.0
 -4. `numpy <http://www.numpy.org/>`_ >= 1.8
 -5. `pytools <https://pypi.python.org/pypi/pytools>`_ >= 2016.2.1
 +1. `gimmik <https://github.com/vincentlab/GiMMiK>`_ >= 2.0
 +2. `h5py <http://www.h5py.org/>`_ >= 2.6
 +3. `mako <http://www.makotemplates.org/>`_ >= 1.0.0
 +4. `mpi4py <http://mpi4py.scipy.org/>`_ >= 2.0
 +5. `numpy <http://www.numpy.org/>`_ >= 1.8
- 6. `pytools <https://pypi.python.org/pypi/pytools>`_ >= 2014.3
++6. `pytools <https://pypi.python.org/pypi/pytools>`_ >= 2016.2.1
  
  Note that due to a bug in `numpy <http://www.numpy.org/>`_ PyFR is not
  compatible with 32-bit Python distributions.

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