Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / forcerec.c

diff --git a/src/gromacs/mdlib/forcerec.c b/src/gromacs/mdlib/forcerec.c
index fec67cfaf63364d7de310adc3adc0145a0f3ff9f..7680d93a42d42d7c17570931f747eb9058889f23 100644 (file)
--- a/src/gromacs/mdlib/forcerec.c
+++ b/src/gromacs/mdlib/forcerec.c
@@ -1384,12 +1384,16 @@ static void make_adress_tf_tables(FILE *fp, const output_env_t oenv,
 
     snew(fr->atf_tabs, ir->adress->n_tf_grps);
 
+    sprintf(buf, "%s", tabfn);
     for (i = 0; i < ir->adress->n_tf_grps; i++)
     {
         j = ir->adress->tf_table_index[i]; /* get energy group index */
         sprintf(buf + strlen(tabfn) - strlen(ftp2ext(efXVG)) - 1, "tf_%s.%s",
                 *(mtop->groups.grpname[mtop->groups.grps[egcENER].nm_ind[j]]), ftp2ext(efXVG));
-        printf("loading tf table for energygrp index %d from %s\n", ir->adress->tf_table_index[j], buf);
+        if(fp)
+        {
+           fprintf(fp,"loading tf table for energygrp index %d from %s\n", ir->adress->tf_table_index[i], buf);
+        }
         fr->atf_tabs[i] = make_atf_table(fp, oenv, fr, buf, box);
     }