Commit Graph

304 Commits

Author SHA1 Message Date
fb862de443 fix compilation with -DLAMMPS_BIGBIG 2015-01-14 07:37:56 -05:00
5838c3c542 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/RIGID/fix_rigid.cpp
2015-01-06 09:26:22 -05:00
1aefa8d624 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12859 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-01-05 15:41:14 +00:00
ced125c2b4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12819 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-12-05 22:05:02 +00:00
d64c77b83c import maintenance patch from michele ceriotti for fix gle and fix ipi 2014-12-04 17:30:34 -05:00
4529a6c726 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	src/USER-COLVARS/colvarproxy_lammps.h
2014-12-04 08:44:59 -05:00
aeb7fec23a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12814 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-12-02 02:15:39 +00:00
74ba3d3095 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2014-12-01 11:27:44 -05:00
362f7ad110 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12808 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-12-01 15:16:00 +00:00
b893e39fba add missing C++ emacs cookies to recently added header files 2014-11-26 12:27:08 -05:00
eb8b18913b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12798 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-26 16:03:06 +00:00
cb0a9998bd use MPI_STATUS_IGNORE where possible 2014-11-25 17:44:03 -05:00
475aa20270 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_intro.txt
	doc/fix_gle.txt
	doc/fix_ipi.txt
	examples/USER/i-pi/README
	src/USER-MISC/README
	src/USER-MISC/fix_gle.cpp
	src/USER-MISC/fix_ipi.cpp
	src/USER-MISC/fix_ipi.h
2014-11-25 15:01:31 -05:00
c820756169 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12794 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-24 23:10:14 +00:00
fe42affff4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12792 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-24 22:30:32 +00:00
1f84af1b91 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12788 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-24 20:57:12 +00:00
6ee2f9f3e3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12779 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-24 17:41:53 +00:00
11bd1a45ed git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12775 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-24 17:23:55 +00:00
162e8050ad git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12773 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-24 17:15:05 +00:00
6f05cb4483 put back c++ emacs cookies 2014-11-20 12:57:05 -05:00
8f5063b26e dead code removal and format cleanups 2014-11-19 11:39:57 -05:00
d865a1d8e5 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/USER-MISC/README
2014-11-19 11:11:34 -05:00
e4c84f31ca git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12720 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-18 20:53:05 +00:00
416f6c25e5 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2014-11-18 10:26:44 -05:00
21ac09ad9c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12715 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-18 00:17:02 +00:00
b7ece0fb51 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12693 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-17 18:11:29 +00:00
7518fae9bc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12641 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-10-21 17:09:24 +00:00
35d8036e32 update C++ headers with emacs mode cookies 2014-10-21 12:00:34 -04:00
2516600403 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12579 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-09-30 23:20:03 +00:00
3a5d4208f3 safer call to generation of occasional neighbor lists. cleaner implementation of write_dump 2014-09-30 15:45:02 -04:00
777e82995d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12406 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-09-05 14:42:44 +00:00
ca6b61d07f remove definitions obsoleted by changes to lmptype.h 2014-08-23 17:11:12 -04:00
dbc55a403f overhaul of fix ipi to be more consistent with LAMMPS programming conventions 2014-08-12 11:33:59 -04:00
e2352387fb some clarification of domain socket name. ifdef out include files on windows 2014-08-11 18:09:17 -04:00
76a61445d8 add fix ipi for path integrals via python frontend 2014-08-11 16:07:31 -04:00
2d5428bee0 minor corrections to GLE code from michele ceriotti 2014-08-11 15:51:53 -04:00
4a197537c0 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2014-08-07 08:24:10 -04:00
ad4d9d88b8 include optimized matrix-matrix multiplication 2014-08-06 18:59:47 -04:00
ce4bea7aac replace unsigned long with int and simplify C reinit. 2014-08-06 13:18:49 -04:00
2cca373515 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12253 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-08-06 16:07:54 +00:00
57b8a339eb clean up reading of C matrix and fix missing scaling bug 2014-08-05 01:51:31 -04:00
8821eb0518 cleaned up code some. doesn't seem to fully work yet. 2014-08-05 01:14:23 -04:00
2056624858 remove trailing whitespace 2014-08-04 22:23:31 -04:00
5e98c4a3e6 some simple cleanup and correction to C++ style and syntax 2014-08-04 22:21:41 -04:00
ff39614926 import updated GLE fix from michele ceriotti 2014-08-04 22:17:04 -04:00
29ae4bd8dc Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	lib/cuda/Makefile.lammps
	lib/gpu/lal_coul_long.cu
	src/VORONOI/compute_voronoi_atom.cpp
	src/version.h
2014-07-01 12:08:09 -04:00
026ff1f6dd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12144 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-27 17:22:32 +00:00
4acacd8e3b Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MISC/fix_efield.cpp
	src/fix_addforce.cpp
	src/fix_move.cpp
	src/fix_setforce.cpp
2014-05-08 08:49:17 -04:00
53db68362e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11935 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-07 14:30:27 +00:00
8bee4ef596 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11907 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-02 21:49:36 +00:00