biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sort all includes in src/gromacs
[alexxy/gromacs.git]
/
src
/
gromacs
/
mdlib
/
pme.c
diff --git
a/src/gromacs/mdlib/pme.c
b/src/gromacs/mdlib/pme.c
index 284480184ee23bb6751068cefea47cda31f4db0a..67a12ab58db8d0a8f5b4dc4a2f53f75214da1568 100644
(file)
--- a/
src/gromacs/mdlib/pme.c
+++ b/
src/gromacs/mdlib/pme.c
@@
-59,6
+59,8
@@
#include "gmxpre.h"
#include "gmxpre.h"
+#include "gromacs/legacyheaders/pme.h"
+
#include "config.h"
#include <assert.h>
#include "config.h"
#include <assert.h>
@@
-67,27
+69,25
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#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/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/legacyheaders/network.h"
-#include "gromacs/math/units.h"
#include "gromacs/legacyheaders/nrnb.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/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/gmxcomplex.h"
+#include "gromacs/math/units.h"
+#include "gromacs/math/vec.h"
#include "gromacs/timing/cyclecounter.h"
#include "gromacs/timing/wallcycle.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/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"
/* 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
#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
#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
#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
#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
#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
#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
#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
#else
DO_FSPLINE(5);
#endif