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

Comparing branches/development/src/brains/ForceManager.cpp (file contents):
Revision 1780 by jmarr, Mon Aug 20 18:28:22 2012 UTC vs.
Revision 1812 by gezelter, Fri Nov 16 21:18:42 2012 UTC

# Line 44 | Line 44
44   * @file ForceManager.cpp
45   * @author tlin
46   * @date 11/09/2004
47 – * @time 10:39am
47   * @version 1.0
48   */
49  
# Line 370 | Line 369 | namespace OpenMD {
369      }
370      switcher_->setSwitchType(sft_);
371      switcher_->setSwitch(rSwitch_, rCut_);
373 –    interactionMan_->setSwitchingRadius(rSwitch_);
372    }
373  
374  
# Line 394 | Line 392 | namespace OpenMD {
392        doParticlePot_ = info_->getSimParams()->getOutputParticlePotential();
393        doHeatFlux_ = info_->getSimParams()->getPrintHeatFlux();
394        if (doHeatFlux_) doParticlePot_ = true;
395 +
396 +      doElectricField_ = info_->getSimParams()->getOutputElectricField();
397    
398      }
399  
# Line 687 | Line 687 | namespace OpenMD {
687      potVec longRangePotential(0.0);
688      potVec workPot(0.0);
689      potVec exPot(0.0);
690 +    Vector3d eField1(0.0);
691 +    Vector3d eField2(0.0);
692      vector<int>::iterator ia, jb;
693  
694      int loopStart, loopEnd;
# Line 700 | Line 702 | namespace OpenMD {
702      idat.vpair = &vpair;
703      idat.dVdFQ1 = &dVdFQ1;
704      idat.dVdFQ2 = &dVdFQ2;
705 +    idat.eField1 = &eField1;
706 +    idat.eField2 = &eField2;  
707      idat.f1 = &f1;
708      idat.sw = &sw;
709      idat.shiftedPot = (cutoffMethod_ == SHIFTED_POTENTIAL) ? true : false;
710      idat.shiftedForce = (cutoffMethod_ == SHIFTED_FORCE) ? true : false;
711      idat.doParticlePot = doParticlePot_;
712 +    idat.doElectricField = doElectricField_;
713      sdat.doParticlePot = doParticlePot_;
714      
715      loopEnd = PAIR_LOOP;
# Line 814 | Line 819 | namespace OpenMD {
819                fij += fg;
820  
821                if (atomListRow.size() == 1 && atomListColumn.size() == 1) {
822 <                stressTensor -= outProduct( *(idat.d), fg);
823 <                if (doHeatFlux_)
824 <                  fDecomp_->addToHeatFlux(*(idat.d) * dot(fg, vel2));
825 <                
822 >                if (!fDecomp_->skipAtomPair(atomListRow[0],
823 >                                            atomListColumn[0],
824 >                                            cg1, cg2)) {
825 >                  stressTensor -= outProduct( *(idat.d), fg);
826 >                  if (doHeatFlux_)
827 >                    fDecomp_->addToHeatFlux(*(idat.d) * dot(fg, vel2));
828 >                }                
829                }
830            
831                for (ia = atomListRow.begin();
# Line 902 | Line 910 | namespace OpenMD {
910        *(fDecomp_->getPairwisePotential());
911  
912      curSnapshot->setLongRangePotential(longRangePotential);
913 +
914 +    // collects single-atom information
915 +    fDecomp_->collectSelfData();
916 +
917 +    longRangePotential = *(fDecomp_->getEmbeddingPotential()) +
918 +      *(fDecomp_->getPairwisePotential());
919 +
920 +    curSnapshot->setLongRangePotential(longRangePotential);
921      
922      curSnapshot->setExcludedPotentials(*(fDecomp_->getExcludedSelfPotential()) +
923                                           *(fDecomp_->getExcludedPotential()));

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines