Merge remote-tracking branch 'origin/master' into exaalt
Description
Description
Details
Details
- Committed
Christoph Junghans <junghans@votca.org> Sep 8 2017, 15:04 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS7b1542a0ba2b: merging stable and exaalt branches into exaaltstable
rLAMMPSc80203cb0115: Merge pull request #641 from lammps/doc-tweak - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| c80203cb0115 | Steve Plimpton/GitHub | Merge pull request #641 from lammps/doc-tweak | Sep 6 2017 | |||
| 4161868bcf69 | Steve Plimpton/GitHub | Merge pull request #640 from ohenrich/user-cgdna | Sep 6 2017 | |||
| 9ca39c89a6a3 | Steve Plimpton/GitHub | Merge pull request #639 from rbberger/python_interface_improvements | Sep 6 2017 | |||
| 99791ce01c09 | Steve Plimpton/GitHub | Merge pull request #632 from timattox/USER-DPD_kokkos_merge | Sep 6 2017 | |||
| 0248a7b98e9e | Tim Mattox | remove duplicate listing of deleted USER-DPD files from Purge.list | Sep 6 2017 | |||
| d886cc91f3b3 | Axel Kohlmeyer | fix syntax error in fix saed/vtk docs example | Sep 5 2017 | |||
| 4c5d901e2b04 | Axel Kohlmeyer | fix stupid typo (too much compiling of fortran codes...) | Sep 5 2017 | |||
| c8f92c1a617a | Axel Kohlmeyer | add a couple deleted files from USER-DPD to Purge.list | Sep 5 2017 | |||
| dec1d7b2dc48 | Axel Kohlmeyer | re-indent so that gcc no longer complains about inconsistent indentation | Sep 5 2017 | |||
| 45602e58f99a | Axel Kohlmeyer/GitHub | fix another couple of typos | Sep 5 2017 | |||
| cd72532fb934 | Axel Kohlmeyer/GitHub | fix typo | Sep 5 2017 | |||
| b1706060529b | Steve Plimpton/GitHub | Merge pull request #620 from amilumas/master | Sep 5 2017 | |||
| 65b295e826aa | Steve Plimpton/GitHub | Merge pull request #638 from jdevemy/master | Sep 5 2017 | |||
| 89a0bc947f01 | Steve Plimpton | small update to docs for new commands | Sep 5 2017 | |||
| c8967a335f26 | Oliver Henrich | Included hyperlink to package | Sep 5 2017 | |||
| 2105145f55e6 | Oliver Henrich | More minor changes | Sep 5 2017 | |||
| f7715ab6ce3c | Oliver Henrich | Added comment about optimised damping coefficient for BD | Sep 5 2017 | |||
| 12fe614ddf58 | Oliver Henrich | Added sequence-dependent stacking and base-pairing strength | Sep 5 2017 | |||
| 0b5a2e199ddb | Richard Berger | Add way of getting correct ctypes integer type for bigint, tagint, and imageint | Sep 5 2017 | |||
| 09bb687918e6 | Richard Berger | Correct indentation | Sep 5 2017 | |||
| bb3ee752e5e9 | Richard Berger | Added optional numpy access to atom data | Sep 5 2017 | |||
| 6b2d321d1899 | Richard Berger | Add missing globals in library interface | Sep 5 2017 | |||
| 2b9646097c86 | Steve Plimpton | Merge branch 'master' of github.com:lammps/lammps | Sep 1 2017 | |||
| f58088ae619d | Steve Plimpton | patch 1Sep17 | Sep 1 2017 | |||
| 397bc225b27c | Axel Kohlmeyer | add temper/npt to src/USER-MISC/README | Aug 31 2017 | |||
| d9d9ba824474 | Axel Kohlmeyer | update .gitignore | Aug 31 2017 | |||
| eba4be18c29a | Axel Kohlmeyer | adapt formatting and naming conventions to fully match LAMMPS style. allow… | Aug 31 2017 | |||
| 4d2ed30b3526 | Axel Kohlmeyer | add reference outputs to temper/npt example | Aug 31 2017 | |||
| f3dda30f8ef3 | Axel Kohlmeyer | fully integrate temper/npt command into manual | Aug 31 2017 | |||
| d95a5f219e69 | Stan Moore | Remove all thread fences except one in verlet_kokkos | Aug 31 2017 | |||
| a5b65c1af48c | Julien Devemy | Mods for extra/special/per/atom and add toluene | Aug 31 2017 | |||
| 3e6cdd140011 | Tim Mattox | USER-DPD: finish renaming #ifdef DEBUG_PAIR_CT to DEBUG_SSA_PAIR_CT | Aug 30 2017 | |||
| dc7f1281b832 | Tim Mattox | USER-DPD: Kokkos version of Const Temperature DPD isn't implemented yet | Aug 30 2017 | |||
| 2dd202cc761d | Tim Mattox | USER-DPD: remove some out-of-date FIXME comments in fix_shardlow_kokkos.cpp | Aug 30 2017 | |||
| f2d8c37f27b1 | Tim Mattox | Rename SSA specific debug #ifdef to DEBUG_SSA_PAIR_CT | Aug 30 2017 | |||
| a4a45f1d9cfb | Stan Moore | Remove unnecessary check in npair_kokkos | Aug 30 2017 | |||
| f57d19492051 | Amulya/GitHub | Add files via upload | Aug 29 2017 | |||
| 736e063971bc | Tim Mattox | Merge branch 'master' (21893539cb Aug 25) into USER-DPD_kokkos_merge | Aug 28 2017 | |||
| 6a4bbddb3b7a | Amulya/GitHub | Add files via upload | Aug 28 2017 | |||
| 2add18e013dd | Amulya/GitHub | Create in.temper_npt | Aug 28 2017 | |||
| d0efd3a422ab | Amulya/GitHub | Add files via upload | Aug 28 2017 | |||
| 21893539cbca | Steve Plimpton/GitHub | Merge pull request #633 from lammps/doc-user-meso | Aug 26 2017 | |||
| dd101db79ced | Steve Plimpton/GitHub | Merge pull request #582 from stanmoore1/kk_changes | Aug 26 2017 | |||
| 81ba181349d7 | Steve Plimpton | tweak an eq in USER-MESO, also allow neigh to be built w/out styles | Aug 26 2017 | |||
| e52a28f8afaf | Stan Moore | Update docs for Kokkos version of USER-DPD package | Aug 26 2017 | |||
| 01dd0e173e51 | Stan Moore | Merge branch 'master' into USER-DPD_kokkos_merge | Aug 26 2017 | |||
| 1f8c4f2c62df | Stan Moore | Remove hardcoded map variables and debug output | Aug 25 2017 | |||
| b73999ef215c | Stan Moore | Revert change to read_data.cpp | Aug 25 2017 | |||
| 1e16fed9ab94 | Stan Moore | Error out if using pair hybrid with Kokkos, but not pair hybrid/overlay | Aug 25 2017 | |||
| a062944de95e | Stan Moore | Fix execution space issues | Aug 25 2017 |