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

Comparing branches/development/src/brains/SimCreator.cpp (file contents):
Revision 1597 by gezelter, Tue Jul 26 15:49:24 2011 UTC vs.
Revision 1600 by gezelter, Wed Aug 3 20:20:37 2011 UTC

# Line 614 | Line 614 | namespace OpenMD {
614   #endif
615          
616          stampId = info->getMoleculeStampId(i);
617 <        Molecule * mol = molCreator.createMolecule(info->getForceField(), info->getMoleculeStamp(stampId),
618 <                                                   stampId, i, info->getLocalIndexManager());
617 >        Molecule * mol = molCreator.createMolecule(info->getForceField(),
618 >                                                   info->getMoleculeStamp(stampId),
619 >                                                   stampId, i,
620 >                                                   info->getLocalIndexManager());
621          
622          info->addMolecule(mol);
623          
# Line 642 | Line 644 | namespace OpenMD {
644      int beginRigidBodyIndex;
645      int beginCutoffGroupIndex;
646      int nGlobalAtoms = info->getNGlobalAtoms();
645
646    /**@todo fixme */
647 #ifndef IS_MPI
647      
648      beginAtomIndex = 0;
649      beginRigidBodyIndex = 0;
650      beginCutoffGroupIndex = 0;
651 <    
652 < #else
654 <    
655 <    int nproc;
656 <    int myNode;
657 <    
658 <    myNode = worldRank;
659 <    MPI_Comm_size(MPI_COMM_WORLD, &nproc);
660 <    
661 <    std::vector < int > tmpAtomsInProc(nproc, 0);
662 <    std::vector < int > tmpRigidBodiesInProc(nproc, 0);
663 <    std::vector < int > tmpCutoffGroupsInProc(nproc, 0);
664 <    std::vector < int > NumAtomsInProc(nproc, 0);
665 <    std::vector < int > NumRigidBodiesInProc(nproc, 0);
666 <    std::vector < int > NumCutoffGroupsInProc(nproc, 0);
667 <    
668 <    tmpAtomsInProc[myNode] = info->getNAtoms();
669 <    tmpRigidBodiesInProc[myNode] = info->getNRigidBodies();
670 <    tmpCutoffGroupsInProc[myNode] = info->getNCutoffGroups();
671 <    
672 <    //do MPI_ALLREDUCE to exchange the total number of atoms, rigidbodies and cutoff groups
673 <    MPI_Allreduce(&tmpAtomsInProc[0], &NumAtomsInProc[0], nproc, MPI_INT,
674 <                  MPI_SUM, MPI_COMM_WORLD);
675 <    MPI_Allreduce(&tmpRigidBodiesInProc[0], &NumRigidBodiesInProc[0], nproc,
676 <                  MPI_INT, MPI_SUM, MPI_COMM_WORLD);
677 <    MPI_Allreduce(&tmpCutoffGroupsInProc[0], &NumCutoffGroupsInProc[0], nproc,
678 <                  MPI_INT, MPI_SUM, MPI_COMM_WORLD);
679 <    
680 <    beginAtomIndex = 0;
681 <    beginRigidBodyIndex = 0;
682 <    beginCutoffGroupIndex = 0;
683 <    
684 <    for(int i = 0; i < myNode; i++) {
685 <      beginAtomIndex += NumAtomsInProc[i];
686 <      beginRigidBodyIndex += NumRigidBodiesInProc[i];
687 <      beginCutoffGroupIndex += NumCutoffGroupsInProc[i];
688 <    }
689 <    
690 < #endif
691 <    
692 <    //rigidbody's index begins right after atom's
693 <    beginRigidBodyIndex += info->getNGlobalAtoms();
694 <    
695 <    for(mol = info->beginMolecule(mi); mol != NULL;
696 <        mol = info->nextMolecule(mi)) {
697 <      
698 <      //local index(index in DataStorge) of atom is important
699 <      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
700 <        atom->setGlobalIndex(beginAtomIndex++);
701 <      }
651 >
652 >    for(int i = 0; i < info->getNGlobalMolecules(); i++) {
653        
654 <      for(rb = mol->beginRigidBody(ri); rb != NULL;
655 <          rb = mol->nextRigidBody(ri)) {
656 <        rb->setGlobalIndex(beginRigidBodyIndex++);
654 > #ifdef IS_MPI      
655 >      if (info->getMolToProc(i) == worldRank) {
656 > #endif        
657 >        // stuff to do if I own this molecule
658 >        mol = info->getMoleculeByGlobalIndex(i);
659 >
660 >        //local index(index in DataStorge) of atom is important
661 >        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
662 >          atom->setGlobalIndex(beginAtomIndex++);
663 >        }
664 >        
665 >        for(rb = mol->beginRigidBody(ri); rb != NULL;
666 >            rb = mol->nextRigidBody(ri)) {
667 >          rb->setGlobalIndex(beginRigidBodyIndex++);
668 >        }
669 >        
670 >        //local index of cutoff group is trivial, it only depends on
671 >        //the order of travesing
672 >        for(cg = mol->beginCutoffGroup(ci); cg != NULL;
673 >            cg = mol->nextCutoffGroup(ci)) {
674 >          cg->setGlobalIndex(beginCutoffGroupIndex++);
675 >        }        
676 >        
677 > #ifdef IS_MPI        
678 >      }  else {
679 >
680 >        // stuff to do if I don't own this molecule
681 >        
682 >        int stampId = info->getMoleculeStampId(i);
683 >        MoleculeStamp* stamp = info->getMoleculeStamp(stampId);
684 >
685 >        beginAtomIndex += stamp->getNAtoms();
686 >        beginRigidBodyIndex += stamp->getNRigidBodies();
687 >        beginCutoffGroupIndex += stamp->getNCutoffGroups() + stamp->getNFreeAtoms();
688        }
689 <      
690 <      //local index of cutoff group is trivial, it only depends on the order of travesing
691 <      for(cg = mol->beginCutoffGroup(ci); cg != NULL;
692 <          cg = mol->nextCutoffGroup(ci)) {
711 <        cg->setGlobalIndex(beginCutoffGroupIndex++);
712 <      }
713 <    }
714 <    
689 > #endif          
690 >
691 >    } //end for(int i=0)  
692 >
693      //fill globalGroupMembership
694 <    std::vector<int> globalGroupMembership(info->getNGlobalAtoms(), -1);
694 >    std::vector<int> globalGroupMembership(info->getNGlobalAtoms(), 0);
695      for(mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {        
696        for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
697          
# Line 732 | Line 710 | namespace OpenMD {
710      // docs said we could.
711      std::vector<int> tmpGroupMembership(info->getNGlobalAtoms(), 0);
712      MPI_Allreduce(&globalGroupMembership[0], &tmpGroupMembership[0], nGlobalAtoms,
713 <                  MPI_INT, MPI_MAX, MPI_COMM_WORLD);
713 >                  MPI_INT, MPI_SUM, MPI_COMM_WORLD);
714      info->setGlobalGroupMembership(tmpGroupMembership);
715  
716      cerr << "ggm:\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines