ViewVC Help

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

root/OpenMD/branches/development/src/primitives/CutoffGroup.hpp

Comparing:
trunk/src/primitives/CutoffGroup.hpp (file contents), Revision 430 by tim, Thu Mar 10 23:56:42 2005 UTC vs.
branches/development/src/primitives/CutoffGroup.hpp (file contents), Revision 1551 by gezelter, Thu Apr 28 18:38:21 2011 UTC

#	Line 1 | Line 1
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
#	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]  Vardeman & Gezelter, in progress (2009).
40		*/
41
42		#ifndef PRIMITIVES_CUTOFFGROUP_HPP
#	Line 46 | Line 46
46		#include "primitives/Atom.hpp"
47		#include "math/Vector3.hpp"
48
49	<	namespace oopse {
50	<	class CutoffGroup {
51	<	public:
49	>	namespace OpenMD {
50	>	class CutoffGroup {
51	>	public:
52	>
53	>	CutoffGroup() :  snapshotMan_(NULL) {
54
55	<	CutoffGroup() {
56	<	haveTotalMass = false;
57	<	totalMass = 0.0;
58	<	}
55	>	storage_ = &Snapshot::cgData;
56	>	haveTotalMass = false;
57	>	totalMass = 0.0;
58	>	}
59	>
60	>	/**
61	>	* Sets the Snapshot Manager of this cutoffGroup
62	>	*/
63	>	void setSnapshotManager(SnapshotManager* sman) {
64	>	snapshotMan_ = sman;
65	>	}
66
58	–	void addAtom(Atom *atom) {
59	–	cutoffAtomList.push_back(atom);
60	–	}
67
68	<	Atom *beginAtom(std::vector<Atom *>::iterator & i) {
69	<	i = cutoffAtomList.begin();
70	<	return i != cutoffAtomList.end() ? *i : NULL;
71	<	}
68	>	void addAtom(Atom *atom) {
69	>	cutoffAtomList.push_back(atom);
70	>	}
71	>
72	>	Atom *beginAtom(std::vector<Atom *>::iterator & i) {
73	>	i = cutoffAtomList.begin();
74	>	return i != cutoffAtomList.end() ? *i : NULL;
75	>	}
76	>
77	>	Atom *nextAtom(std::vector<Atom *>::iterator & i) {
78	>	i++;
79	>	return i != cutoffAtomList.end() ? *i : NULL;
80	>	}
81
82	<	Atom *nextAtom(std::vector<Atom *>::iterator & i) {
83	<	i++;
84	<	return i != cutoffAtomList.end() ? *i : NULL;
85	<	}
82	>	std::vector<Atom*> getAtoms() { return cutoffAtomList; }
83	>	RealType getMass() {
84	>	std::vector<Atom *>::iterator i;
85	>	Atom * atom;
86	>	RealType mass;
87	>
88	>	if (!haveTotalMass) {
89	>	totalMass = 0;
90	>
91	>	for(atom = beginAtom(i); atom != NULL; atom = nextAtom(i)) {
92	>	mass = atom->getMass();
93	>	totalMass += mass;
94	>	}
95	>
96	>	haveTotalMass = true;
97	>	}
98	>
99	>	return totalMass;
100	>	}
101	>
102	>	void updateCOM() {
103	>	std::vector<Atom *>::iterator i;
104	>	Atom * atom;
105
106	<	std::vector<Atom*> getAtoms() { return cutoffAtomList; }
107	<	double getMass() {
108	<	std::vector<Atom *>::iterator i;
109	<	Atom * atom;
110	<	double mass;
106	>	DataStorage&  data = snapshotMan_->getCurrentSnapshot()->*storage_;
107	>
108	>	totalMass = getMass();
109	>
110	>	if (cutoffAtomList.size() == 1) {
111	>	std::cerr << "YO!\n";
112	>	std::cerr << "atipos = " << beginAtom(i)->getPos() << "\n";
113	>	std::cerr << "lI = " << localIndex_ << "\n";
114
115	<	if (!haveTotalMass) {
116	<	totalMass = 0;
115	>	data.position[localIndex_] = beginAtom(i)->getPos();
116	>	std::cerr << "YOYO!\n";
117	>	} else {
118	>	data.position[localIndex_] = V3Zero;
119	>	for(atom = beginAtom(i); atom != NULL; atom = nextAtom(i)) {
120	>	data.position[localIndex_] += atom->getMass() * atom->getPos();
121	>	}
122	>	data.position[localIndex_] /= totalMass;
123	>	}
124	>	}
125
81	–	for(atom = beginAtom(i); atom != NULL; atom = nextAtom(i)) {
82	–	mass = atom->getMass();
83	–	totalMass += mass;
84	–	}
126
127	<	haveTotalMass = true;
128	<	}
127	>	Vector3d getPos() {
128	>	return ((snapshotMan_->getCurrentSnapshot())->*storage_).position[localIndex_];
129	>	}
130	>
131	>	int getNumAtom() {
132	>	return cutoffAtomList.size();
133	>	}
134	>
135	>	int getGlobalIndex() {
136	>	return globalIndex;
137	>	}
138	>
139	>	void setGlobalIndex(int id) {
140	>	this->globalIndex = id;
141	>	}
142
143	<	return totalMass;
144	<	}
143	>	/**
144	>	* Returns the local index of this cutoffGroup
145	>	* @return the local index of this cutoffGroup
146	>	*/
147	>	int getLocalIndex() {
148	>	return localIndex_;
149	>	}
150
151	<	void getCOM(Vector3d & com) {
152	<	std::vector<Atom *>::iterator i;
153	<	Atom * atom;
154	<	Vector3d pos;
155	<	double mass;
151	>	/**
152	>	* Sets the local index of this cutoffGroup
153	>	* @param index new index to be set
154	>	*/
155	>	void setLocalIndex(int index) {
156	>	localIndex_ = index;
157	>	}
158	>
159	>	private:
160	>
161	>	std::vector<Atom *>cutoffAtomList;
162	>	bool haveTotalMass;
163	>	RealType totalMass;
164	>	int globalIndex;
165
166	<	com[0] = 0;
167	<	com[1] = 0;
168	<	com[2] = 0;
101	<	totalMass = getMass();
166	>	int localIndex_;
167	>	DataStoragePointer storage_;
168	>	SnapshotManager* snapshotMan_;
169
170	<	if (cutoffAtomList.size() == 1) {
171	<	com = beginAtom(i)->getPos();
105	<	} else {
106	<	for(atom = beginAtom(i); atom != NULL; atom = nextAtom(i)) {
107	<	mass = atom->getMass();
108	<	pos = atom->getPos();
109	<	com += pos * mass;
110	<	}
111	<
112	<	com /= totalMass;
113	<	}
114	<	}
115	<
116	<	int getNumAtom() {
117	<	return cutoffAtomList.size();
118	<	}
119	<
120	<	int getGlobalIndex() {
121	<	return globalIndex;
122	<	}
123	<
124	<	void setGlobalIndex(int id) {
125	<	this->globalIndex = id;
126	<	}
127	<
128	<	private:
129	<
130	<	std::vector<Atom *>cutoffAtomList;
131	<	bool haveTotalMass;
132	<	double totalMass;
133	<	int globalIndex;
134	<	};
135	<
136	<	}      //end namespace oopse
137	<
170	>	};
171	>	} //end namespace OpenMD
172		#endif //PRIMITIVES_CUTOFFGROUP_HPP

Comparing:
trunk/src/primitives/CutoffGroup.hpp (property svn:keywords), Revision 430 by tim, Thu Mar 10 23:56:42 2005 UTC vs.
branches/development/src/primitives/CutoffGroup.hpp (property svn:keywords), Revision 1551 by gezelter, Thu Apr 28 18:38:21 2011 UTC

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

Diff Legend

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