| 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) : info_(info) { |
| 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 { |
| 93 |
|
cellOffsets_.push_back( Vector3i(1, -1,1) ); |
| 94 |
|
} |
| 95 |
|
|
| 96 |
< |
SelfData ForceDecomposition::fillSelfData(int atom1) { |
| 97 |
< |
SelfData sdat; |
| 98 |
< |
// Still Missing atype, skippedCharge, potVec pot, |
| 96 |
> |
void ForceDecomposition::fillSelfData(SelfData &sdat, int atom1) { |
| 97 |
> |
|
| 98 |
> |
sdat.atype = atypesLocal[atom1]; |
| 99 |
> |
|
| 100 |
> |
sdat.pot = &embeddingPot; |
| 101 |
> |
|
| 102 |
|
if (storageLayout_ & DataStorage::dslElectroFrame) { |
| 103 |
|
sdat.eFrame = &(snap_->atomData.electroFrame[atom1]); |
| 104 |
|
} |
| 119 |
|
sdat.dfrhodrho = &(snap_->atomData.functionalDerivative[atom1]); |
| 120 |
|
} |
| 121 |
|
|
| 122 |
< |
return sdat; |
| 122 |
> |
if (storageLayout_ & DataStorage::dslSkippedCharge) { |
| 123 |
> |
sdat.skippedCharge = &(snap_->atomData.skippedCharge[atom1]); |
| 124 |
> |
} |
| 125 |
> |
|
| 126 |
> |
if (storageLayout_ & DataStorage::dslParticlePot) { |
| 127 |
> |
sdat.particlePot = &(snap_->atomData.particlePot[atom1]); |
| 128 |
> |
} |
| 129 |
|
} |
| 130 |
|
|
| 131 |
|
bool ForceDecomposition::checkNeighborList() { |
| 132 |
|
|
| 133 |
|
int nGroups = snap_->cgData.position.size(); |
| 134 |
< |
|
| 134 |
> |
if (needVelocities_) |
| 135 |
> |
snap_->cgData.setStorageLayout(DataStorage::dslPosition | DataStorage::dslVelocity); |
| 136 |
> |
|
| 137 |
|
// if we have changed the group identities or haven't set up the |
| 138 |
|
// saved positions we automatically will need a neighbor list update: |
| 139 |
|
|
| 155 |
|
// a conservative test of list skin crossings |
| 156 |
|
dispmax = 2.0 * sqrt (3.0 * dispmax * dispmax); |
| 157 |
|
|
| 158 |
< |
return (dispmax > skinThickness_); |
| 158 |
> |
|
| 159 |
> |
if (dispmax > skinThickness_) |
| 160 |
> |
return (dispmax > skinThickness_); |
| 161 |
> |
|
| 162 |
> |
return false; |
| 163 |
|
} |
| 164 |
+ |
|
| 165 |
+ |
void ForceDecomposition::addToHeatFlux(Vector3d hf) { |
| 166 |
+ |
snap_->frameData.conductiveHeatFlux += hf; |
| 167 |
+ |
} |
| 168 |
+ |
void ForceDecomposition::setHeatFlux(Vector3d hf) { |
| 169 |
+ |
snap_->frameData.conductiveHeatFlux = hf; |
| 170 |
+ |
} |
| 171 |
+ |
|
| 172 |
|
} |
