Merges in threading branch as one squashed commit
commitcc33f29a858cf32541eb48cfebd35990e5f41b37
authorRoland Schulz <roland@utk.edu>
Sun, 15 Jan 2012 06:18:38 +0000 (15 01:18 -0500)
committerSzilard Pall <pszilard@cbr.su.se>
Thu, 2 Feb 2012 17:32:25 +0000 (2 18:32 +0100)
treedc90dc9ae79be825c624eec4a67e7968481cd55c
parentc2b3c863199be5d8c86eb21d4a469df3149aeca7
Merges in threading branch as one squashed commit

Implements OpenMP threading for PME

All PME (including SSE) code by Berk.
FFT, timer, and CPU affinity code by Roland.
Two bugfixes by Szilard.

Conflicts:
include/gmx_wallcycle.h
src/gmxlib/trxio.c
src/mdlib/Makefile.am
src/mdlib/fft5d.c
src/mdlib/gmx_wallcycle.c
src/tools/acf.test.c

Change-Id: I4bdd0e29caf135ba6b4cc7297640f29f0d136656
18 files changed:
CMakeLists.txt
cmake/FindFFTW3.cmake
cmake/FindFFTW3F.cmake
cmake/gmxCFlags.cmake
include/gmx_parallel_3dfft.h
include/gmx_wallcycle.h
include/network.h
include/pme.h
src/gmxlib/calcgrid.c
src/gmxlib/network.c
src/kernel/runner.c
src/mdlib/fft5d.c
src/mdlib/fft5d.h
src/mdlib/gmx_parallel_3dfft.c
src/mdlib/gmx_wallcycle.c
src/mdlib/pme.c
src/mdlib/pme_sse_single.h [new file with mode: 0644]
src/tools/gmx_membed.c