Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / legacyheaders / types / simple.h

diff --git a/src/gromacs/legacyheaders/types/simple.h b/src/gromacs/legacyheaders/types/simple.h
index 30c0c9079b36aa442ebf60f0aea0e13f471fe0f9..ec8e23a860a1793dc1b7906a330dbccf41e952b5 100644 (file)
--- a/src/gromacs/legacyheaders/types/simple.h
+++ b/src/gromacs/legacyheaders/types/simple.h
@@ -34,90 +34,14 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-
 #ifndef _simple_h
 #define _simple_h
 
-#include "../../utility/basedefinitions.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-}
-#endif
-
-#define XX      0                 /* Defines for indexing in */
-#define YY      1                 /* vectors                 */
-#define ZZ      2
-#define DIM     3                 /* Dimension of vectors    */
+#include "gromacs/math/vectypes.h"
+#include "gromacs/utility/basedefinitions.h"
+#include "gromacs/utility/real.h"
 
 typedef int         atom_id;      /* To indicate an atoms id         */
 #define NO_ATID     (atom_id)(~0) /* Use this to indicate invalid atid */
 
-/*! \brief Double precision accuracy */
-#define GMX_DOUBLE_EPS   1.11022302E-16
-
-/*! \brief Maximum double precision value - reduced 1 unit in last digit for MSVC */
-#define GMX_DOUBLE_MAX   1.79769312E+308
-
-/*! \brief Minimum double precision value */
-#define GMX_DOUBLE_MIN   2.22507386E-308
-
-/*! \brief Single precision accuracy */
-#define GMX_FLOAT_EPS    5.96046448E-08
-
-/*! \brief Maximum single precision value - reduced 1 unit in last digit for MSVC */
-#define GMX_FLOAT_MAX    3.40282346E+38
-
-/*! \brief Minimum single precision value */
-#define GMX_FLOAT_MIN    1.17549435E-38
-
-
-/* Check whether we already have a real type! */
-#ifdef GMX_DOUBLE
-
-#ifndef HAVE_REAL
-typedef double      real;
-#define HAVE_REAL
-#endif
-
-#define GMX_MPI_REAL    MPI_DOUBLE
-#define GMX_REAL_EPS    GMX_DOUBLE_EPS
-#define GMX_REAL_MIN    GMX_DOUBLE_MIN
-#define GMX_REAL_MAX    GMX_DOUBLE_MAX
-#define gmx_real_fullprecision_pfmt "%21.14e"
-#else
-
-#ifndef HAVE_REAL
-typedef float           real;
-#define HAVE_REAL
-#endif
-
-#define GMX_MPI_REAL    MPI_FLOAT
-#define GMX_REAL_EPS    GMX_FLOAT_EPS
-#define GMX_REAL_MIN    GMX_FLOAT_MIN
-#define GMX_REAL_MAX    GMX_FLOAT_MAX
-#define gmx_real_fullprecision_pfmt "%14.7e"
-#endif
-
-typedef real            rvec[DIM];
-
-typedef double          dvec[DIM];
-
-typedef real            matrix[DIM][DIM];
-
-typedef real            tensor[DIM][DIM];
-
-typedef int             ivec[DIM];
-
-typedef int             imatrix[DIM][DIM];
-
-/* Standard sizes for char* string buffers */
-#define STRLEN 4096
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif