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 1761 by gezelter, Fri Jun 22 20:01:37 2012 UTC vs.
Revision 1866 by gezelter, Thu Apr 25 14:32:56 2013 UTC

# Line 35 | Line 35
35   *                                                                      
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).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
# 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 71 | Line 71 | namespace OpenMD {
71      forceField_ = info_->getForceField();
72      interactionMan_ = new InteractionManager();
73      fDecomp_ = new ForceMatrixDecomposition(info_, interactionMan_);
74 +    thermo = new Thermo(info_);
75    }
76  
77    /**
# Line 117 | Line 118 | namespace OpenMD {
118      else
119        mdFileVersion = 0;
120    
121 +    // We need the list of simulated atom types to figure out cutoffs
122 +    // as well as long range corrections.
123 +
124 +    set<AtomType*>::iterator i;
125 +    set<AtomType*> atomTypes_;
126 +    atomTypes_ = info_->getSimulatedAtomTypes();
127 +
128      if (simParams_->haveCutoffRadius()) {
129        rCut_ = simParams_->getCutoffRadius();
130      } else {      
# Line 131 | Line 139 | namespace OpenMD {
139          rCut_ = 12.0;
140        } else {
141          RealType thisCut;
142 <        set<AtomType*>::iterator i;
135 <        set<AtomType*> atomTypes;
136 <        atomTypes = info_->getSimulatedAtomTypes();        
137 <        for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
142 >        for (i = atomTypes_.begin(); i != atomTypes_.end(); ++i) {
143            thisCut = interactionMan_->getSuggestedCutoffRadius((*i));
144            rCut_ = max(thisCut, rCut_);
145          }
# Line 369 | Line 374 | namespace OpenMD {
374      }
375      switcher_->setSwitchType(sft_);
376      switcher_->setSwitch(rSwitch_, rCut_);
372 –    interactionMan_->setSwitchingRadius(rSwitch_);
377    }
378  
379  
# Line 393 | Line 397 | namespace OpenMD {
397        doParticlePot_ = info_->getSimParams()->getOutputParticlePotential();
398        doHeatFlux_ = info_->getSimParams()->getPrintHeatFlux();
399        if (doHeatFlux_) doParticlePot_ = true;
400 +
401 +      doElectricField_ = info_->getSimParams()->getOutputElectricField();
402    
403      }
404  
# Line 422 | Line 428 | namespace OpenMD {
428      electrostaticScale_[1] = fopts.getelectrostatic12scale();
429      electrostaticScale_[2] = fopts.getelectrostatic13scale();
430      electrostaticScale_[3] = fopts.getelectrostatic14scale();    
431 +    
432 +    if (info_->getSimParams()->haveElectricField()) {
433 +      ElectricField* eField = new ElectricField(info_);
434 +      perturbations_.push_back(eField);
435 +    }
436 +
437 +    usePeriodicBoundaryConditions_ = info_->getSimParams()->getUsePeriodicBoundaryConditions();
438      
439      fDecomp_->distributeInitialData();
440 <
440 >    
441      initialized_ = true;
442 <
442 >    
443    }
444 <
444 >  
445    void ForceManager::calcForces() {
446      
447      if (!initialized_) initialize();
448 <
448 >    
449      preCalculation();  
450      shortRangeInteractions();
451      longRangeInteractions();
# Line 449 | Line 462 | namespace OpenMD {
462      Molecule::CutoffGroupIterator ci;
463      CutoffGroup* cg;
464      
465 <    // forces are zeroed here, before any are accumulated.
465 >    // forces and potentials are zeroed here, before any are
466 >    // accumulated.
467      
468 +    Snapshot* snap = info_->getSnapshotManager()->getCurrentSnapshot();
469 +
470 +    snap->setBondPotential(0.0);
471 +    snap->setBendPotential(0.0);
472 +    snap->setTorsionPotential(0.0);
473 +    snap->setInversionPotential(0.0);
474 +
475 +    potVec zeroPot(0.0);
476 +    snap->setLongRangePotential(zeroPot);
477 +    snap->setExcludedPotentials(zeroPot);
478 +
479 +    snap->setRestraintPotential(0.0);
480 +    snap->setRawPotential(0.0);
481 +
482      for (mol = info_->beginMolecule(mi); mol != NULL;
483           mol = info_->nextMolecule(mi)) {
484        for(atom = mol->beginAtom(ai); atom != NULL;
# Line 608 | Line 636 | namespace OpenMD {
636      curSnapshot->setTorsionPotential(torsionPotential);
637      curSnapshot->setInversionPotential(inversionPotential);
638      
639 <    RealType shortRangePotential = bondPotential + bendPotential +
640 <      torsionPotential +  inversionPotential;    
639 >    // RealType shortRangePotential = bondPotential + bendPotential +
640 >    //   torsionPotential +  inversionPotential;    
641  
642 <    curSnapshot->setShortRangePotential(shortRangePotential);
642 >    // curSnapshot->setShortRangePotential(shortRangePotential);
643    }
644    
645    void ForceManager::longRangeInteractions() {
# Line 660 | Line 688 | namespace OpenMD {
688      InteractionData idat;
689      SelfData sdat;
690      RealType mf;
663 –    RealType lrPot;
691      RealType vpair;
692      RealType dVdFQ1(0.0);
693      RealType dVdFQ2(0.0);
694      potVec longRangePotential(0.0);
695      potVec workPot(0.0);
696      potVec exPot(0.0);
697 +    Vector3d eField1(0.0);
698 +    Vector3d eField2(0.0);
699      vector<int>::iterator ia, jb;
700  
701      int loopStart, loopEnd;
# Line 680 | Line 709 | namespace OpenMD {
709      idat.vpair = &vpair;
710      idat.dVdFQ1 = &dVdFQ1;
711      idat.dVdFQ2 = &dVdFQ2;
712 +    idat.eField1 = &eField1;
713 +    idat.eField2 = &eField2;  
714      idat.f1 = &f1;
715      idat.sw = &sw;
716      idat.shiftedPot = (cutoffMethod_ == SHIFTED_POTENTIAL) ? true : false;
717      idat.shiftedForce = (cutoffMethod_ == SHIFTED_FORCE) ? true : false;
718      idat.doParticlePot = doParticlePot_;
719 +    idat.doElectricField = doElectricField_;
720      sdat.doParticlePot = doParticlePot_;
721      
722      loopEnd = PAIR_LOOP;
# Line 697 | Line 729 | namespace OpenMD {
729      
730        if (iLoop == loopStart) {
731          bool update_nlist = fDecomp_->checkNeighborList();
732 <        if (update_nlist)
732 >        if (update_nlist) {
733 >          if (!usePeriodicBoundaryConditions_)
734 >            Mat3x3d bbox = thermo->getBoundingBox();
735            neighborList = fDecomp_->buildNeighborList();
736 <      }            
736 >        }
737 >      }
738  
739        for (vector<pair<int, int> >::iterator it = neighborList.begin();
740               it != neighborList.end(); ++it) {
# Line 720 | Line 755 | namespace OpenMD {
755            if (iLoop == PAIR_LOOP) {
756              vij = 0.0;
757              fij = V3Zero;
758 +            eField1 = V3Zero;
759 +            eField2 = V3Zero;
760            }
761            
762            in_switching_region = switcher_->getSwitch(rgrpsq, sw, dswdr,
# Line 794 | Line 831 | namespace OpenMD {
831                fij += fg;
832  
833                if (atomListRow.size() == 1 && atomListColumn.size() == 1) {
834 <                stressTensor -= outProduct( *(idat.d), fg);
835 <                if (doHeatFlux_)
836 <                  fDecomp_->addToHeatFlux(*(idat.d) * dot(fg, vel2));
837 <                
834 >                if (!fDecomp_->skipAtomPair(atomListRow[0],
835 >                                            atomListColumn[0],
836 >                                            cg1, cg2)) {
837 >                  stressTensor -= outProduct( *(idat.d), fg);
838 >                  if (doHeatFlux_)
839 >                    fDecomp_->addToHeatFlux(*(idat.d) * dot(fg, vel2));
840 >                }                
841                }
842            
843                for (ia = atomListRow.begin();
# Line 854 | Line 894 | namespace OpenMD {
894  
895            fDecomp_->collectIntermediateData();
896  
897 <          for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
897 >          for (unsigned int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
898              fDecomp_->fillSelfData(sdat, atom1);
899              interactionMan_->doPreForce(sdat);
900            }
# Line 869 | Line 909 | namespace OpenMD {
909      fDecomp_->collectData();
910          
911      if (info_->requiresSelfCorrection()) {
912 <      for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
912 >      for (unsigned int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
913          fDecomp_->fillSelfData(sdat, atom1);
914          interactionMan_->doSelfCorrection(sdat);
915        }
# Line 881 | Line 921 | namespace OpenMD {
921      longRangePotential = *(fDecomp_->getEmbeddingPotential()) +
922        *(fDecomp_->getPairwisePotential());
923  
924 <    curSnapshot->setLongRangePotentialFamilies(longRangePotential);
885 <
886 <    lrPot = longRangePotential.sum();
887 <
888 <    //store the long range potential  
889 <    curSnapshot->setLongRangePotential(lrPot);
924 >    curSnapshot->setLongRangePotential(longRangePotential);
925      
926      curSnapshot->setExcludedPotentials(*(fDecomp_->getExcludedSelfPotential()) +
927                                           *(fDecomp_->getExcludedPotential()));
# Line 895 | Line 930 | namespace OpenMD {
930  
931    
932    void ForceManager::postCalculation() {
933 +
934 +    vector<Perturbation*>::iterator pi;
935 +    for (pi = perturbations_.begin(); pi != perturbations_.end(); ++pi) {
936 +      (*pi)->applyPerturbation();
937 +    }
938 +
939      SimInfo::MoleculeIterator mi;
940      Molecule* mol;
941      Molecule::RigidBodyIterator rbIter;
942      RigidBody* rb;
943      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
944 <    
944 >  
945      // collect the atomic forces onto rigid bodies
946      
947      for (mol = info_->beginMolecule(mi); mol != NULL;
# Line 918 | Line 959 | namespace OpenMD {
959   #endif
960      curSnapshot->setStressTensor(stressTensor);
961      
962 <  }
962 >    if (info_->getSimParams()->getUseLongRangeCorrections()) {
963 >      /*
964 >      RealType vol = curSnapshot->getVolume();
965 >      RealType Elrc(0.0);
966 >      RealType Wlrc(0.0);
967  
968 < } //end namespace OpenMD
968 >      set<AtomType*>::iterator i;
969 >      set<AtomType*>::iterator j;
970 >    
971 >      RealType n_i, n_j;
972 >      RealType rho_i, rho_j;
973 >      pair<RealType, RealType> LRI;
974 >      
975 >      for (i = atomTypes_.begin(); i != atomTypes_.end(); ++i) {
976 >        n_i = RealType(info_->getGlobalCountOfType(*i));
977 >        rho_i = n_i /  vol;
978 >        for (j = atomTypes_.begin(); j != atomTypes_.end(); ++j) {
979 >          n_j = RealType(info_->getGlobalCountOfType(*j));
980 >          rho_j = n_j / vol;
981 >          
982 >          LRI = interactionMan_->getLongRangeIntegrals( (*i), (*j) );
983 >
984 >          Elrc += n_i   * rho_j * LRI.first;
985 >          Wlrc -= rho_i * rho_j * LRI.second;
986 >        }
987 >      }
988 >      Elrc *= 2.0 * NumericConstant::PI;
989 >      Wlrc *= 2.0 * NumericConstant::PI;
990 >
991 >      RealType lrp = curSnapshot->getLongRangePotential();
992 >      curSnapshot->setLongRangePotential(lrp + Elrc);
993 >      stressTensor += Wlrc * SquareMatrix3<RealType>::identity();
994 >      curSnapshot->setStressTensor(stressTensor);
995 >      */
996 >    
997 >    }
998 >  }
999 > }

Diff Legend

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