gridsort+resort: bugfixes
p2nfft: add resort support
Merge branch 'master' into update
fmm: add resort support