From: Roland Schulz <roland@utk.edu>
Date: Thu, 11 Sep 2014 15:02:46 +0000 (-0400)
Subject: Fix sorting and doxygen
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?p=alexxy%2Fgromacs.git;a=commitdiff_plain;h=f1289eb087bbe1c64d6a9da7ae4cf27dcb0a8055

Fix sorting and doxygen

Change-Id: I3f0124dee1b569275fe2889dedb9778bb3cc6b9d
---

diff --git a/src/gromacs/legacyheaders/nsgrid.h b/src/gromacs/legacyheaders/nsgrid.h
index c00df0078f..728e887654 100644
--- a/src/gromacs/legacyheaders/nsgrid.h
+++ b/src/gromacs/legacyheaders/nsgrid.h
@@ -49,7 +49,7 @@ extern "C" {
  * bad approximation for 4x1x1 up to 4x2x2.
  *
  * \todo It would be nicer to use sqrt(3) here, when all code that
- * #includes this file is in C++, which will let us cope with the
+ * includes this file is in C++, which will let us cope with the
  * std::sqrt<T> on Windows. */
 static const real GRID_STDDEV_FAC = 1.73205080757;
 
diff --git a/src/gromacs/mdlib/domdec.cpp b/src/gromacs/mdlib/domdec.cpp
index e3de5a97d9..074193e49b 100644
--- a/src/gromacs/mdlib/domdec.cpp
+++ b/src/gromacs/mdlib/domdec.cpp
@@ -39,8 +39,6 @@
 
 #include "config.h"
 
-#include <algorithm>
-
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
@@ -48,6 +46,8 @@
 #include <string.h>
 #include <time.h>
 
+#include <algorithm>
+
 #include "gromacs/bonded/bonded.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/pdbio.h"
diff --git a/src/gromacs/mdlib/domdec_con.cpp b/src/gromacs/mdlib/domdec_con.cpp
index 22cf39f781..b31204db8f 100644
--- a/src/gromacs/mdlib/domdec_con.cpp
+++ b/src/gromacs/mdlib/domdec_con.cpp
@@ -35,9 +35,10 @@
 
 #include "gmxpre.h"
 
-#include <algorithm>
 #include <assert.h>
 
+#include <algorithm>
+
 #include "gromacs/legacyheaders/constr.h"
 #include "gromacs/legacyheaders/domdec.h"
 #include "gromacs/legacyheaders/domdec_network.h"
diff --git a/src/gromacs/mdlib/domdec_setup.cpp b/src/gromacs/mdlib/domdec_setup.cpp
index 1d03b26bea..a802f29fb9 100644
--- a/src/gromacs/mdlib/domdec_setup.cpp
+++ b/src/gromacs/mdlib/domdec_setup.cpp
@@ -36,9 +36,10 @@
 #include "gmxpre.h"
 
 #include <assert.h>
-#include <cmath>
 #include <stdio.h>
 
+#include <cmath>
+
 #include "gromacs/legacyheaders/domdec.h"
 #include "gromacs/legacyheaders/names.h"
 #include "gromacs/legacyheaders/network.h"