Commit Graph

73 Commits

Author SHA1 Message Date
1ee7cb100d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/atom_vec_hybrid.cpp
	src/verlet.cpp
2014-06-07 19:29:51 -04:00
3f16021ba1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12088 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-05 12:50:23 +00:00
122cdf2c39 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_errors.txt
	doc/Section_start.txt
	src/USER-FEP/Install.sh
	src/USER-OMP/pair_lj_charmm_coul_long_soft_omp.cpp

Signed-off-by: Axel Kohlmeyer <akohlmey@gmail.com>
2014-05-23 06:37:33 -04:00
d45d192091 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12016 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-22 14:20:18 +00:00
6225a86370 improved documentation for errors and windows packages 2014-05-19 16:59:05 -04:00
c6564663e8 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_errors.txt
	src/REPLICA/tad.cpp
	src/lammps.h
2014-01-31 06:34:23 -05:00
d22a9eab28 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11392 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-30 18:21:41 +00:00
6af7493afd add docs for compiling with PNG 2013-10-26 21:01:04 +02:00
9340723b89 fix typos 2013-05-13 16:29:54 +02:00
bfa67dbdf8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9614 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-03-07 21:22:06 +00:00
115df8a116 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/KSPACE/pair_lj_long_coul_long.cpp
	src/KSPACE/pair_lj_long_coul_long.h
	src/pair.h
2013-03-05 13:25:28 +01:00
4c6363564f update docs for current tip4p style naming conventions 2013-03-05 09:59:54 +01:00
32ba98e947 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9573 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-03-05 00:15:17 +00:00
6903543002 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9570 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-03-05 00:10:51 +00:00
9b0c47282e update documentation for respa/omp and other recent additions 2013-02-23 18:50:13 +01:00
5f46ef4e80 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8442 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-29 21:17:59 +00:00
0030566ad8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8366 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-21 16:27:20 +00:00
21133ad922 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7892 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-03-02 17:05:31 +00:00
2de83313b8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7767 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-02-13 15:58:48 +00:00
703c341930 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7764 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-02-13 15:49:36 +00:00
6d3c7dc10d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7576 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-25 15:33:51 +00:00
06f040f25d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7376 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-16 19:03:07 +00:00
c92047aeb5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7326 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-09 00:44:47 +00:00
143aa917f2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7273 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-02 15:47:30 +00:00
e6fac7cd8a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7005 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-09-23 18:14:26 +00:00
a8cf1de735 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6809 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-25 17:01:01 +00:00
a3add0b021 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6808 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-25 16:46:23 +00:00
d0d785e3a2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6807 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-25 16:17:31 +00:00
465cbbd0ed git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6222 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-05-26 23:45:23 +00:00
f6151f6735 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6051 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-05-02 15:01:49 +00:00
0fe876a199 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5853 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-03-26 23:18:28 +00:00
b63b44e274 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5200 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-11-02 15:05:51 +00:00
397f967521 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4978 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-10-06 15:58:26 +00:00
fa06158999 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4939 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-10-01 17:09:52 +00:00
712afcc462 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4747 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-09-08 23:47:51 +00:00
44a309c8c4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4746 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-09-08 23:45:12 +00:00
0d222a3345 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4692 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-09-06 16:36:36 +00:00
c00c60c86d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4219 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-06-01 19:57:01 +00:00
1622c77c82 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3695 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-01-14 23:41:10 +00:00
2c8f1d375d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3684 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-01-14 21:11:34 +00:00
cdd4c56296 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2957 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-07-02 18:00:10 +00:00
22954a4c0f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2938 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-07-01 20:28:51 +00:00
c12b42237c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2709 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-03-26 15:16:32 +00:00
b6dd359a78 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2368 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-01-09 22:22:53 +00:00
b698d94df8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2362 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-01-09 18:18:56 +00:00
b33856003f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2360 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-01-09 14:49:10 +00:00
029ad19318 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2332 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-01-05 22:26:31 +00:00
8c5dbecbb9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2112 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2008-09-29 15:43:58 +00:00
2e221952de git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2104 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2008-09-09 14:21:45 +00:00
82f5d88fca git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2093 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2008-08-21 14:10:31 +00:00