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

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

author	Mark Abraham <mark.j.abraham@gmail.com>
	Thu, 14 Nov 2013 17:35:56 +0000 (18:35 +0100)
committer	Mark Abraham <mark.j.abraham@gmail.com>
	Fri, 15 Nov 2013 17:32:49 +0000 (18:32 +0100)
commit	b67e4ac94431bc0793468280ee8d10305e03942d
tree	79ce18d2ae3f45927073d0a96e143e5f7e379947	tree \| snapshot
parent	6a1ea2da02c829110029d3aee8823525ff1518b7	commit \| diff
parent	90857e3bee86dd7f92ff9063fdb457246908423e	commit \| diff

Merge branch release-4-6

Conflicts:
CMakeLists.txt
cmake/gmxDetectAcceleration.cmake
cmake/gmxSetBuildInformation.cmake
include/gpu_utils.h
include/nbnxn_cuda_data_mgmt.h
include/string2.h
src/gromacs/gmxlib/gmx_detect_hardware.c
src/gromacs/legacyheaders/domdec.h
src/gromacs/legacyheaders/force.h
src/gromacs/legacyheaders/gmx_detect_hardware.h
src/gromacs/legacyheaders/network.h
src/programs/mdrun/mdrun.cpp
src/programs/mdrun/runner.c
Resolved in favour of release-4-6, except for details like
the use of gmx_unused and changes to include file locations

share/html/gmxfaq.html
Deleted as in release-4-6

share/html/online.html
Retained master version because this file is not generated
in master branch.

Did a little bit of uncrustify on areas that were already changing

Change-Id: I3ecf623a65eb4dac208a239e1b35141d08512483

38 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
admin/installguide/installguide.tex	diff1 \|	diff2 \|	blob \| history
admin/mkhtml	diff1 \|	diff2 \|	blob \| history
cmake/gmxDetectAcceleration.cmake	diff1 \|	diff2 \|	blob \| history
cmake/gmxSetBuildInformation.cmake	diff1 \|	diff2 \|	blob \| history
share/html/online/getting_started.html	diff1 \|	diff2 \|	blob \| history
share/html/online/mdp_opt.html	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/gmx_cpuid.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gmx_detect_hardware.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gmx_thread_affinity.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gpu_utils/gpu_utils.cu	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/network.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/string2.c	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/domdec.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/force.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gmx_cpuid.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gmx_detect_hardware.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gmx_simd_macros.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gpu_utils.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/mdrun.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/nbnxn_cuda_data_mgmt.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/network.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/string2.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/types/forcerec.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/types/hw_info.h	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_search.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	\|	blob \| history
src/programs/mdrun/mdrun.cpp	diff1 \|	\|	blob \| history
src/programs/mdrun/pme_loadbal.c	diff1 \|	\|	blob \| history
src/programs/mdrun/runner.c	diff1 \|	\|	blob \| history
tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
admin/installguide/installguide.tex	diff1 \|	diff2 \|	blob \| history
admin/mkhtml	diff1 \|	diff2 \|	blob \| history
cmake/gmxDetectAcceleration.cmake	diff1 \|	diff2 \|	blob \| history
cmake/gmxSetBuildInformation.cmake	diff1 \|	diff2 \|	blob \| history
share/html/online/getting_started.html	diff1 \|	diff2 \|	blob \| history
share/html/online/mdp_opt.html	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxlib/gmx_cpuid.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gmx_detect_hardware.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gmx_thread_affinity.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/gpu_utils/gpu_utils.cu	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/network.c	diff1 \|	\|	blob \| history
src/gromacs/gmxlib/string2.c	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/domdec.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/force.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gmx_cpuid.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gmx_detect_hardware.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gmx_simd_macros.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/gpu_utils.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/mdrun.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/nbnxn_cuda_data_mgmt.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/network.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/string2.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/types/forcerec.h	diff1 \|	\|	blob \| history
src/gromacs/legacyheaders/types/hw_info.h	diff1 \|	\|	blob \| history
src/gromacs/mdlib/domdec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/forcerec.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_search.c	diff1 \|	\|	blob \| history
src/gromacs/mdlib/sim_util.c	diff1 \|	\|	blob \| history
src/programs/mdrun/mdrun.cpp	diff1 \|	\|	blob \| history
src/programs/mdrun/pme_loadbal.c	diff1 \|	\|	blob \| history
src/programs/mdrun/runner.c	diff1 \|	\|	blob \| history
tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history