Fix ICC warnings

[alexxy/gromacs.git] / src / gromacs / gmxlib / txtdump.c

diff --git a/src/gromacs/gmxlib/txtdump.c b/src/gromacs/gmxlib/txtdump.c
index efb5cf0d9677657c8df800fbdb31a7483cecec6b..a70c1c005c5921f050fbca682919b295ce704b7b 100644 (file)
--- a/src/gromacs/gmxlib/txtdump.c
+++ b/src/gromacs/gmxlib/txtdump.c
@@ -34,22 +34,20 @@
  * 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"
 
 /* This file is completely threadsafe - please keep it that way! */
 
+#include "gromacs/legacyheaders/txtdump.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "typedefs.h"
-#include "types/commrec.h"
-#include "names.h"
-#include "txtdump.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/names.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/legacyheaders/types/commrec.h"
 #include "gromacs/math/vec.h"
-#include "macros.h"
-
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/smalloc.h"
 
@@ -740,7 +738,7 @@ static void pr_fepvals(FILE *fp, int indent, t_lambda *fep, gmx_bool bMDPformat)
         }
     }
     PI("calc-lambda-neighbors", fep->lambda_neighbors);
-    PS("dhdl-print-energy", EBOOL(fep->bPrintEnergy));
+    PS("dhdl-print-energy", edHdLPrintEnergy_names[fep->edHdLPrintEnergy]);
     PR("sc-alpha", fep->sc_alpha);
     PI("sc-power", fep->sc_power);
     PR("sc-r-power", fep->sc_r_power);
@@ -1413,7 +1411,7 @@ void pr_ilist(FILE *fp, int indent, const char *title,
                 j++;
                 for (k = 0; k < interaction_function[ftype].nratoms; k++)
                 {
-                    (void) fprintf(fp, " %u", *(iatoms++));
+                    (void) fprintf(fp, " %d", *(iatoms++));
                 }
                 (void) fprintf(fp, "\n");
                 i += 1+interaction_function[ftype].nratoms;
@@ -1948,11 +1946,11 @@ void pr_commrec(FILE *fp, int indent, t_commrec *cr)
     fprintf(fp, "commrec:\n");
     indent += 2;
     pr_indent(fp, indent);
-    fprintf(fp, "nodeid    = %d\n", cr->nodeid);
+    fprintf(fp, "rank      = %d\n", cr->nodeid);
     pr_indent(fp, indent);
-    fprintf(fp, "nnodes    = %d\n", cr->nnodes);
+    fprintf(fp, "number of ranks = %d\n", cr->nnodes);
     pr_indent(fp, indent);
-    fprintf(fp, "npmenodes = %d\n", cr->npmenodes);
+    fprintf(fp, "PME-only ranks = %d\n", cr->npmenodes);
     /*
        pr_indent(fp,indent);
        fprintf(fp,"threadid  = %d\n",cr->threadid);