ViewVC Help

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

root/OpenMD/branches/development/src/brains/SimInfo.cpp

Comparing:
trunk/src/brains/SimInfo.cpp (file contents), Revision 598 by chrisfen, Thu Sep 15 00:14:35 2005 UTC vs.
branches/development/src/brains/SimInfo.cpp (file contents), Revision 1553 by gezelter, Fri Apr 29 17:25:12 2011 UTC

#	Line 6 | Line 6
6		* redistribute this software in source and binary code form, provided
7		* that the following conditions are met:
8		*
9	<	* 1. Acknowledgement of the program authors must be made in any
10	<	*    publication of scientific results based in part on use of the
11	<	*    program.  An acceptable form of acknowledgement is citation of
12	<	*    the article in which the program was described (Matthew
13	<	*    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14	<	*    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15	<	*    Parallel Simulation Engine for Molecular Dynamics,"
16	<	*    J. Comput. Chem. 26, pp. 252-271 (2005))
17	<	*
18	<	* 2. Redistributions of source code must retain the above copyright
9	>	* 1. Redistributions of source code must retain the above copyright
10		*    notice, this list of conditions and the following disclaimer.
11		*
12	<	* 3. Redistributions in binary form must reproduce the above copyright
12	>	* 2. Redistributions in binary form must reproduce the above copyright
13		*    notice, this list of conditions and the following disclaimer in the
14		*    documentation and/or other materials provided with the
15		*    distribution.
#	Line 37 | Line 28
28		* arising out of the use of or inability to use software, even if the
29		* University of Notre Dame has been advised of the possibility of
30		* such damages.
31	+	*
32	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33	+	* research, please cite the appropriate papers when you publish your
34	+	* work.  Good starting points are:
35	+	*
36	+	* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37	+	* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	+	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
39	+	* [4]  Vardeman & Gezelter, in progress (2009).
40		*/
41
42		/**
#	Line 48 | Line 48
48
49		#include <algorithm>
50		#include <set>
51	+	#include <map>
52
53		#include "brains/SimInfo.hpp"
54		#include "math/Vector3.hpp"
55		#include "primitives/Molecule.hpp"
56	<	#include "UseTheForce/fCutoffPolicy.h"
56	<	#include "UseTheForce/fCoulombicCorrection.h"
57	<	#include "UseTheForce/doForces_interface.h"
58	<	#include "UseTheForce/notifyCutoffs_interface.h"
56	>	#include "primitives/StuntDouble.hpp"
57		#include "utils/MemoryUtils.hpp"
58		#include "utils/simError.h"
59		#include "selection/SelectionManager.hpp"
60	+	#include "io/ForceFieldOptions.hpp"
61	+	#include "UseTheForce/ForceField.hpp"
62	+	#include "nonbonded/SwitchingFunction.hpp"
63
64	<	#ifdef IS_MPI
65	<	#include "UseTheForce/mpiComponentPlan.h"
66	<	#include "UseTheForce/DarkSide/simParallel_interface.h"
67	<	#endif
68	<
69	<	namespace oopse {
69	<
70	<	SimInfo::SimInfo(MakeStamps* stamps, std::vector<std::pair<MoleculeStamp*, int> >& molStampPairs,
71	<	ForceField* ff, Globals* simParams) :
72	<	stamps_(stamps), forceField_(ff), simParams_(simParams),
73	<	ndf_(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
64	>	using namespace std;
65	>	namespace OpenMD {
66	>
67	>	SimInfo::SimInfo(ForceField* ff, Globals* simParams) :
68	>	forceField_(ff), simParams_(simParams),
69	>	ndf_(0), fdf_local(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
70		nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
71		nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
72	<	nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
73	<	nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
74	<	sman_(NULL), fortranInitialized_(false) {
75	<
80	<
81	<	std::vector<std::pair<MoleculeStamp*, int> >::iterator i;
82	<	MoleculeStamp* molStamp;
83	<	int nMolWithSameStamp;
84	<	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
85	<	int nGroups = 0;          //total cutoff groups defined in meta-data file
86	<	CutoffGroupStamp* cgStamp;
87	<	RigidBodyStamp* rbStamp;
88	<	int nRigidAtoms = 0;
72	>	nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nInversions_(0),
73	>	nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
74	>	nConstraints_(0), sman_(NULL), fortranInitialized_(false),
75	>	calcBoxDipole_(false), useAtomicVirial_(true) {
76
77	<	for (i = molStampPairs.begin(); i !=molStampPairs.end(); ++i) {
78	<	molStamp = i->first;
79	<	nMolWithSameStamp = i->second;
80	<
81	<	addMoleculeStamp(molStamp, nMolWithSameStamp);
82	<
83	<	//calculate atoms in molecules
84	<	nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;
85	<
86	<
87	<	//calculate atoms in cutoff groups
88	<	int nAtomsInGroups = 0;
89	<	int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
90	<
91	<	for (int j=0; j < nCutoffGroupsInStamp; j++) {
92	<	cgStamp = molStamp->getCutoffGroup(j);
93	<	nAtomsInGroups += cgStamp->getNMembers();
94	<	}
95	<
96	<	nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
97	<	nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;
98	<
99	<	//calculate atoms in rigid bodies
100	<	int nAtomsInRigidBodies = 0;
101	<	int nRigidBodiesInStamp = molStamp->getNRigidBodies();
102	<
116	<	for (int j=0; j < nRigidBodiesInStamp; j++) {
117	<	rbStamp = molStamp->getRigidBody(j);
118	<	nAtomsInRigidBodies += rbStamp->getNMembers();
119	<	}
120	<
121	<	nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
122	<	nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;
123	<
77	>	MoleculeStamp* molStamp;
78	>	int nMolWithSameStamp;
79	>	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
80	>	int nGroups = 0;       //total cutoff groups defined in meta-data file
81	>	CutoffGroupStamp* cgStamp;
82	>	RigidBodyStamp* rbStamp;
83	>	int nRigidAtoms = 0;
84	>
85	>	vector<Component*> components = simParams->getComponents();
86	>
87	>	for (vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
88	>	molStamp = (*i)->getMoleculeStamp();
89	>	nMolWithSameStamp = (*i)->getNMol();
90	>
91	>	addMoleculeStamp(molStamp, nMolWithSameStamp);
92	>
93	>	//calculate atoms in molecules
94	>	nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;
95	>
96	>	//calculate atoms in cutoff groups
97	>	int nAtomsInGroups = 0;
98	>	int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
99	>
100	>	for (int j=0; j < nCutoffGroupsInStamp; j++) {
101	>	cgStamp = molStamp->getCutoffGroupStamp(j);
102	>	nAtomsInGroups += cgStamp->getNMembers();
103		}
104	<
105	<	//every free atom (atom does not belong to cutoff groups) is a cutoff group
106	<	//therefore the total number of cutoff groups in the system is equal to
107	<	//the total number of atoms minus number of atoms belong to cutoff group defined in meta-data
108	<	//file plus the number of cutoff groups defined in meta-data file
109	<	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
110	<
111	<	//every free atom (atom does not belong to rigid bodies) is an integrable object
112	<	//therefore the total number of  integrable objects in the system is equal to
113	<	//the total number of atoms minus number of atoms belong to  rigid body defined in meta-data
114	<	//file plus the number of  rigid bodies defined in meta-data file
115	<	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms + nGlobalRigidBodies_;
116	<
117	<	nGlobalMols_ = molStampIds_.size();
118	<
119	<	#ifdef IS_MPI
120	<	molToProcMap_.resize(nGlobalMols_);
142	<	#endif
143	<
104	>
105	>	nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
106	>
107	>	nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;
108	>
109	>	//calculate atoms in rigid bodies
110	>	int nAtomsInRigidBodies = 0;
111	>	int nRigidBodiesInStamp = molStamp->getNRigidBodies();
112	>
113	>	for (int j=0; j < nRigidBodiesInStamp; j++) {
114	>	rbStamp = molStamp->getRigidBodyStamp(j);
115	>	nAtomsInRigidBodies += rbStamp->getNMembers();
116	>	}
117	>
118	>	nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
119	>	nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;
120	>
121		}
122	+
123	+	//every free atom (atom does not belong to cutoff groups) is a cutoff
124	+	//group therefore the total number of cutoff groups in the system is
125	+	//equal to the total number of atoms minus number of atoms belong to
126	+	//cutoff group defined in meta-data file plus the number of cutoff
127	+	//groups defined in meta-data file
128	+	std::cerr << "nGA = " << nGlobalAtoms_ << "\n";
129	+	std::cerr << "nCA = " << nCutoffAtoms << "\n";
130	+	std::cerr << "nG = " << nGroups << "\n";
131
132	+	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
133	+
134	+	std::cerr << "nGCG = " << nGlobalCutoffGroups_ << "\n";
135	+
136	+	//every free atom (atom does not belong to rigid bodies) is an
137	+	//integrable object therefore the total number of integrable objects
138	+	//in the system is equal to the total number of atoms minus number of
139	+	//atoms belong to rigid body defined in meta-data file plus the number
140	+	//of rigid bodies defined in meta-data file
141	+	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
142	+	+ nGlobalRigidBodies_;
143	+
144	+	nGlobalMols_ = molStampIds_.size();
145	+	molToProcMap_.resize(nGlobalMols_);
146	+	}
147	+
148		SimInfo::~SimInfo() {
149	<	std::map<int, Molecule*>::iterator i;
149	>	map<int, Molecule*>::iterator i;
150		for (i = molecules_.begin(); i != molecules_.end(); ++i) {
151		delete i->second;
152		}
153		molecules_.clear();
154
153	–	delete stamps_;
155		delete sman_;
156		delete simParams_;
157		delete forceField_;
158		}
159
159	–	int SimInfo::getNGlobalConstraints() {
160	–	int nGlobalConstraints;
161	–	#ifdef IS_MPI
162	–	MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
163	–	MPI_COMM_WORLD);
164	–	#else
165	–	nGlobalConstraints =  nConstraints_;
166	–	#endif
167	–	return nGlobalConstraints;
168	–	}
160
161		bool SimInfo::addMolecule(Molecule* mol) {
162		MoleculeIterator i;
163	<
163	>
164		i = molecules_.find(mol->getGlobalIndex());
165		if (i == molecules_.end() ) {
166	<
167	<	molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
168	<
166	>
167	>	molecules_.insert(make_pair(mol->getGlobalIndex(), mol));
168	>
169		nAtoms_ += mol->getNAtoms();
170		nBonds_ += mol->getNBonds();
171		nBends_ += mol->getNBends();
172		nTorsions_ += mol->getNTorsions();
173	+	nInversions_ += mol->getNInversions();
174		nRigidBodies_ += mol->getNRigidBodies();
175		nIntegrableObjects_ += mol->getNIntegrableObjects();
176		nCutoffGroups_ += mol->getNCutoffGroups();
177		nConstraints_ += mol->getNConstraintPairs();
178	<
179	<	addExcludePairs(mol);
180	<
178	>
179	>	addInteractionPairs(mol);
180	>
181		return true;
182		} else {
183		return false;
184		}
185		}
186	<
186	>
187		bool SimInfo::removeMolecule(Molecule* mol) {
188		MoleculeIterator i;
189		i = molecules_.find(mol->getGlobalIndex());
#	Line 204 | Line 196 | namespace oopse {
196		nBonds_ -= mol->getNBonds();
197		nBends_ -= mol->getNBends();
198		nTorsions_ -= mol->getNTorsions();
199	+	nInversions_ -= mol->getNInversions();
200		nRigidBodies_ -= mol->getNRigidBodies();
201		nIntegrableObjects_ -= mol->getNIntegrableObjects();
202		nCutoffGroups_ -= mol->getNCutoffGroups();
203		nConstraints_ -= mol->getNConstraintPairs();
204
205	<	removeExcludePairs(mol);
205	>	removeInteractionPairs(mol);
206		molecules_.erase(mol->getGlobalIndex());
207
208		delete mol;
#	Line 218 | Line 211 | namespace oopse {
211		} else {
212		return false;
213		}
221	–
222	–
214		}
215
216
#	Line 237 | Line 228 | namespace oopse {
228		void SimInfo::calcNdf() {
229		int ndf_local;
230		MoleculeIterator i;
231	<	std::vector<StuntDouble*>::iterator j;
231	>	vector<StuntDouble*>::iterator j;
232		Molecule* mol;
233		StuntDouble* integrableObject;
234
#	Line 257 | Line 248 | namespace oopse {
248		}
249		}
250
251	<	}//end for (integrableObject)
252	<	}// end for (mol)
251	>	}
252	>	}
253
254		// n_constraints is local, so subtract them on each processor
255		ndf_local -= nConstraints_;
#	Line 275 | Line 266 | namespace oopse {
266
267		}
268
269	+	int SimInfo::getFdf() {
270	+	#ifdef IS_MPI
271	+	MPI_Allreduce(&fdf_local,&fdf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
272	+	#else
273	+	fdf_ = fdf_local;
274	+	#endif
275	+	return fdf_;
276	+	}
277	+
278		void SimInfo::calcNdfRaw() {
279		int ndfRaw_local;
280
281		MoleculeIterator i;
282	<	std::vector<StuntDouble*>::iterator j;
282	>	vector<StuntDouble*>::iterator j;
283		Molecule* mol;
284		StuntDouble* integrableObject;
285
#	Line 326 | Line 326 | namespace oopse {
326
327		}
328
329	<	void SimInfo::addExcludePairs(Molecule* mol) {
330	<	std::vector<Bond*>::iterator bondIter;
331	<	std::vector<Bend*>::iterator bendIter;
332	<	std::vector<Torsion*>::iterator torsionIter;
329	>	void SimInfo::addInteractionPairs(Molecule* mol) {
330	>	ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
331	>	vector<Bond*>::iterator bondIter;
332	>	vector<Bend*>::iterator bendIter;
333	>	vector<Torsion*>::iterator torsionIter;
334	>	vector<Inversion*>::iterator inversionIter;
335		Bond* bond;
336		Bend* bend;
337		Torsion* torsion;
338	+	Inversion* inversion;
339		int a;
340		int b;
341		int c;
342		int d;
343	<
344	<	for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
345	<	a = bond->getAtomA()->getGlobalIndex();
346	<	b = bond->getAtomB()->getGlobalIndex();
347	<	exclude_.addPair(a, b);
343	>
344	>	// atomGroups can be used to add special interaction maps between
345	>	// groups of atoms that are in two separate rigid bodies.
346	>	// However, most site-site interactions between two rigid bodies
347	>	// are probably not special, just the ones between the physically
348	>	// bonded atoms.  Interactions *within* a single rigid body should
349	>	// always be excluded.  These are done at the bottom of this
350	>	// function.
351	>
352	>	map<int, set<int> > atomGroups;
353	>	Molecule::RigidBodyIterator rbIter;
354	>	RigidBody* rb;
355	>	Molecule::IntegrableObjectIterator ii;
356	>	StuntDouble* integrableObject;
357	>
358	>	for (integrableObject = mol->beginIntegrableObject(ii);
359	>	integrableObject != NULL;
360	>	integrableObject = mol->nextIntegrableObject(ii)) {
361	>
362	>	if (integrableObject->isRigidBody()) {
363	>	rb = static_cast<RigidBody*>(integrableObject);
364	>	vector<Atom*> atoms = rb->getAtoms();
365	>	set<int> rigidAtoms;
366	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
367	>	rigidAtoms.insert(atoms[i]->getGlobalIndex());
368	>	}
369	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
370	>	atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
371	>	}
372	>	} else {
373	>	set<int> oneAtomSet;
374	>	oneAtomSet.insert(integrableObject->getGlobalIndex());
375	>	atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
376	>	}
377	>	}
378	>
379	>	for (bond= mol->beginBond(bondIter); bond != NULL;
380	>	bond = mol->nextBond(bondIter)) {
381	>
382	>	a = bond->getAtomA()->getGlobalIndex();
383	>	b = bond->getAtomB()->getGlobalIndex();
384	>
385	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
386	>	oneTwoInteractions_.addPair(a, b);
387	>	} else {
388	>	excludedInteractions_.addPair(a, b);
389	>	}
390		}
391
392	<	for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
392	>	for (bend= mol->beginBend(bendIter); bend != NULL;
393	>	bend = mol->nextBend(bendIter)) {
394	>
395		a = bend->getAtomA()->getGlobalIndex();
396		b = bend->getAtomB()->getGlobalIndex();
397		c = bend->getAtomC()->getGlobalIndex();
398	+
399	+	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
400	+	oneTwoInteractions_.addPair(a, b);
401	+	oneTwoInteractions_.addPair(b, c);
402	+	} else {
403	+	excludedInteractions_.addPair(a, b);
404	+	excludedInteractions_.addPair(b, c);
405	+	}
406
407	<	exclude_.addPair(a, b);
408	<	exclude_.addPair(a, c);
409	<	exclude_.addPair(b, c);
407	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
408	>	oneThreeInteractions_.addPair(a, c);
409	>	} else {
410	>	excludedInteractions_.addPair(a, c);
411	>	}
412		}
413
414	<	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
414	>	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
415	>	torsion = mol->nextTorsion(torsionIter)) {
416	>
417		a = torsion->getAtomA()->getGlobalIndex();
418		b = torsion->getAtomB()->getGlobalIndex();
419		c = torsion->getAtomC()->getGlobalIndex();
420	<	d = torsion->getAtomD()->getGlobalIndex();
420	>	d = torsion->getAtomD()->getGlobalIndex();
421
422	<	exclude_.addPair(a, b);
423	<	exclude_.addPair(a, c);
424	<	exclude_.addPair(a, d);
425	<	exclude_.addPair(b, c);
426	<	exclude_.addPair(b, d);
427	<	exclude_.addPair(c, d);
422	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
423	>	oneTwoInteractions_.addPair(a, b);
424	>	oneTwoInteractions_.addPair(b, c);
425	>	oneTwoInteractions_.addPair(c, d);
426	>	} else {
427	>	excludedInteractions_.addPair(a, b);
428	>	excludedInteractions_.addPair(b, c);
429	>	excludedInteractions_.addPair(c, d);
430	>	}
431	>
432	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
433	>	oneThreeInteractions_.addPair(a, c);
434	>	oneThreeInteractions_.addPair(b, d);
435	>	} else {
436	>	excludedInteractions_.addPair(a, c);
437	>	excludedInteractions_.addPair(b, d);
438	>	}
439	>
440	>	if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
441	>	oneFourInteractions_.addPair(a, d);
442	>	} else {
443	>	excludedInteractions_.addPair(a, d);
444	>	}
445		}
446
447	<	Molecule::RigidBodyIterator rbIter;
448	<	RigidBody* rb;
449	<	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
450	<	std::vector<Atom*> atoms = rb->getAtoms();
451	<	for (int i = 0; i < atoms.size() -1 ; ++i) {
452	<	for (int j = i + 1; j < atoms.size(); ++j) {
447	>	for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
448	>	inversion = mol->nextInversion(inversionIter)) {
449	>
450	>	a = inversion->getAtomA()->getGlobalIndex();
451	>	b = inversion->getAtomB()->getGlobalIndex();
452	>	c = inversion->getAtomC()->getGlobalIndex();
453	>	d = inversion->getAtomD()->getGlobalIndex();
454	>
455	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
456	>	oneTwoInteractions_.addPair(a, b);
457	>	oneTwoInteractions_.addPair(a, c);
458	>	oneTwoInteractions_.addPair(a, d);
459	>	} else {
460	>	excludedInteractions_.addPair(a, b);
461	>	excludedInteractions_.addPair(a, c);
462	>	excludedInteractions_.addPair(a, d);
463	>	}
464	>
465	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
466	>	oneThreeInteractions_.addPair(b, c);
467	>	oneThreeInteractions_.addPair(b, d);
468	>	oneThreeInteractions_.addPair(c, d);
469	>	} else {
470	>	excludedInteractions_.addPair(b, c);
471	>	excludedInteractions_.addPair(b, d);
472	>	excludedInteractions_.addPair(c, d);
473	>	}
474	>	}
475	>
476	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL;
477	>	rb = mol->nextRigidBody(rbIter)) {
478	>	vector<Atom*> atoms = rb->getAtoms();
479	>	for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
480	>	for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
481		a = atoms[i]->getGlobalIndex();
482		b = atoms[j]->getGlobalIndex();
483	<	exclude_.addPair(a, b);
483	>	excludedInteractions_.addPair(a, b);
484		}
485		}
486		}
487
488		}
489
490	<	void SimInfo::removeExcludePairs(Molecule* mol) {
491	<	std::vector<Bond*>::iterator bondIter;
492	<	std::vector<Bend*>::iterator bendIter;
493	<	std::vector<Torsion*>::iterator torsionIter;
490	>	void SimInfo::removeInteractionPairs(Molecule* mol) {
491	>	ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
492	>	vector<Bond*>::iterator bondIter;
493	>	vector<Bend*>::iterator bendIter;
494	>	vector<Torsion*>::iterator torsionIter;
495	>	vector<Inversion*>::iterator inversionIter;
496		Bond* bond;
497		Bend* bend;
498		Torsion* torsion;
499	+	Inversion* inversion;
500		int a;
501		int b;
502		int c;
503		int d;
504	+
505	+	map<int, set<int> > atomGroups;
506	+	Molecule::RigidBodyIterator rbIter;
507	+	RigidBody* rb;
508	+	Molecule::IntegrableObjectIterator ii;
509	+	StuntDouble* integrableObject;
510
511	<	for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
511	>	for (integrableObject = mol->beginIntegrableObject(ii);
512	>	integrableObject != NULL;
513	>	integrableObject = mol->nextIntegrableObject(ii)) {
514	>
515	>	if (integrableObject->isRigidBody()) {
516	>	rb = static_cast<RigidBody*>(integrableObject);
517	>	vector<Atom*> atoms = rb->getAtoms();
518	>	set<int> rigidAtoms;
519	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
520	>	rigidAtoms.insert(atoms[i]->getGlobalIndex());
521	>	}
522	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
523	>	atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
524	>	}
525	>	} else {
526	>	set<int> oneAtomSet;
527	>	oneAtomSet.insert(integrableObject->getGlobalIndex());
528	>	atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
529	>	}
530	>	}
531	>
532	>	for (bond= mol->beginBond(bondIter); bond != NULL;
533	>	bond = mol->nextBond(bondIter)) {
534	>
535		a = bond->getAtomA()->getGlobalIndex();
536	<	b = bond->getAtomB()->getGlobalIndex();
537	<	exclude_.removePair(a, b);
536	>	b = bond->getAtomB()->getGlobalIndex();
537	>
538	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
539	>	oneTwoInteractions_.removePair(a, b);
540	>	} else {
541	>	excludedInteractions_.removePair(a, b);
542	>	}
543		}
544
545	<	for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
545	>	for (bend= mol->beginBend(bendIter); bend != NULL;
546	>	bend = mol->nextBend(bendIter)) {
547	>
548		a = bend->getAtomA()->getGlobalIndex();
549		b = bend->getAtomB()->getGlobalIndex();
550		c = bend->getAtomC()->getGlobalIndex();
551	+
552	+	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
553	+	oneTwoInteractions_.removePair(a, b);
554	+	oneTwoInteractions_.removePair(b, c);
555	+	} else {
556	+	excludedInteractions_.removePair(a, b);
557	+	excludedInteractions_.removePair(b, c);
558	+	}
559
560	<	exclude_.removePair(a, b);
561	<	exclude_.removePair(a, c);
562	<	exclude_.removePair(b, c);
560	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
561	>	oneThreeInteractions_.removePair(a, c);
562	>	} else {
563	>	excludedInteractions_.removePair(a, c);
564	>	}
565		}
566
567	<	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
567	>	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
568	>	torsion = mol->nextTorsion(torsionIter)) {
569	>
570		a = torsion->getAtomA()->getGlobalIndex();
571		b = torsion->getAtomB()->getGlobalIndex();
572		c = torsion->getAtomC()->getGlobalIndex();
573	<	d = torsion->getAtomD()->getGlobalIndex();
573	>	d = torsion->getAtomD()->getGlobalIndex();
574	>
575	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
576	>	oneTwoInteractions_.removePair(a, b);
577	>	oneTwoInteractions_.removePair(b, c);
578	>	oneTwoInteractions_.removePair(c, d);
579	>	} else {
580	>	excludedInteractions_.removePair(a, b);
581	>	excludedInteractions_.removePair(b, c);
582	>	excludedInteractions_.removePair(c, d);
583	>	}
584
585	<	exclude_.removePair(a, b);
586	<	exclude_.removePair(a, c);
587	<	exclude_.removePair(a, d);
588	<	exclude_.removePair(b, c);
589	<	exclude_.removePair(b, d);
590	<	exclude_.removePair(c, d);
585	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
586	>	oneThreeInteractions_.removePair(a, c);
587	>	oneThreeInteractions_.removePair(b, d);
588	>	} else {
589	>	excludedInteractions_.removePair(a, c);
590	>	excludedInteractions_.removePair(b, d);
591	>	}
592	>
593	>	if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
594	>	oneFourInteractions_.removePair(a, d);
595	>	} else {
596	>	excludedInteractions_.removePair(a, d);
597	>	}
598		}
599
600	<	Molecule::RigidBodyIterator rbIter;
601	<	RigidBody* rb;
602	<	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
603	<	std::vector<Atom*> atoms = rb->getAtoms();
604	<	for (int i = 0; i < atoms.size() -1 ; ++i) {
605	<	for (int j = i + 1; j < atoms.size(); ++j) {
600	>	for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
601	>	inversion = mol->nextInversion(inversionIter)) {
602	>
603	>	a = inversion->getAtomA()->getGlobalIndex();
604	>	b = inversion->getAtomB()->getGlobalIndex();
605	>	c = inversion->getAtomC()->getGlobalIndex();
606	>	d = inversion->getAtomD()->getGlobalIndex();
607	>
608	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
609	>	oneTwoInteractions_.removePair(a, b);
610	>	oneTwoInteractions_.removePair(a, c);
611	>	oneTwoInteractions_.removePair(a, d);
612	>	} else {
613	>	excludedInteractions_.removePair(a, b);
614	>	excludedInteractions_.removePair(a, c);
615	>	excludedInteractions_.removePair(a, d);
616	>	}
617	>
618	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
619	>	oneThreeInteractions_.removePair(b, c);
620	>	oneThreeInteractions_.removePair(b, d);
621	>	oneThreeInteractions_.removePair(c, d);
622	>	} else {
623	>	excludedInteractions_.removePair(b, c);
624	>	excludedInteractions_.removePair(b, d);
625	>	excludedInteractions_.removePair(c, d);
626	>	}
627	>	}
628	>
629	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL;
630	>	rb = mol->nextRigidBody(rbIter)) {
631	>	vector<Atom*> atoms = rb->getAtoms();
632	>	for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
633	>	for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
634		a = atoms[i]->getGlobalIndex();
635		b = atoms[j]->getGlobalIndex();
636	<	exclude_.removePair(a, b);
636	>	excludedInteractions_.removePair(a, b);
637		}
638		}
639		}
640	<
640	>
641		}
642	<
643	<
642	>
643	>
644		void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
645		int curStampId;
646	<
646	>
647		//index from 0
648		curStampId = moleculeStamps_.size();
649
#	Line 451 | Line 651 | namespace oopse {
651		molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
652		}
653
454	–	void SimInfo::update() {
654
655	<	setupSimType();
656	<
657	<	#ifdef IS_MPI
658	<	setupFortranParallel();
659	<	#endif
660	<
661	<	setupFortranSim();
662	<
663	<	//setup fortran force field
465	<	/** @deprecate */
466	<	int isError = 0;
467	<
468	<	setupCoulombicCorrection( isError );
469	<
470	<	if(isError){
471	<	sprintf( painCave.errMsg,
472	<	"ForceField error: There was an error initializing the forceField in fortran.\n" );
473	<	painCave.isFatal = 1;
474	<	simError();
475	<	}
476	<
477	<
478	<	setupCutoff();
479	<
655	>	/**
656	>	* update
657	>	*
658	>	*  Performs the global checks and variable settings after the
659	>	*  objects have been created.
660	>	*
661	>	*/
662	>	void SimInfo::update() {
663	>	setupSimVariables();
664		calcNdf();
665		calcNdfRaw();
666		calcNdfTrans();
483	–
484	–	fortranInitialized_ = true;
667		}
668	<
669	<	std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
668	>
669	>	/**
670	>	* getSimulatedAtomTypes
671	>	*
672	>	* Returns an STL set of AtomType* that are actually present in this
673	>	* simulation.  Must query all processors to assemble this information.
674	>	*
675	>	*/
676	>	set<AtomType*> SimInfo::getSimulatedAtomTypes() {
677		SimInfo::MoleculeIterator mi;
678		Molecule* mol;
679		Molecule::AtomIterator ai;
680		Atom* atom;
681	<	std::set<AtomType*> atomTypes;
682	<
683	<	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
495	<
681	>	set<AtomType*> atomTypes;
682	>
683	>	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
684		for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
685		atomTypes.insert(atom->getAtomType());
686	<	}
687	<
500	<	}
686	>	}
687	>	}
688
689	<	return atomTypes;
503	<	}
689	>	#ifdef IS_MPI
690
691	<	void SimInfo::setupSimType() {
692	<	std::set<AtomType*>::iterator i;
693	<	std::set<AtomType*> atomTypes;
694	<	atomTypes = getUniqueAtomTypes();
691	>	// loop over the found atom types on this processor, and add their
692	>	// numerical idents to a vector:
693	>
694	>	vector<int> foundTypes;
695	>	set<AtomType*>::iterator i;
696	>	for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
697	>	foundTypes.push_back( (*i)->getIdent() );
698	>
699	>	// count_local holds the number of found types on this processor
700	>	int count_local = foundTypes.size();
701	>
702	>	// count holds the total number of found types on all processors
703	>	// (some will be redundant with the ones found locally):
704	>	int count;
705	>	MPI::COMM_WORLD.Allreduce(&count_local, &count, 1, MPI::INT, MPI::SUM);
706	>
707	>	// create a vector to hold the globally found types, and resize it:
708	>	vector<int> ftGlobal;
709	>	ftGlobal.resize(count);
710	>	vector<int> counts;
711	>
712	>	int nproc = MPI::COMM_WORLD.Get_size();
713	>	counts.resize(nproc);
714	>	vector<int> disps;
715	>	disps.resize(nproc);
716	>
717	>	// now spray out the foundTypes to all the other processors:
718
719	<	int useLennardJones = 0;
720	<	int useElectrostatic = 0;
512	<	int useEAM = 0;
513	<	int useCharge = 0;
514	<	int useDirectional = 0;
515	<	int useDipole = 0;
516	<	int useGayBerne = 0;
517	<	int useSticky = 0;
518	<	int useStickyPower = 0;
519	<	int useShape = 0;
520	<	int useFLARB = 0; //it is not in AtomType yet
521	<	int useDirectionalAtom = 0;
522	<	int useElectrostatics = 0;
523	<	//usePBC and useRF are from simParams
524	<	int usePBC = simParams_->getPBC();
525	<	int useRF = simParams_->getUseRF();
719	>	MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
720	>	&ftGlobal[0], &counts[0], &disps[0], MPI::INT);
721
722	+	// foundIdents is a stl set, so inserting an already found ident
723	+	// will have no effect.
724	+	set<int> foundIdents;
725	+	vector<int>::iterator j;
726	+	for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
727	+	foundIdents.insert((*j));
728	+
729	+	// now iterate over the foundIdents and get the actual atom types
730	+	// that correspond to these:
731	+	set<int>::iterator it;
732	+	for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
733	+	atomTypes.insert( forceField_->getAtomType((*it)) );
734	+
735	+	#endif
736	+
737	+	return atomTypes;
738	+	}
739	+
740	+	void SimInfo::setupSimVariables() {
741	+	useAtomicVirial_ = simParams_->getUseAtomicVirial();
742	+	// we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
743	+	calcBoxDipole_ = false;
744	+	if ( simParams_->haveAccumulateBoxDipole() )
745	+	if ( simParams_->getAccumulateBoxDipole() ) {
746	+	calcBoxDipole_ = true;
747	+	}
748	+
749	+	set<AtomType*>::iterator i;
750	+	set<AtomType*> atomTypes;
751	+	atomTypes = getSimulatedAtomTypes();
752	+	int usesElectrostatic = 0;
753	+	int usesMetallic = 0;
754	+	int usesDirectional = 0;
755		//loop over all of the atom types
756		for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
757	<	useLennardJones |= (*i)->isLennardJones();
758	<	useElectrostatic |= (*i)->isElectrostatic();
759	<	useEAM |= (*i)->isEAM();
532	<	useCharge |= (*i)->isCharge();
533	<	useDirectional |= (*i)->isDirectional();
534	<	useDipole |= (*i)->isDipole();
535	<	useGayBerne |= (*i)->isGayBerne();
536	<	useSticky |= (*i)->isSticky();
537	<	useStickyPower |= (*i)->isStickyPower();
538	<	useShape |= (*i)->isShape();
757	>	usesElectrostatic |= (*i)->isElectrostatic();
758	>	usesMetallic |= (*i)->isMetal();
759	>	usesDirectional |= (*i)->isDirectional();
760		}
761
541	–	if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
542	–	useDirectionalAtom = 1;
543	–	}
544	–
545	–	if (useCharge || useDipole) {
546	–	useElectrostatics = 1;
547	–	}
548	–
762		#ifdef IS_MPI
763		int temp;
764	+	temp = usesDirectional;
765	+	MPI_Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
766
767	<	temp = usePBC;
768	<	MPI_Allreduce(&temp, &usePBC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
767	>	temp = usesMetallic;
768	>	MPI_Allreduce(&temp, &usesMetallicAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
769
770	<	temp = useDirectionalAtom;
771	<	MPI_Allreduce(&temp, &useDirectionalAtom, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
770	>	temp = usesElectrostatic;
771	>	MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
772	>	#endif
773	>	}
774
558	–	temp = useLennardJones;
559	–	MPI_Allreduce(&temp, &useLennardJones, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
775
776	<	temp = useElectrostatics;
777	<	MPI_Allreduce(&temp, &useElectrostatics, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
776	>	vector<int> SimInfo::getGlobalAtomIndices() {
777	>	SimInfo::MoleculeIterator mi;
778	>	Molecule* mol;
779	>	Molecule::AtomIterator ai;
780	>	Atom* atom;
781
782	<	temp = useCharge;
565	<	MPI_Allreduce(&temp, &useCharge, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
566	<
567	<	temp = useDipole;
568	<	MPI_Allreduce(&temp, &useDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
569	<
570	<	temp = useSticky;
571	<	MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
572	<
573	<	temp = useStickyPower;
574	<	MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
782	>	vector<int> GlobalAtomIndices(getNAtoms(), 0);
783
784	<	temp = useGayBerne;
785	<	MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
784	>	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
785	>
786	>	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
787	>	GlobalAtomIndices[atom->getLocalIndex()] = atom->getGlobalIndex();
788	>	}
789	>	}
790	>	return GlobalAtomIndices;
791	>	}
792
579	–	temp = useEAM;
580	–	MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
793
794	<	temp = useShape;
795	<	MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
794	>	vector<int> SimInfo::getGlobalGroupIndices() {
795	>	SimInfo::MoleculeIterator mi;
796	>	Molecule* mol;
797	>	Molecule::CutoffGroupIterator ci;
798	>	CutoffGroup* cg;
799
800	<	temp = useFLARB;
586	<	MPI_Allreduce(&temp, &useFLARB, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
587	<
588	<	temp = useRF;
589	<	MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
590	<
591	<	temp = useUW;
592	<	MPI_Allreduce(&temp, &useUW, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
593	<
594	<	temp = useDW;
595	<	MPI_Allreduce(&temp, &useDW, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
800	>	vector<int> GlobalGroupIndices;
801
802	<	#endif
803	<
804	<	fInfo_.SIM_uses_PBC = usePBC;
805	<	fInfo_.SIM_uses_DirectionalAtoms = useDirectionalAtom;
806	<	fInfo_.SIM_uses_LennardJones = useLennardJones;
807	<	fInfo_.SIM_uses_Electrostatics = useElectrostatics;
808	<	fInfo_.SIM_uses_Charges = useCharge;
809	<	fInfo_.SIM_uses_Dipoles = useDipole;
605	<	fInfo_.SIM_uses_Sticky = useSticky;
606	<	fInfo_.SIM_uses_StickyPower = useStickyPower;
607	<	fInfo_.SIM_uses_GayBerne = useGayBerne;
608	<	fInfo_.SIM_uses_EAM = useEAM;
609	<	fInfo_.SIM_uses_Shapes = useShape;
610	<	fInfo_.SIM_uses_FLARB = useFLARB;
611	<	fInfo_.SIM_uses_RF = useRF;
612	<
613	<	if( fInfo_.SIM_uses_Dipoles && fInfo_.SIM_uses_RF) {
614	<
615	<	if (simParams_->haveDielectric()) {
616	<	fInfo_.dielect = simParams_->getDielectric();
617	<	} else {
618	<	sprintf(painCave.errMsg,
619	<	"SimSetup Error: No Dielectric constant was set.\n"
620	<	"\tYou are trying to use Reaction Field without"
621	<	"\tsetting a dielectric constant!\n");
622	<	painCave.isFatal = 1;
623	<	simError();
624	<	}
625	<
626	<	} else {
627	<	fInfo_.dielect = 0.0;
802	>	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
803	>
804	>	//local index of cutoff group is trivial, it only depends on the
805	>	//order of travesing
806	>	for (cg = mol->beginCutoffGroup(ci); cg != NULL;
807	>	cg = mol->nextCutoffGroup(ci)) {
808	>	GlobalGroupIndices.push_back(cg->getGlobalIndex());
809	>	}
810		}
811	<
811	>	return GlobalGroupIndices;
812		}
813
814	<	void SimInfo::setupFortranSim() {
814	>
815	>	void SimInfo::setupFortran() {
816		int isError;
817	<	int nExclude;
818	<	std::vector<int> fortranGlobalGroupMembership;
817	>	int nExclude, nOneTwo, nOneThree, nOneFour;
818	>	vector<int> fortranGlobalGroupMembership;
819
637	–	nExclude = exclude_.getSize();
820		isError = 0;
821
822		//globalGroupMembership_ is filled by SimCreator
#	Line 643 | Line 825 | namespace oopse {
825		}
826
827		//calculate mass ratio of cutoff group
828	<	std::vector<double> mfact;
828	>	vector<RealType> mfact;
829		SimInfo::MoleculeIterator mi;
830		Molecule* mol;
831		Molecule::CutoffGroupIterator ci;
832		CutoffGroup* cg;
833		Molecule::AtomIterator ai;
834		Atom* atom;
835	<	double totalMass;
835	>	RealType totalMass;
836
837		//to avoid memory reallocation, reserve enough space for mfact
838		mfact.reserve(getNCutoffGroups());
#	Line 660 | Line 842 | namespace oopse {
842
843		totalMass = cg->getMass();
844		for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
845	<	mfact.push_back(atom->getMass()/totalMass);
845	>	// Check for massless groups - set mfact to 1 if true
846	>	if (totalMass != 0)
847	>	mfact.push_back(atom->getMass()/totalMass);
848	>	else
849	>	mfact.push_back( 1.0 );
850		}
665	–
851		}
852		}
853
854	<	//fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
670	<	std::vector<int> identArray;
854	>	// Build the identArray_
855
856	<	//to avoid memory reallocation, reserve enough space identArray
857	<	identArray.reserve(getNAtoms());
674	<
856	>	identArray_.clear();
857	>	identArray_.reserve(getNAtoms());
858		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
859		for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
860	<	identArray.push_back(atom->getIdent());
860	>	identArray_.push_back(atom->getIdent());
861		}
862		}
863
864		//fill molMembershipArray
865		//molMembershipArray is filled by SimCreator
866	<	std::vector<int> molMembershipArray(nGlobalAtoms_);
866	>	vector<int> molMembershipArray(nGlobalAtoms_);
867		for (int i = 0; i < nGlobalAtoms_; i++) {
868		molMembershipArray[i] = globalMolMembership_[i] + 1;
869		}
870
871		//setup fortran simulation
689	–	int nGlobalExcludes = 0;
690	–	int* globalExcludes = NULL;
691	–	int* excludeList = exclude_.getExcludeList();
692	–	setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0], &nExclude, excludeList ,
693	–	&nGlobalExcludes, globalExcludes, &molMembershipArray[0],
694	–	&mfact[0], &nCutoffGroups_, &fortranGlobalGroupMembership[0], &isError);
872
873	<	if( isError ){
873	>	nExclude = excludedInteractions_.getSize();
874	>	nOneTwo = oneTwoInteractions_.getSize();
875	>	nOneThree = oneThreeInteractions_.getSize();
876	>	nOneFour = oneFourInteractions_.getSize();
877
878	<	sprintf( painCave.errMsg,
879	<	"There was an error setting the simulation information in fortran.\n" );
880	<	painCave.isFatal = 1;
881	<	painCave.severity = OOPSE_ERROR;
702	<	simError();
703	<	}
878	>	int* excludeList = excludedInteractions_.getPairList();
879	>	int* oneTwoList = oneTwoInteractions_.getPairList();
880	>	int* oneThreeList = oneThreeInteractions_.getPairList();
881	>	int* oneFourList = oneFourInteractions_.getPairList();
882
883	<	#ifdef IS_MPI
884	<	sprintf( checkPointMsg,
885	<	"succesfully sent the simulation information to fortran.\n");
886	<	MPIcheckPoint();
887	<	#endif // is_mpi
888	<	}
889	<
712	<
713	<	#ifdef IS_MPI
714	<	void SimInfo::setupFortranParallel() {
883	>	//setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray_[0],
884	>	//               &nExclude, excludeList,
885	>	//               &nOneTwo, oneTwoList,
886	>	//               &nOneThree, oneThreeList,
887	>	//               &nOneFour, oneFourList,
888	>	//               &molMembershipArray[0], &mfact[0], &nCutoffGroups_,
889	>	//               &fortranGlobalGroupMembership[0], &isError);
890
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;
891	>	// if( isError ){
892	>	//
893	>	//  sprintf( painCave.errMsg,
894	>	//         "There was an error setting the simulation information in fortran.\n" );
895	>	//  painCave.isFatal = 1;
896	>	//  painCave.severity = OPENMD_ERROR;
897	>	//  simError();
898	>	//}
899	>
900	>
901	>	// sprintf( checkPointMsg,
902	>	//          "succesfully sent the simulation information to fortran.\n");
903	>
904	>	// errorCheckPoint();
905	>
906	>	// Setup number of neighbors in neighbor list if present
907	>	//if (simParams_->haveNeighborListNeighbors()) {
908	>	//  int nlistNeighbors = simParams_->getNeighborListNeighbors();
909	>	//  setNeighbors(&nlistNeighbors);
910	>	//}
911	>
912	>	#ifdef IS_MPI
913	>	// mpiSimData parallelData;
914
728	–	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
729	–
730	–	//local index(index in DataStorge) of atom is important
731	–	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
732	–	localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
733	–	}
734	–
735	–	//local index of cutoff group is trivial, it only depends on the order of travesing
736	–	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
737	–	localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
738	–	}
739	–
740	–	}
741	–
915		//fill up mpiSimData struct
916	<	parallelData.nMolGlobal = getNGlobalMolecules();
917	<	parallelData.nMolLocal = getNMolecules();
918	<	parallelData.nAtomsGlobal = getNGlobalAtoms();
919	<	parallelData.nAtomsLocal = getNAtoms();
920	<	parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
921	<	parallelData.nGroupsLocal = getNCutoffGroups();
922	<	parallelData.myNode = worldRank;
923	<	MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
916	>	// parallelData.nMolGlobal = getNGlobalMolecules();
917	>	// parallelData.nMolLocal = getNMolecules();
918	>	// parallelData.nAtomsGlobal = getNGlobalAtoms();
919	>	// parallelData.nAtomsLocal = getNAtoms();
920	>	// parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
921	>	// parallelData.nGroupsLocal = getNCutoffGroups();
922	>	// parallelData.myNode = worldRank;
923	>	// MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
924
925		//pass mpiSimData struct and index arrays to fortran
926	<	setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
927	<	&localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
928	<	&localToGlobalCutoffGroupIndex[0], &isError);
926	>	//setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
927	>	//                &localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
928	>	//                &localToGlobalCutoffGroupIndex[0], &isError);
929
930	<	if (isError) {
931	<	sprintf(painCave.errMsg,
932	<	"mpiRefresh errror: fortran didn't like something we gave it.\n");
933	<	painCave.isFatal = 1;
934	<	simError();
935	<	}
763	<
764	<	sprintf(checkPointMsg, " mpiRefresh successful.\n");
765	<	MPIcheckPoint();
766	<
930	>	// if (isError) {
931	>	//   sprintf(painCave.errMsg,
932	>	//           "mpiRefresh errror: fortran didn't like something we gave it.\n");
933	>	//   painCave.isFatal = 1;
934	>	//   simError();
935	>	// }
936
937	<	}
938	<
937	>	// sprintf(checkPointMsg, " mpiRefresh successful.\n");
938	>	// errorCheckPoint();
939		#endif
940
941	<	double SimInfo::calcMaxCutoffRadius() {
942	<
943	<
944	<	std::set<AtomType*> atomTypes;
945	<	std::set<AtomType*>::iterator i;
946	<	std::vector<double> cutoffRadius;
947	<
948	<	//get the unique atom types
780	<	atomTypes = getUniqueAtomTypes();
781	<
782	<	//query the max cutoff radius among these atom types
783	<	for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
784	<	cutoffRadius.push_back(forceField_->getRcutFromAtomType(*i));
785	<	}
786	<
787	<	double maxCutoffRadius = *(std::max_element(cutoffRadius.begin(), cutoffRadius.end()));
788	<	#ifdef IS_MPI
789	<	//pick the max cutoff radius among the processors
790	<	#endif
791	<
792	<	return maxCutoffRadius;
793	<	}
794	<
795	<	void SimInfo::getCutoff(double& rcut, double& rsw) {
796	<
797	<	if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
798	<
799	<	if (!simParams_->haveRcut()){
800	<	sprintf(painCave.errMsg,
801	<	"SimCreator Warning: No value was set for the cutoffRadius.\n"
802	<	"\tOOPSE will use a default value of 15.0 angstroms"
803	<	"\tfor the cutoffRadius.\n");
804	<	painCave.isFatal = 0;
805	<	simError();
806	<	rcut = 15.0;
807	<	} else{
808	<	rcut = simParams_->getRcut();
809	<	}
810	<
811	<	if (!simParams_->haveRsw()){
812	<	sprintf(painCave.errMsg,
813	<	"SimCreator Warning: No value was set for switchingRadius.\n"
814	<	"\tOOPSE will use a default value of\n"
815	<	"\t0.95 * cutoffRadius for the switchingRadius\n");
816	<	painCave.isFatal = 0;
817	<	simError();
818	<	rsw = 0.95 * rcut;
819	<	} else{
820	<	rsw = simParams_->getRsw();
821	<	}
822	<
823	<	} else {
824	<	// if charge, dipole or reaction field is not used and the cutofff radius is not specified in
825	<	//meta-data file, the maximum cutoff radius calculated from forcefiled will be used
826	<
827	<	if (simParams_->haveRcut()) {
828	<	rcut = simParams_->getRcut();
829	<	} else {
830	<	//set cutoff radius to the maximum cutoff radius based on atom types in the whole system
831	<	rcut = calcMaxCutoffRadius();
832	<	}
833	<
834	<	if (simParams_->haveRsw()) {
835	<	rsw  = simParams_->getRsw();
836	<	} else {
837	<	rsw = rcut;
838	<	}
839	<
840	<	}
841	<	}
842	<
843	<	void SimInfo::setupCutoff() {
844	<	getCutoff(rcut_, rsw_);
845	<	double rnblist = rcut_ + 1; // skin of neighbor list
846	<
847	<	//Pass these cutoff radius etc. to fortran. This function should be called once and only once
848	<
849	<	int cp =  TRADITIONAL_CUTOFF_POLICY;
850	<	if (simParams_->haveCutoffPolicy()) {
851	<	std::string myPolicy = simParams_->getCutoffPolicy();
852	<	if (myPolicy == "MIX") {
853	<	cp = MIX_CUTOFF_POLICY;
854	<	} else {
855	<	if (myPolicy == "MAX") {
856	<	cp = MAX_CUTOFF_POLICY;
857	<	} else {
858	<	if (myPolicy == "TRADITIONAL") {
859	<	cp = TRADITIONAL_CUTOFF_POLICY;
860	<	} else {
861	<	// throw error
862	<	sprintf( painCave.errMsg,
863	<	"SimInfo error: Unknown cutoffPolicy. (Input file specified %s .)\n\tcutoffPolicy must be one of: \"Mix\", \"Max\", or \"Traditional\".", myPolicy.c_str() );
864	<	painCave.isFatal = 1;
865	<	simError();
866	<	}
867	<	}
868	<	}
869	<	}
870	<	notifyFortranCutoffs(&rcut_, &rsw_, &rnblist, &cp);
871	<	}
872	<
873	<	void SimInfo::setupCoulombicCorrection( int isError ) {
874	<
875	<	int errorOut;
876	<	int cc =  NONE;
877	<	double alphaVal;
878	<
879	<	errorOut = isError;
880	<
881	<	if (simParams_->haveCoulombicCorrection()) {
882	<	std::string myCorrection = simParams_->getCoulombicCorrection();
883	<	if (myCorrection == "NONE") {
884	<	cc = NONE;
885	<	} else {
886	<	if (myCorrection == "UNDAMPED_WOLF") {
887	<	cc = UNDAMPED_WOLF;
888	<	} else {
889	<	if (myCorrection == "WOLF") {
890	<	cc = WOLF;
891	<	if (!simParams_->haveDampingAlpha()) {
892	<	//throw error
893	<	sprintf( painCave.errMsg,
894	<	"SimInfo warning: dampingAlpha was not specified in the input file. A default value of %f (1/ang) will be used for the Wolf Coulombic Correction.", simParams_->getDampingAlpha());
895	<	painCave.isFatal = 0;
896	<	simError();
897	<	}
898	<	alphaVal = simParams_->getDampingAlpha();
899	<	} else {
900	<	if (myCorrection == "REACTION_FIELD") {
901	<	cc = REACTION_FIELD;
902	<	} else {
903	<	// throw error
904	<	sprintf( painCave.errMsg,
905	<	"SimInfo error: Unknown coulombicCorrection. (Input file specified %s .)\n\tcoulombicCorrection must be one of: \"none\", \"undamped_wolf\", \"wolf\", or \"reaction_field\".", myCorrection.c_str() );
906	<	painCave.isFatal = 1;
907	<	simError();
908	<	}
909	<	}
910	<	}
911	<	}
912	<	}
913	<	initFortranFF( &fInfo_.SIM_uses_RF, &cc, &alphaVal, &errorOut );
941	>	// initFortranFF(&isError);
942	>	// if (isError) {
943	>	//   sprintf(painCave.errMsg,
944	>	//           "initFortranFF errror: fortran didn't like something we gave it.\n");
945	>	//   painCave.isFatal = 1;
946	>	//   simError();
947	>	// }
948	>	// fortranInitialized_ = true;
949		}
950
951		void SimInfo::addProperty(GenericData* genData) {
952		properties_.addProperty(genData);
953		}
954
955	<	void SimInfo::removeProperty(const std::string& propName) {
955	>	void SimInfo::removeProperty(const string& propName) {
956		properties_.removeProperty(propName);
957		}
958
#	Line 925 | Line 960 | namespace oopse {
960		properties_.clearProperties();
961		}
962
963	<	std::vector<std::string> SimInfo::getPropertyNames() {
963	>	vector<string> SimInfo::getPropertyNames() {
964		return properties_.getPropertyNames();
965		}
966
967	<	std::vector<GenericData*> SimInfo::getProperties() {
967	>	vector<GenericData*> SimInfo::getProperties() {
968		return properties_.getProperties();
969		}
970
971	<	GenericData* SimInfo::getPropertyByName(const std::string& propName) {
971	>	GenericData* SimInfo::getPropertyByName(const string& propName) {
972		return properties_.getPropertyByName(propName);
973		}
974
#	Line 947 | Line 982 | namespace oopse {
982		Molecule* mol;
983		RigidBody* rb;
984		Atom* atom;
985	+	CutoffGroup* cg;
986		SimInfo::MoleculeIterator mi;
987		Molecule::RigidBodyIterator rbIter;
988	<	Molecule::AtomIterator atomIter;;
988	>	Molecule::AtomIterator atomIter;
989	>	Molecule::CutoffGroupIterator cgIter;
990
991		for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
992
#	Line 960 | Line 997 | namespace oopse {
997		for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
998		rb->setSnapshotManager(sman_);
999		}
1000	+
1001	+	for (cg = mol->beginCutoffGroup(cgIter); cg != NULL; cg = mol->nextCutoffGroup(cgIter)) {
1002	+	cg->setSnapshotManager(sman_);
1003	+	}
1004		}
1005
1006		}
#	Line 969 | Line 1010 | namespace oopse {
1010		Molecule* mol;
1011
1012		Vector3d comVel(0.0);
1013	<	double totalMass = 0.0;
1013	>	RealType totalMass = 0.0;
1014
1015
1016		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1017	<	double mass = mol->getMass();
1017	>	RealType mass = mol->getMass();
1018		totalMass += mass;
1019		comVel += mass * mol->getComVel();
1020		}
1021
1022		#ifdef IS_MPI
1023	<	double tmpMass = totalMass;
1023	>	RealType tmpMass = totalMass;
1024		Vector3d tmpComVel(comVel);
1025	<	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1026	<	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1025	>	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1026	>	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1027		#endif
1028
1029		comVel /= totalMass;
#	Line 995 | Line 1036 | namespace oopse {
1036		Molecule* mol;
1037
1038		Vector3d com(0.0);
1039	<	double totalMass = 0.0;
1039	>	RealType totalMass = 0.0;
1040
1041		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1042	<	double mass = mol->getMass();
1042	>	RealType mass = mol->getMass();
1043		totalMass += mass;
1044		com += mass * mol->getCom();
1045		}
1046
1047		#ifdef IS_MPI
1048	<	double tmpMass = totalMass;
1048	>	RealType tmpMass = totalMass;
1049		Vector3d tmpCom(com);
1050	<	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1051	<	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1050	>	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1051	>	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1052		#endif
1053
1054		com /= totalMass;
#	Line 1016 | Line 1057 | namespace oopse {
1057
1058		}
1059
1060	<	std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1060	>	ostream& operator <<(ostream& o, SimInfo& info) {
1061
1062		return o;
1063		}
#	Line 1031 | Line 1072 | namespace oopse {
1072		Molecule* mol;
1073
1074
1075	<	double totalMass = 0.0;
1075	>	RealType totalMass = 0.0;
1076
1077
1078		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1079	<	double mass = mol->getMass();
1079	>	RealType mass = mol->getMass();
1080		totalMass += mass;
1081		com += mass * mol->getCom();
1082		comVel += mass * mol->getComVel();
1083		}
1084
1085		#ifdef IS_MPI
1086	<	double tmpMass = totalMass;
1086	>	RealType tmpMass = totalMass;
1087		Vector3d tmpCom(com);
1088		Vector3d tmpComVel(comVel);
1089	<	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1090	<	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1091	<	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1089	>	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1090	>	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1091	>	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1092		#endif
1093
1094		com /= totalMass;
#	Line 1059 | Line 1100 | namespace oopse {
1100
1101
1102		[  Ixx -Ixy  -Ixz ]
1103	<	J =| -Iyx  Iyy  -Iyz |
1103	>	J =| -Iyx  Iyy  -Iyz |
1104		[ -Izx -Iyz   Izz ]
1105		*/
1106
1107		void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
1108
1109
1110	<	double xx = 0.0;
1111	<	double yy = 0.0;
1112	<	double zz = 0.0;
1113	<	double xy = 0.0;
1114	<	double xz = 0.0;
1115	<	double yz = 0.0;
1110	>	RealType xx = 0.0;
1111	>	RealType yy = 0.0;
1112	>	RealType zz = 0.0;
1113	>	RealType xy = 0.0;
1114	>	RealType xz = 0.0;
1115	>	RealType yz = 0.0;
1116		Vector3d com(0.0);
1117		Vector3d comVel(0.0);
1118
#	Line 1083 | Line 1124 | namespace oopse {
1124		Vector3d thisq(0.0);
1125		Vector3d thisv(0.0);
1126
1127	<	double thisMass = 0.0;
1127	>	RealType thisMass = 0.0;
1128
1129
1130
#	Line 1121 | Line 1162 | namespace oopse {
1162		#ifdef IS_MPI
1163		Mat3x3d tmpI(inertiaTensor);
1164		Vector3d tmpAngMom;
1165	<	MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1166	<	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1165	>	MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1166	>	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1167		#endif
1168
1169		return;
#	Line 1143 | Line 1184 | namespace oopse {
1184		Vector3d thisr(0.0);
1185		Vector3d thisp(0.0);
1186
1187	<	double thisMass;
1187	>	RealType thisMass;
1188
1189		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1190		thisMass = mol->getMass();
#	Line 1156 | Line 1197 | namespace oopse {
1197
1198		#ifdef IS_MPI
1199		Vector3d tmpAngMom;
1200	<	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1200	>	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1201		#endif
1202
1203		return angularMomentum;
1204		}
1205
1206	<
1207	<	}//end namespace oopse
1206	>	StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1207	>	return IOIndexToIntegrableObject.at(index);
1208	>	}
1209	>
1210	>	void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1211	>	IOIndexToIntegrableObject= v;
1212	>	}
1213
1214	+	/* Returns the Volume of the simulation based on a ellipsoid with semi-axes
1215	+	based on the radius of gyration V=4/3*Pi*R_1*R_2*R_3
1216	+	where R_i are related to the principle inertia moments R_i = sqrt(C*I_i/N), this reduces to
1217	+	V = 4/3*Pi*(C/N)^3/2*sqrt(det(I)). See S.E. Baltazar et. al. Comp. Mat. Sci. 37 (2006) 526-536.
1218	+	*/
1219	+	void SimInfo::getGyrationalVolume(RealType &volume){
1220	+	Mat3x3d intTensor;
1221	+	RealType det;
1222	+	Vector3d dummyAngMom;
1223	+	RealType sysconstants;
1224	+	RealType geomCnst;
1225	+
1226	+	geomCnst = 3.0/2.0;
1227	+	/* Get the inertial tensor and angular momentum for free*/
1228	+	getInertiaTensor(intTensor,dummyAngMom);
1229	+
1230	+	det = intTensor.determinant();
1231	+	sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1232	+	volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(det);
1233	+	return;
1234	+	}
1235	+
1236	+	void SimInfo::getGyrationalVolume(RealType &volume, RealType &detI){
1237	+	Mat3x3d intTensor;
1238	+	Vector3d dummyAngMom;
1239	+	RealType sysconstants;
1240	+	RealType geomCnst;
1241	+
1242	+	geomCnst = 3.0/2.0;
1243	+	/* Get the inertial tensor and angular momentum for free*/
1244	+	getInertiaTensor(intTensor,dummyAngMom);
1245	+
1246	+	detI = intTensor.determinant();
1247	+	sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1248	+	volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(detI);
1249	+	return;
1250	+	}
1251	+	/*
1252	+	void SimInfo::setStuntDoubleFromGlobalIndex(vector<StuntDouble*> v) {
1253	+	assert( v.size() == nAtoms_ + nRigidBodies_);
1254	+	sdByGlobalIndex_ = v;
1255	+	}
1256	+
1257	+	StuntDouble* SimInfo::getStuntDoubleFromGlobalIndex(int index) {
1258	+	//assert(index < nAtoms_ + nRigidBodies_);
1259	+	return sdByGlobalIndex_.at(index);
1260	+	}
1261	+	*/
1262	+	int SimInfo::getNGlobalConstraints() {
1263	+	int nGlobalConstraints;
1264	+	#ifdef IS_MPI
1265	+	MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
1266	+	MPI_COMM_WORLD);
1267	+	#else
1268	+	nGlobalConstraints =  nConstraints_;
1269	+	#endif
1270	+	return nGlobalConstraints;
1271	+	}
1272	+
1273	+	}//end namespace OpenMD
1274	+

Comparing:
trunk/src/brains/SimInfo.cpp (property svn:keywords), Revision 598 by chrisfen, Thu Sep 15 00:14:35 2005 UTC vs.
branches/development/src/brains/SimInfo.cpp (property svn:keywords), Revision 1553 by gezelter, Fri Apr 29 17:25:12 2011 UTC

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

Diff Legend

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