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 1163 by gezelter, Wed May 12 14:30:12 2004 UTC vs.
Revision 1167 by tim, Wed May 12 16:38:45 2004 UTC

# Line 453 | Line 453 | void SimInfo::refreshSim(){
453    
454    getFortranGroupArray(this, mfact, ngroup, groupList, groupStart);
455    //it may not be a good idea to pass the address of first element in vector
456 <  //since c++ standard does not require vector to be stored continously in meomory
457 <  //Most of the compilers will organize the memory of vector continously
456 >  //since c++ standard does not require vector to be stored continuously in meomory
457 >  //Most of the compilers will organize the memory of vector continuously
458    setFsimulation( &fInfo, &n_global, &n_atoms, identArray, &n_exclude, excl,
459                    &nGlobalExcludes, globalExcludes, molMembershipArray,
460                    &mfact[0], &ngroup, &groupList[0], &groupStart[0], &isError);
# Line 591 | Line 591 | void getFortranGroupArray(SimInfo* info, vector<double
591    myMols = info->molecules;
592    numMol = info->n_mol;
593    for(int i  = 0; i < numMol; i++){
594    numAtom = myMols[i].getNAtoms();
595    myAtoms = myMols[i].getMyAtoms();
596
597    
598    for(int j = 0; j < numAtom; j++){
599
600    
601 #ifdef IS_MPI      
602      atomIndex = myAtoms[j]->getGlobalIndex();
603 #else
604      atomIndex = myAtoms[j]->getIndex();
605 #endif
606
607      if(myMols[i].belongToCutoffGroup(atomIndex))
608        continue;
609      else{
610        // this is a fraction of the cutoff group's mass, not the mass itself!
611        mfact.push_back(1.0);
612        groupList.push_back(myAtoms[j]->getIndex() + 1);
613        groupStart.push_back(curIndex++);  
614      }
615    }
616      
594      numCutoffGroups = myMols[i].getNCutoffGroups();
595      for(myCutoffGroup =myMols[i].beginCutoffGroup(iterCutoff); myCutoffGroup != NULL;
596                                                    myCutoffGroup =myMols[i].nextCutoffGroup(iterCutoff)){

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines