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

32 Commits

Author SHA1 Message Date
Axel Kohlmeyer
1d9d6f9241 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Eqs/improper_dist-1.jpg
	doc/Eqs/pair_mdf-1.jpg
	doc/Eqs/pair_mdf-2.jpg
	doc/Eqs/pair_mdf-3.jpg
	doc/Eqs/pair_mdf-4.jpg
	doc/Eqs/pair_mdf-5.jpg
	doc/Eqs/pair_mdf-6.jpg
	doc/Manual.html
	doc/Manual.txt
	doc/Section_commands.txt
	doc/dump_custom_vtk.txt
	doc/fix.txt
	lib/vtk/Makefile.lammps
	python/lammps.py
	src/Makefile
	src/USER-COLVARS/ndx_group.cpp
	src/USER-VTK/dump_custom_vtk.h
 2016-02-16 12:44:25 +01:00
sjplimp
9fc1ec8d30 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14614 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:15:02 +00:00
sjplimp
bee7ffaee5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14610 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:06:11 +00:00
Axel Kohlmeyer
42ff3a7aba Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
 2015-07-07 07:39:44 -04:00
sjplimp
fc933f28ff git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13530 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-06 16:35:48 +00:00
Axel Kohlmeyer
c6564663e8 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_errors.txt
	src/REPLICA/tad.cpp
	src/lammps.h
 2014-01-31 06:34:23 -05:00
sjplimp
dd122f6a0b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11411 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-30 22:50:33 +00:00
sjplimp
abdec3cb5d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11410 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-30 22:49:40 +00:00
sjplimp
15a48a27b5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11402 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-30 21:11:09 +00:00
Axel Kohlmeyer
d181769e88 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	src/MAKE/Makefile.mingw32-cross
	src/MAKE/Makefile.mingw32-cross-mpi
	src/MAKE/Makefile.mingw64-cross
	src/MAKE/Makefile.mingw64-cross-mpi
 2014-01-30 07:54:10 -05:00
athomps
c42f8c43f5 Added Si vacancy hop example 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11383 f3b2605a-c512-4ea7-a41b-209d697bcdaa
 2014-01-29 22:51:52 +00:00
Axel Kohlmeyer
b6ad73ab1d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2014-01-11 13:53:25 -05:00
sjplimp
4f6a55e71b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11222 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-10 20:49:34 +00:00
Axel Kohlmeyer
1535858c41 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-11-09 12:26:31 +01:00
sjplimp
607ad2dc9d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11005 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-11-08 20:49:16 +00:00
Axel Kohlmeyer
7b25847ee5 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-02-16 12:25:40 +01:00
sjplimp
7ebdff8bbd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9514 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-02-15 21:00:56 +00:00
sjplimp
2654f62891 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9513 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-02-15 20:19:33 +00:00
Axel Kohlmeyer
2e265787a1 Merge branch 'master' into lammps-icms 2012-01-13 09:24:31 -05:00
sjplimp
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
Axel Kohlmeyer
5026f4b788 Merge branch 'master' into lammps-icms 2012-01-10 09:05:38 -05:00
sjplimp
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
sjplimp
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
Axel Kohlmeyer
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
sjplimp
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
sjplimp
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
Axel Kohlmeyer
c531b460b4 Merge branch 'master' into lammps-icms 2011-01-05 12:36:24 -05:00
athomps
29e25bd126 Added tad example 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5473 f3b2605a-c512-4ea7-a41b-209d697bcdaa
 2011-01-04 23:35:26 +00:00
Axel Kohlmeyer
357d559ba0 gpu enabled NEB examples. 2010-11-28 18:33:36 -05:00
sjplimp
1d39d319af git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5098 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-10-22 21:24:52 +00:00
sjplimp
f1fee8d3e0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4991 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-10-06 23:33:17 +00:00
sjplimp
a71eb75caa git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4920 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-09-30 23:12:46 +00:00