X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fgromacs%2Fmdlib%2Fpme.c;h=67a12ab58db8d0a8f5b4dc4a2f53f75214da1568;hb=30692f54df98c3e8612dfdb1aa288ed51a7444b3;hp=284480184ee23bb6751068cefea47cda31f4db0a;hpb=8fc4edf35c768e4669814c118bf518578637339b;p=alexxy%2Fgromacs.git diff --git a/src/gromacs/mdlib/pme.c b/src/gromacs/mdlib/pme.c index 284480184e..67a12ab58d 100644 --- a/src/gromacs/mdlib/pme.c +++ b/src/gromacs/mdlib/pme.c @@ -59,6 +59,8 @@ #include "gmxpre.h" +#include "gromacs/legacyheaders/pme.h" + #include "config.h" #include @@ -67,27 +69,25 @@ #include #include -#include "gromacs/legacyheaders/typedefs.h" -#include "gromacs/legacyheaders/txtdump.h" -#include "gromacs/math/vec.h" -#include "gromacs/utility/smalloc.h" +#include "gromacs/fft/parallel_3dfft.h" +#include "gromacs/fileio/pdbio.h" #include "gromacs/legacyheaders/coulomb.h" -#include "gromacs/utility/fatalerror.h" -#include "gromacs/legacyheaders/pme.h" +#include "gromacs/legacyheaders/macros.h" #include "gromacs/legacyheaders/network.h" -#include "gromacs/math/units.h" #include "gromacs/legacyheaders/nrnb.h" -#include "gromacs/legacyheaders/macros.h" - +#include "gromacs/legacyheaders/txtdump.h" +#include "gromacs/legacyheaders/typedefs.h" #include "gromacs/legacyheaders/types/commrec.h" -#include "gromacs/fft/parallel_3dfft.h" -#include "gromacs/utility/futil.h" -#include "gromacs/fileio/pdbio.h" #include "gromacs/math/gmxcomplex.h" +#include "gromacs/math/units.h" +#include "gromacs/math/vec.h" #include "gromacs/timing/cyclecounter.h" #include "gromacs/timing/wallcycle.h" +#include "gromacs/utility/fatalerror.h" +#include "gromacs/utility/futil.h" #include "gromacs/utility/gmxmpi.h" #include "gromacs/utility/gmxomp.h" +#include "gromacs/utility/smalloc.h" /* Include the SIMD macro file and then check for support */ #include "gromacs/simd/simd.h" @@ -1436,7 +1436,7 @@ static void spread_coefficients_bsplines_thread(pmegrid_t *pm #define PME_SPREAD_SIMD4_ALIGNED #define PME_ORDER 4 #endif -#include "pme_simd4.h" +#include "gromacs/mdlib/pme_simd4.h" #else DO_BSPLINE(4); #endif @@ -1445,7 +1445,7 @@ static void spread_coefficients_bsplines_thread(pmegrid_t *pm #ifdef PME_SIMD4_SPREAD_GATHER #define PME_SPREAD_SIMD4_ALIGNED #define PME_ORDER 5 -#include "pme_simd4.h" +#include "gromacs/mdlib/pme_simd4.h" #else DO_BSPLINE(5); #endif @@ -2599,7 +2599,7 @@ static void gather_f_bsplines(gmx_pme_t pme, real *grid, #define PME_GATHER_F_SIMD4_ALIGNED #define PME_ORDER 4 #endif -#include "pme_simd4.h" +#include "gromacs/mdlib/pme_simd4.h" #else DO_FSPLINE(4); #endif @@ -2608,7 +2608,7 @@ static void gather_f_bsplines(gmx_pme_t pme, real *grid, #ifdef PME_SIMD4_SPREAD_GATHER #define PME_GATHER_F_SIMD4_ALIGNED #define PME_ORDER 5 -#include "pme_simd4.h" +#include "gromacs/mdlib/pme_simd4.h" #else DO_FSPLINE(5); #endif