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

Comparing:
trunk/src/brains/SimInfo.cpp (property svn:keywords), Revision 998 by chrisfen, Mon Jul 3 13:18:43 2006 UTC vs.
branches/development/src/brains/SimInfo.cpp (property svn:keywords), Revision 1744 by gezelter, Tue Jun 5 18:07:08 2012 UTC

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

Diff Legend

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