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 1544 by gezelter, Fri Mar 18 19:31:52 2011 UTC vs.
Revision 1569 by gezelter, Thu May 26 13:55:04 2011 UTC

# Line 54 | Line 54
54   #include "math/Vector3.hpp"
55   #include "primitives/Molecule.hpp"
56   #include "primitives/StuntDouble.hpp"
57 #include "UseTheForce/DarkSide/neighborLists_interface.h"
58 #include "UseTheForce/doForces_interface.h"
57   #include "utils/MemoryUtils.hpp"
58   #include "utils/simError.h"
59   #include "selection/SelectionManager.hpp"
# Line 63 | Line 61
61   #include "UseTheForce/ForceField.hpp"
62   #include "nonbonded/SwitchingFunction.hpp"
63  
66 #ifdef IS_MPI
67 #include "UseTheForce/mpiComponentPlan.h"
68 #include "UseTheForce/DarkSide/simParallel_interface.h"
69 #endif
70
64   using namespace std;
65   namespace OpenMD {
66    
# Line 78 | Line 71 | namespace OpenMD {
71      nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
72      nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nInversions_(0),
73      nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
74 <    nConstraints_(0), sman_(NULL), fortranInitialized_(false),
74 >    nConstraints_(0), sman_(NULL), topologyDone_(false),
75      calcBoxDipole_(false), useAtomicVirial_(true) {    
76      
77      MoleculeStamp* molStamp;
# Line 777 | Line 770 | namespace OpenMD {
770      temp = usesElectrostatic;
771      MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
772   #endif
780    fInfo_.SIM_uses_PBC = usesPeriodicBoundaries_;    
781    fInfo_.SIM_uses_DirectionalAtoms = usesDirectionalAtoms_;
782    fInfo_.SIM_uses_MetallicAtoms = usesMetallicAtoms_;
783    fInfo_.SIM_requires_SkipCorrection = usesElectrostaticAtoms_;
784    fInfo_.SIM_requires_SelfCorrection = usesElectrostaticAtoms_;
785    fInfo_.SIM_uses_AtomicVirial = usesAtomicVirial_;
773    }
774  
775 <  void SimInfo::setupFortran() {
776 <    int isError;
777 <    int nExclude, nOneTwo, nOneThree, nOneFour;
778 <    vector<int> fortranGlobalGroupMembership;
775 >
776 >  vector<int> SimInfo::getGlobalAtomIndices() {
777 >    SimInfo::MoleculeIterator mi;
778 >    Molecule* mol;
779 >    Molecule::AtomIterator ai;
780 >    Atom* atom;
781 >
782 >    vector<int> GlobalAtomIndices(getNAtoms(), 0);
783      
784 <    isError = 0;
784 >    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
785 >      
786 >      for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
787 >        GlobalAtomIndices[atom->getLocalIndex()] = atom->getGlobalIndex();
788 >      }
789 >    }
790 >    return GlobalAtomIndices;
791 >  }
792  
793 <    //globalGroupMembership_ is filled by SimCreator    
794 <    for (int i = 0; i < nGlobalAtoms_; i++) {
795 <      fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
793 >
794 >  vector<int> SimInfo::getGlobalGroupIndices() {
795 >    SimInfo::MoleculeIterator mi;
796 >    Molecule* mol;
797 >    Molecule::CutoffGroupIterator ci;
798 >    CutoffGroup* cg;
799 >
800 >    vector<int> GlobalGroupIndices;
801 >    
802 >    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
803 >      
804 >      //local index of cutoff group is trivial, it only depends on the
805 >      //order of travesing
806 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
807 >           cg = mol->nextCutoffGroup(ci)) {
808 >        GlobalGroupIndices.push_back(cg->getGlobalIndex());
809 >      }        
810      }
811 +    return GlobalGroupIndices;
812 +  }
813  
814 +
815 +  void SimInfo::prepareTopology() {
816 +    int nExclude, nOneTwo, nOneThree, nOneFour;
817 +
818      //calculate mass ratio of cutoff group
801    vector<RealType> mfact;
819      SimInfo::MoleculeIterator mi;
820      Molecule* mol;
821      Molecule::CutoffGroupIterator ci;
# Line 807 | Line 824 | namespace OpenMD {
824      Atom* atom;
825      RealType totalMass;
826  
827 <    //to avoid memory reallocation, reserve enough space for mfact
828 <    mfact.reserve(getNCutoffGroups());
827 >    //to avoid memory reallocation, reserve enough space for massFactors_
828 >    massFactors_.clear();
829 >    massFactors_.reserve(getNCutoffGroups());
830      
831      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
832 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
832 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
833 >           cg = mol->nextCutoffGroup(ci)) {
834  
835          totalMass = cg->getMass();
836          for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
837            // Check for massless groups - set mfact to 1 if true
838            if (totalMass != 0)
839 <            mfact.push_back(atom->getMass()/totalMass);
839 >            massFactors_.push_back(atom->getMass()/totalMass);
840            else
841 <            mfact.push_back( 1.0 );
841 >            massFactors_.push_back( 1.0 );
842          }
843        }      
844      }
# Line 833 | Line 852 | namespace OpenMD {
852          identArray_.push_back(atom->getIdent());
853        }
854      }    
836
837    //fill molMembershipArray
838    //molMembershipArray is filled by SimCreator    
839    vector<int> molMembershipArray(nGlobalAtoms_);
840    for (int i = 0; i < nGlobalAtoms_; i++) {
841      molMembershipArray[i] = globalMolMembership_[i] + 1;
842    }
855      
856 <    //setup fortran simulation
856 >    //scan topology
857  
858      nExclude = excludedInteractions_.getSize();
859      nOneTwo = oneTwoInteractions_.getSize();
# Line 853 | Line 865 | namespace OpenMD {
865      int* oneThreeList = oneThreeInteractions_.getPairList();
866      int* oneFourList = oneFourInteractions_.getPairList();
867  
868 <    setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0],
869 <                   &nExclude, excludeList,
870 <                   &nOneTwo, oneTwoList,
871 <                   &nOneThree, oneThreeList,
872 <                   &nOneFour, oneFourList,
873 <                   &molMembershipArray[0], &mfact[0], &nCutoffGroups_,
874 <                   &fortranGlobalGroupMembership[0], &isError);
868 >    //setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray_[0],
869 >    //               &nExclude, excludeList,
870 >    //               &nOneTwo, oneTwoList,
871 >    //               &nOneThree, oneThreeList,
872 >    //               &nOneFour, oneFourList,
873 >    //               &molMembershipArray[0], &mfact[0], &nCutoffGroups_,
874 >    //               &fortranGlobalGroupMembership[0], &isError);
875      
876 <    if( isError ){
865 <      
866 <      sprintf( painCave.errMsg,
867 <               "There was an error setting the simulation information in fortran.\n" );
868 <      painCave.isFatal = 1;
869 <      painCave.severity = OPENMD_ERROR;
870 <      simError();
871 <    }
872 <    
873 <    
874 <    sprintf( checkPointMsg,
875 <             "succesfully sent the simulation information to fortran.\n");
876 <    
877 <    errorCheckPoint();
878 <    
879 <    // Setup number of neighbors in neighbor list if present
880 <    if (simParams_->haveNeighborListNeighbors()) {
881 <      int nlistNeighbors = simParams_->getNeighborListNeighbors();
882 <      setNeighbors(&nlistNeighbors);
883 <    }
884 <  
885 < #ifdef IS_MPI    
886 <    //SimInfo is responsible for creating localToGlobalAtomIndex and
887 <    //localToGlobalGroupIndex
888 <    vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
889 <    vector<int> localToGlobalCutoffGroupIndex;
890 <    mpiSimData parallelData;
891 <
892 <    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
893 <
894 <      //local index(index in DataStorge) of atom is important
895 <      for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
896 <        localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
897 <      }
898 <
899 <      //local index of cutoff group is trivial, it only depends on the order of travesing
900 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
901 <        localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
902 <      }        
903 <        
904 <    }
905 <
906 <    //fill up mpiSimData struct
907 <    parallelData.nMolGlobal = getNGlobalMolecules();
908 <    parallelData.nMolLocal = getNMolecules();
909 <    parallelData.nAtomsGlobal = getNGlobalAtoms();
910 <    parallelData.nAtomsLocal = getNAtoms();
911 <    parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
912 <    parallelData.nGroupsLocal = getNCutoffGroups();
913 <    parallelData.myNode = worldRank;
914 <    MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
915 <
916 <    //pass mpiSimData struct and index arrays to fortran
917 <    setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
918 <                    &localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
919 <                    &localToGlobalCutoffGroupIndex[0], &isError);
920 <
921 <    if (isError) {
922 <      sprintf(painCave.errMsg,
923 <              "mpiRefresh errror: fortran didn't like something we gave it.\n");
924 <      painCave.isFatal = 1;
925 <      simError();
926 <    }
927 <
928 <    sprintf(checkPointMsg, " mpiRefresh successful.\n");
929 <    errorCheckPoint();
930 < #endif
931 <
932 <    initFortranFF(&isError);
933 <    if (isError) {
934 <      sprintf(painCave.errMsg,
935 <              "initFortranFF errror: fortran didn't like something we gave it.\n");
936 <      painCave.isFatal = 1;
937 <      simError();
938 <    }
939 <    fortranInitialized_ = true;
876 >    topologyDone_ = true;
877    }
878  
879    void SimInfo::addProperty(GenericData* genData) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines