ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/visitors/AtomVisitor.cpp
(Generate patch)

Comparing trunk/src/visitors/AtomVisitor.cpp (file contents):
Revision 132 by tim, Thu Oct 21 16:22:01 2004 UTC vs.
Revision 881 by xsun, Thu Feb 2 15:49:42 2006 UTC

# Line 1 | Line 1
1 + /*
2 + * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 + *
4 + * The University of Notre Dame grants you ("Licensee") a
5 + * non-exclusive, royalty free, license to use, modify and
6 + * redistribute this software in source and binary code form, provided
7 + * that the following conditions are met:
8 + *
9 + * 1. Acknowledgement of the program authors must be made in any
10 + *    publication of scientific results based in part on use of the
11 + *    program.  An acceptable form of acknowledgement is citation of
12 + *    the article in which the program was described (Matthew
13 + *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 + *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 + *    Parallel Simulation Engine for Molecular Dynamics,"
16 + *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 + *
18 + * 2. Redistributions of source code must retain the above copyright
19 + *    notice, this list of conditions and the following disclaimer.
20 + *
21 + * 3. Redistributions in binary form must reproduce the above copyright
22 + *    notice, this list of conditions and the following disclaimer in the
23 + *    documentation and/or other materials provided with the
24 + *    distribution.
25 + *
26 + * This software is provided "AS IS," without a warranty of any
27 + * kind. All express or implied conditions, representations and
28 + * warranties, including any implied warranty of merchantability,
29 + * fitness for a particular purpose or non-infringement, are hereby
30 + * excluded.  The University of Notre Dame and its licensors shall not
31 + * be liable for any damages suffered by licensee as a result of
32 + * using, modifying or distributing the software or its
33 + * derivatives. In no event will the University of Notre Dame or its
34 + * licensors be liable for any lost revenue, profit or data, or for
35 + * direct, indirect, special, consequential, incidental or punitive
36 + * damages, however caused and regardless of the theory of liability,
37 + * arising out of the use of or inability to use software, even if the
38 + * University of Notre Dame has been advised of the possibility of
39 + * such damages.
40 + */
41 +
42   #include <cstring>
43   #include "visitors/AtomVisitor.hpp"
44   #include "primitives/DirectionalAtom.hpp"
4 – #include "math/MatVec3.h"
45   #include "primitives/RigidBody.hpp"
46  
47   namespace oopse {
48 +  void BaseAtomVisitor::visit(RigidBody *rb) {
49 +    //vector<Atom*> myAtoms;
50 +    //vector<Atom*>::iterator atomIter;
51  
52 < void BaseAtomVisitor::visit(RigidBody* rb){
10 <  //vector<Atom*> myAtoms;
11 <  //vector<Atom*>::iterator atomIter;
52 >    //myAtoms = rb->getAtoms();
53  
54 <  //myAtoms = rb->getAtoms();
55 <  
56 <  //for(atomIter = myAtoms.begin(); atomIter != myAtoms.end(); ++atomIter)
16 <  //  (*atomIter)->accept(this);
17 < }
54 >    //for(atomIter = myAtoms.begin(); atomIter != myAtoms.end(); ++atomIter)
55 >    //  (*atomIter)->accept(this);
56 >  }
57  
58 < void BaseAtomVisitor::setVisited(Atom* atom){
59 <  GenericData* data;
60 <  data = atom->getProperty("VISITED");
58 >  void BaseAtomVisitor::setVisited(Atom *atom) {
59 >    GenericData *data;
60 >    data = atom->getPropertyByName("VISITED");
61  
62 <  //if visited property is not existed, add it as new property
63 <  if(data == NULL){
64 <    data = new GenericData();
65 <    data->setID("VISITED");
66 <    atom->addProperty(data);  
62 >    //if visited property is not existed, add it as new property
63 >    if (data == NULL) {
64 >      data = new GenericData();
65 >      data->setID("VISITED");
66 >      atom->addProperty(data);
67 >    }
68    }
29 – }
69  
70 < bool BaseAtomVisitor::isVisited(Atom* atom){
71 <  GenericData* data;
72 <  data = atom->getProperty("VISITED");
73 <  return data == NULL ?  false : true;
74 < }
70 >  bool BaseAtomVisitor::isVisited(Atom *atom) {
71 >    GenericData *data;
72 >    data = atom->getPropertyByName("VISITED");
73 >    return data == NULL ? false : true;
74 >  }
75  
76 < bool SSDAtomVisitor::isSSDAtom(const string& atomType){
77 <  vector<string>::iterator strIter;
78 <  
79 <  for(strIter = ssdAtomType.begin(); strIter != ssdAtomType.end(); ++strIter)
80 <   if(*strIter == atomType)
42 <    return true;
43 <  
44 <  return false;  
45 < }
76 >  bool SSDAtomVisitor::isSSDAtom(const std::string&atomType) {
77 >    std::set<std::string>::iterator strIter;
78 >    strIter = ssdAtomType.find(atomType);
79 >    return strIter != ssdAtomType.end() ? true : false;
80 >  }
81  
82 < void SSDAtomVisitor::visit(DirectionalAtom* datom){
82 >  void SSDAtomVisitor::visit(DirectionalAtom *datom) {
83 >    std::vector<AtomInfo*>atoms;
84  
85 <  vector<AtomInfo*> atoms;
85 >    //we need to convert SSD into 4 differnet atoms
86 >    //one oxygen atom, two hydrogen atoms and one pseudo atom which is the center of the mass
87 >    //of the water with a dipole moment
88 >    Vector3d h1(0.0, -0.75695, 0.5206);
89 >    Vector3d h2(0.0, 0.75695, 0.5206);
90 >    Vector3d ox(0.0, 0.0, -0.0654);
91 >    Vector3d u(0, 0, 1);
92 >    RotMat3x3d   rotMatrix;
93 >    RotMat3x3d   rotTrans;
94 >    AtomInfo *   atomInfo;
95 >    Vector3d     pos;
96 >    Vector3d     newVec;
97 >    Quat4d       q;
98 >    AtomData *   atomData;
99 >    GenericData *data;
100 >    bool         haveAtomData;
101  
102 <  //we need to convert SSD into 4 differnet atoms
103 <  //one oxygen atom, two hydrogen atoms and one pseudo atom which is the center of the mass
104 <  //of the water with a dipole moment
54 <  double h1[3] = {0.0, -0.75695, 0.5206};
55 <  double h2[3] = {0.0, 0.75695, 0.5206};
56 <  double ox[3] = {0.0, 0.0, -0.0654};
57 <  double u[3] = {0, 0, 1};
58 <  double rotMatrix[3][3];
59 <  double rotTrans[3][3];
60 <  AtomInfo* atomInfo;
61 <  double pos[3];
62 <  double newVec[3];
63 <  double q[4];
64 <  AtomData* atomData;
65 <  GenericData* data;
66 <  bool haveAtomData;
67 <  
68 <  //if atom is not SSD atom, just skip it
69 <  if(!isSSDAtom(datom->getType()))
70 <    return;
102 >    //if atom is not SSD atom, just skip it
103 >    if (!isSSDAtom(datom->getType()))
104 >      return;
105  
106 <  data = datom->getProperty("ATOMDATA");
73 <  if(data != NULL){
106 >    data = datom->getPropertyByName("ATOMDATA");
107  
108 <    atomData = dynamic_cast<AtomData*>(data);  
109 <    if(atomData == NULL){
110 <      cerr << "can not get Atom Data from " << datom->getType() << endl;
111 <      atomData = new AtomData;
112 <      haveAtomData = false;      
108 >    if (data != NULL) {
109 >      atomData = dynamic_cast<AtomData *>(data);
110 >
111 >      if (atomData == NULL) {
112 >        std::cerr << "can not get Atom Data from " << datom->getType() << std::endl;
113 >        atomData = new AtomData;
114 >        haveAtomData = false;
115 >      } else
116 >        haveAtomData = true;
117 >    } else {
118 >      atomData = new AtomData;
119 >      haveAtomData = false;
120      }
81 –    else
82 –      haveAtomData = true;
83 –  }
84 –  else{
85 –    atomData = new AtomData;
86 –    haveAtomData = false;
87 –  }
88 –  
89 –  
90 –  datom->getPos(pos);
91 –  datom->getQ(q);
92 –  datom->getA(rotMatrix);
121  
122 <  // We need A^T to convert from body-fixed to space-fixed:
123 <  transposeMat3(rotMatrix, rotTrans);
124 <  
97 <  //center of mass of the water molecule
98 <  matVecMul3(rotTrans, u, newVec);
99 <  atomInfo = new AtomInfo;
100 <  atomInfo->AtomType = "X";
101 <  atomInfo->pos[0] = pos[0];
102 <  atomInfo->pos[1] = pos[1];
103 <  atomInfo->pos[2] = pos[2];
104 <  atomInfo->dipole[0] = newVec[0];
105 <  atomInfo->dipole[1] = newVec[1];
106 <  atomInfo->dipole[2] = newVec[2];
122 >    pos = datom->getPos();
123 >    q = datom->getQ();
124 >    rotMatrix = datom->getA();
125  
126 <  atomData->addAtomInfo(atomInfo);
126 >    // We need A^T to convert from body-fixed to space-fixed:
127 >    //transposeMat3(rotMatrix, rotTrans);
128 >    rotTrans = rotMatrix.transpose();
129  
130 <  //oxygen
131 <  matVecMul3(rotTrans, ox, newVec);
132 <  atomInfo = new AtomInfo;
113 <  atomInfo->AtomType = "O";
114 <  atomInfo->pos[0] = pos[0] + newVec[0];
115 <  atomInfo->pos[1] = pos[1] + newVec[1];
116 <  atomInfo->pos[2] = pos[2] + newVec[2];
117 <  atomInfo->dipole[0] = 0.0;
118 <  atomInfo->dipole[1] = 0.0;
119 <  atomInfo->dipole[2] = 0.0;
120 <  atomData->addAtomInfo(atomInfo);
130 >    //center of mass of the water molecule
131 >    //matVecMul3(rotTrans, u, newVec);
132 >    newVec = rotTrans * u;
133  
134 +    atomInfo = new AtomInfo;
135 +    atomInfo->atomTypeName = "X";
136 +    atomInfo->pos[0] = pos[0];
137 +    atomInfo->pos[1] = pos[1];
138 +    atomInfo->pos[2] = pos[2];
139 +    atomInfo->dipole[0] = newVec[0];
140 +    atomInfo->dipole[1] = newVec[1];
141 +    atomInfo->dipole[2] = newVec[2];
142  
143 <  //hydrogen1
124 <    matVecMul3(rotTrans, h1, newVec);
125 <  atomInfo = new AtomInfo;
126 <  atomInfo->AtomType = "H";
127 <  atomInfo->pos[0] = pos[0] + newVec[0];
128 <  atomInfo->pos[1] = pos[1] + newVec[1];
129 <  atomInfo->pos[2] = pos[2] + newVec[2];
130 <  atomInfo->dipole[0] = 0.0;
131 <  atomInfo->dipole[1] = 0.0;
132 <  atomInfo->dipole[2] = 0.0;
133 <  atomData->addAtomInfo(atomInfo);
143 >    atomData->addAtomInfo(atomInfo);
144  
145 <  //hydrogen2
146 <  matVecMul3(rotTrans, h2, newVec);
147 <  atomInfo = new AtomInfo;
138 <  atomInfo->AtomType = "H";
139 <  atomInfo->pos[0] = pos[0] + newVec[0];
140 <  atomInfo->pos[1] = pos[1] + newVec[1];
141 <  atomInfo->pos[2] = pos[2] + newVec[2];
142 <  atomInfo->dipole[0] = 0.0;
143 <  atomInfo->dipole[1] = 0.0;
144 <  atomInfo->dipole[2] = 0.0;
145 <  atomData->addAtomInfo(atomInfo);
145 >    //oxygen
146 >    //matVecMul3(rotTrans, ox, newVec);
147 >    newVec = rotTrans * ox;
148  
149 <  //add atom data into atom's property
149 >    atomInfo = new AtomInfo;
150 >    atomInfo->atomTypeName = "O";
151 >    atomInfo->pos[0] = pos[0] + newVec[0];
152 >    atomInfo->pos[1] = pos[1] + newVec[1];
153 >    atomInfo->pos[2] = pos[2] + newVec[2];
154 >    atomInfo->dipole[0] = 0.0;
155 >    atomInfo->dipole[1] = 0.0;
156 >    atomInfo->dipole[2] = 0.0;
157 >    atomData->addAtomInfo(atomInfo);
158  
159 <  if(!haveAtomData){
160 <    atomData->setID("ATOMDATA");
161 <    datom->addProperty(atomData);
162 <  }
159 >    //hydrogen1
160 >    //matVecMul3(rotTrans, h1, newVec);
161 >    newVec = rotTrans * h1;
162 >    atomInfo = new AtomInfo;
163 >    atomInfo->atomTypeName = "H";
164 >    atomInfo->pos[0] = pos[0] + newVec[0];
165 >    atomInfo->pos[1] = pos[1] + newVec[1];
166 >    atomInfo->pos[2] = pos[2] + newVec[2];
167 >    atomInfo->dipole[0] = 0.0;
168 >    atomInfo->dipole[1] = 0.0;
169 >    atomInfo->dipole[2] = 0.0;
170 >    atomData->addAtomInfo(atomInfo);
171  
172 <  setVisited(datom);
172 >    //hydrogen2
173 >    //matVecMul3(rotTrans, h2, newVec);
174 >    newVec = rotTrans * h2;
175 >    atomInfo = new AtomInfo;
176 >    atomInfo->atomTypeName = "H";
177 >    atomInfo->pos[0] = pos[0] + newVec[0];
178 >    atomInfo->pos[1] = pos[1] + newVec[1];
179 >    atomInfo->pos[2] = pos[2] + newVec[2];
180 >    atomInfo->dipole[0] = 0.0;
181 >    atomInfo->dipole[1] = 0.0;
182 >    atomInfo->dipole[2] = 0.0;
183 >    atomData->addAtomInfo(atomInfo);
184  
185 < }
185 >    //add atom data into atom's property
186  
187 < const string SSDAtomVisitor::toString(){
188 <  char buffer[65535];
189 <  string result;
190 <  
162 <  sprintf(buffer ,"------------------------------------------------------------------\n");
163 <  result += buffer;
187 >    if (!haveAtomData) {
188 >      atomData->setID("ATOMDATA");
189 >      datom->addProperty(atomData);
190 >    }
191  
192 <  sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
193 <  result += buffer;
192 >    setVisited(datom);
193 >  }
194  
195 <  sprintf(buffer , "Visitor Description: Convert SSD into 4 different atoms\n");
196 <  result += buffer;
195 >  const std::string SSDAtomVisitor::toString() {
196 >    char   buffer[65535];
197 >    std::string result;
198  
199 <  sprintf(buffer ,"------------------------------------------------------------------\n");
200 <  result += buffer;
199 >    sprintf(buffer,
200 >            "------------------------------------------------------------------\n");
201 >    result += buffer;
202  
203 <  return result;
204 < }
203 >    sprintf(buffer, "Visitor name: %s\n", visitorName.c_str());
204 >    result += buffer;
205  
206 < //----------------------------------------------------------------------------//
206 >    sprintf(buffer,
207 >            "Visitor Description: Convert SSD into 4 different atoms\n");
208 >    result += buffer;
209  
210 < void DefaultAtomVisitor::visit(Atom* atom){
211 <  AtomData* atomData;
212 <  AtomInfo* atomInfo;
182 <  double pos[3];
210 >    sprintf(buffer,
211 >            "------------------------------------------------------------------\n");
212 >    result += buffer;
213  
214 <  if(isVisited(atom))
215 <    return;
214 >    return result;
215 >  }
216  
217 < atomInfo =new AtomInfo;
217 >  bool LinearAtomVisitor::isLinearAtom(const std::string& atomType){
218 >    std::set<std::string>::iterator strIter;
219 >    strIter = linearAtomType.find(atomType);
220  
221 <  atomData = new AtomData;
222 <  atomData->setID("ATOMDATA");
191 <
192 <  atom->getPos(pos);
193 <  atomInfo->AtomType = atom->getType();
194 <  atomInfo->pos[0] = pos[0];
195 <  atomInfo->pos[1] = pos[1];
196 <  atomInfo->pos[2] = pos[2];
197 <  atomInfo->dipole[0] = 0.0;
198 <  atomInfo->dipole[1] = 0.0;
199 <  atomInfo->dipole[2] = 0.0;
221 >    return strIter != linearAtomType.end() ? true : false;
222 >  }
223  
224 +  void LinearAtomVisitor::visit(DirectionalAtom* datom){
225 +    std::vector<AtomInfo*> atoms;
226 +    //we need to convert linear into 4 different atoms
227 +    Vector3d c1(0.0, 0.0, -1.8);
228 +    Vector3d c2(0.0, 0.0, -0.6);
229 +    Vector3d c3(0.0, 0.0,  0.6);
230 +    Vector3d c4(0.0, 0.0,  1.8);
231 +    RotMat3x3d rotMatrix;
232 +    RotMat3x3d rotTrans;
233 +    AtomInfo* atomInfo;
234 +    Vector3d pos;
235 +    Vector3d newVec;
236 +    Quat4d q;
237 +    AtomData* atomData;
238 +    GenericData* data;
239 +    bool haveAtomData;
240  
241 <  atomData->addAtomInfo(atomInfo);
242 <  
243 <  atom->addProperty(atomData);
241 >    //if atom is not SSD atom, just skip it
242 >    if(!isLinearAtom(datom->getType()))
243 >      return;
244  
245 <  setVisited(atom);
246 < }
247 < void DefaultAtomVisitor::visit(DirectionalAtom* datom){
248 <  AtomData* atomData;
249 <  AtomInfo* atomInfo;
250 <  double pos[3];
251 <  double u[3];
245 >    data = datom->getPropertyByName("ATOMDATA");
246 >    if(data != NULL){
247 >      atomData = dynamic_cast<AtomData*>(data);  
248 >      if(atomData == NULL){
249 >        std::cerr << "can not get Atom Data from " << datom->getType() << std::endl;
250 >        atomData = new AtomData;
251 >        haveAtomData = false;      
252 >      } else {
253 >        haveAtomData = true;
254 >      }
255 >    } else {
256 >      atomData = new AtomData;
257 >      haveAtomData = false;
258 >    }
259 >  
260 >  
261 >    pos = datom->getPos();
262 >    q = datom->getQ();
263 >    rotMatrix = datom->getA();
264  
265 <  if(isVisited(datom))
266 <    return;
265 >    // We need A^T to convert from body-fixed to space-fixed:  
266 >    rotTrans = rotMatrix.transpose();
267 >
268 >    newVec = rotTrans * c1;
269 >    atomInfo = new AtomInfo;
270 >    atomInfo->atomTypeName = "C";
271 >    atomInfo->pos[0] = pos[0] + newVec[0];
272 >    atomInfo->pos[1] = pos[1] + newVec[1];
273 >    atomInfo->pos[2] = pos[2] + newVec[2];
274 >    atomInfo->dipole[0] = 0.0;
275 >    atomInfo->dipole[1] = 0.0;
276 >    atomInfo->dipole[2] = 0.0;
277 >    atomData->addAtomInfo(atomInfo);
278 >
279 >    newVec = rotTrans * c2;
280 >    atomInfo = new AtomInfo;
281 >    atomInfo->atomTypeName = "C";
282 >    atomInfo->pos[0] = pos[0] + newVec[0];
283 >    atomInfo->pos[1] = pos[1] + newVec[1];
284 >    atomInfo->pos[2] = pos[2] + newVec[2];
285 >    atomInfo->dipole[0] = 0.0;
286 >    atomInfo->dipole[1] = 0.0;
287 >    atomInfo->dipole[2] = 0.0;
288 >    atomData->addAtomInfo(atomInfo);
289 >
290 >    newVec = rotTrans * c3;
291 >    atomInfo = new AtomInfo;
292 >    atomInfo->atomTypeName = "C";
293 >    atomInfo->pos[0] = pos[0] + newVec[0];
294 >    atomInfo->pos[1] = pos[1] + newVec[1];
295 >    atomInfo->pos[2] = pos[2] + newVec[2];
296 >    atomInfo->dipole[0] = 0.0;
297 >    atomInfo->dipole[1] = 0.0;
298 >    atomInfo->dipole[2] = 0.0;
299 >    atomData->addAtomInfo(atomInfo);
300 >
301 >    newVec = rotTrans * c4;
302 >    atomInfo = new AtomInfo;
303 >    atomInfo->atomTypeName = "C";
304 >    atomInfo->pos[0] = pos[0] + newVec[0];
305 >    atomInfo->pos[1] = pos[1] + newVec[1];
306 >    atomInfo->pos[2] = pos[2] + newVec[2];
307 >    atomInfo->dipole[0] = 0.0;
308 >    atomInfo->dipole[1] = 0.0;
309 >    atomInfo->dipole[2] = 0.0;
310 >    atomData->addAtomInfo(atomInfo);
311 >
312 >    //add atom data into atom's property
313 >
314 >    if(!haveAtomData){
315 >      atomData->setID("ATOMDATA");
316 >      datom->addProperty(atomData);
317 >    }
318 >
319 >    setVisited(datom);
320 >
321 >  }
322 >
323 >  const std::string LinearAtomVisitor::toString(){
324 >    char buffer[65535];
325 >    std::string result;
326    
327 <  datom->getPos(pos);
328 <  datom->getU(u);
327 >    sprintf(buffer ,"------------------------------------------------------------------\n");
328 >    result += buffer;
329  
330 <  atomData = new AtomData;
331 <  atomData->setID("ATOMDATA");
332 <  atomInfo =new AtomInfo;
330 >    sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
331 >    result += buffer;
332 >
333 >    sprintf(buffer , "Visitor Description: Convert linear into 4 different atoms\n");
334 >    result += buffer;
335 >
336 >    sprintf(buffer ,"------------------------------------------------------------------\n");
337 >    result += buffer;
338 >
339 >    return result;
340 >  }
341 >
342 >  bool GBLipidAtomVisitor::isGBLipidAtom(const std::string& atomType){
343 >    std::set<std::string>::iterator strIter;
344 >    strIter = GBLipidAtomType.find(atomType);
345 >
346 >    return strIter != GBLipidAtomType.end() ? true : false;
347 >  }
348 >
349 >  void GBLipidAtomVisitor::visit(DirectionalAtom* datom){
350 >    std::vector<AtomInfo*> atoms;
351 >    //we need to convert linear into 4 different atoms
352 >    Vector3d c1(0.0, 0.0, -6.25);
353 >    Vector3d c2(0.0, 0.0, -2.1);
354 >    Vector3d c3(0.0, 0.0,  2.1);
355 >    Vector3d c4(0.0, 0.0,  6.25);
356 >    RotMat3x3d rotMatrix;
357 >    RotMat3x3d rotTrans;
358 >    AtomInfo* atomInfo;
359 >    Vector3d pos;
360 >    Vector3d newVec;
361 >    Quat4d q;
362 >    AtomData* atomData;
363 >    GenericData* data;
364 >    bool haveAtomData;
365 >
366 >    //if atom is not GBlipid atom, just skip it
367 >    if(!isGBLipidAtom(datom->getType()))
368 >      return;
369 >
370 >    data = datom->getPropertyByName("ATOMDATA");
371 >    if(data != NULL){
372 >      atomData = dynamic_cast<AtomData*>(data);  
373 >      if(atomData == NULL){
374 >        std::cerr << "can not get Atom Data from " << datom->getType() << std::endl;
375 >        atomData = new AtomData;
376 >        haveAtomData = false;      
377 >      } else {
378 >        haveAtomData = true;
379 >      }
380 >    } else {
381 >      atomData = new AtomData;
382 >      haveAtomData = false;
383 >    }
384 >  
385    
386 <  atomInfo->AtomType = datom->getType();
387 <  atomInfo->pos[0] = pos[0];
388 <  atomInfo->pos[1] = pos[1];
227 <  atomInfo->pos[2] = pos[2];
228 <  atomInfo->dipole[0] = u[0];
229 <  atomInfo->dipole[1] = u[1];
230 <  atomInfo->dipole[2] = u[2];  
386 >    pos = datom->getPos();
387 >    q = datom->getQ();
388 >    rotMatrix = datom->getA();
389  
390 <  atomData->addAtomInfo(atomInfo);
390 >    // We need A^T to convert from body-fixed to space-fixed:  
391 >    rotTrans = rotMatrix.transpose();
392  
393 <  datom->addProperty(atomData);
393 >    newVec = rotTrans * c1;
394 >    atomInfo = new AtomInfo;
395 >    atomInfo->atomTypeName = "K";
396 >    atomInfo->pos[0] = pos[0] + newVec[0];
397 >    atomInfo->pos[1] = pos[1] + newVec[1];
398 >    atomInfo->pos[2] = pos[2] + newVec[2];
399 >    atomInfo->dipole[0] = 0.0;
400 >    atomInfo->dipole[1] = 0.0;
401 >    atomInfo->dipole[2] = 0.0;
402 >    atomData->addAtomInfo(atomInfo);
403  
404 <  setVisited(datom);
405 < }
404 >    newVec = rotTrans * c2;
405 >    atomInfo = new AtomInfo;
406 >    atomInfo->atomTypeName = "K";
407 >    atomInfo->pos[0] = pos[0] + newVec[0];
408 >    atomInfo->pos[1] = pos[1] + newVec[1];
409 >    atomInfo->pos[2] = pos[2] + newVec[2];
410 >    atomInfo->dipole[0] = 0.0;
411 >    atomInfo->dipole[1] = 0.0;
412 >    atomInfo->dipole[2] = 0.0;
413 >    atomData->addAtomInfo(atomInfo);
414  
415 +    newVec = rotTrans * c3;
416 +    atomInfo = new AtomInfo;
417 +    atomInfo->atomTypeName = "K";
418 +    atomInfo->pos[0] = pos[0] + newVec[0];
419 +    atomInfo->pos[1] = pos[1] + newVec[1];
420 +    atomInfo->pos[2] = pos[2] + newVec[2];
421 +    atomInfo->dipole[0] = 0.0;
422 +    atomInfo->dipole[1] = 0.0;
423 +    atomInfo->dipole[2] = 0.0;
424 +    atomData->addAtomInfo(atomInfo);
425  
426 < const string DefaultAtomVisitor::toString(){
427 <  char buffer[65535];
428 <  string result;
426 >    newVec = rotTrans * c4;
427 >    atomInfo = new AtomInfo;
428 >    atomInfo->atomTypeName = "K";
429 >    atomInfo->pos[0] = pos[0] + newVec[0];
430 >    atomInfo->pos[1] = pos[1] + newVec[1];
431 >    atomInfo->pos[2] = pos[2] + newVec[2];
432 >    atomInfo->dipole[0] = 0.0;
433 >    atomInfo->dipole[1] = 0.0;
434 >    atomInfo->dipole[2] = 0.0;
435 >    atomData->addAtomInfo(atomInfo);
436 >
437 >    //add atom data into atom's property
438 >
439 >    if(!haveAtomData){
440 >      atomData->setID("ATOMDATA");
441 >      datom->addProperty(atomData);
442 >    }
443 >
444 >    setVisited(datom);
445 >
446 >  }
447 >
448 >  const std::string GBLipidAtomVisitor::toString(){
449 >    char buffer[65535];
450 >    std::string result;
451    
452 <  sprintf(buffer ,"------------------------------------------------------------------\n");
453 <  result += buffer;
452 >    sprintf(buffer ,"------------------------------------------------------------------\n");
453 >    result += buffer;
454  
455 <  sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
456 <  result += buffer;
455 >    sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
456 >    result += buffer;
457  
458 <  sprintf(buffer , "Visitor Description: copy atom infomation into atom data\n");
459 <  result += buffer;
458 >    sprintf(buffer , "Visitor Description: Convert GBlipid into 4 different K atoms\n");
459 >    result += buffer;
460  
461 <  sprintf(buffer ,"------------------------------------------------------------------\n");
462 <  result += buffer;
461 >    sprintf(buffer ,"------------------------------------------------------------------\n");
462 >    result += buffer;
463  
464 <  return result;
465 < }    
464 >    return result;
465 >  }
466  
467 < }//namespace oopse
467 >  //----------------------------------------------------------------------------//
468 >
469 >  void DefaultAtomVisitor::visit(Atom *atom) {
470 >    AtomData *atomData;
471 >    AtomInfo *atomInfo;
472 >    Vector3d  pos;
473 >
474 >    if (isVisited(atom))
475 >      return;
476 >
477 >    atomInfo = new AtomInfo;
478 >
479 >    atomData = new AtomData;
480 >    atomData->setID("ATOMDATA");
481 >
482 >    pos = atom->getPos();
483 >    atomInfo->atomTypeName = atom->getType();
484 >    atomInfo->pos[0] = pos[0];
485 >    atomInfo->pos[1] = pos[1];
486 >    atomInfo->pos[2] = pos[2];
487 >    atomInfo->dipole[0] = 0.0;
488 >    atomInfo->dipole[1] = 0.0;
489 >    atomInfo->dipole[2] = 0.0;
490 >
491 >    atomData->addAtomInfo(atomInfo);
492 >
493 >    atom->addProperty(atomData);
494 >
495 >    setVisited(atom);
496 >  }
497 >
498 >  void DefaultAtomVisitor::visit(DirectionalAtom *datom) {
499 >    AtomData *atomData;
500 >    AtomInfo *atomInfo;
501 >    Vector3d  pos;
502 >    Vector3d  u;
503 >
504 >    if (isVisited(datom))
505 >      return;
506 >
507 >    pos = datom->getPos();
508 >    u = datom->getElectroFrame().getColumn(2);
509 >
510 >    atomData = new AtomData;
511 >    atomData->setID("ATOMDATA");
512 >    atomInfo = new AtomInfo;
513 >
514 >    atomInfo->atomTypeName = datom->getType();
515 >    atomInfo->pos[0] = pos[0];
516 >    atomInfo->pos[1] = pos[1];
517 >    atomInfo->pos[2] = pos[2];
518 >    atomInfo->dipole[0] = u[0];
519 >    atomInfo->dipole[1] = u[1];
520 >    atomInfo->dipole[2] = u[2];
521 >
522 >    atomData->addAtomInfo(atomInfo);
523 >
524 >    datom->addProperty(atomData);
525 >
526 >    setVisited(datom);
527 >  }
528 >
529 >  const std::string DefaultAtomVisitor::toString() {
530 >    char   buffer[65535];
531 >    std::string result;
532 >
533 >    sprintf(buffer,
534 >            "------------------------------------------------------------------\n");
535 >    result += buffer;
536 >
537 >    sprintf(buffer, "Visitor name: %s\n", visitorName.c_str());
538 >    result += buffer;
539 >
540 >    sprintf(buffer,
541 >            "Visitor Description: copy atom infomation into atom data\n");
542 >    result += buffer;
543 >
544 >    sprintf(buffer,
545 >            "------------------------------------------------------------------\n");
546 >    result += buffer;
547 >
548 >    return result;
549 >  }
550 > } //namespace oopse

Diff Legend

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