Merge remote-tracking branch 'upstream/lammps-icms' into improved_python_interface
Description
Description
Details
Details
- Committed
Richard Berger <richard.berger@temple.edu> Jun 28 2016, 18:08 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS7d17dd1bf0d0: Merge remote-tracking branch 'upstream/lammps-icms' into…
rLAMMPSd8670ba7e328: Merge branch 'merge-gpu-patch' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
d8670ba7e328 | Axel Kohlmeyer | Merge branch 'merge-gpu-patch' into lammps-icms | Jun 24 2016 | |||
1bfe3a3ff5ba | Axel Kohlmeyer | Merge branch 'merge-pull-100' into lammps-icms | Jun 24 2016 | |||
9a31a5469319 | Axel Kohlmeyer | fix a few small issues on USER-HADRESS docs. still much more work to do. | Jun 24 2016 | |||
317dcdf1783b | Axel Kohlmeyer | Cleanup of USER-HADRESS documentation to match the current state. regenerate… | Jun 24 2016 | |||
6ba8906ce2fe | Axel Kohlmeyer | Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge… | Jun 24 2016 | |||
7c016aee735e | Axel Kohlmeyer | remove trailing whitespace and replace tabs with spaces in gpu library and… | Jun 24 2016 | |||
b56bdd2d7bf3 | Axel Kohlmeyer | remove trailing whitespace in gpu library | Jun 24 2016 | |||
bc8c50615c6d | Axel Kohlmeyer | include patch from trung that addresses issues when using manybody potentials… | Jun 24 2016 | |||
b69f79ca1b98 | MaziarHeidari | HADRESS_Version_24_Jun_2016 | Jun 24 2016 | |||
3424786a4779 | MaziarHeidari | HADRESS_Version_24_Jun_2016 | Jun 24 2016 | |||
1ed74de9a87f | MaziarHeidari | HADRESS_Version_24_Jun_2016 | Jun 24 2016 | |||
7e4cd4643459 | MaziarHeidari | HADRESS_Version_24_Jun_2016 | Jun 24 2016 | |||
1f7f7bf12b45 | MaziarHeidari | HADRESS_Version_24_Jun_2016 | Jun 24 2016 | |||
2e4fdec2869b | MaziarHeidari | HADRESS_Version_24_Jun_2016 | Jun 24 2016 | |||
824c0a359638 | MaziarHeidari | HADRESS_Version_24_Jun_2016 | Jun 24 2016 | |||
95ec7a3c0e70 | Axel Kohlmeyer | fixup CR-LF mess | Jun 24 2016 | |||
52f73246b731 | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | Jun 24 2016 | |||
ffc252e7843c | stamoor | Adding Kokkos ReaxFF files | Jun 23 2016 | |||
0434eb168973 | stamoor | Adding Kokkos ReaxFF files | Jun 23 2016 | |||
8a8758f32161 | Axel Kohlmeyer | Merge branch 'merge-pull-105' into lammps-icms | Jun 23 2016 | |||
84b7bce41cf6 | Axel Kohlmeyer | Merge branch 'USER-DPD_restore_atom_style_support' of https://github. | Jun 23 2016 | |||
fb69d36b3eab | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | Jun 23 2016 | |||
1647a54020fb | Tim Mattox | Fix missing newlines in a few USER-DPD example input files. | Jun 23 2016 | |||
84d79d769f16 | Tim Mattox | Update the documentation for atom_style restrictions for USER-DPD. | Jun 23 2016 | |||
297f31387fcf | Tim Mattox | Restore use of "atom_style atomic" in two of the USER-DPD examples. | Jun 23 2016 | |||
0ccd6c6ed96d | Tim Mattox | Move ssaAIR calculation code from atom_vec_dpd into fix_shardlow. Re-enables… | Jun 23 2016 | |||
a0cadae11ebd | Axel Kohlmeyer | Merge branch 'merge-pull-104' into lammps-icms | Jun 23 2016 | |||
6fa216d96cbe | Axel Kohlmeyer | add missing newline characters | Jun 23 2016 | |||
67c60a3ac725 | Axel Kohlmeyer | Merge branch 'update-user-manifold' of https://github.com/Pakketeretet2/lammps… | Jun 23 2016 | |||
eaa3e82aff1a | Stefan Paquay | Forgot closing quotes. | Jun 23 2016 | |||
20681bac1a63 | Stefan Paquay | Fixed bibtex entry to be proper bibtex. | Jun 23 2016 | |||
987f7f19c80c | Stefan Paquay | removed morse soft from wrong branch. | Jun 23 2016 | |||
fa7c2cea4d38 | stamoor | Adding Kokkos mpi-only Makefile | Jun 22 2016 | |||
a1239e65607a | Tim Mattox | Fix the SSA AIR number for ghosts that fall exactly on the upper boundary. Bug… | Jun 21 2016 | |||
396523a0daac | Axel Kohlmeyer | Merge branch 'add-gw' into lammps-icms | Jun 21 2016 | |||
19e4cc0f101f | Axel Kohlmeyer | Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… | Jun 21 2016 | |||
ca443e0b6da8 | Axel Kohlmeyer | Merge branch 'USER-DPD_restartfix' of https://github.com/timattox/lammps into… | Jun 21 2016 | |||
7e65f67f2ba2 | Tim Mattox | Fixes a bug when attempting to restart a reaction DPD calculation. | Jun 21 2016 | |||
b01d83f17801 | Axel Kohlmeyer | force initialization of some member variables in compute rigid/local | Jun 21 2016 | |||
455c123191c4 | Stefan Paquay | Fixed the citation to be a valid bibtex format. | Jun 21 2016 | |||
881dd7608c13 | Axel Kohlmeyer | undo commit enabling a known to be broken feature | Jun 20 2016 | |||
9cab25d42c8b | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | Jun 20 2016 | |||
2f5827189b3c | Axel Kohlmeyer | Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge… | Jun 20 2016 | |||
d40eaf99429a | MaziarHeidari | HADRESS_NEW_REVISION | Jun 20 2016 | |||
4e62aa6510fc | Axel Kohlmeyer | Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge… | Jun 20 2016 | |||
10435ca8dcc7 | MaziarHeidari | HADRESS_NEW_REVISION | Jun 20 2016 | |||
e707236bf733 | MaziarHeidari | HADRESS_NEW_REVISION | Jun 20 2016 | |||
38c80e129fe8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15210 f3b2605a-c512-4ea7… | Jun 18 2016 | |||
3ea4562a598a | Stefan Paquay | removed ramp again. | Jun 10 2016 | |||
d853ac5fd85f | Stefan Paquay | Updated pair_morse_soft to have a smoother ramp for lf < l < 1. | Jun 10 2016 |