ViewVC Help

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

root/OpenMD/trunk/src/brains/SimInfo.cpp

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 1241 by gezelter, Fri Apr 25 15:14:47 2008 UTC vs.
Revision 1983 by gezelter, Tue Apr 15 20:36:19 2014 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		/**
#	Line 46 | Line 47
47		* @version 1.0
48		*/
49
50	+	#ifdef IS_MPI
51	+	#include <mpi.h>
52	+	#endif
53		#include <algorithm>
54		#include <set>
55		#include <map>
#	Line 54 | Line 58
58		#include "math/Vector3.hpp"
59		#include "primitives/Molecule.hpp"
60		#include "primitives/StuntDouble.hpp"
57	–	#include "UseTheForce/fCutoffPolicy.h"
58	–	#include "UseTheForce/DarkSide/fElectrostaticSummationMethod.h"
59	–	#include "UseTheForce/DarkSide/fElectrostaticScreeningMethod.h"
60	–	#include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
61	–	#include "UseTheForce/doForces_interface.h"
62	–	#include "UseTheForce/DarkSide/neighborLists_interface.h"
63	–	#include "UseTheForce/DarkSide/electrostatic_interface.h"
64	–	#include "UseTheForce/DarkSide/switcheroo_interface.h"
61		#include "utils/MemoryUtils.hpp"
62		#include "utils/simError.h"
63		#include "selection/SelectionManager.hpp"
64		#include "io/ForceFieldOptions.hpp"
65	<	#include "UseTheForce/ForceField.hpp"
65	>	#include "brains/ForceField.hpp"
66	>	#include "nonbonded/SwitchingFunction.hpp"
67
68	<
69	<	#ifdef IS_MPI
73	<	#include "UseTheForce/mpiComponentPlan.h"
74	<	#include "UseTheForce/DarkSide/simParallel_interface.h"
75	<	#endif
76	<
77	<	namespace oopse {
78	<	std::set<int> getRigidSet(int index, std::map<int, std::set<int> >& container) {
79	<	std::map<int, std::set<int> >::iterator i = container.find(index);
80	<	std::set<int> result;
81	<	if (i != container.end()) {
82	<	result = i->second;
83	<	}
84	<
85	<	return result;
86	<	}
68	>	using namespace std;
69	>	namespace OpenMD {
70
71		SimInfo::SimInfo(ForceField* ff, Globals* simParams) :
72		forceField_(ff), simParams_(simParams),
73		ndf_(0), fdf_local(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
74		nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
75	<	nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
76	<	nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
77	<	nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
78	<	sman_(NULL), fortranInitialized_(false), calcBoxDipole_(false),
79	<	useAtomicVirial_(true) {
75	>	nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
76	>	nGlobalFluctuatingCharges_(0), nGlobalBonds_(0), nGlobalBends_(0),
77	>	nGlobalTorsions_(0), nGlobalInversions_(0), nGlobalConstraints_(0),
78	>	nAtoms_(0), nBonds_(0), nBends_(0), nTorsions_(0), nInversions_(0),
79	>	nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
80	>	nConstraints_(0), nFluctuatingCharges_(0), sman_(NULL),
81	>	topologyDone_(false), calcBoxDipole_(false), useAtomicVirial_(true),
82	>	hasNGlobalConstraints_(false) {
83	>
84	>	MoleculeStamp* molStamp;
85	>	int nMolWithSameStamp;
86	>	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
87	>	int nGroups = 0;       //total cutoff groups defined in meta-data file
88	>	CutoffGroupStamp* cgStamp;
89	>	RigidBodyStamp* rbStamp;
90	>	int nRigidAtoms = 0;
91	>
92	>	vector<Component*> components = simParams->getComponents();
93	>
94	>	for (vector<Component*>::iterator i = components.begin();
95	>	i !=components.end(); ++i) {
96	>	molStamp = (*i)->getMoleculeStamp();
97	>	if ( (*i)->haveRegion() ) {
98	>	molStamp->setRegion( (*i)->getRegion() );
99	>	} else {
100	>	// set the region to a disallowed value:
101	>	molStamp->setRegion( -1 );
102	>	}
103
104	<	MoleculeStamp* molStamp;
99	<	int nMolWithSameStamp;
100	<	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
101	<	int nGroups = 0;      //total cutoff groups defined in meta-data file
102	<	CutoffGroupStamp* cgStamp;
103	<	RigidBodyStamp* rbStamp;
104	<	int nRigidAtoms = 0;
105	<	std::vector<Component*> components = simParams->getComponents();
104	>	nMolWithSameStamp = (*i)->getNMol();
105
106	<	for (std::vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
107	<	molStamp = (*i)->getMoleculeStamp();
108	<	nMolWithSameStamp = (*i)->getNMol();
109	<
110	<	addMoleculeStamp(molStamp, nMolWithSameStamp);
111	<
112	<	//calculate atoms in molecules
113	<	nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;
114	<
115	<	//calculate atoms in cutoff groups
116	<	int nAtomsInGroups = 0;
117	<	int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
118	<
119	<	for (int j=0; j < nCutoffGroupsInStamp; j++) {
120	<	cgStamp = molStamp->getCutoffGroupStamp(j);
121	<	nAtomsInGroups += cgStamp->getNMembers();
123	<	}
124	<
125	<	nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
126	<
127	<	nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;
128	<
129	<	//calculate atoms in rigid bodies
130	<	int nAtomsInRigidBodies = 0;
131	<	int nRigidBodiesInStamp = molStamp->getNRigidBodies();
132	<
133	<	for (int j=0; j < nRigidBodiesInStamp; j++) {
134	<	rbStamp = molStamp->getRigidBodyStamp(j);
135	<	nAtomsInRigidBodies += rbStamp->getNMembers();
136	<	}
137	<
138	<	nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
139	<	nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;
140	<
106	>	addMoleculeStamp(molStamp, nMolWithSameStamp);
107	>
108	>	//calculate atoms in molecules
109	>	nGlobalAtoms_ += molStamp->getNAtoms() * nMolWithSameStamp;
110	>	nGlobalBonds_ += molStamp->getNBonds() * nMolWithSameStamp;
111	>	nGlobalBends_ += molStamp->getNBends() * nMolWithSameStamp;
112	>	nGlobalTorsions_ += molStamp->getNTorsions() * nMolWithSameStamp;
113	>	nGlobalInversions_ += molStamp->getNInversions() * nMolWithSameStamp;
114	>
115	>	//calculate atoms in cutoff groups
116	>	int nAtomsInGroups = 0;
117	>	int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
118	>
119	>	for (int j=0; j < nCutoffGroupsInStamp; j++) {
120	>	cgStamp = molStamp->getCutoffGroupStamp(j);
121	>	nAtomsInGroups += cgStamp->getNMembers();
122		}
123	<
124	<	//every free atom (atom does not belong to cutoff groups) is a cutoff
125	<	//group therefore the total number of cutoff groups in the system is
126	<	//equal to the total number of atoms minus number of atoms belong to
127	<	//cutoff group defined in meta-data file plus the number of cutoff
128	<	//groups defined in meta-data file
129	<	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
130	<
131	<	//every free atom (atom does not belong to rigid bodies) is an
132	<	//integrable object therefore the total number of integrable objects
133	<	//in the system is equal to the total number of atoms minus number of
134	<	//atoms belong to rigid body defined in meta-data file plus the number
135	<	//of rigid bodies defined in meta-data file
136	<	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
137	<	+ nGlobalRigidBodies_;
138	<
139	<	nGlobalMols_ = molStampIds_.size();
159	<	molToProcMap_.resize(nGlobalMols_);
123	>
124	>	nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
125	>
126	>	nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;
127	>
128	>	//calculate atoms in rigid bodies
129	>	int nAtomsInRigidBodies = 0;
130	>	int nRigidBodiesInStamp = molStamp->getNRigidBodies();
131	>
132	>	for (int j=0; j < nRigidBodiesInStamp; j++) {
133	>	rbStamp = molStamp->getRigidBodyStamp(j);
134	>	nAtomsInRigidBodies += rbStamp->getNMembers();
135	>	}
136	>
137	>	nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
138	>	nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;
139	>
140		}
141	+
142	+	//every free atom (atom does not belong to cutoff groups) is a cutoff
143	+	//group therefore the total number of cutoff groups in the system is
144	+	//equal to the total number of atoms minus number of atoms belong to
145	+	//cutoff group defined in meta-data file plus the number of cutoff
146	+	//groups defined in meta-data file
147
148	+	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
149	+
150	+	//every free atom (atom does not belong to rigid bodies) is an
151	+	//integrable object therefore the total number of integrable objects
152	+	//in the system is equal to the total number of atoms minus number of
153	+	//atoms belong to rigid body defined in meta-data file plus the number
154	+	//of rigid bodies defined in meta-data file
155	+	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
156	+	+ nGlobalRigidBodies_;
157	+
158	+	nGlobalMols_ = molStampIds_.size();
159	+	molToProcMap_.resize(nGlobalMols_);
160	+	}
161	+
162		SimInfo::~SimInfo() {
163	<	std::map<int, Molecule*>::iterator i;
163	>	map<int, Molecule*>::iterator i;
164		for (i = molecules_.begin(); i != molecules_.end(); ++i) {
165		delete i->second;
166		}
#	Line 171 | Line 171 | namespace oopse {
171		delete forceField_;
172		}
173
174	–	int SimInfo::getNGlobalConstraints() {
175	–	int nGlobalConstraints;
176	–	#ifdef IS_MPI
177	–	MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
178	–	MPI_COMM_WORLD);
179	–	#else
180	–	nGlobalConstraints =  nConstraints_;
181	–	#endif
182	–	return nGlobalConstraints;
183	–	}
174
175		bool SimInfo::addMolecule(Molecule* mol) {
176		MoleculeIterator i;
177	<
177	>
178		i = molecules_.find(mol->getGlobalIndex());
179		if (i == molecules_.end() ) {
180	<
181	<	molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
182	<
180	>
181	>	molecules_.insert(make_pair(mol->getGlobalIndex(), mol));
182	>
183		nAtoms_ += mol->getNAtoms();
184		nBonds_ += mol->getNBonds();
185		nBends_ += mol->getNBends();
186		nTorsions_ += mol->getNTorsions();
187	+	nInversions_ += mol->getNInversions();
188		nRigidBodies_ += mol->getNRigidBodies();
189		nIntegrableObjects_ += mol->getNIntegrableObjects();
190		nCutoffGroups_ += mol->getNCutoffGroups();
191		nConstraints_ += mol->getNConstraintPairs();
192	<
193	<	addExcludePairs(mol);
194	<
192	>
193	>	addInteractionPairs(mol);
194	>
195		return true;
196		} else {
197		return false;
198		}
199		}
200	<
200	>
201		bool SimInfo::removeMolecule(Molecule* mol) {
202		MoleculeIterator i;
203		i = molecules_.find(mol->getGlobalIndex());
#	Line 219 | Line 210 | namespace oopse {
210		nBonds_ -= mol->getNBonds();
211		nBends_ -= mol->getNBends();
212		nTorsions_ -= mol->getNTorsions();
213	+	nInversions_ -= mol->getNInversions();
214		nRigidBodies_ -= mol->getNRigidBodies();
215		nIntegrableObjects_ -= mol->getNIntegrableObjects();
216		nCutoffGroups_ -= mol->getNCutoffGroups();
217		nConstraints_ -= mol->getNConstraintPairs();
218
219	<	removeExcludePairs(mol);
219	>	removeInteractionPairs(mol);
220		molecules_.erase(mol->getGlobalIndex());
221
222		delete mol;
#	Line 233 | Line 225 | namespace oopse {
225		} else {
226		return false;
227		}
236	–
237	–
228		}
229
230
#	Line 250 | Line 240 | namespace oopse {
240
241
242		void SimInfo::calcNdf() {
243	<	int ndf_local;
243	>	int ndf_local, nfq_local;
244		MoleculeIterator i;
245	<	std::vector<StuntDouble*>::iterator j;
245	>	vector<StuntDouble*>::iterator j;
246	>	vector<Atom*>::iterator k;
247	>
248		Molecule* mol;
249	<	StuntDouble* integrableObject;
249	>	StuntDouble* sd;
250	>	Atom* atom;
251
252		ndf_local = 0;
253	+	nfq_local = 0;
254
255		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
262	–	for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
263	–	integrableObject = mol->nextIntegrableObject(j)) {
256
257	+	for (sd = mol->beginIntegrableObject(j); sd != NULL;
258	+	sd = mol->nextIntegrableObject(j)) {
259	+
260		ndf_local += 3;
261
262	<	if (integrableObject->isDirectional()) {
263	<	if (integrableObject->isLinear()) {
262	>	if (sd->isDirectional()) {
263	>	if (sd->isLinear()) {
264		ndf_local += 2;
265		} else {
266		ndf_local += 3;
267		}
268		}
269	<
269	>	}
270	>
271	>	for (atom = mol->beginFluctuatingCharge(k); atom != NULL;
272	>	atom = mol->nextFluctuatingCharge(k)) {
273	>	if (atom->isFluctuatingCharge()) {
274	>	nfq_local++;
275	>	}
276		}
277		}
278
279	+	ndfLocal_ = ndf_local;
280	+
281		// n_constraints is local, so subtract them on each processor
282		ndf_local -= nConstraints_;
283
284		#ifdef IS_MPI
285	<	MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
285	>	MPI_Allreduce(&ndf_local, &ndf_, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
286	>	MPI_Allreduce(&nfq_local, &nGlobalFluctuatingCharges_, 1,
287	>	MPI_INT, MPI_SUM, MPI_COMM_WORLD);
288		#else
289		ndf_ = ndf_local;
290	+	nGlobalFluctuatingCharges_ = nfq_local;
291		#endif
292
293		// nZconstraints_ is global, as are the 3 COM translations for the
#	Line 292 | Line 298 | namespace oopse {
298
299		int SimInfo::getFdf() {
300		#ifdef IS_MPI
301	<	MPI_Allreduce(&fdf_local,&fdf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
301	>	MPI_Allreduce(&fdf_local, &fdf_, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
302		#else
303		fdf_ = fdf_local;
304		#endif
305		return fdf_;
306		}
307	+
308	+	unsigned int SimInfo::getNLocalCutoffGroups(){
309	+	int nLocalCutoffAtoms = 0;
310	+	Molecule* mol;
311	+	MoleculeIterator mi;
312	+	CutoffGroup* cg;
313	+	Molecule::CutoffGroupIterator ci;
314
315	+	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
316	+
317	+	for (cg = mol->beginCutoffGroup(ci); cg != NULL;
318	+	cg = mol->nextCutoffGroup(ci)) {
319	+	nLocalCutoffAtoms += cg->getNumAtom();
320	+
321	+	}
322	+	}
323	+
324	+	return nAtoms_ - nLocalCutoffAtoms + nCutoffGroups_;
325	+	}
326	+
327		void SimInfo::calcNdfRaw() {
328		int ndfRaw_local;
329
330		MoleculeIterator i;
331	<	std::vector<StuntDouble*>::iterator j;
331	>	vector<StuntDouble*>::iterator j;
332		Molecule* mol;
333	<	StuntDouble* integrableObject;
333	>	StuntDouble* sd;
334
335		// Raw degrees of freedom that we have to set
336		ndfRaw_local = 0;
337
338		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
314	–	for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
315	–	integrableObject = mol->nextIntegrableObject(j)) {
339
340	+	for (sd = mol->beginIntegrableObject(j); sd != NULL;
341	+	sd = mol->nextIntegrableObject(j)) {
342	+
343		ndfRaw_local += 3;
344
345	<	if (integrableObject->isDirectional()) {
346	<	if (integrableObject->isLinear()) {
345	>	if (sd->isDirectional()) {
346	>	if (sd->isLinear()) {
347		ndfRaw_local += 2;
348		} else {
349		ndfRaw_local += 3;
#	Line 328 | Line 354 | namespace oopse {
354		}
355
356		#ifdef IS_MPI
357	<	MPI_Allreduce(&ndfRaw_local,&ndfRaw_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
357	>	MPI_Allreduce(&ndfRaw_local, &ndfRaw_, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
358		#else
359		ndfRaw_ = ndfRaw_local;
360		#endif
#	Line 339 | Line 365 | namespace oopse {
365
366		ndfTrans_local = 3 * nIntegrableObjects_ - nConstraints_;
367
342	–
368		#ifdef IS_MPI
369	<	MPI_Allreduce(&ndfTrans_local,&ndfTrans_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
369	>	MPI_Allreduce(&ndfTrans_local, &ndfTrans_, 1, MPI_INT, MPI_SUM,
370	>	MPI_COMM_WORLD);
371		#else
372		ndfTrans_ = ndfTrans_local;
373		#endif
374
375		ndfTrans_ = ndfTrans_ - 3 - nZconstraint_;
350	–
376		}
377
378	<	void SimInfo::addExcludePairs(Molecule* mol) {
379	<	std::vector<Bond*>::iterator bondIter;
380	<	std::vector<Bend*>::iterator bendIter;
381	<	std::vector<Torsion*>::iterator torsionIter;
378	>	void SimInfo::addInteractionPairs(Molecule* mol) {
379	>	ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
380	>	vector<Bond*>::iterator bondIter;
381	>	vector<Bend*>::iterator bendIter;
382	>	vector<Torsion*>::iterator torsionIter;
383	>	vector<Inversion*>::iterator inversionIter;
384		Bond* bond;
385		Bend* bend;
386		Torsion* torsion;
387	+	Inversion* inversion;
388		int a;
389		int b;
390		int c;
391		int d;
392
393	<	std::map<int, std::set<int> > atomGroups;
393	>	// atomGroups can be used to add special interaction maps between
394	>	// groups of atoms that are in two separate rigid bodies.
395	>	// However, most site-site interactions between two rigid bodies
396	>	// are probably not special, just the ones between the physically
397	>	// bonded atoms.  Interactions *within* a single rigid body should
398	>	// always be excluded.  These are done at the bottom of this
399	>	// function.
400
401	+	map<int, set<int> > atomGroups;
402		Molecule::RigidBodyIterator rbIter;
403		RigidBody* rb;
404		Molecule::IntegrableObjectIterator ii;
405	<	StuntDouble* integrableObject;
405	>	StuntDouble* sd;
406
407	<	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
408	<	integrableObject = mol->nextIntegrableObject(ii)) {
409	<
410	<	if (integrableObject->isRigidBody()) {
411	<	rb = static_cast<RigidBody*>(integrableObject);
412	<	std::vector<Atom*> atoms = rb->getAtoms();
413	<	std::set<int> rigidAtoms;
414	<	for (int i = 0; i < atoms.size(); ++i) {
415	<	rigidAtoms.insert(atoms[i]->getGlobalIndex());
416	<	}
417	<	for (int i = 0; i < atoms.size(); ++i) {
418	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
419	<	}
407	>	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
408	>	sd = mol->nextIntegrableObject(ii)) {
409	>
410	>	if (sd->isRigidBody()) {
411	>	rb = static_cast<RigidBody*>(sd);
412	>	vector<Atom*> atoms = rb->getAtoms();
413	>	set<int> rigidAtoms;
414	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
415	>	rigidAtoms.insert(atoms[i]->getGlobalIndex());
416	>	}
417	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
418	>	atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
419	>	}
420		} else {
421	<	std::set<int> oneAtomSet;
422	<	oneAtomSet.insert(integrableObject->getGlobalIndex());
423	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
421	>	set<int> oneAtomSet;
422	>	oneAtomSet.insert(sd->getGlobalIndex());
423	>	atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));
424		}
425		}
426
427	<
428	<
429	<	for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
427	>
428	>	for (bond= mol->beginBond(bondIter); bond != NULL;
429	>	bond = mol->nextBond(bondIter)) {
430	>
431		a = bond->getAtomA()->getGlobalIndex();
432	<	b = bond->getAtomB()->getGlobalIndex();
433	<	exclude_.addPair(a, b);
432	>	b = bond->getAtomB()->getGlobalIndex();
433	>
434	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
435	>	oneTwoInteractions_.addPair(a, b);
436	>	} else {
437	>	excludedInteractions_.addPair(a, b);
438	>	}
439		}
440
441	<	for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
441	>	for (bend= mol->beginBend(bendIter); bend != NULL;
442	>	bend = mol->nextBend(bendIter)) {
443	>
444		a = bend->getAtomA()->getGlobalIndex();
445		b = bend->getAtomB()->getGlobalIndex();
446		c = bend->getAtomC()->getGlobalIndex();
404	–	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
405	–	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
406	–	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
407	–
408	–	exclude_.addPairs(rigidSetA, rigidSetB);
409	–	exclude_.addPairs(rigidSetA, rigidSetC);
410	–	exclude_.addPairs(rigidSetB, rigidSetC);
447
448	<	//exclude_.addPair(a, b);
449	<	//exclude_.addPair(a, c);
450	<	//exclude_.addPair(b, c);
448	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
449	>	oneTwoInteractions_.addPair(a, b);
450	>	oneTwoInteractions_.addPair(b, c);
451	>	} else {
452	>	excludedInteractions_.addPair(a, b);
453	>	excludedInteractions_.addPair(b, c);
454	>	}
455	>
456	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
457	>	oneThreeInteractions_.addPair(a, c);
458	>	} else {
459	>	excludedInteractions_.addPair(a, c);
460	>	}
461		}
462
463	<	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
463	>	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
464	>	torsion = mol->nextTorsion(torsionIter)) {
465	>
466		a = torsion->getAtomA()->getGlobalIndex();
467		b = torsion->getAtomB()->getGlobalIndex();
468		c = torsion->getAtomC()->getGlobalIndex();
469	<	d = torsion->getAtomD()->getGlobalIndex();
422	<	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
423	<	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
424	<	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
425	<	std::set<int> rigidSetD = getRigidSet(d, atomGroups);
469	>	d = torsion->getAtomD()->getGlobalIndex();
470
471	<	exclude_.addPairs(rigidSetA, rigidSetB);
472	<	exclude_.addPairs(rigidSetA, rigidSetC);
473	<	exclude_.addPairs(rigidSetA, rigidSetD);
474	<	exclude_.addPairs(rigidSetB, rigidSetC);
475	<	exclude_.addPairs(rigidSetB, rigidSetD);
476	<	exclude_.addPairs(rigidSetC, rigidSetD);
471	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
472	>	oneTwoInteractions_.addPair(a, b);
473	>	oneTwoInteractions_.addPair(b, c);
474	>	oneTwoInteractions_.addPair(c, d);
475	>	} else {
476	>	excludedInteractions_.addPair(a, b);
477	>	excludedInteractions_.addPair(b, c);
478	>	excludedInteractions_.addPair(c, d);
479	>	}
480
481	<	/*
482	<	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
483	<	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
484	<	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
485	<	exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
486	<	exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
487	<	exclude_.addPairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
488	<
489	<
490	<	exclude_.addPair(a, b);
491	<	exclude_.addPair(a, c);
492	<	exclude_.addPair(a, d);
493	<	exclude_.addPair(b, c);
447	<	exclude_.addPair(b, d);
448	<	exclude_.addPair(c, d);
449	<	*/
481	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
482	>	oneThreeInteractions_.addPair(a, c);
483	>	oneThreeInteractions_.addPair(b, d);
484	>	} else {
485	>	excludedInteractions_.addPair(a, c);
486	>	excludedInteractions_.addPair(b, d);
487	>	}
488	>
489	>	if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
490	>	oneFourInteractions_.addPair(a, d);
491	>	} else {
492	>	excludedInteractions_.addPair(a, d);
493	>	}
494		}
495
496	<	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
497	<	std::vector<Atom*> atoms = rb->getAtoms();
498	<	for (int i = 0; i < atoms.size() -1 ; ++i) {
499	<	for (int j = i + 1; j < atoms.size(); ++j) {
496	>	for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
497	>	inversion = mol->nextInversion(inversionIter)) {
498	>
499	>	a = inversion->getAtomA()->getGlobalIndex();
500	>	b = inversion->getAtomB()->getGlobalIndex();
501	>	c = inversion->getAtomC()->getGlobalIndex();
502	>	d = inversion->getAtomD()->getGlobalIndex();
503	>
504	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
505	>	oneTwoInteractions_.addPair(a, b);
506	>	oneTwoInteractions_.addPair(a, c);
507	>	oneTwoInteractions_.addPair(a, d);
508	>	} else {
509	>	excludedInteractions_.addPair(a, b);
510	>	excludedInteractions_.addPair(a, c);
511	>	excludedInteractions_.addPair(a, d);
512	>	}
513	>
514	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
515	>	oneThreeInteractions_.addPair(b, c);
516	>	oneThreeInteractions_.addPair(b, d);
517	>	oneThreeInteractions_.addPair(c, d);
518	>	} else {
519	>	excludedInteractions_.addPair(b, c);
520	>	excludedInteractions_.addPair(b, d);
521	>	excludedInteractions_.addPair(c, d);
522	>	}
523	>	}
524	>
525	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL;
526	>	rb = mol->nextRigidBody(rbIter)) {
527	>	vector<Atom*> atoms = rb->getAtoms();
528	>	for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
529	>	for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
530		a = atoms[i]->getGlobalIndex();
531		b = atoms[j]->getGlobalIndex();
532	<	exclude_.addPair(a, b);
532	>	excludedInteractions_.addPair(a, b);
533		}
534		}
535		}
536
537		}
538
539	<	void SimInfo::removeExcludePairs(Molecule* mol) {
540	<	std::vector<Bond*>::iterator bondIter;
541	<	std::vector<Bend*>::iterator bendIter;
542	<	std::vector<Torsion*>::iterator torsionIter;
539	>	void SimInfo::removeInteractionPairs(Molecule* mol) {
540	>	ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
541	>	vector<Bond*>::iterator bondIter;
542	>	vector<Bend*>::iterator bendIter;
543	>	vector<Torsion*>::iterator torsionIter;
544	>	vector<Inversion*>::iterator inversionIter;
545		Bond* bond;
546		Bend* bend;
547		Torsion* torsion;
548	+	Inversion* inversion;
549		int a;
550		int b;
551		int c;
552		int d;
553
554	<	std::map<int, std::set<int> > atomGroups;
478	<
554	>	map<int, set<int> > atomGroups;
555		Molecule::RigidBodyIterator rbIter;
556		RigidBody* rb;
557		Molecule::IntegrableObjectIterator ii;
558	<	StuntDouble* integrableObject;
558	>	StuntDouble* sd;
559
560	<	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
561	<	integrableObject = mol->nextIntegrableObject(ii)) {
562	<
563	<	if (integrableObject->isRigidBody()) {
564	<	rb = static_cast<RigidBody*>(integrableObject);
565	<	std::vector<Atom*> atoms = rb->getAtoms();
566	<	std::set<int> rigidAtoms;
567	<	for (int i = 0; i < atoms.size(); ++i) {
568	<	rigidAtoms.insert(atoms[i]->getGlobalIndex());
569	<	}
570	<	for (int i = 0; i < atoms.size(); ++i) {
571	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
572	<	}
560	>	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
561	>	sd = mol->nextIntegrableObject(ii)) {
562	>
563	>	if (sd->isRigidBody()) {
564	>	rb = static_cast<RigidBody*>(sd);
565	>	vector<Atom*> atoms = rb->getAtoms();
566	>	set<int> rigidAtoms;
567	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
568	>	rigidAtoms.insert(atoms[i]->getGlobalIndex());
569	>	}
570	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
571	>	atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
572	>	}
573		} else {
574	<	std::set<int> oneAtomSet;
575	<	oneAtomSet.insert(integrableObject->getGlobalIndex());
576	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
574	>	set<int> oneAtomSet;
575	>	oneAtomSet.insert(sd->getGlobalIndex());
576	>	atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));
577		}
578		}
579
580	<
581	<	for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
580	>	for (bond= mol->beginBond(bondIter); bond != NULL;
581	>	bond = mol->nextBond(bondIter)) {
582	>
583		a = bond->getAtomA()->getGlobalIndex();
584	<	b = bond->getAtomB()->getGlobalIndex();
585	<	exclude_.removePair(a, b);
584	>	b = bond->getAtomB()->getGlobalIndex();
585	>
586	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
587	>	oneTwoInteractions_.removePair(a, b);
588	>	} else {
589	>	excludedInteractions_.removePair(a, b);
590	>	}
591		}
592
593	<	for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
593	>	for (bend= mol->beginBend(bendIter); bend != NULL;
594	>	bend = mol->nextBend(bendIter)) {
595	>
596		a = bend->getAtomA()->getGlobalIndex();
597		b = bend->getAtomB()->getGlobalIndex();
598		c = bend->getAtomC()->getGlobalIndex();
515	–
516	–	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
517	–	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
518	–	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
519	–
520	–	exclude_.removePairs(rigidSetA, rigidSetB);
521	–	exclude_.removePairs(rigidSetA, rigidSetC);
522	–	exclude_.removePairs(rigidSetB, rigidSetC);
599
600	<	//exclude_.removePair(a, b);
601	<	//exclude_.removePair(a, c);
602	<	//exclude_.removePair(b, c);
600	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
601	>	oneTwoInteractions_.removePair(a, b);
602	>	oneTwoInteractions_.removePair(b, c);
603	>	} else {
604	>	excludedInteractions_.removePair(a, b);
605	>	excludedInteractions_.removePair(b, c);
606	>	}
607	>
608	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
609	>	oneThreeInteractions_.removePair(a, c);
610	>	} else {
611	>	excludedInteractions_.removePair(a, c);
612	>	}
613		}
614
615	<	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
615	>	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
616	>	torsion = mol->nextTorsion(torsionIter)) {
617	>
618		a = torsion->getAtomA()->getGlobalIndex();
619		b = torsion->getAtomB()->getGlobalIndex();
620		c = torsion->getAtomC()->getGlobalIndex();
621	<	d = torsion->getAtomD()->getGlobalIndex();
621	>	d = torsion->getAtomD()->getGlobalIndex();
622	>
623	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
624	>	oneTwoInteractions_.removePair(a, b);
625	>	oneTwoInteractions_.removePair(b, c);
626	>	oneTwoInteractions_.removePair(c, d);
627	>	} else {
628	>	excludedInteractions_.removePair(a, b);
629	>	excludedInteractions_.removePair(b, c);
630	>	excludedInteractions_.removePair(c, d);
631	>	}
632
633	<	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
634	<	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
635	<	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
636	<	std::set<int> rigidSetD = getRigidSet(d, atomGroups);
633	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
634	>	oneThreeInteractions_.removePair(a, c);
635	>	oneThreeInteractions_.removePair(b, d);
636	>	} else {
637	>	excludedInteractions_.removePair(a, c);
638	>	excludedInteractions_.removePair(b, d);
639	>	}
640
641	<	exclude_.removePairs(rigidSetA, rigidSetB);
642	<	exclude_.removePairs(rigidSetA, rigidSetC);
643	<	exclude_.removePairs(rigidSetA, rigidSetD);
644	<	exclude_.removePairs(rigidSetB, rigidSetC);
645	<	exclude_.removePairs(rigidSetB, rigidSetD);
646	<	exclude_.removePairs(rigidSetC, rigidSetD);
641	>	if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
642	>	oneFourInteractions_.removePair(a, d);
643	>	} else {
644	>	excludedInteractions_.removePair(a, d);
645	>	}
646	>	}
647
648	<	/*
649	<	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
549	<	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
550	<	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
551	<	exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
552	<	exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
553	<	exclude_.removePairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
648	>	for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
649	>	inversion = mol->nextInversion(inversionIter)) {
650
651	<
652	<	exclude_.removePair(a, b);
653	<	exclude_.removePair(a, c);
654	<	exclude_.removePair(a, d);
655	<	exclude_.removePair(b, c);
656	<	exclude_.removePair(b, d);
657	<	exclude_.removePair(c, d);
658	<	*/
651	>	a = inversion->getAtomA()->getGlobalIndex();
652	>	b = inversion->getAtomB()->getGlobalIndex();
653	>	c = inversion->getAtomC()->getGlobalIndex();
654	>	d = inversion->getAtomD()->getGlobalIndex();
655	>
656	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
657	>	oneTwoInteractions_.removePair(a, b);
658	>	oneTwoInteractions_.removePair(a, c);
659	>	oneTwoInteractions_.removePair(a, d);
660	>	} else {
661	>	excludedInteractions_.removePair(a, b);
662	>	excludedInteractions_.removePair(a, c);
663	>	excludedInteractions_.removePair(a, d);
664	>	}
665	>
666	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
667	>	oneThreeInteractions_.removePair(b, c);
668	>	oneThreeInteractions_.removePair(b, d);
669	>	oneThreeInteractions_.removePair(c, d);
670	>	} else {
671	>	excludedInteractions_.removePair(b, c);
672	>	excludedInteractions_.removePair(b, d);
673	>	excludedInteractions_.removePair(c, d);
674	>	}
675		}
676
677	<	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
678	<	std::vector<Atom*> atoms = rb->getAtoms();
679	<	for (int i = 0; i < atoms.size() -1 ; ++i) {
680	<	for (int j = i + 1; j < atoms.size(); ++j) {
677	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL;
678	>	rb = mol->nextRigidBody(rbIter)) {
679	>	vector<Atom*> atoms = rb->getAtoms();
680	>	for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
681	>	for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
682		a = atoms[i]->getGlobalIndex();
683		b = atoms[j]->getGlobalIndex();
684	<	exclude_.removePair(a, b);
684	>	excludedInteractions_.removePair(a, b);
685		}
686		}
687		}
688	<
688	>
689		}
690	<
691	<
690	>
691	>
692		void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
693		int curStampId;
694	<
694	>
695		//index from 0
696		curStampId = moleculeStamps_.size();
697
#	Line 586 | Line 699 | namespace oopse {
699		molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
700		}
701
589	–	void SimInfo::update() {
702
703	<	setupSimType();
704	<
705	<	#ifdef IS_MPI
706	<	setupFortranParallel();
707	<	#endif
708	<
709	<	setupFortranSim();
710	<
711	<	//setup fortran force field
712	<	/** @deprecate */
601	<	int isError = 0;
602	<
603	<	setupCutoff();
604	<
605	<	setupElectrostaticSummationMethod( isError );
606	<	setupSwitchingFunction();
607	<	setupAccumulateBoxDipole();
608	<
609	<	if(isError){
610	<	sprintf( painCave.errMsg,
611	<	"ForceField error: There was an error initializing the forceField in fortran.\n" );
612	<	painCave.isFatal = 1;
613	<	simError();
614	<	}
615	<
703	>	/**
704	>	* update
705	>	*
706	>	*  Performs the global checks and variable settings after the
707	>	*  objects have been created.
708	>	*
709	>	*/
710	>	void SimInfo::update() {
711	>	setupSimVariables();
712	>	calcNConstraints();
713		calcNdf();
714		calcNdfRaw();
715		calcNdfTrans();
619	–
620	–	fortranInitialized_ = true;
716		}
717	<
718	<	std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
717	>
718	>	/**
719	>	* getSimulatedAtomTypes
720	>	*
721	>	* Returns an STL set of AtomType* that are actually present in this
722	>	* simulation.  Must query all processors to assemble this information.
723	>	*
724	>	*/
725	>	set<AtomType*> SimInfo::getSimulatedAtomTypes() {
726		SimInfo::MoleculeIterator mi;
727		Molecule* mol;
728		Molecule::AtomIterator ai;
729		Atom* atom;
730	<	std::set<AtomType*> atomTypes;
731	<
730	>	set<AtomType*> atomTypes;
731	>
732		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
733	<
734	<	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
733	>	for(atom = mol->beginAtom(ai); atom != NULL;
734	>	atom = mol->nextAtom(ai)) {
735		atomTypes.insert(atom->getAtomType());
736	<	}
737	<
636	<	}
637	<
638	<	return atomTypes;
639	<	}
640	<
641	<	void SimInfo::setupSimType() {
642	<	std::set<AtomType*>::iterator i;
643	<	std::set<AtomType*> atomTypes;
644	<	atomTypes = getUniqueAtomTypes();
736	>	}
737	>	}
738
739	<	int useLennardJones = 0;
647	<	int useElectrostatic = 0;
648	<	int useEAM = 0;
649	<	int useSC = 0;
650	<	int useCharge = 0;
651	<	int useDirectional = 0;
652	<	int useDipole = 0;
653	<	int useGayBerne = 0;
654	<	int useSticky = 0;
655	<	int useStickyPower = 0;
656	<	int useShape = 0;
657	<	int useFLARB = 0; //it is not in AtomType yet
658	<	int useDirectionalAtom = 0;
659	<	int useElectrostatics = 0;
660	<	//usePBC and useRF are from simParams
661	<	int usePBC = simParams_->getUsePeriodicBoundaryConditions();
662	<	int useRF;
663	<	int useSF;
664	<	int useSP;
665	<	int useBoxDipole;
739	>	#ifdef IS_MPI
740
741	<	std::string myMethod;
742	<
669	<	// set the useRF logical
670	<	useRF = 0;
671	<	useSF = 0;
672	<	useSP = 0;
673	<
674	<
675	<	if (simParams_->haveElectrostaticSummationMethod()) {
676	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
677	<	toUpper(myMethod);
678	<	if (myMethod == "REACTION_FIELD"){
679	<	useRF = 1;
680	<	} else if (myMethod == "SHIFTED_FORCE"){
681	<	useSF = 1;
682	<	} else if (myMethod == "SHIFTED_POTENTIAL"){
683	<	useSP = 1;
684	<	}
685	<	}
741	>	// loop over the found atom types on this processor, and add their
742	>	// numerical idents to a vector:
743
744	<	if (simParams_->haveAccumulateBoxDipole())
745	<	if (simParams_->getAccumulateBoxDipole())
746	<	useBoxDipole = 1;
744	>	vector<int> foundTypes;
745	>	set<AtomType*>::iterator i;
746	>	for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
747	>	foundTypes.push_back( (*i)->getIdent() );
748
749	<	useAtomicVirial_ = simParams_->getUseAtomicVirial();
749	>	// count_local holds the number of found types on this processor
750	>	int count_local = foundTypes.size();
751
752	<	//loop over all of the atom types
753	<	for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
754	<	useLennardJones |= (*i)->isLennardJones();
696	<	useElectrostatic |= (*i)->isElectrostatic();
697	<	useEAM |= (*i)->isEAM();
698	<	useSC |= (*i)->isSC();
699	<	useCharge |= (*i)->isCharge();
700	<	useDirectional |= (*i)->isDirectional();
701	<	useDipole |= (*i)->isDipole();
702	<	useGayBerne |= (*i)->isGayBerne();
703	<	useSticky |= (*i)->isSticky();
704	<	useStickyPower |= (*i)->isStickyPower();
705	<	useShape |= (*i)->isShape();
706	<	}
752	>	int nproc;
753	>	MPI_Comm_size( MPI_COMM_WORLD, &nproc);
754	>	// int nproc = MPI::COMM_WORLD.Get_size();
755
756	<	if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
757	<	useDirectionalAtom = 1;
758	<	}
756	>	// we need arrays to hold the counts and displacement vectors for
757	>	// all processors
758	>	vector<int> counts(nproc, 0);
759	>	vector<int> disps(nproc, 0);
760
761	<	if (useCharge || useDipole) {
762	<	useElectrostatics = 1;
761	>	// fill the counts array
762	>	MPI_Allgather(&count_local, 1, MPI_INT, &counts[0],
763	>	1, MPI_INT, MPI_COMM_WORLD);
764	>	// MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0],
765	>	//                           1, MPI::INT);
766	>
767	>	// use the processor counts to compute the displacement array
768	>	disps[0] = 0;
769	>	int totalCount = counts[0];
770	>	for (int iproc = 1; iproc < nproc; iproc++) {
771	>	disps[iproc] = disps[iproc-1] + counts[iproc-1];
772	>	totalCount += counts[iproc];
773		}
774
775	<	#ifdef IS_MPI
776	<	int temp;
775	>	// we need a (possibly redundant) set of all found types:
776	>	vector<int> ftGlobal(totalCount);
777	>
778	>	// now spray out the foundTypes to all the other processors:
779	>	MPI_Allgatherv(&foundTypes[0], count_local, MPI_INT,
780	>	&ftGlobal[0], &counts[0], &disps[0],
781	>	MPI_INT, MPI_COMM_WORLD);
782	>	// MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
783	>	//                            &ftGlobal[0], &counts[0], &disps[0],
784	>	//                            MPI::INT);
785
786	<	temp = usePBC;
720	<	MPI_Allreduce(&temp, &usePBC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
786	>	vector<int>::iterator j;
787
788	<	temp = useDirectionalAtom;
789	<	MPI_Allreduce(&temp, &useDirectionalAtom, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
788	>	// foundIdents is a stl set, so inserting an already found ident
789	>	// will have no effect.
790	>	set<int> foundIdents;
791
792	<	temp = useLennardJones;
793	<	MPI_Allreduce(&temp, &useLennardJones, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
792	>	for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
793	>	foundIdents.insert((*j));
794	>
795	>	// now iterate over the foundIdents and get the actual atom types
796	>	// that correspond to these:
797	>	set<int>::iterator it;
798	>	for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
799	>	atomTypes.insert( forceField_->getAtomType((*it)) );
800	>
801	>	#endif
802
803	<	temp = useElectrostatics;
804	<	MPI_Allreduce(&temp, &useElectrostatics, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
803	>	return atomTypes;
804	>	}
805
731	–	temp = useCharge;
732	–	MPI_Allreduce(&temp, &useCharge, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
806
807	<	temp = useDipole;
808	<	MPI_Allreduce(&temp, &useDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
807	>	int getGlobalCountOfType(AtomType* atype) {
808	>	/*
809	>	set<AtomType*> atypes = getSimulatedAtomTypes();
810	>	map<AtomType*, int> counts_;
811
812	<	temp = useSticky;
813	<	MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
814	<
815	<	temp = useStickyPower;
816	<	MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
817	<
818	<	temp = useGayBerne;
819	<	MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
820	<
746	<	temp = useEAM;
747	<	MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
812	>	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
813	>	for(atom = mol->beginAtom(ai); atom != NULL;
814	>	atom = mol->nextAtom(ai)) {
815	>	atom->getAtomType();
816	>	}
817	>	}
818	>	*/
819	>	return 0;
820	>	}
821
822	<	temp = useSC;
823	<	MPI_Allreduce(&temp, &useSC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
822	>	void SimInfo::setupSimVariables() {
823	>	useAtomicVirial_ = simParams_->getUseAtomicVirial();
824	>	// we only call setAccumulateBoxDipole if the accumulateBoxDipole
825	>	// parameter is true
826	>	calcBoxDipole_ = false;
827	>	if ( simParams_->haveAccumulateBoxDipole() )
828	>	if ( simParams_->getAccumulateBoxDipole() ) {
829	>	calcBoxDipole_ = true;
830	>	}
831
832	<	temp = useShape;
833	<	MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
832	>	set<AtomType*>::iterator i;
833	>	set<AtomType*> atomTypes;
834	>	atomTypes = getSimulatedAtomTypes();
835	>	bool usesElectrostatic = false;
836	>	bool usesMetallic = false;
837	>	bool usesDirectional = false;
838	>	bool usesFluctuatingCharges =  false;
839	>	//loop over all of the atom types
840	>	for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
841	>	usesElectrostatic |= (*i)->isElectrostatic();
842	>	usesMetallic |= (*i)->isMetal();
843	>	usesDirectional |= (*i)->isDirectional();
844	>	usesFluctuatingCharges |= (*i)->isFluctuatingCharge();
845	>	}
846
847	<	temp = useFLARB;
848	<	MPI_Allreduce(&temp, &useFLARB, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
847	>	#ifdef IS_MPI
848	>	int temp;
849
850	<	temp = useRF;
851	<	MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
850	>	temp = usesDirectional;
851	>	MPI_Allreduce(MPI_IN_PLACE, &temp, 1, MPI_INT,  MPI_LOR, MPI_COMM_WORLD);
852	>	usesDirectionalAtoms_ = (temp == 0) ? false : true;
853	>
854	>	temp = usesMetallic;
855	>	MPI_Allreduce(MPI_IN_PLACE, &temp, 1, MPI_INT,  MPI_LOR, MPI_COMM_WORLD);
856	>	usesMetallicAtoms_ = (temp == 0) ? false : true;
857
858	<	temp = useSF;
859	<	MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
858	>	temp = usesElectrostatic;
859	>	MPI_Allreduce(MPI_IN_PLACE, &temp, 1, MPI_INT,  MPI_LOR, MPI_COMM_WORLD);
860	>	usesElectrostaticAtoms_ = (temp == 0) ? false : true;
861
862	<	temp = useSP;
863	<	MPI_Allreduce(&temp, &useSP, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
862	>	temp = usesFluctuatingCharges;
863	>	MPI_Allreduce(MPI_IN_PLACE, &temp, 1, MPI_INT,  MPI_LOR, MPI_COMM_WORLD);
864	>	usesFluctuatingCharges_ = (temp == 0) ? false : true;
865	>	#else
866
867	<	temp = useBoxDipole;
868	<	MPI_Allreduce(&temp, &useBoxDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
867	>	usesDirectionalAtoms_ = usesDirectional;
868	>	usesMetallicAtoms_ = usesMetallic;
869	>	usesElectrostaticAtoms_ = usesElectrostatic;
870	>	usesFluctuatingCharges_ = usesFluctuatingCharges;
871
770	–	temp = useAtomicVirial_;
771	–	MPI_Allreduce(&temp, &useAtomicVirial_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
772	–
872		#endif
873	<
874	<	fInfo_.SIM_uses_PBC = usePBC;
875	<	fInfo_.SIM_uses_DirectionalAtoms = useDirectionalAtom;
876	<	fInfo_.SIM_uses_LennardJones = useLennardJones;
778	<	fInfo_.SIM_uses_Electrostatics = useElectrostatics;
779	<	fInfo_.SIM_uses_Charges = useCharge;
780	<	fInfo_.SIM_uses_Dipoles = useDipole;
781	<	fInfo_.SIM_uses_Sticky = useSticky;
782	<	fInfo_.SIM_uses_StickyPower = useStickyPower;
783	<	fInfo_.SIM_uses_GayBerne = useGayBerne;
784	<	fInfo_.SIM_uses_EAM = useEAM;
785	<	fInfo_.SIM_uses_SC = useSC;
786	<	fInfo_.SIM_uses_Shapes = useShape;
787	<	fInfo_.SIM_uses_FLARB = useFLARB;
788	<	fInfo_.SIM_uses_RF = useRF;
789	<	fInfo_.SIM_uses_SF = useSF;
790	<	fInfo_.SIM_uses_SP = useSP;
791	<	fInfo_.SIM_uses_BoxDipole = useBoxDipole;
792	<	fInfo_.SIM_uses_AtomicVirial = useAtomicVirial_;
873	>
874	>	requiresPrepair_ = usesMetallicAtoms_ ? true : false;
875	>	requiresSkipCorrection_ = usesElectrostaticAtoms_ ? true : false;
876	>	requiresSelfCorrection_ = usesElectrostaticAtoms_ ? true : false;
877		}
878
879	<	void SimInfo::setupFortranSim() {
880	<	int isError;
881	<	int nExclude;
882	<	std::vector<int> fortranGlobalGroupMembership;
879	>
880	>	vector<int> SimInfo::getGlobalAtomIndices() {
881	>	SimInfo::MoleculeIterator mi;
882	>	Molecule* mol;
883	>	Molecule::AtomIterator ai;
884	>	Atom* atom;
885	>
886	>	vector<int> GlobalAtomIndices(getNAtoms(), 0);
887
888	<	nExclude = exclude_.getSize();
889	<	isError = 0;
888	>	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
889	>
890	>	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
891	>	GlobalAtomIndices[atom->getLocalIndex()] = atom->getGlobalIndex();
892	>	}
893	>	}
894	>	return GlobalAtomIndices;
895	>	}
896
897	<	//globalGroupMembership_ is filled by SimCreator
898	<	for (int i = 0; i < nGlobalAtoms_; i++) {
899	<	fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
897	>
898	>	vector<int> SimInfo::getGlobalGroupIndices() {
899	>	SimInfo::MoleculeIterator mi;
900	>	Molecule* mol;
901	>	Molecule::CutoffGroupIterator ci;
902	>	CutoffGroup* cg;
903	>
904	>	vector<int> GlobalGroupIndices;
905	>
906	>	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
907	>
908	>	//local index of cutoff group is trivial, it only depends on the
909	>	//order of travesing
910	>	for (cg = mol->beginCutoffGroup(ci); cg != NULL;
911	>	cg = mol->nextCutoffGroup(ci)) {
912	>	GlobalGroupIndices.push_back(cg->getGlobalIndex());
913	>	}
914		}
915	+	return GlobalGroupIndices;
916	+	}
917
918	+
919	+	void SimInfo::prepareTopology() {
920	+
921		//calculate mass ratio of cutoff group
809	–	std::vector<RealType> mfact;
922		SimInfo::MoleculeIterator mi;
923		Molecule* mol;
924		Molecule::CutoffGroupIterator ci;
#	Line 815 | Line 927 | namespace oopse {
927		Atom* atom;
928		RealType totalMass;
929
930	<	//to avoid memory reallocation, reserve enough space for mfact
931	<	mfact.reserve(getNCutoffGroups());
930	>	/**
931	>	* The mass factor is the relative mass of an atom to the total
932	>	* mass of the cutoff group it belongs to.  By default, all atoms
933	>	* are their own cutoff groups, and therefore have mass factors of
934	>	* 1.  We need some special handling for massless atoms, which
935	>	* will be treated as carrying the entire mass of the cutoff
936	>	* group.
937	>	*/
938	>	massFactors_.clear();
939	>	massFactors_.resize(getNAtoms(), 1.0);
940
941		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
942	<	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
942	>	for (cg = mol->beginCutoffGroup(ci); cg != NULL;
943	>	cg = mol->nextCutoffGroup(ci)) {
944
945		totalMass = cg->getMass();
946		for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
947		// Check for massless groups - set mfact to 1 if true
948	<	if (totalMass != 0)
949	<	mfact.push_back(atom->getMass()/totalMass);
948	>	if (totalMass != 0)
949	>	massFactors_[atom->getLocalIndex()] = atom->getMass()/totalMass;
950		else
951	<	mfact.push_back( 1.0 );
951	>	massFactors_[atom->getLocalIndex()] = 1.0;
952		}
832	–
953		}
954		}
955
956	<	//fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
837	<	std::vector<int> identArray;
838	<
839	<	//to avoid memory reallocation, reserve enough space identArray
840	<	identArray.reserve(getNAtoms());
841	<
842	<	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
843	<	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
844	<	identArray.push_back(atom->getIdent());
845	<	}
846	<	}
847	<
848	<	//fill molMembershipArray
849	<	//molMembershipArray is filled by SimCreator
850	<	std::vector<int> molMembershipArray(nGlobalAtoms_);
851	<	for (int i = 0; i < nGlobalAtoms_; i++) {
852	<	molMembershipArray[i] = globalMolMembership_[i] + 1;
853	<	}
854	<
855	<	//setup fortran simulation
856	<	int nGlobalExcludes = 0;
857	<	int* globalExcludes = NULL;
858	<	int* excludeList = exclude_.getExcludeList();
859	<	setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0],
860	<	&nExclude, excludeList , &nGlobalExcludes, globalExcludes,
861	<	&molMembershipArray[0], &mfact[0], &nCutoffGroups_,
862	<	&fortranGlobalGroupMembership[0], &isError);
863	<
864	<	if( isError ){
865	<
866	<	sprintf( painCave.errMsg,
867	<	"There was an error setting the simulation information in fortran.\n" );
868	<	painCave.isFatal = 1;
869	<	painCave.severity = OOPSE_ERROR;
870	<	simError();
871	<	}
872	<
873	<
874	<	sprintf( checkPointMsg,
875	<	"succesfully sent the simulation information to fortran.\n");
876	<
877	<	errorCheckPoint();
878	<
879	<	// Setup number of neighbors in neighbor list if present
880	<	if (simParams_->haveNeighborListNeighbors()) {
881	<	int nlistNeighbors = simParams_->getNeighborListNeighbors();
882	<	setNeighbors(&nlistNeighbors);
883	<	}
884	<
885	<
886	<	}
887	<
888	<
889	<	void SimInfo::setupFortranParallel() {
890	<	#ifdef IS_MPI
891	<	//SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
892	<	std::vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
893	<	std::vector<int> localToGlobalCutoffGroupIndex;
894	<	SimInfo::MoleculeIterator mi;
895	<	Molecule::AtomIterator ai;
896	<	Molecule::CutoffGroupIterator ci;
897	<	Molecule* mol;
898	<	Atom* atom;
899	<	CutoffGroup* cg;
900	<	mpiSimData parallelData;
901	<	int isError;
956	>	// Build the identArray_ and regions_
957
958	<	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
959	<
960	<	//local index(index in DataStorge) of atom is important
961	<	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
962	<	localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
963	<	}
964	<
965	<	//local index of cutoff group is trivial, it only depends on the order of travesing
966	<	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
967	<	localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
913	<	}
914	<
915	<	}
916	<
917	<	//fill up mpiSimData struct
918	<	parallelData.nMolGlobal = getNGlobalMolecules();
919	<	parallelData.nMolLocal = getNMolecules();
920	<	parallelData.nAtomsGlobal = getNGlobalAtoms();
921	<	parallelData.nAtomsLocal = getNAtoms();
922	<	parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
923	<	parallelData.nGroupsLocal = getNCutoffGroups();
924	<	parallelData.myNode = worldRank;
925	<	MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
926	<
927	<	//pass mpiSimData struct and index arrays to fortran
928	<	setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
929	<	&localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
930	<	&localToGlobalCutoffGroupIndex[0], &isError);
931	<
932	<	if (isError) {
933	<	sprintf(painCave.errMsg,
934	<	"mpiRefresh errror: fortran didn't like something we gave it.\n");
935	<	painCave.isFatal = 1;
936	<	simError();
937	<	}
938	<
939	<	sprintf(checkPointMsg, " mpiRefresh successful.\n");
940	<	errorCheckPoint();
941	<
942	<	#endif
943	<	}
944	<
945	<	void SimInfo::setupCutoff() {
946	<
947	<	ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
948	<
949	<	// Check the cutoff policy
950	<	int cp =  TRADITIONAL_CUTOFF_POLICY; // Set to traditional by default
951	<
952	<	// Set LJ shifting bools to false
953	<	ljsp_ = false;
954	<	ljsf_ = false;
955	<
956	<	std::string myPolicy;
957	<	if (forceFieldOptions_.haveCutoffPolicy()){
958	<	myPolicy = forceFieldOptions_.getCutoffPolicy();
959	<	}else if (simParams_->haveCutoffPolicy()) {
960	<	myPolicy = simParams_->getCutoffPolicy();
961	<	}
962	<
963	<	if (!myPolicy.empty()){
964	<	toUpper(myPolicy);
965	<	if (myPolicy == "MIX") {
966	<	cp = MIX_CUTOFF_POLICY;
967	<	} else {
968	<	if (myPolicy == "MAX") {
969	<	cp = MAX_CUTOFF_POLICY;
970	<	} else {
971	<	if (myPolicy == "TRADITIONAL") {
972	<	cp = TRADITIONAL_CUTOFF_POLICY;
973	<	} else {
974	<	// throw error
975	<	sprintf( painCave.errMsg,
976	<	"SimInfo error: Unknown cutoffPolicy. (Input file specified %s .)\n\tcutoffPolicy must be one of: \"Mix\", \"Max\", or \"Traditional\".", myPolicy.c_str() );
977	<	painCave.isFatal = 1;
978	<	simError();
979	<	}
980	<	}
981	<	}
982	<	}
983	<	notifyFortranCutoffPolicy(&cp);
984	<
985	<	// Check the Skin Thickness for neighborlists
986	<	RealType skin;
987	<	if (simParams_->haveSkinThickness()) {
988	<	skin = simParams_->getSkinThickness();
989	<	notifyFortranSkinThickness(&skin);
990	<	}
991	<
992	<	// Check if the cutoff was set explicitly:
993	<	if (simParams_->haveCutoffRadius()) {
994	<	rcut_ = simParams_->getCutoffRadius();
995	<	if (simParams_->haveSwitchingRadius()) {
996	<	rsw_  = simParams_->getSwitchingRadius();
997	<	} else {
998	<	if (fInfo_.SIM_uses_Charges |
999	<	fInfo_.SIM_uses_Dipoles |
1000	<	fInfo_.SIM_uses_RF) {
1001	<
1002	<	rsw_ = 0.85 * rcut_;
1003	<	sprintf(painCave.errMsg,
1004	<	"SimCreator Warning: No value was set for the switchingRadius.\n"
1005	<	"\tOOPSE will use a default value of 85 percent of the cutoffRadius.\n"
1006	<	"\tswitchingRadius = %f. for this simulation\n", rsw_);
1007	<	painCave.isFatal = 0;
1008	<	simError();
1009	<	} else {
1010	<	rsw_ = rcut_;
1011	<	sprintf(painCave.errMsg,
1012	<	"SimCreator Warning: No value was set for the switchingRadius.\n"
1013	<	"\tOOPSE will use the same value as the cutoffRadius.\n"
1014	<	"\tswitchingRadius = %f. for this simulation\n", rsw_);
1015	<	painCave.isFatal = 0;
1016	<	simError();
1017	<	}
1018	<	}
1019	<
1020	<	if (simParams_->haveElectrostaticSummationMethod()) {
1021	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1022	<	toUpper(myMethod);
1023	<
1024	<	if (myMethod == "SHIFTED_POTENTIAL") {
1025	<	ljsp_ = true;
1026	<	} else if (myMethod == "SHIFTED_FORCE") {
1027	<	ljsf_ = true;
1028	<	}
1029	<	}
1030	<	notifyFortranCutoffs(&rcut_, &rsw_, &ljsp_, &ljsf_);
1031	<
1032	<	} else {
1033	<
1034	<	// For electrostatic atoms, we'll assume a large safe value:
1035	<	if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
1036	<	sprintf(painCave.errMsg,
1037	<	"SimCreator Warning: No value was set for the cutoffRadius.\n"
1038	<	"\tOOPSE will use a default value of 15.0 angstroms"
1039	<	"\tfor the cutoffRadius.\n");
1040	<	painCave.isFatal = 0;
1041	<	simError();
1042	<	rcut_ = 15.0;
1043	<
1044	<	if (simParams_->haveElectrostaticSummationMethod()) {
1045	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1046	<	toUpper(myMethod);
1047	<
1048	<	// For the time being, we're tethering the LJ shifted behavior to the
1049	<	// electrostaticSummationMethod keyword options
1050	<	if (myMethod == "SHIFTED_POTENTIAL") {
1051	<	ljsp_ = true;
1052	<	} else if (myMethod == "SHIFTED_FORCE") {
1053	<	ljsf_ = true;
1054	<	}
1055	<	if (myMethod == "SHIFTED_POTENTIAL" || myMethod == "SHIFTED_FORCE") {
1056	<	if (simParams_->haveSwitchingRadius()){
1057	<	sprintf(painCave.errMsg,
1058	<	"SimInfo Warning: A value was set for the switchingRadius\n"
1059	<	"\teven though the electrostaticSummationMethod was\n"
1060	<	"\tset to %s\n", myMethod.c_str());
1061	<	painCave.isFatal = 1;
1062	<	simError();
1063	<	}
1064	<	}
1065	<	}
1066	<
1067	<	if (simParams_->haveSwitchingRadius()){
1068	<	rsw_ = simParams_->getSwitchingRadius();
1069	<	} else {
1070	<	sprintf(painCave.errMsg,
1071	<	"SimCreator Warning: No value was set for switchingRadius.\n"
1072	<	"\tOOPSE will use a default value of\n"
1073	<	"\t0.85 * cutoffRadius for the switchingRadius\n");
1074	<	painCave.isFatal = 0;
1075	<	simError();
1076	<	rsw_ = 0.85 * rcut_;
1077	<	}
1078	<
1079	<	notifyFortranCutoffs(&rcut_, &rsw_, &ljsp_, &ljsf_);
1080	<
1081	<	} else {
1082	<	// We didn't set rcut explicitly, and we don't have electrostatic atoms, so
1083	<	// We'll punt and let fortran figure out the cutoffs later.
1084	<
1085	<	notifyFortranYouAreOnYourOwn();
1086	<
1087	<	}
1088	<	}
1089	<	}
1090	<
1091	<	void SimInfo::setupElectrostaticSummationMethod( int isError ) {
1092	<
1093	<	int errorOut;
1094	<	int esm =  NONE;
1095	<	int sm = UNDAMPED;
1096	<	RealType alphaVal;
1097	<	RealType dielectric;
1098	<
1099	<	errorOut = isError;
1100	<
1101	<	if (simParams_->haveElectrostaticSummationMethod()) {
1102	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1103	<	toUpper(myMethod);
1104	<	if (myMethod == "NONE") {
1105	<	esm = NONE;
1106	<	} else {
1107	<	if (myMethod == "SWITCHING_FUNCTION") {
1108	<	esm = SWITCHING_FUNCTION;
1109	<	} else {
1110	<	if (myMethod == "SHIFTED_POTENTIAL") {
1111	<	esm = SHIFTED_POTENTIAL;
1112	<	} else {
1113	<	if (myMethod == "SHIFTED_FORCE") {
1114	<	esm = SHIFTED_FORCE;
1115	<	} else {
1116	<	if (myMethod == "REACTION_FIELD") {
1117	<	esm = REACTION_FIELD;
1118	<	dielectric = simParams_->getDielectric();
1119	<	if (!simParams_->haveDielectric()) {
1120	<	// throw warning
1121	<	sprintf( painCave.errMsg,
1122	<	"SimInfo warning: dielectric was not specified in the input file\n\tfor the reaction field correction method.\n"
1123	<	"\tA default value of %f will be used for the dielectric.\n", dielectric);
1124	<	painCave.isFatal = 0;
1125	<	simError();
1126	<	}
1127	<	} else {
1128	<	// throw error
1129	<	sprintf( painCave.errMsg,
1130	<	"SimInfo error: Unknown electrostaticSummationMethod.\n"
1131	<	"\t(Input file specified %s .)\n"
1132	<	"\telectrostaticSummationMethod must be one of: \"none\",\n"
1133	<	"\t\"shifted_potential\", \"shifted_force\", or \n"
1134	<	"\t\"reaction_field\".\n", myMethod.c_str() );
1135	<	painCave.isFatal = 1;
1136	<	simError();
1137	<	}
1138	<	}
1139	<	}
1140	<	}
958	>	identArray_.clear();
959	>	identArray_.reserve(getNAtoms());
960	>	regions_.clear();
961	>	regions_.reserve(getNAtoms());
962	>
963	>	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
964	>	int reg = mol->getRegion();
965	>	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
966	>	identArray_.push_back(atom->getIdent());
967	>	regions_.push_back(reg);
968		}
969	<	}
970	<
971	<	if (simParams_->haveElectrostaticScreeningMethod()) {
1145	<	std::string myScreen = simParams_->getElectrostaticScreeningMethod();
1146	<	toUpper(myScreen);
1147	<	if (myScreen == "UNDAMPED") {
1148	<	sm = UNDAMPED;
1149	<	} else {
1150	<	if (myScreen == "DAMPED") {
1151	<	sm = DAMPED;
1152	<	if (!simParams_->haveDampingAlpha()) {
1153	<	// first set a cutoff dependent alpha value
1154	<	// we assume alpha depends linearly with rcut from 0 to 20.5 ang
1155	<	alphaVal = 0.5125 - rcut_* 0.025;
1156	<	// for values rcut > 20.5, alpha is zero
1157	<	if (alphaVal < 0) alphaVal = 0;
1158	<
1159	<	// throw warning
1160	<	sprintf( painCave.errMsg,
1161	<	"SimInfo warning: dampingAlpha was not specified in the input file.\n"
1162	<	"\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
1163	<	painCave.isFatal = 0;
1164	<	simError();
1165	<	} else {
1166	<	alphaVal = simParams_->getDampingAlpha();
1167	<	}
1168	<
1169	<	} else {
1170	<	// throw error
1171	<	sprintf( painCave.errMsg,
1172	<	"SimInfo error: Unknown electrostaticScreeningMethod.\n"
1173	<	"\t(Input file specified %s .)\n"
1174	<	"\telectrostaticScreeningMethod must be one of: \"undamped\"\n"
1175	<	"or \"damped\".\n", myScreen.c_str() );
1176	<	painCave.isFatal = 1;
1177	<	simError();
1178	<	}
1179	<	}
1180	<	}
1181	<
1182	<	// let's pass some summation method variables to fortran
1183	<	setElectrostaticSummationMethod( &esm );
1184	<	setFortranElectrostaticMethod( &esm );
1185	<	setScreeningMethod( &sm );
1186	<	setDampingAlpha( &alphaVal );
1187	<	setReactionFieldDielectric( &dielectric );
1188	<	initFortranFF( &errorOut );
969	>	}
970	>
971	>	topologyDone_ = true;
972		}
973
1191	–	void SimInfo::setupSwitchingFunction() {
1192	–	int ft = CUBIC;
1193	–
1194	–	if (simParams_->haveSwitchingFunctionType()) {
1195	–	std::string funcType = simParams_->getSwitchingFunctionType();
1196	–	toUpper(funcType);
1197	–	if (funcType == "CUBIC") {
1198	–	ft = CUBIC;
1199	–	} else {
1200	–	if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1201	–	ft = FIFTH_ORDER_POLY;
1202	–	} else {
1203	–	// throw error
1204	–	sprintf( painCave.errMsg,
1205	–	"SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", funcType.c_str() );
1206	–	painCave.isFatal = 1;
1207	–	simError();
1208	–	}
1209	–	}
1210	–	}
1211	–
1212	–	// send switching function notification to switcheroo
1213	–	setFunctionType(&ft);
1214	–
1215	–	}
1216	–
1217	–	void SimInfo::setupAccumulateBoxDipole() {
1218	–
1219	–	// we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
1220	–	if ( simParams_->haveAccumulateBoxDipole() )
1221	–	if ( simParams_->getAccumulateBoxDipole() ) {
1222	–	setAccumulateBoxDipole();
1223	–	calcBoxDipole_ = true;
1224	–	}
1225	–
1226	–	}
1227	–
974		void SimInfo::addProperty(GenericData* genData) {
975		properties_.addProperty(genData);
976		}
977
978	<	void SimInfo::removeProperty(const std::string& propName) {
978	>	void SimInfo::removeProperty(const string& propName) {
979		properties_.removeProperty(propName);
980		}
981
#	Line 1237 | Line 983 | namespace oopse {
983		properties_.clearProperties();
984		}
985
986	<	std::vector<std::string> SimInfo::getPropertyNames() {
986	>	vector<string> SimInfo::getPropertyNames() {
987		return properties_.getPropertyNames();
988		}
989
990	<	std::vector<GenericData*> SimInfo::getProperties() {
990	>	vector<GenericData*> SimInfo::getProperties() {
991		return properties_.getProperties();
992		}
993
994	<	GenericData* SimInfo::getPropertyByName(const std::string& propName) {
994	>	GenericData* SimInfo::getPropertyByName(const string& propName) {
995		return properties_.getPropertyByName(propName);
996		}
997
#	Line 1256 | Line 1002 | namespace oopse {
1002		delete sman_;
1003		sman_ = sman;
1004
1259	–	Molecule* mol;
1260	–	RigidBody* rb;
1261	–	Atom* atom;
1005		SimInfo::MoleculeIterator mi;
1006	+	Molecule::AtomIterator ai;
1007		Molecule::RigidBodyIterator rbIter;
1008	<	Molecule::AtomIterator atomIter;;
1008	>	Molecule::CutoffGroupIterator cgIter;
1009	>	Molecule::BondIterator bondIter;
1010	>	Molecule::BendIterator bendIter;
1011	>	Molecule::TorsionIterator torsionIter;
1012	>	Molecule::InversionIterator inversionIter;
1013
1014	+	Molecule* mol;
1015	+	Atom* atom;
1016	+	RigidBody* rb;
1017	+	CutoffGroup* cg;
1018	+	Bond* bond;
1019	+	Bend* bend;
1020	+	Torsion* torsion;
1021	+	Inversion* inversion;
1022	+
1023		for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
1024
1025	<	for (atom = mol->beginAtom(atomIter); atom != NULL; atom = mol->nextAtom(atomIter)) {
1025	>	for (atom = mol->beginAtom(ai); atom != NULL;
1026	>	atom = mol->nextAtom(ai)) {
1027		atom->setSnapshotManager(sman_);
1028	<	}
1029	<
1030	<	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
1028	>	}
1029	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL;
1030	>	rb = mol->nextRigidBody(rbIter)) {
1031		rb->setSnapshotManager(sman_);
1032		}
1033	<	}
1034	<
1033	>	for (cg = mol->beginCutoffGroup(cgIter); cg != NULL;
1034	>	cg = mol->nextCutoffGroup(cgIter)) {
1035	>	cg->setSnapshotManager(sman_);
1036	>	}
1037	>	for (bond = mol->beginBond(bondIter); bond != NULL;
1038	>	bond = mol->nextBond(bondIter)) {
1039	>	bond->setSnapshotManager(sman_);
1040	>	}
1041	>	for (bend = mol->beginBend(bendIter); bend != NULL;
1042	>	bend = mol->nextBend(bendIter)) {
1043	>	bend->setSnapshotManager(sman_);
1044	>	}
1045	>	for (torsion = mol->beginTorsion(torsionIter); torsion != NULL;
1046	>	torsion = mol->nextTorsion(torsionIter)) {
1047	>	torsion->setSnapshotManager(sman_);
1048	>	}
1049	>	for (inversion = mol->beginInversion(inversionIter); inversion != NULL;
1050	>	inversion = mol->nextInversion(inversionIter)) {
1051	>	inversion->setSnapshotManager(sman_);
1052	>	}
1053	>	}
1054		}
1055
1279	–	Vector3d SimInfo::getComVel(){
1280	–	SimInfo::MoleculeIterator i;
1281	–	Molecule* mol;
1056
1057	<	Vector3d comVel(0.0);
1284	<	RealType totalMass = 0.0;
1285	<
1286	<
1287	<	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1288	<	RealType mass = mol->getMass();
1289	<	totalMass += mass;
1290	<	comVel += mass * mol->getComVel();
1291	<	}
1292	<
1293	<	#ifdef IS_MPI
1294	<	RealType tmpMass = totalMass;
1295	<	Vector3d tmpComVel(comVel);
1296	<	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1297	<	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1298	<	#endif
1299	<
1300	<	comVel /= totalMass;
1301	<
1302	<	return comVel;
1303	<	}
1304	<
1305	<	Vector3d SimInfo::getCom(){
1306	<	SimInfo::MoleculeIterator i;
1307	<	Molecule* mol;
1308	<
1309	<	Vector3d com(0.0);
1310	<	RealType totalMass = 0.0;
1311	<
1312	<	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1313	<	RealType mass = mol->getMass();
1314	<	totalMass += mass;
1315	<	com += mass * mol->getCom();
1316	<	}
1317	<
1318	<	#ifdef IS_MPI
1319	<	RealType tmpMass = totalMass;
1320	<	Vector3d tmpCom(com);
1321	<	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1322	<	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1323	<	#endif
1324	<
1325	<	com /= totalMass;
1057	>	ostream& operator <<(ostream& o, SimInfo& info) {
1058
1327	–	return com;
1328	–
1329	–	}
1330	–
1331	–	std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1332	–
1059		return o;
1060		}
1061
1062	<
1337	<	/*
1338	<	Returns center of mass and center of mass velocity in one function call.
1339	<	*/
1340	<
1341	<	void SimInfo::getComAll(Vector3d &com, Vector3d &comVel){
1342	<	SimInfo::MoleculeIterator i;
1343	<	Molecule* mol;
1344	<
1345	<
1346	<	RealType totalMass = 0.0;
1347	<
1348	<
1349	<	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1350	<	RealType mass = mol->getMass();
1351	<	totalMass += mass;
1352	<	com += mass * mol->getCom();
1353	<	comVel += mass * mol->getComVel();
1354	<	}
1355	<
1356	<	#ifdef IS_MPI
1357	<	RealType tmpMass = totalMass;
1358	<	Vector3d tmpCom(com);
1359	<	Vector3d tmpComVel(comVel);
1360	<	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1361	<	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1362	<	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1363	<	#endif
1364	<
1365	<	com /= totalMass;
1366	<	comVel /= totalMass;
1367	<	}
1368	<
1369	<	/*
1370	<	Return intertia tensor for entire system and angular momentum Vector.
1371	<
1372	<
1373	<	[  Ixx -Ixy  -Ixz ]
1374	<	J =| -Iyx  Iyy  -Iyz |
1375	<	[ -Izx -Iyz   Izz ]
1376	<	*/
1377	<
1378	<	void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
1379	<
1380	<
1381	<	RealType xx = 0.0;
1382	<	RealType yy = 0.0;
1383	<	RealType zz = 0.0;
1384	<	RealType xy = 0.0;
1385	<	RealType xz = 0.0;
1386	<	RealType yz = 0.0;
1387	<	Vector3d com(0.0);
1388	<	Vector3d comVel(0.0);
1389	<
1390	<	getComAll(com, comVel);
1391	<
1392	<	SimInfo::MoleculeIterator i;
1393	<	Molecule* mol;
1394	<
1395	<	Vector3d thisq(0.0);
1396	<	Vector3d thisv(0.0);
1397	<
1398	<	RealType thisMass = 0.0;
1399	<
1400	<
1401	<
1402	<
1403	<	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1404	<
1405	<	thisq = mol->getCom()-com;
1406	<	thisv = mol->getComVel()-comVel;
1407	<	thisMass = mol->getMass();
1408	<	// Compute moment of intertia coefficients.
1409	<	xx += thisq[0]*thisq[0]*thisMass;
1410	<	yy += thisq[1]*thisq[1]*thisMass;
1411	<	zz += thisq[2]*thisq[2]*thisMass;
1412	<
1413	<	// compute products of intertia
1414	<	xy += thisq[0]*thisq[1]*thisMass;
1415	<	xz += thisq[0]*thisq[2]*thisMass;
1416	<	yz += thisq[1]*thisq[2]*thisMass;
1417	<
1418	<	angularMomentum += cross( thisq, thisv ) * thisMass;
1419	<
1420	<	}
1421	<
1422	<
1423	<	inertiaTensor(0,0) = yy + zz;
1424	<	inertiaTensor(0,1) = -xy;
1425	<	inertiaTensor(0,2) = -xz;
1426	<	inertiaTensor(1,0) = -xy;
1427	<	inertiaTensor(1,1) = xx + zz;
1428	<	inertiaTensor(1,2) = -yz;
1429	<	inertiaTensor(2,0) = -xz;
1430	<	inertiaTensor(2,1) = -yz;
1431	<	inertiaTensor(2,2) = xx + yy;
1432	<
1433	<	#ifdef IS_MPI
1434	<	Mat3x3d tmpI(inertiaTensor);
1435	<	Vector3d tmpAngMom;
1436	<	MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1437	<	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1438	<	#endif
1439	<
1440	<	return;
1441	<	}
1442	<
1443	<	//Returns the angular momentum of the system
1444	<	Vector3d SimInfo::getAngularMomentum(){
1445	<
1446	<	Vector3d com(0.0);
1447	<	Vector3d comVel(0.0);
1448	<	Vector3d angularMomentum(0.0);
1449	<
1450	<	getComAll(com,comVel);
1451	<
1452	<	SimInfo::MoleculeIterator i;
1453	<	Molecule* mol;
1454	<
1455	<	Vector3d thisr(0.0);
1456	<	Vector3d thisp(0.0);
1457	<
1458	<	RealType thisMass;
1459	<
1460	<	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1461	<	thisMass = mol->getMass();
1462	<	thisr = mol->getCom()-com;
1463	<	thisp = (mol->getComVel()-comVel)*thisMass;
1464	<
1465	<	angularMomentum += cross( thisr, thisp );
1466	<
1467	<	}
1468	<
1469	<	#ifdef IS_MPI
1470	<	Vector3d tmpAngMom;
1471	<	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1472	<	#endif
1473	<
1474	<	return angularMomentum;
1475	<	}
1476	<
1062	>
1063		StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1064	<	return IOIndexToIntegrableObject.at(index);
1064	>	if (index >= int(IOIndexToIntegrableObject.size())) {
1065	>	sprintf(painCave.errMsg,
1066	>	"SimInfo::getIOIndexToIntegrableObject Error: Integrable Object\n"
1067	>	"\tindex exceeds number of known objects!\n");
1068	>	painCave.isFatal = 1;
1069	>	simError();
1070	>	return NULL;
1071	>	} else
1072	>	return IOIndexToIntegrableObject.at(index);
1073		}
1074
1075	<	void SimInfo::setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v) {
1075	>	void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1076		IOIndexToIntegrableObject= v;
1077		}
1078
1079	<	/* Returns the Volume of the simulation based on a ellipsoid with semi-axes
1080	<	based on the radius of gyration V=4/3*Pi*R_1*R_2*R_3
1081	<	where R_i are related to the principle inertia moments R_i = sqrt(C*I_i/N), this reduces to
1082	<	V = 4/3*Pi*(C/N)^3/2*sqrt(det(I)). See S.E. Baltazar et. al. Comp. Mat. Sci. 37 (2006) 526-536.
1083	<	*/
1084	<	void SimInfo::getGyrationalVolume(RealType &volume){
1085	<	Mat3x3d intTensor;
1492	<	RealType det;
1493	<	Vector3d dummyAngMom;
1494	<	RealType sysconstants;
1495	<	RealType geomCnst;
1496	<
1497	<	geomCnst = 3.0/2.0;
1498	<	/* Get the inertial tensor and angular momentum for free*/
1499	<	getInertiaTensor(intTensor,dummyAngMom);
1500	<
1501	<	det = intTensor.determinant();
1502	<	sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1503	<	volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(det);
1504	<	return;
1079	>	void SimInfo::calcNConstraints() {
1080	>	#ifdef IS_MPI
1081	>	MPI_Allreduce(&nConstraints_, &nGlobalConstraints_, 1,
1082	>	MPI_INT, MPI_SUM, MPI_COMM_WORLD);
1083	>	#else
1084	>	nGlobalConstraints_ =  nConstraints_;
1085	>	#endif
1086		}
1087
1088	<	void SimInfo::getGyrationalVolume(RealType &volume, RealType &detI){
1508	<	Mat3x3d intTensor;
1509	<	Vector3d dummyAngMom;
1510	<	RealType sysconstants;
1511	<	RealType geomCnst;
1088	>	}//end namespace OpenMD
1089
1513	–	geomCnst = 3.0/2.0;
1514	–	/* Get the inertial tensor and angular momentum for free*/
1515	–	getInertiaTensor(intTensor,dummyAngMom);
1516	–
1517	–	detI = intTensor.determinant();
1518	–	sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1519	–	volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(detI);
1520	–	return;
1521	–	}
1522	–	/*
1523	–	void SimInfo::setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v) {
1524	–	assert( v.size() == nAtoms_ + nRigidBodies_);
1525	–	sdByGlobalIndex_ = v;
1526	–	}
1527	–
1528	–	StuntDouble* SimInfo::getStuntDoubleFromGlobalIndex(int index) {
1529	–	//assert(index < nAtoms_ + nRigidBodies_);
1530	–	return sdByGlobalIndex_.at(index);
1531	–	}
1532	–	*/
1533	–	}//end namespace oopse
1534	–

Comparing trunk/src/brains/SimInfo.cpp (property svn:keywords):
Revision 1241 by gezelter, Fri Apr 25 15:14:47 2008 UTC vs.
Revision 1983 by gezelter, Tue Apr 15 20:36:19 2014 UTC

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

Diff Legend

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