Re-generated group kernels

This should be a null operation, but I had to fix copyright
years in python scripts and it had the following effects:
* removed some debugging printf statements in GB C kernels
* minor whitespace change now consistent between template and output

Change-Id: I3c3fe9be625ca4f7ade6871fc105fd80899e5a70

diff --git a/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py b/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py
index aafb1d8a1f1b620538d59c9a9fa4b11204399d0e..35a8fc3b3383f8edb9aaa018c716ff1edd8af7a9 100755 (executable)
--- a/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py
+++ b/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py
@@ -2,7 +2,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012, by the GROMACS development team, led by
+# Copyright (c) 2012,2013, 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.
@@ -93,7 +93,7 @@ FileHeader = \
 '/*\n' \
 ' * This file is part of the GROMACS molecular simulation package.\n' \
 ' *\n' \
-' * Copyright (c) 2012, by the GROMACS development team, led by\n' \
+' * Copyright (c) 2012,2013, by the GROMACS development team, led by\n' \
 ' * David van der Spoel, Berk Hess, Erik Lindahl, and including many\n' \
 ' * others, as listed in the AUTHORS file in the top-level source\n' \
 ' * directory and at http://www.gromacs.org.\n' \

diff --git a/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c b/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c
index 9ab3a5c97181ff9863a3400e4ff86dc132c5dfe1..8f157e3b8f42a7072a6b618fc09a0d7256e4b378 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c
+++ b/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c
@@ -257,7 +257,7 @@ nb_kernel_t nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_avx_128_fma_double;
 
 
 nb_kernel_info_t
-    kernellist_avx_128_fma_double[] =
+kernellist_avx_128_fma_double[] =
 {
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_avx_128_fma_double, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_avx_128_fma_double", "avx_128_fma_double", "None", "None", "LennardJones", "None", "ParticleParticle", "", "PotentialAndForce" },
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_avx_128_fma_double, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_avx_128_fma_double", "avx_128_fma_double", "None", "None", "LennardJones", "None", "ParticleParticle", "", "Force" },
@@ -476,6 +476,6 @@ nb_kernel_info_t
 };
 
 int
-    kernellist_avx_128_fma_double_size = sizeof(kernellist_avx_128_fma_double)/sizeof(kernellist_avx_128_fma_double[0]);
+kernellist_avx_128_fma_double_size = sizeof(kernellist_avx_128_fma_double)/sizeof(kernellist_avx_128_fma_double[0]);
 
 #endif

diff --git a/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py b/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py
index 8fd701fe6ab30c19b79617d05734217ae8a42148..eac82ebf699fd5518f235a48561798d0e74a91c5 100755 (executable)
--- a/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py
+++ b/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py
@@ -2,7 +2,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012, by the GROMACS development team, led by
+# Copyright (c) 2012,2013, 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.
@@ -93,7 +93,7 @@ FileHeader = \
 '/*\n' \
 ' * This file is part of the GROMACS molecular simulation package.\n' \
 ' *\n' \
-' * Copyright (c) 2012, by the GROMACS development team, led by\n' \
+' * Copyright (c) 2012,2013, by the GROMACS development team, led by\n' \
 ' * David van der Spoel, Berk Hess, Erik Lindahl, and including many\n' \
 ' * others, as listed in the AUTHORS file in the top-level source\n' \
 ' * directory and at http://www.gromacs.org.\n' \

diff --git a/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c b/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c
index 8783ae2a6dcb84c5c576ebb82736566d013cde1a..a8b3c2236d18f0e24ec4391524efc7372b6dcd5f 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c
+++ b/src/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c
@@ -257,7 +257,7 @@ nb_kernel_t nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_avx_128_fma_single;
 
 
 nb_kernel_info_t
-    kernellist_avx_128_fma_single[] =
+kernellist_avx_128_fma_single[] =
 {
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_avx_128_fma_single, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_avx_128_fma_single", "avx_128_fma_single", "None", "None", "LennardJones", "None", "ParticleParticle", "", "PotentialAndForce" },
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_avx_128_fma_single, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_avx_128_fma_single", "avx_128_fma_single", "None", "None", "LennardJones", "None", "ParticleParticle", "", "Force" },
@@ -476,6 +476,6 @@ nb_kernel_info_t
 };
 
 int
