BioD PNPI Git Repos - alexxy/gromacs.git/commit - docs/reference-manual/analysis/radial-distribution-function.rst

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

author	Roland Schulz <roland.schulz@intel.com>
	Wed, 4 Jul 2018 19:11:14 +0000 (12:11 -0700)
committer	Roland Schulz <roland.schulz@intel.com>
	Wed, 4 Jul 2018 19:25:32 +0000 (12:25 -0700)
commit	c9480da0eb72c2ed2ddc33c93095d138e391f483
tree	5c177369ac39e5c6d81bf5d481ff1b2c99510045	tree \| snapshot
parent	ddc2297bba8efc4007bc58ac687b3cf8ab69368d	commit \| diff
parent	38eea667d724be5cf976345a93d7d59afb35fff3	commit \| diff

Merge release-2018 into master

Changes to fix errors:
gmx_editconf.cpp: clang-tidy fix-it
mdlib/constr.cpp: -> to .

Trivial conflicts:
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
src/external/build-fftw/CMakeLists.txt
src/gromacs/awh/read-params.cpp
src/gromacs/commandline/cmdlineprogramcontext.cpp
src/gromacs/gpu_utils/ocl_compiler.cpp

Change-Id: I1776d8c9a766e46f7212cb0ca3bb3ecb0f312fa5

38 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxVersionInfo.cmake	diff1 \|	diff2 \|	blob \| history
docs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
docs/install-guide/index.rst	diff1 \|	diff2 \|	blob \| history
docs/release-notes/index.rst	diff1 \|	diff2 \|	blob \| history
src/buildinfo.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/external/build-fftw/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/awh/bias.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/awh/biasparams.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/awh/biasstate.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/awh/grid.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/awh/read-params.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/commandline/cmdlineprogramcontext.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/confio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/pdbio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/trxio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_do_dssp.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_editconf.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_enemat.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_mindist.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/solvate.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gpu_utils/gpu_utils.cu	diff1 \|	diff2 \|	blob \| history
src/gromacs/gpu_utils/gpu_utils.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gpu_utils/ocl_compiler.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/hardware/detecthardware.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/constr.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/gmx_omp_nthreads.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/gmx_omp_nthreads.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/md_support.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/vcm.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdrun/minimize.cpp	diff1 \|	\|	blob \| history
src/gromacs/mdrun/runner.cpp	diff1 \|	\|	blob \| history
src/gromacs/pbcutil/mshift.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/taskassignment/resourcedivision.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/taskassignment/resourcedivision.h	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxVersionInfo.cmake	diff1 \|	diff2 \|	blob \| history
docs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
docs/install-guide/index.rst	diff1 \|	diff2 \|	blob \| history
docs/release-notes/index.rst	diff1 \|	diff2 \|	blob \| history
src/buildinfo.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	diff1 \|	diff2 \|	blob \| history
src/external/build-fftw/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/awh/bias.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/awh/biasparams.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/awh/biasstate.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/awh/grid.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/awh/read-params.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/commandline/cmdlineprogramcontext.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/confio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/pdbio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/trxio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_do_dssp.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_editconf.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_enemat.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_mindist.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/solvate.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gpu_utils/gpu_utils.cu	diff1 \|	diff2 \|	blob \| history
src/gromacs/gpu_utils/gpu_utils.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/gpu_utils/ocl_compiler.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/hardware/detecthardware.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/constr.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/gmx_omp_nthreads.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/gmx_omp_nthreads.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/md_support.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/vcm.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdrun/minimize.cpp	diff1 \|	\|	blob \| history
src/gromacs/mdrun/runner.cpp	diff1 \|	\|	blob \| history
src/gromacs/pbcutil/mshift.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/taskassignment/resourcedivision.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/taskassignment/resourcedivision.h	diff1 \|	diff2 \|	blob \| history