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 1103 by chuckv, Fri Dec 29 20:21:53 2006 UTC vs.
branches/development/src/brains/SimInfo.cpp (file contents), Revision 1627 by gezelter, Tue Sep 13 22:05:04 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 54 | Line 54
54		#include "math/Vector3.hpp"
55		#include "primitives/Molecule.hpp"
56		#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"
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	<
71	<
62	>	#include "nonbonded/SwitchingFunction.hpp"
63		#ifdef IS_MPI
64	<	#include "UseTheForce/mpiComponentPlan.h"
65	<	#include "UseTheForce/DarkSide/simParallel_interface.h"
75	<	#endif
64	>	#include <mpi.h>
65	>	#endif
66
67	<	namespace oopse {
68	<	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	<	}
67	>	using namespace std;
68	>	namespace OpenMD {
69
70		SimInfo::SimInfo(ForceField* ff, Globals* simParams) :
71		forceField_(ff), simParams_(simParams),
72		ndf_(0), fdf_local(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
73		nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
74		nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
75	<	nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
76	<	nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
77	<	sman_(NULL), fortranInitialized_(false), calcBoxDipole_(false) {
78	<
79	<	MoleculeStamp* molStamp;
80	<	int nMolWithSameStamp;
81	<	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
82	<	int nGroups = 0;      //total cutoff groups defined in meta-data file
83	<	CutoffGroupStamp* cgStamp;
84	<	RigidBodyStamp* rbStamp;
85	<	int nRigidAtoms = 0;
86	<	std::vector<Component*> components = simParams->getComponents();
75	>	nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nInversions_(0),
76	>	nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
77	>	nConstraints_(0), sman_(NULL), topologyDone_(false),
78	>	calcBoxDipole_(false), useAtomicVirial_(true) {
79	>
80	>	MoleculeStamp* molStamp;
81	>	int nMolWithSameStamp;
82	>	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
83	>	int nGroups = 0;       //total cutoff groups defined in meta-data file
84	>	CutoffGroupStamp* cgStamp;
85	>	RigidBodyStamp* rbStamp;
86	>	int nRigidAtoms = 0;
87	>
88	>	vector<Component*> components = simParams->getComponents();
89	>
90	>	for (vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
91	>	molStamp = (*i)->getMoleculeStamp();
92	>	nMolWithSameStamp = (*i)->getNMol();
93
94	<	for (std::vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
95	<	molStamp = (*i)->getMoleculeStamp();
96	<	nMolWithSameStamp = (*i)->getNMol();
97	<
98	<	addMoleculeStamp(molStamp, nMolWithSameStamp);
99	<
100	<	//calculate atoms in molecules
101	<	nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;
102	<
103	<	//calculate atoms in cutoff groups
104	<	int nAtomsInGroups = 0;
105	<	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	<	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	<
94	>	addMoleculeStamp(molStamp, nMolWithSameStamp);
95	>
96	>	//calculate atoms in molecules
97	>	nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;
98	>
99	>	//calculate atoms in cutoff groups
100	>	int nAtomsInGroups = 0;
101	>	int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
102	>
103	>	for (int j=0; j < nCutoffGroupsInStamp; j++) {
104	>	cgStamp = molStamp->getCutoffGroupStamp(j);
105	>	nAtomsInGroups += cgStamp->getNMembers();
106		}
107	<
108	<	//every free atom (atom does not belong to cutoff groups) is a cutoff
109	<	//group therefore the total number of cutoff groups in the system is
110	<	//equal to the total number of atoms minus number of atoms belong to
111	<	//cutoff group defined in meta-data file plus the number of cutoff
112	<	//groups defined in meta-data file
113	<	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
114	<
115	<	//every free atom (atom does not belong to rigid bodies) is an
116	<	//integrable object therefore the total number of integrable objects
117	<	//in the system is equal to the total number of atoms minus number of
118	<	//atoms belong to rigid body defined in meta-data file plus the number
119	<	//of rigid bodies defined in meta-data file
120	<	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
121	<	+ nGlobalRigidBodies_;
122	<
123	<	nGlobalMols_ = molStampIds_.size();
158	<
159	<	#ifdef IS_MPI
160	<	molToProcMap_.resize(nGlobalMols_);
161	<	#endif
162	<
107	>
108	>	nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
109	>
110	>	nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;
111	>
112	>	//calculate atoms in rigid bodies
113	>	int nAtomsInRigidBodies = 0;
114	>	int nRigidBodiesInStamp = molStamp->getNRigidBodies();
115	>
116	>	for (int j=0; j < nRigidBodiesInStamp; j++) {
117	>	rbStamp = molStamp->getRigidBodyStamp(j);
118	>	nAtomsInRigidBodies += rbStamp->getNMembers();
119	>	}
120	>
121	>	nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
122	>	nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;
123	>
124		}
125	+
126	+	//every free atom (atom does not belong to cutoff groups) is a cutoff
127	+	//group therefore the total number of cutoff groups in the system is
128	+	//equal to the total number of atoms minus number of atoms belong to
129	+	//cutoff group defined in meta-data file plus the number of cutoff
130	+	//groups defined in meta-data file
131
132	+	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
133	+
134	+	//every free atom (atom does not belong to rigid bodies) is an
135	+	//integrable object therefore the total number of integrable objects
136	+	//in the system is equal to the total number of atoms minus number of
137	+	//atoms belong to rigid body defined in meta-data file plus the number
138	+	//of rigid bodies defined in meta-data file
139	+	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
140	+	+ nGlobalRigidBodies_;
141	+
142	+	nGlobalMols_ = molStampIds_.size();
143	+	molToProcMap_.resize(nGlobalMols_);
144	+	}
145	+
146		SimInfo::~SimInfo() {
147	<	std::map<int, Molecule*>::iterator i;
147	>	map<int, Molecule*>::iterator i;
148		for (i = molecules_.begin(); i != molecules_.end(); ++i) {
149		delete i->second;
150		}
#	Line 174 | Line 155 | namespace oopse {
155		delete forceField_;
156		}
157
177	–	int SimInfo::getNGlobalConstraints() {
178	–	int nGlobalConstraints;
179	–	#ifdef IS_MPI
180	–	MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
181	–	MPI_COMM_WORLD);
182	–	#else
183	–	nGlobalConstraints =  nConstraints_;
184	–	#endif
185	–	return nGlobalConstraints;
186	–	}
158
159		bool SimInfo::addMolecule(Molecule* mol) {
160		MoleculeIterator i;
161	<
161	>
162		i = molecules_.find(mol->getGlobalIndex());
163		if (i == molecules_.end() ) {
164	<
165	<	molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
166	<
164	>
165	>	molecules_.insert(make_pair(mol->getGlobalIndex(), mol));
166	>
167		nAtoms_ += mol->getNAtoms();
168		nBonds_ += mol->getNBonds();
169		nBends_ += mol->getNBends();
170		nTorsions_ += mol->getNTorsions();
171	+	nInversions_ += mol->getNInversions();
172		nRigidBodies_ += mol->getNRigidBodies();
173		nIntegrableObjects_ += mol->getNIntegrableObjects();
174		nCutoffGroups_ += mol->getNCutoffGroups();
175		nConstraints_ += mol->getNConstraintPairs();
176	<
177	<	addExcludePairs(mol);
178	<
176	>
177	>	addInteractionPairs(mol);
178	>
179		return true;
180		} else {
181		return false;
182		}
183		}
184	<
184	>
185		bool SimInfo::removeMolecule(Molecule* mol) {
186		MoleculeIterator i;
187		i = molecules_.find(mol->getGlobalIndex());
#	Line 222 | Line 194 | namespace oopse {
194		nBonds_ -= mol->getNBonds();
195		nBends_ -= mol->getNBends();
196		nTorsions_ -= mol->getNTorsions();
197	+	nInversions_ -= mol->getNInversions();
198		nRigidBodies_ -= mol->getNRigidBodies();
199		nIntegrableObjects_ -= mol->getNIntegrableObjects();
200		nCutoffGroups_ -= mol->getNCutoffGroups();
201		nConstraints_ -= mol->getNConstraintPairs();
202
203	<	removeExcludePairs(mol);
203	>	removeInteractionPairs(mol);
204		molecules_.erase(mol->getGlobalIndex());
205
206		delete mol;
#	Line 236 | Line 209 | namespace oopse {
209		} else {
210		return false;
211		}
239	–
240	–
212		}
213
214
#	Line 255 | Line 226 | namespace oopse {
226		void SimInfo::calcNdf() {
227		int ndf_local;
228		MoleculeIterator i;
229	<	std::vector<StuntDouble*>::iterator j;
229	>	vector<StuntDouble*>::iterator j;
230		Molecule* mol;
231		StuntDouble* integrableObject;
232
#	Line 301 | Line 272 | namespace oopse {
272		#endif
273		return fdf_;
274		}
275	+
276	+	unsigned int SimInfo::getNLocalCutoffGroups(){
277	+	int nLocalCutoffAtoms = 0;
278	+	Molecule* mol;
279	+	MoleculeIterator mi;
280	+	CutoffGroup* cg;
281	+	Molecule::CutoffGroupIterator ci;
282
283	+	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
284	+
285	+	for (cg = mol->beginCutoffGroup(ci); cg != NULL;
286	+	cg = mol->nextCutoffGroup(ci)) {
287	+	nLocalCutoffAtoms += cg->getNumAtom();
288	+
289	+	}
290	+	}
291	+
292	+	return nAtoms_ - nLocalCutoffAtoms + nCutoffGroups_;
293	+	}
294	+
295		void SimInfo::calcNdfRaw() {
296		int ndfRaw_local;
297
298		MoleculeIterator i;
299	<	std::vector<StuntDouble*>::iterator j;
299	>	vector<StuntDouble*>::iterator j;
300		Molecule* mol;
301		StuntDouble* integrableObject;
302
#	Line 353 | Line 343 | namespace oopse {
343
344		}
345
346	<	void SimInfo::addExcludePairs(Molecule* mol) {
347	<	std::vector<Bond*>::iterator bondIter;
348	<	std::vector<Bend*>::iterator bendIter;
349	<	std::vector<Torsion*>::iterator torsionIter;
346	>	void SimInfo::addInteractionPairs(Molecule* mol) {
347	>	ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
348	>	vector<Bond*>::iterator bondIter;
349	>	vector<Bend*>::iterator bendIter;
350	>	vector<Torsion*>::iterator torsionIter;
351	>	vector<Inversion*>::iterator inversionIter;
352		Bond* bond;
353		Bend* bend;
354		Torsion* torsion;
355	+	Inversion* inversion;
356		int a;
357		int b;
358		int c;
359		int d;
360
361	<	std::map<int, std::set<int> > atomGroups;
361	>	// atomGroups can be used to add special interaction maps between
362	>	// groups of atoms that are in two separate rigid bodies.
363	>	// However, most site-site interactions between two rigid bodies
364	>	// are probably not special, just the ones between the physically
365	>	// bonded atoms.  Interactions *within* a single rigid body should
366	>	// always be excluded.  These are done at the bottom of this
367	>	// function.
368
369	+	map<int, set<int> > atomGroups;
370		Molecule::RigidBodyIterator rbIter;
371		RigidBody* rb;
372		Molecule::IntegrableObjectIterator ii;
373		StuntDouble* integrableObject;
374
375	<	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
376	<	integrableObject = mol->nextIntegrableObject(ii)) {
377	<
375	>	for (integrableObject = mol->beginIntegrableObject(ii);
376	>	integrableObject != NULL;
377	>	integrableObject = mol->nextIntegrableObject(ii)) {
378	>
379		if (integrableObject->isRigidBody()) {
380	<	rb = static_cast<RigidBody*>(integrableObject);
381	<	std::vector<Atom*> atoms = rb->getAtoms();
382	<	std::set<int> rigidAtoms;
383	<	for (int i = 0; i < atoms.size(); ++i) {
384	<	rigidAtoms.insert(atoms[i]->getGlobalIndex());
385	<	}
386	<	for (int i = 0; i < atoms.size(); ++i) {
387	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
388	<	}
389	<	} else {
390	<	std::set<int> oneAtomSet;
380	>	rb = static_cast<RigidBody*>(integrableObject);
381	>	vector<Atom*> atoms = rb->getAtoms();
382	>	set<int> rigidAtoms;
383	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
384	>	rigidAtoms.insert(atoms[i]->getGlobalIndex());
385	>	}
386	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
387	>	atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
388	>	}
389	>	} else {
390	>	set<int> oneAtomSet;
391		oneAtomSet.insert(integrableObject->getGlobalIndex());
392	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
392	>	atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
393		}
394		}
395	+
396	+	for (bond= mol->beginBond(bondIter); bond != NULL;
397	+	bond = mol->nextBond(bondIter)) {
398
395	–
396	–
397	–	for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
399		a = bond->getAtomA()->getGlobalIndex();
400	<	b = bond->getAtomB()->getGlobalIndex();
401	<	exclude_.addPair(a, b);
400	>	b = bond->getAtomB()->getGlobalIndex();
401	>
402	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
403	>	oneTwoInteractions_.addPair(a, b);
404	>	} else {
405	>	excludedInteractions_.addPair(a, b);
406	>	}
407		}
408
409	<	for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
409	>	for (bend= mol->beginBend(bendIter); bend != NULL;
410	>	bend = mol->nextBend(bendIter)) {
411	>
412		a = bend->getAtomA()->getGlobalIndex();
413		b = bend->getAtomB()->getGlobalIndex();
414		c = bend->getAtomC()->getGlobalIndex();
407	–	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
408	–	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
409	–	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
410	–
411	–	exclude_.addPairs(rigidSetA, rigidSetB);
412	–	exclude_.addPairs(rigidSetA, rigidSetC);
413	–	exclude_.addPairs(rigidSetB, rigidSetC);
415
416	<	//exclude_.addPair(a, b);
417	<	//exclude_.addPair(a, c);
418	<	//exclude_.addPair(b, c);
416	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
417	>	oneTwoInteractions_.addPair(a, b);
418	>	oneTwoInteractions_.addPair(b, c);
419	>	} else {
420	>	excludedInteractions_.addPair(a, b);
421	>	excludedInteractions_.addPair(b, c);
422	>	}
423	>
424	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
425	>	oneThreeInteractions_.addPair(a, c);
426	>	} else {
427	>	excludedInteractions_.addPair(a, c);
428	>	}
429		}
430
431	<	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
431	>	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
432	>	torsion = mol->nextTorsion(torsionIter)) {
433	>
434		a = torsion->getAtomA()->getGlobalIndex();
435		b = torsion->getAtomB()->getGlobalIndex();
436		c = torsion->getAtomC()->getGlobalIndex();
437	<	d = torsion->getAtomD()->getGlobalIndex();
425	<	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
426	<	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
427	<	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
428	<	std::set<int> rigidSetD = getRigidSet(d, atomGroups);
437	>	d = torsion->getAtomD()->getGlobalIndex();
438
439	<	exclude_.addPairs(rigidSetA, rigidSetB);
440	<	exclude_.addPairs(rigidSetA, rigidSetC);
441	<	exclude_.addPairs(rigidSetA, rigidSetD);
442	<	exclude_.addPairs(rigidSetB, rigidSetC);
443	<	exclude_.addPairs(rigidSetB, rigidSetD);
444	<	exclude_.addPairs(rigidSetC, rigidSetD);
439	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
440	>	oneTwoInteractions_.addPair(a, b);
441	>	oneTwoInteractions_.addPair(b, c);
442	>	oneTwoInteractions_.addPair(c, d);
443	>	} else {
444	>	excludedInteractions_.addPair(a, b);
445	>	excludedInteractions_.addPair(b, c);
446	>	excludedInteractions_.addPair(c, d);
447	>	}
448
449	<	/*
450	<	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
451	<	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
452	<	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
453	<	exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
454	<	exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
455	<	exclude_.addPairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
456	<
457	<
458	<	exclude_.addPair(a, b);
459	<	exclude_.addPair(a, c);
460	<	exclude_.addPair(a, d);
461	<	exclude_.addPair(b, c);
450	<	exclude_.addPair(b, d);
451	<	exclude_.addPair(c, d);
452	<	*/
449	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
450	>	oneThreeInteractions_.addPair(a, c);
451	>	oneThreeInteractions_.addPair(b, d);
452	>	} else {
453	>	excludedInteractions_.addPair(a, c);
454	>	excludedInteractions_.addPair(b, d);
455	>	}
456	>
457	>	if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
458	>	oneFourInteractions_.addPair(a, d);
459	>	} else {
460	>	excludedInteractions_.addPair(a, d);
461	>	}
462		}
463
464	<	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
465	<	std::vector<Atom*> atoms = rb->getAtoms();
466	<	for (int i = 0; i < atoms.size() -1 ; ++i) {
467	<	for (int j = i + 1; j < atoms.size(); ++j) {
464	>	for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
465	>	inversion = mol->nextInversion(inversionIter)) {
466	>
467	>	a = inversion->getAtomA()->getGlobalIndex();
468	>	b = inversion->getAtomB()->getGlobalIndex();
469	>	c = inversion->getAtomC()->getGlobalIndex();
470	>	d = inversion->getAtomD()->getGlobalIndex();
471	>
472	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
473	>	oneTwoInteractions_.addPair(a, b);
474	>	oneTwoInteractions_.addPair(a, c);
475	>	oneTwoInteractions_.addPair(a, d);
476	>	} else {
477	>	excludedInteractions_.addPair(a, b);
478	>	excludedInteractions_.addPair(a, c);
479	>	excludedInteractions_.addPair(a, d);
480	>	}
481	>
482	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
483	>	oneThreeInteractions_.addPair(b, c);
484	>	oneThreeInteractions_.addPair(b, d);
485	>	oneThreeInteractions_.addPair(c, d);
486	>	} else {
487	>	excludedInteractions_.addPair(b, c);
488	>	excludedInteractions_.addPair(b, d);
489	>	excludedInteractions_.addPair(c, d);
490	>	}
491	>	}
492	>
493	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL;
494	>	rb = mol->nextRigidBody(rbIter)) {
495	>	vector<Atom*> atoms = rb->getAtoms();
496	>	for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
497	>	for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
498		a = atoms[i]->getGlobalIndex();
499		b = atoms[j]->getGlobalIndex();
500	<	exclude_.addPair(a, b);
500	>	excludedInteractions_.addPair(a, b);
501		}
502		}
503		}
504
505		}
506
507	<	void SimInfo::removeExcludePairs(Molecule* mol) {
508	<	std::vector<Bond*>::iterator bondIter;
509	<	std::vector<Bend*>::iterator bendIter;
510	<	std::vector<Torsion*>::iterator torsionIter;
507	>	void SimInfo::removeInteractionPairs(Molecule* mol) {
508	>	ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
509	>	vector<Bond*>::iterator bondIter;
510	>	vector<Bend*>::iterator bendIter;
511	>	vector<Torsion*>::iterator torsionIter;
512	>	vector<Inversion*>::iterator inversionIter;
513		Bond* bond;
514		Bend* bend;
515		Torsion* torsion;
516	+	Inversion* inversion;
517		int a;
518		int b;
519		int c;
520		int d;
521
522	<	std::map<int, std::set<int> > atomGroups;
481	<
522	>	map<int, set<int> > atomGroups;
523		Molecule::RigidBodyIterator rbIter;
524		RigidBody* rb;
525		Molecule::IntegrableObjectIterator ii;
526		StuntDouble* integrableObject;
527
528	<	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
529	<	integrableObject = mol->nextIntegrableObject(ii)) {
530	<
528	>	for (integrableObject = mol->beginIntegrableObject(ii);
529	>	integrableObject != NULL;
530	>	integrableObject = mol->nextIntegrableObject(ii)) {
531	>
532		if (integrableObject->isRigidBody()) {
533	<	rb = static_cast<RigidBody*>(integrableObject);
534	<	std::vector<Atom*> atoms = rb->getAtoms();
535	<	std::set<int> rigidAtoms;
536	<	for (int i = 0; i < atoms.size(); ++i) {
537	<	rigidAtoms.insert(atoms[i]->getGlobalIndex());
538	<	}
539	<	for (int i = 0; i < atoms.size(); ++i) {
540	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
541	<	}
533	>	rb = static_cast<RigidBody*>(integrableObject);
534	>	vector<Atom*> atoms = rb->getAtoms();
535	>	set<int> rigidAtoms;
536	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
537	>	rigidAtoms.insert(atoms[i]->getGlobalIndex());
538	>	}
539	>	for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
540	>	atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
541	>	}
542		} else {
543	<	std::set<int> oneAtomSet;
543	>	set<int> oneAtomSet;
544		oneAtomSet.insert(integrableObject->getGlobalIndex());
545	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
545	>	atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
546		}
547		}
548
549	<
550	<	for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
549	>	for (bond= mol->beginBond(bondIter); bond != NULL;
550	>	bond = mol->nextBond(bondIter)) {
551	>
552		a = bond->getAtomA()->getGlobalIndex();
553	<	b = bond->getAtomB()->getGlobalIndex();
554	<	exclude_.removePair(a, b);
553	>	b = bond->getAtomB()->getGlobalIndex();
554	>
555	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
556	>	oneTwoInteractions_.removePair(a, b);
557	>	} else {
558	>	excludedInteractions_.removePair(a, b);
559	>	}
560		}
561
562	<	for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
562	>	for (bend= mol->beginBend(bendIter); bend != NULL;
563	>	bend = mol->nextBend(bendIter)) {
564	>
565		a = bend->getAtomA()->getGlobalIndex();
566		b = bend->getAtomB()->getGlobalIndex();
567		c = bend->getAtomC()->getGlobalIndex();
518	–
519	–	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
520	–	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
521	–	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
522	–
523	–	exclude_.removePairs(rigidSetA, rigidSetB);
524	–	exclude_.removePairs(rigidSetA, rigidSetC);
525	–	exclude_.removePairs(rigidSetB, rigidSetC);
568
569	<	//exclude_.removePair(a, b);
570	<	//exclude_.removePair(a, c);
571	<	//exclude_.removePair(b, c);
569	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
570	>	oneTwoInteractions_.removePair(a, b);
571	>	oneTwoInteractions_.removePair(b, c);
572	>	} else {
573	>	excludedInteractions_.removePair(a, b);
574	>	excludedInteractions_.removePair(b, c);
575	>	}
576	>
577	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
578	>	oneThreeInteractions_.removePair(a, c);
579	>	} else {
580	>	excludedInteractions_.removePair(a, c);
581	>	}
582		}
583
584	<	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
584	>	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL;
585	>	torsion = mol->nextTorsion(torsionIter)) {
586	>
587		a = torsion->getAtomA()->getGlobalIndex();
588		b = torsion->getAtomB()->getGlobalIndex();
589		c = torsion->getAtomC()->getGlobalIndex();
590	<	d = torsion->getAtomD()->getGlobalIndex();
590	>	d = torsion->getAtomD()->getGlobalIndex();
591	>
592	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
593	>	oneTwoInteractions_.removePair(a, b);
594	>	oneTwoInteractions_.removePair(b, c);
595	>	oneTwoInteractions_.removePair(c, d);
596	>	} else {
597	>	excludedInteractions_.removePair(a, b);
598	>	excludedInteractions_.removePair(b, c);
599	>	excludedInteractions_.removePair(c, d);
600	>	}
601
602	<	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
603	<	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
604	<	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
605	<	std::set<int> rigidSetD = getRigidSet(d, atomGroups);
602	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
603	>	oneThreeInteractions_.removePair(a, c);
604	>	oneThreeInteractions_.removePair(b, d);
605	>	} else {
606	>	excludedInteractions_.removePair(a, c);
607	>	excludedInteractions_.removePair(b, d);
608	>	}
609
610	<	exclude_.removePairs(rigidSetA, rigidSetB);
611	<	exclude_.removePairs(rigidSetA, rigidSetC);
612	<	exclude_.removePairs(rigidSetA, rigidSetD);
613	<	exclude_.removePairs(rigidSetB, rigidSetC);
614	<	exclude_.removePairs(rigidSetB, rigidSetD);
615	<	exclude_.removePairs(rigidSetC, rigidSetD);
610	>	if (options_.havevdw14scale() || options_.haveelectrostatic14scale()) {
611	>	oneFourInteractions_.removePair(a, d);
612	>	} else {
613	>	excludedInteractions_.removePair(a, d);
614	>	}
615	>	}
616
617	<	/*
618	<	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
552	<	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
553	<	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
554	<	exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
555	<	exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
556	<	exclude_.removePairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
617	>	for (inversion= mol->beginInversion(inversionIter); inversion != NULL;
618	>	inversion = mol->nextInversion(inversionIter)) {
619
620	<
621	<	exclude_.removePair(a, b);
622	<	exclude_.removePair(a, c);
623	<	exclude_.removePair(a, d);
624	<	exclude_.removePair(b, c);
625	<	exclude_.removePair(b, d);
626	<	exclude_.removePair(c, d);
627	<	*/
620	>	a = inversion->getAtomA()->getGlobalIndex();
621	>	b = inversion->getAtomB()->getGlobalIndex();
622	>	c = inversion->getAtomC()->getGlobalIndex();
623	>	d = inversion->getAtomD()->getGlobalIndex();
624	>
625	>	if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
626	>	oneTwoInteractions_.removePair(a, b);
627	>	oneTwoInteractions_.removePair(a, c);
628	>	oneTwoInteractions_.removePair(a, d);
629	>	} else {
630	>	excludedInteractions_.removePair(a, b);
631	>	excludedInteractions_.removePair(a, c);
632	>	excludedInteractions_.removePair(a, d);
633	>	}
634	>
635	>	if (options_.havevdw13scale() || options_.haveelectrostatic13scale()) {
636	>	oneThreeInteractions_.removePair(b, c);
637	>	oneThreeInteractions_.removePair(b, d);
638	>	oneThreeInteractions_.removePair(c, d);
639	>	} else {
640	>	excludedInteractions_.removePair(b, c);
641	>	excludedInteractions_.removePair(b, d);
642	>	excludedInteractions_.removePair(c, d);
643	>	}
644		}
645
646	<	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
647	<	std::vector<Atom*> atoms = rb->getAtoms();
648	<	for (int i = 0; i < atoms.size() -1 ; ++i) {
649	<	for (int j = i + 1; j < atoms.size(); ++j) {
646	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL;
647	>	rb = mol->nextRigidBody(rbIter)) {
648	>	vector<Atom*> atoms = rb->getAtoms();
649	>	for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
650	>	for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
651		a = atoms[i]->getGlobalIndex();
652		b = atoms[j]->getGlobalIndex();
653	<	exclude_.removePair(a, b);
653	>	excludedInteractions_.removePair(a, b);
654		}
655		}
656		}
657	<
657	>
658		}
659	<
660	<
659	>
660	>
661		void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
662		int curStampId;
663	<
663	>
664		//index from 0
665		curStampId = moleculeStamps_.size();
666
#	Line 589 | Line 668 | namespace oopse {
668		molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
669		}
670
592	–	void SimInfo::update() {
671
672	<	setupSimType();
673	<
674	<	#ifdef IS_MPI
675	<	setupFortranParallel();
676	<	#endif
677	<
678	<	setupFortranSim();
679	<
680	<	//setup fortran force field
603	<	/** @deprecate */
604	<	int isError = 0;
605	<
606	<	setupCutoff();
607	<
608	<	setupElectrostaticSummationMethod( isError );
609	<	setupSwitchingFunction();
610	<	setupAccumulateBoxDipole();
611	<
612	<	if(isError){
613	<	sprintf( painCave.errMsg,
614	<	"ForceField error: There was an error initializing the forceField in fortran.\n" );
615	<	painCave.isFatal = 1;
616	<	simError();
617	<	}
618	<
672	>	/**
673	>	* update
674	>	*
675	>	*  Performs the global checks and variable settings after the
676	>	*  objects have been created.
677	>	*
678	>	*/
679	>	void SimInfo::update() {
680	>	setupSimVariables();
681		calcNdf();
682		calcNdfRaw();
683		calcNdfTrans();
622	–
623	–	fortranInitialized_ = true;
684		}
685	<
686	<	std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
685	>
686	>	/**
687	>	* getSimulatedAtomTypes
688	>	*
689	>	* Returns an STL set of AtomType* that are actually present in this
690	>	* simulation.  Must query all processors to assemble this information.
691	>	*
692	>	*/
693	>	set<AtomType*> SimInfo::getSimulatedAtomTypes() {
694		SimInfo::MoleculeIterator mi;
695		Molecule* mol;
696		Molecule::AtomIterator ai;
697		Atom* atom;
698	<	std::set<AtomType*> atomTypes;
699	<
698	>	set<AtomType*> atomTypes;
699	>
700		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
701	<
702	<	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
701	>	for(atom = mol->beginAtom(ai); atom != NULL;
702	>	atom = mol->nextAtom(ai)) {
703		atomTypes.insert(atom->getAtomType());
704	<	}
705	<
704	>	}
705	>	}
706	>
707	>	#ifdef IS_MPI
708	>
709	>	// loop over the found atom types on this processor, and add their
710	>	// numerical idents to a vector:
711	>
712	>	vector<int> foundTypes;
713	>	set<AtomType*>::iterator i;
714	>	for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
715	>	foundTypes.push_back( (*i)->getIdent() );
716	>
717	>	// count_local holds the number of found types on this processor
718	>	int count_local = foundTypes.size();
719	>
720	>	int nproc = MPI::COMM_WORLD.Get_size();
721	>
722	>	// we need arrays to hold the counts and displacement vectors for
723	>	// all processors
724	>	vector<int> counts(nproc, 0);
725	>	vector<int> disps(nproc, 0);
726	>
727	>	// fill the counts array
728	>	MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0],
729	>	1, MPI::INT);
730	>
731	>	// use the processor counts to compute the displacement array
732	>	disps[0] = 0;
733	>	int totalCount = counts[0];
734	>	for (int iproc = 1; iproc < nproc; iproc++) {
735	>	disps[iproc] = disps[iproc-1] + counts[iproc-1];
736	>	totalCount += counts[iproc];
737		}
738
739	<	return atomTypes;
740	<	}
643	<
644	<	void SimInfo::setupSimType() {
645	<	std::set<AtomType*>::iterator i;
646	<	std::set<AtomType*> atomTypes;
647	<	atomTypes = getUniqueAtomTypes();
739	>	// we need a (possibly redundant) set of all found types:
740	>	vector<int> ftGlobal(totalCount);
741
742	<	int useLennardJones = 0;
743	<	int useElectrostatic = 0;
744	<	int useEAM = 0;
745	<	int useSC = 0;
653	<	int useCharge = 0;
654	<	int useDirectional = 0;
655	<	int useDipole = 0;
656	<	int useGayBerne = 0;
657	<	int useSticky = 0;
658	<	int useStickyPower = 0;
659	<	int useShape = 0;
660	<	int useFLARB = 0; //it is not in AtomType yet
661	<	int useDirectionalAtom = 0;
662	<	int useElectrostatics = 0;
663	<	//usePBC and useRF are from simParams
664	<	int usePBC = simParams_->getUsePeriodicBoundaryConditions();
665	<	int useRF;
666	<	int useSF;
667	<	int useSP;
668	<	int useBoxDipole;
669	<	std::string myMethod;
742	>	// now spray out the foundTypes to all the other processors:
743	>	MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
744	>	&ftGlobal[0], &counts[0], &disps[0],
745	>	MPI::INT);
746
747	<	// set the useRF logical
672	<	useRF = 0;
673	<	useSF = 0;
674	<	useSP = 0;
747	>	vector<int>::iterator j;
748
749	+	// foundIdents is a stl set, so inserting an already found ident
750	+	// will have no effect.
751	+	set<int> foundIdents;
752
753	<	if (simParams_->haveElectrostaticSummationMethod()) {
754	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
679	<	toUpper(myMethod);
680	<	if (myMethod == "REACTION_FIELD"){
681	<	useRF = 1;
682	<	} else if (myMethod == "SHIFTED_FORCE"){
683	<	useSF = 1;
684	<	} else if (myMethod == "SHIFTED_POTENTIAL"){
685	<	useSP = 1;
686	<	}
687	<	}
753	>	for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
754	>	foundIdents.insert((*j));
755
756	<	if (simParams_->haveAccumulateBoxDipole())
757	<	if (simParams_->getAccumulateBoxDipole())
758	<	useBoxDipole = 1;
756	>	// now iterate over the foundIdents and get the actual atom types
757	>	// that correspond to these:
758	>	set<int>::iterator it;
759	>	for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
760	>	atomTypes.insert( forceField_->getAtomType((*it)) );
761	>
762	>	#endif
763
764	+	return atomTypes;
765	+	}
766	+
767	+	void SimInfo::setupSimVariables() {
768	+	useAtomicVirial_ = simParams_->getUseAtomicVirial();
769	+	// we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
770	+	calcBoxDipole_ = false;
771	+	if ( simParams_->haveAccumulateBoxDipole() )
772	+	if ( simParams_->getAccumulateBoxDipole() ) {
773	+	calcBoxDipole_ = true;
774	+	}
775	+
776	+	set<AtomType*>::iterator i;
777	+	set<AtomType*> atomTypes;
778	+	atomTypes = getSimulatedAtomTypes();
779	+	int usesElectrostatic = 0;
780	+	int usesMetallic = 0;
781	+	int usesDirectional = 0;
782		//loop over all of the atom types
783		for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
784	<	useLennardJones |= (*i)->isLennardJones();
785	<	useElectrostatic |= (*i)->isElectrostatic();
786	<	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();
784	>	usesElectrostatic |= (*i)->isElectrostatic();
785	>	usesMetallic |= (*i)->isMetal();
786	>	usesDirectional |= (*i)->isDirectional();
787		}
788	<
708	<	if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
709	<	useDirectionalAtom = 1;
710	<	}
711	<
712	<	if (useCharge || useDipole) {
713	<	useElectrostatics = 1;
714	<	}
715	<
788	>
789		#ifdef IS_MPI
790		int temp;
791	<
792	<	temp = usePBC;
720	<	MPI_Allreduce(&temp, &usePBC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
721	<
722	<	temp = useDirectionalAtom;
723	<	MPI_Allreduce(&temp, &useDirectionalAtom, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
724	<
725	<	temp = useLennardJones;
726	<	MPI_Allreduce(&temp, &useLennardJones, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
727	<
728	<	temp = useElectrostatics;
729	<	MPI_Allreduce(&temp, &useElectrostatics, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
730	<
731	<	temp = useCharge;
732	<	MPI_Allreduce(&temp, &useCharge, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
733	<
734	<	temp = useDipole;
735	<	MPI_Allreduce(&temp, &useDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
736	<
737	<	temp = useSticky;
738	<	MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
739	<
740	<	temp = useStickyPower;
741	<	MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
791	>	temp = usesDirectional;
792	>	MPI_Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
793
794	<	temp = useGayBerne;
795	<	MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
794	>	temp = usesMetallic;
795	>	MPI_Allreduce(&temp, &usesMetallicAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
796	>
797	>	temp = usesElectrostatic;
798	>	MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
799	>	#else
800
801	<	temp = useEAM;
802	<	MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
801	>	usesDirectionalAtoms_ = usesDirectional;
802	>	usesMetallicAtoms_ = usesMetallic;
803	>	usesElectrostaticAtoms_ = usesElectrostatic;
804
805	<	temp = useSC;
750	<	MPI_Allreduce(&temp, &useSC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
805	>	#endif
806
807	<	temp = useShape;
808	<	MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
807	>	requiresPrepair_ = usesMetallicAtoms_ ? true : false;
808	>	requiresSkipCorrection_ = usesElectrostaticAtoms_ ? true : false;
809	>	requiresSelfCorrection_ = usesElectrostaticAtoms_ ? true : false;
810	>	}
811
755	–	temp = useFLARB;
756	–	MPI_Allreduce(&temp, &useFLARB, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
812
813	<	temp = useRF;
814	<	MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
813	>	vector<int> SimInfo::getGlobalAtomIndices() {
814	>	SimInfo::MoleculeIterator mi;
815	>	Molecule* mol;
816	>	Molecule::AtomIterator ai;
817	>	Atom* atom;
818
819	<	temp = useSF;
820	<	MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
819	>	vector<int> GlobalAtomIndices(getNAtoms(), 0);
820	>
821	>	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
822	>
823	>	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
824	>	GlobalAtomIndices[atom->getLocalIndex()] = atom->getGlobalIndex();
825	>	}
826	>	}
827	>	return GlobalAtomIndices;
828	>	}
829
764	–	temp = useSP;
765	–	MPI_Allreduce(&temp, &useSP, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
830
831	<	temp = useBoxDipole;
832	<	MPI_Allreduce(&temp, &useBoxDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
831	>	vector<int> SimInfo::getGlobalGroupIndices() {
832	>	SimInfo::MoleculeIterator mi;
833	>	Molecule* mol;
834	>	Molecule::CutoffGroupIterator ci;
835	>	CutoffGroup* cg;
836
837	<	#endif
838	<
839	<	fInfo_.SIM_uses_PBC = usePBC;
840	<	fInfo_.SIM_uses_DirectionalAtoms = useDirectionalAtom;
841	<	fInfo_.SIM_uses_LennardJones = useLennardJones;
842	<	fInfo_.SIM_uses_Electrostatics = useElectrostatics;
843	<	fInfo_.SIM_uses_Charges = useCharge;
844	<	fInfo_.SIM_uses_Dipoles = useDipole;
845	<	fInfo_.SIM_uses_Sticky = useSticky;
846	<	fInfo_.SIM_uses_StickyPower = useStickyPower;
847	<	fInfo_.SIM_uses_GayBerne = useGayBerne;
848	<	fInfo_.SIM_uses_EAM = useEAM;
782	<	fInfo_.SIM_uses_SC = useSC;
783	<	fInfo_.SIM_uses_Shapes = useShape;
784	<	fInfo_.SIM_uses_FLARB = useFLARB;
785	<	fInfo_.SIM_uses_RF = useRF;
786	<	fInfo_.SIM_uses_SF = useSF;
787	<	fInfo_.SIM_uses_SP = useSP;
788	<	fInfo_.SIM_uses_BoxDipole = useBoxDipole;
837	>	vector<int> GlobalGroupIndices;
838	>
839	>	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
840	>
841	>	//local index of cutoff group is trivial, it only depends on the
842	>	//order of travesing
843	>	for (cg = mol->beginCutoffGroup(ci); cg != NULL;
844	>	cg = mol->nextCutoffGroup(ci)) {
845	>	GlobalGroupIndices.push_back(cg->getGlobalIndex());
846	>	}
847	>	}
848	>	return GlobalGroupIndices;
849		}
850
791	–	void SimInfo::setupFortranSim() {
792	–	int isError;
793	–	int nExclude;
794	–	std::vector<int> fortranGlobalGroupMembership;
795	–
796	–	nExclude = exclude_.getSize();
797	–	isError = 0;
851
852	<	//globalGroupMembership_ is filled by SimCreator
853	<	for (int i = 0; i < nGlobalAtoms_; i++) {
801	<	fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
802	<	}
852	>	void SimInfo::prepareTopology() {
853	>	int nExclude, nOneTwo, nOneThree, nOneFour;
854
855		//calculate mass ratio of cutoff group
805	–	std::vector<RealType> mfact;
856		SimInfo::MoleculeIterator mi;
857		Molecule* mol;
858		Molecule::CutoffGroupIterator ci;
#	Line 811 | Line 861 | namespace oopse {
861		Atom* atom;
862		RealType totalMass;
863
864	<	//to avoid memory reallocation, reserve enough space for mfact
865	<	mfact.reserve(getNCutoffGroups());
864	>	/**
865	>	* The mass factor is the relative mass of an atom to the total
866	>	* mass of the cutoff group it belongs to.  By default, all atoms
867	>	* are their own cutoff groups, and therefore have mass factors of
868	>	* 1.  We need some special handling for massless atoms, which
869	>	* will be treated as carrying the entire mass of the cutoff
870	>	* group.
871	>	*/
872	>	massFactors_.clear();
873	>	massFactors_.resize(getNAtoms(), 1.0);
874
875		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
876	<	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
876	>	for (cg = mol->beginCutoffGroup(ci); cg != NULL;
877	>	cg = mol->nextCutoffGroup(ci)) {
878
879		totalMass = cg->getMass();
880		for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
881		// Check for massless groups - set mfact to 1 if true
882	<	if (totalMass != 0)
883	<	mfact.push_back(atom->getMass()/totalMass);
882	>	if (totalMass != 0)
883	>	massFactors_[atom->getLocalIndex()] = atom->getMass()/totalMass;
884		else
885	<	mfact.push_back( 1.0 );
885	>	massFactors_[atom->getLocalIndex()] = 1.0;
886		}
828	–
887		}
888		}
889
890	<	//fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
833	<	std::vector<int> identArray;
890	>	// Build the identArray_
891
892	<	//to avoid memory reallocation, reserve enough space identArray
893	<	identArray.reserve(getNAtoms());
837	<
892	>	identArray_.clear();
893	>	identArray_.reserve(getNAtoms());
894		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
895		for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
896	<	identArray.push_back(atom->getIdent());
896	>	identArray_.push_back(atom->getIdent());
897		}
898		}
843	–
844	–	//fill molMembershipArray
845	–	//molMembershipArray is filled by SimCreator
846	–	std::vector<int> molMembershipArray(nGlobalAtoms_);
847	–	for (int i = 0; i < nGlobalAtoms_; i++) {
848	–	molMembershipArray[i] = globalMolMembership_[i] + 1;
849	–	}
899
900	<	//setup fortran simulation
852	<	int nGlobalExcludes = 0;
853	<	int* globalExcludes = NULL;
854	<	int* excludeList = exclude_.getExcludeList();
855	<	setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0], &nExclude, excludeList ,
856	<	&nGlobalExcludes, globalExcludes, &molMembershipArray[0],
857	<	&mfact[0], &nCutoffGroups_, &fortranGlobalGroupMembership[0], &isError);
900	>	//scan topology
901
902	<	if( isError ){
902	>	nExclude = excludedInteractions_.getSize();
903	>	nOneTwo = oneTwoInteractions_.getSize();
904	>	nOneThree = oneThreeInteractions_.getSize();
905	>	nOneFour = oneFourInteractions_.getSize();
906
907	<	sprintf( painCave.errMsg,
908	<	"There was an error setting the simulation information in fortran.\n" );
909	<	painCave.isFatal = 1;
910	<	painCave.severity = OOPSE_ERROR;
865	<	simError();
866	<	}
907	>	int* excludeList = excludedInteractions_.getPairList();
908	>	int* oneTwoList = oneTwoInteractions_.getPairList();
909	>	int* oneThreeList = oneThreeInteractions_.getPairList();
910	>	int* oneFourList = oneFourInteractions_.getPairList();
911
912	<	#ifdef IS_MPI
869	<	sprintf( checkPointMsg,
870	<	"succesfully sent the simulation information to fortran.\n");
871	<	MPIcheckPoint();
872	<	#endif // is_mpi
873	<
874	<	// Setup number of neighbors in neighbor list if present
875	<	if (simParams_->haveNeighborListNeighbors()) {
876	<	setNeighbors(simParams_->getNeighborListNeighbors());
877	<	}
878	<
879	<
880	<	}
881	<
882	<
883	<	#ifdef IS_MPI
884	<	void SimInfo::setupFortranParallel() {
885	<
886	<	//SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
887	<	std::vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
888	<	std::vector<int> localToGlobalCutoffGroupIndex;
889	<	SimInfo::MoleculeIterator mi;
890	<	Molecule::AtomIterator ai;
891	<	Molecule::CutoffGroupIterator ci;
892	<	Molecule* mol;
893	<	Atom* atom;
894	<	CutoffGroup* cg;
895	<	mpiSimData parallelData;
896	<	int isError;
897	<
898	<	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
899	<
900	<	//local index(index in DataStorge) of atom is important
901	<	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
902	<	localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
903	<	}
904	<
905	<	//local index of cutoff group is trivial, it only depends on the order of travesing
906	<	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
907	<	localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
908	<	}
909	<
910	<	}
911	<
912	<	//fill up mpiSimData struct
913	<	parallelData.nMolGlobal = getNGlobalMolecules();
914	<	parallelData.nMolLocal = getNMolecules();
915	<	parallelData.nAtomsGlobal = getNGlobalAtoms();
916	<	parallelData.nAtomsLocal = getNAtoms();
917	<	parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
918	<	parallelData.nGroupsLocal = getNCutoffGroups();
919	<	parallelData.myNode = worldRank;
920	<	MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
921	<
922	<	//pass mpiSimData struct and index arrays to fortran
923	<	setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
924	<	&localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
925	<	&localToGlobalCutoffGroupIndex[0], &isError);
926	<
927	<	if (isError) {
928	<	sprintf(painCave.errMsg,
929	<	"mpiRefresh errror: fortran didn't like something we gave it.\n");
930	<	painCave.isFatal = 1;
931	<	simError();
932	<	}
933	<
934	<	sprintf(checkPointMsg, " mpiRefresh successful.\n");
935	<	MPIcheckPoint();
936	<
937	<
938	<	}
939	<
940	<	#endif
941	<
942	<	void SimInfo::setupCutoff() {
943	<
944	<	ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
945	<
946	<	// Check the cutoff policy
947	<	int cp =  TRADITIONAL_CUTOFF_POLICY; // Set to traditional by default
948	<
949	<	std::string myPolicy;
950	<	if (forceFieldOptions_.haveCutoffPolicy()){
951	<	myPolicy = forceFieldOptions_.getCutoffPolicy();
952	<	}else if (simParams_->haveCutoffPolicy()) {
953	<	myPolicy = simParams_->getCutoffPolicy();
954	<	}
955	<
956	<	if (!myPolicy.empty()){
957	<	toUpper(myPolicy);
958	<	if (myPolicy == "MIX") {
959	<	cp = MIX_CUTOFF_POLICY;
960	<	} else {
961	<	if (myPolicy == "MAX") {
962	<	cp = MAX_CUTOFF_POLICY;
963	<	} else {
964	<	if (myPolicy == "TRADITIONAL") {
965	<	cp = TRADITIONAL_CUTOFF_POLICY;
966	<	} else {
967	<	// throw error
968	<	sprintf( painCave.errMsg,
969	<	"SimInfo error: Unknown cutoffPolicy. (Input file specified %s .)\n\tcutoffPolicy must be one of: \"Mix\", \"Max\", or \"Traditional\".", myPolicy.c_str() );
970	<	painCave.isFatal = 1;
971	<	simError();
972	<	}
973	<	}
974	<	}
975	<	}
976	<	notifyFortranCutoffPolicy(&cp);
977	<
978	<	// Check the Skin Thickness for neighborlists
979	<	RealType skin;
980	<	if (simParams_->haveSkinThickness()) {
981	<	skin = simParams_->getSkinThickness();
982	<	notifyFortranSkinThickness(&skin);
983	<	}
984	<
985	<	// Check if the cutoff was set explicitly:
986	<	if (simParams_->haveCutoffRadius()) {
987	<	rcut_ = simParams_->getCutoffRadius();
988	<	if (simParams_->haveSwitchingRadius()) {
989	<	rsw_  = simParams_->getSwitchingRadius();
990	<	} else {
991	<	if (fInfo_.SIM_uses_Charges |
992	<	fInfo_.SIM_uses_Dipoles |
993	<	fInfo_.SIM_uses_RF) {
994	<
995	<	rsw_ = 0.85 * rcut_;
996	<	sprintf(painCave.errMsg,
997	<	"SimCreator Warning: No value was set for the switchingRadius.\n"
998	<	"\tOOPSE will use a default value of 85 percent of the cutoffRadius.\n"
999	<	"\tswitchingRadius = %f. for this simulation\n", rsw_);
1000	<	painCave.isFatal = 0;
1001	<	simError();
1002	<	} else {
1003	<	rsw_ = rcut_;
1004	<	sprintf(painCave.errMsg,
1005	<	"SimCreator Warning: No value was set for the switchingRadius.\n"
1006	<	"\tOOPSE will use the same value as the cutoffRadius.\n"
1007	<	"\tswitchingRadius = %f. for this simulation\n", rsw_);
1008	<	painCave.isFatal = 0;
1009	<	simError();
1010	<	}
1011	<	}
1012	<
1013	<	notifyFortranCutoffs(&rcut_, &rsw_);
1014	<
1015	<	} else {
1016	<
1017	<	// For electrostatic atoms, we'll assume a large safe value:
1018	<	if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
1019	<	sprintf(painCave.errMsg,
1020	<	"SimCreator Warning: No value was set for the cutoffRadius.\n"
1021	<	"\tOOPSE will use a default value of 15.0 angstroms"
1022	<	"\tfor the cutoffRadius.\n");
1023	<	painCave.isFatal = 0;
1024	<	simError();
1025	<	rcut_ = 15.0;
1026	<
1027	<	if (simParams_->haveElectrostaticSummationMethod()) {
1028	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1029	<	toUpper(myMethod);
1030	<	if (myMethod == "SHIFTED_POTENTIAL" || myMethod == "SHIFTED_FORCE") {
1031	<	if (simParams_->haveSwitchingRadius()){
1032	<	sprintf(painCave.errMsg,
1033	<	"SimInfo Warning: A value was set for the switchingRadius\n"
1034	<	"\teven though the electrostaticSummationMethod was\n"
1035	<	"\tset to %s\n", myMethod.c_str());
1036	<	painCave.isFatal = 1;
1037	<	simError();
1038	<	}
1039	<	}
1040	<	}
1041	<
1042	<	if (simParams_->haveSwitchingRadius()){
1043	<	rsw_ = simParams_->getSwitchingRadius();
1044	<	} else {
1045	<	sprintf(painCave.errMsg,
1046	<	"SimCreator Warning: No value was set for switchingRadius.\n"
1047	<	"\tOOPSE will use a default value of\n"
1048	<	"\t0.85 * cutoffRadius for the switchingRadius\n");
1049	<	painCave.isFatal = 0;
1050	<	simError();
1051	<	rsw_ = 0.85 * rcut_;
1052	<	}
1053	<	notifyFortranCutoffs(&rcut_, &rsw_);
1054	<	} else {
1055	<	// We didn't set rcut explicitly, and we don't have electrostatic atoms, so
1056	<	// We'll punt and let fortran figure out the cutoffs later.
1057	<
1058	<	notifyFortranYouAreOnYourOwn();
1059	<
1060	<	}
1061	<	}
1062	<	}
1063	<
1064	<	void SimInfo::setupElectrostaticSummationMethod( int isError ) {
1065	<
1066	<	int errorOut;
1067	<	int esm =  NONE;
1068	<	int sm = UNDAMPED;
1069	<	RealType alphaVal;
1070	<	RealType dielectric;
1071	<
1072	<	errorOut = isError;
1073	<
1074	<	if (simParams_->haveElectrostaticSummationMethod()) {
1075	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1076	<	toUpper(myMethod);
1077	<	if (myMethod == "NONE") {
1078	<	esm = NONE;
1079	<	} else {
1080	<	if (myMethod == "SWITCHING_FUNCTION") {
1081	<	esm = SWITCHING_FUNCTION;
1082	<	} else {
1083	<	if (myMethod == "SHIFTED_POTENTIAL") {
1084	<	esm = SHIFTED_POTENTIAL;
1085	<	} else {
1086	<	if (myMethod == "SHIFTED_FORCE") {
1087	<	esm = SHIFTED_FORCE;
1088	<	} else {
1089	<	if (myMethod == "REACTION_FIELD") {
1090	<	esm = REACTION_FIELD;
1091	<	dielectric = simParams_->getDielectric();
1092	<	if (!simParams_->haveDielectric()) {
1093	<	// throw warning
1094	<	sprintf( painCave.errMsg,
1095	<	"SimInfo warning: dielectric was not specified in the input file\n\tfor the reaction field correction method.\n"
1096	<	"\tA default value of %f will be used for the dielectric.\n", dielectric);
1097	<	painCave.isFatal = 0;
1098	<	simError();
1099	<	}
1100	<	} else {
1101	<	// throw error
1102	<	sprintf( painCave.errMsg,
1103	<	"SimInfo error: Unknown electrostaticSummationMethod.\n"
1104	<	"\t(Input file specified %s .)\n"
1105	<	"\telectrostaticSummationMethod must be one of: \"none\",\n"
1106	<	"\t\"shifted_potential\", \"shifted_force\", or \n"
1107	<	"\t\"reaction_field\".\n", myMethod.c_str() );
1108	<	painCave.isFatal = 1;
1109	<	simError();
1110	<	}
1111	<	}
1112	<	}
1113	<	}
1114	<	}
1115	<	}
1116	<
1117	<	if (simParams_->haveElectrostaticScreeningMethod()) {
1118	<	std::string myScreen = simParams_->getElectrostaticScreeningMethod();
1119	<	toUpper(myScreen);
1120	<	if (myScreen == "UNDAMPED") {
1121	<	sm = UNDAMPED;
1122	<	} else {
1123	<	if (myScreen == "DAMPED") {
1124	<	sm = DAMPED;
1125	<	if (!simParams_->haveDampingAlpha()) {
1126	<	// first set a cutoff dependent alpha value
1127	<	// we assume alpha depends linearly with rcut from 0 to 20.5 ang
1128	<	alphaVal = 0.5125 - rcut_* 0.025;
1129	<	// for values rcut > 20.5, alpha is zero
1130	<	if (alphaVal < 0) alphaVal = 0;
1131	<
1132	<	// throw warning
1133	<	sprintf( painCave.errMsg,
1134	<	"SimInfo warning: dampingAlpha was not specified in the input file.\n"
1135	<	"\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
1136	<	painCave.isFatal = 0;
1137	<	simError();
1138	<	} else {
1139	<	alphaVal = simParams_->getDampingAlpha();
1140	<	}
1141	<
1142	<	} else {
1143	<	// throw error
1144	<	sprintf( painCave.errMsg,
1145	<	"SimInfo error: Unknown electrostaticScreeningMethod.\n"
1146	<	"\t(Input file specified %s .)\n"
1147	<	"\telectrostaticScreeningMethod must be one of: \"undamped\"\n"
1148	<	"or \"damped\".\n", myScreen.c_str() );
1149	<	painCave.isFatal = 1;
1150	<	simError();
1151	<	}
1152	<	}
1153	<	}
1154	<
1155	<	// let's pass some summation method variables to fortran
1156	<	setElectrostaticSummationMethod( &esm );
1157	<	setFortranElectrostaticMethod( &esm );
1158	<	setScreeningMethod( &sm );
1159	<	setDampingAlpha( &alphaVal );
1160	<	setReactionFieldDielectric( &dielectric );
1161	<	initFortranFF( &errorOut );
1162	<	}
1163	<
1164	<	void SimInfo::setupSwitchingFunction() {
1165	<	int ft = CUBIC;
1166	<
1167	<	if (simParams_->haveSwitchingFunctionType()) {
1168	<	std::string funcType = simParams_->getSwitchingFunctionType();
1169	<	toUpper(funcType);
1170	<	if (funcType == "CUBIC") {
1171	<	ft = CUBIC;
1172	<	} else {
1173	<	if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1174	<	ft = FIFTH_ORDER_POLY;
1175	<	} else {
1176	<	// throw error
1177	<	sprintf( painCave.errMsg,
1178	<	"SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", funcType.c_str() );
1179	<	painCave.isFatal = 1;
1180	<	simError();
1181	<	}
1182	<	}
1183	<	}
1184	<
1185	<	// send switching function notification to switcheroo
1186	<	setFunctionType(&ft);
1187	<
1188	<	}
1189	<
1190	<	void SimInfo::setupAccumulateBoxDipole() {
1191	<
1192	<	// we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
1193	<	if ( simParams_->haveAccumulateBoxDipole() )
1194	<	if ( simParams_->getAccumulateBoxDipole() ) {
1195	<	setAccumulateBoxDipole();
1196	<	calcBoxDipole_ = true;
1197	<	}
1198	<
912	>	topologyDone_ = true;
913		}
914
915		void SimInfo::addProperty(GenericData* genData) {
916		properties_.addProperty(genData);
917		}
918
919	<	void SimInfo::removeProperty(const std::string& propName) {
919	>	void SimInfo::removeProperty(const string& propName) {
920		properties_.removeProperty(propName);
921		}
922
#	Line 1210 | Line 924 | namespace oopse {
924		properties_.clearProperties();
925		}
926
927	<	std::vector<std::string> SimInfo::getPropertyNames() {
927	>	vector<string> SimInfo::getPropertyNames() {
928		return properties_.getPropertyNames();
929		}
930
931	<	std::vector<GenericData*> SimInfo::getProperties() {
931	>	vector<GenericData*> SimInfo::getProperties() {
932		return properties_.getProperties();
933		}
934
935	<	GenericData* SimInfo::getPropertyByName(const std::string& propName) {
935	>	GenericData* SimInfo::getPropertyByName(const string& propName) {
936		return properties_.getPropertyByName(propName);
937		}
938
#	Line 1232 | Line 946 | namespace oopse {
946		Molecule* mol;
947		RigidBody* rb;
948		Atom* atom;
949	+	CutoffGroup* cg;
950		SimInfo::MoleculeIterator mi;
951		Molecule::RigidBodyIterator rbIter;
952	<	Molecule::AtomIterator atomIter;;
952	>	Molecule::AtomIterator atomIter;
953	>	Molecule::CutoffGroupIterator cgIter;
954
955		for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
956
#	Line 1245 | Line 961 | namespace oopse {
961		for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
962		rb->setSnapshotManager(sman_);
963		}
964	+
965	+	for (cg = mol->beginCutoffGroup(cgIter); cg != NULL; cg = mol->nextCutoffGroup(cgIter)) {
966	+	cg->setSnapshotManager(sman_);
967	+	}
968		}
969
970		}
#	Line 1301 | Line 1021 | namespace oopse {
1021
1022		}
1023
1024	<	std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1024	>	ostream& operator <<(ostream& o, SimInfo& info) {
1025
1026		return o;
1027		}
#	Line 1344 | Line 1064 | namespace oopse {
1064
1065
1066		[  Ixx -Ixy  -Ixz ]
1067	<	J =| -Iyx  Iyy  -Iyz |
1067	>	J =| -Iyx  Iyy  -Iyz |
1068		[ -Izx -Iyz   Izz ]
1069		*/
1070
#	Line 1451 | Line 1171 | namespace oopse {
1171		return IOIndexToIntegrableObject.at(index);
1172		}
1173
1174	<	void SimInfo::setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v) {
1174	>	void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1175		IOIndexToIntegrableObject= v;
1176		}
1177
#	Line 1493 | Line 1213 | namespace oopse {
1213		return;
1214		}
1215		/*
1216	<	void SimInfo::setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v) {
1216	>	void SimInfo::setStuntDoubleFromGlobalIndex(vector<StuntDouble*> v) {
1217		assert( v.size() == nAtoms_ + nRigidBodies_);
1218		sdByGlobalIndex_ = v;
1219		}
#	Line 1503 | Line 1223 | namespace oopse {
1223		return sdByGlobalIndex_.at(index);
1224		}
1225		*/
1226	<	}//end namespace oopse
1226	>	int SimInfo::getNGlobalConstraints() {
1227	>	int nGlobalConstraints;
1228	>	#ifdef IS_MPI
1229	>	MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
1230	>	MPI_COMM_WORLD);
1231	>	#else
1232	>	nGlobalConstraints =  nConstraints_;
1233	>	#endif
1234	>	return nGlobalConstraints;
1235	>	}
1236
1237	+	}//end namespace OpenMD
1238	+

Comparing:
trunk/src/brains/SimInfo.cpp (property svn:keywords), Revision 1103 by chuckv, Fri Dec 29 20:21:53 2006 UTC vs.
branches/development/src/brains/SimInfo.cpp (property svn:keywords), Revision 1627 by gezelter, Tue Sep 13 22:05:04 2011 UTC

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

Diff Legend

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