788b01cd71
Merge branch 'master' into lammps-icms
2012-08-18 17:17:35 -04:00
d4215d8844
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8675 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-16 21:16:03 +00:00
2e7bd3367f
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8672 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-15 19:49:01 +00:00
4486372868
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8670 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-15 14:34:23 +00:00
ffc41c52c5
Merge branch 'master' into lammps-icms
...
Resolved Conflicts:
lib/meam/Makefile.gfortran
lib/poems/Makefile.g++
lib/reax/Makefile.gfortran
python/lammps.py
src/USER-CUDA/cuda.cpp
2012-08-15 08:38:04 -04:00
6139908a11
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8664 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-14 23:08:53 +00:00
7487754a4d
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8659 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-14 20:20:39 +00:00
7f5e8cb896
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8656 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-14 20:13:20 +00:00
1512b14f98
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8649 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-14 15:40:43 +00:00
01830d476b
Merge branch 'master' into lammps-icms
...
Resolved Conflicts:
python/lammps.py
src/MAKE/Makefile.mingw
src/MAKE/Makefile.openmpi
src/MAKE/Makefile.serial
src/MAKE/Makefile.serial_debug
src/USER-CUDA/verlet_cuda.cpp
2012-08-14 03:35:29 -04:00
9bb3b04ec4
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8633 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-13 22:27:24 +00:00
8df0f9c2e6
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8631 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-13 22:13:23 +00:00
6f4f134d4d
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8630 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-13 22:13:06 +00:00
0ea3d01f09
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8616 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-13 16:12:54 +00:00
ee7f12334d
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8603 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-10 23:22:54 +00:00
c6878811f0
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8602 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-08-10 23:13:26 +00:00
959946a023
import patch from joe jordan to find the lammps DSO automatically
2012-04-27 10:37:04 -04:00
00944a2b95
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7856 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-02-28 17:57:43 +00:00
7eef27acfd
bugfix for changing STUBS-MPI to plain C
2012-02-23 20:19:04 -05:00
92b9766cf1
Merge branch 'master' into lammps-icms
...
Resolved Conflicts:
doc/Section_commands.html
src/displace_box.h
2012-02-07 09:06:00 -05:00
4c98b2d1a9
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7710 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-02-06 18:19:20 +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
5a158918de
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7237 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-11-28 22:42:51 +00:00
17413fb144
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6493 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2011-06-30 22:41:09 +00:00
e42d61f775
Merge branch 'master' into lammps-icms
2010-11-30 08:35:42 -05:00
3524795784
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5335 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-29 15:33:35 +00:00
1226d999b4
Merge branch 'master' into lammps-icms
2010-11-25 10:24:09 -05:00
9e0598d918
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5323 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-24 21:27:39 +00:00
5d199c90cd
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5320 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-24 20:45:17 +00:00
509fe6fe17
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5319 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-24 20:40:51 +00:00
ab7699eecd
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5318 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-24 20:38:59 +00:00
3ed80aea4d
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5317 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-24 20:38:34 +00:00
cd166c6f2f
integrate vmd wrapper module for pizza.py
...
this wrapper allows to spawn an instance of VMD
as an ancillary process under python and supports
a few simple manipulations through converting them
to tcl commands. also arbitrary tcl commands can
be forwarded by the object to the vmd instance.
2010-11-20 17:00:21 -05:00
71a6b77ea8
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5233 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-10 17:29:47 +00:00
f27a73ad68
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5231 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-10 14:58:49 +00:00
86bd2b29f2
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5230 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-08 21:06:24 +00:00
140780bcd6
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5229 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-08 21:04:35 +00:00
850dc7782b
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5215 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-04 14:11:58 +00:00
1b39008e5e
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5204 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-02 15:12:36 +00:00
508ee5d6aa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5202 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-02 15:08:33 +00:00
453aba29e5
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5201 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-02 15:07:40 +00:00
