Merge branch 'master' of github.com:lammps/lammps
Description
Description
Details
Details
- Committed
Michele Ceriotti <michele.ceriotti@gmail.com> Jul 3 2015, 15:43 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS357d4517e85f: Merge branch 'master' of github.com:lammps/lammps
rLAMMPS8db4d807260a: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13513 f3b2605a-c512-4ea7… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
8db4d807260a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13513 f3b2605a-c512-4ea7… | Jul 3 2015 | |||
ccfea31ae52b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13512 f3b2605a-c512-4ea7… | Jul 3 2015 | |||
79e142b2ca43 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13511 f3b2605a-c512-4ea7… | Jul 2 2015 | |||
050244f229df | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13510 f3b2605a-c512-4ea7… | Jul 2 2015 | |||
38af3b0ffb75 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13508 f3b2605a-c512-4ea7… | Jul 2 2015 | |||
5db1b37955a6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13507 f3b2605a-c512-4ea7… | Jul 2 2015 | |||
ade2dca6af71 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13506 f3b2605a-c512-4ea7… | Jul 2 2015 | |||
7579964db779 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13505 f3b2605a-c512-4ea7… | Jul 2 2015 | |||
b3242e1962d9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13504 f3b2605a-c512-4ea7… | Jul 2 2015 | |||
7abe03a595fb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13503 f3b2605a-c512-4ea7… | Jul 2 2015 | |||
90d0dd27d288 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13502 f3b2605a-c512-4ea7… | Jul 2 2015 | |||
65f55e702397 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13501 f3b2605a-c512-4ea7… | Jul 2 2015 | |||
a67cb068562f | stamoor | Fixing small Kokkos bug | Jul 1 2015 | |||
2b605e29db7b | athomps | Describes new QUIP directory structure | Jul 1 2015 | |||
fe0bf706ece1 | stamoor | Small bug fix for Kokkos charmm pair styles | Jul 1 2015 | |||
afd2f6bde817 | stamoor | Fixing small bug in run-style verlet split | Jul 1 2015 | |||
721b312498d6 | stamoor | Fixing small bug in Kokkos pair styles with long-range Coulombics | Jul 1 2015 | |||
48445741ddda | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13494 f3b2605a-c512-4ea7… | Jun 26 2015 | |||
12b5742f6c7c | athomps | Updated to new QUIP directory structure | Jun 24 2015 | |||
e223ffe74bef | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13490 f3b2605a-c512-4ea7… | Jun 12 2015 | |||
5a723510dc6d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13489 f3b2605a-c512-4ea7… | Jun 9 2015 | |||
9a72a59b694c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13488 f3b2605a-c512-4ea7… | Jun 9 2015 | |||
547f57090441 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13486 f3b2605a-c512-4ea7… | Jun 4 2015 | |||
43d738e168b2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13484 f3b2605a-c512-4ea7… | May 21 2015 | |||
9d8ec277cb3f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13483 f3b2605a-c512-4ea7… | May 19 2015 | |||
f110488db006 | athomps | Added inside_nonperiodic() | May 18 2015 | |||
d9be5d7d63d3 | athomps | Switched some inside() checks to inside_nonperiodic() checks | May 18 2015 | |||
b2b721f5fbff | athomps | Updated full_energy description | May 18 2015 | |||
bff094784db4 | athomps | Added error message to list | May 18 2015 | |||
26c09979f3b0 | athomps | Added inside box check for fix_gcmc moves | May 16 2015 | |||
aef75ace77e7 | athomps | Added inside box check for fix_gcmc moves | May 16 2015 | |||
410549ec46b3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13475 f3b2605a-c512-4ea7… | May 15 2015 | |||
fcbf8275eb91 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13473 f3b2605a-c512-4ea7… | May 15 2015 | |||
7c5320e342d7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13472 f3b2605a-c512-4ea7… | May 15 2015 | |||
07f62aea1a51 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13471 f3b2605a-c512-4ea7… | May 15 2015 | |||
723da5079ab7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13470 f3b2605a-c512-4ea7… | May 15 2015 | |||
8177dd7612fa | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13469 f3b2605a-c512-4ea7… | May 15 2015 | |||
b206e23b33bd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13468 f3b2605a-c512-4ea7… | May 15 2015 | |||
6106843d57af | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13467 f3b2605a-c512-4ea7… | May 15 2015 | |||
1bdd915a90bf | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13466 f3b2605a-c512-4ea7… | May 15 2015 | |||
a32bfebe880a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13465 f3b2605a-c512-4ea7… | May 15 2015 | |||
c3fd41010d41 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13464 f3b2605a-c512-4ea7… | May 15 2015 | |||
2284dcc4527a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13463 f3b2605a-c512-4ea7… | May 15 2015 | |||
29746678ff3e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13461 f3b2605a-c512-4ea7… | May 15 2015 | |||
09581bb143a6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13460 f3b2605a-c512-4ea7… | May 14 2015 | |||
d2f90c7e0c6d | athomps | Added intra_energy keyword | May 12 2015 | |||
1f21a5dcc45a | athomps | Added intra_energy keyword | May 12 2015 | |||
720490cfa461 | athomps | Added group keywords to fix gcmc, fixed destructor | May 12 2015 | |||
0c0441b870a0 | athomps | Added group keywords to fix gcmc | May 8 2015 | |||
4dff6763963f | athomps | Added group keywords to fix gcmc | May 8 2015 |