Commit Graph

225 Commits

Author SHA1 Message Date
2e265787a1 Merge branch 'master' into lammps-icms 2012-01-13 09:24:31 -05:00
cc84c41ef0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7547 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-12 19:12:10 +00:00
ec06aed001 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7546 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-12 19:03:12 +00:00
5026f4b788 Merge branch 'master' into lammps-icms 2012-01-10 09:05:38 -05:00
34c1930201 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7497 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-10 01:54:14 +00:00
9a3ab257bd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7495 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-10 01:39:21 +00:00
3cf4cb2706 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7489 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-09 23:45:41 +00:00
876112a0c6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7488 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-09 23:45:25 +00:00
4f1bc1a2da documentation updates 2012-01-07 12:01:15 -05:00
0af770b923 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7432 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-06 17:34:26 +00:00
479db22978 update and remove crud. 2012-01-05 14:41:52 -05:00
9259ae8699 Merge branch 'master' into lammps-icms
Resolved Conflicts:
	doc/Eqs/pair_coul_diel.jpg
	doc/Section_commands.html
	doc/Section_commands.txt
	doc/pair_coul_diel.html
	doc/pair_coul_diel.txt
	doc/processors.html
	doc/processors.txt
	examples/USER/imd/bucky_cnt_imd.vmd
	examples/USER/imd/in.bucky-plus-cnt
	examples/USER/imd/in.deca-ala-solv_imd
	examples/USER/imd/in.deca-ala_imd
	lib/gpu/Makefile.fermi
	lib/gpu/Makefile.lincoln
	lib/gpu/Makefile.longhorn
	lib/gpu/Makefile.serial
	lib/gpu/geryon/VERSION.txt
	lib/gpu/pair_gpu_device.cpp
	src/ASPHERE/atom_vec_ellipsoid.cpp
	src/CLASS2/Install.sh
	src/COLLOID/atom_vec_colloid.cpp
	src/DIPOLE/atom_vec_dipole.cpp
	src/GPU/fix_gpu.cpp
	src/GRANULAR/atom_vec_granular.cpp
	src/GRANULAR/fix_pour.h
	src/KSPACE/Install.sh
	src/KSPACE/fft3d.cpp
	src/KSPACE/fft3d.h
	src/KSPACE/kissfft.h
	src/KSPACE/pppm.cpp
	src/KSPACE/pppm.h
	src/KSPACE/pppm_tip4p.cpp
	src/MAKE/Makefile.openmpi
	src/MAKE/Makefile.serial
	src/MANYBODY/pair_airebo.cpp
	src/MANYBODY/pair_comb.cpp
	src/MANYBODY/pair_eam.cpp
	src/MANYBODY/pair_eim.cpp
	src/MANYBODY/pair_sw.cpp
	src/MANYBODY/pair_tersoff.cpp
	src/MANYBODY/pair_tersoff_zbl.cpp
	src/MOLECULE/atom_vec_angle.cpp
	src/MOLECULE/atom_vec_bond.cpp
	src/MOLECULE/atom_vec_full.cpp
	src/MOLECULE/atom_vec_molecular.cpp
	src/Makefile
	src/Makefile.lib
	src/PERI/atom_vec_peri.cpp
	src/USER-CG-CMM/Install.sh
	src/USER-IMD/README
	src/USER-IMD/fix_imd.cpp
	src/USER-IMD/fix_imd.h
	src/USER-SMD/Install.sh
	src/atom_vec_atomic.cpp
	src/atom_vec_charge.cpp
	src/comm.cpp
	src/finish.cpp
	src/fix_box_relax.cpp
	src/fix_deposit.cpp
	src/fix_spring_self.cpp
	src/fix_store_state.cpp
	src/fix_wall.cpp
	src/fix_wall_reflect.cpp
	src/input.cpp
	src/input.h
	src/memory.cpp
	src/memory.h
	src/pair_lj_cut.cpp
	tools/restart2data.cpp
2011-12-31 19:07:46 -05:00
a55728fa74 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7274 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-02 15:47:54 +00:00
70a85bddfd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7256 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-01 14:58:11 +00:00
789f069c2b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7062 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-10-10 16:33:07 +00:00
42da26e307 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6946 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-09-13 22:13:14 +00:00
d34543f2a6 Tweaked input file
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6925 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-09-02 19:16:43 +00:00
7ea78551d2 Removed some stuff
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6921 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-09-02 02:47:28 +00:00
2d099c8e7c Added example of nphug
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6920 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-09-02 02:45:31 +00:00
91f4940250 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6836 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-27 20:08:16 +00:00
b58baf2f28 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6699 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-17 14:24:19 +00:00
a2ea5509ff git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6616 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-08 19:01:31 +00:00
93b297d2e9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6438 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-20 14:26:28 +00:00
c7e91e5418 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6379 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-13 22:31:50 +00:00
e07d86e93f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6273 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-01 00:03:29 +00:00
63953173fd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6272 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-01 00:01:29 +00:00
4fa9d24d7e Removed unneeded changes to input scripts
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6090 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-05-12 21:31:44 +00:00
022748a56e Added bond output
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6089 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-05-12 21:23:27 +00:00
b4b5e469e9 Added attribution
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6016 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-04-25 15:20:12 +00:00
e2d5478a6c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5951 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-04-15 22:57:52 +00:00
17f9667059 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5933 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-04-13 21:40:28 +00:00
a290cc6874 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5852 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-03-26 23:02:38 +00:00
06737e36b0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5851 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-03-26 22:44:59 +00:00
d8fe7a91f0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5850 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-03-26 22:41:19 +00:00
0869b6dc12 Tweaked comments
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5807 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-03-21 22:54:01 +00:00
eac710420d Merge branch 'master' into lammps-icms 2011-02-23 10:58:07 -05:00
1d4a6440d1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5715 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-02-22 22:35:22 +00:00
f50885fd46 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5714 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-02-22 22:34:43 +00:00
fdb2c35dca Merge branch 'master' into lammps-icms 2011-02-22 10:48:54 -05:00
74ddbe7a8f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5682 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-02-21 21:57:22 +00:00
3ce83810ef Added README files to subdirectories
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5681 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-02-21 19:01:30 +00:00
355da9b2ec Removed dump files from repository
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5679 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-02-21 17:20:57 +00:00
caeb58a5eb Tweaked README
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5677 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-02-21 17:10:03 +00:00
8a8c46a372 Merge branch 'master' into lammps-icms 2011-02-20 19:34:27 -05:00
79ec2261bb Added some new ReaxFF examples
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5673 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-02-19 03:56:58 +00:00
a60fdb29c5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5623 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-02-09 22:22:12 +00:00
4e98edb242 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5622 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-02-09 22:20:53 +00:00
582ce0423f Merge branch 'master' into lammps-icms 2011-01-06 12:14:18 -05:00
c531b460b4 Merge branch 'master' into lammps-icms 2011-01-05 12:36:24 -05:00
1dcb17a2b2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5487 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-01-05 17:29:17 +00:00