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

Comparing branches/development/src/parallel/ForceDecomposition.cpp (file contents):
Revision 1586 by gezelter, Tue Jun 21 06:34:35 2011 UTC vs.
Revision 1613 by gezelter, Thu Aug 18 20:18:19 2011 UTC

# Line 89 | Line 89 | namespace OpenMD {
89  
90    void ForceDecomposition::fillSelfData(SelfData &sdat, int atom1) {
91  
92 <    sdat.atype = ff_->getAtomType(idents[atom1]);
92 >    sdat.atype = atypesLocal[atom1];
93 >
94 >    sdat.pot = &embeddingPot;
95          
96      // Still Missing skippedCharge
97      if (storageLayout_ & DataStorage::dslElectroFrame) {
# Line 128 | Line 130 | namespace OpenMD {
130      // if we have changed the group identities or haven't set up the
131      // saved positions we automatically will need a neighbor list update:
132  
133 <    if ( saved_CG_positions_.size() != nGroups ) {
132 <      cerr << "build because size\n";
133 <      return true;
134 <    }
133 >    if ( saved_CG_positions_.size() != nGroups ) return true;
134  
135      RealType dispmax = 0.0;
136      Vector3d disp;    
# Line 150 | Line 149 | namespace OpenMD {
149      dispmax = 2.0 * sqrt (3.0 * dispmax * dispmax);
150  
151  
152 <    if (dispmax > skinThickness_) {
154 <      cerr << "build because movement\n";
152 >    if (dispmax > skinThickness_)
153        return (dispmax > skinThickness_);  
154 <    } else {
157 <      cerr << "not rebuilding\n";
158 <    }
154 >
155      return false;
156    }
157   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines