Merge branch 'merge-pull-20' into lammps-icms
a4984eeaaaf6
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 24 2015, 20:05.

Description

Merge branch 'merge-pull-20' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 24 2015, 20:05

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa4984eeaaaf6: Merge branch 'merge-pull-20' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 24 2015, 20:05

Commit	Author	Details	Committed
7bb39e299685	Axel Kohlmeyer	move lj/cut/thole/long/omp into USER-OMP directory, so it is properly installed…	Nov 24 2015
9764280bb2f7	Axel Kohlmeyer	Merge branch 'master' of git://github.com/jdevemy/lammps into merge-pull-20	Nov 24 2015
fd127b82c458	Julien Devemy	Add pair lj/cut/thole/long/omp	Nov 24 2015

				Path
	P			src/USER-OMP/pair_lj_cut_thole_long_omp.cpp Copied from src/USER-OMP/pair_lj_cut_coul_long_omp.cpp
	P			src/USER-OMP/pair_lj_cut_thole_long_omp.h Copied from src/CORESHELL/pair_lj_cut_coul_long_cs.h