| 58 |
|
#include "primitives/Torsion.hpp" |
| 59 |
|
#include "primitives/Inversion.hpp" |
| 60 |
|
#include "nonbonded/NonBondedInteraction.hpp" |
| 61 |
+ |
#include "perturbations/ElectricField.hpp" |
| 62 |
|
#include "parallel/ForceMatrixDecomposition.hpp" |
| 63 |
|
|
| 64 |
|
#include <cstdio> |
| 370 |
|
} |
| 371 |
|
switcher_->setSwitchType(sft_); |
| 372 |
|
switcher_->setSwitch(rSwitch_, rCut_); |
| 372 |
– |
interactionMan_->setSwitchingRadius(rSwitch_); |
| 373 |
|
} |
| 374 |
|
|
| 375 |
|
|
| 393 |
|
doParticlePot_ = info_->getSimParams()->getOutputParticlePotential(); |
| 394 |
|
doHeatFlux_ = info_->getSimParams()->getPrintHeatFlux(); |
| 395 |
|
if (doHeatFlux_) doParticlePot_ = true; |
| 396 |
+ |
|
| 397 |
+ |
doElectricField_ = info_->getSimParams()->getOutputElectricField(); |
| 398 |
|
|
| 399 |
|
} |
| 400 |
|
|
| 425 |
|
electrostaticScale_[2] = fopts.getelectrostatic13scale(); |
| 426 |
|
electrostaticScale_[3] = fopts.getelectrostatic14scale(); |
| 427 |
|
|
| 428 |
+ |
if (info_->getSimParams()->haveElectricField()) { |
| 429 |
+ |
ElectricField* eField = new ElectricField(info_); |
| 430 |
+ |
perturbations_.push_back(eField); |
| 431 |
+ |
} |
| 432 |
+ |
|
| 433 |
|
fDecomp_->distributeInitialData(); |
| 434 |
|
|
| 435 |
|
initialized_ = true; |
| 688 |
|
potVec longRangePotential(0.0); |
| 689 |
|
potVec workPot(0.0); |
| 690 |
|
potVec exPot(0.0); |
| 691 |
+ |
Vector3d eField1(0.0); |
| 692 |
+ |
Vector3d eField2(0.0); |
| 693 |
|
vector<int>::iterator ia, jb; |
| 694 |
|
|
| 695 |
|
int loopStart, loopEnd; |
| 703 |
|
idat.vpair = &vpair; |
| 704 |
|
idat.dVdFQ1 = &dVdFQ1; |
| 705 |
|
idat.dVdFQ2 = &dVdFQ2; |
| 706 |
+ |
idat.eField1 = &eField1; |
| 707 |
+ |
idat.eField2 = &eField2; |
| 708 |
|
idat.f1 = &f1; |
| 709 |
|
idat.sw = &sw; |
| 710 |
|
idat.shiftedPot = (cutoffMethod_ == SHIFTED_POTENTIAL) ? true : false; |
| 711 |
|
idat.shiftedForce = (cutoffMethod_ == SHIFTED_FORCE) ? true : false; |
| 712 |
|
idat.doParticlePot = doParticlePot_; |
| 713 |
+ |
idat.doElectricField = doElectricField_; |
| 714 |
|
sdat.doParticlePot = doParticlePot_; |
| 715 |
|
|
| 716 |
|
loopEnd = PAIR_LOOP; |
| 916 |
|
|
| 917 |
|
|
| 918 |
|
void ForceManager::postCalculation() { |
| 919 |
+ |
|
| 920 |
+ |
vector<Perturbation*>::iterator pi; |
| 921 |
+ |
for (pi = perturbations_.begin(); pi != perturbations_.end(); ++pi) { |
| 922 |
+ |
(*pi)->applyPerturbation(); |
| 923 |
+ |
} |
| 924 |
+ |
|
| 925 |
|
SimInfo::MoleculeIterator mi; |
| 926 |
|
Molecule* mol; |
| 927 |
|
Molecule::RigidBodyIterator rbIter; |
| 946 |
|
curSnapshot->setStressTensor(stressTensor); |
| 947 |
|
|
| 948 |
|
} |
| 931 |
– |
|
| 949 |
|
} //end namespace OpenMD |
