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

Comparing trunk/src/brains/ForceManager.cpp (file contents):
Revision 1895 by gezelter, Mon Jul 1 21:09:37 2013 UTC vs.
Revision 1993 by gezelter, Tue Apr 29 17:32:31 2014 UTC

# Line 99 | Line 99 | namespace OpenMD {
99     *      Use the maximum suggested value that was found.
100     *
101     * cutoffMethod : (one of HARD, SWITCHED, SHIFTED_FORCE, TAYLOR_SHIFTED,
102 <   *                        or SHIFTED_POTENTIAL)
102 >   *                        SHIFTED_POTENTIAL, or EWALD_FULL)
103     *      If cutoffMethod was explicitly set, use that choice.
104     *      If cutoffMethod was not explicitly set, use SHIFTED_FORCE
105     *
# Line 172 | Line 172 | namespace OpenMD {
172      stringToCutoffMethod["SHIFTED_POTENTIAL"] = SHIFTED_POTENTIAL;    
173      stringToCutoffMethod["SHIFTED_FORCE"] = SHIFTED_FORCE;
174      stringToCutoffMethod["TAYLOR_SHIFTED"] = TAYLOR_SHIFTED;
175 +    stringToCutoffMethod["EWALD_FULL"] = EWALD_FULL;
176    
177      if (simParams_->haveCutoffMethod()) {
178        string cutMeth = toUpperCopy(simParams_->getCutoffMethod());
# Line 182 | Line 183 | namespace OpenMD {
183                  "ForceManager::setupCutoffs: Could not find chosen cutoffMethod %s\n"
184                  "\tShould be one of: "
185                  "HARD, SWITCHED, SHIFTED_POTENTIAL, TAYLOR_SHIFTED,\n"
186 <                "\tor SHIFTED_FORCE\n",
186 >                "\tSHIFTED_FORCE, or EWALD_FULL\n",
187                  cutMeth.c_str());
188          painCave.isFatal = 1;
189          painCave.severity = OPENMD_ERROR;
# Line 228 | Line 229 | namespace OpenMD {
229              cutoffMethod_ = SHIFTED_FORCE;
230            } else if (myMethod == "TAYLOR_SHIFTED") {
231              cutoffMethod_ = TAYLOR_SHIFTED;
232 +          } else if (myMethod == "EWALD_FULL") {
233 +            cutoffMethod_ = EWALD_FULL;
234            }
235          
236            if (simParams_->haveSwitchingRadius())
237              rSwitch_ = simParams_->getSwitchingRadius();
238  
239            if (myMethod == "SHIFTED_POTENTIAL" || myMethod == "SHIFTED_FORCE" ||
240 <              myMethod == "TAYLOR_SHIFTED") {
240 >              myMethod == "TAYLOR_SHIFTED" || myMethod == "EWALD_FULL") {
241              if (simParams_->haveSwitchingRadius()){
242                sprintf(painCave.errMsg,
243                        "ForceManager::setupCutoffs : DEPRECATED ERROR MESSAGE\n"
# Line 414 | Line 417 | namespace OpenMD {
417        if (doHeatFlux_) doParticlePot_ = true;
418  
419        doElectricField_ = info_->getSimParams()->getOutputElectricField();
420 +      doSitePotential_ = info_->getSimParams()->getOutputSitePotential();
421    
422      }
423  
# Line 634 | Line 638 | namespace OpenMD {
638      // Collect from all nodes.  This should eventually be moved into a
639      // SystemDecomposition, but this is a better place than in
640      // Thermo to do the collection.
641 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bondPotential, 1, MPI::REALTYPE,
642 <                              MPI::SUM);
643 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bendPotential, 1, MPI::REALTYPE,
644 <                              MPI::SUM);
645 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &torsionPotential, 1,
646 <                              MPI::REALTYPE, MPI::SUM);
647 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &inversionPotential, 1,
648 <                              MPI::REALTYPE, MPI::SUM);
641 >
642 >    MPI_Allreduce(MPI_IN_PLACE, &bondPotential, 1, MPI_REALTYPE,
643 >                  MPI_SUM, MPI_COMM_WORLD);
644 >    MPI_Allreduce(MPI_IN_PLACE, &bendPotential, 1, MPI_REALTYPE,
645 >                  MPI_SUM, MPI_COMM_WORLD);
646 >    MPI_Allreduce(MPI_IN_PLACE, &torsionPotential, 1,
647 >                  MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
648 >    MPI_Allreduce(MPI_IN_PLACE, &inversionPotential, 1,
649 >                  MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
650   #endif
651  
652      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
# Line 663 | Line 668 | namespace OpenMD {
668      DataStorage* config = &(curSnapshot->atomData);
669      DataStorage* cgConfig = &(curSnapshot->cgData);
670  
671 +
672      //calculate the center of mass of cutoff group
673  
674      SimInfo::MoleculeIterator mi;
# Line 695 | Line 701 | namespace OpenMD {
701      RealType vij;
702      Vector3d fij, fg, f1;
703      tuple3<RealType, RealType, RealType> cuts;
704 <    RealType rCutSq;
704 >    RealType rCut, rCutSq, rListSq;
705      bool in_switching_region;
706      RealType sw, dswdr, swderiv;
707      vector<int> atomListColumn, atomListRow;
# Line 706 | Line 712 | namespace OpenMD {
712      RealType dVdFQ1(0.0);
713      RealType dVdFQ2(0.0);
714      potVec longRangePotential(0.0);
715 +    RealType reciprocalPotential(0.0);
716      potVec workPot(0.0);
717      potVec exPot(0.0);
718      Vector3d eField1(0.0);
719      Vector3d eField2(0.0);
720 +    RealType sPot1(0.0);
721 +    RealType sPot2(0.0);
722 +                  
723      vector<int>::iterator ia, jb;
724  
725      int loopStart, loopEnd;
726      
727 +    idat.rcut = &rCut;
728      idat.vdwMult = &vdwMult;
729      idat.electroMult = &electroMult;
730      idat.pot = &workPot;
# Line 724 | Line 735 | namespace OpenMD {
735      idat.dVdFQ1 = &dVdFQ1;
736      idat.dVdFQ2 = &dVdFQ2;
737      idat.eField1 = &eField1;
738 <    idat.eField2 = &eField2;  
738 >    idat.eField2 = &eField2;
739 >    idat.sPot1 = &sPot1;
740 >    idat.sPot2 = &sPot2;
741      idat.f1 = &f1;
742      idat.sw = &sw;
743      idat.shiftedPot = (cutoffMethod_ == SHIFTED_POTENTIAL) ? true : false;
744      idat.shiftedForce = (cutoffMethod_ == SHIFTED_FORCE || cutoffMethod_ == TAYLOR_SHIFTED) ? true : false;
745      idat.doParticlePot = doParticlePot_;
746      idat.doElectricField = doElectricField_;
747 +    idat.doSitePotential = doSitePotential_;
748      sdat.doParticlePot = doParticlePot_;
749      
750      loopEnd = PAIR_LOOP;
# Line 756 | Line 770 | namespace OpenMD {
770          cg1 = (*it).first;
771          cg2 = (*it).second;
772          
773 <        cuts = fDecomp_->getGroupCutoffs(cg1, cg2);
773 >        fDecomp_->getGroupCutoffs(cg1, cg2, rCut, rCutSq, rListSq);
774  
775          d_grp  = fDecomp_->getIntergroupVector(cg1, cg2);
776  
777          // already wrapped in the getIntergroupVector call:
778          // curSnapshot->wrapVector(d_grp);        
779          rgrpsq = d_grp.lengthSquare();
766 –        rCutSq = cuts.second;
780  
781          if (rgrpsq < rCutSq) {
769 –          idat.rcut = &cuts.first;
782            if (iLoop == PAIR_LOOP) {
783              vij = 0.0;
784              fij.zero();
785              eField1.zero();
786              eField2.zero();
787 +            sPot1 = 0.0;
788 +            sPot2 = 0.0;
789            }
790            
791            in_switching_region = switcher_->getSwitch(rgrpsq, sw, dswdr,
# Line 823 | Line 837 | namespace OpenMD {
837                
838                  r = sqrt( *(idat.r2) );
839                  idat.rij = &r;
840 <              
840 >
841                  if (iLoop == PREPAIR_LOOP) {
842                    interactionMan_->doPrePair(idat);
843                  } else {
# Line 922 | Line 936 | namespace OpenMD {
936      
937      // collects pairwise information
938      fDecomp_->collectData();
939 +    if (cutoffMethod_ == EWALD_FULL) {
940 +      interactionMan_->doReciprocalSpaceSum(reciprocalPotential);
941 +
942 +      curSnapshot->setReciprocalPotential(reciprocalPotential);
943 +    }
944          
945      if (info_->requiresSelfCorrection()) {
946        for (unsigned int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
# Line 943 | Line 962 | namespace OpenMD {
962  
963    }
964  
946 –  
965    void ForceManager::postCalculation() {
966  
967      vector<Perturbation*>::iterator pi;
# Line 969 | Line 987 | namespace OpenMD {
987      }
988      
989   #ifdef IS_MPI
990 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, stressTensor.getArrayPointer(), 9,
991 <                              MPI::REALTYPE, MPI::SUM);
990 >    MPI_Allreduce(MPI_IN_PLACE, stressTensor.getArrayPointer(), 9,
991 >                  MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
992   #endif
993      curSnapshot->setStressTensor(stressTensor);
994      

Diff Legend

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