Merge release-5-0 into master

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

diff --git a/src/gromacs/gmxlib/txtdump.c b/src/gromacs/gmxlib/txtdump.c
index efb5cf0d9677657c8df800fbdb31a7483cecec6b..8866da3100c028531f7cb807937000c865395bb3 100644 (file)
--- a/src/gromacs/gmxlib/txtdump.c
+++ b/src/gromacs/gmxlib/txtdump.c
@@ -740,7 +740,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);
@@ -1948,11 +1948,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);