Commit Graph

10804 Commits

Author SHA1 Message Date
bea87398b3 update format strings for bond, dihedral and improper warnings that use tags 2014-01-28 12:53:42 -05:00
961d9171eb update hbond/dreiding/*/omp for the latest upstream changes 2014-01-28 12:42:42 -05:00
f217a59546 bugfix for typo bugfix from upstream 2014-01-28 10:21:50 -05:00
0750213978 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/USER-OMP/fix_omp.cpp
2014-01-28 10:11:00 -05:00
62b1b84677 bufix for compilation of MPIIO dumps with OpenMP enabled 2014-01-27 19:06:15 -05:00
7e5b15bb90 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11345 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-27 20:53:04 +00:00
87e52e2a56 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11343 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-27 18:37:56 +00:00
703de42fed git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11342 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-27 18:37:55 +00:00
9b1cc599f6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11341 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-27 16:59:18 +00:00
f29d16e032 carry over changes from upstream 2014-01-26 22:25:58 -05:00
30a5d89bcd fix typo 2014-01-26 22:25:41 -05:00
39b1597778 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/RIGID/fix_shake.cpp
	src/variable.cpp
	src/write_data.cpp
2014-01-26 21:35:32 -05:00
806a382bd0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11339 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-26 00:11:21 +00:00
10064ce603 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11337 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-26 00:01:13 +00:00
861b7fdd7f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11336 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-26 00:01:13 +00:00
28194a14eb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11335 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 23:53:12 +00:00
dc585528b2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 23:52:50 +00:00
af931f23d0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11332 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 23:46:25 +00:00
90b672593d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11331 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 23:41:09 +00:00
69f4457f65 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11330 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 23:36:16 +00:00
eec46d66ec git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11329 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 23:06:52 +00:00
0ce16af78b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11328 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 22:46:08 +00:00
2f6a46a2be git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11326 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 18:38:21 +00:00
158661bbe4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11325 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 18:38:20 +00:00
948c4145b9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11324 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 18:31:06 +00:00
e126d82aaa Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	doc/dump.txt
	src/.gitignore
2014-01-25 11:19:07 -05:00
8ef19992c2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11323 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 16:11:46 +00:00
d94ff39c8f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11320 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:53:44 +00:00
cc4f939cba git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11319 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:53:43 +00:00
281f90082e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11318 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:53:26 +00:00
d6ce6d939f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11317 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:49:07 +00:00
a4baae328e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11316 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:45:26 +00:00
d557e616ad git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11315 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:22:48 +00:00
fd56a3d416 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11314 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:22:39 +00:00
422e202a7f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11313 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:22:36 +00:00
0b4584465b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11312 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:22:26 +00:00
662a6bbcd6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11311 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 00:22:08 +00:00
fe888437bd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11310 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-24 23:05:40 +00:00
63c730ea7d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11309 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-24 23:05:34 +00:00
96919da164 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11308 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-24 23:05:23 +00:00
98655f672e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11307 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-24 23:05:12 +00:00
418e9cf0bb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11306 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-24 21:43:20 +00:00
48a85cdd9c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11305 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-24 21:40:19 +00:00
dc7ac2ad60 update USER-PHONON package to be compatible with 64-bit atom tags 2014-01-24 12:31:15 -05:00
54d1b93d5f bugfix to compile in reax/c 32-bit mode with smallsmall. 2014-01-24 11:22:43 -05:00
4fc6368fcc Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-01-24 06:48:00 -05:00
5e9f4c8130 fix compilation of USER-QMMM for 64-bit atom tags 2014-01-23 19:46:36 -05:00
36176a9eb9 fixes to compile USER-OMP with -DLAMMPS_BIGBIG 2014-01-23 19:22:16 -05:00
c67f39ee6a yet some more compilation fixes for -DLAMMPS_BIGBIG for USER-LB package 2014-01-23 19:05:40 -05:00
8d60b3d0db fix one more typo 2014-01-23 18:35:10 -05:00