-    kernellist_avx_128_fma_single_size = sizeof(kernellist_avx_128_fma_single)/sizeof(kernellist_avx_128_fma_single[0]);
+kernellist_avx_128_fma_single_size = sizeof(kernellist_avx_128_fma_single)/sizeof(kernellist_avx_128_fma_single[0]);
 
 #endif

diff --git a/src/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py b/src/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py
index d81938bf62e437669aa4815d455e608167062c4c..4644e6d247e9b59e2f6dabe7438fdde0b9039ea9 100755 (executable)
--- a/src/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py
+++ b/src/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py
@@ -2,7 +2,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012, by the GROMACS development team, led by
+# Copyright (c) 2012,2013, 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.
@@ -93,7 +93,7 @@ FileHeader = \
 '/*\n' \
 ' * This file is part of the GROMACS molecular simulation package.\n' \
 ' *\n' \
-' * Copyright (c) 2012, by the GROMACS development team, led by\n' \
+' * Copyright (c) 2012,2013, by the GROMACS development team, led by\n' \
 ' * David van der Spoel, Berk Hess, Erik Lindahl, and including many\n' \
 ' * others, as listed in the AUTHORS file in the top-level source\n' \
 ' * directory and at http://www.gromacs.org.\n' \

diff --git a/src/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c b/src/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c
index 5a9bb4166793e00f847e88036dd95f02a73dec1a..f437d6d5a33e18e745d3942ffeef690a8ed7794e 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c
+++ b/src/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c
@@ -257,7 +257,7 @@ nb_kernel_t nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_avx_256_double;
 
 
 nb_kernel_info_t
-    kernellist_avx_256_double[] =
+kernellist_avx_256_double[] =
 {
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_avx_256_double, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_avx_256_double", "avx_256_double", "None", "None", "LennardJones", "None", "ParticleParticle", "", "PotentialAndForce" },
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_avx_256_double, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_avx_256_double", "avx_256_double", "None", "None", "LennardJones", "None", "ParticleParticle", "", "Force" },
@@ -476,6 +476,6 @@ nb_kernel_info_t
 };
 
 int
-    kernellist_avx_256_double_size = sizeof(kernellist_avx_256_double)/sizeof(kernellist_avx_256_double[0]);
+kernellist_avx_256_double_size = sizeof(kernellist_avx_256_double)/sizeof(kernellist_avx_256_double[0]);
 
 #endif

diff --git a/src/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py b/src/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py
index 6ef5f19b519bf72db2afc302713f0957da4149b8..dc27ca638c0ca60e2aca6ddde113b8e2cc362606 100755 (executable)
--- a/src/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py
+++ b/src/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py
@@ -2,7 +2,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012, by the GROMACS development team, led by
+# Copyright (c) 2012,2013, 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.
@@ -93,7 +93,7 @@ FileHeader = \
 '/*\n' \
 ' * This file is part of the GROMACS molecular simulation package.\n' \
 ' *\n' \
-' * Copyright (c) 2012, by the GROMACS development team, led by\n' \
+' * Copyright (c) 2012,2013, by the GROMACS development team, led by\n' \
 ' * David van der Spoel, Berk Hess, Erik Lindahl, and including many\n' \
 ' * others, as listed in the AUTHORS file in the top-level source\n' \
 ' * directory and at http://www.gromacs.org.\n' \

diff --git a/src/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c b/src/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c
index 73a21850b634daacc5880d111df733255f98dec5..1f683b5198cd9e66a2fbd7a9039b8a06b61a4a29 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c
+++ b/src/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c
@@ -257,7 +257,7 @@ nb_kernel_t nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_avx_256_single;
 
 
 nb_kernel_info_t
