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 490 by tim, Wed Apr 13 18:41:17 2005 UTC vs.
Revision 878 by chrisfen, Wed Feb 1 20:54:46 2006 UTC

#	Line 1 | Line 1
1	<	/*
1	>	/*
2		* Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3		*
4		* The University of Notre Dame grants you ("Licensee") a
#	Line 48 | Line 48
48
49		#include <algorithm>
50		#include <set>
51	+	#include <map>
52
53		#include "brains/SimInfo.hpp"
54		#include "math/Vector3.hpp"
55		#include "primitives/Molecule.hpp"
56	+	#include "UseTheForce/fCutoffPolicy.h"
57	+	#include "UseTheForce/DarkSide/fElectrostaticSummationMethod.h"
58	+	#include "UseTheForce/DarkSide/fElectrostaticScreeningMethod.h"
59	+	#include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
60		#include "UseTheForce/doForces_interface.h"
61	<	#include "UseTheForce/notifyCutoffs_interface.h"
61	>	#include "UseTheForce/DarkSide/electrostatic_interface.h"
62	>	#include "UseTheForce/DarkSide/switcheroo_interface.h"
63		#include "utils/MemoryUtils.hpp"
64		#include "utils/simError.h"
65		#include "selection/SelectionManager.hpp"
66	+	#include "io/ForceFieldOptions.hpp"
67	+	#include "UseTheForce/ForceField.hpp"
68
69		#ifdef IS_MPI
70		#include "UseTheForce/mpiComponentPlan.h"
#	Line 64 | Line 72 | namespace oopse {
72		#endif
73
74		namespace oopse {
75	+	std::set<int> getRigidSet(int index, std::map<int, std::set<int> >& container) {
76	+	std::map<int, std::set<int> >::iterator i = container.find(index);
77	+	std::set<int> result;
78	+	if (i != container.end()) {
79	+	result = i->second;
80	+	}
81
82	<	SimInfo::SimInfo(MakeStamps* stamps, std::vector<std::pair<MoleculeStamp*, int> >& molStampPairs,
83	<	ForceField* ff, Globals* simParams) :
84	<	stamps_(stamps), forceField_(ff), simParams_(simParams),
85	<	ndf_(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
86	<	nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
87	<	nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
88	<	nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
89	<	nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
90	<	sman_(NULL), fortranInitialized_(false) {
82	>	return result;
83	>	}
84	>
85	>	SimInfo::SimInfo(ForceField* ff, Globals* simParams) :
86	>	forceField_(ff), simParams_(simParams),
87	>	ndf_(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
88	>	nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
89	>	nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
90	>	nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
91	>	nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
92	>	sman_(NULL), fortranInitialized_(false) {
93
94	<
95	<	std::vector<std::pair<MoleculeStamp*, int> >::iterator i;
96	<	MoleculeStamp* molStamp;
97	<	int nMolWithSameStamp;
98	<	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
99	<	int nGroups = 0;          //total cutoff groups defined in meta-data file
100	<	CutoffGroupStamp* cgStamp;
101	<	RigidBodyStamp* rbStamp;
102	<	int nRigidAtoms = 0;
103	<
104	<	for (i = molStampPairs.begin(); i !=molStampPairs.end(); ++i) {
105	<	molStamp = i->first;
90	<	nMolWithSameStamp = i->second;
94	>	MoleculeStamp* molStamp;
95	>	int nMolWithSameStamp;
96	>	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
97	>	int nGroups = 0;      //total cutoff groups defined in meta-data file
98	>	CutoffGroupStamp* cgStamp;
99	>	RigidBodyStamp* rbStamp;
100	>	int nRigidAtoms = 0;
101	>	std::vector<Component*> components = simParams->getComponents();
102	>
103	>	for (std::vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
104	>	molStamp = (*i)->getMoleculeStamp();
105	>	nMolWithSameStamp = (*i)->getNMol();
106
107		addMoleculeStamp(molStamp, nMolWithSameStamp);
108
109		//calculate atoms in molecules
110		nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;
111
97	–
112		//calculate atoms in cutoff groups
113		int nAtomsInGroups = 0;
114		int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
115
116		for (int j=0; j < nCutoffGroupsInStamp; j++) {
117	<	cgStamp = molStamp->getCutoffGroup(j);
118	<	nAtomsInGroups += cgStamp->getNMembers();
117	>	cgStamp = molStamp->getCutoffGroupStamp(j);
118	>	nAtomsInGroups += cgStamp->getNMembers();
119		}
120
121		nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
122	+
123		nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;
124
125		//calculate atoms in rigid bodies
#	Line 112 | Line 127 | SimInfo::SimInfo(MakeStamps* stamps, std::vector<std::
127		int nRigidBodiesInStamp = molStamp->getNRigidBodies();
128
129		for (int j=0; j < nRigidBodiesInStamp; j++) {
130	<	rbStamp = molStamp->getRigidBody(j);
131	<	nAtomsInRigidBodies += rbStamp->getNMembers();
130	>	rbStamp = molStamp->getRigidBodyStamp(j);
131	>	nAtomsInRigidBodies += rbStamp->getNMembers();
132		}
133
134		nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
135		nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;
136
137	<	}
137	>	}
138
139	<	//every free atom (atom does not belong to cutoff groups) is a cutoff group
140	<	//therefore the total number of cutoff groups in the system is equal to
141	<	//the total number of atoms minus number of atoms belong to cutoff group defined in meta-data
142	<	//file plus the number of cutoff groups defined in meta-data file
143	<	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
139	>	//every free atom (atom does not belong to cutoff groups) is a cutoff
140	>	//group therefore the total number of cutoff groups in the system is
141	>	//equal to the total number of atoms minus number of atoms belong to
142	>	//cutoff group defined in meta-data file plus the number of cutoff
143	>	//groups defined in meta-data file
144	>	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
145
146	<	//every free atom (atom does not belong to rigid bodies) is an integrable object
147	<	//therefore the total number of  integrable objects in the system is equal to
148	<	//the total number of atoms minus number of atoms belong to  rigid body defined in meta-data
149	<	//file plus the number of  rigid bodies defined in meta-data file
150	<	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms + nGlobalRigidBodies_;
146	>	//every free atom (atom does not belong to rigid bodies) is an
147	>	//integrable object therefore the total number of integrable objects
148	>	//in the system is equal to the total number of atoms minus number of
149	>	//atoms belong to rigid body defined in meta-data file plus the number
150	>	//of rigid bodies defined in meta-data file
151	>	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
152	>	+ nGlobalRigidBodies_;
153	>
154	>	nGlobalMols_ = molStampIds_.size();
155
136	–	nGlobalMols_ = molStampIds_.size();
137	–
156		#ifdef IS_MPI
157	<	molToProcMap_.resize(nGlobalMols_);
157	>	molToProcMap_.resize(nGlobalMols_);
158		#endif
159
160	<	}
160	>	}
161
162	<	SimInfo::~SimInfo() {
162	>	SimInfo::~SimInfo() {
163		std::map<int, Molecule*>::iterator i;
164		for (i = molecules_.begin(); i != molecules_.end(); ++i) {
165	<	delete i->second;
165	>	delete i->second;
166		}
167		molecules_.clear();
168
151	–	delete stamps_;
169		delete sman_;
170		delete simParams_;
171		delete forceField_;
172	<	}
172	>	}
173
174	<	int SimInfo::getNGlobalConstraints() {
174	>	int SimInfo::getNGlobalConstraints() {
175		int nGlobalConstraints;
176		#ifdef IS_MPI
177		MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
#	Line 163 | Line 180 | int SimInfo::getNGlobalConstraints() {
180		nGlobalConstraints =  nConstraints_;
181		#endif
182		return nGlobalConstraints;
183	<	}
183	>	}
184
185	<	bool SimInfo::addMolecule(Molecule* mol) {
185	>	bool SimInfo::addMolecule(Molecule* mol) {
186		MoleculeIterator i;
187
188		i = molecules_.find(mol->getGlobalIndex());
189		if (i == molecules_.end() ) {
190
191	<	molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
191	>	molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
192
193	<	nAtoms_ += mol->getNAtoms();
194	<	nBonds_ += mol->getNBonds();
195	<	nBends_ += mol->getNBends();
196	<	nTorsions_ += mol->getNTorsions();
197	<	nRigidBodies_ += mol->getNRigidBodies();
198	<	nIntegrableObjects_ += mol->getNIntegrableObjects();
199	<	nCutoffGroups_ += mol->getNCutoffGroups();
200	<	nConstraints_ += mol->getNConstraintPairs();
193	>	nAtoms_ += mol->getNAtoms();
194	>	nBonds_ += mol->getNBonds();
195	>	nBends_ += mol->getNBends();
196	>	nTorsions_ += mol->getNTorsions();
197	>	nRigidBodies_ += mol->getNRigidBodies();
198	>	nIntegrableObjects_ += mol->getNIntegrableObjects();
199	>	nCutoffGroups_ += mol->getNCutoffGroups();
200	>	nConstraints_ += mol->getNConstraintPairs();
201
202	<	addExcludePairs(mol);
202	>	addExcludePairs(mol);
203
204	<	return true;
204	>	return true;
205		} else {
206	<	return false;
206	>	return false;
207		}
208	<	}
208	>	}
209
210	<	bool SimInfo::removeMolecule(Molecule* mol) {
210	>	bool SimInfo::removeMolecule(Molecule* mol) {
211		MoleculeIterator i;
212		i = molecules_.find(mol->getGlobalIndex());
213
214		if (i != molecules_.end() ) {
215
216	<	assert(mol == i->second);
216	>	assert(mol == i->second);
217
218	<	nAtoms_ -= mol->getNAtoms();
219	<	nBonds_ -= mol->getNBonds();
220	<	nBends_ -= mol->getNBends();
221	<	nTorsions_ -= mol->getNTorsions();
222	<	nRigidBodies_ -= mol->getNRigidBodies();
223	<	nIntegrableObjects_ -= mol->getNIntegrableObjects();
224	<	nCutoffGroups_ -= mol->getNCutoffGroups();
225	<	nConstraints_ -= mol->getNConstraintPairs();
218	>	nAtoms_ -= mol->getNAtoms();
219	>	nBonds_ -= mol->getNBonds();
220	>	nBends_ -= mol->getNBends();
221	>	nTorsions_ -= mol->getNTorsions();
222	>	nRigidBodies_ -= mol->getNRigidBodies();
223	>	nIntegrableObjects_ -= mol->getNIntegrableObjects();
224	>	nCutoffGroups_ -= mol->getNCutoffGroups();
225	>	nConstraints_ -= mol->getNConstraintPairs();
226
227	<	removeExcludePairs(mol);
228	<	molecules_.erase(mol->getGlobalIndex());
227	>	removeExcludePairs(mol);
228	>	molecules_.erase(mol->getGlobalIndex());
229
230	<	delete mol;
231	<
232	<	return true;
230	>	delete mol;
231	>
232	>	return true;
233		} else {
234	<	return false;
234	>	return false;
235		}
236
237
238	<	}
238	>	}
239
240
241	<	Molecule* SimInfo::beginMolecule(MoleculeIterator& i) {
241	>	Molecule* SimInfo::beginMolecule(MoleculeIterator& i) {
242		i = molecules_.begin();
243		return i == molecules_.end() ? NULL : i->second;
244	<	}
244	>	}
245
246	<	Molecule* SimInfo::nextMolecule(MoleculeIterator& i) {
246	>	Molecule* SimInfo::nextMolecule(MoleculeIterator& i) {
247		++i;
248		return i == molecules_.end() ? NULL : i->second;
249	<	}
249	>	}
250
251
252	<	void SimInfo::calcNdf() {
252	>	void SimInfo::calcNdf() {
253		int ndf_local;
254		MoleculeIterator i;
255		std::vector<StuntDouble*>::iterator j;
#	Line 242 | Line 259 | void SimInfo::calcNdf() {
259		ndf_local = 0;
260
261		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
262	<	for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
263	<	integrableObject = mol->nextIntegrableObject(j)) {
262	>	for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
263	>	integrableObject = mol->nextIntegrableObject(j)) {
264
265	<	ndf_local += 3;
265	>	ndf_local += 3;
266
267	<	if (integrableObject->isDirectional()) {
268	<	if (integrableObject->isLinear()) {
269	<	ndf_local += 2;
270	<	} else {
271	<	ndf_local += 3;
272	<	}
273	<	}
267	>	if (integrableObject->isDirectional()) {
268	>	if (integrableObject->isLinear()) {
269	>	ndf_local += 2;
270	>	} else {
271	>	ndf_local += 3;
272	>	}
273	>	}
274
275	<	}//end for (integrableObject)
276	<	}// end for (mol)
275	>	}
276	>	}
277
278		// n_constraints is local, so subtract them on each processor
279		ndf_local -= nConstraints_;
#	Line 271 | Line 288 | void SimInfo::calcNdf() {
288		// entire system:
289		ndf_ = ndf_ - 3 - nZconstraint_;
290
291	<	}
291	>	}
292
293	<	void SimInfo::calcNdfRaw() {
293	>	void SimInfo::calcNdfRaw() {
294		int ndfRaw_local;
295
296		MoleculeIterator i;
#	Line 285 | Line 302 | void SimInfo::calcNdfRaw() {
302		ndfRaw_local = 0;
303
304		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
305	<	for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
306	<	integrableObject = mol->nextIntegrableObject(j)) {
305	>	for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
306	>	integrableObject = mol->nextIntegrableObject(j)) {
307
308	<	ndfRaw_local += 3;
308	>	ndfRaw_local += 3;
309
310	<	if (integrableObject->isDirectional()) {
311	<	if (integrableObject->isLinear()) {
312	<	ndfRaw_local += 2;
313	<	} else {
314	<	ndfRaw_local += 3;
315	<	}
316	<	}
310	>	if (integrableObject->isDirectional()) {
311	>	if (integrableObject->isLinear()) {
312	>	ndfRaw_local += 2;
313	>	} else {
314	>	ndfRaw_local += 3;
315	>	}
316	>	}
317
318	<	}
318	>	}
319		}
320
321		#ifdef IS_MPI
#	Line 306 | Line 323 | void SimInfo::calcNdfRaw() {
323		#else
324		ndfRaw_ = ndfRaw_local;
325		#endif
326	<	}
326	>	}
327
328	<	void SimInfo::calcNdfTrans() {
328	>	void SimInfo::calcNdfTrans() {
329		int ndfTrans_local;
330
331		ndfTrans_local = 3 * nIntegrableObjects_ - nConstraints_;
#	Line 322 | Line 339 | void SimInfo::calcNdfTrans() {
339
340		ndfTrans_ = ndfTrans_ - 3 - nZconstraint_;
341
342	<	}
342	>	}
343
344	<	void SimInfo::addExcludePairs(Molecule* mol) {
344	>	void SimInfo::addExcludePairs(Molecule* mol) {
345		std::vector<Bond*>::iterator bondIter;
346		std::vector<Bend*>::iterator bendIter;
347		std::vector<Torsion*>::iterator torsionIter;
#	Line 335 | Line 352 | void SimInfo::addExcludePairs(Molecule* mol) {
352		int b;
353		int c;
354		int d;
355	+
356	+	std::map<int, std::set<int> > atomGroups;
357	+
358	+	Molecule::RigidBodyIterator rbIter;
359	+	RigidBody* rb;
360	+	Molecule::IntegrableObjectIterator ii;
361	+	StuntDouble* integrableObject;
362
363	+	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
364	+	integrableObject = mol->nextIntegrableObject(ii)) {
365	+
366	+	if (integrableObject->isRigidBody()) {
367	+	rb = static_cast<RigidBody*>(integrableObject);
368	+	std::vector<Atom*> atoms = rb->getAtoms();
369	+	std::set<int> rigidAtoms;
370	+	for (int i = 0; i < atoms.size(); ++i) {
371	+	rigidAtoms.insert(atoms[i]->getGlobalIndex());
372	+	}
373	+	for (int i = 0; i < atoms.size(); ++i) {
374	+	atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
375	+	}
376	+	} else {
377	+	std::set<int> oneAtomSet;
378	+	oneAtomSet.insert(integrableObject->getGlobalIndex());
379	+	atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
380	+	}
381	+	}
382	+
383	+
384	+
385		for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
386	<	a = bond->getAtomA()->getGlobalIndex();
387	<	b = bond->getAtomB()->getGlobalIndex();
388	<	exclude_.addPair(a, b);
386	>	a = bond->getAtomA()->getGlobalIndex();
387	>	b = bond->getAtomB()->getGlobalIndex();
388	>	exclude_.addPair(a, b);
389		}
390
391		for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
392	<	a = bend->getAtomA()->getGlobalIndex();
393	<	b = bend->getAtomB()->getGlobalIndex();
394	<	c = bend->getAtomC()->getGlobalIndex();
392	>	a = bend->getAtomA()->getGlobalIndex();
393	>	b = bend->getAtomB()->getGlobalIndex();
394	>	c = bend->getAtomC()->getGlobalIndex();
395	>	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
396	>	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
397	>	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
398
399	<	exclude_.addPair(a, b);
400	<	exclude_.addPair(a, c);
401	<	exclude_.addPair(b, c);
399	>	exclude_.addPairs(rigidSetA, rigidSetB);
400	>	exclude_.addPairs(rigidSetA, rigidSetC);
401	>	exclude_.addPairs(rigidSetB, rigidSetC);
402	>
403	>	//exclude_.addPair(a, b);
404	>	//exclude_.addPair(a, c);
405	>	//exclude_.addPair(b, c);
406		}
407
408		for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
409	<	a = torsion->getAtomA()->getGlobalIndex();
410	<	b = torsion->getAtomB()->getGlobalIndex();
411	<	c = torsion->getAtomC()->getGlobalIndex();
412	<	d = torsion->getAtomD()->getGlobalIndex();
409	>	a = torsion->getAtomA()->getGlobalIndex();
410	>	b = torsion->getAtomB()->getGlobalIndex();
411	>	c = torsion->getAtomC()->getGlobalIndex();
412	>	d = torsion->getAtomD()->getGlobalIndex();
413	>	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
414	>	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
415	>	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
416	>	std::set<int> rigidSetD = getRigidSet(d, atomGroups);
417
418	<	exclude_.addPair(a, b);
419	<	exclude_.addPair(a, c);
420	<	exclude_.addPair(a, d);
421	<	exclude_.addPair(b, c);
422	<	exclude_.addPair(b, d);
423	<	exclude_.addPair(c, d);
418	>	exclude_.addPairs(rigidSetA, rigidSetB);
419	>	exclude_.addPairs(rigidSetA, rigidSetC);
420	>	exclude_.addPairs(rigidSetA, rigidSetD);
421	>	exclude_.addPairs(rigidSetB, rigidSetC);
422	>	exclude_.addPairs(rigidSetB, rigidSetD);
423	>	exclude_.addPairs(rigidSetC, rigidSetD);
424	>
425	>	/*
426	>	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
427	>	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
428	>	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
429	>	exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
430	>	exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
431	>	exclude_.addPairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
432	>
433	>
434	>	exclude_.addPair(a, b);
435	>	exclude_.addPair(a, c);
436	>	exclude_.addPair(a, d);
437	>	exclude_.addPair(b, c);
438	>	exclude_.addPair(b, d);
439	>	exclude_.addPair(c, d);
440	>	*/
441		}
442
369	–	Molecule::RigidBodyIterator rbIter;
370	–	RigidBody* rb;
443		for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
444	<	std::vector<Atom*> atoms = rb->getAtoms();
445	<	for (int i = 0; i < atoms.size() -1 ; ++i) {
446	<	for (int j = i + 1; j < atoms.size(); ++j) {
447	<	a = atoms[i]->getGlobalIndex();
448	<	b = atoms[j]->getGlobalIndex();
449	<	exclude_.addPair(a, b);
450	<	}
451	<	}
444	>	std::vector<Atom*> atoms = rb->getAtoms();
445	>	for (int i = 0; i < atoms.size() -1 ; ++i) {
446	>	for (int j = i + 1; j < atoms.size(); ++j) {
447	>	a = atoms[i]->getGlobalIndex();
448	>	b = atoms[j]->getGlobalIndex();
449	>	exclude_.addPair(a, b);
450	>	}
451	>	}
452		}
453
454	<	}
454	>	}
455
456	<	void SimInfo::removeExcludePairs(Molecule* mol) {
456	>	void SimInfo::removeExcludePairs(Molecule* mol) {
457		std::vector<Bond*>::iterator bondIter;
458		std::vector<Bend*>::iterator bendIter;
459		std::vector<Torsion*>::iterator torsionIter;
#	Line 392 | Line 464 | void SimInfo::removeExcludePairs(Molecule* mol) {
464		int b;
465		int c;
466		int d;
467	+
468	+	std::map<int, std::set<int> > atomGroups;
469	+
470	+	Molecule::RigidBodyIterator rbIter;
471	+	RigidBody* rb;
472	+	Molecule::IntegrableObjectIterator ii;
473	+	StuntDouble* integrableObject;
474
475	+	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
476	+	integrableObject = mol->nextIntegrableObject(ii)) {
477	+
478	+	if (integrableObject->isRigidBody()) {
479	+	rb = static_cast<RigidBody*>(integrableObject);
480	+	std::vector<Atom*> atoms = rb->getAtoms();
481	+	std::set<int> rigidAtoms;
482	+	for (int i = 0; i < atoms.size(); ++i) {
483	+	rigidAtoms.insert(atoms[i]->getGlobalIndex());
484	+	}
485	+	for (int i = 0; i < atoms.size(); ++i) {
486	+	atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
487	+	}
488	+	} else {
489	+	std::set<int> oneAtomSet;
490	+	oneAtomSet.insert(integrableObject->getGlobalIndex());
491	+	atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
492	+	}
493	+	}
494	+
495	+
496		for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
497	<	a = bond->getAtomA()->getGlobalIndex();
498	<	b = bond->getAtomB()->getGlobalIndex();
499	<	exclude_.removePair(a, b);
497	>	a = bond->getAtomA()->getGlobalIndex();
498	>	b = bond->getAtomB()->getGlobalIndex();
499	>	exclude_.removePair(a, b);
500		}
501
502		for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
503	<	a = bend->getAtomA()->getGlobalIndex();
504	<	b = bend->getAtomB()->getGlobalIndex();
505	<	c = bend->getAtomC()->getGlobalIndex();
503	>	a = bend->getAtomA()->getGlobalIndex();
504	>	b = bend->getAtomB()->getGlobalIndex();
505	>	c = bend->getAtomC()->getGlobalIndex();
506
507	<	exclude_.removePair(a, b);
508	<	exclude_.removePair(a, c);
509	<	exclude_.removePair(b, c);
507	>	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
508	>	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
509	>	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
510	>
511	>	exclude_.removePairs(rigidSetA, rigidSetB);
512	>	exclude_.removePairs(rigidSetA, rigidSetC);
513	>	exclude_.removePairs(rigidSetB, rigidSetC);
514	>
515	>	//exclude_.removePair(a, b);
516	>	//exclude_.removePair(a, c);
517	>	//exclude_.removePair(b, c);
518		}
519
520		for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
521	<	a = torsion->getAtomA()->getGlobalIndex();
522	<	b = torsion->getAtomB()->getGlobalIndex();
523	<	c = torsion->getAtomC()->getGlobalIndex();
524	<	d = torsion->getAtomD()->getGlobalIndex();
521	>	a = torsion->getAtomA()->getGlobalIndex();
522	>	b = torsion->getAtomB()->getGlobalIndex();
523	>	c = torsion->getAtomC()->getGlobalIndex();
524	>	d = torsion->getAtomD()->getGlobalIndex();
525
526	<	exclude_.removePair(a, b);
527	<	exclude_.removePair(a, c);
528	<	exclude_.removePair(a, d);
529	<	exclude_.removePair(b, c);
530	<	exclude_.removePair(b, d);
531	<	exclude_.removePair(c, d);
526	>	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
527	>	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
528	>	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
529	>	std::set<int> rigidSetD = getRigidSet(d, atomGroups);
530	>
531	>	exclude_.removePairs(rigidSetA, rigidSetB);
532	>	exclude_.removePairs(rigidSetA, rigidSetC);
533	>	exclude_.removePairs(rigidSetA, rigidSetD);
534	>	exclude_.removePairs(rigidSetB, rigidSetC);
535	>	exclude_.removePairs(rigidSetB, rigidSetD);
536	>	exclude_.removePairs(rigidSetC, rigidSetD);
537	>
538	>	/*
539	>	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
540	>	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
541	>	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
542	>	exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
543	>	exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
544	>	exclude_.removePairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
545	>
546	>
547	>	exclude_.removePair(a, b);
548	>	exclude_.removePair(a, c);
549	>	exclude_.removePair(a, d);
550	>	exclude_.removePair(b, c);
551	>	exclude_.removePair(b, d);
552	>	exclude_.removePair(c, d);
553	>	*/
554		}
555
426	–	Molecule::RigidBodyIterator rbIter;
427	–	RigidBody* rb;
556		for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
557	<	std::vector<Atom*> atoms = rb->getAtoms();
558	<	for (int i = 0; i < atoms.size() -1 ; ++i) {
559	<	for (int j = i + 1; j < atoms.size(); ++j) {
560	<	a = atoms[i]->getGlobalIndex();
561	<	b = atoms[j]->getGlobalIndex();
562	<	exclude_.removePair(a, b);
563	<	}
564	<	}
557	>	std::vector<Atom*> atoms = rb->getAtoms();
558	>	for (int i = 0; i < atoms.size() -1 ; ++i) {
559	>	for (int j = i + 1; j < atoms.size(); ++j) {
560	>	a = atoms[i]->getGlobalIndex();
561	>	b = atoms[j]->getGlobalIndex();
562	>	exclude_.removePair(a, b);
563	>	}
564	>	}
565		}
566
567	<	}
567	>	}
568
569
570	<	void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
570	>	void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
571		int curStampId;
572
573		//index from 0
#	Line 447 | Line 575 | void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp
575
576		moleculeStamps_.push_back(molStamp);
577		molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
578	<	}
578	>	}
579
580	<	void SimInfo::update() {
580	>	void SimInfo::update() {
581
582		setupSimType();
583
#	Line 462 | Line 590 | void SimInfo::update() {
590		//setup fortran force field
591		/** @deprecate */
592		int isError = 0;
593	<	initFortranFF( &fInfo_.SIM_uses_RF , &isError );
593	>
594	>	setupElectrostaticSummationMethod( isError );
595	>	setupSwitchingFunction();
596	>
597		if(isError){
598	<	sprintf( painCave.errMsg,
599	<	"ForceField error: There was an error initializing the forceField in fortran.\n" );
600	<	painCave.isFatal = 1;
601	<	simError();
598	>	sprintf( painCave.errMsg,
599	>	"ForceField error: There was an error initializing the forceField in fortran.\n" );
600	>	painCave.isFatal = 1;
601	>	simError();
602		}
603
604
#	Line 478 | Line 609 | void SimInfo::update() {
609		calcNdfTrans();
610
611		fortranInitialized_ = true;
612	<	}
612	>	}
613
614	<	std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
614	>	std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
615		SimInfo::MoleculeIterator mi;
616		Molecule* mol;
617		Molecule::AtomIterator ai;
#	Line 489 | Line 620 | std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
620
621		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
622
623	<	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
624	<	atomTypes.insert(atom->getAtomType());
625	<	}
623	>	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
624	>	atomTypes.insert(atom->getAtomType());
625	>	}
626
627		}
628
629		return atomTypes;
630	<	}
630	>	}
631
632	<	void SimInfo::setupSimType() {
632	>	void SimInfo::setupSimType() {
633		std::set<AtomType*>::iterator i;
634		std::set<AtomType*> atomTypes;
635		atomTypes = getUniqueAtomTypes();
#	Line 506 | Line 637 | void SimInfo::setupSimType() {
637		int useLennardJones = 0;
638		int useElectrostatic = 0;
639		int useEAM = 0;
640	+	int useSC = 0;
641		int useCharge = 0;
642		int useDirectional = 0;
643		int useDipole = 0;
644		int useGayBerne = 0;
645		int useSticky = 0;
646	+	int useStickyPower = 0;
647		int useShape = 0;
648		int useFLARB = 0; //it is not in AtomType yet
649		int useDirectionalAtom = 0;
650		int useElectrostatics = 0;
651		//usePBC and useRF are from simParams
652	<	int usePBC = simParams_->getPBC();
653	<	int useRF = simParams_->getUseRF();
652	>	int usePBC = simParams_->getUsePeriodicBoundaryConditions();
653	>	int useRF;
654	>	int useSF;
655	>	std::string myMethod;
656
657	+	// set the useRF logical
658	+	useRF = 0;
659	+	useSF = 0;
660	+
661	+
662	+	if (simParams_->haveElectrostaticSummationMethod()) {
663	+	std::string myMethod = simParams_->getElectrostaticSummationMethod();
664	+	toUpper(myMethod);
665	+	if (myMethod == "REACTION_FIELD") {
666	+	useRF=1;
667	+	} else {
668	+	if (myMethod == "SHIFTED_FORCE") {
669	+	useSF = 1;
670	+	}
671	+	}
672	+	}
673	+
674		//loop over all of the atom types
675		for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
676	<	useLennardJones |= (*i)->isLennardJones();
677	<	useElectrostatic |= (*i)->isElectrostatic();
678	<	useEAM |= (*i)->isEAM();
679	<	useCharge |= (*i)->isCharge();
680	<	useDirectional |= (*i)->isDirectional();
681	<	useDipole |= (*i)->isDipole();
682	<	useGayBerne |= (*i)->isGayBerne();
683	<	useSticky |= (*i)->isSticky();
684	<	useShape |= (*i)->isShape();
676	>	useLennardJones |= (*i)->isLennardJones();
677	>	useElectrostatic |= (*i)->isElectrostatic();
678	>	useEAM |= (*i)->isEAM();
679	>	useSC |= (*i)->isSC();
680	>	useCharge |= (*i)->isCharge();
681	>	useDirectional |= (*i)->isDirectional();
682	>	useDipole |= (*i)->isDipole();
683	>	useGayBerne |= (*i)->isGayBerne();
684	>	useSticky |= (*i)->isSticky();
685	>	useStickyPower |= (*i)->isStickyPower();
686	>	useShape |= (*i)->isShape();
687		}
688
689	<	if (useSticky || useDipole || useGayBerne || useShape) {
690	<	useDirectionalAtom = 1;
689	>	if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
690	>	useDirectionalAtom = 1;
691		}
692
693		if (useCharge || useDipole) {
694	<	useElectrostatics = 1;
694	>	useElectrostatics = 1;
695		}
696
697		#ifdef IS_MPI
#	Line 564 | Line 718 | void SimInfo::setupSimType() {
718		temp = useSticky;
719		MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
720
721	+	temp = useStickyPower;
722	+	MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
723	+
724		temp = useGayBerne;
725		MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
726
727		temp = useEAM;
728		MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
729
730	+	temp = useSC;
731	+	MPI_Allreduce(&temp, &useSC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
732	+
733		temp = useShape;
734		MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
735
#	Line 578 | Line 738 | void SimInfo::setupSimType() {
738
739		temp = useRF;
740		MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
741	<
741	>
742	>	temp = useSF;
743	>	MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
744	>
745		#endif
746
747		fInfo_.SIM_uses_PBC = usePBC;
#	Line 588 | Line 751 | void SimInfo::setupSimType() {
751		fInfo_.SIM_uses_Charges = useCharge;
752		fInfo_.SIM_uses_Dipoles = useDipole;
753		fInfo_.SIM_uses_Sticky = useSticky;
754	+	fInfo_.SIM_uses_StickyPower = useStickyPower;
755		fInfo_.SIM_uses_GayBerne = useGayBerne;
756		fInfo_.SIM_uses_EAM = useEAM;
757	+	fInfo_.SIM_uses_SC = useSC;
758		fInfo_.SIM_uses_Shapes = useShape;
759		fInfo_.SIM_uses_FLARB = useFLARB;
760		fInfo_.SIM_uses_RF = useRF;
761	+	fInfo_.SIM_uses_SF = useSF;
762
763	<	if( fInfo_.SIM_uses_Dipoles && fInfo_.SIM_uses_RF) {
764	<
765	<	if (simParams_->haveDielectric()) {
766	<	fInfo_.dielect = simParams_->getDielectric();
767	<	} else {
768	<	sprintf(painCave.errMsg,
769	<	"SimSetup Error: No Dielectric constant was set.\n"
770	<	"\tYou are trying to use Reaction Field without"
771	<	"\tsetting a dielectric constant!\n");
772	<	painCave.isFatal = 1;
773	<	simError();
774	<	}
609	<
610	<	} else {
611	<	fInfo_.dielect = 0.0;
763	>	if( myMethod == "REACTION_FIELD") {
764	>
765	>	if (simParams_->haveDielectric()) {
766	>	fInfo_.dielect = simParams_->getDielectric();
767	>	} else {
768	>	sprintf(painCave.errMsg,
769	>	"SimSetup Error: No Dielectric constant was set.\n"
770	>	"\tYou are trying to use Reaction Field without"
771	>	"\tsetting a dielectric constant!\n");
772	>	painCave.isFatal = 1;
773	>	simError();
774	>	}
775		}
776
777	<	}
777	>	}
778
779	<	void SimInfo::setupFortranSim() {
779	>	void SimInfo::setupFortranSim() {
780		int isError;
781		int nExclude;
782		std::vector<int> fortranGlobalGroupMembership;
#	Line 623 | Line 786 | void SimInfo::setupFortranSim() {
786
787		//globalGroupMembership_ is filled by SimCreator
788		for (int i = 0; i < nGlobalAtoms_; i++) {
789	<	fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
789	>	fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
790		}
791
792		//calculate mass ratio of cutoff group
#	Line 640 | Line 803 | void SimInfo::setupFortranSim() {
803		mfact.reserve(getNCutoffGroups());
804
805		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
806	<	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
806	>	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
807
808	<	totalMass = cg->getMass();
809	<	for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
810	<	mfact.push_back(atom->getMass()/totalMass);
811	<	}
808	>	totalMass = cg->getMass();
809	>	for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
810	>	// Check for massless groups - set mfact to 1 if true
811	>	if (totalMass != 0)
812	>	mfact.push_back(atom->getMass()/totalMass);
813	>	else
814	>	mfact.push_back( 1.0 );
815	>	}
816
817	<	}
817	>	}
818		}
819
820		//fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
#	Line 657 | Line 824 | void SimInfo::setupFortranSim() {
824		identArray.reserve(getNAtoms());
825
826		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
827	<	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
828	<	identArray.push_back(atom->getIdent());
829	<	}
827	>	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
828	>	identArray.push_back(atom->getIdent());
829	>	}
830		}
831
832		//fill molMembershipArray
833		//molMembershipArray is filled by SimCreator
834		std::vector<int> molMembershipArray(nGlobalAtoms_);
835		for (int i = 0; i < nGlobalAtoms_; i++) {
836	<	molMembershipArray[i] = globalMolMembership_[i] + 1;
836	>	molMembershipArray[i] = globalMolMembership_[i] + 1;
837		}
838
839		//setup fortran simulation
#	Line 674 | Line 841 | void SimInfo::setupFortranSim() {
841		int* globalExcludes = NULL;
842		int* excludeList = exclude_.getExcludeList();
843		setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0], &nExclude, excludeList ,
844	<	&nGlobalExcludes, globalExcludes, &molMembershipArray[0],
845	<	&mfact[0], &nCutoffGroups_, &fortranGlobalGroupMembership[0], &isError);
844	>	&nGlobalExcludes, globalExcludes, &molMembershipArray[0],
845	>	&mfact[0], &nCutoffGroups_, &fortranGlobalGroupMembership[0], &isError);
846
847		if( isError ){
848
849	<	sprintf( painCave.errMsg,
850	<	"There was an error setting the simulation information in fortran.\n" );
851	<	painCave.isFatal = 1;
852	<	painCave.severity = OOPSE_ERROR;
853	<	simError();
849	>	sprintf( painCave.errMsg,
850	>	"There was an error setting the simulation information in fortran.\n" );
851	>	painCave.isFatal = 1;
852	>	painCave.severity = OOPSE_ERROR;
853	>	simError();
854		}
855
856		#ifdef IS_MPI
857		sprintf( checkPointMsg,
858	<	"succesfully sent the simulation information to fortran.\n");
858	>	"succesfully sent the simulation information to fortran.\n");
859		MPIcheckPoint();
860		#endif // is_mpi
861	<	}
861	>	}
862
863
864		#ifdef IS_MPI
865	<	void SimInfo::setupFortranParallel() {
865	>	void SimInfo::setupFortranParallel() {
866
867		//SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
868		std::vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
#	Line 711 | Line 878 | void SimInfo::setupFortranParallel() {
878
879		for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
880
881	<	//local index(index in DataStorge) of atom is important
882	<	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
883	<	localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
884	<	}
881	>	//local index(index in DataStorge) of atom is important
882	>	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
883	>	localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
884	>	}
885
886	<	//local index of cutoff group is trivial, it only depends on the order of travesing
887	<	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
888	<	localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
889	<	}
886	>	//local index of cutoff group is trivial, it only depends on the order of travesing
887	>	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
888	>	localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
889	>	}
890
891		}
892
#	Line 739 | Line 906 | void SimInfo::setupFortranParallel() {
906		&localToGlobalCutoffGroupIndex[0], &isError);
907
908		if (isError) {
909	<	sprintf(painCave.errMsg,
910	<	"mpiRefresh errror: fortran didn't like something we gave it.\n");
911	<	painCave.isFatal = 1;
912	<	simError();
909	>	sprintf(painCave.errMsg,
910	>	"mpiRefresh errror: fortran didn't like something we gave it.\n");
911	>	painCave.isFatal = 1;
912	>	simError();
913		}
914
915		sprintf(checkPointMsg, " mpiRefresh successful.\n");
916		MPIcheckPoint();
917
918
919	<	}
919	>	}
920
921		#endif
922
923	<	double SimInfo::calcMaxCutoffRadius() {
923	>	void SimInfo::setupCutoff() {
924	>
925	>	ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
926
927	+	// Check the cutoff policy
928	+	int cp =  TRADITIONAL_CUTOFF_POLICY; // Set to traditional by default
929
930	<	std::set<AtomType*> atomTypes;
931	<	std::set<AtomType*>::iterator i;
932	<	std::vector<double> cutoffRadius;
933	<
934	<	//get the unique atom types
764	<	atomTypes = getUniqueAtomTypes();
765	<
766	<	//query the max cutoff radius among these atom types
767	<	for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
768	<	cutoffRadius.push_back(forceField_->getRcutFromAtomType(*i));
930	>	std::string myPolicy;
931	>	if (forceFieldOptions_.haveCutoffPolicy()){
932	>	myPolicy = forceFieldOptions_.getCutoffPolicy();
933	>	}else if (simParams_->haveCutoffPolicy()) {
934	>	myPolicy = simParams_->getCutoffPolicy();
935		}
936
937	<	double maxCutoffRadius = *(std::max_element(cutoffRadius.begin(), cutoffRadius.end()));
938	<	#ifdef IS_MPI
939	<	//pick the max cutoff radius among the processors
940	<	#endif
937	>	if (!myPolicy.empty()){
938	>	toUpper(myPolicy);
939	>	if (myPolicy == "MIX") {
940	>	cp = MIX_CUTOFF_POLICY;
941	>	} else {
942	>	if (myPolicy == "MAX") {
943	>	cp = MAX_CUTOFF_POLICY;
944	>	} else {
945	>	if (myPolicy == "TRADITIONAL") {
946	>	cp = TRADITIONAL_CUTOFF_POLICY;
947	>	} else {
948	>	// throw error
949	>	sprintf( painCave.errMsg,
950	>	"SimInfo error: Unknown cutoffPolicy. (Input file specified %s .)\n\tcutoffPolicy must be one of: \"Mix\", \"Max\", or \"Traditional\".", myPolicy.c_str() );
951	>	painCave.isFatal = 1;
952	>	simError();
953	>	}
954	>	}
955	>	}
956	>	}
957	>	notifyFortranCutoffPolicy(&cp);
958
959	<	return maxCutoffRadius;
960	<	}
961	<
962	<	void SimInfo::getCutoff(double& rcut, double& rsw) {
963	<
964	<	if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
959	>	// Check the Skin Thickness for neighborlists
960	>	double skin;
961	>	if (simParams_->haveSkinThickness()) {
962	>	skin = simParams_->getSkinThickness();
963	>	notifyFortranSkinThickness(&skin);
964	>	}
965
966	<	if (!simParams_->haveRcut()){
967	<	sprintf(painCave.errMsg,
966	>	// Check if the cutoff was set explicitly:
967	>	if (simParams_->haveCutoffRadius()) {
968	>	rcut_ = simParams_->getCutoffRadius();
969	>	if (simParams_->haveSwitchingRadius()) {
970	>	rsw_  = simParams_->getSwitchingRadius();
971	>	} else {
972	>	if (fInfo_.SIM_uses_Charges |
973	>	fInfo_.SIM_uses_Dipoles |
974	>	fInfo_.SIM_uses_RF) {
975	>
976	>	rsw_ = 0.85 * rcut_;
977	>	sprintf(painCave.errMsg,
978	>	"SimCreator Warning: No value was set for the switchingRadius.\n"
979	>	"\tOOPSE will use a default value of 85\% of the cutoffRadius"
980	>	"\tswitchingRadius = %f. for this simulation\n", rsw_);
981	>	painCave.isFatal = 0;
982	>	simError();
983	>	} else {
984	>	rsw_ = rcut_;
985	>	sprintf(painCave.errMsg,
986	>	"SimCreator Warning: No value was set for the switchingRadius.\n"
987	>	"\tOOPSE will use the same value as the cutoffRadius.\n"
988	>	"\tswitchingRadius = %f. for this simulation\n", rsw_);
989	>	painCave.isFatal = 0;
990	>	simError();
991	>	}
992	>
993	>	notifyFortranCutoffs(&rcut_, &rsw_);
994	>
995	>	} else {
996	>
997	>	// For electrostatic atoms, we'll assume a large safe value:
998	>	if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
999	>	sprintf(painCave.errMsg,
1000		"SimCreator Warning: No value was set for the cutoffRadius.\n"
1001		"\tOOPSE will use a default value of 15.0 angstroms"
1002		"\tfor the cutoffRadius.\n");
1003	<	painCave.isFatal = 0;
1004	<	simError();
1005	<	rcut = 15.0;
1006	<	} else{
1007	<	rcut = simParams_->getRcut();
1003	>	painCave.isFatal = 0;
1004	>	simError();
1005	>	rcut_ = 15.0;
1006	>
1007	>	if (simParams_->haveElectrostaticSummationMethod()) {
1008	>	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1009	>	toUpper(myMethod);
1010	>	if (myMethod == "SHIFTED_POTENTIAL" || myMethod == "SHIFTED_FORCE") {
1011	>	if (simParams_->haveSwitchingRadius()){
1012	>	sprintf(painCave.errMsg,
1013	>	"SimInfo Warning: A value was set for the switchingRadius\n"
1014	>	"\teven though the electrostaticSummationMethod was\n"
1015	>	"\tset to %s\n", myMethod.c_str());
1016	>	painCave.isFatal = 1;
1017	>	simError();
1018	>	}
1019	>	}
1020		}
1021	<
1022	<	if (!simParams_->haveRsw()){
1023	<	sprintf(painCave.errMsg,
1024	<	"SimCreator Warning: No value was set for switchingRadius.\n"
1025	<	"\tOOPSE will use a default value of\n"
1026	<	"\t0.95 * cutoffRadius for the switchingRadius\n");
1027	<	painCave.isFatal = 0;
1028	<	simError();
1029	<	rsw = 0.95 * rcut;
1030	<	} else{
1031	<	rsw = simParams_->getRsw();
1021	>
1022	>	if (simParams_->haveSwitchingRadius()){
1023	>	rsw_ = simParams_->getSwitchingRadius();
1024	>	} else {
1025	>	sprintf(painCave.errMsg,
1026	>	"SimCreator Warning: No value was set for switchingRadius.\n"
1027	>	"\tOOPSE will use a default value of\n"
1028	>	"\t0.85 * cutoffRadius for the switchingRadius\n");
1029	>	painCave.isFatal = 0;
1030	>	simError();
1031	>	rsw_ = 0.85 * rcut_;
1032		}
1033	<
1034	<	} else {
1035	<	// if charge, dipole or reaction field is not used and the cutofff radius is not specified in
1036	<	//meta-data file, the maximum cutoff radius calculated from forcefiled will be used
1033	>	notifyFortranCutoffs(&rcut_, &rsw_);
1034	>	} else {
1035	>	// We didn't set rcut explicitly, and we don't have electrostatic atoms, so
1036	>	// We'll punt and let fortran figure out the cutoffs later.
1037
1038	<	if (simParams_->haveRcut()) {
812	<	rcut = simParams_->getRcut();
813	<	} else {
814	<	//set cutoff radius to the maximum cutoff radius based on atom types in the whole system
815	<	rcut = calcMaxCutoffRadius();
816	<	}
1038	>	notifyFortranYouAreOnYourOwn();
1039
1040	<	if (simParams_->haveRsw()) {
819	<	rsw  = simParams_->getRsw();
820	<	} else {
821	<	rsw = rcut;
822	<	}
823	<
1040	>	}
1041		}
1042	<	}
1042	>	}
1043
1044	<	void SimInfo::setupCutoff() {
1045	<	getCutoff(rcut_, rsw_);
1046	<	double rnblist = rcut_ + 1; // skin of neighbor list
1044	>	void SimInfo::setupElectrostaticSummationMethod( int isError ) {
1045	>
1046	>	int errorOut;
1047	>	int esm =  NONE;
1048	>	int sm = UNDAMPED;
1049	>	double alphaVal;
1050	>	double dielectric;
1051
1052	<	//Pass these cutoff radius etc. to fortran. This function should be called once and only once
1053	<	notifyFortranCutoffs(&rcut_, &rsw_, &rnblist);
1054	<	}
1052	>	errorOut = isError;
1053	>	alphaVal = simParams_->getDampingAlpha();
1054	>	dielectric = simParams_->getDielectric();
1055
1056	<	void SimInfo::addProperty(GenericData* genData) {
1057	<	properties_.addProperty(genData);
1058	<	}
1059	<
1060	<	void SimInfo::removeProperty(const std::string& propName) {
1061	<	properties_.removeProperty(propName);
1062	<	}
1063	<
1064	<	void SimInfo::clearProperties() {
1065	<	properties_.clearProperties();
1066	<	}
1067	<
1068	<	std::vector<std::string> SimInfo::getPropertyNames() {
1069	<	return properties_.getPropertyNames();
1070	<	}
1071	<
1072	<	std::vector<GenericData*> SimInfo::getProperties() {
1073	<	return properties_.getProperties();
1074	<	}
1075	<
1076	<	GenericData* SimInfo::getPropertyByName(const std::string& propName) {
1077	<	return properties_.getPropertyByName(propName);
1078	<	}
1079	<
1080	<	void SimInfo::setSnapshotManager(SnapshotManager* sman) {
1056	>	if (simParams_->haveElectrostaticSummationMethod()) {
1057	>	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1058	>	toUpper(myMethod);
1059	>	if (myMethod == "NONE") {
1060	>	esm = NONE;
1061	>	} else {
1062	>	if (myMethod == "SWITCHING_FUNCTION") {
1063	>	esm = SWITCHING_FUNCTION;
1064	>	} else {
1065	>	if (myMethod == "SHIFTED_POTENTIAL") {
1066	>	esm = SHIFTED_POTENTIAL;
1067	>	} else {
1068	>	if (myMethod == "SHIFTED_FORCE") {
1069	>	esm = SHIFTED_FORCE;
1070	>	} else {
1071	>	if (myMethod == "REACTION_FIELD") {
1072	>	esm = REACTION_FIELD;
1073	>	} else {
1074	>	// throw error
1075	>	sprintf( painCave.errMsg,
1076	>	"SimInfo error: Unknown electrostaticSummationMethod.\n"
1077	>	"\t(Input file specified %s .)\n"
1078	>	"\telectrostaticSummationMethod must be one of: \"none\",\n"
1079	>	"\t\"shifted_potential\", \"shifted_force\", or \n"
1080	>	"\t\"reaction_field\".\n", myMethod.c_str() );
1081	>	painCave.isFatal = 1;
1082	>	simError();
1083	>	}
1084	>	}
1085	>	}
1086	>	}
1087	>	}
1088	>	}
1089	>
1090	>	if (simParams_->haveElectrostaticScreeningMethod()) {
1091	>	std::string myScreen = simParams_->getElectrostaticScreeningMethod();
1092	>	toUpper(myScreen);
1093	>	if (myScreen == "UNDAMPED") {
1094	>	sm = UNDAMPED;
1095	>	} else {
1096	>	if (myScreen == "DAMPED") {
1097	>	sm = DAMPED;
1098	>	if (!simParams_->haveDampingAlpha()) {
1099	>	//throw error
1100	>	sprintf( painCave.errMsg,
1101	>	"SimInfo warning: dampingAlpha was not specified in the input file.\n"
1102	>	"\tA default value of %f (1/ang) will be used.\n", alphaVal);
1103	>	painCave.isFatal = 0;
1104	>	simError();
1105	>	}
1106	>	} else {
1107	>	// throw error
1108	>	sprintf( painCave.errMsg,
1109	>	"SimInfo error: Unknown electrostaticScreeningMethod.\n"
1110	>	"\t(Input file specified %s .)\n"
1111	>	"\telectrostaticScreeningMethod must be one of: \"undamped\"\n"
1112	>	"or \"damped\".\n", myScreen.c_str() );
1113	>	painCave.isFatal = 1;
1114	>	simError();
1115	>	}
1116	>	}
1117	>	}
1118	>
1119	>	// let's pass some summation method variables to fortran
1120	>	setElectrostaticSummationMethod( &esm );
1121	>	setFortranElectrostaticMethod( &esm );
1122	>	setScreeningMethod( &sm );
1123	>	setDampingAlpha( &alphaVal );
1124	>	setReactionFieldDielectric( &dielectric );
1125	>	initFortranFF( &errorOut );
1126	>	}
1127	>
1128	>	void SimInfo::setupSwitchingFunction() {
1129	>	int ft = CUBIC;
1130	>
1131	>	if (simParams_->haveSwitchingFunctionType()) {
1132	>	std::string funcType = simParams_->getSwitchingFunctionType();
1133	>	toUpper(funcType);
1134	>	if (funcType == "CUBIC") {
1135	>	ft = CUBIC;
1136	>	} else {
1137	>	if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1138	>	ft = FIFTH_ORDER_POLY;
1139	>	} else {
1140	>	// throw error
1141	>	sprintf( painCave.errMsg,
1142	>	"SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", funcType.c_str() );
1143	>	painCave.isFatal = 1;
1144	>	simError();
1145	>	}
1146	>	}
1147	>	}
1148	>
1149	>	// send switching function notification to switcheroo
1150	>	setFunctionType(&ft);
1151	>
1152	>	}
1153	>
1154	>	void SimInfo::addProperty(GenericData* genData) {
1155	>	properties_.addProperty(genData);
1156	>	}
1157	>
1158	>	void SimInfo::removeProperty(const std::string& propName) {
1159	>	properties_.removeProperty(propName);
1160	>	}
1161	>
1162	>	void SimInfo::clearProperties() {
1163	>	properties_.clearProperties();
1164	>	}
1165	>
1166	>	std::vector<std::string> SimInfo::getPropertyNames() {
1167	>	return properties_.getPropertyNames();
1168	>	}
1169	>
1170	>	std::vector<GenericData*> SimInfo::getProperties() {
1171	>	return properties_.getProperties();
1172	>	}
1173	>
1174	>	GenericData* SimInfo::getPropertyByName(const std::string& propName) {
1175	>	return properties_.getPropertyByName(propName);
1176	>	}
1177	>
1178	>	void SimInfo::setSnapshotManager(SnapshotManager* sman) {
1179		if (sman_ == sman) {
1180	<	return;
1180	>	return;
1181		}
1182		delete sman_;
1183		sman_ = sman;
#	Line 872 | Line 1191 | void SimInfo::setSnapshotManager(SnapshotManager* sman
1191
1192		for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
1193
1194	<	for (atom = mol->beginAtom(atomIter); atom != NULL; atom = mol->nextAtom(atomIter)) {
1195	<	atom->setSnapshotManager(sman_);
1196	<	}
1194	>	for (atom = mol->beginAtom(atomIter); atom != NULL; atom = mol->nextAtom(atomIter)) {
1195	>	atom->setSnapshotManager(sman_);
1196	>	}
1197
1198	<	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
1199	<	rb->setSnapshotManager(sman_);
1200	<	}
1198	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
1199	>	rb->setSnapshotManager(sman_);
1200	>	}
1201		}
1202
1203	<	}
1203	>	}
1204
1205	<	Vector3d SimInfo::getComVel(){
1205	>	Vector3d SimInfo::getComVel(){
1206		SimInfo::MoleculeIterator i;
1207		Molecule* mol;
1208
#	Line 892 | Line 1211 | Vector3d SimInfo::getComVel(){
1211
1212
1213		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1214	<	double mass = mol->getMass();
1215	<	totalMass += mass;
1216	<	comVel += mass * mol->getComVel();
1214	>	double mass = mol->getMass();
1215	>	totalMass += mass;
1216	>	comVel += mass * mol->getComVel();
1217		}
1218
1219		#ifdef IS_MPI
#	Line 907 | Line 1226 | Vector3d SimInfo::getComVel(){
1226		comVel /= totalMass;
1227
1228		return comVel;
1229	<	}
1229	>	}
1230
1231	<	Vector3d SimInfo::getCom(){
1231	>	Vector3d SimInfo::getCom(){
1232		SimInfo::MoleculeIterator i;
1233		Molecule* mol;
1234
#	Line 917 | Line 1236 | Vector3d SimInfo::getCom(){
1236		double totalMass = 0.0;
1237
1238		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1239	<	double mass = mol->getMass();
1240	<	totalMass += mass;
1241	<	com += mass * mol->getCom();
1239	>	double mass = mol->getMass();
1240	>	totalMass += mass;
1241	>	com += mass * mol->getCom();
1242		}
1243
1244		#ifdef IS_MPI
#	Line 933 | Line 1252 | Vector3d SimInfo::getCom(){
1252
1253		return com;
1254
1255	<	}
1255	>	}
1256
1257	<	std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1257	>	std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1258
1259		return o;
1260	<	}
1260	>	}
1261	>
1262	>
1263	>	/*
1264	>	Returns center of mass and center of mass velocity in one function call.
1265	>	*/
1266	>
1267	>	void SimInfo::getComAll(Vector3d &com, Vector3d &comVel){
1268	>	SimInfo::MoleculeIterator i;
1269	>	Molecule* mol;
1270	>
1271	>
1272	>	double totalMass = 0.0;
1273	>
1274
1275	+	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1276	+	double mass = mol->getMass();
1277	+	totalMass += mass;
1278	+	com += mass * mol->getCom();
1279	+	comVel += mass * mol->getComVel();
1280	+	}
1281	+
1282	+	#ifdef IS_MPI
1283	+	double tmpMass = totalMass;
1284	+	Vector3d tmpCom(com);
1285	+	Vector3d tmpComVel(comVel);
1286	+	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1287	+	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1288	+	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1289	+	#endif
1290	+
1291	+	com /= totalMass;
1292	+	comVel /= totalMass;
1293	+	}
1294	+
1295	+	/*
1296	+	Return intertia tensor for entire system and angular momentum Vector.
1297	+
1298	+
1299	+	[  Ixx -Ixy  -Ixz ]
1300	+	J =| -Iyx  Iyy  -Iyz |
1301	+	[ -Izx -Iyz   Izz ]
1302	+	*/
1303	+
1304	+	void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
1305	+
1306	+
1307	+	double xx = 0.0;
1308	+	double yy = 0.0;
1309	+	double zz = 0.0;
1310	+	double xy = 0.0;
1311	+	double xz = 0.0;
1312	+	double yz = 0.0;
1313	+	Vector3d com(0.0);
1314	+	Vector3d comVel(0.0);
1315	+
1316	+	getComAll(com, comVel);
1317	+
1318	+	SimInfo::MoleculeIterator i;
1319	+	Molecule* mol;
1320	+
1321	+	Vector3d thisq(0.0);
1322	+	Vector3d thisv(0.0);
1323	+
1324	+	double thisMass = 0.0;
1325	+
1326	+
1327	+
1328	+
1329	+	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1330	+
1331	+	thisq = mol->getCom()-com;
1332	+	thisv = mol->getComVel()-comVel;
1333	+	thisMass = mol->getMass();
1334	+	// Compute moment of intertia coefficients.
1335	+	xx += thisq[0]*thisq[0]*thisMass;
1336	+	yy += thisq[1]*thisq[1]*thisMass;
1337	+	zz += thisq[2]*thisq[2]*thisMass;
1338	+
1339	+	// compute products of intertia
1340	+	xy += thisq[0]*thisq[1]*thisMass;
1341	+	xz += thisq[0]*thisq[2]*thisMass;
1342	+	yz += thisq[1]*thisq[2]*thisMass;
1343	+
1344	+	angularMomentum += cross( thisq, thisv ) * thisMass;
1345	+
1346	+	}
1347	+
1348	+
1349	+	inertiaTensor(0,0) = yy + zz;
1350	+	inertiaTensor(0,1) = -xy;
1351	+	inertiaTensor(0,2) = -xz;
1352	+	inertiaTensor(1,0) = -xy;
1353	+	inertiaTensor(1,1) = xx + zz;
1354	+	inertiaTensor(1,2) = -yz;
1355	+	inertiaTensor(2,0) = -xz;
1356	+	inertiaTensor(2,1) = -yz;
1357	+	inertiaTensor(2,2) = xx + yy;
1358	+
1359	+	#ifdef IS_MPI
1360	+	Mat3x3d tmpI(inertiaTensor);
1361	+	Vector3d tmpAngMom;
1362	+	MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1363	+	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1364	+	#endif
1365	+
1366	+	return;
1367	+	}
1368	+
1369	+	//Returns the angular momentum of the system
1370	+	Vector3d SimInfo::getAngularMomentum(){
1371	+
1372	+	Vector3d com(0.0);
1373	+	Vector3d comVel(0.0);
1374	+	Vector3d angularMomentum(0.0);
1375	+
1376	+	getComAll(com,comVel);
1377	+
1378	+	SimInfo::MoleculeIterator i;
1379	+	Molecule* mol;
1380	+
1381	+	Vector3d thisr(0.0);
1382	+	Vector3d thisp(0.0);
1383	+
1384	+	double thisMass;
1385	+
1386	+	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1387	+	thisMass = mol->getMass();
1388	+	thisr = mol->getCom()-com;
1389	+	thisp = (mol->getComVel()-comVel)*thisMass;
1390	+
1391	+	angularMomentum += cross( thisr, thisp );
1392	+
1393	+	}
1394	+
1395	+	#ifdef IS_MPI
1396	+	Vector3d tmpAngMom;
1397	+	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1398	+	#endif
1399	+
1400	+	return angularMomentum;
1401	+	}
1402	+
1403	+
1404		}//end namespace oopse
1405

Diff Legend

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