Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
4f2c55d12ed5
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 8 2015, 20:57.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 8 2015, 20:57

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
e02850884592	athomps	Simplified non-overlap condition	Dec 5 2015
32acf721464b	athomps	Simplified non-overlap condition	Dec 5 2015
9ae8b64f9a5c	athomps	Cleaned up sna factorial table	Dec 5 2015
5087bdb20c59	athomps	prevented reorder from being used with fix gcmc	Dec 5 2015
f7702fd7e388	athomps	removed print statement	Dec 5 2015
2271d9168e52	athomps	Added missing normalization to vector case	Dec 4 2015
d241f928c85b	athomps	Fixed error in average option	Dec 4 2015
050a1367a04e	athomps	Fixed error in average option	Dec 4 2015
28e3ebfd102e	athomps	Fixed error in average option	Dec 4 2015

				Path
	M			doc/compute_msd.txt
	M			doc/fix_ave_atom.txt
	M			doc/fix_ave_chunk.txt
	M			doc/fix_ave_histo.txt
	M			doc/fix_ave_spatial.txt
	M			doc/fix_ave_spatial_sphere.txt
	M			doc/fix_ave_time.txt
	M			doc/fix_reaxc_species.txt
	M			doc/fix_saed_vtk.txt
	M			src/SNAP/sna.cpp
	M			src/SNAP/sna.h
	M			src/USER-DIFFRACTION/fix_saed_vtk.cpp
	M			src/USER-MISC/fix_ave_spatial_sphere.cpp
	M			src/USER-REAXC/fix_reaxc_species.cpp
	M			src/compute_msd.cpp
	M			src/compute_orientorder_atom.cpp
	M			src/dump.cpp
	M			src/fix_ave_atom.cpp
	M			src/fix_ave_chunk.cpp
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_time.cpp