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

Comparing trunk/OOPSE/libmdtools/SimSetup.cpp (file contents):
Revision 432 by chuckv, Thu Mar 27 23:33:40 2003 UTC vs.
Revision 443 by mmeineke, Wed Apr 2 22:19:03 2003 UTC

# Line 314 | Line 314 | void SimSetup::createSim( void ){
314      
315      if(mol2proc[i] == worldRank ){
316        the_molecules[molIndex].setStampID( molCompType[i] );
317 +      the_molecules[molIndex].setMyIndex( molIndex );
318        molIndex++;
319      }
320    }
# Line 324 | Line 325 | void SimSetup::createSim( void ){
325    for(i=0; i<n_components; i++){
326      for(j=0; j<components_nmol[i]; j++ ){
327        the_molecules[molIndex].setStampID( i );
328 +      the_molecules[molIndex].setMyIndex( molIndex );
329        molIndex++;
330      }
331    }
# Line 333 | Line 335 | void SimSetup::createSim( void ){
335  
336  
337    if( simnfo->n_SRI ){
336    
337    std::cerr << "n_SRI = " << simnfo->n_SRI << "\n";
338      
339      Exclude::createArray(simnfo->n_SRI);
340      the_excludes = new Exclude*[simnfo->n_SRI];
341      for( int ex=0; ex<simnfo->n_SRI; ex++) the_excludes[ex] = new Exclude(ex);
342      simnfo->globalExcludes = new int;
343 <    simnfo->n_exclude = tot_SRI;
343 >    simnfo->n_exclude = simnfo->n_SRI;
344    }
345    else{
346      
# Line 783 | Line 783 | void SimSetup::makeMolecules( void ){
783        theBonds[j].a = currentBond->getA() + atomOffset;
784        theBonds[j].b = currentBond->getB() + atomOffset;
785  
786 <      exI = theBonds[i].a;
787 <      exJ = theBonds[i].b;
786 >      exI = theBonds[j].a;
787 >      exJ = theBonds[j].b;
788  
789        // exclude_I must always be the smaller of the pair
790        if( exI > exJ ){
# Line 800 | Line 800 | void SimSetup::makeMolecules( void ){
800        
801        the_excludes[j+excludeOffset]->setPair( exI, exJ );
802   #else  // isn't MPI
803 +
804        the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
805   #endif  //is_mpi
806      }
# Line 837 | Line 838 | void SimSetup::makeMolecules( void ){
838                
839              default:
840                sprintf( painCave.errMsg,
841 <                       "SimSetup Error: ghostVectorSource was neiter a "
841 >                       "SimSetup Error: ghostVectorSource was neither a "
842                         "double nor an int.\n"
843                         "-->Bend[%d] in %s\n",
844                         j, comp_stamps[stampID]->getID() );
# Line 931 | Line 932 | void SimSetup::makeMolecules( void ){
932  
933  
934      the_molecules[i].initialize( info );
935 +
936 +
937      atomOffset += info.nAtoms;
938      delete[] theBonds;
939      delete[] theBends;
940      delete[] theTorsions;
941    }
942 +
943 + #ifdef IS_MPI
944 +  sprintf( checkPointMsg, "all molecules initialized succesfully" );
945 +  MPIcheckPoint();
946 + #endif // is_mpi
947  
948    // clean up the forcefield
949    the_ff->calcRcut();
950    the_ff->cleanMe();
951 +
952   }
953  
954   void SimSetup::initFromBass( void ){

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines