lammps-ro
95c322ef0319
Actions

Authored by Mike Brown <wb8@lens-login1.ccs.ornl.gov> on Apr 16 2011, 01:19.

Description

Merge branch 'master' of http://git.icms.temple.edu/lammps-ro

Conflicts:
lib/gpu/gb_gpu_kernel.cu
src/GPU/pair_gayberne_gpu.cpp

Details

Committed

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

Apr 16 2011, 01:19

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS385080beabc5: Merge branch 'upload'
rLAMMPS74c219743e23: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5943 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Mike Brown <wb8@lens-login1.ccs.ornl.gov> committed rLAMMPS95c322ef0319: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro (authored by Mike Brown <wb8@lens-login1.ccs.ornl.gov>).Apr 16 2011, 01:19

Merged Changes

Commit	Author	Details	Committed
74c219743e23	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5943 f3b2605a-c512-4ea7…	Apr 14 2011
85b537f0c65d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5942 f3b2605a-c512-4ea7…	Apr 14 2011
a0431917813f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5941 f3b2605a-c512-4ea7…	Apr 14 2011
759ee1f3e88b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5940 f3b2605a-c512-4ea7…	Apr 14 2011
f7ce52785b33	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5937 f3b2605a-c512-4ea7…	Apr 13 2011
c14ad97fedf2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5936 f3b2605a-c512-4ea7…	Apr 13 2011
f9089a721f4d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5934 f3b2605a-c512-4ea7…	Apr 13 2011
17f9667059fe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5933 f3b2605a-c512-4ea7…	Apr 13 2011
819524ebd6de	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5932 f3b2605a-c512-4ea7…	Apr 13 2011
e45fbd89d1b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5931 f3b2605a-c512-4ea7…	Apr 13 2011
7e9dd09646b7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5926 f3b2605a-c512-4ea7…	Apr 11 2011
0d56ce0615a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5925 f3b2605a-c512-4ea7…	Apr 11 2011
3b43d998c20a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5924 f3b2605a-c512-4ea7…	Apr 11 2011
a3a9b135d6f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5923 f3b2605a-c512-4ea7…	Apr 11 2011
d4b0e1454149	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5922 f3b2605a-c512-4ea7…	Apr 11 2011
05f10e15a2f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5918 f3b2605a-c512-4ea7…	Apr 11 2011
218bb0f0779d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5911 f3b2605a-c512-4ea7…	Apr 8 2011
fda01f6d2ec5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5907 f3b2605a-c512-4ea7…	Apr 7 2011
3480e40e5f59	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5906 f3b2605a-c512-4ea7…	Apr 7 2011

