--- trunk/src/brains/SimInfo.cpp	2005/02/14 17:57:01	334
+++ trunk/src/brains/SimInfo.cpp	2005/03/11 15:55:17	435
@@ -73,7 +73,7 @@ SimInfo::SimInfo(std::vector<std::pair<MoleculeStamp*,
                                 nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
                                 nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
                                 nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
-                                sman_(NULL), fortranInitialized_(false), selectMan_(NULL) {
+                                sman_(NULL), fortranInitialized_(false) {
 
             
     std::vector<std::pair<MoleculeStamp*, int> >::iterator i;
@@ -139,19 +139,20 @@ SimInfo::SimInfo(std::vector<std::pair<MoleculeStamp*,
     molToProcMap_.resize(nGlobalMols_);
 #endif
 
-    selectMan_ = new SelectionManager(this);
-    selectMan_->selectAll();
 }
 
 SimInfo::~SimInfo() {
-    //MemoryUtils::deleteVectorOfPointer(molecules_);
-
-    MemoryUtils::deleteVectorOfPointer(moleculeStamps_);
+    std::map<int, Molecule*>::iterator i;
+    for (i = molecules_.begin(); i != molecules_.end(); ++i) {
+        delete i->second;
+    }
+    molecules_.clear();
     
+    MemoryUtils::deletePointers(moleculeStamps_);
+    
     delete sman_;
     delete simParams_;
     delete forceField_;
-    delete selectMan_;
 }
 
 int SimInfo::getNGlobalConstraints() {
@@ -366,7 +367,19 @@ void SimInfo::addExcludePairs(Molecule* mol) {
         exclude_.addPair(c, d);        
     }
 
-    
+    Molecule::RigidBodyIterator rbIter;
+    RigidBody* rb;
+    for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
+        std::vector<Atom*> atoms = rb->getAtoms();
+        for (int i = 0; i < atoms.size() -1 ; ++i) {
+            for (int j = i + 1; j < atoms.size(); ++j) {
+                a = atoms[i]->getGlobalIndex();
+                b = atoms[j]->getGlobalIndex();
+                exclude_.addPair(a, b);
+            }
+        }
+    }        
+
 }
 
 void SimInfo::removeExcludePairs(Molecule* mol) {
@@ -410,6 +423,19 @@ void SimInfo::removeExcludePairs(Molecule* mol) {
         exclude_.removePair(b, d);
         exclude_.removePair(c, d);        
     }
+
+    Molecule::RigidBodyIterator rbIter;
+    RigidBody* rb;
+    for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
+        std::vector<Atom*> atoms = rb->getAtoms();
+        for (int i = 0; i < atoms.size() -1 ; ++i) {
+            for (int j = i + 1; j < atoms.size(); ++j) {
+                a = atoms[i]->getGlobalIndex();
+                b = atoms[j]->getGlobalIndex();
+                exclude_.removePair(a, b);
+            }
+        }
+    }        
 
 }
 
@@ -645,9 +671,6 @@ void SimInfo::setupFortranSim() {
     }
     
     //setup fortran simulation
-    //gloalExcludes and molMembershipArray should go away (They are never used)
-    //why the hell fortran need to know molecule?
-    //OOPSE = Object-Obfuscated Parallel Simulation Engine
     int nGlobalExcludes = 0;
     int* globalExcludes = NULL; 
     int* excludeList = exclude_.getExcludeList();
@@ -835,11 +858,10 @@ void SimInfo::setSnapshotManager(SnapshotManager* sman
 }
 
 void SimInfo::setSnapshotManager(SnapshotManager* sman) {
-    //if (sman_ == sman_) {
-    //    return;
-    //}
-    
-    //delete sman_;
+    if (sman_ == sman) {
+        return;
+    }    
+    delete sman_;
     sman_ = sman;
 
     Molecule* mol;