Merge branch 'lammps-awesome' into lammps-icms
e70e9e49e1d4
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 29 2010, 01:42.

Description

Merge branch 'lammps-awesome' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 29 2010, 01:42

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSe70e9e49e1d4: Merge branch 'lammps-awesome' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 29 2010, 01:42

Commit	Author	Details	Committed
93e95bf1f32f	Ryan Houlihan	Added a #include <omp.h>	May 28 2010
e5ead4f83489	Ryan Houlihan	Leonard Jones Gromacs with OMP	May 28 2010
98f60f404a47	Ryan Houlihan	Leonard Jones Expand with OMP	May 28 2010
a8d74088fdfa	Ryan Houlihan	Leonard Jones Gromacs Coul Gromacs with OMP	May 28 2010
d9249100f52d	Ryan Houlihan	USER-OPENMP/pair_lj_expand_omp.cpp	May 28 2010

				Path
	P			src/USER-OPENMP/pair_lj_expand_omp.cpp Copied from src/pair_lj_expand.cpp
	P			src/USER-OPENMP/pair_lj_expand_omp.h Copied from src/USER-OPENMP/pair_morse_omp.h
	P			src/USER-OPENMP/pair_lj_gromacs_coul_gromacs_omp.cpp Copied from src/pair_lj_gromacs_coul_gromacs.cpp
	P			src/USER-OPENMP/pair_lj_gromacs_coul_gromacs_omp.h Copied from src/USER-OPENMP/pair_lj_charmm_coul_charmm_omp.h
	P			src/USER-OPENMP/pair_lj_gromacs_omp.cpp Copied from src/pair_lj_gromacs.cpp
	P			src/USER-OPENMP/pair_lj_gromacs_omp.h Copied from src/USER-OPENMP/pair_lj_smooth_omp.h