Merge release-4-6 into master

[alexxy/gromacs.git] / src / tools / gmx_trjconv.c

diff --git a/src/tools/gmx_trjconv.c b/src/tools/gmx_trjconv.c
index 9d7ed66f5c7fa9a8424018a9296daea8269b8ac6..3f0a2fe6823be795123e740d9278263f89098d5e 100644 (file)
--- a/src/tools/gmx_trjconv.c
+++ b/src/tools/gmx_trjconv.c
@@ -1,39 +1,36 @@
 /*
- * This file is part of the GROMACS molecular simulation package.
- *
+ * 
+ *                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.
- * Copyright (c) 2012, by the GROMACS development team, led by
- * David van der Spoel, Berk Hess, Erik Lindahl, and including many
- * others, as listed in the AUTHORS file in the top-level source
- * directory and at http://www.gromacs.org.
- *
- * GROMACS is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
+
+ * 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.
- *
- * GROMACS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GROMACS; if not, see
- * http://www.gnu.org/licenses, or write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- *
- * If you want to redistribute modifications to GROMACS, 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 http://www.gromacs.org.
- *
+ * 
+ * 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 research papers on the package. Check out http://www.gromacs.org.
+ * 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:
+ * Green Red Orange Magenta Azure Cyan Skyblue
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -42,7 +39,6 @@
 #include <string.h>
 #include <math.h>
 #include "macros.h"
-#include "assert.h"
 #include "sysstuff.h"
 #include "smalloc.h"
 #include "typedefs.h"
@@ -67,6 +63,10 @@
 #include "gmx_ana.h"
 #include "gmx_sort.h"
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 enum { euSel,euRect, euTric, euCompact, euNR};
 
 
@@ -814,7 +814,6 @@ int gmx_trjconv(int argc,char *argv[])
     };
 #define NFILE asize(fnm)
 
-    CopyRight(stderr,argv[0]);
     parse_common_args(&argc,argv,
                       PCA_CAN_BEGIN | PCA_CAN_END | PCA_CAN_VIEW | 
                       PCA_TIME_UNIT | PCA_BE_NICE,