biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3c14bc8 457d046)
Merge release-2019 into master
authorPaul Bauer <paul.bauer.q@gmail.com>
Wed, 31 Jul 2019 13:28:34 +0000 (15:28 +0200)
committerBerk Hess <hess@kth.se>
Thu, 1 Aug 2019 07:53:51 +0000 (09:53 +0200)
commitdac65bb1396dde72175304074e0d8ac226587e15
treea1e019c78d0193e6021179a66c430419feef71b0tree | snapshot
parent3c14bc8b77584e99bb3c4c1d23b9495199aa8632commit | diff
parent457d046bd141a7258cfda4614a23709d911adaabcommit | diff
Merge release-2019 into master

Resolved Conflicts:
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
docs/release-notes/2019/2019.2.rst
src/external/build-fftw/CMakeLists.txt
src/gromacs/awh/read-params.cpp
src/gromacs/awh/read-params.h
src/gromacs/domdec/domdec_internal.h
src/gromacs/ewald/pme-gather.clh
src/gromacs/fileio/gmx_internal_xdr.cpp
src/gromacs/gmxana/gmx_editconf.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/listed-forces/manage-threading.cpp
src/gromacs/mdlib/broadcaststructs.cpp
src/gromacs/mdlib/membed.cpp
src/gromacs/mdlib/nbnxn_atomdata.cpp
src/gromacs/mdlib/nbnxn_atomdata.h
src/gromacs/mdlib/nbnxn_search.cpp
src/gromacs/mdlib/ns.cpp
src/gromacs/mdrun/runner.cpp
src/programs/mdrun/tests/spc-and-methanol.top

Change-Id: I2c0853732620246cade31f3a66ae23b7ba5b902b
37 files changed:
cmake/gmxDetectAvx512FmaUnits.cmake diff1 | diff2 | blob | history
cmake/gmxManageNvccConfig.cmake diff1 | diff2 | blob | history
docs/CMakeLists.txt diff1 | diff2 | blob | history
docs/install-guide/index.rst diff1 | diff2 | blob | history
docs/reference-manual/references.rst diff1 | diff2 | blob | history
docs/release-notes/index.rst diff1 | diff2 | blob | history
docs/user-guide/mdp-options.rst diff1 | diff2 | blob | history
docs/user-guide/mdrun-performance.rst diff1 | diff2 | blob | history
src/external/build-fftw/CMakeLists.txt diff1 | diff2 | blob | history
src/gromacs/awh/awh.cpp diff1 | diff2 | blob | history
src/gromacs/awh/read_params.cpp diff1 | | blob | history
src/gromacs/awh/read_params.h diff1 | diff2 | blob | history
src/gromacs/domdec/domdec.cpp diff1 | diff2 | blob | history
src/gromacs/domdec/domdec_internal.h diff1 | diff2 | blob | history
src/gromacs/domdec/domdec_struct.h diff1 | diff2 | blob | history
src/gromacs/ewald/pme.cpp diff1 | diff2 | blob | history
src/gromacs/ewald/pme_gather.clh diff1 | | blob | history
src/gromacs/fileio/pdbio.cpp diff1 | diff2 | blob | history
src/gromacs/gmxana/gmx_wham.cpp diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/editconf.cpp diff1 | | blob | history
src/gromacs/gmxpreprocess/gmxcpp.cpp diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/gmxcpp.h diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/grompp.cpp diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/toppush.cpp diff1 | diff2 | blob | history
src/gromacs/listed_forces/manage_threading.cpp diff1 | | blob | history
src/gromacs/mdlib/broadcaststructs.cpp diff1 | diff2 | blob | history
src/gromacs/mdlib/membed.cpp diff1 | diff2 | blob | history
src/gromacs/mdlib/shake.cpp diff1 | diff2 | blob | history
src/gromacs/mdrun/legacymdrunoptions.h diff1 | diff2 | blob | history
src/gromacs/mdrun/minimize.cpp diff1 | diff2 | blob | history
src/gromacs/mdrun/runner.cpp diff1 | diff2 | blob | history
src/gromacs/nbnxm/pairlist.cpp diff1 | | blob | history
src/gromacs/pulling/pull.cpp diff1 | diff2 | blob | history
src/gromacs/pulling/pullutil.cpp diff1 | diff2 | blob | history
src/gromacs/selection/indexutil.cpp diff1 | diff2 | blob | history
src/gromacs/selection/sm_simple.cpp diff1 | diff2 | blob | history
src/programs/mdrun/tests/refdata/MdrunTest_WritesHelp.xml diff1 | | blob | history
Local GROMACS mirror with custom stuff