[ViewVC] Diff of: OpenMD/trunk/src/visitors/AtomNameVisitor.cpp

Comparing trunk/src/visitors/AtomNameVisitor.cpp (file contents):
Revision 1455 by gezelter, Thu Jun 24 20:44:18 2010 UTC vs.
Revision 1793 by gezelter, Fri Aug 31 21:16:10 2012 UTC

#	Line 36 \| Line 36
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] Vardeman & Gezelter, in progress (2009).
39	>	* [4] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
40		*/
41		#include <sstream>
42		#include <fstream>
#	Line 57 \| Line 57 \| namespace OpenMD {
57		void AtomNameVisitor::visitAtom(Atom* atom) {
58		AtomData* atomData;
59		GenericData* data;
60	–	bool haveAtomData;
60
61		data = atom->getPropertyByName("ATOMDATA");
62		if(data != NULL){
#	Line 65 \| Line 64 \| namespace OpenMD {
64		if(atomData == NULL){
65		std::cerr << "can not get Atom Data from " << atom->getType() << std::endl;
66		atomData = new AtomData;
68	–	haveAtomData = false;
69	–	} else {
70	–	haveAtomData = true;
67		}
68		} else {
69	<	atomData = new AtomData;
74	<	haveAtomData = false;
69	>	atomData = new AtomData;
70		}
71
72		std::vector<AtomInfo*>::iterator i;

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