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

581 Commits

Author SHA1 Message Date
sjplimp
7ce22765cf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11884 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-02 15:06:34 +00:00
Axel Kohlmeyer
3a24287f4d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MC/fix_gcmc.cpp
	src/USER-REAXC/reaxc_types.h
 2014-05-01 08:24:38 -04:00
sjplimp
ddc1ad9ca2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11858 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-30 20:59:17 +00:00
Axel Kohlmeyer
104376fcba Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	lib/gpu/lal_sw.cu
	src/GRANULAR/fix_pour.cpp
 2014-04-30 06:43:53 -04:00
sjplimp
2cf0a3bafa git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11845 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-29 23:26:34 +00:00
Axel Kohlmeyer
517a48da9a Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MAKE/Makefile.bgq
	src/MAKE/Makefile.bgq.details
	src/MC/fix_gcmc.cpp
 2014-04-19 07:04:43 -04:00
sjplimp
bbc57688d8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11833 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-18 21:01:25 +00:00
Axel Kohlmeyer
e93e800f81 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-04-18 06:32:53 -04:00
sjplimp
182f71d113 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11812 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-17 17:05:32 +00:00
Axel Kohlmeyer
e51c613dfa Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-04-17 06:30:54 -04:00
sjplimp
9d1798e604 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11804 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-16 23:29:47 +00:00
Axel Kohlmeyer
c6992e8503 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-04-12 16:13:47 +02:00
sjplimp
5a26ea8238 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11784 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-11 23:37:41 +00:00
Axel Kohlmeyer
00a141d5ce Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-04-11 12:22:52 +02:00
sjplimp
e579757de1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11771 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-10 23:08:32 +00:00
Axel Kohlmeyer
5bb50f8841 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/USER-OMP/fix_qeq_comb_omp.cpp
 2014-04-10 13:24:56 +02:00
sjplimp
5e3ff6cffd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11754 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-09 15:59:29 +00:00
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