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 1929 by gezelter, Mon Aug 19 13:12:00 2013 UTC vs.
Revision 1930 by gezelter, Mon Aug 19 13:51:04 2013 UTC

# Line 1175 | Line 1175 | namespace OpenMD {
1175      idat.excluded = excludeAtomPair(atom1, atom2);
1176    
1177   #ifdef IS_MPI
1178 <    idat.atypes = make_pair( atypesRow[atom1], atypesCol[atom2]);
1178 >    //idat.atypes = make_pair( atypesRow[atom1], atypesCol[atom2]);
1179      idat.atid1 = identsRow[atom1];
1180      idat.atid2 = identsCol[atom2];
1181  
1182      if (regionsRow[atom1] >= 0 && regionsCol[atom2] >= 0)
1183        idat.sameRegion = (regionsRow[atom1] == regionsCol[atom2]);
1184        
1185 –    //idat.atypes = make_pair( ff_->getAtomType(identsRow[atom1]),
1186 –    //                         ff_->getAtomType(identsCol[atom2]) );
1187 –    
1185      if (storageLayout_ & DataStorage::dslAmat) {
1186        idat.A1 = &(atomRowData.aMat[atom1]);
1187        idat.A2 = &(atomColData.aMat[atom2]);
# Line 1237 | Line 1234 | namespace OpenMD {
1234  
1235   #else
1236      
1237 <    idat.atypes = make_pair( atypesLocal[atom1], atypesLocal[atom2]);
1237 >    //idat.atypes = make_pair( atypesLocal[atom1], atypesLocal[atom2]);
1238      idat.atid1 = idents[atom1];
1239      idat.atid2 = idents[atom2];
1240  

Diff Legend

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