ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/visitors/AtomVisitor.cpp

Comparing:
trunk/src/visitors/AtomVisitor.cpp (file contents), Revision 989 by tim, Sat Jun 17 17:02:33 2006 UTC vs.
branches/development/src/visitors/AtomVisitor.cpp (file contents), Revision 1787 by gezelter, Wed Aug 29 18:13:11 2012 UTC

#	Line 6 | Line 6
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
9	>	* 1. Redistributions of source code must retain the above copyright
10		*    notice, this list of conditions and the following disclaimer.
11		*
12	<	* 3. Redistributions in binary form must reproduce the above copyright
12	>	* 2. Redistributions in binary form must reproduce the above copyright
13		*    notice, this list of conditions and the following disclaimer in the
14		*    documentation and/or other materials provided with the
15		*    distribution.
#	Line 37 | Line 28
28		* arising out of the use of or inability to use software, even if the
29		* University of Notre Dame has been advised of the possibility of
30		* such damages.
31	+	*
32	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33	+	* research, please cite the appropriate papers when you publish your
34	+	* work.  Good starting points are:
35	+	*
36	+	* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37	+	* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	+	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
39	+	* [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40	+	* [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43		#include <cstring>
44		#include "visitors/AtomVisitor.hpp"
45		#include "primitives/DirectionalAtom.hpp"
46		#include "primitives/RigidBody.hpp"
47	+	#include "types/MultipoleAdapter.hpp"
48	+	#include "types/GayBerneAdapter.hpp"
49
50	<	namespace oopse {
50	>	namespace OpenMD {
51		void BaseAtomVisitor::visit(RigidBody *rb) {
52		//vector<Atom*> myAtoms;
53		//vector<Atom*>::iterator atomIter;
#	Line 71 | Line 74 | namespace oopse {
74		GenericData *data;
75		data = atom->getPropertyByName("VISITED");
76		return data == NULL ? false : true;
74	–	}
75	–
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) {
83	–	std::vector<AtomInfo*>atoms;
84	–
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	–	//if atom is not SSD atom, just skip it
103	–	if (!isSSDAtom(datom->getType()))
104	–	return;
105	–
106	–	data = datom->getPropertyByName("ATOMDATA");
107	–
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	–	}
121	–
122	–	pos = datom->getPos();
123	–	q = datom->getQ();
124	–	rotMatrix = datom->getA();
125	–
126	–	// We need A^T to convert from body-fixed to space-fixed:
127	–	//transposeMat3(rotMatrix, rotTrans);
128	–	rotTrans = rotMatrix.transpose();
129	–
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	–	atomData->addAtomInfo(atomInfo);
144	–
145	–	//oxygen
146	–	//matVecMul3(rotTrans, ox, newVec);
147	–	newVec = rotTrans * ox;
148	–
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	–	//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	–	//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	–	//add atom data into atom's property
186	–
187	–	if (!haveAtomData) {
188	–	atomData->setID("ATOMDATA");
189	–	datom->addProperty(atomData);
190	–	}
191	–
192	–	setVisited(datom);
193	–	}
194	–
195	–	const std::string SSDAtomVisitor::toString() {
196	–	char   buffer[65535];
197	–	std::string result;
198	–
199	–	sprintf(buffer,
200	–	"------------------------------------------------------------------\n");
201	–	result += buffer;
202	–
203	–	sprintf(buffer, "Visitor name: %s\n", visitorName.c_str());
204	–	result += buffer;
205	–
206	–	sprintf(buffer,
207	–	"Visitor Description: Convert SSD into 4 different atoms\n");
208	–	result += buffer;
209	–
210	–	sprintf(buffer,
211	–	"------------------------------------------------------------------\n");
212	–	result += buffer;
213	–
214	–	return result;
215	–	}
216	–
217	–	bool LinearAtomVisitor::isLinearAtom(const std::string& atomType){
218	–	std::set<std::string>::iterator strIter;
219	–	strIter = linearAtomType.find(atomType);
220	–
221	–	return strIter != linearAtomType.end() ? true : false;
222	–	}
223	–
224	–	void LinearAtomVisitor::addGayBerneAtomType(const std::string& atomType){
225	–	linearAtomType.insert(atomType);
226	–	}
227	–
228	–	void LinearAtomVisitor::visit(DirectionalAtom* datom){
229	–	std::vector<AtomInfo*> atoms;
230	–	//we need to convert linear into 4 different atoms
231	–	Vector3d c1(0.0, 0.0, -1.8);
232	–	Vector3d c2(0.0, 0.0, -0.6);
233	–	Vector3d c3(0.0, 0.0,  0.6);
234	–	Vector3d c4(0.0, 0.0,  1.8);
235	–	RotMat3x3d rotMatrix;
236	–	RotMat3x3d rotTrans;
237	–	AtomInfo* atomInfo;
238	–	Vector3d pos;
239	–	Vector3d newVec;
240	–	Quat4d q;
241	–	AtomData* atomData;
242	–	GenericData* data;
243	–	bool haveAtomData;
244	–	AtomType* atomType;
245	–	//if atom is not SSD atom, just skip it
246	–	if(!isLinearAtom(datom->getType()) || !datom->getAtomType()->isGayBerne())
247	–	return;
248	–
249	–	//setup GayBerne type in fortran side
250	–	data = datom->getAtomType()->getPropertyByName("GayBerne");
251	–	if (data != NULL) {
252	–	GayBerneParamGenericData* gayBerneData = dynamic_cast<GayBerneParamGenericData*>(data);
253	–
254	–	if (gayBerneData != NULL) {
255	–	GayBerneParam gayBerneParam = gayBerneData->getData();
256	–
257	–	double halfLen = gayBerneParam.GB_sigma * gayBerneParam.GB_l2b_ratio/2.0;
258	–	c1[2] = -halfLen;
259	–	c2[2] = -halfLen /2;
260	–	c3[2] = halfLen/2;
261	–	c4[2] = halfLen;
262	–
263	–	}
264	–
265	–	else {
266	–	sprintf( painCave.errMsg,
267	–	"Can not cast GenericData to GayBerneParam\n");
268	–	painCave.severity = OOPSE_ERROR;
269	–	painCave.isFatal = 1;
270	–	simError();
271	–	}
272	–	}
273	–
274	–
275	–	data = datom->getPropertyByName("ATOMDATA");
276	–	if(data != NULL){
277	–	atomData = dynamic_cast<AtomData*>(data);
278	–	if(atomData == NULL){
279	–	std::cerr << "can not get Atom Data from " << datom->getType() << std::endl;
280	–	atomData = new AtomData;
281	–	haveAtomData = false;
282	–	} else {
283	–	haveAtomData = true;
284	–	}
285	–	} else {
286	–	atomData = new AtomData;
287	–	haveAtomData = false;
288	–	}
289	–
290	–
291	–	pos = datom->getPos();
292	–	q = datom->getQ();
293	–	rotMatrix = datom->getA();
294	–
295	–	// We need A^T to convert from body-fixed to space-fixed:
296	–	rotTrans = rotMatrix.transpose();
297	–
298	–	newVec = rotTrans * c1;
299	–	atomInfo = new AtomInfo;
300	–	atomInfo->atomTypeName = "C";
301	–	atomInfo->pos[0] = pos[0] + newVec[0];
302	–	atomInfo->pos[1] = pos[1] + newVec[1];
303	–	atomInfo->pos[2] = pos[2] + newVec[2];
304	–	atomInfo->dipole[0] = 0.0;
305	–	atomInfo->dipole[1] = 0.0;
306	–	atomInfo->dipole[2] = 0.0;
307	–	atomData->addAtomInfo(atomInfo);
308	–
309	–	newVec = rotTrans * c2;
310	–	atomInfo = new AtomInfo;
311	–	atomInfo->atomTypeName = "C";
312	–	atomInfo->pos[0] = pos[0] + newVec[0];
313	–	atomInfo->pos[1] = pos[1] + newVec[1];
314	–	atomInfo->pos[2] = pos[2] + newVec[2];
315	–	atomInfo->dipole[0] = 0.0;
316	–	atomInfo->dipole[1] = 0.0;
317	–	atomInfo->dipole[2] = 0.0;
318	–	atomData->addAtomInfo(atomInfo);
319	–
320	–	newVec = rotTrans * c3;
321	–	atomInfo = new AtomInfo;
322	–	atomInfo->atomTypeName = "C";
323	–	atomInfo->pos[0] = pos[0] + newVec[0];
324	–	atomInfo->pos[1] = pos[1] + newVec[1];
325	–	atomInfo->pos[2] = pos[2] + newVec[2];
326	–	atomInfo->dipole[0] = 0.0;
327	–	atomInfo->dipole[1] = 0.0;
328	–	atomInfo->dipole[2] = 0.0;
329	–	atomData->addAtomInfo(atomInfo);
330	–
331	–	newVec = rotTrans * c4;
332	–	atomInfo = new AtomInfo;
333	–	atomInfo->atomTypeName = "C";
334	–	atomInfo->pos[0] = pos[0] + newVec[0];
335	–	atomInfo->pos[1] = pos[1] + newVec[1];
336	–	atomInfo->pos[2] = pos[2] + newVec[2];
337	–	atomInfo->dipole[0] = 0.0;
338	–	atomInfo->dipole[1] = 0.0;
339	–	atomInfo->dipole[2] = 0.0;
340	–	atomData->addAtomInfo(atomInfo);
341	–
342	–	//add atom data into atom's property
343	–
344	–	if(!haveAtomData){
345	–	atomData->setID("ATOMDATA");
346	–	datom->addProperty(atomData);
347	–	}
348	–
349	–	setVisited(datom);
350	–
77		}
78
79	<	const std::string LinearAtomVisitor::toString(){
80	<	char buffer[65535];
355	<	std::string result;
356	<
357	<	sprintf(buffer ,"------------------------------------------------------------------\n");
358	<	result += buffer;
359	<
360	<	sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
361	<	result += buffer;
362	<
363	<	sprintf(buffer , "Visitor Description: Convert linear into 4 different atoms\n");
364	<	result += buffer;
365	<
366	<	sprintf(buffer ,"------------------------------------------------------------------\n");
367	<	result += buffer;
368	<
369	<	return result;
370	<	}
371	<
372	<	bool GBLipidAtomVisitor::isGBLipidAtom(const std::string& atomType){
373	<	std::set<std::string>::iterator strIter;
374	<	strIter = GBLipidAtomType.find(atomType);
375	<
376	<	return strIter != GBLipidAtomType.end() ? true : false;
377	<	}
378	<
379	<	void GBLipidAtomVisitor::visit(DirectionalAtom* datom){
380	<	std::vector<AtomInfo*> atoms;
381	<	//we need to convert linear into 4 different atoms
382	<	Vector3d c1(0.0, 0.0, -6.25);
383	<	Vector3d c2(0.0, 0.0, -2.1);
384	<	Vector3d c3(0.0, 0.0,  2.1);
385	<	Vector3d c4(0.0, 0.0,  6.25);
386	<	RotMat3x3d rotMatrix;
387	<	RotMat3x3d rotTrans;
388	<	AtomInfo* atomInfo;
389	<	Vector3d pos;
390	<	Vector3d newVec;
391	<	Quat4d q;
392	<	AtomData* atomData;
393	<	GenericData* data;
394	<	bool haveAtomData;
395	<
396	<	//if atom is not GBlipid atom, just skip it
397	<	if(!isGBLipidAtom(datom->getType()))
398	<	return;
399	<
400	<	data = datom->getPropertyByName("ATOMDATA");
401	<	if(data != NULL){
402	<	atomData = dynamic_cast<AtomData*>(data);
403	<	if(atomData == NULL){
404	<	std::cerr << "can not get Atom Data from " << datom->getType() << std::endl;
405	<	atomData = new AtomData;
406	<	haveAtomData = false;
407	<	} else {
408	<	haveAtomData = true;
409	<	}
410	<	} else {
411	<	atomData = new AtomData;
412	<	haveAtomData = false;
413	<	}
414	<
415	<
416	<	pos = datom->getPos();
417	<	q = datom->getQ();
418	<	rotMatrix = datom->getA();
419	<
420	<	// We need A^T to convert from body-fixed to space-fixed:
421	<	rotTrans = rotMatrix.transpose();
422	<
423	<	newVec = rotTrans * c1;
424	<	atomInfo = new AtomInfo;
425	<	atomInfo->atomTypeName = "K";
426	<	atomInfo->pos[0] = pos[0] + newVec[0];
427	<	atomInfo->pos[1] = pos[1] + newVec[1];
428	<	atomInfo->pos[2] = pos[2] + newVec[2];
429	<	atomInfo->dipole[0] = 0.0;
430	<	atomInfo->dipole[1] = 0.0;
431	<	atomInfo->dipole[2] = 0.0;
432	<	atomData->addAtomInfo(atomInfo);
433	<
434	<	newVec = rotTrans * c2;
435	<	atomInfo = new AtomInfo;
436	<	atomInfo->atomTypeName = "K";
437	<	atomInfo->pos[0] = pos[0] + newVec[0];
438	<	atomInfo->pos[1] = pos[1] + newVec[1];
439	<	atomInfo->pos[2] = pos[2] + newVec[2];
440	<	atomInfo->dipole[0] = 0.0;
441	<	atomInfo->dipole[1] = 0.0;
442	<	atomInfo->dipole[2] = 0.0;
443	<	atomData->addAtomInfo(atomInfo);
444	<
445	<	newVec = rotTrans * c3;
446	<	atomInfo = new AtomInfo;
447	<	atomInfo->atomTypeName = "K";
448	<	atomInfo->pos[0] = pos[0] + newVec[0];
449	<	atomInfo->pos[1] = pos[1] + newVec[1];
450	<	atomInfo->pos[2] = pos[2] + newVec[2];
451	<	atomInfo->dipole[0] = 0.0;
452	<	atomInfo->dipole[1] = 0.0;
453	<	atomInfo->dipole[2] = 0.0;
454	<	atomData->addAtomInfo(atomInfo);
455	<
456	<	newVec = rotTrans * c4;
457	<	atomInfo = new AtomInfo;
458	<	atomInfo->atomTypeName = "K";
459	<	atomInfo->pos[0] = pos[0] + newVec[0];
460	<	atomInfo->pos[1] = pos[1] + newVec[1];
461	<	atomInfo->pos[2] = pos[2] + newVec[2];
462	<	atomInfo->dipole[0] = 0.0;
463	<	atomInfo->dipole[1] = 0.0;
464	<	atomInfo->dipole[2] = 0.0;
465	<	atomData->addAtomInfo(atomInfo);
466	<
467	<	//add atom data into atom's property
468	<
469	<	if(!haveAtomData){
470	<	atomData->setID("ATOMDATA");
471	<	datom->addProperty(atomData);
472	<	}
473	<
474	<	setVisited(datom);
475	<
476	<	}
477	<
478	<	const std::string GBLipidAtomVisitor::toString(){
479	<	char buffer[65535];
480	<	std::string result;
481	<
482	<	sprintf(buffer ,"------------------------------------------------------------------\n");
483	<	result += buffer;
484	<
485	<	sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
486	<	result += buffer;
487	<
488	<	sprintf(buffer , "Visitor Description: Convert GBlipid into 4 different K atoms\n");
489	<	result += buffer;
490	<
491	<	sprintf(buffer ,"------------------------------------------------------------------\n");
492	<	result += buffer;
493	<
494	<	return result;
495	<	}
496	<
497	<	//----------------------------------------------------------------------------//
498	<
79	>	//------------------------------------------------------------------------//
80	>
81		void DefaultAtomVisitor::visit(Atom *atom) {
82		AtomData *atomData;
83		AtomInfo *atomInfo;
84		Vector3d  pos;
85	+	Vector3d  vel;
86	+	Vector3d  frc;
87	+	Vector3d  u;
88
89		if (isVisited(atom))
90		return;
91	<
91	>
92		atomInfo = new AtomInfo;
93	<
93	>
94		atomData = new AtomData;
95		atomData->setID("ATOMDATA");
96	<
96	>
97		pos = atom->getPos();
98	+	vel = atom->getVel();
99	+	frc = atom->getFrc();
100		atomInfo->atomTypeName = atom->getType();
101		atomInfo->pos[0] = pos[0];
102		atomInfo->pos[1] = pos[1];
103		atomInfo->pos[2] = pos[2];
104	<	atomInfo->dipole[0] = 0.0;
105	<	atomInfo->dipole[1] = 0.0;
106	<	atomInfo->dipole[2] = 0.0;
107	<
104	>	atomInfo->vel[0] = vel[0];
105	>	atomInfo->vel[1] = vel[1];
106	>	atomInfo->vel[2] = vel[2];
107	>	atomInfo->hasVelocity = true;
108	>	atomInfo->frc[0] = frc[0];
109	>	atomInfo->frc[1] = frc[1];
110	>	atomInfo->frc[2] = frc[2];
111	>	atomInfo->hasForce = true;
112	>	atomInfo->vec[0] = 0.0;
113	>	atomInfo->vec[1] = 0.0;
114	>	atomInfo->vec[2] = 0.0;
115	>
116		atomData->addAtomInfo(atomInfo);
117	<
117	>
118		atom->addProperty(atomData);
119	<
119	>
120		setVisited(atom);
121		}
122	<
122	>
123		void DefaultAtomVisitor::visit(DirectionalAtom *datom) {
124		AtomData *atomData;
125		AtomInfo *atomInfo;
126		Vector3d  pos;
127	+	Vector3d  vel;
128	+	Vector3d  frc;
129		Vector3d  u;
130
131		if (isVisited(datom))
132		return;
133	<
133	>
134		pos = datom->getPos();
135	<	if (datom->getAtomType()->isGayBerne()) {
136	<	u = datom->getA().transpose()*V3Z;
137	<	} else if (datom->getAtomType()->isMultipole()) {
138	<	u = datom->getElectroFrame().getColumn(2);
135	>	vel = datom->getVel();
136	>	frc = datom->getFrc();
137	>
138	>	GayBerneAdapter gba = GayBerneAdapter(datom->getAtomType());
139	>	MultipoleAdapter ma = MultipoleAdapter(datom->getAtomType());
140	>
141	>	if (gba.isGayBerne()) {
142	>	u = datom->getA().transpose()*V3Z;
143	>	} else if (ma.isDipole()) {
144	>	u = datom->getDipole();
145		}
146		atomData = new AtomData;
147		atomData->setID("ATOMDATA");
#	Line 548 | Line 151 | namespace oopse {
151		atomInfo->pos[0] = pos[0];
152		atomInfo->pos[1] = pos[1];
153		atomInfo->pos[2] = pos[2];
154	<	atomInfo->dipole[0] = u[0];
155	<	atomInfo->dipole[1] = u[1];
156	<	atomInfo->dipole[2] = u[2];
154	>	atomInfo->vel[0] = vel[0];
155	>	atomInfo->vel[1] = vel[1];
156	>	atomInfo->vel[2] = vel[2];
157	>	atomInfo->hasVelocity = true;
158	>	atomInfo->frc[0] = frc[0];
159	>	atomInfo->frc[1] = frc[1];
160	>	atomInfo->frc[2] = frc[2];
161	>	atomInfo->hasForce = true;
162	>	atomInfo->vec[0] = u[0];
163	>	atomInfo->vec[1] = u[1];
164	>	atomInfo->vec[2] = u[2];
165	>	atomInfo->hasVector = true;
166
167		atomData->addAtomInfo(atomInfo);
168
#	Line 580 | Line 192 | namespace oopse {
192
193		return result;
194		}
195	<	} //namespace oopse
195	>	} //namespace OpenMD

Comparing:
trunk/src/visitors/AtomVisitor.cpp (property svn:keywords), Revision 989 by tim, Sat Jun 17 17:02:33 2006 UTC vs.
branches/development/src/visitors/AtomVisitor.cpp (property svn:keywords), Revision 1787 by gezelter, Wed Aug 29 18:13:11 2012 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

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