Merge branch 'mypage' into lammps-icms
89efd487b1e9
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 9 2013, 08:42.

Description

Merge branch 'mypage' into lammps-icms

Resolved Conflicts:
src/USER-OMP/neighbor_omp.h

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 9 2013, 08:42

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS89efd487b1e9: Merge branch 'mypage' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 9 2013, 08:42

Commit	Author	Details	Committed
3c289419b0df	Axel Kohlmeyer	clean up MyPage API to go without public variables and use aligned malloc	Jul 8 2013
d8dec88599b9	Axel Kohlmeyer	bugfix for comb/omp	Jul 7 2013
56bd9bf3b681	Axel Kohlmeyer	bugfix for respa lists using wrong page increments avoid memory leak in shear…	Jul 7 2013
278eaaaeff02	Axel Kohlmeyer	port new memory allocation strategy to OpenMP for the rest (untested)	Jul 7 2013
228fb2f00519	Axel Kohlmeyer	Merge branch 'lammps-icms' into mydata	Jul 7 2013
9db2350af159	Axel Kohlmeyer	incorporate changes from steve with adjustments for OpenMP	Jul 7 2013

				Path
	M			src/GRANULAR/fix_pour.h
	M			src/MANYBODY/pair_airebo.cpp
	M			src/MANYBODY/pair_airebo.h
	M			src/MANYBODY/pair_comb.cpp
	M			src/MANYBODY/pair_comb.h
	M			src/MANYBODY/pair_lcbop.cpp
	M			src/MANYBODY/pair_lcbop.h
	M			src/USER-OMP/fix_shear_history_omp.cpp
	M			src/USER-OMP/neigh_derive_omp.cpp
	M			src/USER-OMP/neigh_full_omp.cpp
	M			src/USER-OMP/neigh_gran_omp.cpp
	M			src/USER-OMP/neigh_half_bin_omp.cpp
	M			src/USER-OMP/neigh_half_multi_omp.cpp
	M			src/USER-OMP/neigh_half_nsq_omp.cpp
	M			src/USER-OMP/neigh_respa_omp.cpp
	M			src/USER-OMP/neighbor_omp.h
	M			src/USER-OMP/pair_airebo_omp.cpp
	M			src/USER-OMP/pair_comb_omp.cpp
	M			src/fix_shear_history.cpp
	M			src/fix_shear_history.h
	A			src/my_page.h
	M			src/neigh_derive.cpp
	M			src/neigh_full.cpp
	M			src/neigh_gran.cpp
	M			src/neigh_half_bin.cpp
	M			src/neigh_half_multi.cpp
	M			src/neigh_half_nsq.cpp
	M			src/neigh_list.cpp
	M			src/neigh_list.h
	M			src/neigh_respa.cpp
	M			src/neighbor.cpp
	M			src/neighbor.h