Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 14 Apr 2016 09:23:52 +0000 (11:23 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 14 Apr 2016 10:04:52 +0000 (12:04 +0200)
commit0e9f664b985abfb43af63695978382539473162c
treedf62ef1bab9fa6d5499222b7b94ca23e1e6cfa9c
parent4cd9198e5505190328276f96c2887f38edc2cfe9
parent36035fb031565bd2e938e6d7db304f7a7e2a9046
Merge branch release-5-1

Several changes from release-5-1 have been fixed separately
in master, such changes are omitted here.

Change-Id: Ib03a2091ad6f76e785f7a6cc9ea91493d246da3b
19 files changed:
cmake/gmxManageGPU.cmake
docs/CMakeLists.txt
docs/manual/forcefield.tex
src/gromacs/correlationfunctions/autocorr.cpp
src/gromacs/correlationfunctions/manyautocorrelation.cpp
src/gromacs/correlationfunctions/tests/autocorr.cpp
src/gromacs/ewald/pme-load-balancing.cpp
src/gromacs/gmxana/gmx_dielectric.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/gmxpreprocess/toppush.cpp
src/gromacs/mdlib/constr.cpp
src/gromacs/mdlib/coupling.cpp
src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.cpp
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.cpp
src/gromacs/mdlib/sim_util.cpp
src/gromacs/mdlib/wall.cpp
src/gromacs/simd/impl_ibm_vmx/impl_ibm_vmx.h
src/gromacs/utility/datafilefinder.cpp
src/programs/mdrun/runner.cpp