Commit 270b07b0 authored by Steve Plimpton's avatar Steve Plimpton
Browse files

Merge branch 'integration' into small-bugfixes

parents 50a82bb3 abc5a32c
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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
+2 −2
Original line number Diff line number Diff line
// -------------------------------------------------------------
// 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.
+2 −2
Original line number Diff line number Diff line
// -------------------------------------------------------------
// 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.
+2 −2
Original line number Diff line number Diff line
// -------------------------------------------------------------
// 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.
+1 −1
Original line number Diff line number Diff line
@@ -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.
Loading