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

Comparing:
trunk/src/brains/SimInfo.cpp (property svn:keywords), Revision 1241 by gezelter, Fri Apr 25 15:14:47 2008 UTC vs.
branches/development/src/brains/SimInfo.cpp (property svn:keywords), Revision 1725 by gezelter, Sat May 26 18:13:43 2012 UTC

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

Diff Legend

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