Diffusion lammps 03fd924a5222

lammps-ro
03fd924a5222
Actions

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

Description

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

Conflicts:
src/GPU/pair_gayberne_gpu.cpp

Details

Committed

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

Apr 19 2011, 00:06

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS95c322ef0319: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro
rLAMMPS3e3ae00afabc: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5965 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
3e3ae00afabc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5965 f3b2605a-c512-4ea7…	Apr 17 2011
70a043a91ed7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5964 f3b2605a-c512-4ea7…	Apr 17 2011
888bee024a9e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5956 f3b2605a-c512-4ea7…	Apr 16 2011
0aad802c3b8d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5954 f3b2605a-c512-4ea7…	Apr 16 2011
e7038083a9da	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5953 f3b2605a-c512-4ea7…	Apr 16 2011
d6f7a7383ef8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5952 f3b2605a-c512-4ea7…	Apr 16 2011
e2d5478a6cb8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5951 f3b2605a-c512-4ea7…	Apr 16 2011
ff0cac6cc696	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5950 f3b2605a-c512-4ea7…	Apr 16 2011
452107d9cbd7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5949 f3b2605a-c512-4ea7…	Apr 16 2011
91c348d1952c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5948 f3b2605a-c512-4ea7…	Apr 16 2011
8ff0659bae17	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5947 f3b2605a-c512-4ea7…	Apr 16 2011

Changes (85)

				Path
	M			doc/atom_style.html
	M			doc/atom_style.txt
	M			doc/compute_pe_atom.html
	M			doc/compute_pe_atom.txt
	M			doc/create_atoms.html
	M			doc/create_atoms.txt
	M			doc/dump.html
	M			doc/dump.txt
	M			doc/dump_image.html
	M			doc/dump_image.txt
	M			doc/dump_modify.html
	M			doc/dump_modify.txt
	M			doc/fix_store_state.html
	M			doc/fix_store_state.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	M			doc/set.html
	M			doc/set.txt
	M			examples/ellipse/in.ellipse.gayberne
	M			examples/ellipse/in.ellipse.resquared
	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
	M			src/ASPHERE/compute_temp_asphere.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/DIPOLE/atom_vec_dipole.cpp
	M			src/DIPOLE/atom_vec_dipole.h
	M			src/GPU/pair_gayberne_gpu.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/PERI/pair_peri_lps.cpp
	M			src/PERI/pair_peri_pmb.cpp
	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/atom.cpp
	M			src/atom.h
	M			src/atom_vec.cpp
	M			src/atom_vec.h
	M			src/atom_vec_atomic.cpp
	M			src/atom_vec_atomic.h
	M			src/atom_vec_charge.cpp
	M			src/atom_vec_charge.h
	M			src/atom_vec_hybrid.cpp
	M			src/atom_vec_hybrid.h
	M			src/atom_vec_sphere.cpp
	M			src/atom_vec_sphere.h
	M			src/comm.cpp
	M			src/compute_property_atom.cpp
	M			src/compute_property_atom.h
	M			src/delete_atoms.cpp
	M			src/dump_cfg.cpp
	M			src/dump_custom.cpp
	M			src/dump_custom.h
	M			src/fix_evaporate.cpp
	M			src/fix_move.cpp
	M			src/fix_rigid.cpp
	M			src/fix_rigid.h
	M			src/fix_store_state.cpp
	M			src/fix_store_state.h
	M			src/force.cpp
	M			src/irregular.cpp
	M			src/read_data.cpp
	M			src/read_data.h
	M			src/set.cpp
	M			src/version.h
	M			tools/restart2data.cpp