Merge branch 'integration' into small-bugfixes

doc/src/compute_sna_atom.txt

@@ -177,18 +177,18 @@ described by the following piece of python code:
 
 for j1 in range(0,twojmax+1):
     if(diagonal==2): 
-        print j1/2,j1/2,j1/2
+        print j1/2.,j1/2.,j1/2.
     elif(diagonal==1):
         for j in range(0,min(twojmax,2*j1)+1,2): 
-            print j1/2,j1/2,j/2
+            print j1/2.,j1/2.,j/2.
     elif(diagonal==0):
         for j2 in range(0,j1+1):
             for j in range(j1-j2,min(twojmax,j1+j2)+1,2): 
-                print j1/2,j2/2,j/2
+                print j1/2.,j2/2.,j/2.
     elif(diagonal==3):
         for j2 in range(0,j1+1):
             for j in range(j1-j2,min(twojmax,j1+j2)+1,2): 
-                if (j>=j1): print j1/2,j2/2,j/2 :pre
+                if (j>=j1): print j1/2.,j2/2.,j/2. :pre
 
 Compute {snad/atom} evaluates a per-atom array. The columns are
 arranged into {ntypes} blocks, listed in order of atom type {I}.  Each

lib/gpu/cudpp_mini/cudpp.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // CUDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt in
 // the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_globals.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt in
 // the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_maximal_launch.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt
 // in the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_plan.h

@@ -2,7 +2,7 @@
 // CUDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
 // $Revision: 3572$
-// $Date$
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt
 // in the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_plan_manager.h

@@ -2,7 +2,7 @@
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
 // $Revision: 3572$
-// $Date$
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt
 // in the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_radixsort.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt
 // in the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_scan.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt 
 // in the root directory of this source distribution.

lib/gpu/cudpp_mini/cudpp_util.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt in
 // the root directory of this source distribution.

lib/gpu/cudpp_mini/sharedmem.h

@@ -1,8 +1,8 @@
 // -------------------------------------------------------------
 // cuDPP -- CUDA Data Parallel Primitives library
 // -------------------------------------------------------------
-// $Revision$
-// $Date$
+// $Revision: 5289 $
+// $Date: 2010-11-23 13:04:43 -0700 (Tue, 23 Nov 2010) $
 // ------------------------------------------------------------- 
 // This source code is distributed under the terms of license.txt 
 // in the root directory of this source distribution.

src/KOKKOS/Install.sh

@@ -189,8 +189,12 @@ if (test $1 = 1) then
     sed -i -e '/CXX\ =\ \$(CC)/d' ../Makefile.package.settings
     sed -i -e '/^include.*kokkos.*$/d' ../Makefile.package.settings
     # multiline form needed for BSD sed on Macs
-    sed -i -e '4 i \CXX = $(CC)' ../Makefile.package.settings
-    sed -i -e '5 i \include ..\/..\/lib\/kokkos\/Makefile.kokkos' ../Makefile.package.settings
+    sed -i -e '4 i \
+CXX = $(CC)
+' ../Makefile.package.settings
+    sed -i -e '5 i \
+include ..\/..\/lib\/kokkos\/Makefile.kokkos
+' ../Makefile.package.settings
   fi
 
   #  comb/omp triggers a persistent bug in nvcc. deleting it.

src/finish.cpp

@@ -162,10 +162,17 @@ void Finish::end(int flag)
       if (screen) fprintf(screen,fmt2,cpu_loop,nprocs,nthreads);
       if (logfile) fprintf(logfile,fmt2,cpu_loop,nprocs,nthreads);
 #else
-      const char fmt2[] =
-        "%.1f%% CPU use with %d MPI tasks x no OpenMP threads\n";
-      if (screen) fprintf(screen,fmt2,cpu_loop,nprocs);
-      if (logfile) fprintf(logfile,fmt2,cpu_loop,nprocs);
+      if (lmp->kokkos) {
+        const char fmt2[] =
+          "%.1f%% CPU use with %d MPI tasks x %d OpenMP threads\n";
+        if (screen) fprintf(screen,fmt2,cpu_loop,nprocs,lmp->kokkos->num_threads);
+        if (logfile) fprintf(logfile,fmt2,cpu_loop,nprocs,lmp->kokkos->num_threads);
+      } else {
+        const char fmt2[] =
+          "%.1f%% CPU use with %d MPI tasks x no OpenMP threads\n";
+        if (screen) fprintf(screen,fmt2,cpu_loop,nprocs);
+        if (logfile) fprintf(logfile,fmt2,cpu_loop,nprocs);
+      }
 #endif
 
     }