ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/applications/hydrodynamics/ShapeBuilder.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/applications/hydrodynamics/ShapeBuilder.cpp (file contents):
Revision 2732 by gezelter, Tue Apr 25 02:06:12 2006 UTC vs.
Revision 2787 by gezelter, Mon Jun 5 18:24:45 2006 UTC

# Line 39 | Line 39
39   * such damages.
40   */
41   #include "applications/hydrodynamics/ShapeBuilder.hpp"
42 < #include "applications/hydrodynamics/Spheric.hpp"
43 < #include "applications/hydrodynamics/Ellipsoid.hpp"
42 > #include "hydrodynamics/Sphere.hpp"
43 > #include "hydrodynamics/Ellipsoid.hpp"
44   #include "applications/hydrodynamics/CompositeShape.hpp"
45   namespace oopse {
46    
# Line 66 | Line 66 | namespace oopse {
66          
67          if (ljData != NULL) {
68            LJParam ljParam = ljData->getData();
69 <          currShape = new Spheric(atom->getPos(), ljParam.sigma/2.0);
69 >          currShape = new Sphere(atom->getPos(), ljParam.sigma/2.0);
70          } else {
71            sprintf( painCave.errMsg,
72                     "Can not cast GenericData to LJParam\n");
# Line 75 | Line 75 | namespace oopse {
75            simError();          
76          }      
77        }
78 <    } else if (atomType->isEAM()) {
79 <      GenericData* data = atomType->getPropertyByName("EAM");
80 <      if (data != NULL) {
81 <        EAMParamGenericData* eamData = dynamic_cast<EAMParamGenericData*>(data);
82 <        
83 <        if (eamData != NULL) {
84 <          EAMParam eamParam = eamData->getData();
85 <          currShape = new Spheric(atom->getPos(), eamParam.rcut);
86 <        } else {
87 <          sprintf( painCave.errMsg,
88 <                   "Can not cast GenericData to EAMParam\n");
89 <          painCave.severity = OOPSE_ERROR;
90 <          painCave.isFatal = 1;
91 <          simError();          
92 <        }      
78 >    } else {
79 >      int obanum = etab.GetAtomicNum((atom->getType()).c_str());
80 >      if (obanum != 0) {
81 >        currShape = new Sphere(atom->getPos(), etab.GetVdwRad(obanum));
82 >      } else {
83 >        sprintf( painCave.errMsg,
84 >                 "Could not find atom type in default element.txt\n");
85 >        painCave.severity = OOPSE_ERROR;
86 >        painCave.isFatal = 1;
87 >        simError();          
88        }
89 <    }    
89 >    }
90      return currShape;
91    }
92    
# Line 107 | Line 102 | namespace oopse {
102          
103          if (gayBerneData != NULL) {  
104            GayBerneParam gayBerneParam = gayBerneData->getData();
105 <          currShape = new Ellipsoid(datom->getPos(), gayBerneParam.GB_sigma/2.0, gayBerneParam.GB_l2b_ratio*gayBerneParam.GB_sigma/2.0, datom->getA());
105 >          currShape = new Ellipsoid(datom->getPos(), gayBerneParam.GB_d/2.0, gayBerneParam.GB_l/2.0, datom->getA());
106          } else {
107            sprintf( painCave.errMsg,
108                     "Can not cast GenericData to GayBerneParam\n");
# Line 128 | Line 123 | namespace oopse {
123          
124          if (ljData != NULL) {
125            LJParam ljParam = ljData->getData();
126 <          currShape = new Spheric(datom->getPos(), ljParam.sigma/2.0);
126 >          currShape = new Sphere(datom->getPos(), ljParam.sigma/2.0);
127          } else {
128            sprintf( painCave.errMsg,
129                     "Can not cast GenericData to LJParam\n");
# Line 136 | Line 131 | namespace oopse {
131            painCave.isFatal = 1;
132            simError();          
133          }      
134 <      } else if (atomType->isEAM()) {
135 <        GenericData* data = atomType->getPropertyByName("EAM");
136 <        if (data != NULL) {
137 <          EAMParamGenericData* eamData = dynamic_cast<EAMParamGenericData*>(data);          
138 <          if (eamData != NULL) {
139 <            EAMParam eamParam = eamData->getData();
140 <            currShape = new Spheric(datom->getPos(), eamParam.rcut);
141 <          } else {
142 <            sprintf( painCave.errMsg,
143 <                     "Can not cast GenericData to EAMParam\n");
149 <            painCave.severity = OOPSE_ERROR;
150 <            painCave.isFatal = 1;
151 <            simError();          
152 <          }      
134 >      } else {
135 >        int obanum = etab.GetAtomicNum((datom->getType()).c_str());
136 >        if (obanum != 0) {
137 >          currShape = new Sphere(datom->getPos(), etab.GetVdwRad(obanum));
138 >        } else {
139 >          sprintf( painCave.errMsg,
140 >                   "Could not find atom type in default element.txt\n");
141 >          painCave.severity = OOPSE_ERROR;
142 >          painCave.isFatal = 1;
143 >          simError();          
144          }
145 <      }
145 >      }      
146      }
147      return currShape;
148    }

Diff Legend

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