Commit Graph

6090 Commits

Author SHA1 Message Date
21442a6221 complete implementation of nm/cut styles for USER-OMP 2013-10-03 21:56:13 +02:00
fee8a8b3a6 add more nm/cut pair styles for USER-OMP (still incomplete) 2013-10-03 20:33:38 +02:00
5f2e89786f fix compilation issue due to new timer class in lammps-icms 2013-10-03 15:00:01 +02:00
8edeead355 Merge remote branch 'lammps-ro/master' into lammps-icms 2013-10-03 13:48:39 +02:00
cae2cbfa75 ########################################################################
add nm/cut/omp pair style (untested)
2013-10-03 11:58:56 +02:00
1cedbf7454 properly order entries 2013-10-03 11:35:47 +02:00
2345ca02f9 more files to ignore 2013-10-03 10:58:02 +02:00
b618d0eb9b one more test 2013-10-03 10:54:02 +02:00
23cc2e26a8 test commit for debugging post update hook 2013-10-03 10:50:49 +02:00
5d8427bc5b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10848 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-10-02 13:41:42 +00:00
f3b6503ffa Merge branch 'master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	doc/log.txt
	src/USER-REAXC/fix_reaxc_species.cpp
	src/input.cpp
2013-10-02 13:12:58 +02:00
2a892f05d7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10843 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-10-01 14:16:09 +00:00
35eb67c68e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10842 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-10-01 14:12:06 +00:00
72d59c438d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10841 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-10-01 14:11:52 +00:00
7d0088da79 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10840 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-10-01 13:56:05 +00:00
09d10121a0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10838 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-10-01 13:48:58 +00:00
49550263e2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10837 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-10-01 13:44:17 +00:00
9714f43e50 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2013-09-29 18:38:58 +02:00
3356e53476 Eliminated kmax=0 for triclinic
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10835 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-09-27 19:37:28 +00:00
4609d2c716 added append flag to log command 2013-09-25 14:05:23 +02:00
0fad40b818 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-09-24 13:11:35 +02:00
4545b11a67 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10829 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-23 21:34:08 +00:00
99f67ba8bb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10825 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-23 17:30:16 +00:00
995ec050ce git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10824 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-23 16:49:42 +00:00
8b662e5d95 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10822 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-23 14:56:17 +00:00
89d315e2c6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10821 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-23 14:54:23 +00:00
7d8d8c22be git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10820 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-23 14:33:37 +00:00
1348d729e8 bugfix for multi-threaded execution of pair style adp 2013-09-21 23:59:19 +02:00
14f5763c2e fix file pointer scoping bug 2013-09-21 15:10:58 +02:00
cad615e03a fix restart bug in dpd/tstat 2013-09-21 09:41:07 +02:00
68c0de7199 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-09-19 13:54:27 +02:00
f8fe148cf4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10813 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-18 17:19:08 +00:00
6a189f3188 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10811 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-18 17:15:38 +00:00
505313c828 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10808 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-18 16:57:18 +00:00
d28e92e032 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10806 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-18 16:20:58 +00:00
23da8399c0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10805 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-18 14:10:31 +00:00
0680636555 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10804 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-18 14:05:57 +00:00
a471105ce4 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-09-18 12:13:02 +02:00
4a756ed453 bugfix for compute pe/atom w/o a kspace defined 2013-09-18 09:13:48 +02:00
db8e27f9f0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10801 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-17 19:51:15 +00:00
d11d8a4acb Extended to cover all units styles
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10798 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-09-17 19:09:29 +00:00
fe7ae37d52 Switched econv to use qqr2e
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10794 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-09-17 17:34:09 +00:00
0f7740818c Merge remote branch 'lammps-ro/master' into lammps-icms 2013-09-17 13:00:49 +02:00
210045f4a5 Added pair style ZBL
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10790 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-09-16 23:02:26 +00:00
00d9f400ba Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-09-13 12:43:54 +02:00
45b4745d55 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10778 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-12 23:59:32 +00:00
f300e03ef6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10766 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-12 18:37:05 +00:00
2639347e90 Remove "stdout" files.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10763 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-09-12 18:15:04 +00:00
8affd9162d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-09-11 16:04:19 +02:00
e5f4966986 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10760 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-09-11 00:05:07 +00:00