|
|
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 |
|
|
|
8983f9e8ff
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5897 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-04-05 19:11:00 +00:00 |
|
|
|
a5de35d07c
|
update atc for 64-bit changes.
|
2011-03-15 09:28:23 -04:00 |
|
|
|
ccefc1c3c0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3509 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-12-04 21:04:00 +00:00 |
|
|
|
93fe3738c9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3170 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-09-24 16:33:23 +00:00 |
|
