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 1756 by gezelter, Mon Jun 18 18:23:20 2012 UTC vs.
Revision 1847 by gezelter, Thu Jan 31 17:57:07 2013 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 58 | Line 57
57   #include "primitives/Torsion.hpp"
58   #include "primitives/Inversion.hpp"
59   #include "nonbonded/NonBondedInteraction.hpp"
60 + #include "perturbations/ElectricField.hpp"
61   #include "parallel/ForceMatrixDecomposition.hpp"
62  
63   #include <cstdio>
# Line 369 | Line 369 | namespace OpenMD {
369      }
370      switcher_->setSwitchType(sft_);
371      switcher_->setSwitch(rSwitch_, rCut_);
372    interactionMan_->setSwitchingRadius(rSwitch_);
372    }
373  
374  
# Line 393 | 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 423 | Line 424 | namespace OpenMD {
424      electrostaticScale_[2] = fopts.getelectrostatic13scale();
425      electrostaticScale_[3] = fopts.getelectrostatic14scale();    
426      
427 +    if (info_->getSimParams()->haveElectricField()) {
428 +      ElectricField* eField = new ElectricField(info_);
429 +      perturbations_.push_back(eField);
430 +    }
431 +
432      fDecomp_->distributeInitialData();
433  
434      initialized_ = true;
# Line 449 | Line 455 | namespace OpenMD {
455      Molecule::CutoffGroupIterator ci;
456      CutoffGroup* cg;
457      
458 <    // forces are zeroed here, before any are accumulated.
458 >    // forces and potentials are zeroed here, before any are
459 >    // accumulated.
460      
461 +    Snapshot* snap = info_->getSnapshotManager()->getCurrentSnapshot();
462 +
463 +    snap->setBondPotential(0.0);
464 +    snap->setBendPotential(0.0);
465 +    snap->setTorsionPotential(0.0);
466 +    snap->setInversionPotential(0.0);
467 +
468 +    potVec zeroPot(0.0);
469 +    snap->setLongRangePotential(zeroPot);
470 +    snap->setExcludedPotentials(zeroPot);
471 +
472 +    snap->setRestraintPotential(0.0);
473 +    snap->setRawPotential(0.0);
474 +
475      for (mol = info_->beginMolecule(mi); mol != NULL;
476           mol = info_->nextMolecule(mi)) {
477        for(atom = mol->beginAtom(ai); atom != NULL;
# Line 586 | Line 607 | namespace OpenMD {
607          }      
608        }      
609      }
610 <    
611 <    RealType  shortRangePotential = bondPotential + bendPotential +
612 <      torsionPotential +  inversionPotential;    
610 >
611 > #ifdef IS_MPI
612 >    // Collect from all nodes.  This should eventually be moved into a
613 >    // SystemDecomposition, but this is a better place than in
614 >    // Thermo to do the collection.
615 >    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bondPotential, 1, MPI::REALTYPE,
616 >                              MPI::SUM);
617 >    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bendPotential, 1, MPI::REALTYPE,
618 >                              MPI::SUM);
619 >    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &torsionPotential, 1,
620 >                              MPI::REALTYPE, MPI::SUM);
621 >    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &inversionPotential, 1,
622 >                              MPI::REALTYPE, MPI::SUM);
623 > #endif
624 >
625      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
626 <    curSnapshot->statData[Stats::SHORT_RANGE_POTENTIAL] = shortRangePotential;
627 <    curSnapshot->statData[Stats::BOND_POTENTIAL] = bondPotential;
628 <    curSnapshot->statData[Stats::BEND_POTENTIAL] = bendPotential;
629 <    curSnapshot->statData[Stats::DIHEDRAL_POTENTIAL] = torsionPotential;
630 <    curSnapshot->statData[Stats::INVERSION_POTENTIAL] = inversionPotential;    
626 >
627 >    curSnapshot->setBondPotential(bondPotential);
628 >    curSnapshot->setBendPotential(bendPotential);
629 >    curSnapshot->setTorsionPotential(torsionPotential);
630 >    curSnapshot->setInversionPotential(inversionPotential);
631 >    
632 >    // RealType shortRangePotential = bondPotential + bendPotential +
633 >    //   torsionPotential +  inversionPotential;    
634 >
635 >    // curSnapshot->setShortRangePotential(shortRangePotential);
636    }
637    
638    void ForceManager::longRangeInteractions() {
# Line 643 | Line 681 | namespace OpenMD {
681      InteractionData idat;
682      SelfData sdat;
683      RealType mf;
646    RealType lrPot;
684      RealType vpair;
685      RealType dVdFQ1(0.0);
686      RealType dVdFQ2(0.0);
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 656 | Line 696 | namespace OpenMD {
696      idat.vdwMult = &vdwMult;
697      idat.electroMult = &electroMult;
698      idat.pot = &workPot;
699 +    idat.excludedPot = &exPot;
700      sdat.pot = fDecomp_->getEmbeddingPotential();
701 +    sdat.excludedPot = fDecomp_->getExcludedSelfPotential();
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 700 | Line 745 | namespace OpenMD {
745            if (iLoop == PAIR_LOOP) {
746              vij = 0.0;
747              fij = V3Zero;
748 +            eField1 = V3Zero;
749 +            eField2 = V3Zero;
750            }
751            
752            in_switching_region = switcher_->getSwitch(rgrpsq, sw, dswdr,
# Line 723 | Line 770 | namespace OpenMD {
770  
771                  vpair = 0.0;
772                  workPot = 0.0;
773 +                exPot = 0.0;
774                  f1 = V3Zero;
775                  dVdFQ1 = 0.0;
776                  dVdFQ2 = 0.0;
# Line 773 | Line 821 | namespace OpenMD {
821                fij += fg;
822  
823                if (atomListRow.size() == 1 && atomListColumn.size() == 1) {
824 <                stressTensor -= outProduct( *(idat.d), fg);
825 <                if (doHeatFlux_)
826 <                  fDecomp_->addToHeatFlux(*(idat.d) * dot(fg, vel2));
827 <                
824 >                if (!fDecomp_->skipAtomPair(atomListRow[0],
825 >                                            atomListColumn[0],
826 >                                            cg1, cg2)) {
827 >                  stressTensor -= outProduct( *(idat.d), fg);
828 >                  if (doHeatFlux_)
829 >                    fDecomp_->addToHeatFlux(*(idat.d) * dot(fg, vel2));
830 >                }                
831                }
832            
833                for (ia = atomListRow.begin();
# Line 833 | Line 884 | namespace OpenMD {
884  
885            fDecomp_->collectIntermediateData();
886  
887 <          for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
887 >          for (unsigned int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
888              fDecomp_->fillSelfData(sdat, atom1);
889              interactionMan_->doPreForce(sdat);
890            }
# Line 848 | Line 899 | namespace OpenMD {
899      fDecomp_->collectData();
900          
901      if (info_->requiresSelfCorrection()) {
902 <      for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
902 >      for (unsigned int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
903          fDecomp_->fillSelfData(sdat, atom1);
904          interactionMan_->doSelfCorrection(sdat);
905        }
# Line 860 | Line 911 | namespace OpenMD {
911      longRangePotential = *(fDecomp_->getEmbeddingPotential()) +
912        *(fDecomp_->getPairwisePotential());
913  
914 <    lrPot = longRangePotential.sum();
914 >    curSnapshot->setLongRangePotential(longRangePotential);
915  
916 <    //store the stressTensor and long range potential    
917 <    curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] = lrPot;
918 <    curSnapshot->statData[Stats::VANDERWAALS_POTENTIAL] = longRangePotential[VANDERWAALS_FAMILY];
919 <    curSnapshot->statData[Stats::ELECTROSTATIC_POTENTIAL] = longRangePotential[ELECTROSTATIC_FAMILY];
916 >    // collects single-atom information
917 >    fDecomp_->collectSelfData();
918 >
919 >    longRangePotential = *(fDecomp_->getEmbeddingPotential()) +
920 >      *(fDecomp_->getPairwisePotential());
921 >
922 >    curSnapshot->setLongRangePotential(longRangePotential);
923 >    
924 >    curSnapshot->setExcludedPotentials(*(fDecomp_->getExcludedSelfPotential()) +
925 >                                         *(fDecomp_->getExcludedPotential()));
926 >
927    }
928  
929    
930    void ForceManager::postCalculation() {
931 +
932 +    vector<Perturbation*>::iterator pi;
933 +    for (pi = perturbations_.begin(); pi != perturbations_.end(); ++pi) {
934 +      (*pi)->applyPerturbation();
935 +    }
936 +
937      SimInfo::MoleculeIterator mi;
938      Molecule* mol;
939      Molecule::RigidBodyIterator rbIter;
940      RigidBody* rb;
941      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
942 <    
942 >  
943      // collect the atomic forces onto rigid bodies
944      
945      for (mol = info_->beginMolecule(mi); mol != NULL;
# Line 894 | Line 958 | namespace OpenMD {
958      curSnapshot->setStressTensor(stressTensor);
959      
960    }
897
961   } //end namespace OpenMD

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines