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 1761 by gezelter, Fri Jun 22 20:01:37 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42   #include "parallel/ForceDecomposition.hpp"
43   #include "math/Vector3.hpp"
# Line 47 | Line 48 | namespace OpenMD {
48   using namespace std;
49   namespace OpenMD {
50  
51 <  ForceDecomposition::ForceDecomposition(SimInfo* info, InteractionManager* iMan) : info_(info), interactionMan_(iMan) {
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();
56      userChoseCutoff_ = false;
57  
58      Globals* simParams_ = info_->getSimParams();    
59 <  
59 >    if (simParams_->havePrintHeatFlux()) {
60 >      if (simParams_->getPrintHeatFlux()) {
61 >        needVelocities_ = true;
62 >      }
63 >    }
64 >
65      if (simParams_->haveSkinThickness()) {
66        skinThickness_ = simParams_->getSkinThickness();
67      } else {      
# Line 89 | Line 96 | namespace OpenMD {
96  
97    void ForceDecomposition::fillSelfData(SelfData &sdat, int atom1) {
98  
99 <    sdat.atype = ff_->getAtomType(idents[atom1]);
100 <        
101 <    // Still Missing skippedCharge
99 >    sdat.atype = atypesLocal[atom1];
100 >
101 >    sdat.pot = &embeddingPot;
102 >    sdat.excludedPot = &excludedSelfPot;
103 >
104      if (storageLayout_ & DataStorage::dslElectroFrame) {
105        sdat.eFrame = &(snap_->atomData.electroFrame[atom1]);
106      }
# Line 119 | Line 128 | namespace OpenMD {
128      if (storageLayout_ & DataStorage::dslParticlePot) {
129        sdat.particlePot = &(snap_->atomData.particlePot[atom1]);
130      }
131 +    
132 +    if (storageLayout_ & DataStorage::dslFlucQPosition) {
133 +      sdat.flucQ = &(snap_->atomData.flucQPos[atom1]);
134 +    }
135 +    
136 +    if (storageLayout_ & DataStorage::dslFlucQForce) {
137 +      sdat.dVdFQ = &(snap_->atomData.flucQFrc[atom1]);
138 +    }
139    }
140  
141    bool ForceDecomposition::checkNeighborList() {
142  
143      int nGroups = snap_->cgData.position.size();
144 <
144 >    if (needVelocities_)
145 >      snap_->cgData.setStorageLayout(DataStorage::dslPosition | DataStorage::dslVelocity);
146 >    
147      // if we have changed the group identities or haven't set up the
148      // saved positions we automatically will need a neighbor list update:
149  
150 <    if ( saved_CG_positions_.size() != nGroups ) {
132 <      cerr << "build because size\n";
133 <      return true;
134 <    }
150 >    if ( saved_CG_positions_.size() != nGroups ) return true;
151  
152      RealType dispmax = 0.0;
153      Vector3d disp;    
# Line 150 | Line 166 | namespace OpenMD {
166      dispmax = 2.0 * sqrt (3.0 * dispmax * dispmax);
167  
168  
169 <    if (dispmax > skinThickness_) {
154 <      cerr << "build because movement\n";
169 >    if (dispmax > skinThickness_)
170        return (dispmax > skinThickness_);  
171 <    } else {
157 <      cerr << "not rebuilding\n";
158 <    }
171 >
172      return false;
173    }
174 +
175 +  void ForceDecomposition::addToHeatFlux(Vector3d hf) {
176 +    Vector3d chf = snap_->getConductiveHeatFlux();
177 +    chf += hf;
178 +    snap_->setConductiveHeatFlux(chf);
179 +  }
180 +  void ForceDecomposition::setHeatFlux(Vector3d hf) {
181 +    snap_->setConductiveHeatFlux(hf);
182 +  }
183 +
184   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines