fix imcompatibility with tpr vers<64 with free energy option

should fix to redmine #1156

Change-Id: I6e60f1efbb03bf460009b8bc59f80f2e0e15bf44
Uncrustified code changes since 4.6

The group kernel python scripts have changed slightly to emit
code that uncrustify won't want to change. Group kernel
generation and uncrustify are now mutual null operations.

Recent changes to the declarations in gmx_order in baa65b60
may have exposed a possible bug in uncrustify. Those declarations
have been simplified so that there will be no future issue from
that possible bug.

Refs #845

Change-Id: I33495d57ca37317cef4bf12707fd77d67309d292
fixed PME time print with -ntomp_pme != -ntomp

Fixes #1158

Change-Id: I9028e6309b8802125e91935e87d96b341ec30f77
Declaration-definition consistency nbxn_cuda_wait_gpu.

Changed float->real in nbnxn_cuda_wait_gpu() for consistency between
function declaration and function definition.  Added note that this is
only implemented for single-precision at the moment.  CMake will
complain if GMX_GPU and GMX_DOUBLE are both set.
Addresses Bug #1157.

Change-Id: Ide495cbaba6d120d91f106c6a87ca04e46a2f5a8
Merge "Uncrustified code changes since 4.6" into release-4-6
Warn if X11 was not found and the user wanted it

Also, removed unused HAVE_X11 variable.

Change-Id: I581b2036f9de27a02c034230f2d1212b9814ffbb
Updated install guide

* bumped some versions for 4.6.1
* reviewed various promises about 4.6.1

Change-Id: I6d8549e1f47c53367db275c3091b02556af3b8d8
Fixes for install guide page.

Editorial fixes to rename GMX_LIBS_SUFFIX and provide an example
of proper usage of adding suffixes.  These edits now keep the .tex
file in sync with the edits manually made to the wiki page.

Change-Id: Iba5b4c66ad3d0d84ddb06591d4681ff48e4de2ee
Update outdated admin things

* remove outdated CMake installation guide
* updated the bootstrap script
* remove outdated admin/README.patches
* update README, including adding reference to
  GROMACS 4.5 paper and DOIs for old papers

Change-Id: I9a55126049806ca67f6ad846cdbd67cc530c7db0
Update shell completions

There's some strange changes of what completions are being generated
for inputs that take multiple files when generated by different 4.6.x
versions, but nobody seems to know what is going on. Also, those
problems do not have a large impact.

Refs #1159

Change-Id: Ib4b1ad4999e1b68904d46b0d01c2a5dd07507fd7
fixed recent bug with sorting atoms for GPUs

The sort buffer in the nbnxn gridding for GPUs was made too small
in 8d6cc146. This led to inconsistency errors (not incorrect output).
This is fixed and the sort_atoms call is now made simpler and
multiple consistency checks are now always on in debug builds.
Fixes #1153

Change-Id: Ifcdf45bb4de88e7584628d3ed2699e2fd469d5c6
Fix regressiontests automated download

Refs #1150

Change-Id: I7ba82b22a75532516f481dcb5e4a870047c0bfe8
fixed bug with DD cut-off check and PME DLB

During the initial stage of PME DLB, the cut-off limit check for the
DD DLB was not checked correcty. This reduced the effectiveness of
both DD and PME DLB and could lead to missing interactions during
a very limited number of steps.
Fixes #1169

Change-Id: I0b0cac22d4abbe8a9b0c16488aeb662d7d4d9bcc
Fix automated regression testing GMXLIB value

Change-Id: I3030a85df4d649106f4620b48374ee41a9bdebc9
New patch release 4.6.1

Change-Id: I60998e3be8c0c7289d0aa5279e554cc79fb74310
Merge "fixed PME time print with -ntomp_pme != -ntomp" into release-4-6
Merge release-4-6 into master

Conflicts:
	CMakeLists.txt (trivial)
	bootstrap (deleted)

Reverted: tests/CMakeLists.txt (GMXLIB - not necessary)

Change-Id: I2f0810ac6343b3629f01169b13c06784ccfd56cf
Merge "Merge release-4-6 into master"
Fix problems with intel-mpi

The mpich version with intel-mpi has a naming conflict of SEEK_SET
between stdio and the C++ binding of MPI. It would be sufficient
to set MPICH_IGNORE_CXX_SEEK or change the include order, but
given that the C++ binding is deprecated and not used it seems
more constistent to simply disable the MPI C++ binding as a whole.

Also moves the #ifdef for lib-mpi/thread-mpi into one file
and thus simplifies the code.

Change-Id: I9702b840f1d1ac51e99b610a7c125d97cda69164
Merge libgmxana into libgromacs.

- Move contents of src/tools/ into src/gromacs/gmxana/, except for
  g_tune_pme.c and g_pme_error.c.
- Delete unused src/tools/g_membed.c.
- Adjust the build system accordingly, removing references to gmxana.
- Merge contents of libgmxana.pc into libgromacs.pc and remove the
  former.
- Move src/gromacs/legacyheaders/gmx_ana.h into src/gromacs/gmxana/ and
  adjust files that include it accordingly.  Removed a few unnecessary
  inclusions of this header.  Don't install it, as it doesn't do much
  good.
- Merge src/contrib/g_sdf.c into src/contrib/gmx_sdf.c to make it
  independent of gmx_ana.h.  Remove gmx_sdf() from gmx_ana.h.

Closes #1013.

Change-Id: I34ba52fc938823833103123c8ada06d169abf7de