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

Comparing branches/development/src/parallel/ForceDecomposition.cpp (file contents):
Revision 1572 by gezelter, Sun May 29 01:49:17 2011 UTC vs.
Revision 1787 by gezelter, Wed Aug 29 18:13:11 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) : info_(info) {
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 86 | Line 94 | namespace OpenMD {
94      cellOffsets_.push_back( Vector3i(1, -1,1) );
95    }
96  
97 <  SelfData ForceDecomposition::fillSelfData(int atom1) {
98 <    SelfData sdat;
99 <    // Still Missing atype, skippedCharge, potVec pot,
100 <    if (storageLayout_ & DataStorage::dslElectroFrame) {
101 <      sdat.eFrame = &(snap_->atomData.electroFrame[atom1]);
97 >  void ForceDecomposition::fillSelfData(SelfData &sdat, int atom1) {
98 >
99 >    sdat.atype = atypesLocal[atom1];
100 >
101 >    sdat.pot = &embeddingPot;
102 >    sdat.excludedPot = &excludedSelfPot;
103 >
104 >    if (storageLayout_ & DataStorage::dslDipole) {
105 >      sdat.dipole = &(snap_->atomData.dipole[atom1]);
106      }
107 <    
107 >
108 >    if (storageLayout_ & DataStorage::dslQuadrupole) {
109 >      sdat.quadrupole = &(snap_->atomData.quadrupole[atom1]);
110 >    }
111 >
112      if (storageLayout_ & DataStorage::dslTorque) {
113        sdat.t = &(snap_->atomData.torque[atom1]);
114      }
# Line 109 | Line 125 | namespace OpenMD {
125        sdat.dfrhodrho = &(snap_->atomData.functionalDerivative[atom1]);
126      }
127  
128 <    return sdat;    
128 >    if (storageLayout_ & DataStorage::dslSkippedCharge) {
129 >      sdat.skippedCharge = &(snap_->atomData.skippedCharge[atom1]);
130 >    }
131 >
132 >    if (storageLayout_ & DataStorage::dslParticlePot) {
133 >      sdat.particlePot = &(snap_->atomData.particlePot[atom1]);
134 >    }
135 >    
136 >    if (storageLayout_ & DataStorage::dslFlucQPosition) {
137 >      sdat.flucQ = &(snap_->atomData.flucQPos[atom1]);
138 >    }
139 >    
140 >    if (storageLayout_ & DataStorage::dslFlucQForce) {
141 >      sdat.dVdFQ = &(snap_->atomData.flucQFrc[atom1]);
142 >    }
143    }
144  
145    bool ForceDecomposition::checkNeighborList() {
146  
147      int nGroups = snap_->cgData.position.size();
148 <
148 >    if (needVelocities_)
149 >      snap_->cgData.setStorageLayout(DataStorage::dslPosition | DataStorage::dslVelocity);
150 >    
151      // if we have changed the group identities or haven't set up the
152      // saved positions we automatically will need a neighbor list update:
153  
# Line 137 | Line 169 | namespace OpenMD {
169      // a conservative test of list skin crossings
170      dispmax = 2.0 * sqrt (3.0 * dispmax * dispmax);
171  
172 <    return (dispmax > skinThickness_);    
172 >
173 >    if (dispmax > skinThickness_)
174 >      return (dispmax > skinThickness_);  
175 >
176 >    return false;
177    }
178 +
179 +  void ForceDecomposition::addToHeatFlux(Vector3d hf) {
180 +    Vector3d chf = snap_->getConductiveHeatFlux();
181 +    chf += hf;
182 +    snap_->setConductiveHeatFlux(chf);
183 +  }
184 +  void ForceDecomposition::setHeatFlux(Vector3d hf) {
185 +    snap_->setConductiveHeatFlux(hf);
186 +  }
187 +
188   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines