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 1723 by gezelter, Thu May 24 20:59:54 2012 UTC vs.
Revision 1755 by gezelter, Thu Jun 14 01:58:35 2012 UTC

# Line 49 | Line 49 | namespace OpenMD {
49   namespace OpenMD {
50  
51    ForceDecomposition::ForceDecomposition(SimInfo* info, InteractionManager* iMan) : info_(info), interactionMan_(iMan), needVelocities_(false) {
52 +
53      sman_ = info_->getSnapshotManager();
54      storageLayout_ = sman_->getStorageLayout();
55      ff_ = info_->getForceField();
# Line 126 | Line 127 | namespace OpenMD {
127      if (storageLayout_ & DataStorage::dslParticlePot) {
128        sdat.particlePot = &(snap_->atomData.particlePot[atom1]);
129      }
130 +    
131 +    if (storageLayout_ & DataStorage::dslFlucQPosition) {
132 +      sdat.flucQ = &(snap_->atomData.flucQPos[atom1]);
133 +    }
134 +    
135 +    if (storageLayout_ & DataStorage::dslFlucQForce) {
136 +      sdat.dVdFQ = &(snap_->atomData.flucQFrc[atom1]);
137 +    }
138    }
139  
140    bool ForceDecomposition::checkNeighborList() {
# Line 163 | Line 172 | namespace OpenMD {
172    }
173  
174    void ForceDecomposition::addToHeatFlux(Vector3d hf) {
175 <    snap_->frameData.conductiveHeatFlux += hf;
175 >    Vector3d chf = snap_->getConductiveHeatFlux();
176 >    chf += hf;
177 >    snap_->setConductiveHeatFlux(chf);
178    }
179    void ForceDecomposition::setHeatFlux(Vector3d hf) {
180 <    snap_->frameData.conductiveHeatFlux = hf;
180 >    snap_->setConductiveHeatFlux(hf);
181    }
182  
183   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines