ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/hydrodynamics/BeadModel.cpp
(Generate patch)

Comparing trunk/src/applications/hydrodynamics/BeadModel.cpp (file contents):
Revision 898 by tim, Wed Mar 15 15:51:44 2006 UTC vs.
Revision 946 by gezelter, Tue Apr 25 13:35:42 2006 UTC

# Line 42 | Line 42 | namespace oopse {
42   #include "applications/hydrodynamics/BeadModel.hpp"
43  
44   namespace oopse {
45 < bool BeadModel::createBeads(std::vector<BeadParam>& beads) {
46 <
45 >  bool BeadModel::createBeads(std::vector<BeadParam>& beads) {
46 >    
47      if (sd_->isAtom()) {
48 <        createSingleBead(static_cast<Atom*>(sd_), beads);
48 >      if (!createSingleBead(static_cast<Atom*>(sd_), beads)) {
49 >        sprintf( painCave.errMsg,
50 >                 "BeadModel::createBeads Error: GayBerne and other non-spheric atoms should use RoughShell model\n");
51 >        painCave.severity = OOPSE_ERROR;
52 >        painCave.isFatal = 1;
53 >        simError();    
54 >        return false;
55 >      }
56      }
57      else if (sd_->isRigidBody()) {
58 <        RigidBody* rb = static_cast<RigidBody*>(sd_);
59 <        std::vector<Atom*>::iterator ai;
60 <        Atom* atom;
61 <        for (atom = rb->beginAtom(ai); atom != NULL; atom = rb->nextAtom(ai)) {
62 <            if (!createSingleBead(atom, beads))
63 <                return false;
58 >      RigidBody* rb = static_cast<RigidBody*>(sd_);
59 >      std::vector<Atom*>::iterator ai;
60 >      Atom* atom;
61 >      for (atom = rb->beginAtom(ai); atom != NULL; atom = rb->nextAtom(ai)) {
62 >        if (!createSingleBead(atom, beads)) {
63 >          sprintf( painCave.errMsg,
64 >                   "BeadModel::createBeads Error: GayBerne and other non-spheric atoms should use RoughShell model\n");
65 >          painCave.severity = OOPSE_ERROR;
66 >          painCave.isFatal = 1;
67 >          simError();    
68 >          return false;
69          }
70 <    }
71 <
70 >      }
71 >    }    
72      return true;
73 < }
74 <
75 < bool BeadModel::createSingleBead(Atom* atom, std::vector<BeadParam>& beads) {
73 >  }
74 >  
75 >  bool BeadModel::createSingleBead(Atom* atom, std::vector<BeadParam>& beads) {
76      AtomType* atomType = atom->getAtomType();
77 <
77 >    
78      if (atomType->isGayBerne()) {
79 <        return false;
79 >      return false;
80      } else if (atomType->isLennardJones()){
81 <        GenericData* data = atomType->getPropertyByName("LennardJones");
82 <        if (data != NULL) {
83 <            LJParamGenericData* ljData = dynamic_cast<LJParamGenericData*>(data);
84 <
85 <            if (ljData != NULL) {
86 <                LJParam ljParam = ljData->getData();
87 <                BeadParam currBead;
88 <                currBead.atomName = atom->getType();
89 <                currBead.pos = atom->getPos();
90 <                currBead.radius = ljParam.sigma/2.0;
91 <                beads.push_back(currBead);
81 >      GenericData* data = atomType->getPropertyByName("LennardJones");
82 >      if (data != NULL) {
83 >        LJParamGenericData* ljData = dynamic_cast<LJParamGenericData*>(data);
84 >        
85 >        if (ljData != NULL) {
86 >          LJParam ljParam = ljData->getData();
87 >          BeadParam currBead;
88 >          currBead.atomName = atom->getType();
89 >          currBead.pos = atom->getPos();
90 >          currBead.radius = ljParam.sigma/2.0;
91 >          beads.push_back(currBead);
92          } else {
93 <            sprintf( painCave.errMsg,
94 <            "Can not cast GenericData to LJParam\n");
95 <            painCave.severity = OOPSE_ERROR;
96 <            painCave.isFatal = 1;
97 <            simError();          
98 <            }      
99 <        }
93 >          sprintf( painCave.errMsg,
94 >                   "Can not cast GenericData to LJParam\n");
95 >          painCave.severity = OOPSE_ERROR;
96 >          painCave.isFatal = 1;
97 >          simError();          
98 >        }      
99 >      }
100 >    } else {
101 >      int obanum = etab.GetAtomicNum((atom->getType()).c_str());
102 >      if (obanum != 0) {
103 >        BeadParam currBead;      
104 >        currBead.atomName = atom->getType();
105 >        currBead.pos = atom->getPos();        
106 >        currBead.radius = etab.GetVdwRad(obanum);
107 >        std::cout << "using rvdw = " << currBead.radius << " for atomic number " << obanum << "\n";
108 >        beads.push_back(currBead);
109 >      } else {
110 >        sprintf( painCave.errMsg,
111 >                 "Could not find atom type in default element.txt\n");
112 >        painCave.severity = OOPSE_ERROR;
113 >        painCave.isFatal = 1;
114 >        simError();          
115 >      }
116      }
117 <
118 <    return true;
117 >    return true;    
118 >  }
119   }
92 –
93 – }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines