Merge branch 'lammps-icms' into lammps-molfile
f1c81a600599
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 12 2012, 02:00.

Description

Merge branch 'lammps-icms' into lammps-molfile

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 12 2012, 02:00

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf1c81a600599: Merge branch 'lammps-icms' into lammps-molfile (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 12 2012, 02:00

Commit	Author	Details	Committed
d650aef0dfb7	Axel Kohlmeyer	carry over mike brown's bugfix into /omp version. some formatting cleanup.	May 11 2012
9a8709ecc46f	Axel Kohlmeyer	drop const from all remaining templated parameters	May 11 2012
c4cccedd1ed1	Axel Kohlmeyer	add fix spring/pull to install list	May 11 2012
31a6affd9369	Axel Kohlmeyer	fix bug reported by mike brown	May 10 2012
d988dd011e97	Axel Kohlmeyer	incorporate dihedral bugfix by andrew jewett	May 9 2012

				Path
	M			src/MOLECULE/dihedral_helix.cpp
	M			src/USER-CG-CMM/pair_lj_sdk_coul_long.cpp
	M			src/USER-MISC/Install.sh
	M			src/USER-OMP/improper_class2_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_long_tip4p_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_pppm_tip4p_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_pppm_tip4p_omp.h
	M			src/USER-OMP/pair_lj_sdk_coul_long_omp.cpp