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 |
> |
|
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 { |
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, |
97 |
> |
void ForceDecomposition::fillSelfData(SelfData &sdat, int atom1) { |
98 |
> |
|
99 |
> |
sdat.atype = atypesLocal[atom1]; |
100 |
> |
|
101 |
> |
sdat.pot = &embeddingPot; |
102 |
> |
|
103 |
|
if (storageLayout_ & DataStorage::dslElectroFrame) { |
104 |
|
sdat.eFrame = &(snap_->atomData.electroFrame[atom1]); |
105 |
|
} |
120 |
|
sdat.dfrhodrho = &(snap_->atomData.functionalDerivative[atom1]); |
121 |
|
} |
122 |
|
|
123 |
< |
return sdat; |
123 |
> |
if (storageLayout_ & DataStorage::dslSkippedCharge) { |
124 |
> |
sdat.skippedCharge = &(snap_->atomData.skippedCharge[atom1]); |
125 |
> |
} |
126 |
> |
|
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() { |
141 |
|
|
142 |
|
int nGroups = snap_->cgData.position.size(); |
143 |
< |
|
143 |
> |
if (needVelocities_) |
144 |
> |
snap_->cgData.setStorageLayout(DataStorage::dslPosition | DataStorage::dslVelocity); |
145 |
> |
|
146 |
|
// if we have changed the group identities or haven't set up the |
147 |
|
// saved positions we automatically will need a neighbor list update: |
148 |
|
|
164 |
|
// a conservative test of list skin crossings |
165 |
|
dispmax = 2.0 * sqrt (3.0 * dispmax * dispmax); |
166 |
|
|
167 |
< |
return (dispmax > skinThickness_); |
167 |
> |
|
168 |
> |
if (dispmax > skinThickness_) |
169 |
> |
return (dispmax > skinThickness_); |
170 |
> |
|
171 |
> |
return false; |
172 |
|
} |
173 |
+ |
|
174 |
+ |
void ForceDecomposition::addToHeatFlux(Vector3d hf) { |
175 |
+ |
Vector3d chf = snap_->getConductiveHeatFlux(); |
176 |
+ |
chf += hf; |
177 |
+ |
snap_->setConductiveHeatFlux(chf); |
178 |
+ |
} |
179 |
+ |
void ForceDecomposition::setHeatFlux(Vector3d hf) { |
180 |
+ |
snap_->setConductiveHeatFlux(hf); |
181 |
+ |
} |
182 |
+ |
|
183 |
|
} |