Commit Graph

28 Commits

Author SHA1 Message Date
4df037aa3b use a namespace with static const to propagate fix flags safely. 2012-01-30 18:15:25 -05:00
41a12bc4c1 Merge branch 'master' into lammps-icms 2012-01-05 10:00:57 -05:00
d733ea3398 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7403 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-04 23:23:41 +00: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
19e8c92a90 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-09-23 18:06:55 +00:00
a47e493dfd Merge branch 'master' into lammps-icms
Conflicts resolved in:
	doc/Section_commands.html
	src/USER-IMD/fix_imd.cpp
	src/finish.cpp
2011-01-10 10:06:21 -05:00
140cdf9485 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5504 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-01-07 21:42:19 +00:00
6e7746bf33 add target option to fix deposit for sputtering 2010-12-11 16:47:32 -05:00
b015f75194 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4745 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-09-08 23:41:16 +00:00
5ff00cfd0f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4505 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-08-19 16:01:08 +00:00
202fe18b18 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3652 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-01-11 22:22:03 +00:00
d9310d7e56 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3645 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-01-11 21:15:28 +00:00
e3c029753d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3633 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-01-08 22:54:13 +00:00
edfea8bc0f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3259 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-10-30 18:14:19 +00:00
08577f42a7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2996 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-07-21 15:00:56 +00:00
ffa3b8c1ee git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2689 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-03-19 14:54:04 +00:00
0cc1d090f4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2330 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-01-05 22:26:08 +00:00
8dceec24a4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2229 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2008-11-07 15:47:56 +00:00
a1b082b37d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1034 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-10-12 17:34:53 +00:00
255b8fc0d9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@995 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-10-09 23:40:36 +00:00
0eab9eef3c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@890 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-09-19 21:32:47 +00:00
186aec6b7e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@781 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-08-07 13:44:22 +00:00
cea0208207 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@642 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-06-22 16:59:17 +00:00
aaed6ebc33 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@622 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-06-20 13:17:59 +00:00
3bf07918d4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@402 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-03-15 23:38:38 +00:00
9e1f8bcd6a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@371 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-03-08 00:54:02 +00:00
209f169cbc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@254 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-01-30 00:22:05 +00:00
bea8025b93 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@186 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2006-12-13 00:34:21 +00:00