ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,247 Commits 12 Branches 209 Tags
f8daecd639f4c3492777defd110a1a469846e47b
Commit Graph

364 Commits

Author SHA1 Message Date
Axel Kohlmeyer
f8daecd639 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	examples/USER/openmp/parm.pegc12e8
	examples/USER/openmp/parm.pegc12e8-omp
 2014-04-09 13:49:45 +02:00
sjplimp
8355dc9ac0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11741 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-08 17:35:53 +00:00
Axel Kohlmeyer
20bb47e06a Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/fix_qmmm.txt
	doc/fix_recenter.txt
	lib/README
	lib/qmmm/README
	src/Makefile
	src/USER-QMMM/README
 2014-04-05 12:58:39 +02:00
sjplimp
0016a5b042 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11719 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-04 20:43:59 +00:00
sjplimp
a03cb3cf63 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11706 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-04 17:21:02 +00:00
Axel Kohlmeyer
84ee1efa3e Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/atom_map.cpp
 2014-04-04 06:18:57 -04:00
sjplimp
df57381665 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11694 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-03 15:55:25 +00:00
sjplimp
e677a5040c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11691 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-03 14:59:02 +00:00
Axel Kohlmeyer
5618830283 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/finish.cpp
 2014-04-02 15:00:49 +02:00
sjplimp
85e1f84e82 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11680 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-01 23:57:30 +00:00
Axel Kohlmeyer
0f7f4a1e43 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	lib/gpu/lal_device.cpp
 2014-03-21 13:58:34 +01:00
sjplimp
c64a797231 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11664 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-03-20 15:02:26 +00:00
Axel Kohlmeyer
430aed042a Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Conflicts:
	doc/Manual.html
	doc/Manual.txt
	tools/msi2lmp/src/msi2lmp.c
 2014-03-20 10:50:23 -04:00
sjplimp
1f6484a29a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11653 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-03-19 19:31:06 +00:00
Axel Kohlmeyer
ec6c67ddbb Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/kspace_modify.txt
	src/KSPACE/fft3d.cpp
	src/KSPACE/remap.cpp
	src/kspace.cpp
 2014-03-15 07:03:59 -04:00
sjplimp
4ffae61a66 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11635 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-03-14 22:36:30 +00:00
Axel Kohlmeyer
c6ee3357a4 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/finish.cpp
	src/fix.cpp
 2014-03-13 06:40:26 -04:00
Axel Kohlmeyer
573db9e2f7 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/fix_oneway.txt
	doc/fix_temp_csvr.txt
	src/fix_move.cpp
	src/fix_nh.cpp
	src/fix_temp_csvr.cpp
	src/neigh_stencil.cpp
	src/pair.cpp
	src/pair_hybrid.cpp
	src/read_data.cpp
	tools/msi2lmp/src/msi2lmp.c
	tools/msi2lmp/src/msi2lmp.h

Signed-off-by: Axel Kohlmeyer <akohlmey@gmail.com>
 2014-03-12 17:43:22 -04:00
sjplimp
d2bbbcef02 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11629 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-03-12 21:32:57 +00:00
sjplimp
8fc989a6b1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11611 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-03-10 15:23:49 +00:00
sjplimp
dcab7801eb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11598 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-03-06 17:33:45 +00:00
sjplimp
ec9648ee94 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11586 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-03-04 16:48:05 +00:00
Axel Kohlmeyer
53fef3f3a3 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/molecule.cpp
	src/variable.cpp
 2014-02-27 06:58:12 -05:00
sjplimp
91e6590891 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11580 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-26 16:14:39 +00:00
Axel Kohlmeyer
8d99c46045 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-02-19 11:20:07 -05:00
sjplimp
1d46260d6e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11573 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-17 18:46:33 +00:00
Axel Kohlmeyer
fe20d93857 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-02-16 11:59:08 -05:00
sjplimp
a80289ca06 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11572 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-15 23:23:23 +00:00
sjplimp
68279e563c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11571 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-15 22:51:35 +00:00
sjplimp
7e5c32ef1c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11570 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-15 20:44:03 +00:00
Axel Kohlmeyer
15f33d5a92 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/REPLICA/prd.cpp
 2014-02-15 09:43:30 -05:00
sjplimp
d47ec9bed1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11568 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-14 16:38:26 +00:00
Axel Kohlmeyer
1a516b2ab2 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-02-13 09:01:36 -05:00
sjplimp
32a5cd0043 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11558 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-12 23:27:37 +00:00
Axel Kohlmeyer
0ad199801d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/lammps.cpp
 2014-02-11 07:15:35 -05:00
sjplimp
243a4f5703 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11519 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-10 20:54:29 +00:00
Axel Kohlmeyer
f2cc64ee8b Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MC/fix_bond_create.cpp
	src/read_data.cpp
 2014-02-08 10:31:25 -05:00
sjplimp
903002dce1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11511 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-07 21:38:25 +00:00
Axel Kohlmeyer
9bbaf62d2a Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-02-07 06:16:24 -05:00
sjplimp
f0cbf46492 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11498 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-06 16:27:58 +00:00
Axel Kohlmeyer
2fcb0a3e92 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_start.txt
	doc/Section_tools.txt
	src/Makefile
 2014-02-06 07:50:47 -05:00
sjplimp
091fa33ab3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11492 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-05 21:45:20 +00:00
sjplimp
f909337cdd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11486 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-05 19:39:47 +00:00
Axel Kohlmeyer
a82962baef Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/variable.cpp
 2014-02-05 08:59:35 -05:00
sjplimp
eef916b7de git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11470 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 15:43:22 +00:00
Axel Kohlmeyer
96ccc7976d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-02-04 07:14:41 -05:00
sjplimp
b7d55ca484 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11467 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 01:18:16 +00:00
sjplimp
45bcc86602 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11461 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-04 00:26:40 +00:00
sjplimp
036f4f8dbf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11450 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:56:30 +00:00
sjplimp
532dd7c500 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11444 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-02-01 18:05:22 +00:00