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

Comparing:
trunk/src/brains/SimInfo.cpp (property svn:keywords), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/brains/SimInfo.cpp (property svn:keywords), Revision 1750 by gezelter, Thu Jun 7 12:53:46 2012 UTC

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

Diff Legend

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