BioD PNPI Git Repos - alexxy/gromacs.git/commit

biod.pnpi.spb.ru / alexxy / gromacs.git / commit

author	Roland Schulz <roland@utk.edu>
	Sun, 30 Sep 2012 23:24:42 +0000 (19:24 -0400)
committer	Roland Schulz <roland@utk.edu>
	Mon, 1 Oct 2012 18:20:39 +0000 (14:20 -0400)
commit	f6f8a2514473c9e225cc0cdefcd55806c5079284
tree	a5d7c0cdc090dcfab405639d7e8af035dd7b293e	tree \| snapshot
parent	cb1a040c17a66d4fc892256109275ab9a57f95ed	commit \| diff
parent	aeb52f6ee2e2977f84be4b4c4a5b104dcf8fbb6f	commit \| diff

Merge release-4-6 into master

Conflicts:
cmake/ThreadMPI.cmake (resolved)
src/tools/CMakeLists.txt (resolved)
src/gmxlib/CMakeLists.txt
src/kernel/CMakeLists.txt
src/mdlib/CMakeLists.txt
Last three applied to src/gromacs/CMakeLists.txt and
src/programs/mdrun/CMakeLists.txt.

The release-4-6 version is not the most recent. Merge is being done in
several steps.

Change-Id: Ia9ec3c132a6306701866867aa1a4314541203002

42 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/ThreadMPI.cmake	diff1 \|	diff2 \|	blob \| history
cmake/gmxDetectAcceleration.cmake	diff1 \|	diff2 \|	blob \| history
src/gromacs/CMakeLists.txt	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gmx_fatal.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/main.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/thread_mpi/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/impl.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/profile.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/profile.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/pthreads.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/reduce.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/scan.c	\|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/gen_ad.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/pdb2top.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/readadress.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/readpull.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/resall.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/vsite_parm.c	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/edsam.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gen_ad.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/hackblock.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/thread_mpi/mpi_bindings.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/thread_mpi/tmpi.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/edsam.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/groupcoord.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/pme.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/tpi.c	diff1 \|	diff2 \|	blob \| history
src/programs/g_x2top/g_x2top.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxcheck/gmxcheck.c	diff1 \|	diff2 \|	blob \| history
src/programs/grompp/grompp.c	diff1 \|	\|	blob \| history
src/programs/mdrun/CMakeLists.txt	diff1 \|	\|	blob \| history
src/programs/mdrun/md.c	diff1 \|	\|	blob \| history
src/tools/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_cluster.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_covar.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_trjconv.c	diff1 \|	diff2 \|	blob \| history
src/tools/make_edi.c	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/ThreadMPI.cmake	diff1 \|	diff2 \|	blob \| history
cmake/gmxDetectAcceleration.cmake	diff1 \|	diff2 \|	blob \| history
src/gromacs/CMakeLists.txt	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gmx_fatal.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/main.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/thread_mpi/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/impl.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/profile.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/profile.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/pthreads.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/reduce.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/thread_mpi/scan.c	\|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/gen_ad.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/pdb2top.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/readadress.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	\|	blob \| history
src/gromacs/gmxpreprocess/readpull.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/resall.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/vsite_parm.c	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/edsam.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gen_ad.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/hackblock.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/thread_mpi/mpi_bindings.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/thread_mpi/tmpi.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/edsam.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/groupcoord.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/minimize.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/pme.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/tpi.c	diff1 \|	diff2 \|	blob \| history
src/programs/g_x2top/g_x2top.c	diff1 \|	diff2 \|	blob \| history
src/programs/gmxcheck/gmxcheck.c	diff1 \|	diff2 \|	blob \| history
src/programs/grompp/grompp.c	diff1 \|	\|	blob \| history
src/programs/mdrun/CMakeLists.txt	diff1 \|	\|	blob \| history
src/programs/mdrun/md.c	diff1 \|	\|	blob \| history
src/tools/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_cluster.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_covar.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_trjconv.c	diff1 \|	diff2 \|	blob \| history
src/tools/make_edi.c	diff1 \|	diff2 \|	blob \| history