Merge branch release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 2 Feb 2015 16:06:08 +0000 (17:06 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 2 Feb 2015 16:12:11 +0000 (17:12 +0100)
commita9ab6846e42f1a5ffd59e2271b6721b2ac67aa5c
tree292fa370994cd80b8b0e16b1bae7c43d1223b8d9
parent19f442abed32a06a30f4c1f9b3457dbbce9502b8
parent587c6292500a0424ecff5bd90cd5da475144fa58
Merge branch release-5-0

Implemented usingGpu() for use by md.cpp in the new rerun behaviour,
because nonbonded_verlet_t is now opaque in master
branch. Unfortunately there is not yet a good home for its
implementation, so it's next to the "constructor" in forcerec.cpp.

Fixed typo in copyright header of gmx_detect_hardware.cpp

Conflicts:
src/gromacs/mdlib/forcerec.cpp
Added gromacs/simd/simd.h to the right place, per fix in release-5-0

src/gromacs/mdlib/tpi.cpp
Added gromacs/simd/simd.h to the right place, per fix in release-5-0

src/programs/mdrun/runner.cpp
Trivial conflict from introducing GPU-usage variables
on line before removal of time variables.

Change-Id: I6157d962d183fae4e6874057da01f44ce10e733c
cmake/gmxManageGPU.cmake
src/gromacs/gmxlib/gmx_detect_hardware.cpp
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdlib/nb_verlet.h
src/gromacs/mdlib/tpi.cpp
src/programs/mdrun/md.cpp
src/programs/mdrun/runner.cpp