Code beautification with uncrustify

[alexxy/gromacs.git] / src / gromacs / gmxlib / oenv.cpp

diff --git a/src/gromacs/gmxlib/oenv.cpp b/src/gromacs/gmxlib/oenv.cpp
index 9a88904c6499d2c2139d41c0ad0243fb2460f724..11c2d5c525ea9de22dba18adf6db7c4115ab0c75 100644 (file)
--- a/src/gromacs/gmxlib/oenv.cpp
+++ b/src/gromacs/gmxlib/oenv.cpp
@@ -1,35 +1,35 @@
 /* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*-
  *
- * 
+ *
  *                This source code is part of
- * 
+ *
  *                 G   R   O   M   A   C   S
- * 
+ *
  *          GROningen MAchine for Chemical Simulations
- * 
+ *
  *                        VERSION 3.2.0
  * Written by David van der Spoel, Erik Lindahl, Berk Hess, and others.
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team,
  * check out http://www.gromacs.org for more information.
- 
+
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * If you want to redistribute modifications, please consider that
  * scientific software is very special. Version control is crucial -
  * bugs must be traceable. We will be happy to consider code for
  * inclusion in the official distribution, but derived work must not
  * be called official GROMACS. Details are found in the README & COPYING
  * files - if they are missing, get the official version at www.gromacs.org.
- * 
+ *
  * To help us fund GROMACS development, we humbly ask that you cite
  * the papers on the package - you can find them in the top README file.
- * 
+ *
  * For more info, check our website at http://www.gromacs.org
- * 
+ *
  * And Hey:
  * GROningen Mixture of Alchemy and Childrens' Stories
  */
@@ -63,14 +63,14 @@ struct output_env
 
     gmx::ProgramInfo programInfo;
 
-    time_unit_t time_unit; /* the time unit, enum defined in oenv.h */
-    gmx_bool view;  /* view of file requested */
-    xvg_format_t xvg_format; /* xvg output format, enum defined in oenv.h */
-    int  verbosity; /* The level of verbosity for this program */
-    int debug_level; /* the debug level */
+    time_unit_t      time_unit;   /* the time unit, enum defined in oenv.h */
+    gmx_bool         view;        /* view of file requested */
+    xvg_format_t     xvg_format;  /* xvg output format, enum defined in oenv.h */
+    int              verbosity;   /* The level of verbosity for this program */
+    int              debug_level; /* the debug level */
 };
 
-/* The source code in this file should be thread-safe. 
+/* The source code in this file should be thread-safe.
       Please keep it that way. */
 
 /******************************************************************
@@ -81,12 +81,16 @@ struct output_env
 
 /* read only time names */
 /* These must correspond to the time units type time_unit_t in oenv.h */
-static const real timefactors[] =   { 0,  1e3,  1, 1e-3, 1e-6, 1e-9, 1e-12, 0 };
-static const real timeinvfactors[] ={ 0, 1e-3,  1,  1e3,  1e6,  1e9,  1e12, 0 };
-static const char *time_units_str[] = { NULL, "fs", "ps", "ns", "us", 
-                                        "\\mus", "ms", "s" };
-static const char *time_units_xvgr[] = { NULL, "fs", "ps", "ns",  
-                                        "ms", "s", NULL };
+static const real  timefactors[] =   { 0,  1e3,  1, 1e-3, 1e-6, 1e-9, 1e-12, 0 };
+static const real  timeinvfactors[] = { 0, 1e-3,  1,  1e3,  1e6,  1e9,  1e12, 0 };
+static const char *time_units_str[] = {
+    NULL, "fs", "ps", "ns", "us",
+    "\\mus", "ms", "s"
+};
+static const char *time_units_xvgr[] = {
+    NULL, "fs", "ps", "ns",
+    "ms", "s", NULL
+};
 
 
 /***** OUTPUT_ENV MEMBER FUNCTIONS ******/
@@ -98,7 +102,7 @@ void output_env_init(output_env_t *oenvp, int argc, char *argv[],
     try
     {
         output_env_t oenv = new output_env(argc, argv);
-        *oenvp = oenv;
+        *oenvp            = oenv;
         oenv->time_unit   = tmu;
         oenv->view        = view;
         oenv->xvg_format  = xvg_format;
@@ -143,10 +147,10 @@ const char *output_env_get_time_label(const output_env_t oenv)
 {
     char *label;
     snew(label, 20);
-    
-    sprintf(label,"Time (%s)",time_units_str[oenv->time_unit] ? 
-            time_units_str[oenv->time_unit]: "ps");
-    
+
+    sprintf(label, "Time (%s)", time_units_str[oenv->time_unit] ?
+            time_units_str[oenv->time_unit] : "ps");
+
     return label;
 }
 
@@ -154,10 +158,10 @@ const char *output_env_get_xvgr_tlabel(const output_env_t oenv)
 {
     char *label;
     snew(label, 20);
-    
-    sprintf(label,"Time (%s)", time_units_xvgr[oenv->time_unit] ?
+
+    sprintf(label, "Time (%s)", time_units_xvgr[oenv->time_unit] ?
             time_units_xvgr[oenv->time_unit] : "ps");
-    
+
     return label;
 }
 
@@ -178,12 +182,16 @@ real output_env_conv_time(const output_env_t oenv, real time)
 
 void output_env_conv_times(const output_env_t oenv, int n, real *time)
 {
-    int i;
-    double fact=timefactors[oenv->time_unit];
-    
-    if (fact!=1.)
-        for(i=0; i<n; i++)
+    int    i;
+    double fact = timefactors[oenv->time_unit];
+
+    if (fact != 1.)
+    {
+        for (i = 0; i < n; i++)
+        {
             time[i] *= fact;
+        }
+    }
 }
 
 gmx_bool output_env_get_view(const output_env_t oenv)