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 881 by xsun, Thu Feb 2 15:49:42 2006 UTC vs.
branches/development/src/visitors/AtomVisitor.cpp (file contents), Revision 1873 by gezelter, Fri May 10 16:09:34 2013 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, 234107 (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/FixedChargeAdapter.hpp"
48	+	#include "types/FluctuatingChargeAdapter.hpp"
49	+	#include "types/MultipoleAdapter.hpp"
50	+	#include "types/GayBerneAdapter.hpp"
51
52	<	namespace oopse {
52	>	namespace OpenMD {
53	>
54	>	BaseAtomVisitor::BaseAtomVisitor(SimInfo* info) : BaseVisitor() {
55	>	storageLayout_ = info->getStorageLayout();
56	>	}
57	>
58		void BaseAtomVisitor::visit(RigidBody *rb) {
59		//vector<Atom*> myAtoms;
60		//vector<Atom*>::iterator atomIter;
#	Line 71 | Line 81 | namespace oopse {
81		GenericData *data;
82		data = atom->getPropertyByName("VISITED");
83		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::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	–	//if atom is not SSD atom, just skip it
242	–	if(!isLinearAtom(datom->getType()))
243	–	return;
244	–
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	–	// 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	–
84		}
85
86	<	const std::string LinearAtomVisitor::toString(){
87	<	char buffer[65535];
325	<	std::string result;
326	<
327	<	sprintf(buffer ,"------------------------------------------------------------------\n");
328	<	result += buffer;
329	<
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	<	pos = datom->getPos();
387	<	q = datom->getQ();
388	<	rotMatrix = datom->getA();
389	<
390	<	// We need A^T to convert from body-fixed to space-fixed:
391	<	rotTrans = rotMatrix.transpose();
392	<
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	<	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	<	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;
454	<
455	<	sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
456	<	result += buffer;
457	<
458	<	sprintf(buffer , "Visitor Description: Convert GBlipid into 4 different K atoms\n");
459	<	result += buffer;
460	<
461	<	sprintf(buffer ,"------------------------------------------------------------------\n");
462	<	result += buffer;
463	<
464	<	return result;
465	<	}
466	<
467	<	//----------------------------------------------------------------------------//
468	<
86	>	//------------------------------------------------------------------------//
87	>
88		void DefaultAtomVisitor::visit(Atom *atom) {
89		AtomData *atomData;
90		AtomInfo *atomInfo;
91	<	Vector3d  pos;
92	<
91	>	AtomType* atype = atom->getAtomType();
92	>
93		if (isVisited(atom))
94		return;
95	<
95	>
96		atomInfo = new AtomInfo;
478	–
479	–	atomData = new AtomData;
480	–	atomData->setID("ATOMDATA");
481	–
482	–	pos = atom->getPos();
97		atomInfo->atomTypeName = atom->getType();
98	<	atomInfo->pos[0] = pos[0];
99	<	atomInfo->pos[1] = pos[1];
100	<	atomInfo->pos[2] = pos[2];
101	<	atomInfo->dipole[0] = 0.0;
102	<	atomInfo->dipole[1] = 0.0;
103	<	atomInfo->dipole[2] = 0.0;
98	>	atomInfo->pos = atom->getPos();
99	>	atomInfo->vel = atom->getVel();
100	>	atomInfo->frc = atom->getFrc();
101	>	atomInfo->vec = V3Zero;
102	>	atomInfo->hasVelocity = true;
103	>	atomInfo->hasForce = true;
104	>
105	>	FixedChargeAdapter fca = FixedChargeAdapter(atype);
106	>	if ( fca.isFixedCharge() ) {
107	>	atomInfo->hasCharge = true;
108	>	atomInfo->charge = fca.getCharge();
109	>	}
110	>
111	>	FluctuatingChargeAdapter fqa = FluctuatingChargeAdapter(atype);
112	>	if ( fqa.isFluctuatingCharge() ) {
113	>	atomInfo->hasCharge = true;
114	>	atomInfo->charge += atom->getFlucQPos();
115	>	}
116	>
117	>	if ((storageLayout_ & DataStorage::dslElectricField) &&
118	>	(atype->isElectrostatic())) {
119	>	atomInfo->hasElectricField = true;
120	>	atomInfo->eField = atom->getElectricField();
121	>	}
122
123	+	atomData = new AtomData;
124	+	atomData->setID("ATOMDATA");
125		atomData->addAtomInfo(atomInfo);
126	<
126	>
127		atom->addProperty(atomData);
128	<
128	>
129		setVisited(atom);
130		}
131	<
131	>
132		void DefaultAtomVisitor::visit(DirectionalAtom *datom) {
133		AtomData *atomData;
134		AtomInfo *atomInfo;
135	<	Vector3d  pos;
502	<	Vector3d  u;
135	>	AtomType* atype = datom->getAtomType();
136
137		if (isVisited(datom))
138		return;
139	+
140	+	atomInfo = new AtomInfo;
141	+	atomInfo->atomTypeName = datom->getType();
142	+	atomInfo->pos = datom->getPos();
143	+	atomInfo->vel = datom->getVel();
144	+	atomInfo->frc = datom->getFrc();
145	+	atomInfo->hasVelocity = true;
146	+	atomInfo->hasForce = true;
147
148	<	pos = datom->getPos();
149	<	u = datom->getElectroFrame().getColumn(2);
148	>	FixedChargeAdapter fca = FixedChargeAdapter(atype);
149	>	if ( fca.isFixedCharge() ) {
150	>	atomInfo->hasCharge = true;
151	>	atomInfo->charge = fca.getCharge();
152	>	}
153	>
154	>	FluctuatingChargeAdapter fqa = FluctuatingChargeAdapter(atype);
155	>	if ( fqa.isFluctuatingCharge() ) {
156	>	atomInfo->hasCharge = true;
157	>	atomInfo->charge += datom->getFlucQPos();
158	>	}
159
160	<	atomData = new AtomData;
161	<	atomData->setID("ATOMDATA");
162	<	atomInfo = new AtomInfo;
160	>	if ((storageLayout_ & DataStorage::dslElectricField) &&
161	>	(atype->isElectrostatic())) {
162	>	atomInfo->hasElectricField = true;
163	>	atomInfo->eField = datom->getElectricField();
164	>	}
165
166	<	atomInfo->atomTypeName = datom->getType();
167	<	atomInfo->pos[0] = pos[0];
168	<	atomInfo->pos[1] = pos[1];
169	<	atomInfo->pos[2] = pos[2];
170	<	atomInfo->dipole[0] = u[0];
171	<	atomInfo->dipole[1] = u[1];
172	<	atomInfo->dipole[2] = u[2];
166	>	GayBerneAdapter gba = GayBerneAdapter(atype);
167	>	MultipoleAdapter ma = MultipoleAdapter(atype);
168	>
169	>	if (gba.isGayBerne()) {
170	>	atomInfo->hasVector = true;
171	>	atomInfo->vec = datom->getA().transpose()*V3Z;
172	>	} else if (ma.isDipole()) {
173	>	atomInfo->hasVector = true;
174	>	atomInfo->vec = datom->getDipole();
175	>	} else if (ma.isQuadrupole()) {
176	>	atomInfo->hasVector = true;
177	>	atomInfo->vec = datom->getA().transpose()*V3Z;
178	>	}
179
180	+	atomData = new AtomData;
181	+	atomData->setID("ATOMDATA");
182		atomData->addAtomInfo(atomInfo);
183
184		datom->addProperty(atomData);
#	Line 531 | Line 191 | namespace oopse {
191		std::string result;
192
193		sprintf(buffer,
194	<	"------------------------------------------------------------------\n");
194	>	"--------------------------------------------------------------\n");
195		result += buffer;
196
197		sprintf(buffer, "Visitor name: %s\n", visitorName.c_str());
#	Line 542 | Line 202 | namespace oopse {
202		result += buffer;
203
204		sprintf(buffer,
205	<	"------------------------------------------------------------------\n");
205	>	"--------------------------------------------------------------\n");
206		result += buffer;
207
208		return result;
209		}
210	<	} //namespace oopse
210	>	} //namespace OpenMD

Comparing:
trunk/src/visitors/AtomVisitor.cpp (property svn:keywords), Revision 881 by xsun, Thu Feb 2 15:49:42 2006 UTC vs.
branches/development/src/visitors/AtomVisitor.cpp (property svn:keywords), Revision 1873 by gezelter, Fri May 10 16:09:34 2013 UTC

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

Diff Legend

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