Merge branch 'release-4-6'
authorTeemu Murtola <teemu.murtola@gmail.com>
Fri, 20 Sep 2013 03:23:30 +0000 (06:23 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Fri, 20 Sep 2013 03:23:30 +0000 (06:23 +0300)
commitdd08732c88487572bfe26be61dd8b76c127b4912
treec189cd49d950f3e8807372631bd43b7c9c63ec87
parentaf0fe81cf1d30f45daec250520116ca9e172d031
parent4f40d576b762496ba1c809ae41c65ec5005de9fd
Merge branch 'release-4-6'

Merged up to the nbnxn kernel split (i.e., left the current last commit
in release-4-6 yet unmerged).

Conflicts:
    CMakeLists.txt
        (master had changed indentation and added code in suffixing that
         was moved in release-4-6)
    src/gromacs/gmxlib/statutil.cpp
        (code changed in 4.6 removed from master)
    src/gromacs/mdlib/expanded.c (took both changes)
Extra changes:
    src/gromacs/mdlib/nbnxn_search.c (added back a cppcheck suppression)

Change-Id: Ib1d95e53d69714404e594de45442b41d48b5c584
26 files changed:
CMakeLists.txt
src/gromacs/gmxlib/gmx_cpuid.c
src/gromacs/legacyheaders/gmx_cpuid.h
src/gromacs/legacyheaders/gmx_simd_macros.h
src/gromacs/legacyheaders/gmx_simd_ref.h
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/expanded.c
src/gromacs/mdlib/gmx_wallcycle.c
src/gromacs/mdlib/minimize.c
src/gromacs/mdlib/nbnxn_internal.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn.c
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn_inner.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn_outer.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn.c
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn_inner.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn_outer.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_ref.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_128d.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_128s.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_256d.h
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_256s.h
src/gromacs/mdlib/nbnxn_search.c
src/gromacs/mdlib/nbnxn_search_simd_2xnn.h
src/gromacs/mdlib/nbnxn_search_simd_4xn.h
src/programs/mdrun/runner.c