Merge gromacs-4-6 into master

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

diff --git a/src/gromacs/gmxlib/names.c b/src/gromacs/gmxlib/names.c
index a49e360836e72a3a98e22f89c5baff2f84162a6a..470a0c17c909e8534b336fd04a9bc29c48c62eff 100644 (file)
--- a/src/gromacs/gmxlib/names.c
+++ b/src/gromacs/gmxlib/names.c
@@ -181,11 +181,11 @@ const char *ewt_names[ewtNR+1] = {
 };
 
 const char *epull_names[epullNR+1] = { 
-  "no", "umbrella", "constraint", "constant_force", NULL
+  "no", "umbrella", "constraint", "constant-force", NULL
 };
 
 const char *epullg_names[epullgNR+1] = { 
-  "distance", "direction", "cylinder", "position", "direction_periodic", NULL
+  "distance", "direction", "cylinder", "position", "direction-periodic", NULL
 };
 
 const char *erotg_names[erotgNR+1] = {