Merge branch 'USER-DPD_GBhacks' into USER-DPD_GBhacks_ssa_mem as of patch 31March17
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Apr 5 2017, 22:38 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS456926a32195: Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks as of patch 31March17
rLAMMPS2b2f3bd57c1d: USER-DPD Kokkos: #ifdef DEBUG_SSA_BUILD_LOCALS the new debug output - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
456926a32195 | Tim Mattox | Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks as of patch 31March17 | Apr 5 2017 | |||
bceaa5761426 | Tim Mattox | Merge branch 'master' into USER-DPD_kokkos as of patch 31Mar17 | Apr 5 2017 | |||
4d4b6f66b713 | Stan Moore | Changing default gb/test to on | Apr 5 2017 | |||
aedd7c57f3f7 | Stan Moore | Reset atom map values from restart file | Apr 4 2017 | |||
6ba59cb4583c | Dan Ibanez/Stan Moore | fix memory leak in fix_shardlow_kokkos | Apr 1 2017 | |||
fe82926c1f41 | Dan Ibanez/Stan Moore | fix memory leaks in pair_tabl_rx_kokkos | Apr 1 2017 | |||
697b0725524d | Stan Moore/GitHub | Merge pull request #21 from ibaned/dpd-memleaks | Apr 1 2017 | |||
5edbd6392068 | Dan Ibanez | fix memory leak in fix_shardlow_kokkos | Apr 1 2017 | |||
bf4f0817d4f8 | Dan Ibanez | fix memory leaks in pair_tabl_rx_kokkos | Mar 31 2017 | |||
085958f06575 | Dan Ibanez | Merge remote-tracking branch 'timattox/USER-DPD_GBhacks' into dpd-memleaks | Mar 31 2017 | |||
ae56b9ad8915 | Steve Plimpton | patch 31Mar17 for stable release | Mar 30 2017 | |||
4466d9fb4a47 | sjplimp/GitHub | Merge pull request #440 from ohenrich/user-cgdna | Mar 30 2017 | |||
ac1aa9edea39 | Oliver Henrich | Updated README | Mar 29 2017 | |||
c733204a700c | Oliver Henrich | Updated lammps.book and install script | Mar 29 2017 | |||
4b9d0a956632 | Steve Plimpton | sync with SVN | Mar 28 2017 | |||
0637f2387518 | Steve Plimpton | patch 28Mar17 | Mar 28 2017 | |||
b3d6d9f8cf3e | Dan Ibanez/Stan Moore | fix memory leak via NeighListKokkos::clean_copy() | Mar 28 2017 | |||
9f6e126a2f2e | sjplimp/GitHub | Merge pull request #437 from ohenrich/user-cgdna | Mar 28 2017 | |||
645f56cf7021 | sjplimp/GitHub | Merge pull request #436 from Pakketeretet2/better_incorrect_input_handling_nh | Mar 28 2017 | |||
80e5111dcabc | sjplimp/GitHub | Merge pull request #434 from akohlmey/imgflags-in-library | Mar 28 2017 | |||
7e9f05b617ad | sjplimp/GitHub | Merge pull request #433 from akohlmey/fixes-for-stable | Mar 28 2017 | |||
1d8f0c762d2c | Axel Kohlmeyer | Merge branch 'master' into fixes-for-stable | Mar 28 2017 | |||
ef6070cbdeb5 | Axel Kohlmeyer | remove executable permissions for potential files | Mar 28 2017 | |||
61f3ff1d2be2 | Steve Plimpton | Merge branch 'master' of github.com:lammps/lammps | Mar 28 2017 | |||
111d350a223f | Steve Plimpton | fix gcmc units change for chemical potential | Mar 28 2017 | |||
1dfd61f532a6 | sjplimp/GitHub | Merge pull request #432 from Pakketeretet2/user_manifold_fix | Mar 28 2017 | |||
5c1f5462e792 | Oliver Henrich | Removed contribution line from header files | Mar 28 2017 | |||
66a6375405b6 | Oliver Henrich | Resolved merge conflict | Mar 28 2017 | |||
604afebf6fef | Oliver Henrich | Update to oxDNA2 | Mar 28 2017 | |||
8afed61db1c8 | Oliver Henrich | Upgrade to oxDNA2 | Mar 28 2017 | |||
ee55a981032f | Stefan Paquay | Changed the check on initial and final temperature to <= 0 for both. | Mar 28 2017 | |||
f8da9a866a73 | Axel Kohlmeyer | synchronize dump custom/vtk documentation with that of dump custom | Mar 28 2017 | |||
28bdebd3c045 | Axel Kohlmeyer | avoid segfault when calling PPPM*::memory_usage() before grid communication is… | Mar 28 2017 | |||
fc51c38abb2b | Axel Kohlmeyer | add some docs for the special treatment of image flags | Mar 28 2017 | |||
443ea13effa4 | Axel Kohlmeyer | add image flag packing/unpacking to library/python interface | Mar 28 2017 | |||
5feeb79c13f2 | Axel Kohlmeyer | one more line of dead code removed | Mar 27 2017 | |||
a241b2d0f7c8 | Axel Kohlmeyer | fix problems with references | Mar 27 2017 | |||
61e7595a94bf | Axel Kohlmeyer | remove references to xmovie, streamline dump and viz descriptions | Mar 27 2017 | |||
da9096750e55 | Axel Kohlmeyer | update .gitignore for newly added files | Mar 27 2017 | |||
87ea9ba66162 | Axel Kohlmeyer | bugfix for library interface | Mar 27 2017 | |||
c041727e4fed | Axel Kohlmeyer | remove dead code and reduce trivial compiler warnings (clang++) | Mar 27 2017 | |||
3feffbe1de32 | Stefan Paquay | Removed diagnostics. | Mar 27 2017 | |||
04fd038d350b | Stefan Paquay | Fixed a bug with equal-style variables as manifold params. | Mar 27 2017 | |||
3dfe4505ddcb | Steve Plimpton | 24Mar17 patch sync with SVN | Mar 24 2017 | |||
394e9b42b06a | Steve Plimpton | new CHARMM pair styles with force swithing/shifting | Mar 24 2017 | |||
e6fcaefe95d3 | sjplimp/GitHub | Merge pull request #431 from v0i0/fix-airebo-morse | Mar 24 2017 | |||
f5a85d68add0 | sjplimp/GitHub | Merge pull request #429 from akohlmey/updates-for-stable | Mar 24 2017 | |||
277b93cb8956 | sjplimp/GitHub | Merge pull request #417 from tonnamb/add-pair-zhou | Mar 24 2017 | |||
8820315ff96a | Axel Kohlmeyer | Merge branch 'master' into updates-for-stable | Mar 23 2017 | |||
44841f689127 | Steve Plimpton | fix ave/chunk fixes, 2d disc option, fix_modify dynamic/dof | Mar 23 2017 |