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 1583 by gezelter, Thu Jun 16 22:00:08 2011 UTC vs.
Revision 1587 by gezelter, Fri Jul 8 20:25:32 2011 UTC

# Line 112 | Line 112 | namespace OpenMD {
112        sdat.dfrhodrho = &(snap_->atomData.functionalDerivative[atom1]);
113      }
114  
115 +    if (storageLayout_ & DataStorage::dslSkippedCharge) {
116 +      sdat.skippedCharge = &(snap_->atomData.skippedCharge[atom1]);
117 +    }
118 +
119      if (storageLayout_ & DataStorage::dslParticlePot) {
120        sdat.particlePot = &(snap_->atomData.particlePot[atom1]);
121      }
# Line 124 | Line 128 | namespace OpenMD {
128      // if we have changed the group identities or haven't set up the
129      // saved positions we automatically will need a neighbor list update:
130  
131 <    if ( saved_CG_positions_.size() != nGroups ) {
128 <      cerr << "build because size\n";
129 <      return true;
130 <    }
131 >    if ( saved_CG_positions_.size() != nGroups ) return true;
132  
133      RealType dispmax = 0.0;
134      Vector3d disp;    
# Line 146 | Line 147 | namespace OpenMD {
147      dispmax = 2.0 * sqrt (3.0 * dispmax * dispmax);
148  
149  
150 <    if (dispmax > skinThickness_) {
150 <      cerr << "build because movement\n";
150 >    if (dispmax > skinThickness_)
151        return (dispmax > skinThickness_);  
152 <    } else {
153 <      cerr << "not rebuilding\n";
154 <    }
152 >
153      return false;
154    }
155   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines