Merge branch 'master' into lammps-icms
Resolved conflict with user gauss,
by keeping the simpler gauss pair style.
and the special gauss pair style only in
the /omp version. temporary changes are
stashed away.
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Oct 15 2010, 20:25 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSf729f1b2793a: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5052 f3b2605a-c512-4ea7…
rLAMMPSf1118ab41dee: Merge branch 'master' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| f729f1b2793a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5052 f3b2605a-c512-4ea7… | Oct 15 2010 | |||
| 4771b8a07b8f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5051 f3b2605a-c512-4ea7… | Oct 15 2010 | |||
| 46a1a3b66e83 | athomps | Made full neighbor list histogram report work when nlocal is zero for some procs | Oct 14 2010 | |||
| 887bd1760c1f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5048 f3b2605a-c512-4ea7… | Oct 14 2010 | |||
| 7b516d0751bd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5047 f3b2605a-c512-4ea7… | Oct 14 2010 | |||
| c507b5f50288 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5045 f3b2605a-c512-4ea7… | Oct 14 2010 | |||
| f7426ff6800b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5044 f3b2605a-c512-4ea7… | Oct 14 2010 | |||
| 269b49de9a02 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5042 f3b2605a-c512-4ea7… | Oct 14 2010 | |||
| 93e85b54d60b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5041 f3b2605a-c512-4ea7… | Oct 14 2010 | |||
| 6dd3d3e40347 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5039 f3b2605a-c512-4ea7… | Oct 14 2010 | |||
| 50e87391449a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5038 f3b2605a-c512-4ea7… | Oct 14 2010 | |||
| 8dca8f6b20f9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5037 f3b2605a-c512-4ea7… | Oct 14 2010 | |||
| 8ba6841a32b0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5036 f3b2605a-c512-4ea7… | Oct 13 2010 | |||
| 4c3d42e04031 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5035 f3b2605a-c512-4ea7… | Oct 13 2010 | |||
| c57a5e2af155 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5034 f3b2605a-c512-4ea7… | Oct 13 2010 | |||
| 2fbdda55e0ec | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5033 f3b2605a-c512-4ea7… | Oct 13 2010 | |||
| 3d419547a22d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5031 f3b2605a-c512-4ea7… | Oct 13 2010 | |||
| 45f5513e535c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5030 f3b2605a-c512-4ea7… | Oct 13 2010 | |||
| 60e0882e6ce5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5027 f3b2605a-c512-4ea7… | Oct 12 2010 | |||
| 51af42b59d07 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5026 f3b2605a-c512-4ea7… | Oct 12 2010 | |||
| 66f5c0f42aeb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5025 f3b2605a-c512-4ea7… | Oct 12 2010 | |||
| 544dde674bfb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5023 f3b2605a-c512-4ea7… | Oct 12 2010 | |||
| a7c21670c844 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5022 f3b2605a-c512-4ea7… | Oct 12 2010 | |||
| 4c837166d360 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5019 f3b2605a-c512-4ea7… | Oct 11 2010 | |||
| 1f68ebab80d5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5018 f3b2605a-c512-4ea7… | Oct 11 2010 | |||
| 50fb5e430b3c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5017 f3b2605a-c512-4ea7… | Oct 11 2010 | |||
| 422c7453a16b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5016 f3b2605a-c512-4ea7… | Oct 8 2010 | |||
| a60d4c6f71f4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5014 f3b2605a-c512-4ea7… | Oct 8 2010 | |||
| 3fb18239d054 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5012 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| 8cc883f2b4ac | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5011 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| becdcdb27d35 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5010 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| 4e67191e823b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5009 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| b14753aae83e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5007 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| 2296334f94b7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5006 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| 79cbe1d30214 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5005 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| 025431ec023d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5003 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| 601a8c627087 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5002 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| addd9d7dad8c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5000 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| 178c27db3ba7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4999 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| 6c68c68cdc5d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4998 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| 9e58ed6bbe33 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4996 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| c696189dfcc9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4995 f3b2605a-c512-4ea7… | Oct 7 2010 | |||
| e20c035199a4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4994 f3b2605a-c512-4ea7… | Oct 7 2010 |
