Merge "Minor formatting and consistency changes to txtdump.c" into release-4-6

diff --git a/src/mdlib/mdebin.c b/src/mdlib/mdebin.c
index bf2a9a37a28176e4f2559bdd47fc159c2f071d01..bc1627371d53de498f9cedb1c3c419df5b3af9bb 100644 (file)
--- a/src/mdlib/mdebin.c
+++ b/src/mdlib/mdebin.c
@@ -1289,12 +1289,18 @@ void print_ebin(ener_file_t fp_ene,gmx_bool bEne,gmx_bool bDR,gmx_bool bOR,
                 pr_ebin(log,md->ebin,md->ifvir,9,3,mode,FALSE);
                 fprintf(log,"\n");
             }
-            fprintf(log,"   Total Virial (%s)\n",unit_energy);
-            pr_ebin(log,md->ebin,md->ivir,9,3,mode,FALSE);
-            fprintf(log,"\n");
-            fprintf(log,"   Pressure (%s)\n",unit_pres_bar);
-            pr_ebin(log,md->ebin,md->ipres,9,3,mode,FALSE);
-            fprintf(log,"\n");
+            if (md->bVir)
+            {
+                fprintf(log,"   Total Virial (%s)\n",unit_energy);
+                pr_ebin(log,md->ebin,md->ivir,9,3,mode,FALSE);
+                fprintf(log,"\n");
+            }
+            if (md->bPress)
+            {
+                fprintf(log,"   Pressure (%s)\n",unit_pres_bar);
+                pr_ebin(log,md->ebin,md->ipres,9,3,mode,FALSE);
+                fprintf(log,"\n");
+            }
             fprintf(log,"   Total Dipole (%s)\n",unit_dipole_D);
             pr_ebin(log,md->ebin,md->imu,3,3,mode,FALSE);
             fprintf(log,"\n");