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 1880 by gezelter, Mon Jun 17 18:28:30 2013 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 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 634 | Line 637 | namespace OpenMD {
637      // Collect from all nodes.  This should eventually be moved into a
638      // SystemDecomposition, but this is a better place than in
639      // Thermo to do the collection.
640 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bondPotential, 1, MPI::REALTYPE,
641 <                              MPI::SUM);
642 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bendPotential, 1, MPI::REALTYPE,
643 <                              MPI::SUM);
644 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &torsionPotential, 1,
645 <                              MPI::REALTYPE, MPI::SUM);
646 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &inversionPotential, 1,
647 <                              MPI::REALTYPE, MPI::SUM);
640 >
641 >    MPI_Allreduce(MPI_IN_PLACE, &bondPotential, 1, MPI_REALTYPE,
642 >                  MPI_SUM, MPI_COMM_WORLD);
643 >    MPI_Allreduce(MPI_IN_PLACE, &bendPotential, 1, MPI_REALTYPE,
644 >                  MPI_SUM, MPI_COMM_WORLD);
645 >    MPI_Allreduce(MPI_IN_PLACE, &torsionPotential, 1,
646 >                  MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
647 >    MPI_Allreduce(MPI_IN_PLACE, &inversionPotential, 1,
648 >                  MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
649 >    // MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bondPotential, 1, MPI::REALTYPE,
650 >    //                           MPI::SUM);
651 >    // MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bendPotential, 1, MPI::REALTYPE,
652 >    //                           MPI::SUM);
653 >    // MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &torsionPotential, 1,
654 >    //                           MPI::REALTYPE, MPI::SUM);
655 >    // MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &inversionPotential, 1,
656 >    //                           MPI::REALTYPE, MPI::SUM);
657   #endif
658  
659      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
# Line 663 | Line 675 | namespace OpenMD {
675      DataStorage* config = &(curSnapshot->atomData);
676      DataStorage* cgConfig = &(curSnapshot->cgData);
677  
678 +
679      //calculate the center of mass of cutoff group
680  
681      SimInfo::MoleculeIterator mi;
# Line 695 | Line 708 | namespace OpenMD {
708      RealType vij;
709      Vector3d fij, fg, f1;
710      tuple3<RealType, RealType, RealType> cuts;
711 <    RealType rCutSq;
711 >    RealType rCut, rCutSq, rListSq;
712      bool in_switching_region;
713      RealType sw, dswdr, swderiv;
714      vector<int> atomListColumn, atomListRow;
# Line 706 | Line 719 | namespace OpenMD {
719      RealType dVdFQ1(0.0);
720      RealType dVdFQ2(0.0);
721      potVec longRangePotential(0.0);
722 +    RealType reciprocalPotential(0.0);
723      potVec workPot(0.0);
724      potVec exPot(0.0);
725      Vector3d eField1(0.0);
# Line 713 | Line 727 | namespace OpenMD {
727      vector<int>::iterator ia, jb;
728  
729      int loopStart, loopEnd;
730 <
730 >    
731 >    idat.rcut = &rCut;
732      idat.vdwMult = &vdwMult;
733      idat.electroMult = &electroMult;
734      idat.pot = &workPot;
# Line 746 | Line 761 | namespace OpenMD {
761          if (update_nlist) {
762            if (!usePeriodicBoundaryConditions_)
763              Mat3x3d bbox = thermo->getBoundingBox();
764 <          neighborList = fDecomp_->buildNeighborList();
764 >          fDecomp_->buildNeighborList(neighborList_);
765          }
766        }
767  
768 <      for (vector<pair<int, int> >::iterator it = neighborList.begin();
769 <             it != neighborList.end(); ++it) {
768 >      for (vector<pair<int, int> >::iterator it = neighborList_.begin();
769 >             it != neighborList_.end(); ++it) {
770                  
771          cg1 = (*it).first;
772          cg2 = (*it).second;
773          
774 <        cuts = fDecomp_->getGroupCutoffs(cg1, cg2);
774 >        fDecomp_->getGroupCutoffs(cg1, cg2, rCut, rCutSq, rListSq);
775  
776          d_grp  = fDecomp_->getIntergroupVector(cg1, cg2);
777  
778 <        curSnapshot->wrapVector(d_grp);        
778 >        // already wrapped in the getIntergroupVector call:
779 >        // curSnapshot->wrapVector(d_grp);        
780          rgrpsq = d_grp.lengthSquare();
765 –        rCutSq = cuts.second;
781  
782          if (rgrpsq < rCutSq) {
768 –          idat.rcut = &cuts.first;
783            if (iLoop == PAIR_LOOP) {
784              vij = 0.0;
785              fij.zero();
# Line 822 | Line 836 | namespace OpenMD {
836                
837                  r = sqrt( *(idat.r2) );
838                  idat.rij = &r;
839 <              
839 >
840                  if (iLoop == PREPAIR_LOOP) {
841                    interactionMan_->doPrePair(idat);
842                  } else {
# Line 921 | Line 935 | namespace OpenMD {
935      
936      // collects pairwise information
937      fDecomp_->collectData();
938 +    if (cutoffMethod_ == EWALD_FULL) {
939 +      interactionMan_->doReciprocalSpaceSum(reciprocalPotential);
940 +
941 +      curSnapshot->setReciprocalPotential(reciprocalPotential);
942 +    }
943          
944      if (info_->requiresSelfCorrection()) {
945        for (unsigned int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
# Line 942 | Line 961 | namespace OpenMD {
961  
962    }
963  
945 –  
964    void ForceManager::postCalculation() {
965  
966      vector<Perturbation*>::iterator pi;
# Line 968 | Line 986 | namespace OpenMD {
986      }
987      
988   #ifdef IS_MPI
989 <    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, stressTensor.getArrayPointer(), 9,
990 <                              MPI::REALTYPE, MPI::SUM);
989 >    MPI_Allreduce(MPI_IN_PLACE, stressTensor.getArrayPointer(), 9,
990 >      MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
991 >    // MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, stressTensor.getArrayPointer(), 9,
992 >    //                           MPI::REALTYPE, MPI::SUM);
993   #endif
994      curSnapshot->setStressTensor(stressTensor);
995      

Diff Legend

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