ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/SimInfo.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/SimInfo.cpp (file contents):
Revision 1157 by tim, Tue May 11 20:33:41 2004 UTC vs.
Revision 1158 by tim, Tue May 11 21:14:26 2004 UTC

# Line 579 | Line 579 | void getFortranGroupArray(SimInfo* info, vector<double
579    Atom* cutoffAtom;
580    vector<Atom*>::iterator iterAtom;
581    int atomIndex;
582 +  double totalMass;
583    
584    mfact.clear();
585    groupList.clear();
# Line 615 | Line 616 | void getFortranGroupArray(SimInfo* info, vector<double
616      numCutoffGroups = myMols[i].getNCutoffGroups();
617      for(myCutoffGroup =myMols[i].beginCutoffGroup(iterCutoff); myCutoffGroup != NULL;
618                                                    myCutoffGroup =myMols[i].nextCutoffGroup(iterCutoff)){
619 +
620 +      totalMass = myCutoffGroup->getMass();
621        
622        for(cutoffAtom = myCutoffGroup->beginAtom(iterAtom); cutoffAtom != NULL;
623 <                                           cutoffAtom = myCutoffGroup->beginAtom(iterAtom)){
623 >                                           cutoffAtom = myCutoffGroup->nextAtom(iterAtom)){
624 >        mfact.push_back(cutoffAtom->getMass()/totalMass);
625          groupList.push_back(cutoffAtom->getIndex() + 1);
626        }  
627                                
628        groupStart.push_back(curIndex);
629        curIndex += myCutoffGroup->getNumAtom();
626    }
627    
628  }
630  
631 +    }//end for(myCutoffGroup =myMols[i].beginCutoffGroup(iterCutoff))
632 +
633 +  }//end for(int i  = 0; i < numMol; i++)
634 +  
635    ngroup = groupStart.size();
636   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines