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 1715 by gezelter, Tue May 22 21:55:31 2012 UTC vs.
Revision 1764 by gezelter, Tue Jul 3 18:32:27 2012 UTC

# Line 110 | Line 110 | namespace OpenMD {
110      Globals* simParams_ = info_->getSimParams();
111      ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
112      int mdFileVersion;
113 +    rCut_ = 0.0; //Needs a value for a later max() call;  
114      
115      if (simParams_->haveMDfileVersion())
116        mdFileVersion = simParams_->getMDfileVersion();
# Line 390 | Line 391 | namespace OpenMD {
391        info_->prepareTopology();      
392  
393        doParticlePot_ = info_->getSimParams()->getOutputParticlePotential();
394 +      doHeatFlux_ = info_->getSimParams()->getPrintHeatFlux();
395 +      if (doHeatFlux_) doParticlePot_ = true;
396    
397      }
398  
# Line 446 | Line 449 | namespace OpenMD {
449      Molecule::CutoffGroupIterator ci;
450      CutoffGroup* cg;
451      
452 <    // forces are zeroed here, before any are accumulated.
452 >    // forces and potentials are zeroed here, before any are
453 >    // accumulated.
454      
455 +    Snapshot* snap = info_->getSnapshotManager()->getCurrentSnapshot();
456 +
457 +    snap->setBondPotential(0.0);
458 +    snap->setBendPotential(0.0);
459 +    snap->setTorsionPotential(0.0);
460 +    snap->setInversionPotential(0.0);
461 +
462 +    potVec zeroPot(0.0);
463 +    snap->setLongRangePotential(zeroPot);
464 +    snap->setExcludedPotentials(zeroPot);
465 +
466 +    snap->setRestraintPotential(0.0);
467 +    snap->setRawPotential(0.0);
468 +
469      for (mol = info_->beginMolecule(mi); mol != NULL;
470           mol = info_->nextMolecule(mi)) {
471        for(atom = mol->beginAtom(ai); atom != NULL;
# Line 471 | Line 489 | namespace OpenMD {
489      }
490      
491      // Zero out the stress tensor
492 <    tau *= 0.0;
493 <    
492 >    stressTensor *= 0.0;
493 >    // Zero out the heatFlux
494 >    fDecomp_->setHeatFlux( Vector3d(0.0) );    
495    }
496    
497    void ForceManager::shortRangeInteractions() {
# Line 582 | Line 601 | namespace OpenMD {
601          }      
602        }      
603      }
604 <    
605 <    RealType  shortRangePotential = bondPotential + bendPotential +
606 <      torsionPotential +  inversionPotential;    
604 >
605 > #ifdef IS_MPI
606 >    // Collect from all nodes.  This should eventually be moved into a
607 >    // SystemDecomposition, but this is a better place than in
608 >    // Thermo to do the collection.
609 >    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bondPotential, 1, MPI::REALTYPE,
610 >                              MPI::SUM);
611 >    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bendPotential, 1, MPI::REALTYPE,
612 >                              MPI::SUM);
613 >    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &torsionPotential, 1,
614 >                              MPI::REALTYPE, MPI::SUM);
615 >    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &inversionPotential, 1,
616 >                              MPI::REALTYPE, MPI::SUM);
617 > #endif
618 >
619      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
620 <    curSnapshot->statData[Stats::SHORT_RANGE_POTENTIAL] = shortRangePotential;
621 <    curSnapshot->statData[Stats::BOND_POTENTIAL] = bondPotential;
622 <    curSnapshot->statData[Stats::BEND_POTENTIAL] = bendPotential;
623 <    curSnapshot->statData[Stats::DIHEDRAL_POTENTIAL] = torsionPotential;
624 <    curSnapshot->statData[Stats::INVERSION_POTENTIAL] = inversionPotential;    
620 >
621 >    curSnapshot->setBondPotential(bondPotential);
622 >    curSnapshot->setBendPotential(bendPotential);
623 >    curSnapshot->setTorsionPotential(torsionPotential);
624 >    curSnapshot->setInversionPotential(inversionPotential);
625 >    
626 >    // RealType shortRangePotential = bondPotential + bendPotential +
627 >    //   torsionPotential +  inversionPotential;    
628 >
629 >    // curSnapshot->setShortRangePotential(shortRangePotential);
630    }
631    
632    void ForceManager::longRangeInteractions() {
633  
634 +
635      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
636      DataStorage* config = &(curSnapshot->atomData);
637      DataStorage* cgConfig = &(curSnapshot->cgData);
# Line 618 | Line 655 | namespace OpenMD {
655        // center of mass of the group is the same as position of the atom  
656        // if cutoff group does not exist
657        cgConfig->position = config->position;
658 +      cgConfig->velocity = config->velocity;
659      }
660  
661      fDecomp_->zeroWorkArrays();
662      fDecomp_->distributeData();
663      
664      int cg1, cg2, atom1, atom2, topoDist;
665 <    Vector3d d_grp, dag, d;
665 >    Vector3d d_grp, dag, d, gvel2, vel2;
666      RealType rgrpsq, rgrp, r2, r;
667      RealType electroMult, vdwMult;
668      RealType vij;
# Line 639 | Line 677 | namespace OpenMD {
677      RealType mf;
678      RealType lrPot;
679      RealType vpair;
680 +    RealType dVdFQ1(0.0);
681 +    RealType dVdFQ2(0.0);
682      potVec longRangePotential(0.0);
683      potVec workPot(0.0);
684 +    potVec exPot(0.0);
685      vector<int>::iterator ia, jb;
686  
687      int loopStart, loopEnd;
# Line 648 | Line 689 | namespace OpenMD {
689      idat.vdwMult = &vdwMult;
690      idat.electroMult = &electroMult;
691      idat.pot = &workPot;
692 +    idat.excludedPot = &exPot;
693      sdat.pot = fDecomp_->getEmbeddingPotential();
694 +    sdat.excludedPot = fDecomp_->getExcludedSelfPotential();
695      idat.vpair = &vpair;
696 +    idat.dVdFQ1 = &dVdFQ1;
697 +    idat.dVdFQ2 = &dVdFQ2;
698      idat.f1 = &f1;
699      idat.sw = &sw;
700      idat.shiftedPot = (cutoffMethod_ == SHIFTED_POTENTIAL) ? true : false;
# Line 663 | Line 708 | namespace OpenMD {
708      } else {
709        loopStart = PAIR_LOOP;
710      }
666 –  
711      for (int iLoop = loopStart; iLoop <= loopEnd; iLoop++) {
712      
713        if (iLoop == loopStart) {
# Line 695 | Line 739 | namespace OpenMD {
739            
740            in_switching_region = switcher_->getSwitch(rgrpsq, sw, dswdr,
741                                                       rgrp);
742 <          
742 >
743            atomListRow = fDecomp_->getAtomsInGroupRow(cg1);
744            atomListColumn = fDecomp_->getAtomsInGroupColumn(cg2);
745 +
746 +          if (doHeatFlux_)
747 +            gvel2 = fDecomp_->getGroupVelocityColumn(cg2);
748  
749            for (ia = atomListRow.begin();
750                 ia != atomListRow.end(); ++ia) {            
751              atom1 = (*ia);
752 <            
752 >
753              for (jb = atomListColumn.begin();
754                   jb != atomListColumn.end(); ++jb) {              
755                atom2 = (*jb);
756  
757 <              if (!fDecomp_->skipAtomPair(atom1, atom2)) {
757 >              if (!fDecomp_->skipAtomPair(atom1, atom2, cg1, cg2)) {
758 >
759                  vpair = 0.0;
760                  workPot = 0.0;
761 +                exPot = 0.0;
762                  f1 = V3Zero;
763 +                dVdFQ1 = 0.0;
764 +                dVdFQ2 = 0.0;
765  
766                  fDecomp_->fillInteractionData(idat, atom1, atom2);
767 <                
767 >
768                  topoDist = fDecomp_->getTopologicalDistance(atom1, atom2);
769                  vdwMult = vdwScale_[topoDist];
770                  electroMult = electrostaticScale_[topoDist];
# Line 721 | Line 772 | namespace OpenMD {
772                  if (atomListRow.size() == 1 && atomListColumn.size() == 1) {
773                    idat.d = &d_grp;
774                    idat.r2 = &rgrpsq;
775 +                  if (doHeatFlux_)
776 +                    vel2 = gvel2;
777                  } else {
778                    d = fDecomp_->getInteratomicVector(atom1, atom2);
779                    curSnapshot->wrapVector( d );
780                    r2 = d.lengthSquare();
781                    idat.d = &d;
782                    idat.r2 = &r2;
783 +                  if (doHeatFlux_)
784 +                    vel2 = fDecomp_->getAtomVelocityColumn(atom2);
785                  }
786                
787                  r = sqrt( *(idat.r2) );
# Line 739 | Line 794 | namespace OpenMD {
794                    fDecomp_->unpackInteractionData(idat, atom1, atom2);
795                    vij += vpair;
796                    fij += f1;
797 <                  tau -= outProduct( *(idat.d), f1);
797 >                  stressTensor -= outProduct( *(idat.d), f1);
798 >                  if (doHeatFlux_)
799 >                    fDecomp_->addToHeatFlux(*(idat.d) * dot(f1, vel2));
800                  }
801                }
802              }
# Line 752 | Line 809 | namespace OpenMD {
809                fij += fg;
810  
811                if (atomListRow.size() == 1 && atomListColumn.size() == 1) {
812 <                tau -= outProduct( *(idat.d), fg);
812 >                stressTensor -= outProduct( *(idat.d), fg);
813 >                if (doHeatFlux_)
814 >                  fDecomp_->addToHeatFlux(*(idat.d) * dot(fg, vel2));
815 >                
816                }
817            
818                for (ia = atomListRow.begin();
# Line 768 | Line 828 | namespace OpenMD {
828                      // find the distance between the atom
829                      // and the center of the cutoff group:
830                      dag = fDecomp_->getAtomToGroupVectorRow(atom1, cg1);
831 <                    tau -= outProduct(dag, fg);
831 >                    stressTensor -= outProduct(dag, fg);
832 >                    if (doHeatFlux_)
833 >                      fDecomp_->addToHeatFlux( dag * dot(fg, vel2));
834                    }
835                  }
836                }
# Line 786 | Line 848 | namespace OpenMD {
848                      // find the distance between the atom
849                      // and the center of the cutoff group:
850                      dag = fDecomp_->getAtomToGroupVectorColumn(atom2, cg2);
851 <                    tau -= outProduct(dag, fg);
851 >                    stressTensor -= outProduct(dag, fg);
852 >                    if (doHeatFlux_)
853 >                      fDecomp_->addToHeatFlux( dag * dot(fg, vel2));
854                    }
855                  }
856                }
857              }
858              //if (!info_->usesAtomicVirial()) {
859 <            //  tau -= outProduct(d_grp, fij);
859 >            //  stressTensor -= outProduct(d_grp, fij);
860 >            //  if (doHeatFlux_)
861 >            //     fDecomp_->addToHeatFlux( d_grp * dot(fij, vel2));
862              //}
863            }
864          }
# Line 814 | Line 880 | namespace OpenMD {
880        }
881      }
882      
883 +    // collects pairwise information
884      fDecomp_->collectData();
885          
886      if (info_->requiresSelfCorrection()) {
887 <
821 <      for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {          
887 >      for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
888          fDecomp_->fillSelfData(sdat, atom1);
889          interactionMan_->doSelfCorrection(sdat);
890        }
825 –
891      }
892  
893 +    // collects single-atom information
894 +    fDecomp_->collectSelfData();
895 +
896      longRangePotential = *(fDecomp_->getEmbeddingPotential()) +
897        *(fDecomp_->getPairwisePotential());
898  
899 <    lrPot = longRangePotential.sum();
899 >    curSnapshot->setLongRangePotential(longRangePotential);
900  
901 <    //store the tau and long range potential    
902 <    curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] = lrPot;
903 <    curSnapshot->statData[Stats::VANDERWAALS_POTENTIAL] = longRangePotential[VANDERWAALS_FAMILY];
904 <    curSnapshot->statData[Stats::ELECTROSTATIC_POTENTIAL] = longRangePotential[ELECTROSTATIC_FAMILY];
901 >    // lrPot = longRangePotential.sum();
902 >
903 >    // //store the long range potential  
904 >    // curSnapshot->setLongRangePotential(lrPot);
905 >    
906 >    curSnapshot->setExcludedPotentials(*(fDecomp_->getExcludedSelfPotential()) +
907 >                                         *(fDecomp_->getExcludedPotential()));
908 >
909    }
910  
911    
# Line 843 | Line 915 | namespace OpenMD {
915      Molecule::RigidBodyIterator rbIter;
916      RigidBody* rb;
917      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
918 <    
918 >  
919      // collect the atomic forces onto rigid bodies
920      
921      for (mol = info_->beginMolecule(mi); mol != NULL;
# Line 851 | Line 923 | namespace OpenMD {
923        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
924             rb = mol->nextRigidBody(rbIter)) {
925          Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
926 <        tau += rbTau;
926 >        stressTensor += rbTau;
927        }
928      }
929      
930   #ifdef IS_MPI
931 <    Mat3x3d tmpTau(tau);
932 <    MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
861 <                  9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
931 >    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, stressTensor.getArrayPointer(), 9,
932 >                              MPI::REALTYPE, MPI::SUM);
933   #endif
934 <    curSnapshot->setTau(tau);
934 >    curSnapshot->setStressTensor(stressTensor);
935 >    
936    }
937  
938   } //end namespace OpenMD

Diff Legend

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