update colvarmodule code to svn as of aug 8 2012

2012-08-08 05:15:16 -04:00
parent 4b6667811e
commit b898d5d163
6 changed files with 41 additions and 31 deletions
--- a/lib/colvars/colvar.cpp
+++ b/lib/colvars/colvar.cpp
@ -98,8 +98,8 @@ colvar::colvar (std::string const &conf)
                         "on an axis",       "distanceZ",      distance_z);
  initialize_components ("distance projection "
                         "on a plane",       "distanceXY",     distance_xy);
-  initialize_components ("average distance weighted by inverse sixth power",
-                         "distance6", distance6);
+  initialize_components ("average distance weighted by inverse power",
+                         "distanceInv", distance_inv);

  initialize_components ("coordination "
                         "number",           "coordNum",       coordnum);