lammps-ro
390acdbbe95e
Actions

Authored by Mike Brown <wb8@lens-login4.ccs.ornl.gov> on Oct 28 2011, 20:44.

Description

Committed

Mike Brown <wb8@lens-login4.ccs.ornl.gov>

Oct 28 2011, 20:44

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Mike Brown <wb8@lens-login4.ccs.ornl.gov> committed rLAMMPS390acdbbe95e: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro (authored by Mike Brown <wb8@lens-login4.ccs.ornl.gov>).Oct 28 2011, 20:44

Commit	Author	Details	Committed
e05839cbeba5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7215 f3b2605a-c512-4ea7…	Oct 26 2011
331aca8ba6bc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7214 f3b2605a-c512-4ea7…	Oct 26 2011
600c945ee951	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7211 f3b2605a-c512-4ea7…	Oct 26 2011
3e3dc7361660	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7210 f3b2605a-c512-4ea7…	Oct 26 2011
c6ab9c0ce614	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7209 f3b2605a-c512-4ea7…	Oct 26 2011
9e2f81e4ed4a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7208 f3b2605a-c512-4ea7…	Oct 26 2011
ce48b6d67c3f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7206 f3b2605a-c512-4ea7…	Oct 26 2011
ac30ed30e3d3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7204 f3b2605a-c512-4ea7…	Oct 26 2011
cf330851dfc8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7203 f3b2605a-c512-4ea7…	Oct 26 2011
a0e2e04aed5d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7202 f3b2605a-c512-4ea7…	Oct 26 2011
c452d0bd8d51	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7201 f3b2605a-c512-4ea7…	Oct 26 2011

		Path
A		doc/Eqs/fld.jpg
P		doc/Eqs/fld.tex Copied from doc/Eqs/angle_cosine_periodic.tex
A		doc/Eqs/fld2.jpg
P		doc/Eqs/fld2.tex Copied from doc/Eqs/angle_cosine_periodic.tex
M		doc/Section_packages.html
M		doc/Section_packages.txt
M		doc/fix_wall.html
M		doc/fix_wall.txt
M		doc/fix_wall_reflect.html
M		doc/fix_wall_reflect.txt
A		doc/pair_brownian.html
A		doc/pair_brownian.txt
M		doc/pair_coeff.html
M		doc/pair_coeff.txt
A		doc/pair_lubricate.html
A		doc/pair_lubricate.txt
A		doc/pair_lubricateU.html
A		doc/pair_lubricateU.txt
M		doc/pair_style.html
M		doc/pair_style.txt
A	(dir)	src/FLD/
A		src/FLD/Install.sh
A		src/FLD/pair_brownian.cpp
P		src/FLD/pair_brownian.h Copied from src/pair_yukawa.h
A		src/FLD/pair_brownian_poly.cpp
P		src/FLD/pair_brownian_poly.h Copied from src/dump_xyz.h
A		src/FLD/pair_lubricate.cpp
P		src/FLD/pair_lubricate.h Copied from src/pair_lj96_cut.h
A		src/FLD/pair_lubricateU.cpp
P		src/FLD/pair_lubricateU.h Copied from src/GRANULAR/pair_gran_hooke_history.h
A		src/FLD/pair_lubricateU_poly.cpp
P		src/FLD/pair_lubricateU_poly.h Copied from src/GPU/pair_lj96_cut_gpu.h
A		src/FLD/pair_lubricate_poly.cpp
P		src/FLD/pair_lubricate_poly.h Copied from src/OPT/pair_lj_cut_opt.h
M		src/Makefile
D		src/USER-OMP/pair_lubricate_omp.cpp
D		src/USER-OMP/pair_lubricate_omp.h
M		src/fix_wall.cpp
M		src/fix_wall.h
M		src/fix_wall_reflect.cpp
M		src/fix_wall_reflect.h
M		src/version.h