Homec4science

Merge branch 'USER-DPD_GBhacks' into USER-DPD_GBhacks_ssa_mem as of patch…

Authored by Tim Mattox <timothy.mattox@engilitycorp.com> on Apr 5 2017, 22:38.

Description

Merge branch 'USER-DPD_GBhacks' into USER-DPD_GBhacks_ssa_mem as of patch 31March17

Event Timeline

Tim Mattox <timothy.mattox@engilitycorp.com> committed rLAMMPSad5481831fdc: Merge branch 'USER-DPD_GBhacks' into USER-DPD_GBhacks_ssa_mem as of patch… (authored by Tim Mattox <timothy.mattox@engilitycorp.com>).Apr 5 2017, 22:38

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
456926a32195Tim Mattox
Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks as of patch 31March17 
Apr 5 2017
bceaa5761426Tim Mattox
Merge branch 'master' into USER-DPD_kokkos as of patch 31Mar17 
Apr 5 2017
4d4b6f66b713Stan Moore
Changing default gb/test to on 
Apr 5 2017
aedd7c57f3f7Stan Moore
Reset atom map values from restart file 
Apr 4 2017
6ba59cb4583cDan Ibanez/Stan Moore
fix memory leak in fix_shardlow_kokkos 
Apr 1 2017
fe82926c1f41Dan Ibanez/Stan Moore
fix memory leaks in pair_tabl_rx_kokkos 
Apr 1 2017
697b0725524dStan Moore/GitHub
Merge pull request #21 from ibaned/dpd-memleaks 
Apr 1 2017
5edbd6392068Dan Ibanez
fix memory leak in fix_shardlow_kokkos 
Apr 1 2017
bf4f0817d4f8Dan Ibanez
fix memory leaks in pair_tabl_rx_kokkos 
Mar 31 2017
085958f06575Dan Ibanez
Merge remote-tracking branch 'timattox/USER-DPD_GBhacks' into dpd-memleaks 
Mar 31 2017
ae56b9ad8915Steve Plimpton
patch 31Mar17 for stable release 
Mar 30 2017
4466d9fb4a47sjplimp/GitHub
Merge pull request #440 from ohenrich/user-cgdna 
Mar 30 2017
ac1aa9edea39Oliver Henrich
Updated README 
Mar 29 2017
c733204a700cOliver Henrich
Updated lammps.book and install script 
Mar 29 2017
4b9d0a956632Steve Plimpton
sync with SVN 
Mar 28 2017
0637f2387518Steve Plimpton
patch 28Mar17 
Mar 28 2017
b3d6d9f8cf3eDan Ibanez/Stan Moore
fix memory leak via NeighListKokkos::clean_copy() 
Mar 28 2017
9f6e126a2f2esjplimp/GitHub
Merge pull request #437 from ohenrich/user-cgdna 
Mar 28 2017
645f56cf7021sjplimp/GitHub
Merge pull request #436 from Pakketeretet2/better_incorrect_input_handling_nh 
Mar 28 2017
80e5111dcabcsjplimp/GitHub
Merge pull request #434 from akohlmey/imgflags-in-library 
Mar 28 2017
7e9f05b617adsjplimp/GitHub
Merge pull request #433 from akohlmey/fixes-for-stable 
Mar 28 2017
1d8f0c762d2cAxel Kohlmeyer
Merge branch 'master' into fixes-for-stable 
Mar 28 2017
ef6070cbdeb5Axel Kohlmeyer
remove executable permissions for potential files 
Mar 28 2017
61f3ff1d2be2Steve Plimpton
Merge branch 'master' of github.com:lammps/lammps 
Mar 28 2017
111d350a223fSteve Plimpton
fix gcmc units change for chemical potential 
Mar 28 2017
1dfd61f532a6sjplimp/GitHub
Merge pull request #432 from Pakketeretet2/user_manifold_fix 
Mar 28 2017
5c1f5462e792Oliver Henrich
Removed contribution line from header files 
Mar 28 2017
66a6375405b6Oliver Henrich
Resolved merge conflict 
Mar 28 2017
604afebf6fefOliver Henrich
Update to oxDNA2 
Mar 28 2017
8afed61db1c8Oliver Henrich
Upgrade to oxDNA2 
Mar 28 2017
ee55a981032fStefan Paquay
Changed the check on initial and final temperature to <= 0 for both. 
Mar 28 2017
f8da9a866a73Axel Kohlmeyer
synchronize dump custom/vtk documentation with that of dump custom 
Mar 28 2017
28bdebd3c045Axel Kohlmeyer
avoid segfault when calling PPPM*::memory_usage() before grid communication is… 
Mar 28 2017
fc51c38abb2bAxel Kohlmeyer
add some docs for the special treatment of image flags 
Mar 28 2017
443ea13effa4Axel Kohlmeyer
add image flag packing/unpacking to library/python interface 
Mar 28 2017
5feeb79c13f2Axel Kohlmeyer
one more line of dead code removed 
Mar 27 2017
a241b2d0f7c8Axel Kohlmeyer
fix problems with references 
Mar 27 2017
61e7595a94bfAxel Kohlmeyer
remove references to xmovie, streamline dump and viz descriptions 
Mar 27 2017
da9096750e55Axel Kohlmeyer
update .gitignore for newly added files 
Mar 27 2017
87ea9ba66162Axel Kohlmeyer
bugfix for library interface 
Mar 27 2017
c041727e4fedAxel Kohlmeyer
remove dead code and reduce trivial compiler warnings (clang++) 
Mar 27 2017
3feffbe1de32Stefan Paquay
Removed diagnostics. 
Mar 27 2017
04fd038d350bStefan Paquay
Fixed a bug with equal-style variables as manifold params. 
Mar 27 2017
3dfe4505ddcbSteve Plimpton
24Mar17 patch sync with SVN 
Mar 24 2017
394e9b42b06aSteve Plimpton
new CHARMM pair styles with force swithing/shifting 
Mar 24 2017
e6fcaefe95d3sjplimp/GitHub
Merge pull request #431 from v0i0/fix-airebo-morse 
Mar 24 2017
f5a85d68add0sjplimp/GitHub
Merge pull request #429 from akohlmey/updates-for-stable 
Mar 24 2017
277b93cb8956sjplimp/GitHub
Merge pull request #417 from tonnamb/add-pair-zhou 
Mar 24 2017
8820315ff96aAxel Kohlmeyer
Merge branch 'master' into updates-for-stable 
Mar 23 2017
44841f689127Steve Plimpton
fix ave/chunk fixes, 2d disc option, fix_modify dynamic/dof 
Mar 23 2017