Merge branch 'openmp-pair-styles' into lammps-icms
b4898150f774
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 6 2010, 22:21.

Description

Merge branch 'openmp-pair-styles' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 6 2010, 22:21

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSb4898150f774: Merge branch 'openmp-pair-styles' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 6 2010, 22:21

	Commit			Author	Details	Committed
	5995cb3da891			Axel Kohlmeyer	add first stab of OpenMP for granular potentials	Jun 6 2010

				Path
	M			src/.gitignore
	M			src/USER-OPENMP/Install.sh
	P			src/USER-OPENMP/fix_pour_omp.cpp Copied from src/GRANULAR/fix_pour.cpp
	P			src/USER-OPENMP/fix_pour_omp.h Copied from src/GRANULAR/fix_pour.h
	P			src/USER-OPENMP/fix_shear_history_omp.cpp Copied from src/fix_shear_history.cpp
	P			src/USER-OPENMP/fix_shear_history_omp.h Copied from src/fix_shear_history.h
	A			src/USER-OPENMP/pair_gran_hertz_history_omp.cpp
	P			src/USER-OPENMP/pair_gran_hertz_history_omp.h Copied from src/GRANULAR/pair_gran_hertz_history.h
	P			src/USER-OPENMP/pair_gran_hooke_history_omp.cpp Copied from src/GRANULAR/pair_gran_hooke_history.cpp
	P			src/USER-OPENMP/pair_gran_hooke_history_omp.h Copied from src/GRANULAR/pair_gran_hooke_history.h
	A			src/USER-OPENMP/pair_gran_hooke_omp.cpp
	P			src/USER-OPENMP/pair_gran_hooke_omp.h Copied from src/GRANULAR/pair_gran_hooke.h
	M			src/fix_gravity.h
	M			src/region_block.h
	M			src/region_cylinder.h