biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 52cbaca 39cd3a3)
Merge branch 'release-2019' into master
authorPaul Bauer <paul.bauer.q@gmail.com>
Wed, 20 Feb 2019 12:50:49 +0000 (13:50 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Wed, 20 Feb 2019 12:50:49 +0000 (13:50 +0100)
commitf34c351274ba0a20aaeae56babbb8b3f44cadcb3
tree20b90be6021d64f0488e4ff9a7b08942ee3d114etree | snapshot
parent52cbaca4af40da2c459cee7e0b38221c42a8975fcommit | diff
parent39cd3a33d38ab79282ad57838f3e9f088efa20f3commit | diff
Merge branch 'release-2019' into master

Kept the way topologyinformation was removed from solvate and
insert_molecules in 2019.

Resolved Conflicts:
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
docs/user-guide/mdp-options.rst
src/gromacs/gmxpreprocess/insert-molecules.cpp
src/gromacs/gmxpreprocess/solvate.cpp
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_utils.clh
src/gromacs/mdlib/sim_util.cpp
src/gromacs/trajectoryanalysis/topologyinformation.cpp

Change-Id: I2576133c4bc7a3c55cedb29e9832bb5afa8fe76f
26 files changed:
cmake/gmxManageNvccConfig.cmake diff1 | diff2 | blob | history
cmake/gmxSimdFlags.cmake 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
docs/user-guide/mdp-options.rst diff1 | diff2 | blob | history
src/gromacs/CMakeLists.txt diff1 | diff2 | blob | history
src/gromacs/domdec/partition.cpp diff1 | diff2 | blob | history
src/gromacs/ewald/pme.cpp diff1 | diff2 | blob | history
src/gromacs/ewald/tests/pmetestcommon.cpp diff1 | diff2 | blob | history
src/gromacs/ewald/tests/testhardwarecontexts.cpp diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/insert_molecules.cpp diff1 | | blob | history
src/gromacs/gmxpreprocess/readir.cpp diff1 | diff2 | blob | history
src/gromacs/gmxpreprocess/solvate.cpp diff1 | diff2 | blob | history
src/gromacs/mdlib/constr.cpp diff1 | diff2 | blob | history
src/gromacs/mdlib/constr.h diff1 | diff2 | blob | history
src/gromacs/mdlib/force.cpp diff1 | diff2 | blob | history
src/gromacs/mdlib/sim_util.cpp diff1 | diff2 | blob | history
src/gromacs/mdrun/rerun.cpp diff1 | diff2 | blob | history
src/gromacs/mdrun/runner.cpp diff1 | diff2 | blob | history
src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel_utils.cuh diff1 | | blob | history
src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel_utils.clh diff1 | | blob | history
src/gromacs/taskassignment/decidegpuusage.cpp diff1 | diff2 | blob | history
src/gromacs/taskassignment/resourcedivision.cpp diff1 | diff2 | blob | history
src/gromacs/trajectoryanalysis/topologyinformation.cpp diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff