X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fgromacs%2Ffft%2Ffft5d.cpp;h=1e9e11bd70a7757568d5115bf35726db5f5072f2;hb=a5b355552b920746e3dda332accccabadfe37b50;hp=69a689aaa8fe469f03c8814fe902fb63c5e6928a;hpb=7df930ee2e1d3bac7d080dfd994417c47fec94db;p=alexxy%2Fgromacs.git diff --git a/src/gromacs/fft/fft5d.cpp b/src/gromacs/fft/fft5d.cpp index 69a689aaa8..1e9e11bd70 100644 --- a/src/gromacs/fft/fft5d.cpp +++ b/src/gromacs/fft/fft5d.cpp @@ -34,14 +34,23 @@ */ #include "gmxpre.h" -#include "config.h" - -#include +#include "fft5d.h" +#include +#include +#include #include #include #include +#include + +#include "gromacs/utility/fatalerror.h" +#include "gromacs/utility/gmxmpi.h" +#include "gromacs/utility/smalloc.h" + +#include "config.h" + #ifdef NOGMX #define GMX_PARALLEL_ENV_INITIALIZED 1 #else @@ -52,8 +61,6 @@ #endif #endif -#include "gromacs/utility/gmxmpi.h" - #ifdef GMX_OPENMP /* TODO: Do we still need this? Are we still planning ot use fftw + OpenMP? */ #define FFT5D_THREADS @@ -61,12 +68,6 @@ /* #define FFT5D_FFTW_THREADS (now set by cmake) */ #endif -#include "fft5d.h" -#include -#include -#include -#include "gromacs/utility/smalloc.h" - #ifndef __FLT_EPSILON__ #define __FLT_EPSILON__ FLT_EPSILON #define __DBL_EPSILON__ DBL_EPSILON @@ -76,11 +77,9 @@ FILE* debug = 0; #endif -#include "gromacs/utility/fatalerror.h" - - #ifdef GMX_FFT_FFTW3 #include "thread_mpi/mutex.h" + #include "gromacs/utility/exceptions.h" /* none of the fftw3 calls, except execute(), are thread-safe, so we need to serialize them with this mutex. */