Merge branch 'master' into USER-DPD_kokkos
f16f9393ef09
Actions

Authored by Stan Moore <stanmoore1@gmail.com> on Jan 13 2017, 18:51.

Description

Merge branch 'master' into USER-DPD_kokkos

Committed

Stan Moore <stanmoore1@gmail.com>

Jan 13 2017, 18:51

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Stan Moore <stanmoore1@gmail.com> committed rLAMMPSf16f9393ef09: Merge branch 'master' into USER-DPD_kokkos (authored by Stan Moore <stanmoore1@gmail.com>).Jan 13 2017, 18:51

	Commit			Author	Details	Committed
	c31f1e9f2252			Steve Plimpton	add fix mscg command, example, lib	Jan 9 2017

		Path
M		doc/src/Manual.txt
M		doc/src/Section_commands.txt
M		doc/src/accelerate_intel.txt
A		doc/src/fix_mscg.txt
M		doc/src/fixes.txt
M		doc/src/lammps.book
M		doc/src/pair_eam.txt
M		doc/src/read_dump.txt
M		examples/README
A	(dir)	examples/mscg/
A		examples/mscg/README
A		examples/mscg/control.in
A		examples/mscg/data.meoh
A		examples/mscg/dump.meoh
A		examples/mscg/in.mscg
A	(dir)	examples/mscg/output_9Jan17/
A		examples/mscg/output_9Jan17/1_1.dat
A		examples/mscg/output_9Jan17/1_1.table
A		examples/mscg/output_9Jan17/b-spline.out
A		examples/mscg/output_9Jan17/rmin.in
P		examples/mscg/output_9Jan17/rmin_b.in Copied from doc/utils/converters/lammpsdoc/__init__.py
A		examples/mscg/output_9Jan17/sol_info.out
A		examples/mscg/output_9Jan17/x.out
A		examples/voronoi/README
M		lib/README
A	(dir)	lib/mscg/
A		lib/mscg/Makefile.lammps
A		lib/mscg/README
M		lib/voronoi/README
M		src/KSPACE/pppm.cpp
M		src/KSPACE/pppm_tip4p.cpp
M		src/KSPACE/pppm_tip4p.h
A	(dir)	src/MSCG/
A		src/MSCG/Install.sh
A		src/MSCG/README
A		src/MSCG/fix_mscg.cpp
A		src/MSCG/fix_mscg.h
M		src/Makefile
A		src/USER-INTEL/TEST/in.intel.eam
A		src/USER-INTEL/pair_eam_intel.cpp
A		src/USER-INTEL/pair_eam_intel.h
M		src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
M		src/USER-INTEL/pair_lj_charmm_coul_long_intel.h
M		src/read_dump.cpp
M		src/reader_native.cpp
M		src/version.h