Changes (190)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			bench/in.chute
	M			bench/in.chute.scaled
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/Section_modify.html
	M			doc/Section_modify.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/atom_style.html
	M			doc/atom_style.txt
	M			doc/compute_erotate_asphere.html
	M			doc/compute_erotate_asphere.txt
	M			doc/compute_erotate_sphere.html
	M			doc/compute_erotate_sphere.txt
	M			doc/compute_pair_local.html
	M			doc/compute_pair_local.txt
	M			doc/compute_property_atom.html
	M			doc/compute_property_atom.txt
	M			doc/compute_property_local.html
	M			doc/compute_property_local.txt
	M			doc/compute_rdf.html
	M			doc/compute_rdf.txt
	M			doc/compute_temp_asphere.html
	M			doc/compute_temp_asphere.txt
	M			doc/compute_temp_sphere.html
	M			doc/compute_temp_sphere.txt
	M			doc/create_atoms.html
	M			doc/create_atoms.txt
	D			doc/dipole.html
	D			doc/dipole.txt
	M			doc/dump.html
	M			doc/dump.txt
	A			doc/dump_image.html
	A			doc/dump_image.txt
	M			doc/dump_modify.html
	M			doc/dump_modify.txt
	M			doc/fix_freeze.html
	M			doc/fix_freeze.txt
	M			doc/fix_gravity.html
	M			doc/fix_gravity.txt
	M			doc/fix_nph_asphere.html
	M			doc/fix_nph_asphere.txt
	M			doc/fix_nph_sphere.html
	M			doc/fix_nph_sphere.txt
	M			doc/fix_npt_asphere.html
	M			doc/fix_npt_asphere.txt
	M			doc/fix_npt_sphere.html
	M			doc/fix_npt_sphere.txt
	M			doc/fix_nve_asphere.html
	M			doc/fix_nve_asphere.txt
	M			doc/fix_nve_sphere.html
	M			doc/fix_nve_sphere.txt
	M			doc/fix_nvt_asphere.html
	M			doc/fix_nvt_asphere.txt
	M			doc/fix_nvt_sphere.html
	M			doc/fix_nvt_sphere.txt
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			doc/fix_srd.html
	M			doc/fix_srd.txt
	M			doc/mass.html
	M			doc/mass.txt
	M			doc/pair_colloid.html
	M			doc/pair_colloid.txt
	M			doc/pair_gayberne.html
	M			doc/pair_gayberne.txt
	M			doc/pair_gran.html
	M			doc/pair_gran.txt
	M			doc/pair_lubricate.html
	M			doc/pair_lubricate.txt
	M			doc/pair_resquared.html
	M			doc/pair_resquared.txt
	M			doc/pair_yukawa_colloid.html
	M			doc/pair_yukawa_colloid.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	M			doc/read_restart.html
	M			doc/read_restart.txt
	M			doc/set.html
	M			doc/set.txt
	D			doc/shape.html
	D			doc/shape.txt
	M			doc/tad.html
	M			doc/tad.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			examples/colloid/in.colloid
	M			examples/dipole/in.dipole
	M			examples/ellipse/in.ellipse.gayberne
	M			examples/ellipse/in.ellipse.resquared
	M			examples/pour/in.pour
	M			examples/pour/in.pour.2d
	M			examples/srd/in.srd.mixture
	M			lib/gpu/Makefile.lens
	M			lib/gpu/pair_gpu_build_kernel.cu
	M			src/ASPHERE/atom_vec_ellipsoid.cpp
	M			src/ASPHERE/atom_vec_ellipsoid.h
	M			src/ASPHERE/compute_erotate_asphere.cpp
	M			src/ASPHERE/compute_erotate_asphere.h
	P			src/ASPHERE/compute_temp_asphere.cpp Copied to src/compute_temp_sphere.cpp
	M			src/ASPHERE/compute_temp_asphere.h
	M			src/ASPHERE/fix_nh_asphere.cpp
	M			src/ASPHERE/fix_nh_asphere.h
	M			src/ASPHERE/fix_nve_asphere.cpp
	M			src/ASPHERE/fix_nve_asphere.h
	M			src/ASPHERE/pair_gayberne.cpp
	M			src/ASPHERE/pair_gayberne.h
	M			src/ASPHERE/pair_resquared.cpp
	M			src/ASPHERE/pair_resquared.h
	M			src/COLLOID/Install.sh
	D			src/COLLOID/atom_vec_colloid.cpp
	D			src/COLLOID/atom_vec_colloid.h
	M			src/COLLOID/fix_wall_colloid.cpp
	M			src/COLLOID/pair_colloid.cpp
	M			src/COLLOID/pair_lubricate.cpp
	M			src/COLLOID/pair_lubricate.h
	M			src/COLLOID/pair_yukawa_colloid.cpp
	M			src/DIPOLE/atom_vec_dipole.cpp
	M			src/DIPOLE/atom_vec_dipole.h
	M			src/DIPOLE/pair_dipole_cut.cpp
	M			src/GPU/pair_gayberne_gpu.cpp
	M			src/GRANULAR/Install.sh
	V			src/{GRANULAR/atom_vec_granular.cpp → atom_vec_sphere.cpp}
	V			src/{GRANULAR/atom_vec_granular.h → atom_vec_sphere.h}
	M			src/GRANULAR/fix_pour.cpp
	M			src/GRANULAR/fix_wall_gran.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/MOLECULE/atom_vec_angle.cpp
	M			src/MOLECULE/atom_vec_angle.h
	M			src/MOLECULE/atom_vec_bond.cpp
	M			src/MOLECULE/atom_vec_bond.h
	M			src/MOLECULE/atom_vec_full.cpp
	M			src/MOLECULE/atom_vec_full.h
	M			src/MOLECULE/atom_vec_molecular.cpp
	M			src/MOLECULE/atom_vec_molecular.h
	M			src/PERI/atom_vec_peri.cpp
	M			src/PERI/atom_vec_peri.h
	M			src/SRD/fix_srd.cpp
	M			src/SRD/fix_srd.h
	M			src/USER-EFF/atom_vec_electron.cpp
	M			src/USER-EFF/atom_vec_electron.h
	M			src/USER-EFF/compute_ke_atom_eff.cpp
	P			src/USER-EFF/compute_ke_eff.cpp Copied to src/compute_erotate_sphere.cpp
	M			src/USER-EFF/compute_temp_deform_eff.cpp
	M			src/USER-EFF/compute_temp_eff.cpp
	M			src/USER-EFF/compute_temp_region_eff.cpp
	P			src/USER-EFF/fix_nh_eff.cpp Copied to src/fix_nh_sphere.cpp
	M			src/USER-EFF/fix_nve_eff.cpp
	M			src/atom.cpp
	M			src/atom.h
	M			src/atom_vec.cpp
	M			src/atom_vec.h
	M			src/atom_vec_charge.cpp
	M			src/atom_vec_charge.h
	M			src/atom_vec_hybrid.cpp
	V			src/{atom_vec_sphere.cpp ← GRANULAR/atom_vec_granular.cpp}
	V			src/{atom_vec_sphere.h ← GRANULAR/atom_vec_granular.h}
	P			src/compute_erotate_sphere.cpp Copied from src/USER-EFF/compute_ke_eff.cpp
	M			src/compute_property_atom.cpp
	M			src/compute_property_atom.h
	P			src/compute_temp_sphere.cpp Copied from src/ASPHERE/compute_temp_asphere.cpp
	M			src/dump.h
	M			src/dump_atom.cpp
	M			src/dump_custom.cpp
	M			src/dump_custom.h
	M			src/fix_adapt.cpp
	P			src/fix_nh_sphere.cpp Copied from src/USER-EFF/fix_nh_eff.cpp
	M			src/fix_nve_sphere.cpp
	M			src/fix_rigid.cpp
	M			src/fix_rigid.h
	M			src/fix_wall_region.cpp
	M			src/input.cpp
	M			src/input.h
	M			src/lammps.cpp
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/pair_dpd_tstat.cpp
	M			src/pair_yukawa.cpp
	M			src/pair_yukawa.h
	M			src/read_data.cpp
	M			src/read_data.h
	M			src/read_restart.cpp
	M			src/replicate.cpp
	M			src/set.cpp
	M			src/version.h
	M			src/write_restart.cpp
	M			tools/binary2txt.cpp
	M			tools/restart2data.cpp