-    kernellist_avx_256_single[] =
+kernellist_avx_256_single[] =
 {
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_avx_256_single, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_avx_256_single", "avx_256_single", "None", "None", "LennardJones", "None", "ParticleParticle", "", "PotentialAndForce" },
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_avx_256_single, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_avx_256_single", "avx_256_single", "None", "None", "LennardJones", "None", "ParticleParticle", "", "Force" },
@@ -476,6 +476,6 @@ nb_kernel_info_t
 };
 
 int
-    kernellist_avx_256_single_size = sizeof(kernellist_avx_256_single)/sizeof(kernellist_avx_256_single[0]);
+kernellist_avx_256_single_size = sizeof(kernellist_avx_256_single)/sizeof(kernellist_avx_256_single[0]);
 
 #endif

diff --git a/src/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py b/src/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py
index 45f4b599fb323c8c578dcc3e70e2cf9ec0bba18d..3c93ddd4269b5f231cbf08aeea69bd2aeb326412 100755 (executable)
--- a/src/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py
+++ b/src/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py
@@ -2,7 +2,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012, by the GROMACS development team, led by
+# Copyright (c) 2012,2013, 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.
@@ -93,7 +93,7 @@ FileHeader = \
 '/*\n' \
 ' * This file is part of the GROMACS molecular simulation package.\n' \
 ' *\n' \
-' * Copyright (c) 2012, by the GROMACS development team, led by\n' \
+' * Copyright (c) 2012,2013, by the GROMACS development team, led by\n' \
 ' * David van der Spoel, Berk Hess, Erik Lindahl, and including many\n' \
 ' * others, as listed in the AUTHORS file in the top-level source\n' \
 ' * directory and at http://www.gromacs.org.\n' \

diff --git a/src/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c b/src/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c
index cc7944e9eb46a718c5f6c63328e6fdb825081f08..58ee0257453bf694a5f60e0a605b0f72ff9bb101 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c
+++ b/src/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c
@@ -149,7 +149,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_c
         vgbsum           = 0.0;
         vvdwsum          = 0.0;
         dvdasum          = 0.0;
-        printf("inr=%d\n",inr);
+
         /* Start inner kernel loop */
         for(jidx=j_index_start; jidx<j_index_end; jidx++)
         {
@@ -213,12 +213,9 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_c
 
             FF               = Fp+Geps+2.0*Heps2;
             fgb              = gbqqfactor*FF*gbscale;
-            printf("  jnr=%d  fgb=%g\n",jnr,fgb);
             dvdatmp          = -0.5*(vgb+fgb*r00);
             dvdasum          = dvdasum + dvdatmp;
-            printf("  dvdatmp=%g\n",dvdatmp);
             dvda[jnr]        = dvdaj+dvdatmp*isaj0*isaj0;
-            printf("  dvda, jcontrib=%g\n",dvdatmp*isaj0*isaj0);
             velec            = qq00*rinv00;
             felec            = (velec*rinv00-fgb)*rinv00;
 

diff --git a/src/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c b/src/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c
index 3d6ff12132649bf1e94b942d391b16b83564fffb..12ab8fc8991d57ba61770d1856e544a67f14b9ff 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c
+++ b/src/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c
@@ -345,7 +345,7 @@ nb_kernel_t nb_kernel_ElecRF_VdwBham_GeomW4W4_F_c;
 
 
 nb_kernel_info_t
-    kernellist_c[] =
+kernellist_c[] =
 {
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_c, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_c", "c", "None", "None", "LennardJones", "None", "ParticleParticle", "", "PotentialAndForce" },
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_c, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_c", "c", "None", "None", "LennardJones", "None", "ParticleParticle", "", "Force" },
@@ -652,6 +652,6 @@ nb_kernel_info_t
 };
 
 int
-    kernellist_c_size = sizeof(kernellist_c)/sizeof(kernellist_c[0]);
+kernellist_c_size = sizeof(kernellist_c)/sizeof(kernellist_c[0]);
 
 #endif

diff --git a/src/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py b/src/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py
index 6b7f0d283424de615e08a067fc6243a47850be88..352faab684499bbae9c277c9396b06510ef51267 100755 (executable)
--- a/src/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py
+++ b/src/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py
@@ -2,7 +2,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012, by the GROMACS development team, led by
+# Copyright (c) 2012,2013, 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.
@@ -93,7 +93,7 @@ FileHeader = \
 '/*\n' \
 ' * This file is part of the GROMACS molecular simulation package.\n' \
 ' *\n' \
-' * Copyright (c) 2012, by the GROMACS development team, led by\n' \
+' * Copyright (c) 2012,2013, by the GROMACS development team, led by\n' \
 ' * David van der Spoel, Berk Hess, Erik Lindahl, and including many\n' \
 ' * others, as listed in the AUTHORS file in the top-level source\n' \
 ' * directory and at http://www.gromacs.org.\n' \

diff --git a/src/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c b/src/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c
index ca55fb6e3a537eb36c15834d37e5e061fee788a8..2bd1c3b2fa30cc4619ff34273da3e830abd19524 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c
+++ b/src/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c
@@ -257,7 +257,7 @@ nb_kernel_t nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_sse2_double;
 
 
 nb_kernel_info_t
-    kernellist_sse2_double[] =
+kernellist_sse2_double[] =
 {
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_sse2_double, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_sse2_double", "sse2_double", "None", "None", "LennardJones", "None", "ParticleParticle", "", "PotentialAndForce" },
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_sse2_double, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_sse2_double", "sse2_double", "None", "None", "LennardJones", "None", "ParticleParticle", "", "Force" },
@@ -476,6 +476,6 @@ nb_kernel_info_t
 };
 
 int
-    kernellist_sse2_double_size = sizeof(kernellist_sse2_double)/sizeof(kernellist_sse2_double[0]);
+kernellist_sse2_double_size = sizeof(kernellist_sse2_double)/sizeof(kernellist_sse2_double[0]);
 
 #endif

diff --git a/src/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py b/src/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py
index fe15e4e81f654006ed6fd0d3680b673e25122bb1..ad43b3ba6e9fe21295153592ad864d38d02aaf93 100755 (executable)
--- a/src/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py
+++ b/src/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py
@@ -2,7 +2,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012, by the GROMACS development team, led by
+# Copyright (c) 2012,2013, 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.
@@ -93,7 +93,7 @@ FileHeader = \
 '/*\n' \
 ' * This file is part of the GROMACS molecular simulation package.\n' \
 ' *\n' \
-' * Copyright (c) 2012, by the GROMACS development team, led by\n' \
+' * Copyright (c) 2012,2013, by the GROMACS development team, led by\n' \
 ' * David van der Spoel, Berk Hess, Erik Lindahl, and including many\n' \
 ' * others, as listed in the AUTHORS file in the top-level source\n' \
 ' * directory and at http://www.gromacs.org.\n' \

diff --git a/src/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c b/src/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c
index fb46f4b3ba505789671a55a1134ed766be27a2ca..6002013d2452b32e61fe0a83e9a773d59179bc5f 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c
+++ b/src/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c
@@ -257,7 +257,7 @@ nb_kernel_t nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_sse2_single;
 
 
 nb_kernel_info_t
-    kernellist_sse2_single[] =
+kernellist_sse2_single[] =
 {
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_sse2_single, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_sse2_single", "sse2_single", "None", "None", "LennardJones", "None", "ParticleParticle", "", "PotentialAndForce" },
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_sse2_single, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_sse2_single", "sse2_single", "None", "None", "LennardJones", "None", "ParticleParticle", "", "Force" },
@@ -476,6 +476,6 @@ nb_kernel_info_t
 };
 
 int
-    kernellist_sse2_single_size = sizeof(kernellist_sse2_single)/sizeof(kernellist_sse2_single[0]);
+kernellist_sse2_single_size = sizeof(kernellist_sse2_single)/sizeof(kernellist_sse2_single[0]);
 
 #endif

diff --git a/src/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py b/src/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py
index a6e0802d30517056ef96df7a47f6a83c7e8deecf..a34738ae2811c6a57077fb0461f7dc2e1e9353f5 100755 (executable)
--- a/src/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py
+++ b/src/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py
@@ -2,7 +2,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012, by the GROMACS development team, led by
+# Copyright (c) 2012,2013, 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.
@@ -93,7 +93,7 @@ FileHeader = \
 '/*\n' \
 ' * This file is part of the GROMACS molecular simulation package.\n' \
 ' *\n' \
-' * Copyright (c) 2012, by the GROMACS development team, led by\n' \
+' * Copyright (c) 2012,2013, by the GROMACS development team, led by\n' \
 ' * David van der Spoel, Berk Hess, Erik Lindahl, and including many\n' \
 ' * others, as listed in the AUTHORS file in the top-level source\n' \
 ' * directory and at http://www.gromacs.org.\n' \

diff --git a/src/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c b/src/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c
index 1661f658754278731a3089a67506b322a6b515f2..665c685bee0faa8d6444e4c5b4919038bd13d028 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c
+++ b/src/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c
@@ -257,7 +257,7 @@ nb_kernel_t nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_sse4_1_double;
 
 
 nb_kernel_info_t
-    kernellist_sse4_1_double[] =
+kernellist_sse4_1_double[] =
 {
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_sse4_1_double, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_sse4_1_double", "sse4_1_double", "None", "None", "LennardJones", "None", "ParticleParticle", "", "PotentialAndForce" },
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_sse4_1_double, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_sse4_1_double", "sse4_1_double", "None", "None", "LennardJones", "None", "ParticleParticle", "", "Force" },
@@ -476,6 +476,6 @@ nb_kernel_info_t
 };
 
 int
-    kernellist_sse4_1_double_size = sizeof(kernellist_sse4_1_double)/sizeof(kernellist_sse4_1_double[0]);
+kernellist_sse4_1_double_size = sizeof(kernellist_sse4_1_double)/sizeof(kernellist_sse4_1_double[0]);
 
 #endif

diff --git a/src/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py b/src/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py
index 2b5f67e369070571f4047cfa14ad4877472ae2b5..f13947d29881436f8d36a305ead2bda147503d31 100755 (executable)
--- a/src/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py
+++ b/src/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py
@@ -2,7 +2,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012, by the GROMACS development team, led by
+# Copyright (c) 2012,2013, 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.
@@ -93,7 +93,7 @@ FileHeader = \
 '/*\n' \
 ' * This file is part of the GROMACS molecular simulation package.\n' \
 ' *\n' \
-' * Copyright (c) 2012, by the GROMACS development team, led by\n' \
+' * Copyright (c) 2012,2013, by the GROMACS development team, led by\n' \
 ' * David van der Spoel, Berk Hess, Erik Lindahl, and including many\n' \
 ' * others, as listed in the AUTHORS file in the top-level source\n' \
 ' * directory and at http://www.gromacs.org.\n' \

diff --git a/src/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c b/src/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c
index cf1d322c1d8341030ada8ff2aa3ab8767fdba303..f774874ff1187c2b2b3fd6f875e0a5d3f88ae923 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c
+++ b/src/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c
@@ -257,7 +257,7 @@ nb_kernel_t nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_sse4_1_single;
 
 
 nb_kernel_info_t
-    kernellist_sse4_1_single[] =
+kernellist_sse4_1_single[] =
 {
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_sse4_1_single, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_VF_sse4_1_single", "sse4_1_single", "None", "None", "LennardJones", "None", "ParticleParticle", "", "PotentialAndForce" },
     { nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_sse4_1_single, "nb_kernel_ElecNone_VdwLJ_GeomP1P1_F_sse4_1_single", "sse4_1_single", "None", "None", "LennardJones", "None", "ParticleParticle", "", "Force" },
@@ -476,6 +476,6 @@ nb_kernel_info_t
 };
 
 int
-    kernellist_sse4_1_single_size = sizeof(kernellist_sse4_1_single)/sizeof(kernellist_sse4_1_single[0]);
+kernellist_sse4_1_single_size = sizeof(kernellist_sse4_1_single)/sizeof(kernellist_sse4_1_single[0]);
 
 #endif