| 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" | 
| 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 |  | sman_ = info_->getSnapshotManager(); | 
| 53 |  | storageLayout_ = sman_->getStorageLayout(); | 
| 54 |  | ff_ = info_->getForceField(); | 
| 55 |  | userChoseCutoff_ = false; | 
| 56 |  |  | 
| 57 |  | Globals* simParams_ = info_->getSimParams(); | 
| 58 | < |  | 
| 58 | > | if (simParams_->havePrintHeatFlux()) { | 
| 59 | > | if (simParams_->getPrintHeatFlux()) { | 
| 60 | > | needVelocities_ = true; | 
| 61 | > | } | 
| 62 | > | } | 
| 63 | > |  | 
| 64 |  | if (simParams_->haveSkinThickness()) { | 
| 65 |  | skinThickness_ = simParams_->getSkinThickness(); | 
| 66 |  | } else { | 
| 126 |  | if (storageLayout_ & DataStorage::dslParticlePot) { | 
| 127 |  | sdat.particlePot = &(snap_->atomData.particlePot[atom1]); | 
| 128 |  | } | 
| 129 | + |  | 
| 130 | + | if (storageLayout_ & DataStorage::dslFlucQPosition) { | 
| 131 | + | sdat.flucQ = &(snap_->atomData.flucQPos[atom1]); | 
| 132 | + | } | 
| 133 | + |  | 
| 134 | + | if (storageLayout_ & DataStorage::dslFlucQForce) { | 
| 135 | + | sdat.dVdFQ = &(snap_->atomData.flucQFrc[atom1]); | 
| 136 | + | } | 
| 137 |  | } | 
| 138 |  |  | 
| 139 |  | bool ForceDecomposition::checkNeighborList() { | 
| 140 |  |  | 
| 141 |  | int nGroups = snap_->cgData.position.size(); | 
| 142 | < |  | 
| 142 | > | if (needVelocities_) | 
| 143 | > | snap_->cgData.setStorageLayout(DataStorage::dslPosition | DataStorage::dslVelocity); | 
| 144 | > |  | 
| 145 |  | // if we have changed the group identities or haven't set up the | 
| 146 |  | // saved positions we automatically will need a neighbor list update: | 
| 147 |  |  | 
| 169 |  |  | 
| 170 |  | return false; | 
| 171 |  | } | 
| 172 | + |  | 
| 173 | + | void ForceDecomposition::addToHeatFlux(Vector3d hf) { | 
| 174 | + | snap_->frameData.conductiveHeatFlux += hf; | 
| 175 | + | } | 
| 176 | + | void ForceDecomposition::setHeatFlux(Vector3d hf) { | 
| 177 | + | snap_->frameData.conductiveHeatFlux = hf; | 
| 178 | + | } | 
| 179 | + |  | 
| 180 |  | } |