Merge gromacs-4-6 into master

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

diff --git a/src/gromacs/gmxlib/tcontrol.c b/src/gromacs/gmxlib/tcontrol.c
index 3c609b90a7966f7ed26cc874cf6906dbd8e9fcbc..f4c2a39e30761ac1ce18b77d965b9f3fd350da65 100644 (file)
--- a/src/gromacs/gmxlib/tcontrol.c
+++ b/src/gromacs/gmxlib/tcontrol.c
@@ -63,24 +63,6 @@ static t_timecontrol timecontrol[TNR] = {
 static tMPI_Thread_mutex_t tc_mutex=TMPI_THREAD_MUTEX_INITIALIZER;
 #endif
 
-typedef struct {
-  real tfactor;
-  const char *tstr,*xvgstr;
-} t_timeconvert;
-
-static const t_timeconvert timeconvert[] = {
-    { 0,                   NULL,  NULL       },
-    { 1e3,                "fs",  "fs"       },
-    { 1,                  "ps",  "ps"       },
-    { 1e-3,               "ns",  "ns"       },
-    { 1e-6,               "us",  "\\mus"    }, 
-    { 1e-9,               "ms",  "ms"       },
-    { 1e-12,              "s",   "s"        },
-    { (1.0/60.0)*1e-12,    "m",   "m"        },
-    { (1.0/3600.0)*1e-12,  "h",   "h"        },
-    { 0,                  NULL,  NULL       }
-};
-
 gmx_bool bTimeSet(int tcontrol)
 {
     gmx_bool ret;