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

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

author	Roland Schulz <roland@utk.edu>
	Sun, 10 Mar 2013 21:25:44 +0000 (17:25 -0400)
committer	Roland Schulz <roland@utk.edu>
	Wed, 20 Mar 2013 06:09:06 +0000 (02:09 -0400)
commit	34c86c4451c323cdc346674ad6ba5ccb10ad13e6
tree	c0c962d32e4cdee52ef4daa34d5e37154bf1dd4f	tree \| snapshot
parent	16047b6ad105d842862e0adbca5d1436332dfba8	commit \| diff
parent	873b98540a47a5727e69342117ab71f8c8b75072	commit \| diff

Merge release-4-6 into master

Conflicts:
CMakeLists.txt (trivial)
bootstrap (deleted)

Reverted: tests/CMakeLists.txt (GMXLIB - not necessary)

Change-Id: I2f0810ac6343b3629f01169b13c06784ccfd56cf

34 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/mvdata.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/make_nb_kernel_adress_c.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/thread_mpi/pthreads.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/gmx_wallcycle.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_atomdata.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_internal.h	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_search.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/ns.c	diff1 \|	\|	blob \| history
src/tools/gmx_dipoles.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_order.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history
tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/mvdata.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/make_nb_kernel_adress_c.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/thread_mpi/pthreads.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/gmx_wallcycle.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_atomdata.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_internal.h	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_search.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/ns.c	diff1 \|	\|	blob \| history
src/tools/gmx_dipoles.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_order.c	diff1 \|	diff2 \|	blob \| history
src/tools/gmx_tune_pme.c	diff1 \|	diff2 \|	blob \| history
tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history