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

Comparing trunk/OOPSE-2.0/src/brains/SimInfo.cpp (file contents):
Revision 2114 by tim, Thu Mar 10 23:56:42 2005 UTC vs.
Revision 2119 by tim, Fri Mar 11 15:55:17 2005 UTC

# Line 380 | Line 380 | void SimInfo::addExcludePairs(Molecule* mol) {
380          }
381      }        
382  
383    Molecule::CutoffGroupIterator cgIter;
384    CutoffGroup* cg;
385    for (cg = mol->beginCutoffGroup(cgIter); cg != NULL; cg = mol->nextCutoffGroup(cgIter)) {
386        std::vector<Atom*> atoms = cg->getAtoms();
387        for (int i = 0; i < atoms.size() -1 ; ++i) {
388            for (int j = i + 1; j < atoms.size(); ++j) {
389                a = atoms[i]->getGlobalIndex();
390                b = atoms[j]->getGlobalIndex();
391                exclude_.addPair(a, b);
392            }
393        }
394    }  
395
383   }
384  
385   void SimInfo::removeExcludePairs(Molecule* mol) {
# Line 449 | Line 436 | void SimInfo::removeExcludePairs(Molecule* mol) {
436              }
437          }
438      }        
452
453    Molecule::CutoffGroupIterator cgIter;
454    CutoffGroup* cg;
455    for (cg = mol->beginCutoffGroup(cgIter); cg != NULL; cg = mol->nextCutoffGroup(cgIter)) {
456        std::vector<Atom*> atoms = cg->getAtoms();
457        for (int i = 0; i < atoms.size() -1 ; ++i) {
458            for (int j = i + 1; j < atoms.size(); ++j) {
459                a = atoms[i]->getGlobalIndex();
460                b = atoms[j]->getGlobalIndex();
461                exclude_.removePair(a, b);
462            }
463        }
464    }  
439  
440   }
441  
# Line 697 | Line 671 | void SimInfo::setupFortranSim() {
671      }
672      
673      //setup fortran simulation
700    //gloalExcludes and molMembershipArray should go away (They are never used)
701    //why the hell fortran need to know molecule?
702    //OOPSE = Object-Obfuscated Parallel Simulation Engine
674      int nGlobalExcludes = 0;
675      int* globalExcludes = NULL;
676      int* excludeList = exclude_.getExcludeList();
# Line 887 | Line 858 | void SimInfo::setSnapshotManager(SnapshotManager* sman
858   }
859  
860   void SimInfo::setSnapshotManager(SnapshotManager* sman) {
861 <    //if (sman_ == sman_) {
862 <    //    return;
863 <    //}
864 <    
894 <    //delete sman_;
861 >    if (sman_ == sman) {
862 >        return;
863 >    }    
864 >    delete sman_;
865      sman_ = sman;
866  
867      Molecule* mol;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines