Further copyrite.h cleanup.

- Rename thanx() to gmx_thanx().
- Make it responsibility of the wrapper binary to call gmx_thanx(),
  removing most existing calls.
- Remove unnecessary copyrite.h includes (many of them made unnecessary
  by the above change).
- One fix in qm_gamess.c that caused uncrustify to not parse the file
  correctly.

Change-Id: Ie74cdefa14f03b921f94d4b5931eb8e35a09f5af

diff --git a/src/contrib/anaf.c b/src/contrib/anaf.c
index e00de26062be5c94ede5a22ceec9275926153b3d..d5d352959d82d07eeec327283bd607c616d66089 100644 (file)
--- a/src/contrib/anaf.c
+++ b/src/contrib/anaf.c
@@ -162,7 +162,7 @@ int main(int argc,char *argv[])
     list_trn(fn);
   }
   
-  thanx(stderr);
+  gmx_thanx(stderr);
 
   return 0;
 }

diff --git a/src/contrib/compnl.c b/src/contrib/compnl.c
index 09348f5d18017a1341871eace4cc9dc9499c0f05..648a6c84706f2f262946261e6750115ffd45430e 100644 (file)
--- a/src/contrib/compnl.c
+++ b/src/contrib/compnl.c
@@ -138,7 +138,7 @@ int main(int argc,char *argv[])
   fprintf(stderr,"There were %d mismatches\n",nmiss);
   fprintf(stderr,"Finished\n");
   
-  thanx(stdout);
+  gmx_thanx(stdout);
   
   return 0;
 }

diff --git a/src/contrib/do_multiprot.c b/src/contrib/do_multiprot.c
index ed59ba2295a3a1436b8b9a9ae1dde3ec0e54cae7..58e7e5db35f4771b4c837f8fa3da36b53d1cb892 100644 (file)
--- a/src/contrib/do_multiprot.c
+++ b/src/contrib/do_multiprot.c
@@ -457,6 +457,6 @@ int main(int argc,char *argv[])
            free_t_atoms(&useatoms,TRUE);
        }
     }
-    thanx(stderr);
+    gmx_thanx(stderr);
     return 0;
 }

diff --git a/src/contrib/do_shift.c b/src/contrib/do_shift.c
index 4f2f443292c80a6ad548f7138bbd65d21fb98b92..7b4fa42802ea8f61d965584be244d005c77ea765 100644 (file)
--- a/src/contrib/do_shift.c
+++ b/src/contrib/do_shift.c
@@ -185,7 +185,7 @@ int main(int argc,char *argv[])
   close_trj(status);
   ffclose(out);
   
-  thanx(stderr);
+  gmx_thanx(stderr);
   
   return 0;
 }

diff --git a/src/contrib/ehanal.c b/src/contrib/ehanal.c
index 9c19c0b9973368588acbca055318ca3a83330a53..264afb8de76e98fa032289799ff95db3714f2ee7 100644 (file)
--- a/src/contrib/ehanal.c
+++ b/src/contrib/ehanal.c
@@ -42,7 +42,6 @@
 #include "typedefs.h"
 #include "smalloc.h"
 #include "macros.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "gmx_fatal.h"
 #include "random.h"

diff --git a/src/contrib/ehdata.c b/src/contrib/ehdata.c
index cc8137864b66ed7b0d8039843b5de964e6899356..2b5c6400631dc9eafbf878694e51660009117527 100644 (file)
--- a/src/contrib/ehdata.c
+++ b/src/contrib/ehdata.c
@@ -41,7 +41,6 @@
 #include "typedefs.h"
 #include "smalloc.h"
 #include "macros.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "gmx_fatal.h"
 #include "random.h"

diff --git a/src/contrib/ehole.c b/src/contrib/ehole.c
index 7fca28a72f6ead4aa8d68c5bfb2b62a33938cba1..a6817d423622b6e1f0a017ebc258f3a60a7652b7 100644 (file)
--- a/src/contrib/ehole.c
+++ b/src/contrib/ehole.c
@@ -689,7 +689,7 @@ int main(int argc,char *argv[])
   else 
     do_sims(NFILE,fnm,&ehp);
   
-  thanx(stdout);
+  gmx_thanx(stdout);
   
   return 0;
 }

diff --git a/src/contrib/g_anavel.c b/src/contrib/g_anavel.c
index e4eba47f834142fa5ae54b5c71cc3895ab677f66..eb7656c65b4a0444a50d9616d88296df77374b07 100644 (file)
--- a/src/contrib/g_anavel.c
+++ b/src/contrib/g_anavel.c
@@ -155,7 +155,7 @@ int main(int argc,char *argv[])
            nframe,nmax+1,t_x,t_y,profile,0,tmax,
            rgblo,rgbhi,&nlevels);
   
-  thanx(stderr);
+  gmx_thanx(stderr);
   
   return 0;
 }

diff --git a/src/contrib/gen_table.c b/src/contrib/gen_table.c
index 1ae2912acef40caaef85b1232df7eabae101b3b4..a649867127083ca71b0bf35ec65dd0c45c1c8e1f 100644 (file)
--- a/src/contrib/gen_table.c
+++ b/src/contrib/gen_table.c
@@ -842,7 +842,7 @@ int main(int argc,char *argv[])
   if ((m != mGuillot2001a)) 
     ffclose(fp);
   
-  thanx(stdout);
+  gmx_thanx(stdout);
   
   return 0;
 }

diff --git a/src/contrib/gmx_sdf.c b/src/contrib/gmx_sdf.c
index 88d7fe761fdd712229436638a44f76641f73c8de..62f66a9e47f0aeb394eb7c2f798d622d247605c5 100644 (file)
--- a/src/contrib/gmx_sdf.c
+++ b/src/contrib/gmx_sdf.c
@@ -763,7 +763,7 @@ int gmx_sdf(int argc,char *argv[])
          fnREF,bRef,cutoff,binwidth,mode,triangle,dtri,oenv);
 
 
-  thanx(stderr);
+  gmx_thanx(stderr);
   
   return 0;
 }

diff --git a/src/contrib/hexamer.c b/src/contrib/hexamer.c
index b950f2b89e7661ee0b5b8d1b7aa3aebac4dae207..2a264c113ac18e150e954c565dfa24e5f3c832aa 100644 (file)
--- a/src/contrib/hexamer.c
+++ b/src/contrib/hexamer.c
@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
   }
   ffclose(fp);
   
-  thanx(stderr);
+  gmx_thanx(stderr);
   
   return 0;
 }

diff --git a/src/contrib/mdrun_openmm.c b/src/contrib/mdrun_openmm.c
index 1d1600196d51fea0a27af0342331a9197a50a8a3..a258666a5f71fcb37df57e5abbde4ddac8781420 100644 (file)
--- a/src/contrib/mdrun_openmm.c
+++ b/src/contrib/mdrun_openmm.c
@@ -496,7 +496,7 @@ int cmain(int argc,char *argv[])
   gmx_finalize_par();
 
   if (MULTIMASTER(cr)) {
-      thanx(stderr);
+      gmx_thanx(stderr);
   }
 
   /* Log file has to be closed in mdrunner if we are appending to it 

diff --git a/src/contrib/optwat.c b/src/contrib/optwat.c
index 033a56a8b84983db334c49feae50fd840544cfbb..0f41adbb0bd8392c8800a2ea32b9d4782a3db8ba 100644 (file)
--- a/src/contrib/optwat.c
+++ b/src/contrib/optwat.c
@@ -269,7 +269,7 @@ int main(int argc,char *argv[])
   
   ffclose(fp);
     
-  thanx(stderr);
+  gmx_thanx(stderr);
   
   return 0;
 }

diff --git a/src/contrib/pmetest.c b/src/contrib/pmetest.c
index 00a7b4e352082591bbd9e1d8338ecd1cd37e0c42..4c248be8fc89d4b4d7fcd6bfeefe53304906aa78 100644 (file)
--- a/src/contrib/pmetest.c
+++ b/src/contrib/pmetest.c
@@ -469,7 +469,7 @@ int main(int argc,char *argv[])
 
   /* Thank the audience, as usual */
   if (MASTER(cr)) 
-    thanx(stderr);
+    gmx_thanx(stderr);
 
   return 0;
 }

diff --git a/src/contrib/test.c b/src/contrib/test.c
index 06bd506b365e730b8fcc0bcc2927425d27ac8860..1f88caa1b0182f0f8efaf53ad083a88e65430f2f 100644 (file)
--- a/src/contrib/test.c
+++ b/src/contrib/test.c
@@ -139,7 +139,7 @@ int main(int argc,char *argv[])
   
   do_view(ftp2fn(efXVG,NFILE,fnm),NULL);
 
-  thanx(stderr);  
+  gmx_thanx(stderr);
               
   return 0;
 }

diff --git a/src/contrib/testlr.c b/src/contrib/testlr.c
index aeba9650f0d3a312790955f1652ba6125354c904..86fc1d4d28df9c804dd21abc9c3ef2567be956d7 100644 (file)
--- a/src/contrib/testlr.c
+++ b/src/contrib/testlr.c
@@ -576,7 +576,7 @@ int main(int argc,char *argv[])
   
   gmx_fio_fclose(log);
   
-  thanx(stderr);
+  gmx_thanx(stderr);
   
   return 0;
 }

diff --git a/src/gromacs/commandline/cmdlinemodulemanager.cpp b/src/gromacs/commandline/cmdlinemodulemanager.cpp
index f99e511cfb37d2995fe9ec1f21bc4d15d436c285..3bb6f69681c6ae3375aa5dec611b84955dbaa484 100644 (file)
--- a/src/gromacs/commandline/cmdlinemodulemanager.cpp
+++ b/src/gromacs/commandline/cmdlinemodulemanager.cpp
@@ -47,6 +47,8 @@
 #include <string>
 #include <utility>
 
+#include "gromacs/legacyheaders/copyrite.h"
+
 #include "gromacs/commandline/cmdlinemodule.h"
 #include "gromacs/onlinehelp/helpformat.h"
 #include "gromacs/onlinehelp/helpmanager.h"
@@ -299,7 +301,6 @@ int CommandLineHelpModule::run(int argc, char *argv[])
         return 2;
     }
     helpManager.writeCurrentTopic();
-    fprintf(stderr, "\n");
     return 0;
 }
 
@@ -451,6 +452,7 @@ int CommandLineModuleManager::run(int argc, char *argv[])
         if (argc < 2)
         {
             impl_->helpModule_->printUsage();
+            gmx_thanx(stderr);
             return 2;
         }
         module    = impl_->findModuleByName(argv[1]);
@@ -460,9 +462,12 @@ int CommandLineModuleManager::run(int argc, char *argv[])
     {
         fprintf(stderr, "Unknown command: '%s'\n\n", argv[1]);
         impl_->helpModule_->printUsage();
+        gmx_thanx(stderr);
         return 2;
     }
-    return module->second->run(argc - argOffset, argv + argOffset);
+    int rc = module->second->run(argc - argOffset, argv + argOffset);
+    gmx_thanx(stderr);
+    return rc;
 }
 
 } // namespace gmx

diff --git a/src/gromacs/gmxana/gmx_anadock.c b/src/gromacs/gmxana/gmx_anadock.c
index d43eb918e0b6eb3460d1b1b481f6c1dc65390afc..1c68e21631dfc3ceebc6ee595bdef0018326fa8f 100644 (file)
--- a/src/gromacs/gmxana/gmx_anadock.c
+++ b/src/gromacs/gmxana/gmx_anadock.c
@@ -391,10 +391,8 @@ int gmx_anadock(int argc, char *argv[])
     cluster_em_all(fp, npdbf, pdbf, opt2fn("-ox", NFILE, fnm),
                    bFree, bRMS, cutoff);
 
-    thanx(fp);
+    gmx_thanx(fp);
     ffclose(fp);
 
-    thanx(stdout);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_anaeig.c b/src/gromacs/gmxana/gmx_anaeig.c
index 4d4c89bfbb1f693fddb6a0ec6f36ea478f64dc00..220d156508aa279e5d90b96e894fc00a324fce1b 100644 (file)
--- a/src/gromacs/gmxana/gmx_anaeig.c
+++ b/src/gromacs/gmxana/gmx_anaeig.c
@@ -45,7 +45,6 @@
 #include "gmx_fatal.h"
 #include "vec.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -1473,7 +1472,5 @@ int gmx_anaeig(int argc, char *argv[])
 
     view_all(oenv, NFILE, fnm);
 
-    thanx(stdout);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_analyze.c b/src/gromacs/gmxana/gmx_analyze.c
index a0815619991ad989f64bc5b517e516de5d81342c..6a48bb1a55cbbdcb38fb6ecad70337a1afd4e8cc 100644 (file)
--- a/src/gromacs/gmxana/gmx_analyze.c
+++ b/src/gromacs/gmxana/gmx_analyze.c
@@ -1416,7 +1416,5 @@ int gmx_analyze(int argc, char *argv[])
 
     view_all(oenv, NFILE, fnm);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_angle.c b/src/gromacs/gmxana/gmx_angle.c
index e0215ec7d1113abbe2ab1d62f736be8a395e5dd9..478ab9153ab9cb8682d03734a5cf0427d9821683 100644 (file)
--- a/src/gromacs/gmxana/gmx_angle.c
+++ b/src/gromacs/gmxana/gmx_angle.c
@@ -466,7 +466,5 @@ int gmx_g_angle(int argc, char *argv[])
         do_view(oenv, opt2fn("-ov", NFILE, fnm), "-nxy");
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_bar.c b/src/gromacs/gmxana/gmx_bar.c
index 2fa8ecbde39e057deb4cdcd99f881a3bd931a0bb..c3e86fe453d98c4d649b5e89c43f344bbdc81ce3 100644 (file)
--- a/src/gromacs/gmxana/gmx_bar.c
+++ b/src/gromacs/gmxana/gmx_bar.c
@@ -48,7 +48,6 @@
 #include "smalloc.h"
 #include "futil.h"
 #include "statutil.h"
-#include "copyrite.h"
 #include "macros.h"
 #include "enxio.h"
 #include "physics.h"
@@ -3944,7 +3943,5 @@ int gmx_bar(int argc, char *argv[])
     do_view(oenv, opt2fn_null("-o", NFILE, fnm), "-xydy");
     do_view(oenv, opt2fn_null("-oi", NFILE, fnm), "-xydy");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_bond.c b/src/gromacs/gmxana/gmx_bond.c
index 6783285dc6cbe811d29b76ab472957af98dc811d..ff27615106e11fb0a463c30f6a8d991a3ba61c94 100644 (file)
--- a/src/gromacs/gmxana/gmx_bond.c
+++ b/src/gromacs/gmxana/gmx_bond.c
@@ -44,7 +44,6 @@
 #include "vec.h"
 #include "pbc.h"
 #include "xvgr.h"
-#include "copyrite.h"
 #include "gmx_fatal.h"
 #include "futil.h"
 #include "statutil.h"
@@ -365,7 +364,5 @@ int gmx_bond(int argc, char *argv[])
     do_view(oenv, opt2fn("-o", NFILE, fnm), "-nxy");
     do_view(oenv, opt2fn_null("-d", NFILE, fnm), "-nxy");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_bundle.c b/src/gromacs/gmxana/gmx_bundle.c
index 263a59ade159b39adfbe77a6a75cebbf6dd28324..6ecd5cf3887cdd351295c7f626d56f9c3afbeabe 100644 (file)
--- a/src/gromacs/gmxana/gmx_bundle.c
+++ b/src/gromacs/gmxana/gmx_bundle.c
@@ -44,7 +44,6 @@
 #include "smalloc.h"
 #include "macros.h"
 #include "vec.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -436,7 +435,5 @@ int gmx_bundle(int argc, char *argv[])
         ffclose(fkinkl);
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_chi.c b/src/gromacs/gmxana/gmx_chi.c
index 0c37cd8e5bc3b9b0f0c267ade5387f1751955546..24f2fec9c06f095dbe62546ea0407419f587b6dd 100644 (file)
--- a/src/gromacs/gmxana/gmx_chi.c
+++ b/src/gromacs/gmxana/gmx_chi.c
@@ -40,7 +40,6 @@
 
 #include "confio.h"
 #include "pdbio.h"
-#include "copyrite.h"
 #include "gmx_fatal.h"
 #include "futil.h"
 #include "gstat.h"
@@ -1576,7 +1575,5 @@ int gmx_chi(int argc, char *argv[])
 
     gmx_residuetype_destroy(rt);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_cluster.c b/src/gromacs/gmxana/gmx_cluster.c
index 604a24f84c95096f3275de8e65da5d51bf20fcc3..78c1634ff4db4da1f9342faa951d85e8894399f6 100644 (file)
--- a/src/gromacs/gmxana/gmx_cluster.c
+++ b/src/gromacs/gmxana/gmx_cluster.c
@@ -41,7 +41,6 @@
 #include "macros.h"
 #include "smalloc.h"
 #include "typedefs.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "tpxio.h"
 #include "string2.h"
@@ -1895,8 +1894,5 @@ int gmx_cluster(int argc, char *argv[])
         do_view(oenv, opt2fn_null("-clid", NFILE, fnm), "-nxy");
     }
 
-    /* Thank the user for her patience */
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_clustsize.c b/src/gromacs/gmxana/gmx_clustsize.c
index 49667edc31df7788aba25c597f679f7084ff363b..476c55534654dd35d7f2232e79d6e1a97f68db6f 100644 (file)
--- a/src/gromacs/gmxana/gmx_clustsize.c
+++ b/src/gromacs/gmxana/gmx_clustsize.c
@@ -48,7 +48,6 @@
 #include "rmpbc.h"
 #include "statutil.h"
 #include "xvgr.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "tpxio.h"
@@ -529,7 +528,5 @@ int gmx_clustsize(int argc, char *argv[])
                bMol, bPBC, fnTPR,
                cutoff, nskip, nlevels, rgblo, rgbhi, ndf, oenv);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_confrms.c b/src/gromacs/gmxana/gmx_confrms.c
index f7f38337dc3141ecbd1830fcb0bda718abc3aaea..40286ec3984bef21ac724a58c995c8323466c4c7 100644 (file)
--- a/src/gromacs/gmxana/gmx_confrms.c
+++ b/src/gromacs/gmxana/gmx_confrms.c
@@ -42,7 +42,6 @@
 #include <math.h>
 #include "typedefs.h"
 #include "xvgr.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "tpxio.h"
 #include "string2.h"
@@ -833,7 +832,5 @@ int gmx_confrms(int argc, char *argv[])
 
     view_all(oenv, NFILE, fnm);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_covar.c b/src/gromacs/gmxana/gmx_covar.c
index a3ad2a6bb60fbbdaadc1ce4f78d816f2c11c67c8..a8c1b088b34ade04333f963e824b4581a3a53094 100644 (file)
--- a/src/gromacs/gmxana/gmx_covar.c
+++ b/src/gromacs/gmxana/gmx_covar.c
@@ -51,7 +51,6 @@
 #include "macros.h"
 #include "vec.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -653,7 +652,5 @@ int gmx_covar(int argc, char *argv[])
 
     fprintf(stderr, "Wrote the log to %s\n", logfile);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_current.c b/src/gromacs/gmxana/gmx_current.c
index bb762e7beda1244928b6dbc5a6dadd825ddf3bc9..e81132b73123071d4dec6087e7af30de92eb7e21 100644 (file)
--- a/src/gromacs/gmxana/gmx_current.c
+++ b/src/gromacs/gmxana/gmx_current.c
@@ -44,7 +44,6 @@
 #include "typedefs.h"
 #include "smalloc.h"
 #include "vec.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "tpxio.h"
 #include "xvgr.h"
@@ -1005,7 +1004,5 @@ int gmx_current(int argc, char *argv[])
         ffclose(mcor);
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_density.c b/src/gromacs/gmxana/gmx_density.c
index c944f5924c074ed5d4f7f6b529983d9d399c26d3..fa3ad0940f789472d51e446ef9cfbcb62613e8f6 100644 (file)
--- a/src/gromacs/gmxana/gmx_density.c
+++ b/src/gromacs/gmxana/gmx_density.c
@@ -48,7 +48,6 @@
 #include "vec.h"
 #include "xvgr.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -554,6 +553,5 @@ int gmx_density(int argc, char *argv[])
                  bSymmetrize, oenv);
 
     do_view(oenv, opt2fn("-o", NFILE, fnm), "-nxy");  /* view xvgr file */
-    thanx(stderr);
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_densmap.c b/src/gromacs/gmxana/gmx_densmap.c
index cabc2b49152fbc9cefecc9dfc707fbd60fc0ebf5..5d1cbc3ae03de8f347b5712fd695beef790cc3bb 100644 (file)
--- a/src/gromacs/gmxana/gmx_densmap.c
+++ b/src/gromacs/gmxana/gmx_densmap.c
@@ -46,7 +46,6 @@
 #include "macros.h"
 #include "vec.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -524,8 +523,6 @@ int gmx_densmap(int argc, char *argv[])
         ffclose(fp);
     }
 
-    thanx(stderr);
-
     do_view(oenv, opt2fn("-o", NFILE, fnm), NULL);
 
     return 0;

diff --git a/src/gromacs/gmxana/gmx_densorder.c b/src/gromacs/gmxana/gmx_densorder.c
index 0cd0cc7eb5b0f68287a02230e8075bdd3e335cc2..1a61fc6caf1eaa69ce09f06617a4c50dfb877945 100644 (file)
--- a/src/gromacs/gmxana/gmx_densorder.c
+++ b/src/gromacs/gmxana/gmx_densorder.c
@@ -48,7 +48,6 @@
 #include "vec.h"
 #include "xvgr.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -807,6 +806,5 @@ int gmx_densorder(int argc, char *argv[])
         sfree(surf2);
     }
 
-    thanx(stderr);
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_dielectric.c b/src/gromacs/gmxana/gmx_dielectric.c
index 0a5484e29b4a6654e4593291b7e20613570c6897..d5a60e7c0e109822982c419cf4f4b472d0ce9e5d 100644 (file)
--- a/src/gromacs/gmxana/gmx_dielectric.c
+++ b/src/gromacs/gmxana/gmx_dielectric.c
@@ -416,7 +416,5 @@ int gmx_dielectric(int argc, char *argv[])
     do_view(oenv, opt2fn("-c", NFILE, fnm), NULL);
     do_view(oenv, opt2fn("-d", NFILE, fnm), "-nxy");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_dipoles.c b/src/gromacs/gmxana/gmx_dipoles.c
index 84719ea456a01e56a3dedd589d28b2d192cc17c2..473ffc4e5bf53afb7ee4969a955dc330e2085f2b 100644 (file)
--- a/src/gromacs/gmxana/gmx_dipoles.c
+++ b/src/gromacs/gmxana/gmx_dipoles.c
@@ -45,7 +45,6 @@
 #include "vec.h"
 #include "pbc.h"
 #include "bondf.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "xvgr.h"
 #include "txtdump.h"
@@ -1691,7 +1690,5 @@ int gmx_dipoles(int argc, char *argv[])
     do_view(oenv, opt2fn("-d", NFILE, fnm), "-autoscale xy");
     do_view(oenv, opt2fn("-c", NFILE, fnm), "-autoscale xy");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_disre.c b/src/gromacs/gmxana/gmx_disre.c
index 408448a474c91e4e0207730e340f6edd1efeceb0..0dea4511aa1b85483d84b766b893e61ec351733e 100644 (file)
--- a/src/gromacs/gmxana/gmx_disre.c
+++ b/src/gromacs/gmxana/gmx_disre.c
@@ -40,7 +40,6 @@
 
 #include "typedefs.h"
 #include "macros.h"
-#include "copyrite.h"
 #include "mshift.h"
 #include "xvgr.h"
 #include "vec.h"
@@ -942,7 +941,6 @@ int gmx_disre(int argc, char *argv[])
         do_view(oenv, opt2fn("-ds", NFILE, fnm), "-nxy");
         do_view(oenv, opt2fn("-dm", NFILE, fnm), "-nxy");
     }
-    thanx(stderr);
 
     gmx_finalize_par();
 

diff --git a/src/gromacs/gmxana/gmx_dist.c b/src/gromacs/gmxana/gmx_dist.c
index 7995942dc161660e9e99a41a47cbf7ab1dd07e9f..75098a192606a8bf748e6f8673df03d82b99e1bc 100644 (file)
--- a/src/gromacs/gmxana/gmx_dist.c
+++ b/src/gromacs/gmxana/gmx_dist.c
@@ -41,7 +41,6 @@
 #include "macros.h"
 #include <math.h>
 #include "xvgr.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "string2.h"
 #include "vec.h"
@@ -343,6 +342,5 @@ int gmx_dist(int argc, char *argv[])
         ffclose(fp);
     }
 
-    thanx(stderr);
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_do_dssp.c b/src/gromacs/gmxana/gmx_do_dssp.c
index 23a755db0c763b25a1e17a5ca993981b85d47ff6..8d22f98758fb380dbafd8382ab3ec228af801cd6 100644 (file)
--- a/src/gromacs/gmxana/gmx_do_dssp.c
+++ b/src/gromacs/gmxana/gmx_do_dssp.c
@@ -47,7 +47,6 @@
 #include "smalloc.h"
 #include "mshift.h"
 #include "statutil.h"
-#include "copyrite.h"
 #include "pdbio.h"
 #include "gmx_fatal.h"
 #include "xvgr.h"
@@ -744,7 +743,5 @@ int gmx_do_dssp(int argc, char *argv[])
 
     view_all(oenv, NFILE, fnm);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_dos.c b/src/gromacs/gmxana/gmx_dos.c
index 578d51c702402a14c6f7f95bc4cf5584aab5993b..3a03d45418deeea642ef4b4c02c27833b09d97eb 100644 (file)
--- a/src/gromacs/gmxana/gmx_dos.c
+++ b/src/gromacs/gmxana/gmx_dos.c
@@ -581,7 +581,5 @@ int gmx_dos(int argc, char *argv[])
 
     do_view(oenv, ftp2fn(efXVG, NFILE, fnm), "-nxy");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_dyecoupl.c b/src/gromacs/gmxana/gmx_dyecoupl.c
index ba6d2867ffd79fca8432eed28b325ad17f995ab5..1d1cc4f06a36012cd6c8135c7ad0d4c8b6e299a6 100644 (file)
--- a/src/gromacs/gmxana/gmx_dyecoupl.c
+++ b/src/gromacs/gmxana/gmx_dyecoupl.c
@@ -466,6 +466,5 @@ int gmx_dyecoupl(int argc, char *argv[])
         gmx_fatal(FARGS, "Could not read first frame of the trajectory.\n");
     }
 
-    thanx(stderr);
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_dyndom.c b/src/gromacs/gmxana/gmx_dyndom.c
index d48e15d622c6ad9e7361c1475436b1448865c596..a72bb7a61f45bdea936a58098ecbce62b8ffbf90 100644 (file)
--- a/src/gromacs/gmxana/gmx_dyndom.c
+++ b/src/gromacs/gmxana/gmx_dyndom.c
@@ -39,7 +39,6 @@
 #include "3dview.h"
 #include "statutil.h"
 #include "smalloc.h"
-#include "copyrite.h"
 #include "index.h"
 #include "confio.h"
 #include "gmx_fatal.h"
@@ -245,7 +244,5 @@ int gmx_dyndom(int argc, char *argv[])
     }
     close_trx(status);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_editconf.c b/src/gromacs/gmxana/gmx_editconf.c
index 272a6abc2687bb689ca124489f77aacc7341551f..fb30e8832e60769fde774b0c278cfd8982e77546 100644 (file)
--- a/src/gromacs/gmxana/gmx_editconf.c
+++ b/src/gromacs/gmxana/gmx_editconf.c
@@ -45,7 +45,6 @@
 #include "symtab.h"
 #include "smalloc.h"
 #include "macros.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "string2.h"
 #include "strdb.h"
@@ -1340,7 +1339,5 @@ int gmx_editconf(int argc, char *argv[])
 
     do_view(oenv, outfile, NULL);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_eneconv.c b/src/gromacs/gmxana/gmx_eneconv.c
index 8102c8df30aa764a9396dbe58f07becf18ff0f50..cbb8a466ca00a22fa2d62d9b6867ad637519f7e6 100644 (file)
--- a/src/gromacs/gmxana/gmx_eneconv.c
+++ b/src/gromacs/gmxana/gmx_eneconv.c
@@ -44,7 +44,6 @@
 #include "statutil.h"
 #include "disre.h"
 #include "names.h"
-#include "copyrite.h"
 #include "macros.h"
 #include "gmx_fatal.h"
 #include "enxio.h"
@@ -873,6 +872,5 @@ int gmx_eneconv(int argc, char *argv[])
         fprintf(stderr, "Wrote %d frames\n", noutfr);
     }
 
-    thanx(stderr);
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_enemat.c b/src/gromacs/gmxana/gmx_enemat.c
index bff527f2b066f97d1d065f6530e6a34e94fa47ea..5849aa2021bd0809d4dc435c1b46b370f0dd0a6f 100644 (file)
--- a/src/gromacs/gmxana/gmx_enemat.c
+++ b/src/gromacs/gmxana/gmx_enemat.c
@@ -46,7 +46,6 @@
 #include "enxio.h"
 #include "statutil.h"
 #include "names.h"
-#include "copyrite.h"
 #include "macros.h"
 #include "xvgr.h"
 #include "gstat.h"
@@ -580,7 +579,5 @@ int gmx_enemat(int argc, char *argv[])
     }
     close_enx(in);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_energy.c b/src/gromacs/gmxana/gmx_energy.c
index 908aea755eac3fdc0cf5845055be37ff7f5815af..0ee09ca6e1f78225140632556e6fe6c380a6ee22 100644 (file)
--- a/src/gromacs/gmxana/gmx_energy.c
+++ b/src/gromacs/gmxana/gmx_energy.c
@@ -2823,7 +2823,6 @@ int gmx_energy(int argc, char *argv[])
         do_view(oenv, opt2fn_null("-oten", NFILE, fnm), nxy);
         do_view(oenv, opt2fn_null("-odh", NFILE, fnm), nxy);
     }
-    thanx(stderr);
 
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_filter.c b/src/gromacs/gmxana/gmx_filter.c
index c281a654cc30c09adb0871eb014aa523b00721a9..8044e6a96ea626b8fcc19881d4bdd7337092e877 100644 (file)
--- a/src/gromacs/gmxana/gmx_filter.c
+++ b/src/gromacs/gmxana/gmx_filter.c
@@ -49,7 +49,6 @@
 #include "tpxio.h"
 #include "princ.h"
 #include "do_fit.h"
-#include "copyrite.h"
 #include "rmpbc.h"
 #include "gmx_ana.h"
 

diff --git a/src/gromacs/gmxana/gmx_genbox.cpp b/src/gromacs/gmxana/gmx_genbox.cpp
index 2f7e68518b75c8cc2c4505522af15da9b7f7f9ab..5fe9aed17d9c882269a4b10898f998d40eb38736 100644 (file)
--- a/src/gromacs/gmxana/gmx_genbox.cpp
+++ b/src/gromacs/gmxana/gmx_genbox.cpp
@@ -44,7 +44,6 @@
 #include "string2.h"
 #include "physics.h"
 #include "confio.h"
-#include "copyrite.h"
 #include "txtdump.h"
 #include <math.h>
 #include "macros.h"
@@ -1068,7 +1067,5 @@ int gmx_genbox(int argc, char *argv[])
 
     gmx_atomprop_destroy(aps);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_genconf.c b/src/gromacs/gmxana/gmx_genconf.c
index 73ae1abf3e1bfb48c90d855033de433906826202..576c11050dbbcd74eceb8a98877885e5d4af57b5 100644 (file)
--- a/src/gromacs/gmxana/gmx_genconf.c
+++ b/src/gromacs/gmxana/gmx_genconf.c
@@ -38,7 +38,6 @@
 
 #include "maths.h"
 #include "macros.h"
-#include "copyrite.h"
 #include "string2.h"
 #include "smalloc.h"
 #include "sysstuff.h"
@@ -370,7 +369,5 @@ int gmx_genconf(int argc, char *argv[])
 
     write_sto_conf(opt2fn("-o", NFILE, fnm), title, atoms, x, v, ePBC, box);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_genion.c b/src/gromacs/gmxana/gmx_genion.c
index 2302ac8f1d76613ce1c31b5f6a6948ce4179e548..8c521daae19228d63d81cb4cd64709c49922e928 100644 (file)
--- a/src/gromacs/gmxana/gmx_genion.c
+++ b/src/gromacs/gmxana/gmx_genion.c
@@ -37,7 +37,6 @@
 #endif
 
 #include <ctype.h>
-#include "copyrite.h"
 #include "string2.h"
 #include "smalloc.h"
 #include "sysstuff.h"
@@ -553,7 +552,5 @@ int gmx_genion(int argc, char *argv[])
     write_sto_conf(ftp2fn(efSTO, NFILE, fnm), *top.name, &atoms, x, NULL, ePBC,
                    box);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_genpr.c b/src/gromacs/gmxana/gmx_genpr.c
index 7eefb9985d9ece270331ed9319beed877bede932..c7e11851dd898149898daa5a6a1516869f817927 100644 (file)
--- a/src/gromacs/gmxana/gmx_genpr.c
+++ b/src/gromacs/gmxana/gmx_genpr.c
@@ -40,7 +40,6 @@
 #include "sysstuff.h"
 #include "statutil.h"
 #include <string.h>
-#include "copyrite.h"
 #include "smalloc.h"
 #include "typedefs.h"
 #include "confio.h"
@@ -251,7 +250,5 @@ int gmx_genpr(int argc, char *argv[])
         sfree(v);
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_gyrate.c b/src/gromacs/gmxana/gmx_gyrate.c
index 66bf4d406c9344ec72c20e3b75bba00f95912fc4..cccee82376acfb373aa780c839990bff6ca9b948 100644 (file)
--- a/src/gromacs/gmxana/gmx_gyrate.c
+++ b/src/gromacs/gmxana/gmx_gyrate.c
@@ -46,7 +46,6 @@
 #include "macros.h"
 #include "vec.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -389,7 +388,5 @@ int gmx_gyrate(int argc, char *argv[])
 
     do_view(oenv, ftp2fn(efXVG, NFILE, fnm), "-nxy");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_h2order.c b/src/gromacs/gmxana/gmx_h2order.c
index 5f9734ee4617ed8fe8542dc2ae8e777ab17e0abd..f4885946b1c1db6a515c4ece009163321f1094a3 100644 (file)
--- a/src/gromacs/gmxana/gmx_h2order.c
+++ b/src/gromacs/gmxana/gmx_h2order.c
@@ -48,7 +48,6 @@
 #include "vec.h"
 #include "xvgr.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -332,7 +331,6 @@ int gmx_h2order(int argc, char *argv[])
                  slWidth, oenv);
 
     do_view(oenv, opt2fn("-o", NFILE, fnm), "-nxy"); /* view xvgr file */
-    thanx(stderr);
 
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_hbond.c b/src/gromacs/gmxana/gmx_hbond.c
index 1b81ee6b2742bf72ce0db7b8bbdb5dc37e0148b2..5fff37049fe7aedbe26e8be2d5ff379ef801760a 100644 (file)
--- a/src/gromacs/gmxana/gmx_hbond.c
+++ b/src/gromacs/gmxana/gmx_hbond.c
@@ -4916,7 +4916,5 @@ int gmx_hbond(int argc, char *argv[])
         ffclose(fp);
     }
 
-    thanx(stdout);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_helix.c b/src/gromacs/gmxana/gmx_helix.c
index 0bc87e154c5d88f1ebd60a9a166d7be0cc2b7ce0..54b0bafc2923994877e780736f855af29de5309f 100644 (file)
--- a/src/gromacs/gmxana/gmx_helix.c
+++ b/src/gromacs/gmxana/gmx_helix.c
@@ -39,7 +39,6 @@
 #include <math.h>
 
 #include "confio.h"
-#include "copyrite.h"
 #include "gmx_fatal.h"
 #include "fitahx.h"
 #include "futil.h"
@@ -372,7 +371,5 @@ int gmx_helix(int argc, char *argv[])
         do_view(oenv, xf[i].filenm, "-nxy");
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_helixorient.c b/src/gromacs/gmxana/gmx_helixorient.c
index b04da1d87eac9860dff26257550334c972151a96..bcb4607edbf37084e130fd4b83f7aca7e9539ae3 100644 (file)
--- a/src/gromacs/gmxana/gmx_helixorient.c
+++ b/src/gromacs/gmxana/gmx_helixorient.c
@@ -41,7 +41,6 @@
 #include "macros.h"
 #include <math.h>
 #include "xvgr.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "string2.h"
 #include "vec.h"
@@ -521,6 +520,5 @@ int gmx_helixorient(int argc, char *argv[])
 
     close_trj(status);
 
-    thanx(stderr);
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_hydorder.c b/src/gromacs/gmxana/gmx_hydorder.c
index 3b6e9700040137164ca850edf314c3b422c26762..abf30f4ecae8b9490e9d161815881eaf73eb6193 100644 (file)
--- a/src/gromacs/gmxana/gmx_hydorder.c
+++ b/src/gromacs/gmxana/gmx_hydorder.c
@@ -51,7 +51,6 @@
 #include "vec.h"
 #include "xvgr.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -719,9 +718,5 @@ int gmx_hydorder(int argc, char *argv[])
         writeraw(intfpos, frames, xslices, yslices, raw);
     }
 
-
-
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_kinetics.c b/src/gromacs/gmxana/gmx_kinetics.c
index 624b84825e5b6eac0984ccd3e1d8fa0b70786492..f3da5028a55e3acad038a34312f3eb274db735f2 100644 (file)
--- a/src/gromacs/gmxana/gmx_kinetics.c
+++ b/src/gromacs/gmxana/gmx_kinetics.c
@@ -1069,7 +1069,6 @@ int gmx_kinetics(int argc, char *argv[])
 
     view_all(oenv, NFILE, fnm);
 
-    thanx(stderr);
 #else
     fprintf(stderr, "This program should be compiled with the GNU scientific library. Please install the library and reinstall GROMACS.\n");
 #endif /*HAVE_LIBGSL*/

diff --git a/src/gromacs/gmxana/gmx_lie.c b/src/gromacs/gmxana/gmx_lie.c
index 6b7117ab0d1d4371cb93fe7ca37eb2eea4769242..5298eab9b4f881aef79389ba0ecfeab3836d2900 100644 (file)
--- a/src/gromacs/gmxana/gmx_lie.c
+++ b/src/gromacs/gmxana/gmx_lie.c
@@ -48,7 +48,6 @@
 #include "macros.h"
 #include "gmx_fatal.h"
 #include "vec.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "txtdump.h"
@@ -212,7 +211,5 @@ int gmx_lie(int argc, char *argv[])
 
     do_view(oenv, ftp2fn(efXVG, NFILE, fnm), "-nxy");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_make_edi.c b/src/gromacs/gmxana/gmx_make_edi.c
index e54dc30400518b7884beef533b818d2aa1e95183..c29225cb9fa42eab0ba93eb7571d178e2df59005 100644 (file)
--- a/src/gromacs/gmxana/gmx_make_edi.c
+++ b/src/gromacs/gmxana/gmx_make_edi.c
@@ -53,7 +53,6 @@
 #include "gmx_fatal.h"
 #include "vec.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "pdbio.h"
@@ -983,7 +982,6 @@ int gmx_make_edi(int argc, char *argv[])
 
     /* Write edi-file */
     write_the_whole_thing(ffopen(EdiFile, "w"), &edi_params, eigvec1, nvec1, listen, evStepList);
-    thanx(stderr);
 
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_make_ndx.c b/src/gromacs/gmxana/gmx_make_ndx.c
index c8a2b4c77851ed8fcc38fa0db4e39ef4b5a78379..35183507390071840f620604a837357faf297de8 100644 (file)
--- a/src/gromacs/gmxana/gmx_make_ndx.c
+++ b/src/gromacs/gmxana/gmx_make_ndx.c
@@ -47,7 +47,6 @@
 #include "string2.h"
 #include "statutil.h"
 #include "confio.h"
-#include "copyrite.h"
 #include "typedefs.h"
 #include "index.h"
 #include "smalloc.h"
@@ -1624,7 +1623,5 @@ int gmx_make_ndx(int argc, char *argv[])
 
     write_index(ndxoutfile, block, gnames);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_mdmat.c b/src/gromacs/gmxana/gmx_mdmat.c
index a6f8191729a6e2101864588548ee607374142bda..6aa3f662f9fdab6b29bf9b60b408bac1d4c8b153 100644 (file)
--- a/src/gromacs/gmxana/gmx_mdmat.c
+++ b/src/gromacs/gmxana/gmx_mdmat.c
@@ -45,7 +45,6 @@
 #include "typedefs.h"
 #include "filenm.h"
 #include "statutil.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "gmx_fatal.h"
 #include "smalloc.h"
@@ -393,7 +392,5 @@ int gmx_mdmat(int argc, char *argv[])
         ffclose(fp);
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_membed.c b/src/gromacs/gmxana/gmx_membed.c
index d769a4a95e3402da969da5b3ab81a0fd9803c19d..0d2b54171668d63c82678bc63fa87e7f1cb3b00f 100644 (file)
--- a/src/gromacs/gmxana/gmx_membed.c
+++ b/src/gromacs/gmxana/gmx_membed.c
@@ -41,7 +41,6 @@
 #include "sysstuff.h"
 #include "statutil.h"
 #include "macros.h"
-#include "copyrite.h"
 #include "main.h"
 #include "gmx_ana.h"
 #include "string2.h"

diff --git a/src/gromacs/gmxana/gmx_mindist.c b/src/gromacs/gmxana/gmx_mindist.c
index f8342a7e5fb33fc3d44202161c2515618a72abbc..536094832f0e05187ea34df50db962dd51ae7f0c 100644 (file)
--- a/src/gromacs/gmxana/gmx_mindist.c
+++ b/src/gromacs/gmxana/gmx_mindist.c
@@ -47,7 +47,6 @@
 #include "vec.h"
 #include "xvgr.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -791,7 +790,5 @@ int gmx_mindist(int argc, char *argv[])
         do_view(oenv, numfnm, "-nxy");
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_mk_angndx.c b/src/gromacs/gmxana/gmx_mk_angndx.c
index 07ecbccc8dc8a3f0dbd39811301fcb6ae67d41dd..13105eabff67e83dd05dcb0d62bc8cc7427800ca 100644 (file)
--- a/src/gromacs/gmxana/gmx_mk_angndx.c
+++ b/src/gromacs/gmxana/gmx_mk_angndx.c
@@ -42,7 +42,6 @@
 #include <math.h>
 #include "typedefs.h"
 #include "smalloc.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "macros.h"
 #include "string2.h"
@@ -305,7 +304,5 @@ int gmx_mk_angndx(int argc, char *argv[])
     }
     ffclose(out);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_morph.c b/src/gromacs/gmxana/gmx_morph.c
index ac1f03bfff99121258fa8322c630fcef497c4265..fd62c88bda0723732fbc6a936b7f07832491b860 100644 (file)
--- a/src/gromacs/gmxana/gmx_morph.c
+++ b/src/gromacs/gmxana/gmx_morph.c
@@ -40,7 +40,6 @@
 #include "smalloc.h"
 #include "macros.h"
 #include "confio.h"
-#include "copyrite.h"
 #include "xvgr.h"
 #include "index.h"
 #include "do_fit.h"
@@ -197,7 +196,5 @@ int gmx_morph(int argc, char *argv[])
         do_view(oenv, opt2fn("-or", NFILE, fnm), "-nxy");
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_msd.c b/src/gromacs/gmxana/gmx_msd.c
index 67c5791fa40fad00424a8d9e932cdc695cd80de7..ac7dcb658b581fed765f10bc2ba849716bbde716 100644 (file)
--- a/src/gromacs/gmxana/gmx_msd.c
+++ b/src/gromacs/gmxana/gmx_msd.c
@@ -47,7 +47,6 @@
 #include "maths.h"
 #include "futil.h"
 #include "index.h"
-#include "copyrite.h"
 #include "typedefs.h"
 #include "xvgr.h"
 #include "gstat.h"
@@ -1200,7 +1199,5 @@ int gmx_msd(int argc, char *argv[])
 
     view_all(oenv, NFILE, fnm);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_nmeig.c b/src/gromacs/gmxana/gmx_nmeig.c
index d0952b4e1ab03f9978f9826b60305fbea5bbca3c..47f40140055af38e02aab37bd3f96ef5ffe69edb 100644 (file)
--- a/src/gromacs/gmxana/gmx_nmeig.c
+++ b/src/gromacs/gmxana/gmx_nmeig.c
@@ -609,7 +609,5 @@ int gmx_nmeig(int argc, char *argv[])
     write_eigenvectors(opt2fn("-v", NFILE, fnm), natoms, eigenvectors, FALSE, begin, end,
                        eWXR_NO, NULL, FALSE, top_x, bM, eigenvalues);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_nmens.c b/src/gromacs/gmxana/gmx_nmens.c
index 8217fbefc395e550af4eecd27d89c8190c585b09..5afce94ff84b2efd70efea5bb9f869932a6d4def 100644 (file)
--- a/src/gromacs/gmxana/gmx_nmens.c
+++ b/src/gromacs/gmxana/gmx_nmens.c
@@ -46,7 +46,6 @@
 #include "macros.h"
 #include "gmx_fatal.h"
 #include "vec.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"

diff --git a/src/gromacs/gmxana/gmx_nmtraj.c b/src/gromacs/gmxana/gmx_nmtraj.c
index 91590742a9794115b8135f5570682279ea88bfd4..4d54489f0fd8b3dabcbf82bddfa9811857cec540 100644 (file)
--- a/src/gromacs/gmxana/gmx_nmtraj.c
+++ b/src/gromacs/gmxana/gmx_nmtraj.c
@@ -46,7 +46,6 @@
 #include "macros.h"
 #include "gmx_fatal.h"
 #include "vec.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"

diff --git a/src/gromacs/gmxana/gmx_options.c b/src/gromacs/gmxana/gmx_options.c
index 7ea7f65525cb458ea4f603c17a3e76e8e2810b95..03d68fbd82184b491da4dbb4839070237ba4b07f 100644 (file)
--- a/src/gromacs/gmxana/gmx_options.c
+++ b/src/gromacs/gmxana/gmx_options.c
@@ -39,7 +39,6 @@
 #include "typedefs.h"
 #include "macros.h"
 #include "statutil.h"
-#include "copyrite.h"
 
 /*
  * This program is needed to create the files:
@@ -106,7 +105,5 @@ gmx_options(int argc, char *argv[])
     parse_common_args(&argc, argv, 0,
                       0, NULL, 0, NULL, asize(desc), desc, asize(bugs), bugs, &oenv);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_order.c b/src/gromacs/gmxana/gmx_order.c
index 97e83ee2d957a5d896723d8572e9d30fc0ae4489..417f37db8889cbc010428ef849d91647dca630a1 100644 (file)
--- a/src/gromacs/gmxana/gmx_order.c
+++ b/src/gromacs/gmxana/gmx_order.c
@@ -48,7 +48,6 @@
 #include "vec.h"
 #include "xvgr.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -1114,7 +1113,6 @@ int gmx_order(int argc, char *argv[])
         do_view(oenv, opt2fn("-od", NFILE, fnm), NULL); /* view xvgr file */
     }
 
