Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / topdirs.c

diff --git a/src/gromacs/gmxpreprocess/topdirs.c b/src/gromacs/gmxpreprocess/topdirs.c
index 335d3500ef1dba396b2f7890a4fa4f55b71389e6..1c42dfab2d4513603f229a3a1baa4f2b4d2b3c51 100644 (file)
--- a/src/gromacs/gmxpreprocess/topdirs.c
+++ b/src/gromacs/gmxpreprocess/topdirs.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -34,21 +34,19 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
+
+#include "topdirs.h"
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 
-#include "sysstuff.h"
-#include "smalloc.h"
-#include "macros.h"
-#include "string2.h"
-#include "gmx_fatal.h"
-#include "topdirs.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
 
-/* Must correspond to the directive enum in grompp.h */
+/* Must correspond to the directive enum in grompp-impl.h */
 static const char *directive_names[d_maxdir+1] = {
     "defaults",
     "atomtypes",
@@ -144,6 +142,8 @@ int ifunc_index(directive d, int type)
                     return F_TABANGLES;
                 case 9:
                     return F_LINEAR_ANGLES;
+                case 10:
+                    return F_RESTRANGLES;
                 default:
                     gmx_fatal(FARGS, "Invalid angle type %d", type);
                     break;
@@ -184,6 +184,10 @@ int ifunc_index(directive d, int type)
                     return F_TABDIHS;
                 case 9:
                     return F_PDIHS; /* proper dihedrals where we allow multiple terms over single bond */
+                case 10:
+                    return F_RESTRDIHS;
+                case 11:
+                    return F_CBTDIHS;
                 default:
                     gmx_fatal(FARGS, "Invalid dihedral type %d", type);
             }