--- trunk/src/applications/hydrodynamics/BeadModel.cpp	2006/03/15 15:51:44	898
+++ trunk/src/applications/hydrodynamics/BeadModel.cpp	2006/04/25 13:35:42	946
@@ -42,52 +42,78 @@ namespace oopse {
 #include "applications/hydrodynamics/BeadModel.hpp"
 
 namespace oopse {
-bool BeadModel::createBeads(std::vector<BeadParam>& beads) {
-
+  bool BeadModel::createBeads(std::vector<BeadParam>& beads) {
+    
     if (sd_->isAtom()) {
-        createSingleBead(static_cast<Atom*>(sd_), beads);
+      if (!createSingleBead(static_cast<Atom*>(sd_), beads)) {
+        sprintf( painCave.errMsg,
+                 "BeadModel::createBeads Error: GayBerne and other non-spheric atoms should use RoughShell model\n");
+        painCave.severity = OOPSE_ERROR;
+        painCave.isFatal = 1;
+        simError();    
+        return false;
+      }
     }
     else if (sd_->isRigidBody()) {
-        RigidBody* rb = static_cast<RigidBody*>(sd_);
-        std::vector<Atom*>::iterator ai; 
-        Atom* atom;
-        for (atom = rb->beginAtom(ai); atom != NULL; atom = rb->nextAtom(ai)) {
-            if (!createSingleBead(atom, beads))
-                return false;
+      RigidBody* rb = static_cast<RigidBody*>(sd_);
+      std::vector<Atom*>::iterator ai; 
+      Atom* atom;
+      for (atom = rb->beginAtom(ai); atom != NULL; atom = rb->nextAtom(ai)) {
+        if (!createSingleBead(atom, beads)) {
+          sprintf( painCave.errMsg,
+                   "BeadModel::createBeads Error: GayBerne and other non-spheric atoms should use RoughShell model\n");
+          painCave.severity = OOPSE_ERROR;
+          painCave.isFatal = 1;
+          simError();    
+          return false;
         }
-    }
-
+      }
+    }    
     return true;
-}
-
-bool BeadModel::createSingleBead(Atom* atom, std::vector<BeadParam>& beads) {
+  }
+  
+  bool BeadModel::createSingleBead(Atom* atom, std::vector<BeadParam>& beads) {
     AtomType* atomType = atom->getAtomType();
-
+    
     if (atomType->isGayBerne()) {
-        return false;
+      return false;
     } else if (atomType->isLennardJones()){
-        GenericData* data = atomType->getPropertyByName("LennardJones");
-        if (data != NULL) {
-            LJParamGenericData* ljData = dynamic_cast<LJParamGenericData*>(data);
-
-            if (ljData != NULL) {
-                LJParam ljParam = ljData->getData();
-                BeadParam currBead;
-                currBead.atomName = atom->getType();
-                currBead.pos = atom->getPos();
-                currBead.radius = ljParam.sigma/2.0;
-                beads.push_back(currBead);
+      GenericData* data = atomType->getPropertyByName("LennardJones");
+      if (data != NULL) {
+        LJParamGenericData* ljData = dynamic_cast<LJParamGenericData*>(data);
+        
+        if (ljData != NULL) {
+          LJParam ljParam = ljData->getData();
+          BeadParam currBead;
+          currBead.atomName = atom->getType();
+          currBead.pos = atom->getPos();
+          currBead.radius = ljParam.sigma/2.0;
+          beads.push_back(currBead);
         } else {
-            sprintf( painCave.errMsg,
-            "Can not cast GenericData to LJParam\n");
-            painCave.severity = OOPSE_ERROR;
-            painCave.isFatal = 1;
-            simError();          
-            }       
-        }
+          sprintf( painCave.errMsg,
+                   "Can not cast GenericData to LJParam\n");
+          painCave.severity = OOPSE_ERROR;
+          painCave.isFatal = 1;
+          simError();          
+        }       
+      }
+    } else {
+      int obanum = etab.GetAtomicNum((atom->getType()).c_str());
+      if (obanum != 0) {
+        BeadParam currBead;      
+        currBead.atomName = atom->getType();
+        currBead.pos = atom->getPos();        
+        currBead.radius = etab.GetVdwRad(obanum);
+        std::cout << "using rvdw = " << currBead.radius << " for atomic number " << obanum << "\n";
+        beads.push_back(currBead);
+      } else {
+        sprintf( painCave.errMsg,
+                 "Could not find atom type in default element.txt\n");
+        painCave.severity = OOPSE_ERROR;
+        painCave.isFatal = 1;
+        simError();          
+      }
     }
-
-    return true;
+    return true;    
+  }
 }
-
-}