-    thanx(stderr);
     if (distvals != NULL)
     {
         for (i = 0; i < nslices; ++i)

diff --git a/src/gromacs/gmxana/gmx_polystat.c b/src/gromacs/gmxana/gmx_polystat.c
index cfbaa2a8abfe66bfe0d9c41b07472495d35709e6..0c80bcf48343019b4d3e28c3ab1d5a77f71cc30d 100644 (file)
--- a/src/gromacs/gmxana/gmx_polystat.c
+++ b/src/gromacs/gmxana/gmx_polystat.c
@@ -44,7 +44,6 @@
 #include "smalloc.h"
 #include "futil.h"
 #include "statutil.h"
-#include "copyrite.h"
 #include "vec.h"
 #include "index.h"
 #include "macros.h"
@@ -523,7 +522,5 @@ int gmx_polystat(int argc, char *argv[])
         do_view(oenv, opt2fn("-p", NFILE, fnm), "-nxy");
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_potential.c b/src/gromacs/gmxana/gmx_potential.c
index 3528ea2fb985a12ae6435c58e21e380f5bfe599d..0f46d45dcfd7b56b7f69f2df203d231ac7df0e80 100644 (file)
--- a/src/gromacs/gmxana/gmx_potential.c
+++ b/src/gromacs/gmxana/gmx_potential.c
@@ -49,7 +49,6 @@
 #include "vec.h"
 #include "xvgr.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -495,6 +494,5 @@ int gmx_potential(int argc, char *argv[])
     do_view(oenv, opt2fn("-oc", NFILE, fnm), NULL); /* view xvgr file */
     do_view(oenv, opt2fn("-of", NFILE, fnm), NULL); /* view xvgr file */
 
-    thanx(stderr);
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_principal.c b/src/gromacs/gmxana/gmx_principal.c
index 0d4e009f9e5a1779e61b3f75b29211b41083721d..bb3ca306e73113c23ff4d9163eb7929d5cebce71 100644 (file)
--- a/src/gromacs/gmxana/gmx_principal.c
+++ b/src/gromacs/gmxana/gmx_principal.c
@@ -46,7 +46,6 @@
 #include "macros.h"
 #include "vec.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -155,7 +154,5 @@ int gmx_principal(int argc, char *argv[])
     ffclose(axis3);
     ffclose(fmoi);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_rama.c b/src/gromacs/gmxana/gmx_rama.c
index 221ec008d4ba7a34067c1f9ddd632e35d9166af8..987723b6efac64a135406b318b57a87491aa2f7a 100644 (file)
--- a/src/gromacs/gmxana/gmx_rama.c
+++ b/src/gromacs/gmxana/gmx_rama.c
@@ -46,7 +46,6 @@
 #include "xvgr.h"
 #include "physics.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -114,7 +113,5 @@ int gmx_rama(int argc, char *argv[])
 
     do_view(oenv, ftp2fn(efXVG, NFILE, fnm), NULL);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_rdf.c b/src/gromacs/gmxana/gmx_rdf.c
index bebb3f4769bc9acafb829958be55a113ee1f4b87..3eaa3aef8fee54afd397a3caead2ba8046031637 100644 (file)
--- a/src/gromacs/gmxana/gmx_rdf.c
+++ b/src/gromacs/gmxana/gmx_rdf.c
@@ -46,7 +46,6 @@
 #include "vec.h"
 #include "pbc.h"
 #include "xvgr.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "tpxio.h"
@@ -945,7 +944,5 @@ int gmx_rdf(int argc, char *argv[])
            bCM, closet[0], rdft, bXY, bPBC, bNormalize, cutoff, binwidth, fade, ngroups,
            oenv);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_rms.c b/src/gromacs/gmxana/gmx_rms.c
index 5efc8fc1ab81d72d4b547ed4669825fcd81c2ca4..d24d171e65452a62ac358c459be19ab5d0ab2e1e 100644 (file)
--- a/src/gromacs/gmxana/gmx_rms.c
+++ b/src/gromacs/gmxana/gmx_rms.c
@@ -1215,7 +1215,5 @@ int gmx_rms(int argc, char *argv[])
     do_view(oenv, opt2fn_null("-bm", NFILE, fnm), NULL);
     do_view(oenv, opt2fn_null("-dist", NFILE, fnm), NULL);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_rmsdist.c b/src/gromacs/gmxana/gmx_rmsdist.c
index 385e65ab929b4350c8355b4779e8bc9a9a389609..5e91fe8c0093a8f9d6e56cae2e70e7ab36679fcb 100644 (file)
--- a/src/gromacs/gmxana/gmx_rmsdist.c
+++ b/src/gromacs/gmxana/gmx_rmsdist.c
@@ -43,7 +43,6 @@
 #include "smalloc.h"
 #include "typedefs.h"
 #include "names.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "tpxio.h"
 #include "string2.h"
@@ -880,6 +879,5 @@ int gmx_rmsdist (int argc, char *argv[])
 
     do_view(oenv, ftp2fn(efXVG, NFILE, fnm), NULL);
 
-    thanx(stderr);
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_rmsf.c b/src/gromacs/gmxana/gmx_rmsf.c
index 111f47492856a3b443b05db509b90a78d38e91c0..2f69e72dbcd04aaf8d21c7165f4b24dde8f52054 100644 (file)
--- a/src/gromacs/gmxana/gmx_rmsf.c
+++ b/src/gromacs/gmxana/gmx_rmsf.c
@@ -41,7 +41,6 @@
 #include "macros.h"
 #include "typedefs.h"
 #include "xvgr.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "string2.h"
 #include "vec.h"
@@ -577,7 +576,5 @@ int gmx_rmsf(int argc, char *argv[])
         do_view(oenv, opt2fn("-od", NFILE, fnm), "-nxy");
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_rotacf.c b/src/gromacs/gmxana/gmx_rotacf.c
index aad8236c26332bdad83fe3781e5893a24bbf693f..deac58817d326cd7fa32c40401c573933205a5aa 100644 (file)
--- a/src/gromacs/gmxana/gmx_rotacf.c
+++ b/src/gromacs/gmxana/gmx_rotacf.c
@@ -44,7 +44,6 @@
 #include "smalloc.h"
 #include "futil.h"
 #include "statutil.h"
-#include "copyrite.h"
 #include "index.h"
 #include "macros.h"
 #include "gmx_fatal.h"
@@ -229,7 +228,5 @@ int gmx_rotacf(int argc, char *argv[])
 
     do_view(oenv, ftp2fn(efXVG, NFILE, fnm), NULL);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_rotmat.c b/src/gromacs/gmxana/gmx_rotmat.c
index 61aeff55eb80ec33486152d305e2083dd846f1c5..220349afc86289b3bcd2f2b9759a2e4678af064c 100644 (file)
--- a/src/gromacs/gmxana/gmx_rotmat.c
+++ b/src/gromacs/gmxana/gmx_rotmat.c
@@ -47,7 +47,6 @@
 #include "macros.h"
 #include "vec.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -312,7 +311,5 @@ int gmx_rotmat(int argc, char *argv[])
 
     do_view(oenv, ftp2fn(efXVG, NFILE, fnm), "-nxy");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_saltbr.c b/src/gromacs/gmxana/gmx_saltbr.c
index b853772c84886fc0bc274ae696ba55d244e126c3..497378e652d83ba461746e67e43dfd7414d7367a 100644 (file)
--- a/src/gromacs/gmxana/gmx_saltbr.c
+++ b/src/gromacs/gmxana/gmx_saltbr.c
@@ -44,7 +44,6 @@
 #include "typedefs.h"
 #include "filenm.h"
 #include "statutil.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "gmx_fatal.h"
 #include "smalloc.h"
@@ -331,7 +330,6 @@ int gmx_saltbr(int argc, char *argv[])
             }
         }
     }
-    thanx(stderr);
 
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_sans.c b/src/gromacs/gmxana/gmx_sans.c
index 6182923a5466dd9e80f3e30c1cc447e97f947882..368d1bf10a20c2960a71b1c59ea9ad6923d853cc 100644 (file)
--- a/src/gromacs/gmxana/gmx_sans.c
+++ b/src/gromacs/gmxana/gmx_sans.c
@@ -371,7 +371,6 @@ int gmx_sans(int argc, char *argv[])
     sfree(sq);
 
     please_cite(stdout, "Garmay2012");
-    thanx(stderr);
 
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_sas.c b/src/gromacs/gmxana/gmx_sas.c
index b5eb7d71ef84b2e77faa154501d8aa1693fe3b92..35a6509cac55c76205a79a330c06e83d07986e19 100644 (file)
--- a/src/gromacs/gmxana/gmx_sas.c
+++ b/src/gromacs/gmxana/gmx_sas.c
@@ -778,7 +778,5 @@ int gmx_sas(int argc, char *argv[])
     do_view(oenv, opt2fn_null("-or", NFILE, fnm), "-nxy");
     do_view(oenv, opt2fn_null("-oa", NFILE, fnm), "-nxy");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_saxs.c b/src/gromacs/gmxana/gmx_saxs.c
index 262b51b50fb91bf74f436768914d87e2ce8b44a9..396170daa159344f9555a142c438d8a502bf93aa 100644 (file)
--- a/src/gromacs/gmxana/gmx_saxs.c
+++ b/src/gromacs/gmxana/gmx_saxs.c
@@ -108,7 +108,5 @@ int gmx_saxs(int argc, char *argv[])
 
     please_cite(stdout, "Cromer1968a");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_sgangle.c b/src/gromacs/gmxana/gmx_sgangle.c
index 0c7c37929eaf216fcff1774d1c0b474fa00e7557..50d01c9b2bd59980aed4abbe2dd76b8395beae51 100644 (file)
--- a/src/gromacs/gmxana/gmx_sgangle.c
+++ b/src/gromacs/gmxana/gmx_sgangle.c
@@ -46,7 +46,6 @@
 #include "vec.h"
 #include "xvgr.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -606,6 +605,5 @@ int gmx_sgangle(int argc, char *argv[])
     do_view(oenv, fnd1, "-nxy"); /* view xvgr file */
     do_view(oenv, fnd2, "-nxy"); /* view xvgr file */
 
-    thanx(stderr);
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_sham.c b/src/gromacs/gmxana/gmx_sham.c
index f76414c89c9586c2e0c47ea0fa4479e587b48254..2f54909d2fa0884ce55d6cd960b420f69d096c94 100644 (file)
--- a/src/gromacs/gmxana/gmx_sham.c
+++ b/src/gromacs/gmxana/gmx_sham.c
@@ -44,7 +44,6 @@
 #include "macros.h"
 #include "gmx_fatal.h"
 #include "vec.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "readinp.h"
 #include "statutil.h"
@@ -1169,7 +1168,5 @@ int gmx_sham(int argc, char *argv[])
             opt2parg_bSet("-xmin", NPA, pa), rmin,
             opt2parg_bSet("-xmax", NPA, pa), rmax);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_sigeps.c b/src/gromacs/gmxana/gmx_sigeps.c
index c3507260738bd1956289d1227a47f82f9f5cbb1b..09481d0a49d42cda2f74825ea3881350e22f5bd9 100644 (file)
--- a/src/gromacs/gmxana/gmx_sigeps.c
+++ b/src/gromacs/gmxana/gmx_sigeps.c
@@ -43,7 +43,6 @@
 #include <math.h>
 #include "typedefs.h"
 #include "statutil.h"
-#include "copyrite.h"
 #include "gmx_fatal.h"
 #include "xvgr.h"
 #include "pdbio.h"
@@ -193,7 +192,5 @@ int gmx_sigeps(int argc, char *argv[])
 
     do_view(oenv, ftp2fn(efXVG, NFILE, fnm), NULL);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_sorient.c b/src/gromacs/gmxana/gmx_sorient.c
index 4053fe9eff05b5dd59298fc24ccc7a33c4098c6e..2ac9537768c079c409543fe1c0d6c32bfb8a28d6 100644 (file)
--- a/src/gromacs/gmxana/gmx_sorient.c
+++ b/src/gromacs/gmxana/gmx_sorient.c
@@ -39,7 +39,6 @@
 #include "macros.h"
 #include "statutil.h"
 #include "smalloc.h"
-#include "copyrite.h"
 #include "gstat.h"
 #include "vec.h"
 #include "xvgr.h"
@@ -459,7 +458,5 @@ int gmx_sorient(int argc, char *argv[])
     do_view(oenv, opt2fn("-ro", NFILE, fnm), "-nxy");
     do_view(oenv, opt2fn("-co", NFILE, fnm), "-nxy");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_spatial.c b/src/gromacs/gmxana/gmx_spatial.c
index 52f281b66c1b9ee1d95e82ad9483fa6bd920636c..7f8c7e9401f74181a08a4efefbdc2c554baba4eb 100644 (file)
--- a/src/gromacs/gmxana/gmx_spatial.c
+++ b/src/gromacs/gmxana/gmx_spatial.c
@@ -42,7 +42,6 @@
 #include "typedefs.h"
 #include "smalloc.h"
 #include "vec.h"
-#include "copyrite.h"
 #include "statutil.h"
 #include "tpxio.h"
 #include <math.h>
@@ -465,7 +464,5 @@ int gmx_spatial(int argc, char *argv[])
         printf("Raw data: average %le, min %le, max %le\n", 1.0/norm, (double)min/(double)numfr, (double)max/(double)numfr);
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_spol.c b/src/gromacs/gmxana/gmx_spol.c
index 36704dee136d640605672800e01cbd6d71d106ed..67dabb39cccd6cc8d3ca9989e8693c07f4f7645b 100644 (file)
--- a/src/gromacs/gmxana/gmx_spol.c
+++ b/src/gromacs/gmxana/gmx_spol.c
@@ -39,7 +39,6 @@
 #include "macros.h"
 #include "statutil.h"
 #include "smalloc.h"
-#include "copyrite.h"
 #include "gstat.h"
 #include "vec.h"
 #include "xvgr.h"
@@ -379,7 +378,5 @@ int gmx_spol(int argc, char *argv[])
 
     do_view(oenv, opt2fn("-o", NFILE, fnm), NULL);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_tcaf.c b/src/gromacs/gmxana/gmx_tcaf.c
index cde1760a31b982af222c6a69d86c791d4ae7e239..96ee7e13648cbdd795c3732a464cad0c7ddf268c 100644 (file)
--- a/src/gromacs/gmxana/gmx_tcaf.c
+++ b/src/gromacs/gmxana/gmx_tcaf.c
@@ -39,7 +39,6 @@
 
 #include <math.h>
 #include "confio.h"
-#include "copyrite.h"
 #include "gmx_fatal.h"
 #include "futil.h"
 #include "gstat.h"
@@ -488,7 +487,5 @@ int gmx_tcaf(int argc, char *argv[])
                  opt2fn("-of", NFILE, fnm), opt2fn_null("-oc", NFILE, fnm),
                  opt2fn("-ov", NFILE, fnm), oenv);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_traj.c b/src/gromacs/gmxana/gmx_traj.c
index 514e5be224e5bd9b1cecdeda3d1fcff68263cec6..05c82fe0e690caa149b25e39708d21d393b1ea75 100644 (file)
--- a/src/gromacs/gmxana/gmx_traj.c
+++ b/src/gromacs/gmxana/gmx_traj.c
@@ -46,7 +46,6 @@
 #include "macros.h"
 #include "vec.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -1121,7 +1120,5 @@ int gmx_traj(int argc, char *argv[])
     /* view it */
     view_all(oenv, NFILE, fnm);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_trjcat.c b/src/gromacs/gmxana/gmx_trjcat.c
index 87aae043179f219e1a65f5cef4c4ae7bd15df000..d4c3a473270128775ab7556f1d87dd551937a7ff 100644 (file)
--- a/src/gromacs/gmxana/gmx_trjcat.c
+++ b/src/gromacs/gmxana/gmx_trjcat.c
@@ -42,7 +42,6 @@
 #include "sysstuff.h"
 #include "smalloc.h"
 #include "typedefs.h"
-#include "copyrite.h"
 #include "gmxfio.h"
 #include "tpxio.h"
 #include "trnio.h"
@@ -897,7 +896,6 @@ int gmx_trjcat(int argc, char *argv[])
         fprintf(stderr, "\nLast frame written was %d, time %f %s\n",
                 frame, output_env_conv_time(oenv, last_ok_t), output_env_get_time_unit(oenv));
     }
-    thanx(stderr);
 
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_trjconv.c b/src/gromacs/gmxana/gmx_trjconv.c
index 88dfd0b524b044c6e1bb044fb67f7b9ec5f8a039..d5c1246ca9b5de5b0206eb52ae116873c2d0f168 100644 (file)
--- a/src/gromacs/gmxana/gmx_trjconv.c
+++ b/src/gromacs/gmxana/gmx_trjconv.c
@@ -42,7 +42,6 @@
 #include "sysstuff.h"
 #include "smalloc.h"
 #include "typedefs.h"
-#include "copyrite.h"
 #include "gmxfio.h"
 #include "tpxio.h"
 #include "trnio.h"
@@ -1876,7 +1875,5 @@ int gmx_trjconv(int argc, char *argv[])
 
     do_view(oenv, out_file, NULL);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_trjorder.c b/src/gromacs/gmxana/gmx_trjorder.c
index d962167c5d3d5e6ad54b686464c3ada1f216dbdf..fd893f75f8ff8a169f064896271d48f42ea34502 100644 (file)
--- a/src/gromacs/gmxana/gmx_trjorder.c
+++ b/src/gromacs/gmxana/gmx_trjorder.c
@@ -45,7 +45,6 @@
 #include "macros.h"
 #include "vec.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "statutil.h"
 #include "index.h"
@@ -376,7 +375,5 @@ int gmx_trjorder(int argc, char *argv[])
     }
     gmx_rmpbc_done(gpbc);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_vanhove.c b/src/gromacs/gmxana/gmx_vanhove.c
index 6c1cb249e5c8e08cf297e4bc07d45df2e13b02ce..0468c72cc5dea74689d0afce3afc9d42798f0689 100644 (file)
--- a/src/gromacs/gmxana/gmx_vanhove.c
+++ b/src/gromacs/gmxana/gmx_vanhove.c
@@ -47,7 +47,6 @@
 #include "maths.h"
 #include "futil.h"
 #include "index.h"
-#include "copyrite.h"
 #include "typedefs.h"
 #include "xvgr.h"
 #include "gstat.h"
@@ -467,7 +466,5 @@ int gmx_vanhove(int argc, char *argv[])
     do_view(oenv, orfile, NULL);
     do_view(oenv, otfile, NULL);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_velacc.c b/src/gromacs/gmxana/gmx_velacc.c
index b49775e081309a9c647d7a707cfc66fd5493fb41..d5297551aa300eea069cb0ffd302d038f920086a 100644 (file)
--- a/src/gromacs/gmxana/gmx_velacc.c
+++ b/src/gromacs/gmxana/gmx_velacc.c
@@ -39,7 +39,6 @@
 #include <math.h>
 
 #include "confio.h"
-#include "copyrite.h"
 #include "gmx_fatal.h"
 #include "futil.h"
 #include "gstat.h"
@@ -364,7 +363,5 @@ int gmx_velacc(int argc, char *argv[])
         fprintf(stderr, "Not enough frames in trajectory - no output generated.\n");
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_wham.cpp b/src/gromacs/gmxana/gmx_wham.cpp
index 0ea356a6d79a71df363243f8168b1df62dc31afd..7fb0ec3b1ec41bbe03ba1d71b3af2539928c057b 100644 (file)
--- a/src/gromacs/gmxana/gmx_wham.cpp
+++ b/src/gromacs/gmxana/gmx_wham.cpp
@@ -3653,6 +3653,5 @@ int gmx_wham(int argc, char *argv[])
     printf("\nIn case you use results from g_wham for a publication, please cite:\n");
     please_cite(stdout, "Hub2010");
 
-    thanx(stderr);
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_wheel.c b/src/gromacs/gmxana/gmx_wheel.c
index f28ded7ee8bdcefd74d4540a06110ea0942d1053..d720a046bdc04b09c7f45cd33e44cad77b9f87db 100644 (file)
--- a/src/gromacs/gmxana/gmx_wheel.c
+++ b/src/gromacs/gmxana/gmx_wheel.c
@@ -48,7 +48,6 @@
 #include "vec.h"
 #include "xvgr.h"
 #include "pbc.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "strdb.h"
 #include "statutil.h"
@@ -291,7 +290,5 @@ int gmx_wheel(int argc, char *argv[])
         wheel2(ftp2fn(efEPS, NFILE, fnm), nres, resnm, r0, rot0, title);
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxana/gmx_xpm2ps.c b/src/gromacs/gmxana/gmx_xpm2ps.c
index f46442a9f0a92de0d06cedb225579b05ee9522a8..cecb3f31412691d3883106b8abc7dff513469345 100644 (file)
--- a/src/gromacs/gmxana/gmx_xpm2ps.c
+++ b/src/gromacs/gmxana/gmx_xpm2ps.c
@@ -40,7 +40,6 @@
 #include <stdlib.h>
 #include <math.h>
 #include "string2.h"
-#include "copyrite.h"
 #include "typedefs.h"
 #include "macros.h"
 #include "statutil.h"
@@ -1611,7 +1610,5 @@ int gmx_xpm2ps(int argc, char *argv[])
 
     view_all(oenv, NFILE, fnm);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/gromacs/gmxlib/copyrite.c b/src/gromacs/gmxlib/copyrite.c
index fef70c2bc4302f0e9d06d60a5fec28c4f9205843..81369c25d9ed4a0e084e2832e6eb34d7bfec1a27 100644 (file)
--- a/src/gromacs/gmxlib/copyrite.c
+++ b/src/gromacs/gmxlib/copyrite.c
@@ -260,7 +260,7 @@ void CopyRight(FILE *out, const char *szProgram)
 }
 
 
-void thanx(FILE *fp)
+void gmx_thanx(FILE *fp)
 {
     char cq[1024];
     int  cqnum;

diff --git a/src/gromacs/gmxlib/index.c b/src/gromacs/gmxlib/index.c
index b39abd386d3d99656afb8b13b0a83d8aca195149..5c8492490f5beff91e7e6a73bd24c7f1aa146fdb 100644 (file)
--- a/src/gromacs/gmxlib/index.c
+++ b/src/gromacs/gmxlib/index.c
@@ -48,7 +48,6 @@
 #include "statutil.h"
 #include "confio.h"
 #include "main.h"
-#include "copyrite.h"
 #include "typedefs.h"
 #include "smalloc.h"
 #include "invblock.h"

diff --git a/src/gromacs/gmxlib/mshift.c b/src/gromacs/gmxlib/mshift.c
index d24e39ab822d3abdaebe16baca3e63ce7099b324..430462624beff5921088586f28cd5180fb2ecbea 100644 (file)
--- a/src/gromacs/gmxlib/mshift.c
+++ b/src/gromacs/gmxlib/mshift.c
@@ -42,7 +42,6 @@
 #include "macros.h"
 #include "vec.h"
 #include "futil.h"
-#include "copyrite.h"
 #include "mshift.h"
 #include "main.h"
 #include "pbc.h"

diff --git a/src/gromacs/gmxlib/network.c b/src/gromacs/gmxlib/network.c
index 4236850c26c7ee7835ba0127e43ba35cf5b305d4..14926b731aed1b2d7d607c4dacc83d7a9085852d 100644 (file)
--- a/src/gromacs/gmxlib/network.c
+++ b/src/gromacs/gmxlib/network.c
@@ -366,7 +366,7 @@ void gmx_abort(int noderank, int nnodes, int errorno)
 #else
 #ifdef GMX_THREAD_MPI
     fprintf(stderr, "Halting program %s\n", ShortProgram());
-    thanx(stderr);
+    gmx_thanx(stderr);
     exit(1);
 #else
     if (nnodes > 1)
@@ -379,7 +379,7 @@ void gmx_abort(int noderank, int nnodes, int errorno)
         fprintf(stderr, "Halting program %s\n", ShortProgram());
     }
 
-    thanx(stderr);
+    gmx_thanx(stderr);
     MPI_Abort(MPI_COMM_WORLD, errorno);
     exit(1);
 #endif

diff --git a/src/gromacs/gmxlib/sfactor.c b/src/gromacs/gmxlib/sfactor.c
index 7d7b1636bf2c938eb8c2a569fe396507f17e8f7d..7cafc73c0435c75363288e1abb79b0bb5d364eb4 100644 (file)
--- a/src/gromacs/gmxlib/sfactor.c
+++ b/src/gromacs/gmxlib/sfactor.c
@@ -47,7 +47,6 @@
 #include "macros.h"
 #include "index.h"
 #include "strdb.h"
-#include "copyrite.h"
 #include "tpxio.h"
 #include "typedefs.h"
 #include "statutil.h"

diff --git a/src/gromacs/gmxlib/writeps.c b/src/gromacs/gmxlib/writeps.c
index 48ab990e19efdf2886a10725b9d21f355b901fb8..68d3c366aff8430b39edf3b115c4e34dba6a4070 100644 (file)
--- a/src/gromacs/gmxlib/writeps.c
+++ b/src/gromacs/gmxlib/writeps.c
@@ -39,7 +39,6 @@
 #include <stdio.h>
 #include "futil.h"
 #include "gmx_fatal.h"
-#include "copyrite.h"
 #include "writeps.h"
 #include "smalloc.h"
 #include "gmxfio.h"

diff --git a/src/gromacs/gmxpreprocess/genhydro.c b/src/gromacs/gmxpreprocess/genhydro.c
index 23134b1ac686ab19d584f25fa19ada89b4e42815..71de6714a75f203bd6939257b1f46cf02fee6512 100644 (file)
--- a/src/gromacs/gmxpreprocess/genhydro.c
+++ b/src/gromacs/gmxpreprocess/genhydro.c
@@ -42,7 +42,6 @@
 #include "sysstuff.h"
 #include "typedefs.h"
 #include "smalloc.h"
-#include "copyrite.h"
 #include "string2.h"
 #include "confio.h"
 #include "symtab.h"

diff --git a/src/gromacs/gmxpreprocess/pdb2top.c b/src/gromacs/gmxpreprocess/pdb2top.c
index d5ef857d7178bcc761a98666b7625f80c503ccc1..a094258434b213b578094d969bf1e3af7c9cda28 100644 (file)
--- a/src/gromacs/gmxpreprocess/pdb2top.c
+++ b/src/gromacs/gmxpreprocess/pdb2top.c
@@ -42,7 +42,6 @@
 #include <ctype.h>
 
 #include "vec.h"
-#include "copyrite.h"
 #include "smalloc.h"
 #include "macros.h"
 #include "symtab.h"

diff --git a/src/gromacs/legacyheaders/copyrite.h b/src/gromacs/legacyheaders/copyrite.h
index 6389adec74d448a5d639e2bf1c6d7cb48c1f3e9c..28ab375239f01ec347cb4527e8ab946af55e58d7 100644 (file)
--- a/src/gromacs/legacyheaders/copyrite.h
+++ b/src/gromacs/legacyheaders/copyrite.h
@@ -66,7 +66,7 @@ void
 cool_quote(char *retstring, int retsize, int *cqnum);
 
 void
-thanx(FILE *fp);
+gmx_thanx(FILE *fp);
 
 void
 please_cite(FILE *fp, const char *key);

diff --git a/src/gromacs/mdlib/expanded.c b/src/gromacs/mdlib/expanded.c
index 6140392c78dac9107dd69cc58fc544ca204fa7cb..4359a6f1c6e8af3291dd7fe5ea75010a81a58ff9 100644 (file)
--- a/src/gromacs/mdlib/expanded.c
+++ b/src/gromacs/mdlib/expanded.c
@@ -76,7 +76,6 @@
 #include "xvgr.h"
 #include "trnio.h"
 #include "xtcio.h"
-#include "copyrite.h"
 #include "gmx_random.h"
 #include "domdec.h"
 #include "partdec.h"

diff --git a/src/gromacs/mdlib/minimize.c b/src/gromacs/mdlib/minimize.c
index cd99ec2a0f7f0859337fc889201bacba55536208..10e4ae43fc38261baeb3068805bc2b008dbc2e42 100644 (file)
--- a/src/gromacs/mdlib/minimize.c
+++ b/src/gromacs/mdlib/minimize.c
@@ -44,7 +44,6 @@
 #include "string2.h"
 #include "network.h"
 #include "confio.h"
-#include "copyrite.h"
 #include "smalloc.h"
 #include "nrnb.h"
 #include "main.h"

diff --git a/src/gromacs/mdlib/pme.c b/src/gromacs/mdlib/pme.c
index 6b4ede675782d282ce548d566a949c26ecee4cb5..bd1a2966e31e961a8d7883a101d7970a4db176b4 100644 (file)
--- a/src/gromacs/mdlib/pme.c
+++ b/src/gromacs/mdlib/pme.c
@@ -79,7 +79,6 @@
 #include "network.h"
 #include "physics.h"
 #include "nrnb.h"
-#include "copyrite.h"
 #include "gmx_wallcycle.h"
 #include "pdbio.h"
 #include "gmx_cyclecounter.h"

diff --git a/src/gromacs/mdlib/qm_gamess.c b/src/gromacs/mdlib/qm_gamess.c
index c6e2b31e10c613d9bae13538650f8224f28b2451..21aded5d1d03dbfe71d16b93f03cfad133af5d58 100644 (file)
--- a/src/gromacs/mdlib/qm_gamess.c
+++ b/src/gromacs/mdlib/qm_gamess.c
@@ -57,7 +57,6 @@
 #include "bondf.h"
 #include "mshift.h"
 #include "txtdump.h"
-#include "copyrite.h"
 #include "qmmm.h"
 #include <stdio.h>
 #include <string.h>
@@ -108,7 +107,8 @@ void init_gamess(t_commrec *cr, t_QMrec *qm, t_MMrec *mm)
     if (PAR(cr))
     {
 
-        if MASTER(cr){
+        if (MASTER(cr))
+        {
             out = fopen("FOR009", "w");
             /* of these options I am not completely sure....  the overall
              * preformance on more than 4 cpu's is rather poor at the moment.

diff --git a/src/gromacs/mdlib/qm_gaussian.c b/src/gromacs/mdlib/qm_gaussian.c
index adb18a7f820d324bd2498b7a03e763c44d201587..761b8ec875966c8e1d88ea5308da40158c99902c 100644 (file)
--- a/src/gromacs/mdlib/qm_gaussian.c
+++ b/src/gromacs/mdlib/qm_gaussian.c
@@ -57,7 +57,6 @@
 #include "bondf.h"
 #include "mshift.h"
 #include "txtdump.h"
-#include "copyrite.h"
 #include "qmmm.h"
 #include <stdio.h>
 #include <string.h>

diff --git a/src/gromacs/mdlib/qm_mopac.c b/src/gromacs/mdlib/qm_mopac.c
index 6192098fed50c347b0bd0c3f9e3e294bca245194..f3e4cf8884599525009ddae6ea2ad283db189bed 100644 (file)
--- a/src/gromacs/mdlib/qm_mopac.c
+++ b/src/gromacs/mdlib/qm_mopac.c
@@ -57,7 +57,6 @@
 #include "bondf.h"
 #include "mshift.h"
 #include "txtdump.h"
-#include "copyrite.h"
 #include "qmmm.h"
 #include <stdio.h>
 #include <string.h>

diff --git a/src/gromacs/mdlib/qm_orca.c b/src/gromacs/mdlib/qm_orca.c
index 240f51f79c1a6b365719e89b9cd887aedc6ff28c..a8ee061002abc6cb2d8a26e28e7a3fbcef054aab 100644 (file)
--- a/src/gromacs/mdlib/qm_orca.c
+++ b/src/gromacs/mdlib/qm_orca.c
@@ -55,7 +55,6 @@
 #include "bondf.h"
 #include "mshift.h"
 #include "txtdump.h"
-#include "copyrite.h"
 #include "qmmm.h"
 #include <stdio.h>
 #include <string.h>

diff --git a/src/gromacs/mdlib/qmmm.c b/src/gromacs/mdlib/qmmm.c
index ad7a64b24d6bafbbaff16ec2db026bed1ae95fbe..689b82a6309529140b2636c5b97e8cdb7d8ac650 100644 (file)
--- a/src/gromacs/mdlib/qmmm.c
+++ b/src/gromacs/mdlib/qmmm.c
@@ -55,7 +55,6 @@
 #include "bondf.h"
 #include "mshift.h"
 #include "txtdump.h"
-#include "copyrite.h"
 #include "qmmm.h"
 #include <stdio.h>
 #include <string.h>

diff --git a/src/gromacs/mdlib/shellfc.c b/src/gromacs/mdlib/shellfc.c
index 4bcc5cc6f74f6776ba345759e860b06978ab0eb5..8469a259eebcefbf490907e6f195c6bddb99d9ad 100644 (file)
--- a/src/gromacs/mdlib/shellfc.c
+++ b/src/gromacs/mdlib/shellfc.c
@@ -51,7 +51,6 @@
 #include "domdec.h"
 #include "partdec.h"
 #include "physics.h"
-#include "copyrite.h"
 #include "shellfc.h"
 #include "mtop_util.h"
 #include "chargegroup.h"

diff --git a/src/gromacs/mdlib/tpi.c b/src/gromacs/mdlib/tpi.c
index 78dc14b91a18e7840b45052e13ad5ac381a4edff..652f3a9a0233494737b3b03e5c2a7b015fdff9b1 100644 (file)
--- a/src/gromacs/mdlib/tpi.c
+++ b/src/gromacs/mdlib/tpi.c
@@ -44,7 +44,6 @@
 #include "string2.h"
 #include "network.h"
 #include "confio.h"
-#include "copyrite.h"
 #include "smalloc.h"
 #include "nrnb.h"
 #include "main.h"

diff --git a/src/gromacs/mdlib/update.c b/src/gromacs/mdlib/update.c
index ab6fba50dc20a3df1c4d6c5c51d415e8842a550b..d829a167b4bc366b04ad5ddcf305b7aec10d3590 100644 (file)
--- a/src/gromacs/mdlib/update.c
+++ b/src/gromacs/mdlib/update.c
@@ -60,7 +60,6 @@
 #include "names.h"
 #include "txtdump.h"
 #include "mdrun.h"
-#include "copyrite.h"
 #include "constr.h"
 #include "edsam.h"
 #include "pull.h"

diff --git a/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp b/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
index 29673a90b3ed8fd117f96a1c538cd5bfefbb2d36..9c1c737d3407385fe2b8d3610cfb8be3be188f48 100644 (file)
--- a/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
+++ b/src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
@@ -87,13 +87,13 @@ class TrajectoryAnalysisCommandLineRunner::Impl
 
         TrajectoryAnalysisModule *module_;
         int                       debugLevel_;
-        bool                      bPrintCopyright_;
+        bool                      bStandalone_;
 };
 
 
 TrajectoryAnalysisCommandLineRunner::Impl::Impl(
         TrajectoryAnalysisModule *module)
-    : module_(module), debugLevel_(0), bPrintCopyright_(true)
+    : module_(module), debugLevel_(0), bStandalone_(true)
 {
 }
 
@@ -195,9 +195,9 @@ TrajectoryAnalysisCommandLineRunner::~TrajectoryAnalysisCommandLineRunner()
 
 
 void
-TrajectoryAnalysisCommandLineRunner::setPrintCopyright(bool bPrint)
+TrajectoryAnalysisCommandLineRunner::setStandalone(bool bStandalone)
 {
-    impl_->bPrintCopyright_ = bPrint;
+    impl_->bStandalone_ = bStandalone;
 }
 
 
@@ -213,7 +213,7 @@ TrajectoryAnalysisCommandLineRunner::run(int argc, char *argv[])
 {
     TrajectoryAnalysisModule *module = impl_->module_;
 
-    if (impl_->bPrintCopyright_)
+    if (impl_->bStandalone_)
     {
         CopyRight(stderr, argv[0]);
     }
@@ -284,6 +284,11 @@ TrajectoryAnalysisCommandLineRunner::run(int argc, char *argv[])
     module->finishAnalysis(nframes);
     module->writeOutput();
 
+    if (impl_->bStandalone_)
+    {
+        gmx_thanx(stderr);
+    }
+
     return 0;
 }
 

diff --git a/src/gromacs/trajectoryanalysis/cmdlinerunner.h b/src/gromacs/trajectoryanalysis/cmdlinerunner.h
index bb67b960b19307e4bdcd485ad2170e4fbee2001d..035b8ce4b17614c73735b5f856315b568257706e 100644 (file)
--- a/src/gromacs/trajectoryanalysis/cmdlinerunner.h
+++ b/src/gromacs/trajectoryanalysis/cmdlinerunner.h
@@ -79,17 +79,18 @@ class TrajectoryAnalysisCommandLineRunner
         ~TrajectoryAnalysisCommandLineRunner();
 
         /*! \brief
-         * Sets whether the runner will print the copyright header.
+         * Sets whether the runner will print standalone messages.
          *
-         * \param[in] bPrint  Whether to print the copyright header.
+         * \param[in] bStandalone  Whether the runner is run directly from main().
          *
-         * By default, the copyright header is printed.
+         * By default, the runner takes responsibility of printing some
+         * standard Gromacs messages at startup and at the end.
          * This is used internally when executing the runner in a context where
-         * the copyright has already been printed at a higher level.
+         * these messages are handled on a higher level.
          *
          * Does not throw.
          */
-        void setPrintCopyright(bool bPrint);
+        void setStandalone(bool bStandalone);
         /*! \brief
          * Sets the default debugging level for selections.
          *

diff --git a/src/gromacs/trajectoryanalysis/modules.cpp b/src/gromacs/trajectoryanalysis/modules.cpp
index b5770a4878748e7a98381864e7108627c7ca1452..902094f955b78571e12c6437553aef83da1a9c0a 100644 (file)
--- a/src/gromacs/trajectoryanalysis/modules.cpp
+++ b/src/gromacs/trajectoryanalysis/modules.cpp
@@ -82,7 +82,7 @@ int AbstractTrajAnalysisCmdLineWrapper::run(int argc, char *argv[])
 {
     TrajectoryAnalysisModulePointer     module(createModule());
     TrajectoryAnalysisCommandLineRunner runner(module.get());
-    runner.setPrintCopyright(false);
+    runner.setStandalone(false);
     return runner.run(argc, argv);
 }
 

diff --git a/src/gromacs/trajectoryanalysis/tests/moduletest.cpp b/src/gromacs/trajectoryanalysis/tests/moduletest.cpp
index 59e4ccdb997e674f5970d06b1d489c8fad8bba67..4df3d2f8ca99aacb6e8388c1001f57ea8e288de4 100644 (file)
--- a/src/gromacs/trajectoryanalysis/tests/moduletest.cpp
+++ b/src/gromacs/trajectoryanalysis/tests/moduletest.cpp
@@ -215,7 +215,7 @@ AbstractTrajectoryAnalysisModuleTestFixture::runTest(const CommandLine &args)
     }
 
     TrajectoryAnalysisCommandLineRunner runner(&module);
-    runner.setPrintCopyright(false);
+    runner.setStandalone(false);
     int rc = 0;
     EXPECT_NO_THROW_GMX(rc = runner.run(impl_->cmdline_.argc(), impl_->cmdline_.argv()));
     EXPECT_EQ(0, rc);

diff --git a/src/ngmx/g_highway.c b/src/ngmx/g_highway.c
index 43163bae4b24267d07cc729a31b9f09b922bfa3c..063306eb220f54c0f38d86e60cce7b81b8b34c4d 100644 (file)
--- a/src/ngmx/g_highway.c
+++ b/src/ngmx/g_highway.c
@@ -582,7 +582,7 @@ int main(int argc, char *argv[])
     x11->MainLoop(x11);
     x11->CleanUp(x11);
 
-    thanx(stderr);
+    gmx_thanx(stderr);
 
     return 0;
 }

diff --git a/src/ngmx/g_xrama.c b/src/ngmx/g_xrama.c
index 7cfae9c9b30bab032de1cba9a6967decd3efe248..b1807ea23f63b91d4b5b03c71dc21af76a810649 100644 (file)
--- a/src/ngmx/g_xrama.c
+++ b/src/ngmx/g_xrama.c
@@ -381,7 +381,7 @@ int main(int argc, char *argv[])
     x11->MainLoop(x11);
     x11->CleanUp(x11);
 
-    thanx(stderr);
+    gmx_thanx(stderr);
 
     return 0;
 }

diff --git a/src/ngmx/ngmx.c b/src/ngmx/ngmx.c
index 7256416126dc6fc7b0023c153c83ee6a23c0164c..e731111679f13dfe3feafe041bf132e0231a2509 100644 (file)
--- a/src/ngmx/ngmx.c
+++ b/src/ngmx/ngmx.c
@@ -321,7 +321,7 @@ int main(int argc, char *argv[])
     x11->MainLoop(x11);
     x11->CleanUp(x11);
 
-    thanx(stderr);
+    gmx_thanx(stderr);
 
     return 0;
 }

diff --git a/src/programs/gmx/g_protonate.c b/src/programs/gmx/g_protonate.c
index b079e3f9c5c53fa187a9c9e2887983e69b2bf9c8..dc72928465a18101b9f10230d6cc32386f65d720 100644 (file)
--- a/src/programs/gmx/g_protonate.c
+++ b/src/programs/gmx/g_protonate.c
@@ -40,7 +40,6 @@
 #include "string2.h"
 #include "typedefs.h"
 #include "macros.h"
-#include "copyrite.h"
 #include "smalloc.h"
 #include "statutil.h"
 #include "confio.h"
@@ -208,7 +207,5 @@ int gmx_protonate(int argc, char *argv[])
     sfree(ix);
     sfree(iatoms);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/programs/gmx/g_x2top.c b/src/programs/gmx/g_x2top.c
index 43593b3315f4b0c4eab9fd75cb1723c7ad0d7f21..8a5c3d90556d1a817b5ef1c9f354922124cdd5e8 100644 (file)
--- a/src/programs/gmx/g_x2top.c
+++ b/src/programs/gmx/g_x2top.c
@@ -38,7 +38,6 @@
 
 #include "maths.h"
 #include "macros.h"
-#include "copyrite.h"
 #include "bondf.h"
 #include "gmxfio.h"
 #include "string2.h"
@@ -638,7 +637,5 @@ int gmx_x2top(int argc, char *argv[])
     printf("         Please verify atomtypes and charges by comparison to other\n");
     printf("         topologies.\n");
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/programs/gmx/gmxcheck.c b/src/programs/gmx/gmxcheck.c
index 54dae3aee32f325e804026c46f379ff8d1e4f7e7..00d5f51fec5e7e1315161fbeb1bc0d7429ff0b99 100644 (file)
--- a/src/programs/gmx/gmxcheck.c
+++ b/src/programs/gmx/gmxcheck.c
@@ -44,7 +44,6 @@
 #include <math.h>
 #include "futil.h"
 #include "statutil.h"
-#include "copyrite.h"
 #include "sysstuff.h"
 #include "txtdump.h"
 #include "gmx_fatal.h"
@@ -850,7 +849,5 @@ int gmx_gmxcheck(int argc, char *argv[])
         chk_ndx(ftp2fn(efNDX, NFILE, fnm));
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/programs/gmx/gmxdump.c b/src/programs/gmx/gmxdump.c
index 045c2f3092dfcd6044c90c65058bec7dda322d06..054b980812d743db9df34cb2b25ce41f776f491a 100644 (file)
--- a/src/programs/gmx/gmxdump.c
+++ b/src/programs/gmx/gmxdump.c
@@ -44,7 +44,6 @@
 #include "macros.h"
 #include "futil.h"
 #include "statutil.h"
-#include "copyrite.h"
 #include "sysstuff.h"
 #include "txtdump.h"
 #include "gmx_fatal.h"
@@ -588,7 +587,5 @@ int gmx_gmxdump(int argc, char *argv[])
         list_mtx(ftp2fn(efMTX, NFILE, fnm));
     }
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/programs/gmx/grompp.c b/src/programs/gmx/grompp.c
index 629dcaa3c29683970a9c0cd8b1316385accc001f..6f213682171bdbe0d20adb72f0da89bed1ed456b 100644 (file)
--- a/src/programs/gmx/grompp.c
+++ b/src/programs/gmx/grompp.c
@@ -51,7 +51,6 @@
 #include "toputil.h"
 #include "topio.h"
 #include "confio.h"
-#include "copyrite.h"
 #include "readir.h"
 #include "symtab.h"
 #include "names.h"
@@ -1931,7 +1930,5 @@ int gmx_grompp(int argc, char *argv[])
 
     write_tpx_state(ftp2fn(efTPX, NFILE, fnm), ir, &state, sys);
 
-    thanx(stderr);
-
     return 0;
 }

diff --git a/src/programs/gmx/nm2type.c b/src/programs/gmx/nm2type.c
index 1afff57a0f75c585b47e1c358605c88b5b788229..5aeab36bbdbcb7c8576806380067dec42b87e697 100644 (file)
--- a/src/programs/gmx/nm2type.c
+++ b/src/programs/gmx/nm2type.c
@@ -39,7 +39,6 @@
 
 #include "maths.h"
 #include "macros.h"
-#include "copyrite.h"
 #include "bondf.h"
 #include "string2.h"
 #include "smalloc.h"

diff --git a/src/programs/gmx/pdb2gmx.c b/src/programs/gmx/pdb2gmx.c
index 1fcc38cf218ae163d7a543f1fe6c35bfac8359eb..52d543b813e7c30e8bfe2bfbf2ff5e3a6668a1b6 100644 (file)
--- a/src/programs/gmx/pdb2gmx.c
+++ b/src/programs/gmx/pdb2gmx.c
@@ -2230,8 +2230,5 @@ int gmx_pdb2gmx(int argc, char *argv[])
     }
     printf("\t\t--------- ETON ESAELP ------------\n");
 
-
-    thanx(stdout);
-
     return 0;
 }

diff --git a/src/programs/gmx/tpbconv.c b/src/programs/gmx/tpbconv.c
index 040420fcc17866a021a42ca24deb91ad104b1ae5..3359cf7dce85d7b85cc3d307ee71eb85f92039e0 100644 (file)
--- a/src/programs/gmx/tpbconv.c
+++ b/src/programs/gmx/tpbconv.c
@@ -51,7 +51,6 @@
 #include "enxio.h"
 #include "readir.h"
 #include "statutil.h"
-#include "copyrite.h"
 #include "futil.h"
 #include "vec.h"
 #include "mtop_util.h"
@@ -687,7 +686,6 @@ int gmx_tpbconv(int argc, char *argv[])
     {
         printf("You've simulated long enough. Not writing tpr file\n");
     }
-    thanx(stderr);
 
     return 0;
 }

diff --git a/src/programs/mdrun/mdrun.c b/src/programs/mdrun/mdrun.c
index 41635d608727b34284c71ec082d312de999e81f1..2b23ce799b06a1bf198db92766ced956eb1e38e5 100644 (file)
--- a/src/programs/mdrun/mdrun.c
+++ b/src/programs/mdrun/mdrun.c
@@ -744,7 +744,7 @@ int cmain(int argc, char *argv[])
 
     if (MULTIMASTER(cr))
     {
-        thanx(stderr);
+        gmx_thanx(stderr);
     }
 
     /* Log file has to be closed in mdrunner if we are appending to it

diff --git a/src/programs/mdrun/membed.c b/src/programs/mdrun/membed.c
index 81d61b68262c3190df92e65a57cd9bbf52783dbb..49d5e338c19220397b05fd766262f468eccd07d1 100644 (file)
--- a/src/programs/mdrun/membed.c
+++ b/src/programs/mdrun/membed.c
@@ -44,7 +44,6 @@
 #include "vec.h"
 #include "statutil.h"
 #include "macros.h"
-#include "copyrite.h"
 #include "main.h"
 #include "futil.h"
 #include "edsam.h"