Merge branch 'lammps-icms' into qmmm-qe
d3e6c3396d67
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 5 2013, 20:11.

Description

Merge branch 'lammps-icms' into qmmm-qe

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 5 2013, 20:11

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd3e6c3396d67: Merge branch 'lammps-icms' into qmmm-qe (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 5 2013, 20:11

Commit	Author	Details	Committed
0cc56656db65	Axel Kohlmeyer	added tersoff/omp style	Oct 5 2013
087056c03fd1	Axel Kohlmeyer	add a shell setenv command	Oct 5 2013
ba9d5d475c3e	Axel Kohlmeyer	use open_potential() instead of fopen	Oct 5 2013
515744cff24c	Axel Kohlmeyer	link recently added styles to list of pair styles	Oct 5 2013
2fed2809291b	Axel Kohlmeyer	add zbl/omp pair style	Oct 5 2013
e42f82edac35	Axel Kohlmeyer	we should align memory on 64 byte boundaries to match cache line sizes	Oct 4 2013
0a7fbe653a26	Axel Kohlmeyer	include explicit 8x loop unrolling for faster thread data reduction	Oct 4 2013
30a6c8eec72e	Axel Kohlmeyer	re-enable the "timers" command that got somehow lost	Oct 4 2013

		Path
A	(dir)	bench-accel/bench_zbl/
P		bench-accel/bench_zbl/in.zbl Copied from bench-accel/bench_lj/in.lj
M		doc/Section_commands.txt
M		doc/pair_tersoff_mod.txt
M		doc/pair_zbl.txt
M		doc/shell.txt
M		src/MAKE/Makefile.openmpi-omp
M		src/MANYBODY/pair_tersoff_mod.cpp
M		src/MEAM/pair_meam.cpp
P		src/USER-OMP/pair_tersoff_mod_omp.cpp Copied from src/USER-OMP/pair_tersoff_omp.cpp
P		src/USER-OMP/pair_tersoff_mod_omp.h Copied from src/USER-OMP/pair_edip_omp.h
P		src/USER-OMP/pair_zbl_omp.cpp Copied from src/USER-OMP/pair_lj_cut_omp.cpp
P		src/USER-OMP/pair_zbl_omp.h Copied from src/USER-OMP/pair_soft_omp.h
M		src/USER-OMP/thr_data.cpp
M		src/input.cpp