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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 9 2013, 00:49.

Description

Merge branch 'lammps-icms' into qmmm-qe

Resolved Conflicts:
src/STUBS/mpi.c
src/STUBS/mpi.h

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 9 2013, 00:49

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSef2991cc91ca: Merge branch 'lammps-icms' into qmmm-qe (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 9 2013, 00:49

	Commit			Author	Details	Committed
	3c7da9308eef			Axel Kohlmeyer	added code to use collective MPI operations for data remap in 3d-FFT	Oct 9 2013
	3250b3b4cc0c			Axel Kohlmeyer	added functions in MPI stub for improved remap. cleanup from jeff h	Oct 9 2013

				Path
	M			doc/kspace_modify.txt
	M			src/KSPACE/fft3d.cpp
	M			src/KSPACE/fft3d.h
	M			src/KSPACE/fft3d_wrap.cpp
	M			src/KSPACE/fft3d_wrap.h
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_old.cpp
	M			src/KSPACE/remap.cpp
	M			src/KSPACE/remap.h
	M			src/KSPACE/remap_wrap.cpp
	M			src/STUBS/mpi.c
	M			src/STUBS/mpi.h
	M			src/USER-PHONON/fix_phonon.cpp
	M			src/kspace.cpp
	M			src/kspace.h