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

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1529 by gezelter, Mon Dec 27 18:35:59 2010 UTC vs.
Revision 1535 by gezelter, Fri Dec 31 18:31:56 2010 UTC

# Line 54 | Line 54
54   #include "math/Vector3.hpp"
55   #include "primitives/Molecule.hpp"
56   #include "primitives/StuntDouble.hpp"
57 – #include "UseTheForce/fCutoffPolicy.h"
58 – #include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
59 – #include "UseTheForce/doForces_interface.h"
57   #include "UseTheForce/DarkSide/neighborLists_interface.h"
61 – #include "UseTheForce/DarkSide/switcheroo_interface.h"
58   #include "utils/MemoryUtils.hpp"
59   #include "utils/simError.h"
60   #include "selection/SelectionManager.hpp"
61   #include "io/ForceFieldOptions.hpp"
62   #include "UseTheForce/ForceField.hpp"
63 < #include "nonbonded/InteractionManager.hpp"
68 <
63 > #include "nonbonded/SwitchingFunction.hpp"
64  
65   #ifdef IS_MPI
66   #include "UseTheForce/mpiComponentPlan.h"
# Line 655 | Line 650 | namespace OpenMD {
650      moleculeStamps_.push_back(molStamp);
651      molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
652    }
658 –
659 –  void SimInfo::update() {
653  
661 –    setupSimType();
662 –    setupCutoffRadius();
663 –    setupSwitchingRadius();
664 –    setupCutoffMethod();
665 –    setupSkinThickness();
666 –    setupSwitchingFunction();
667 –    setupAccumulateBoxDipole();
654  
655 < #ifdef IS_MPI
656 <    setupFortranParallel();
657 < #endif
658 <    setupFortranSim();
659 <    fortranInitialized_ = true;
660 <
655 >  /**
656 >   * update
657 >   *
658 >   *  Performs the global checks and variable settings after the
659 >   *  objects have been created.
660 >   *
661 >   */
662 >  void SimInfo::update() {  
663 >    setupSimVariables();
664      calcNdf();
665      calcNdfRaw();
666      calcNdfTrans();
667    }
668    
669 +  /**
670 +   * getSimulatedAtomTypes
671 +   *
672 +   * Returns an STL set of AtomType* that are actually present in this
673 +   * simulation.  Must query all processors to assemble this information.
674 +   *
675 +   */
676    set<AtomType*> SimInfo::getSimulatedAtomTypes() {
677      SimInfo::MoleculeIterator mi;
678      Molecule* mol;
# Line 689 | Line 685 | namespace OpenMD {
685          atomTypes.insert(atom->getAtomType());
686        }      
687      }    
692 –    return atomTypes;        
693 –  }
688  
689 <  /**
690 <   * setupCutoffRadius
691 <   *
692 <   *  If the cutoffRadius was explicitly set, use that value.
693 <   *  If the cutoffRadius was not explicitly set:
694 <   *      Are there electrostatic atoms?  Use 12.0 Angstroms.
695 <   *      No electrostatic atoms?  Poll the atom types present in the
696 <   *      simulation for suggested cutoff values (e.g. 2.5 * sigma).
697 <   *      Use the maximum suggested value that was found.
698 <   */
699 <  void SimInfo::setupCutoffRadius() {
700 <    
701 <    if (simParams_->haveCutoffRadius()) {
702 <      cutoffRadius_ = simParams_->getCutoffRadius();
703 <    } else {      
704 <      if (usesElectrostaticAtoms_) {
705 <        sprintf(painCave.errMsg,
712 <                "SimInfo Warning: No value was set for the cutoffRadius.\n"
713 <                "\tOpenMD will use a default value of 12.0 angstroms"
714 <                "\tfor the cutoffRadius.\n");
715 <        painCave.isFatal = 0;
716 <        simError();
717 <        cutoffRadius_ = 12.0;
718 <      } else {
719 <        RealType thisCut;
720 <        set<AtomType*>::iterator i;
721 <        set<AtomType*> atomTypes;
722 <        atomTypes = getSimulatedAtomTypes();        
723 <        for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
724 <          thisCut = InteractionManager::Instance()->getSuggestedCutoffRadius((*i));
725 <          cutoffRadius_ = max(thisCut, cutoffRadius_);
726 <        }
727 <        sprintf(painCave.errMsg,
728 <                "SimInfo Warning: No value was set for the cutoffRadius.\n"
729 <                "\tOpenMD will use %lf angstroms.\n",
730 <                cutoffRadius_);
731 <        painCave.isFatal = 0;
732 <        simError();
733 <      }            
734 <    }
689 > #ifdef IS_MPI
690 >
691 >    // loop over the found atom types on this processor, and add their
692 >    // numerical idents to a vector:
693 >
694 >    vector<int> foundTypes;
695 >    set<AtomType*>::iterator i;
696 >    for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
697 >      foundTypes.push_back( (*i)->getIdent() );
698 >
699 >    // count_local holds the number of found types on this processor
700 >    int count_local = foundTypes.size();
701 >
702 >    // count holds the total number of found types on all processors
703 >    // (some will be redundant with the ones found locally):
704 >    int count;
705 >    MPI::COMM_WORLD.Allreduce(&count_local, &count, 1, MPI::INT, MPI::SUM);
706  
707 <    InteractionManager::Instance()->setCutoffRadius(cutoffRadius_);
708 <  }
709 <  
710 <  /**
711 <   * setupSwitchingRadius
712 <   *
713 <   *  If the switchingRadius was explicitly set, use that value (but check it)
714 <   *  If the switchingRadius was not explicitly set: use 0.85 * cutoffRadius_
715 <   */
716 <  void SimInfo::setupSwitchingRadius() {
707 >    // create a vector to hold the globally found types, and resize it:
708 >    vector<int> ftGlobal;
709 >    ftGlobal.resize(count);
710 >    vector<int> counts;
711 >
712 >    int nproc = MPI::COMM_WORLD.Get_size();
713 >    counts.resize(nproc);
714 >    vector<int> disps;
715 >    disps.resize(nproc);
716 >
717 >    // now spray out the foundTypes to all the other processors:
718      
719 <    if (simParams_->haveSwitchingRadius()) {
720 <      switchingRadius_ = simParams_->getSwitchingRadius();
749 <      if (switchingRadius_ > cutoffRadius_) {        
750 <        sprintf(painCave.errMsg,
751 <                "SimInfo Error: switchingRadius (%f) is larger than cutoffRadius(%f)\n",
752 <                switchingRadius_, cutoffRadius_);
753 <        painCave.isFatal = 1;
754 <        simError();
719 >    MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
720 >                               &ftGlobal[0], &counts[0], &disps[0], MPI::INT);
721  
722 <      }
723 <    } else {      
724 <      switchingRadius_ = 0.85 * cutoffRadius_;
725 <      sprintf(painCave.errMsg,
726 <              "SimInfo Warning: No value was set for the switchingRadius.\n"
727 <              "\tOpenMD will use a default value of 85 percent of the cutoffRadius.\n"
728 <              "\tswitchingRadius = %f. for this simulation\n", switchingRadius_);
729 <      painCave.isFatal = 0;
730 <      simError();
731 <    }            
732 <    InteractionManager::Instance()->setSwitchingRadius(switchingRadius_);
722 >    // foundIdents is a stl set, so inserting an already found ident
723 >    // will have no effect.
724 >    set<int> foundIdents;
725 >    vector<int>::iterator j;
726 >    for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
727 >      foundIdents.insert((*j));
728 >    
729 >    // now iterate over the foundIdents and get the actual atom types
730 >    // that correspond to these:
731 >    set<int>::iterator it;
732 >    for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
733 >      atomTypes.insert( forceField_->getAtomType((*it)) );
734 >
735 > #endif
736 >    
737 >    return atomTypes;        
738    }
739  
740 <  /**
741 <   * setupSkinThickness
742 <   *
743 <   *  If the skinThickness was explicitly set, use that value (but check it)
744 <   *  If the skinThickness was not explicitly set: use 1.0 angstroms
745 <   */
746 <  void SimInfo::setupSkinThickness() {    
747 <    if (simParams_->haveSkinThickness()) {
777 <      skinThickness_ = simParams_->getSkinThickness();
778 <    } else {      
779 <      skinThickness_ = 1.0;
780 <      sprintf(painCave.errMsg,
781 <              "SimInfo Warning: No value was set for the skinThickness.\n"
782 <              "\tOpenMD will use a default value of %f Angstroms\n"
783 <              "\tfor this simulation\n", skinThickness_);
784 <      painCave.isFatal = 0;
785 <      simError();
786 <    }            
787 <  }
740 >  void SimInfo::setupSimVariables() {
741 >    useAtomicVirial_ = simParams_->getUseAtomicVirial();
742 >    // we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
743 >    calcBoxDipole_ = false;
744 >    if ( simParams_->haveAccumulateBoxDipole() )
745 >      if ( simParams_->getAccumulateBoxDipole() ) {
746 >        calcBoxDipole_ = true;      
747 >      }
748  
789 –  void SimInfo::setupSimType() {
749      set<AtomType*>::iterator i;
750      set<AtomType*> atomTypes;
751 <    atomTypes = getSimulatedAtomTypes();
793 <
794 <    useAtomicVirial_ = simParams_->getUseAtomicVirial();
795 <
751 >    atomTypes = getSimulatedAtomTypes();    
752      int usesElectrostatic = 0;
753      int usesMetallic = 0;
754      int usesDirectional = 0;
# Line 822 | Line 778 | namespace OpenMD {
778      fInfo_.SIM_uses_AtomicVirial = usesAtomicVirial_;
779    }
780  
781 <  void SimInfo::setupFortranSim() {
781 >  void SimInfo::setupFortran() {
782      int isError;
783      int nExclude, nOneTwo, nOneThree, nOneFour;
784      vector<int> fortranGlobalGroupMembership;
785      
830 –    notifyFortranSkinThickness(&skinThickness_);
831 –
832 –    int ljsp = cutoffMethod_ == SHIFTED_POTENTIAL ? 1 : 0;
833 –    int ljsf = cutoffMethod_ == SHIFTED_FORCE ? 1 : 0;
834 –    notifyFortranCutoffs(&cutoffRadius_, &switchingRadius_, &ljsp, &ljsf);
835 –
786      isError = 0;
787  
788      //globalGroupMembership_ is filled by SimCreator    
# Line 867 | Line 817 | namespace OpenMD {
817        }      
818      }
819  
820 <    //fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
820 >    //fill ident array of local atoms (it is actually ident of
821 >    //AtomType, it is so confusing !!!)
822      vector<int> identArray;
823  
824      //to avoid memory reallocation, reserve enough space identArray
# Line 927 | Line 878 | namespace OpenMD {
878        setNeighbors(&nlistNeighbors);
879      }
880    
930 –
931 –  }
932 –
933 –
934 –  void SimInfo::setupFortranParallel() {
881   #ifdef IS_MPI    
882 <    //SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
882 >    //SimInfo is responsible for creating localToGlobalAtomIndex and
883 >    //localToGlobalGroupIndex
884      vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
885      vector<int> localToGlobalCutoffGroupIndex;
939 –    SimInfo::MoleculeIterator mi;
940 –    Molecule::AtomIterator ai;
941 –    Molecule::CutoffGroupIterator ci;
942 –    Molecule* mol;
943 –    Atom* atom;
944 –    CutoffGroup* cg;
886      mpiSimData parallelData;
946 –    int isError;
887  
888      for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
889  
# Line 983 | Line 923 | namespace OpenMD {
923  
924      sprintf(checkPointMsg, " mpiRefresh successful.\n");
925      errorCheckPoint();
986 –
926   #endif
927 <  }
989 <
990 <
991 <  void SimInfo::setupSwitchingFunction() {    
992 <    int ft = CUBIC;
993 <    
994 <    if (simParams_->haveSwitchingFunctionType()) {
995 <      string funcType = simParams_->getSwitchingFunctionType();
996 <      toUpper(funcType);
997 <      if (funcType == "CUBIC") {
998 <        ft = CUBIC;
999 <      } else {
1000 <        if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1001 <          ft = FIFTH_ORDER_POLY;
1002 <        } else {
1003 <          // throw error        
1004 <          sprintf( painCave.errMsg,
1005 <                   "SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n"
1006 <                   "\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".",
1007 <                   funcType.c_str() );
1008 <          painCave.isFatal = 1;
1009 <          simError();
1010 <        }          
1011 <      }
1012 <    }
1013 <
1014 <    // send switching function notification to switcheroo
1015 <    setFunctionType(&ft);
1016 <
1017 <  }
1018 <
1019 <  void SimInfo::setupAccumulateBoxDipole() {    
1020 <
1021 <    // we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
1022 <    if ( simParams_->haveAccumulateBoxDipole() )
1023 <      if ( simParams_->getAccumulateBoxDipole() ) {
1024 <        calcBoxDipole_ = true;
1025 <      }
1026 <
927 >    fortranInitialized_ = true;
928    }
929  
930    void SimInfo::addProperty(GenericData* genData) {

Diff Legend

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