ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/parallel/ForceMatrixDecomposition.cpp
(Generate patch)

Comparing trunk/src/parallel/ForceMatrixDecomposition.cpp (file contents):
Revision 2062 by gezelter, Tue Mar 3 16:40:39 2015 UTC vs.
Revision 2069 by gezelter, Thu Mar 5 16:30:23 2015 UTC

# Line 833 | Line 833 | namespace OpenMD {
833   #endif
834    }
835    
836 <  inline Vector3d ForceMatrixDecomposition::getIntergroupVector(int cg1,
837 <                                                                int cg2){
836 >  Vector3d ForceMatrixDecomposition::getIntergroupVector(int cg1,
837 >                                                         int cg2){
838  
839      Vector3d d;
840   #ifdef IS_MPI
# Line 913 | Line 913 | namespace OpenMD {
913  
914    }
915      
916 <  inline Vector3d ForceMatrixDecomposition::getInteratomicVector(int atom1,
917 <                                                                 int atom2){
916 >  Vector3d ForceMatrixDecomposition::getInteratomicVector(int atom1,
917 >                                                          int atom2){
918      Vector3d d;
919      
920   #ifdef IS_MPI
# Line 1512 | Line 1512 | namespace OpenMD {
1512          whichCell.y() = nCells_.y() * scaled.y();
1513          whichCell.z() = nCells_.z() * scaled.z();
1514          
1515 –        // find single index of this cell:
1516 –        int m1 = Vlinear(whichCell, nCells_);
1517 –
1515          for (vector<Vector3i>::iterator os = cellOffsets_.begin();
1516               os != cellOffsets_.end(); ++os) {
1517                

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines