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 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
branches/development/src/brains/SimInfo.cpp (file contents), Revision 1597 by gezelter, Tue Jul 26 15:49:24 2011 UTC

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

Comparing:
trunk/src/brains/SimInfo.cpp (property svn:keywords), Revision 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
branches/development/src/brains/SimInfo.cpp (property svn:keywords), Revision 1597 by gezelter, Tue Jul 26 15:49:24 2011 UTC

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

Diff Legend

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