Diffusion lammps 25e319f781aa

Merge branch 'master' into lammps-icms
25e319f781aa
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 2 2012, 20:37.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/read_dump.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 2 2012, 20:37

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS0f339a9ae724: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8218 f3b2605a-c512-4ea7…
rLAMMPS8a263bb4bea4: rename old read_dump code in preparation for merge

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS25e319f781aa: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 2 2012, 20:37

Merged Changes

Commit	Author	Details	Committed
0f339a9ae724	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8218 f3b2605a-c512-4ea7…	Jun 2 2012
dc5ce9f15ff3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8217 f3b2605a-c512-4ea7…	Jun 2 2012
17be5191bef8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8216 f3b2605a-c512-4ea7…	Jun 2 2012
fe568c6697a9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8215 f3b2605a-c512-4ea7…	Jun 2 2012
fa88ca7a58eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8213 f3b2605a-c512-4ea7…	Jun 2 2012
8591b9fb30b0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8211 f3b2605a-c512-4ea7…	Jun 2 2012
f8f88f150839	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8210 f3b2605a-c512-4ea7…	Jun 2 2012
cb7dd67f2560	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8209 f3b2605a-c512-4ea7…	Jun 1 2012
4990f2e53ddf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8208 f3b2605a-c512-4ea7…	Jun 1 2012
611e614170e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8207 f3b2605a-c512-4ea7…	Jun 1 2012
978a99e0981f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8206 f3b2605a-c512-4ea7…	Jun 1 2012
9377bfd64bd2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8205 f3b2605a-c512-4ea7…	Jun 1 2012
2c77342ed35e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8204 f3b2605a-c512-4ea7…	Jun 1 2012
e9342b00e064	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8202 f3b2605a-c512-4ea7…	Jun 1 2012
d319e4a651c5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8201 f3b2605a-c512-4ea7…	Jun 1 2012
6621cee3cd1c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8200 f3b2605a-c512-4ea7…	Jun 1 2012
75d99d30f584	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8199 f3b2605a-c512-4ea7…	Jun 1 2012

Changes (45)

				Path
	M			doc/Manual.html
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/compute_temp_region.html
	M			doc/compute_temp_region.txt
	M			doc/fix_dt_reset.html
	M			doc/fix_dt_reset.txt
	M			doc/fix_gravity.html
	M			doc/fix_gravity.txt
	M			doc/fix_move.html
	M			doc/fix_move.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	A			doc/read_dump.html
	M			doc/read_dump.txt
	M			doc/read_restart.html
	M			doc/read_restart.txt
	M			src/GRANULAR/fix_wall_gran.cpp
	M			src/MC/fix_gcmc.cpp
	M			src/SHOCK/fix_append_atoms.cpp
	M			src/SHOCK/fix_wall_piston.cpp
	M			src/SRD/fix_wall_srd.cpp
	M			src/USER-CUDA/fix_gravity_cuda.cpp
	M			src/USER-MISC/pair_edip.cpp
	M			src/USER-MISC/pair_edip.h
	M			src/USER-MISC/pair_tersoff_table.cpp
	M			src/USER-MISC/pair_tersoff_table.h
	M			src/USER-OMP/pair_edip_omp.cpp
	M			src/USER-OMP/pair_tersoff_table_omp.cpp
	M			src/atom.cpp
	M			src/create_atoms.cpp
	M			src/create_atoms.h
	M			src/fix.h
	M			src/fix_dt_reset.cpp
	M			src/fix_gravity.cpp
	M			src/fix_gravity.h
	M			src/fix_move.cpp
	M			src/fix_restrain.cpp
	M			src/fix_wall.cpp
	M			src/fix_wall_reflect.cpp
	A			src/read_dump.cpp
	A			src/read_dump.h
	A			src/read_dump_native.cpp
	A			src/read_dump_native.h
	M			src/version.h