[ViewVC] Diff of: OpenMD/branches/development/src/brains/SimInfo.cpp

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1505 by gezelter, Sun Oct 3 22:18:59 2010 UTC vs.
Revision 1544 by gezelter, Fri Mar 18 19:31:52 2011 UTC

#	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/fSwitchingFunctionType.h"
59	–	#include "UseTheForce/doForces_interface.h"
57		#include "UseTheForce/DarkSide/neighborLists_interface.h"
58	<	#include "UseTheForce/DarkSide/switcheroo_interface.h"
58	>	#include "UseTheForce/doForces_interface.h"
59		#include "utils/MemoryUtils.hpp"
60		#include "utils/simError.h"
61		#include "selection/SelectionManager.hpp"
62		#include "io/ForceFieldOptions.hpp"
63		#include "UseTheForce/ForceField.hpp"
64	+	#include "nonbonded/SwitchingFunction.hpp"
65
68	–
66		#ifdef IS_MPI
67		#include "UseTheForce/mpiComponentPlan.h"
68		#include "UseTheForce/DarkSide/simParallel_interface.h"
69		#endif
70
71	+	using namespace std;
72		namespace OpenMD {
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	–	return result;
83	–	}
73
74		SimInfo::SimInfo(ForceField* ff, Globals* simParams) :
75		forceField_(ff), simParams_(simParams),
#	Line 90 \| Line 79 \| namespace OpenMD {
79		nAtoms_(0), nBonds_(0), nBends_(0), nTorsions_(0), nInversions_(0),
80		nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
81		nConstraints_(0), sman_(NULL), fortranInitialized_(false),
82	<	calcBoxDipole_(false), useAtomicVirial_(true) {
83	<
84	<
85	<	MoleculeStamp* molStamp;
86	<	int nMolWithSameStamp;
87	<	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
88	<	int nGroups = 0; //total cutoff groups defined in meta-data file
89	<	CutoffGroupStamp* cgStamp;
90	<	RigidBodyStamp* rbStamp;
91	<	int nRigidAtoms = 0;
92	<
93	<	std::vector<Component*> components = simParams->getComponents();
82	>	calcBoxDipole_(false), useAtomicVirial_(true) {
83	>
84	>	MoleculeStamp* molStamp;
85	>	int nMolWithSameStamp;
86	>	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
87	>	int nGroups = 0; //total cutoff groups defined in meta-data file
88	>	CutoffGroupStamp* cgStamp;
89	>	RigidBodyStamp* rbStamp;
90	>	int nRigidAtoms = 0;
91	>
92	>	vector<Component*> components = simParams->getComponents();
93	>
94	>	for (vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
95	>	molStamp = (*i)->getMoleculeStamp();
96	>	nMolWithSameStamp = (*i)->getNMol();
97
98	<	for (std::vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
99	<	molStamp = (*i)->getMoleculeStamp();
100	<	nMolWithSameStamp = (*i)->getNMol();
101	<
102	<	addMoleculeStamp(molStamp, nMolWithSameStamp);
103	<
104	<	//calculate atoms in molecules
105	<	nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;
106	<
107	<	//calculate atoms in cutoff groups
108	<	int nAtomsInGroups = 0;
109	<	int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
118	<
119	<	for (int j=0; j < nCutoffGroupsInStamp; j++) {
120	<	cgStamp = molStamp->getCutoffGroupStamp(j);
121	<	nAtomsInGroups += cgStamp->getNMembers();
122	<	}
123	<
124	<	nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
125	<
126	<	nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;
127	<
128	<	//calculate atoms in rigid bodies
129	<	int nAtomsInRigidBodies = 0;
130	<	int nRigidBodiesInStamp = molStamp->getNRigidBodies();
131	<
132	<	for (int j=0; j < nRigidBodiesInStamp; j++) {
133	<	rbStamp = molStamp->getRigidBodyStamp(j);
134	<	nAtomsInRigidBodies += rbStamp->getNMembers();
135	<	}
136	<
137	<	nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
138	<	nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;
139	<
98	>	addMoleculeStamp(molStamp, nMolWithSameStamp);
99	>
100	>	//calculate atoms in molecules
101	>	nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;
102	>
103	>	//calculate atoms in cutoff groups
104	>	int nAtomsInGroups = 0;
105	>	int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
106	>
107	>	for (int j=0; j < nCutoffGroupsInStamp; j++) {
108	>	cgStamp = molStamp->getCutoffGroupStamp(j);
109	>	nAtomsInGroups += cgStamp->getNMembers();
110		}
111	<
112	<	//every free atom (atom does not belong to cutoff groups) is a cutoff
113	<	//group therefore the total number of cutoff groups in the system is
114	<	//equal to the total number of atoms minus number of atoms belong to
115	<	//cutoff group defined in meta-data file plus the number of cutoff
116	<	//groups defined in meta-data file
117	<	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
118	<
119	<	//every free atom (atom does not belong to rigid bodies) is an
120	<	//integrable object therefore the total number of integrable objects
121	<	//in the system is equal to the total number of atoms minus number of
122	<	//atoms belong to rigid body defined in meta-data file plus the number
123	<	//of rigid bodies defined in meta-data file
124	<	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
125	<	+ nGlobalRigidBodies_;
126	<
127	<	nGlobalMols_ = molStampIds_.size();
158	<	molToProcMap_.resize(nGlobalMols_);
111	>
112	>	nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
113	>
114	>	nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;
115	>
116	>	//calculate atoms in rigid bodies
117	>	int nAtomsInRigidBodies = 0;
118	>	int nRigidBodiesInStamp = molStamp->getNRigidBodies();
119	>
120	>	for (int j=0; j < nRigidBodiesInStamp; j++) {
121	>	rbStamp = molStamp->getRigidBodyStamp(j);
122	>	nAtomsInRigidBodies += rbStamp->getNMembers();
123	>	}
124	>
125	>	nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
126	>	nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;
127	>
128		}
129	+
130	+	//every free atom (atom does not belong to cutoff groups) is a cutoff
131	+	//group therefore the total number of cutoff groups in the system is
132	+	//equal to the total number of atoms minus number of atoms belong to
133	+	//cutoff group defined in meta-data file plus the number of cutoff
134	+	//groups defined in meta-data file
135	+	std::cerr << "nGA = " << nGlobalAtoms_ << "\n";
136	+	std::cerr << "nCA = " << nCutoffAtoms << "\n";
137	+	std::cerr << "nG = " << nGroups << "\n";
138
139	+	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
140	+
141	+	std::cerr << "nGCG = " << nGlobalCutoffGroups_ << "\n";
142	+
143	+	//every free atom (atom does not belong to rigid bodies) is an
144	+	//integrable object therefore the total number of integrable objects
145	+	//in the system is equal to the total number of atoms minus number of
146	+	//atoms belong to rigid body defined in meta-data file plus the number
147	+	//of rigid bodies defined in meta-data file
148	+	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
149	+	+ nGlobalRigidBodies_;
150	+
151	+	nGlobalMols_ = molStampIds_.size();
152	+	molToProcMap_.resize(nGlobalMols_);
153	+	}
154	+
155		SimInfo::~SimInfo() {
156	<	std::map<int, Molecule*>::iterator i;
156	>	map<int, Molecule*>::iterator i;
157		for (i = molecules_.begin(); i != molecules_.end(); ++i) {
158		delete i->second;
159		}
#	Line 170 \| Line 164 \| namespace OpenMD {
164		delete forceField_;
165		}
166
173	–	int SimInfo::getNGlobalConstraints() {
174	–	int nGlobalConstraints;
175	–	#ifdef IS_MPI
176	–	MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
177	–	MPI_COMM_WORLD);
178	–	#else
179	–	nGlobalConstraints = nConstraints_;
180	–	#endif
181	–	return nGlobalConstraints;
182	–	}
167
168		bool SimInfo::addMolecule(Molecule* mol) {
169		MoleculeIterator i;
170	<
170	>
171		i = molecules_.find(mol->getGlobalIndex());
172		if (i == molecules_.end() ) {
173	<
174	<	molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
175	<
173	>
174	>	molecules_.insert(make_pair(mol->getGlobalIndex(), mol));
175	>
176		nAtoms_ += mol->getNAtoms();
177		nBonds_ += mol->getNBonds();
178		nBends_ += mol->getNBends();
#	Line 198 \| Line 182 \| namespace OpenMD {
182		nIntegrableObjects_ += mol->getNIntegrableObjects();
183		nCutoffGroups_ += mol->getNCutoffGroups();
184		nConstraints_ += mol->getNConstraintPairs();
185	<
185	>
186		addInteractionPairs(mol);
187	<
187	>
188		return true;
189		} else {
190		return false;
191		}
192		}
193	<
193	>
194		bool SimInfo::removeMolecule(Molecule* mol) {
195		MoleculeIterator i;
196		i = molecules_.find(mol->getGlobalIndex());
#	Line 234 \| Line 218 \| namespace OpenMD {
218		} else {
219		return false;
220		}
237	–
238	–
221		}
222
223
#	Line 253 \| Line 235 \| namespace OpenMD {
235		void SimInfo::calcNdf() {
236		int ndf_local;
237		MoleculeIterator i;
238	<	std::vector<StuntDouble*>::iterator j;
238	>	vector<StuntDouble*>::iterator j;
239		Molecule* mol;
240		StuntDouble* integrableObject;
241
#	Line 304 \| Line 286 \| namespace OpenMD {
286		int ndfRaw_local;
287
288		MoleculeIterator i;
289	<	std::vector<StuntDouble*>::iterator j;
289	>	vector<StuntDouble*>::iterator j;
290		Molecule* mol;
291		StuntDouble* integrableObject;
292
#	Line 353 \| Line 335 \| namespace OpenMD {
335
336		void SimInfo::addInteractionPairs(Molecule* mol) {
337		ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
338	<	std::vector<Bond*>::iterator bondIter;
339	<	std::vector<Bend*>::iterator bendIter;
340	<	std::vector<Torsion*>::iterator torsionIter;
341	<	std::vector<Inversion*>::iterator inversionIter;
338	>	vector<Bond*>::iterator bondIter;
339	>	vector<Bend*>::iterator bendIter;
340	>	vector<Torsion*>::iterator torsionIter;
341	>	vector<Inversion*>::iterator inversionIter;
342		Bond* bond;
343		Bend* bend;
344		Torsion* torsion;
#	Line 374 \| Line 356 \| namespace OpenMD {
356		// always be excluded. These are done at the bottom of this
357		// function.
358
359	<	std::map<int, std::set<int> > atomGroups;
359	>	map<int, set<int> > atomGroups;
360		Molecule::RigidBodyIterator rbIter;
361		RigidBody* rb;
362		Molecule::IntegrableObjectIterator ii;
#	Line 386 \| Line 368 \| namespace OpenMD {
368
369		if (integrableObject->isRigidBody()) {
370		rb = static_cast<RigidBody*>(integrableObject);
371	<	std::vector<Atom*> atoms = rb->getAtoms();
372	<	std::set<int> rigidAtoms;
371	>	vector<Atom*> atoms = rb->getAtoms();
372	>	set<int> rigidAtoms;
373		for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
374		rigidAtoms.insert(atoms[i]->getGlobalIndex());
375		}
376		for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
377	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
377	>	atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
378		}
379		} else {
380	<	std::set<int> oneAtomSet;
380	>	set<int> oneAtomSet;
381		oneAtomSet.insert(integrableObject->getGlobalIndex());
382	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
382	>	atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
383		}
384		}
385
#	Line 500 \| Line 482 \| namespace OpenMD {
482
483		for (rb = mol->beginRigidBody(rbIter); rb != NULL;
484		rb = mol->nextRigidBody(rbIter)) {
485	<	std::vector<Atom*> atoms = rb->getAtoms();
485	>	vector<Atom*> atoms = rb->getAtoms();
486		for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
487		for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
488		a = atoms[i]->getGlobalIndex();
#	Line 514 \| Line 496 \| namespace OpenMD {
496
497		void SimInfo::removeInteractionPairs(Molecule* mol) {
498		ForceFieldOptions& options_ = forceField_->getForceFieldOptions();
499	<	std::vector<Bond*>::iterator bondIter;
500	<	std::vector<Bend*>::iterator bendIter;
501	<	std::vector<Torsion*>::iterator torsionIter;
502	<	std::vector<Inversion*>::iterator inversionIter;
499	>	vector<Bond*>::iterator bondIter;
500	>	vector<Bend*>::iterator bendIter;
501	>	vector<Torsion*>::iterator torsionIter;
502	>	vector<Inversion*>::iterator inversionIter;
503		Bond* bond;
504		Bend* bend;
505		Torsion* torsion;
#	Line 527 \| Line 509 \| namespace OpenMD {
509		int c;
510		int d;
511
512	<	std::map<int, std::set<int> > atomGroups;
512	>	map<int, set<int> > atomGroups;
513		Molecule::RigidBodyIterator rbIter;
514		RigidBody* rb;
515		Molecule::IntegrableObjectIterator ii;
#	Line 539 \| Line 521 \| namespace OpenMD {
521
522		if (integrableObject->isRigidBody()) {
523		rb = static_cast<RigidBody*>(integrableObject);
524	<	std::vector<Atom*> atoms = rb->getAtoms();
525	<	std::set<int> rigidAtoms;
524	>	vector<Atom*> atoms = rb->getAtoms();
525	>	set<int> rigidAtoms;
526		for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
527		rigidAtoms.insert(atoms[i]->getGlobalIndex());
528		}
529		for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
530	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
530	>	atomGroups.insert(map<int, set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
531		}
532		} else {
533	<	std::set<int> oneAtomSet;
533	>	set<int> oneAtomSet;
534		oneAtomSet.insert(integrableObject->getGlobalIndex());
535	<	atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
535	>	atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
536		}
537		}
538
#	Line 653 \| Line 635 \| namespace OpenMD {
635
636		for (rb = mol->beginRigidBody(rbIter); rb != NULL;
637		rb = mol->nextRigidBody(rbIter)) {
638	<	std::vector<Atom*> atoms = rb->getAtoms();
638	>	vector<Atom*> atoms = rb->getAtoms();
639		for (int i = 0; i < static_cast<int>(atoms.size()) -1 ; ++i) {
640		for (int j = i + 1; j < static_cast<int>(atoms.size()); ++j) {
641		a = atoms[i]->getGlobalIndex();
#	Line 676 \| Line 658 \| namespace OpenMD {
658		molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
659		}
660
679	–	void SimInfo::update() {
661
662	<	setupSimType();
663	<
664	<	#ifdef IS_MPI
665	<	setupFortranParallel();
666	<	#endif
667	<
668	<	setupFortranSim();
669	<
670	<	//setup fortran force field
690	<	/** @deprecate */
691	<	int isError = 0;
692	<
693	<	setupCutoff();
694	<
695	<	setupElectrostaticSummationMethod( isError );
696	<	setupSwitchingFunction();
697	<	setupAccumulateBoxDipole();
698	<
699	<	if(isError){
700	<	sprintf( painCave.errMsg,
701	<	"ForceField error: There was an error initializing the forceField in fortran.\n" );
702	<	painCave.isFatal = 1;
703	<	simError();
704	<	}
705	<
662	>	/**
663	>	* update
664	>	*
665	>	* Performs the global checks and variable settings after the
666	>	* objects have been created.
667	>	*
668	>	*/
669	>	void SimInfo::update() {
670	>	setupSimVariables();
671		calcNdf();
672		calcNdfRaw();
673		calcNdfTrans();
709	–
710	–	fortranInitialized_ = true;
674		}
675	<
676	<	std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
675	>
676	>	/**
677	>	* getSimulatedAtomTypes
678	>	*
679	>	* Returns an STL set of AtomType* that are actually present in this
680	>	* simulation. Must query all processors to assemble this information.
681	>	*
682	>	*/
683	>	set<AtomType*> SimInfo::getSimulatedAtomTypes() {
684		SimInfo::MoleculeIterator mi;
685		Molecule* mol;
686		Molecule::AtomIterator ai;
687		Atom* atom;
688	<	std::set<AtomType*> atomTypes;
689	<
690	<	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
721	<
688	>	set<AtomType*> atomTypes;
689	>
690	>	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
691		for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
692		atomTypes.insert(atom->getAtomType());
693	<	}
694	<
726	<	}
693	>	}
694	>	}
695
696	<	return atomTypes;
729	<	}
696	>	#ifdef IS_MPI
697
698	<	void SimInfo::setupSimType() {
699	<	std::set<AtomType*>::iterator i;
733	<	std::set<AtomType*> atomTypes;
734	<	atomTypes = getUniqueAtomTypes();
735	<
736	<	int useLennardJones = 0;
737	<	int useElectrostatic = 0;
738	<	int useEAM = 0;
739	<	int useSC = 0;
740	<	int useCharge = 0;
741	<	int useDirectional = 0;
742	<	int useDipole = 0;
743	<	int useGayBerne = 0;
744	<	int useSticky = 0;
745	<	int useStickyPower = 0;
746	<	int useShape = 0;
747	<	int useFLARB = 0; //it is not in AtomType yet
748	<	int useDirectionalAtom = 0;
749	<	int useElectrostatics = 0;
750	<	//usePBC and useRF are from simParams
751	<	int usePBC = simParams_->getUsePeriodicBoundaryConditions();
752	<	int useRF;
753	<	int useSF;
754	<	int useSP;
755	<	int useBoxDipole;
698	>	// loop over the found atom types on this processor, and add their
699	>	// numerical idents to a vector:
700
701	<	std::string myMethod;
701	>	vector<int> foundTypes;
702	>	set<AtomType*>::iterator i;
703	>	for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
704	>	foundTypes.push_back( (*i)->getIdent() );
705
706	<	// set the useRF logical
707	<	useRF = 0;
761	<	useSF = 0;
762	<	useSP = 0;
763	<	useBoxDipole = 0;
706	>	// count_local holds the number of found types on this processor
707	>	int count_local = foundTypes.size();
708
709	<	if (simParams_->haveElectrostaticSummationMethod()) {
710	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
711	<	toUpper(myMethod);
712	<	if (myMethod == "REACTION_FIELD"){
713	<	useRF = 1;
714	<	} else if (myMethod == "SHIFTED_FORCE"){
715	<	useSF = 1;
716	<	} else if (myMethod == "SHIFTED_POTENTIAL"){
717	<	useSP = 1;
718	<	}
719	<	}
709	>	// count holds the total number of found types on all processors
710	>	// (some will be redundant with the ones found locally):
711	>	int count;
712	>	MPI::COMM_WORLD.Allreduce(&count_local, &count, 1, MPI::INT, MPI::SUM);
713	>
714	>	// create a vector to hold the globally found types, and resize it:
715	>	vector<int> ftGlobal;
716	>	ftGlobal.resize(count);
717	>	vector<int> counts;
718	>
719	>	int nproc = MPI::COMM_WORLD.Get_size();
720	>	counts.resize(nproc);
721	>	vector<int> disps;
722	>	disps.resize(nproc);
723	>
724	>	// now spray out the foundTypes to all the other processors:
725
726	<	if (simParams_->haveAccumulateBoxDipole())
727	<	if (simParams_->getAccumulateBoxDipole())
779	<	useBoxDipole = 1;
726	>	MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
727	>	&ftGlobal[0], &counts[0], &disps[0], MPI::INT);
728
729	+	// foundIdents is a stl set, so inserting an already found ident
730	+	// will have no effect.
731	+	set<int> foundIdents;
732	+	vector<int>::iterator j;
733	+	for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
734	+	foundIdents.insert((*j));
735	+
736	+	// now iterate over the foundIdents and get the actual atom types
737	+	// that correspond to these:
738	+	set<int>::iterator it;
739	+	for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
740	+	atomTypes.insert( forceField_->getAtomType((*it)) );
741	+
742	+	#endif
743	+
744	+	return atomTypes;
745	+	}
746	+
747	+	void SimInfo::setupSimVariables() {
748		useAtomicVirial_ = simParams_->getUseAtomicVirial();
749	+	// we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
750	+	calcBoxDipole_ = false;
751	+	if ( simParams_->haveAccumulateBoxDipole() )
752	+	if ( simParams_->getAccumulateBoxDipole() ) {
753	+	calcBoxDipole_ = true;
754	+	}
755
756	+	set<AtomType*>::iterator i;
757	+	set<AtomType*> atomTypes;
758	+	atomTypes = getSimulatedAtomTypes();
759	+	int usesElectrostatic = 0;
760	+	int usesMetallic = 0;
761	+	int usesDirectional = 0;
762		//loop over all of the atom types
763		for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
764	<	useLennardJones \|= (*i)->isLennardJones();
765	<	useElectrostatic \|= (*i)->isElectrostatic();
766	<	useEAM \|= (*i)->isEAM();
788	<	useSC \|= (*i)->isSC();
789	<	useCharge \|= (*i)->isCharge();
790	<	useDirectional \|= (*i)->isDirectional();
791	<	useDipole \|= (*i)->isDipole();
792	<	useGayBerne \|= (*i)->isGayBerne();
793	<	useSticky \|= (*i)->isSticky();
794	<	useStickyPower \|= (*i)->isStickyPower();
795	<	useShape \|= (*i)->isShape();
764	>	usesElectrostatic \|= (*i)->isElectrostatic();
765	>	usesMetallic \|= (*i)->isMetal();
766	>	usesDirectional \|= (*i)->isDirectional();
767		}
768
798	–	if (useSticky \|\| useStickyPower \|\| useDipole \|\| useGayBerne \|\| useShape) {
799	–	useDirectionalAtom = 1;
800	–	}
801	–
802	–	if (useCharge \|\| useDipole) {
803	–	useElectrostatics = 1;
804	–	}
805	–
769		#ifdef IS_MPI
770		int temp;
771	<
772	<	temp = usePBC;
810	<	MPI_Allreduce(&temp, &usePBC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
811	<
812	<	temp = useDirectionalAtom;
813	<	MPI_Allreduce(&temp, &useDirectionalAtom, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
814	<
815	<	temp = useLennardJones;
816	<	MPI_Allreduce(&temp, &useLennardJones, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
817	<
818	<	temp = useElectrostatics;
819	<	MPI_Allreduce(&temp, &useElectrostatics, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
820	<
821	<	temp = useCharge;
822	<	MPI_Allreduce(&temp, &useCharge, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
823	<
824	<	temp = useDipole;
825	<	MPI_Allreduce(&temp, &useDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
771	>	temp = usesDirectional;
772	>	MPI_Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
773
774	<	temp = useSticky;
775	<	MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
774	>	temp = usesMetallic;
775	>	MPI_Allreduce(&temp, &usesMetallicAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
776
777	<	temp = useStickyPower;
778	<	MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
832	<
833	<	temp = useGayBerne;
834	<	MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
835	<
836	<	temp = useEAM;
837	<	MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
838	<
839	<	temp = useSC;
840	<	MPI_Allreduce(&temp, &useSC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
841	<
842	<	temp = useShape;
843	<	MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
844	<
845	<	temp = useFLARB;
846	<	MPI_Allreduce(&temp, &useFLARB, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
847	<
848	<	temp = useRF;
849	<	MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
850	<
851	<	temp = useSF;
852	<	MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
853	<
854	<	temp = useSP;
855	<	MPI_Allreduce(&temp, &useSP, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
856	<
857	<	temp = useBoxDipole;
858	<	MPI_Allreduce(&temp, &useBoxDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
859	<
860	<	temp = useAtomicVirial_;
861	<	MPI_Allreduce(&temp, &useAtomicVirial_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
862	<
777	>	temp = usesElectrostatic;
778	>	MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
779		#endif
780	<	fInfo_.SIM_uses_PBC = usePBC;
781	<	fInfo_.SIM_uses_DirectionalAtoms = useDirectionalAtom;
782	<	fInfo_.SIM_uses_LennardJones = useLennardJones;
783	<	fInfo_.SIM_uses_Electrostatics = useElectrostatics;
784	<	fInfo_.SIM_uses_Charges = useCharge;
785	<	fInfo_.SIM_uses_Dipoles = useDipole;
870	<	fInfo_.SIM_uses_Sticky = useSticky;
871	<	fInfo_.SIM_uses_StickyPower = useStickyPower;
872	<	fInfo_.SIM_uses_GayBerne = useGayBerne;
873	<	fInfo_.SIM_uses_EAM = useEAM;
874	<	fInfo_.SIM_uses_SC = useSC;
875	<	fInfo_.SIM_uses_Shapes = useShape;
876	<	fInfo_.SIM_uses_FLARB = useFLARB;
877	<	fInfo_.SIM_uses_RF = useRF;
878	<	fInfo_.SIM_uses_SF = useSF;
879	<	fInfo_.SIM_uses_SP = useSP;
880	<	fInfo_.SIM_uses_BoxDipole = useBoxDipole;
881	<	fInfo_.SIM_uses_AtomicVirial = useAtomicVirial_;
780	>	fInfo_.SIM_uses_PBC = usesPeriodicBoundaries_;
781	>	fInfo_.SIM_uses_DirectionalAtoms = usesDirectionalAtoms_;
782	>	fInfo_.SIM_uses_MetallicAtoms = usesMetallicAtoms_;
783	>	fInfo_.SIM_requires_SkipCorrection = usesElectrostaticAtoms_;
784	>	fInfo_.SIM_requires_SelfCorrection = usesElectrostaticAtoms_;
785	>	fInfo_.SIM_uses_AtomicVirial = usesAtomicVirial_;
786		}
787
788	<	void SimInfo::setupFortranSim() {
788	>	void SimInfo::setupFortran() {
789		int isError;
790		int nExclude, nOneTwo, nOneThree, nOneFour;
791	<	std::vector<int> fortranGlobalGroupMembership;
791	>	vector<int> fortranGlobalGroupMembership;
792
793		isError = 0;
794
#	Line 894 \| Line 798 \| namespace OpenMD {
798		}
799
800		//calculate mass ratio of cutoff group
801	<	std::vector<RealType> mfact;
801	>	vector<RealType> mfact;
802		SimInfo::MoleculeIterator mi;
803		Molecule* mol;
804		Molecule::CutoffGroupIterator ci;
#	Line 920 \| Line 824 \| namespace OpenMD {
824		}
825		}
826
827	<	//fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
924	<	std::vector<int> identArray;
827	>	// Build the identArray_
828
829	<	//to avoid memory reallocation, reserve enough space identArray
830	<	identArray.reserve(getNAtoms());
928	<
829	>	identArray_.clear();
830	>	identArray_.reserve(getNAtoms());
831		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
832		for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
833	<	identArray.push_back(atom->getIdent());
833	>	identArray_.push_back(atom->getIdent());
834		}
835		}
836
837		//fill molMembershipArray
838		//molMembershipArray is filled by SimCreator
839	<	std::vector<int> molMembershipArray(nGlobalAtoms_);
839	>	vector<int> molMembershipArray(nGlobalAtoms_);
840		for (int i = 0; i < nGlobalAtoms_; i++) {
841		molMembershipArray[i] = globalMolMembership_[i] + 1;
842		}
#	Line 980 \| Line 882 \| namespace OpenMD {
882		setNeighbors(&nlistNeighbors);
883		}
884
983	–
984	–	}
985	–
986	–
987	–	void SimInfo::setupFortranParallel() {
885		#ifdef IS_MPI
886	<	//SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
887	<	std::vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
888	<	std::vector<int> localToGlobalCutoffGroupIndex;
889	<	SimInfo::MoleculeIterator mi;
993	<	Molecule::AtomIterator ai;
994	<	Molecule::CutoffGroupIterator ci;
995	<	Molecule* mol;
996	<	Atom* atom;
997	<	CutoffGroup* cg;
886	>	//SimInfo is responsible for creating localToGlobalAtomIndex and
887	>	//localToGlobalGroupIndex
888	>	vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
889	>	vector<int> localToGlobalCutoffGroupIndex;
890		mpiSimData parallelData;
999	–	int isError;
891
892		for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
893
#	Line 1036 \| Line 927 \| namespace OpenMD {
927
928		sprintf(checkPointMsg, " mpiRefresh successful.\n");
929		errorCheckPoint();
1039	–
930		#endif
1041	–	}
931
932	<	void SimInfo::setupCutoff() {
933	<
934	<	ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
935	<
936	<	// Check the cutoff policy
937	<	int cp = TRADITIONAL_CUTOFF_POLICY; // Set to traditional by default
1049	<
1050	<	// Set LJ shifting bools to false
1051	<	ljsp_ = 0;
1052	<	ljsf_ = 0;
1053	<
1054	<	std::string myPolicy;
1055	<	if (forceFieldOptions_.haveCutoffPolicy()){
1056	<	myPolicy = forceFieldOptions_.getCutoffPolicy();
1057	<	}else if (simParams_->haveCutoffPolicy()) {
1058	<	myPolicy = simParams_->getCutoffPolicy();
932	>	initFortranFF(&isError);
933	>	if (isError) {
934	>	sprintf(painCave.errMsg,
935	>	"initFortranFF errror: fortran didn't like something we gave it.\n");
936	>	painCave.isFatal = 1;
937	>	simError();
938		}
939	<
1061	<	if (!myPolicy.empty()){
1062	<	toUpper(myPolicy);
1063	<	if (myPolicy == "MIX") {
1064	<	cp = MIX_CUTOFF_POLICY;
1065	<	} else {
1066	<	if (myPolicy == "MAX") {
1067	<	cp = MAX_CUTOFF_POLICY;
1068	<	} else {
1069	<	if (myPolicy == "TRADITIONAL") {
1070	<	cp = TRADITIONAL_CUTOFF_POLICY;
1071	<	} else {
1072	<	// throw error
1073	<	sprintf( painCave.errMsg,
1074	<	"SimInfo error: Unknown cutoffPolicy. (Input file specified %s .)\n\tcutoffPolicy must be one of: \"Mix\", \"Max\", or \"Traditional\".", myPolicy.c_str() );
1075	<	painCave.isFatal = 1;
1076	<	simError();
1077	<	}
1078	<	}
1079	<	}
1080	<	}
1081	<	notifyFortranCutoffPolicy(&cp);
1082	<
1083	<	// Check the Skin Thickness for neighborlists
1084	<	RealType skin;
1085	<	if (simParams_->haveSkinThickness()) {
1086	<	skin = simParams_->getSkinThickness();
1087	<	notifyFortranSkinThickness(&skin);
1088	<	}
1089	<
1090	<	// Check if the cutoff was set explicitly:
1091	<	if (simParams_->haveCutoffRadius()) {
1092	<	rcut_ = simParams_->getCutoffRadius();
1093	<	if (simParams_->haveSwitchingRadius()) {
1094	<	rsw_ = simParams_->getSwitchingRadius();
1095	<	} else {
1096	<	if (fInfo_.SIM_uses_Charges \|
1097	<	fInfo_.SIM_uses_Dipoles \|
1098	<	fInfo_.SIM_uses_RF) {
1099	<
1100	<	rsw_ = 0.85 * rcut_;
1101	<	sprintf(painCave.errMsg,
1102	<	"SimCreator Warning: No value was set for the switchingRadius.\n"
1103	<	"\tOpenMD will use a default value of 85 percent of the cutoffRadius.\n"
1104	<	"\tswitchingRadius = %f. for this simulation\n", rsw_);
1105	<	painCave.isFatal = 0;
1106	<	simError();
1107	<	} else {
1108	<	rsw_ = rcut_;
1109	<	sprintf(painCave.errMsg,
1110	<	"SimCreator Warning: No value was set for the switchingRadius.\n"
1111	<	"\tOpenMD will use the same value as the cutoffRadius.\n"
1112	<	"\tswitchingRadius = %f. for this simulation\n", rsw_);
1113	<	painCave.isFatal = 0;
1114	<	simError();
1115	<	}
1116	<	}
1117	<
1118	<	if (simParams_->haveElectrostaticSummationMethod()) {
1119	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1120	<	toUpper(myMethod);
1121	<
1122	<	if (myMethod == "SHIFTED_POTENTIAL") {
1123	<	ljsp_ = 1;
1124	<	} else if (myMethod == "SHIFTED_FORCE") {
1125	<	ljsf_ = 1;
1126	<	}
1127	<	}
1128	<
1129	<	notifyFortranCutoffs(&rcut_, &rsw_, &ljsp_, &ljsf_);
1130	<
1131	<	} else {
1132	<
1133	<	// For electrostatic atoms, we'll assume a large safe value:
1134	<	if (fInfo_.SIM_uses_Charges \| fInfo_.SIM_uses_Dipoles \| fInfo_.SIM_uses_RF) {
1135	<	sprintf(painCave.errMsg,
1136	<	"SimCreator Warning: No value was set for the cutoffRadius.\n"
1137	<	"\tOpenMD will use a default value of 15.0 angstroms"
1138	<	"\tfor the cutoffRadius.\n");
1139	<	painCave.isFatal = 0;
1140	<	simError();
1141	<	rcut_ = 15.0;
1142	<
1143	<	if (simParams_->haveElectrostaticSummationMethod()) {
1144	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1145	<	toUpper(myMethod);
1146	<
1147	<	// For the time being, we're tethering the LJ shifted behavior to the
1148	<	// electrostaticSummationMethod keyword options
1149	<	if (myMethod == "SHIFTED_POTENTIAL") {
1150	<	ljsp_ = 1;
1151	<	} else if (myMethod == "SHIFTED_FORCE") {
1152	<	ljsf_ = 1;
1153	<	}
1154	<	if (myMethod == "SHIFTED_POTENTIAL" \|\| myMethod == "SHIFTED_FORCE") {
1155	<	if (simParams_->haveSwitchingRadius()){
1156	<	sprintf(painCave.errMsg,
1157	<	"SimInfo Warning: A value was set for the switchingRadius\n"
1158	<	"\teven though the electrostaticSummationMethod was\n"
1159	<	"\tset to %s\n", myMethod.c_str());
1160	<	painCave.isFatal = 1;
1161	<	simError();
1162	<	}
1163	<	}
1164	<	}
1165	<
1166	<	if (simParams_->haveSwitchingRadius()){
1167	<	rsw_ = simParams_->getSwitchingRadius();
1168	<	} else {
1169	<	sprintf(painCave.errMsg,
1170	<	"SimCreator Warning: No value was set for switchingRadius.\n"
1171	<	"\tOpenMD will use a default value of\n"
1172	<	"\t0.85 * cutoffRadius for the switchingRadius\n");
1173	<	painCave.isFatal = 0;
1174	<	simError();
1175	<	rsw_ = 0.85 * rcut_;
1176	<	}
1177	<
1178	<	Electrostatic::setElectrostaticCutoffRadius(rcut_, rsw_);
1179	<	notifyFortranCutoffs(&rcut_, &rsw_, &ljsp_, &ljsf_);
1180	<
1181	<	} else {
1182	<	// We didn't set rcut explicitly, and we don't have electrostatic atoms, so
1183	<	// We'll punt and let fortran figure out the cutoffs later.
1184	<
1185	<	notifyFortranYouAreOnYourOwn();
1186	<
1187	<	}
1188	<	}
1189	<	}
1190	<
1191	<	void SimInfo::setupElectrostaticSummationMethod( int isError ) {
1192	<
1193	<	int errorOut;
1194	<	ElectrostaticSummationMethod esm = NONE;
1195	<	ElectrostaticScreeningMethod sm = UNDAMPED;
1196	<	RealType alphaVal;
1197	<	RealType dielectric;
1198	<
1199	<	errorOut = isError;
1200	<
1201	<	if (simParams_->haveElectrostaticSummationMethod()) {
1202	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1203	<	toUpper(myMethod);
1204	<	if (myMethod == "NONE") {
1205	<	esm = NONE;
1206	<	} else {
1207	<	if (myMethod == "SWITCHING_FUNCTION") {
1208	<	esm = SWITCHING_FUNCTION;
1209	<	} else {
1210	<	if (myMethod == "SHIFTED_POTENTIAL") {
1211	<	esm = SHIFTED_POTENTIAL;
1212	<	} else {
1213	<	if (myMethod == "SHIFTED_FORCE") {
1214	<	esm = SHIFTED_FORCE;
1215	<	} else {
1216	<	if (myMethod == "REACTION_FIELD") {
1217	<	esm = REACTION_FIELD;
1218	<	dielectric = simParams_->getDielectric();
1219	<	if (!simParams_->haveDielectric()) {
1220	<	// throw warning
1221	<	sprintf( painCave.errMsg,
1222	<	"SimInfo warning: dielectric was not specified in the input file\n\tfor the reaction field correction method.\n"
1223	<	"\tA default value of %f will be used for the dielectric.\n", dielectric);
1224	<	painCave.isFatal = 0;
1225	<	simError();
1226	<	}
1227	<	} else {
1228	<	// throw error
1229	<	sprintf( painCave.errMsg,
1230	<	"SimInfo error: Unknown electrostaticSummationMethod.\n"
1231	<	"\t(Input file specified %s .)\n"
1232	<	"\telectrostaticSummationMethod must be one of: \"none\",\n"
1233	<	"\t\"shifted_potential\", \"shifted_force\", or \n"
1234	<	"\t\"reaction_field\".\n", myMethod.c_str() );
1235	<	painCave.isFatal = 1;
1236	<	simError();
1237	<	}
1238	<	}
1239	<	}
1240	<	}
1241	<	}
1242	<	}
1243	<
1244	<	if (simParams_->haveElectrostaticScreeningMethod()) {
1245	<	std::string myScreen = simParams_->getElectrostaticScreeningMethod();
1246	<	toUpper(myScreen);
1247	<	if (myScreen == "UNDAMPED") {
1248	<	sm = UNDAMPED;
1249	<	} else {
1250	<	if (myScreen == "DAMPED") {
1251	<	sm = DAMPED;
1252	<	if (!simParams_->haveDampingAlpha()) {
1253	<	// first set a cutoff dependent alpha value
1254	<	// we assume alpha depends linearly with rcut from 0 to 20.5 ang
1255	<	alphaVal = 0.5125 - rcut_* 0.025;
1256	<	// for values rcut > 20.5, alpha is zero
1257	<	if (alphaVal < 0) alphaVal = 0;
1258	<
1259	<	// throw warning
1260	<	sprintf( painCave.errMsg,
1261	<	"SimInfo warning: dampingAlpha was not specified in the input file.\n"
1262	<	"\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
1263	<	painCave.isFatal = 0;
1264	<	simError();
1265	<	} else {
1266	<	alphaVal = simParams_->getDampingAlpha();
1267	<	}
1268	<
1269	<	} else {
1270	<	// throw error
1271	<	sprintf( painCave.errMsg,
1272	<	"SimInfo error: Unknown electrostaticScreeningMethod.\n"
1273	<	"\t(Input file specified %s .)\n"
1274	<	"\telectrostaticScreeningMethod must be one of: \"undamped\"\n"
1275	<	"or \"damped\".\n", myScreen.c_str() );
1276	<	painCave.isFatal = 1;
1277	<	simError();
1278	<	}
1279	<	}
1280	<	}
1281	<
1282	<
1283	<	Electrostatic::setElectrostaticSummationMethod( esm );
1284	<	Electrostatic::setElectrostaticScreeningMethod( sm );
1285	<	Electrostatic::setDampingAlpha( alphaVal );
1286	<	Electrostatic::setReactionFieldDielectric( dielectric );
1287	<	initFortranFF( &errorOut );
1288	<	}
1289	<
1290	<	void SimInfo::setupSwitchingFunction() {
1291	<	int ft = CUBIC;
1292	<
1293	<	if (simParams_->haveSwitchingFunctionType()) {
1294	<	std::string funcType = simParams_->getSwitchingFunctionType();
1295	<	toUpper(funcType);
1296	<	if (funcType == "CUBIC") {
1297	<	ft = CUBIC;
1298	<	} else {
1299	<	if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1300	<	ft = FIFTH_ORDER_POLY;
1301	<	} else {
1302	<	// throw error
1303	<	sprintf( painCave.errMsg,
1304	<	"SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", funcType.c_str() );
1305	<	painCave.isFatal = 1;
1306	<	simError();
1307	<	}
1308	<	}
1309	<	}
1310	<
1311	<	// send switching function notification to switcheroo
1312	<	setFunctionType(&ft);
1313	<
939	>	fortranInitialized_ = true;
940		}
941
1316	–	void SimInfo::setupAccumulateBoxDipole() {
1317	–
1318	–	// we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
1319	–	if ( simParams_->haveAccumulateBoxDipole() )
1320	–	if ( simParams_->getAccumulateBoxDipole() ) {
1321	–	setAccumulateBoxDipole();
1322	–	calcBoxDipole_ = true;
1323	–	}
1324	–
1325	–	}
1326	–
942		void SimInfo::addProperty(GenericData* genData) {
943		properties_.addProperty(genData);
944		}
945
946	<	void SimInfo::removeProperty(const std::string& propName) {
946	>	void SimInfo::removeProperty(const string& propName) {
947		properties_.removeProperty(propName);
948		}
949
#	Line 1336 \| Line 951 \| namespace OpenMD {
951		properties_.clearProperties();
952		}
953
954	<	std::vector<std::string> SimInfo::getPropertyNames() {
954	>	vector<string> SimInfo::getPropertyNames() {
955		return properties_.getPropertyNames();
956		}
957
958	<	std::vector<GenericData*> SimInfo::getProperties() {
958	>	vector<GenericData*> SimInfo::getProperties() {
959		return properties_.getProperties();
960		}
961
962	<	GenericData* SimInfo::getPropertyByName(const std::string& propName) {
962	>	GenericData* SimInfo::getPropertyByName(const string& propName) {
963		return properties_.getPropertyByName(propName);
964		}
965
#	Line 1358 \| Line 973 \| namespace OpenMD {
973		Molecule* mol;
974		RigidBody* rb;
975		Atom* atom;
976	+	CutoffGroup* cg;
977		SimInfo::MoleculeIterator mi;
978		Molecule::RigidBodyIterator rbIter;
979	<	Molecule::AtomIterator atomIter;;
979	>	Molecule::AtomIterator atomIter;
980	>	Molecule::CutoffGroupIterator cgIter;
981
982		for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
983
#	Line 1370 \| Line 987 \| namespace OpenMD {
987
988		for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
989		rb->setSnapshotManager(sman_);
990	+	}
991	+
992	+	for (cg = mol->beginCutoffGroup(cgIter); cg != NULL; cg = mol->nextCutoffGroup(cgIter)) {
993	+	cg->setSnapshotManager(sman_);
994		}
995		}
996
#	Line 1427 \| Line 1048 \| namespace OpenMD {
1048
1049		}
1050
1051	<	std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1051	>	ostream& operator <<(ostream& o, SimInfo& info) {
1052
1053		return o;
1054		}
#	Line 1577 \| Line 1198 \| namespace OpenMD {
1198		return IOIndexToIntegrableObject.at(index);
1199		}
1200
1201	<	void SimInfo::setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v) {
1201	>	void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1202		IOIndexToIntegrableObject= v;
1203		}
1204
#	Line 1619 \| Line 1240 \| namespace OpenMD {
1240		return;
1241		}
1242		/*
1243	<	void SimInfo::setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v) {
1243	>	void SimInfo::setStuntDoubleFromGlobalIndex(vector<StuntDouble*> v) {
1244		assert( v.size() == nAtoms_ + nRigidBodies_);
1245		sdByGlobalIndex_ = v;
1246		}
#	Line 1629 \| Line 1250 \| namespace OpenMD {
1250		return sdByGlobalIndex_.at(index);
1251		}
1252		*/
1253	+	int SimInfo::getNGlobalConstraints() {
1254	+	int nGlobalConstraints;
1255	+	#ifdef IS_MPI
1256	+	MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
1257	+	MPI_COMM_WORLD);
1258	+	#else
1259	+	nGlobalConstraints = nConstraints_;
1260	+	#endif
1261	+	return nGlobalConstraints;
1262	+	}
1263	+
1264		}//end namespace OpenMD
1265

Diff Legend

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

Comparing branches/development/src/brains/SimInfo.cpp (file contents): Revision 1505 by gezelter, Sun Oct 3 22:18:59 2010 UTC vs. Revision 1544 by gezelter, Fri Mar 18 19:31:52 2011 UTC

Diff Legend

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1505 by gezelter, Sun Oct 3 22:18:59 2010 UTC vs.
Revision 1544 by gezelter, Fri Mar 18 19:31:52 2011 UTC