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

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1529 by gezelter, Mon Dec 27 18:35:59 2010 UTC vs.
Revision 1830 by gezelter, Wed Jan 9 22:02:30 2013 UTC

#	Line 36 \| Line 36
36		* [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37		* [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38		* [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
39	<	* [4] Vardeman & Gezelter, in progress (2009).
39	>	* [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010).
40	>	* [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43		/**
#	Line 54 \| Line 55
55		#include "math/Vector3.hpp"
56		#include "primitives/Molecule.hpp"
57		#include "primitives/StuntDouble.hpp"
57	–	#include "UseTheForce/fCutoffPolicy.h"
58	–	#include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
59	–	#include "UseTheForce/doForces_interface.h"
60	–	#include "UseTheForce/DarkSide/neighborLists_interface.h"
61	–	#include "UseTheForce/DarkSide/switcheroo_interface.h"
58		#include "utils/MemoryUtils.hpp"
59		#include "utils/simError.h"
60		#include "selection/SelectionManager.hpp"
61		#include "io/ForceFieldOptions.hpp"
62	<	#include "UseTheForce/ForceField.hpp"
63	<	#include "nonbonded/InteractionManager.hpp"
68	<
69	<
62	>	#include "brains/ForceField.hpp"
63	>	#include "nonbonded/SwitchingFunction.hpp"
64		#ifdef IS_MPI
65	<	#include "UseTheForce/mpiComponentPlan.h"
66	<	#include "UseTheForce/DarkSide/simParallel_interface.h"
73	<	#endif
65	>	#include <mpi.h>
66	>	#endif
67
68		using namespace std;
69		namespace OpenMD {
#	Line 79 \| Line 72 \| namespace OpenMD {
72		forceField_(ff), simParams_(simParams),
73		ndf_(0), fdf_local(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
74		nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
75	<	nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
75	>	nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0), nGlobalFluctuatingCharges_(0),
76		nAtoms_(0), nBonds_(0), nBends_(0), nTorsions_(0), nInversions_(0),
77		nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
78	<	nConstraints_(0), sman_(NULL), fortranInitialized_(false),
78	>	nConstraints_(0), nFluctuatingCharges_(0), sman_(NULL), topologyDone_(false),
79		calcBoxDipole_(false), useAtomicVirial_(true) {
80
81		MoleculeStamp* molStamp;
#	Line 95 \| Line 88 \| namespace OpenMD {
88
89		vector<Component*> components = simParams->getComponents();
90
91	<	for (vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
91	>	for (vector<Component*>::iterator i = components.begin();
92	>	i !=components.end(); ++i) {
93		molStamp = (*i)->getMoleculeStamp();
94		nMolWithSameStamp = (*i)->getNMol();
95
#	Line 136 \| Line 130 \| namespace OpenMD {
130		//equal to the total number of atoms minus number of atoms belong to
131		//cutoff group defined in meta-data file plus the number of cutoff
132		//groups defined in meta-data file
133	+
134		nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
135
136		//every free atom (atom does not belong to rigid bodies) is an
#	Line 231 \| Line 226 \| namespace OpenMD {
226
227
228		void SimInfo::calcNdf() {
229	<	int ndf_local;
229	>	int ndf_local, nfq_local;
230		MoleculeIterator i;
231		vector<StuntDouble*>::iterator j;
232	+	vector<Atom*>::iterator k;
233	+
234		Molecule* mol;
235	<	StuntDouble* integrableObject;
235	>	StuntDouble* sd;
236	>	Atom* atom;
237
238		ndf_local = 0;
239	+	nfq_local = 0;
240
241		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
243	–	for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
244	–	integrableObject = mol->nextIntegrableObject(j)) {
242
243	+	for (sd = mol->beginIntegrableObject(j); sd != NULL;
244	+	sd = mol->nextIntegrableObject(j)) {
245	+
246		ndf_local += 3;
247
248	<	if (integrableObject->isDirectional()) {
249	<	if (integrableObject->isLinear()) {
248	>	if (sd->isDirectional()) {
249	>	if (sd->isLinear()) {
250		ndf_local += 2;
251		} else {
252		ndf_local += 3;
253		}
254		}
255	–
255		}
256	+
257	+	for (atom = mol->beginFluctuatingCharge(k); atom != NULL;
258	+	atom = mol->nextFluctuatingCharge(k)) {
259	+	if (atom->isFluctuatingCharge()) {
260	+	nfq_local++;
261	+	}
262	+	}
263		}
264
265	+	ndfLocal_ = ndf_local;
266	+
267		// n_constraints is local, so subtract them on each processor
268		ndf_local -= nConstraints_;
269
270		#ifdef IS_MPI
271	<	MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
271	>	MPI::COMM_WORLD.Allreduce(&ndf_local, &ndf_, 1, MPI::INT,MPI::SUM);
272	>	MPI::COMM_WORLD.Allreduce(&nfq_local, &nGlobalFluctuatingCharges_, 1,
273	>	MPI::INT, MPI::SUM);
274		#else
275		ndf_ = ndf_local;
276	+	nGlobalFluctuatingCharges_ = nfq_local;
277		#endif
278
279		// nZconstraints_ is global, as are the 3 COM translations for the
#	Line 273 \| Line 284 \| namespace OpenMD {
284
285		int SimInfo::getFdf() {
286		#ifdef IS_MPI
287	<	MPI_Allreduce(&fdf_local,&fdf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
287	>	MPI::COMM_WORLD.Allreduce(&fdf_local, &fdf_, 1, MPI::INT, MPI::SUM);
288		#else
289		fdf_ = fdf_local;
290		#endif
291		return fdf_;
292	+	}
293	+
294	+	unsigned int SimInfo::getNLocalCutoffGroups(){
295	+	int nLocalCutoffAtoms = 0;
296	+	Molecule* mol;
297	+	MoleculeIterator mi;
298	+	CutoffGroup* cg;
299	+	Molecule::CutoffGroupIterator ci;
300	+
301	+	for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
302	+
303	+	for (cg = mol->beginCutoffGroup(ci); cg != NULL;
304	+	cg = mol->nextCutoffGroup(ci)) {
305	+	nLocalCutoffAtoms += cg->getNumAtom();
306	+
307	+	}
308	+	}
309	+
310	+	return nAtoms_ - nLocalCutoffAtoms + nCutoffGroups_;
311		}
312
313		void SimInfo::calcNdfRaw() {
#	Line 286 \| Line 316 \| namespace OpenMD {
316		MoleculeIterator i;
317		vector<StuntDouble*>::iterator j;
318		Molecule* mol;
319	<	StuntDouble* integrableObject;
319	>	StuntDouble* sd;
320
321		// Raw degrees of freedom that we have to set
322		ndfRaw_local = 0;
323
324		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
295	–	for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
296	–	integrableObject = mol->nextIntegrableObject(j)) {
325
326	+	for (sd = mol->beginIntegrableObject(j); sd != NULL;
327	+	sd = mol->nextIntegrableObject(j)) {
328	+
329		ndfRaw_local += 3;
330
331	<	if (integrableObject->isDirectional()) {
332	<	if (integrableObject->isLinear()) {
331	>	if (sd->isDirectional()) {
332	>	if (sd->isLinear()) {
333		ndfRaw_local += 2;
334		} else {
335		ndfRaw_local += 3;
#	Line 309 \| Line 340 \| namespace OpenMD {
340		}
341
342		#ifdef IS_MPI
343	<	MPI_Allreduce(&ndfRaw_local,&ndfRaw_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
343	>	MPI::COMM_WORLD.Allreduce(&ndfRaw_local, &ndfRaw_, 1, MPI::INT, MPI::SUM);
344		#else
345		ndfRaw_ = ndfRaw_local;
346		#endif
#	Line 322 \| Line 353 \| namespace OpenMD {
353
354
355		#ifdef IS_MPI
356	<	MPI_Allreduce(&ndfTrans_local,&ndfTrans_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
356	>	MPI::COMM_WORLD.Allreduce(&ndfTrans_local, &ndfTrans_, 1,
357	>	MPI::INT, MPI::SUM);
358		#else
359		ndfTrans_ = ndfTrans_local;
360		#endif
#	Line 358 \| Line 390 \| namespace OpenMD {
390		Molecule::RigidBodyIterator rbIter;
391		RigidBody* rb;
392		Molecule::IntegrableObjectIterator ii;
393	<	StuntDouble* integrableObject;
393	>	StuntDouble* sd;
394
395	<	for (integrableObject = mol->beginIntegrableObject(ii);
396	<	integrableObject != NULL;
365	<	integrableObject = mol->nextIntegrableObject(ii)) {
395	>	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
396	>	sd = mol->nextIntegrableObject(ii)) {
397
398	<	if (integrableObject->isRigidBody()) {
399	<	rb = static_cast<RigidBody*>(integrableObject);
398	>	if (sd->isRigidBody()) {
399	>	rb = static_cast<RigidBody*>(sd);
400		vector<Atom*> atoms = rb->getAtoms();
401		set<int> rigidAtoms;
402		for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
#	Line 376 \| Line 407 \| namespace OpenMD {
407		}
408		} else {
409		set<int> oneAtomSet;
410	<	oneAtomSet.insert(integrableObject->getGlobalIndex());
411	<	atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
410	>	oneAtomSet.insert(sd->getGlobalIndex());
411	>	atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));
412		}
413		}
414
#	Line 511 \| Line 542 \| namespace OpenMD {
542		Molecule::RigidBodyIterator rbIter;
543		RigidBody* rb;
544		Molecule::IntegrableObjectIterator ii;
545	<	StuntDouble* integrableObject;
545	>	StuntDouble* sd;
546
547	<	for (integrableObject = mol->beginIntegrableObject(ii);
548	<	integrableObject != NULL;
518	<	integrableObject = mol->nextIntegrableObject(ii)) {
547	>	for (sd = mol->beginIntegrableObject(ii); sd != NULL;
548	>	sd = mol->nextIntegrableObject(ii)) {
549
550	<	if (integrableObject->isRigidBody()) {
551	<	rb = static_cast<RigidBody*>(integrableObject);
550	>	if (sd->isRigidBody()) {
551	>	rb = static_cast<RigidBody*>(sd);
552		vector<Atom*> atoms = rb->getAtoms();
553		set<int> rigidAtoms;
554		for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
#	Line 529 \| Line 559 \| namespace OpenMD {
559		}
560		} else {
561		set<int> oneAtomSet;
562	<	oneAtomSet.insert(integrableObject->getGlobalIndex());
563	<	atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
562	>	oneAtomSet.insert(sd->getGlobalIndex());
563	>	atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));
564		}
565		}
566
#	Line 656 \| Line 686 \| namespace OpenMD {
686		molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
687		}
688
659	–	void SimInfo::update() {
689
690	<	setupSimType();
691	<	setupCutoffRadius();
692	<	setupSwitchingRadius();
693	<	setupCutoffMethod();
694	<	setupSkinThickness();
695	<	setupSwitchingFunction();
696	<	setupAccumulateBoxDipole();
697	<
698	<	#ifdef IS_MPI
670	<	setupFortranParallel();
671	<	#endif
672	<	setupFortranSim();
673	<	fortranInitialized_ = true;
674	<
690	>	/**
691	>	* update
692	>	*
693	>	* Performs the global checks and variable settings after the
694	>	* objects have been created.
695	>	*
696	>	*/
697	>	void SimInfo::update() {
698	>	setupSimVariables();
699		calcNdf();
700		calcNdfRaw();
701		calcNdfTrans();
702		}
703
704	+	/**
705	+	* getSimulatedAtomTypes
706	+	*
707	+	* Returns an STL set of AtomType* that are actually present in this
708	+	* simulation. Must query all processors to assemble this information.
709	+	*
710	+	*/
711		set<AtomType*> SimInfo::getSimulatedAtomTypes() {
712		SimInfo::MoleculeIterator mi;
713		Molecule* mol;
#	Line 684 \| Line 715 \| namespace OpenMD {
715		Atom* atom;
716		set<AtomType*> atomTypes;
717
718	<	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
719	<	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
718	>	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
719	>	for(atom = mol->beginAtom(ai); atom != NULL;
720	>	atom = mol->nextAtom(ai)) {
721		atomTypes.insert(atom->getAtomType());
722		}
723		}
692	–	return atomTypes;
693	–	}
694	–
695	–	/**
696	–	* setupCutoffRadius
697	–	*
698	–	* If the cutoffRadius was explicitly set, use that value.
699	–	* If the cutoffRadius was not explicitly set:
700	–	* Are there electrostatic atoms? Use 12.0 Angstroms.
701	–	* No electrostatic atoms? Poll the atom types present in the
702	–	* simulation for suggested cutoff values (e.g. 2.5 * sigma).
703	–	* Use the maximum suggested value that was found.
704	–	*/
705	–	void SimInfo::setupCutoffRadius() {
724
725	<	if (simParams_->haveCutoffRadius()) {
708	<	cutoffRadius_ = simParams_->getCutoffRadius();
709	<	} else {
710	<	if (usesElectrostaticAtoms_) {
711	<	sprintf(painCave.errMsg,
712	<	"SimInfo Warning: No value was set for the cutoffRadius.\n"
713	<	"\tOpenMD will use a default value of 12.0 angstroms"
714	<	"\tfor the cutoffRadius.\n");
715	<	painCave.isFatal = 0;
716	<	simError();
717	<	cutoffRadius_ = 12.0;
718	<	} else {
719	<	RealType thisCut;
720	<	set<AtomType*>::iterator i;
721	<	set<AtomType*> atomTypes;
722	<	atomTypes = getSimulatedAtomTypes();
723	<	for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
724	<	thisCut = InteractionManager::Instance()->getSuggestedCutoffRadius((*i));
725	<	cutoffRadius_ = max(thisCut, cutoffRadius_);
726	<	}
727	<	sprintf(painCave.errMsg,
728	<	"SimInfo Warning: No value was set for the cutoffRadius.\n"
729	<	"\tOpenMD will use %lf angstroms.\n",
730	<	cutoffRadius_);
731	<	painCave.isFatal = 0;
732	<	simError();
733	<	}
734	<	}
725	>	#ifdef IS_MPI
726
727	<	InteractionManager::Instance()->setCutoffRadius(cutoffRadius_);
728	<	}
738	<
739	<	/**
740	<	* setupSwitchingRadius
741	<	*
742	<	* If the switchingRadius was explicitly set, use that value (but check it)
743	<	* If the switchingRadius was not explicitly set: use 0.85 * cutoffRadius_
744	<	*/
745	<	void SimInfo::setupSwitchingRadius() {
727	>	// loop over the found atom types on this processor, and add their
728	>	// numerical idents to a vector:
729
730	<	if (simParams_->haveSwitchingRadius()) {
731	<	switchingRadius_ = simParams_->getSwitchingRadius();
732	<	if (switchingRadius_ > cutoffRadius_) {
733	<	sprintf(painCave.errMsg,
734	<	"SimInfo Error: switchingRadius (%f) is larger than cutoffRadius(%f)\n",
735	<	switchingRadius_, cutoffRadius_);
736	<	painCave.isFatal = 1;
754	<	simError();
730	>	vector<int> foundTypes;
731	>	set<AtomType*>::iterator i;
732	>	for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
733	>	foundTypes.push_back( (*i)->getIdent() );
734	>
735	>	// count_local holds the number of found types on this processor
736	>	int count_local = foundTypes.size();
737
738	<	}
757	<	} else {
758	<	switchingRadius_ = 0.85 * cutoffRadius_;
759	<	sprintf(painCave.errMsg,
760	<	"SimInfo Warning: No value was set for the switchingRadius.\n"
761	<	"\tOpenMD will use a default value of 85 percent of the cutoffRadius.\n"
762	<	"\tswitchingRadius = %f. for this simulation\n", switchingRadius_);
763	<	painCave.isFatal = 0;
764	<	simError();
765	<	}
766	<	InteractionManager::Instance()->setSwitchingRadius(switchingRadius_);
767	<	}
738	>	int nproc = MPI::COMM_WORLD.Get_size();
739
740	<	/**
741	<	* setupSkinThickness
742	<	*
743	<	* If the skinThickness was explicitly set, use that value (but check it)
744	<	* If the skinThickness was not explicitly set: use 1.0 angstroms
745	<	*/
746	<	void SimInfo::setupSkinThickness() {
747	<	if (simParams_->haveSkinThickness()) {
748	<	skinThickness_ = simParams_->getSkinThickness();
749	<	} else {
750	<	skinThickness_ = 1.0;
751	<	sprintf(painCave.errMsg,
752	<	"SimInfo Warning: No value was set for the skinThickness.\n"
753	<	"\tOpenMD will use a default value of %f Angstroms\n"
754	<	"\tfor this simulation\n", skinThickness_);
755	<	painCave.isFatal = 0;
756	<	simError();
757	<	}
740	>	// we need arrays to hold the counts and displacement vectors for
741	>	// all processors
742	>	vector<int> counts(nproc, 0);
743	>	vector<int> disps(nproc, 0);
744	>
745	>	// fill the counts array
746	>	MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0],
747	>	1, MPI::INT);
748	>
749	>	// use the processor counts to compute the displacement array
750	>	disps[0] = 0;
751	>	int totalCount = counts[0];
752	>	for (int iproc = 1; iproc < nproc; iproc++) {
753	>	disps[iproc] = disps[iproc-1] + counts[iproc-1];
754	>	totalCount += counts[iproc];
755	>	}
756	>
757	>	// we need a (possibly redundant) set of all found types:
758	>	vector<int> ftGlobal(totalCount);
759	>
760	>	// now spray out the foundTypes to all the other processors:
761	>	MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
762	>	&ftGlobal[0], &counts[0], &disps[0],
763	>	MPI::INT);
764	>
765	>	vector<int>::iterator j;
766	>
767	>	// foundIdents is a stl set, so inserting an already found ident
768	>	// will have no effect.
769	>	set<int> foundIdents;
770	>
771	>	for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
772	>	foundIdents.insert((*j));
773	>
774	>	// now iterate over the foundIdents and get the actual atom types
775	>	// that correspond to these:
776	>	set<int>::iterator it;
777	>	for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
778	>	atomTypes.insert( forceField_->getAtomType((*it)) );
779	>
780	>	#endif
781	>
782	>	return atomTypes;
783		}
784
785	<	void SimInfo::setupSimType() {
785	>	void SimInfo::setupSimVariables() {
786	>	useAtomicVirial_ = simParams_->getUseAtomicVirial();
787	>	// we only call setAccumulateBoxDipole if the accumulateBoxDipole
788	>	// parameter is true
789	>	calcBoxDipole_ = false;
790	>	if ( simParams_->haveAccumulateBoxDipole() )
791	>	if ( simParams_->getAccumulateBoxDipole() ) {
792	>	calcBoxDipole_ = true;
793	>	}
794	>
795		set<AtomType*>::iterator i;
796		set<AtomType*> atomTypes;
797	<	atomTypes = getSimulatedAtomTypes();
798	<
799	<	useAtomicVirial_ = simParams_->getUseAtomicVirial();
800	<
801	<	int usesElectrostatic = 0;
797	<	int usesMetallic = 0;
798	<	int usesDirectional = 0;
797	>	atomTypes = getSimulatedAtomTypes();
798	>	bool usesElectrostatic = false;
799	>	bool usesMetallic = false;
800	>	bool usesDirectional = false;
801	>	bool usesFluctuatingCharges = false;
802		//loop over all of the atom types
803		for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
804		usesElectrostatic \|= (*i)->isElectrostatic();
805		usesMetallic \|= (*i)->isMetal();
806		usesDirectional \|= (*i)->isDirectional();
807	+	usesFluctuatingCharges \|= (*i)->isFluctuatingCharge();
808		}
809
810	<	#ifdef IS_MPI
811	<	int temp;
810	>	#ifdef IS_MPI
811	>	bool temp;
812		temp = usesDirectional;
813	<	MPI_Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
814	<
813	>	MPI::COMM_WORLD.Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI::BOOL,
814	>	MPI::LOR);
815	>
816		temp = usesMetallic;
817	<	MPI_Allreduce(&temp, &usesMetallicAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
818	<
817	>	MPI::COMM_WORLD.Allreduce(&temp, &usesMetallicAtoms_, 1, MPI::BOOL,
818	>	MPI::LOR);
819	>
820		temp = usesElectrostatic;
821	<	MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
821	>	MPI::COMM_WORLD.Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI::BOOL,
822	>	MPI::LOR);
823	>
824	>	temp = usesFluctuatingCharges;
825	>	MPI::COMM_WORLD.Allreduce(&temp, &usesFluctuatingCharges_, 1, MPI::BOOL,
826	>	MPI::LOR);
827	>	#else
828	>
829	>	usesDirectionalAtoms_ = usesDirectional;
830	>	usesMetallicAtoms_ = usesMetallic;
831	>	usesElectrostaticAtoms_ = usesElectrostatic;
832	>	usesFluctuatingCharges_ = usesFluctuatingCharges;
833	>
834		#endif
835	<	fInfo_.SIM_uses_PBC = usesPeriodicBoundaries_;
836	<	fInfo_.SIM_uses_DirectionalAtoms = usesDirectionalAtoms_;
837	<	fInfo_.SIM_uses_MetallicAtoms = usesMetallicAtoms_;
838	<	fInfo_.SIM_requires_SkipCorrection = usesElectrostaticAtoms_;
821	<	fInfo_.SIM_requires_SelfCorrection = usesElectrostaticAtoms_;
822	<	fInfo_.SIM_uses_AtomicVirial = usesAtomicVirial_;
835	>
836	>	requiresPrepair_ = usesMetallicAtoms_ ? true : false;
837	>	requiresSkipCorrection_ = usesElectrostaticAtoms_ ? true : false;
838	>	requiresSelfCorrection_ = usesElectrostaticAtoms_ ? true : false;
839		}
840
841	<	void SimInfo::setupFortranSim() {
842	<	int isError;
843	<	int nExclude, nOneTwo, nOneThree, nOneFour;
844	<	vector<int> fortranGlobalGroupMembership;
841	>
842	>	vector<int> SimInfo::getGlobalAtomIndices() {
843	>	SimInfo::MoleculeIterator mi;
844	>	Molecule* mol;
845	>	Molecule::AtomIterator ai;
846	>	Atom* atom;
847	>
848	>	vector<int> GlobalAtomIndices(getNAtoms(), 0);
849
850	<	notifyFortranSkinThickness(&skinThickness_);
850	>	for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
851	>
852	>	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
853	>	GlobalAtomIndices[atom->getLocalIndex()] = atom->getGlobalIndex();
854	>	}
855	>	}
856	>	return GlobalAtomIndices;
857	>	}
858
832	–	int ljsp = cutoffMethod_ == SHIFTED_POTENTIAL ? 1 : 0;
833	–	int ljsf = cutoffMethod_ == SHIFTED_FORCE ? 1 : 0;
834	–	notifyFortranCutoffs(&cutoffRadius_, &switchingRadius_, &ljsp, &ljsf);
859
860	<	isError = 0;
860	>	vector<int> SimInfo::getGlobalGroupIndices() {
861	>	SimInfo::MoleculeIterator mi;
862	>	Molecule* mol;
863	>	Molecule::CutoffGroupIterator ci;
864	>	CutoffGroup* cg;
865
866	<	//globalGroupMembership_ is filled by SimCreator
867	<	for (int i = 0; i < nGlobalAtoms_; i++) {
868	<	fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
866	>	vector<int> GlobalGroupIndices;
867	>
868	>	for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
869	>
870	>	//local index of cutoff group is trivial, it only depends on the
871	>	//order of travesing
872	>	for (cg = mol->beginCutoffGroup(ci); cg != NULL;
873	>	cg = mol->nextCutoffGroup(ci)) {
874	>	GlobalGroupIndices.push_back(cg->getGlobalIndex());
875	>	}
876		}
877	+	return GlobalGroupIndices;
878	+	}
879
880	+
881	+	void SimInfo::prepareTopology() {
882	+
883		//calculate mass ratio of cutoff group
844	–	vector<RealType> mfact;
884		SimInfo::MoleculeIterator mi;
885		Molecule* mol;
886		Molecule::CutoffGroupIterator ci;
#	Line 850 \| Line 889 \| namespace OpenMD {
889		Atom* atom;
890		RealType totalMass;
891
892	<	//to avoid memory reallocation, reserve enough space for mfact
893	<	mfact.reserve(getNCutoffGroups());
892	>	/**
893	>	* The mass factor is the relative mass of an atom to the total
894	>	* mass of the cutoff group it belongs to. By default, all atoms
895	>	* are their own cutoff groups, and therefore have mass factors of
896	>	* 1. We need some special handling for massless atoms, which
897	>	* will be treated as carrying the entire mass of the cutoff
898	>	* group.
899	>	*/
900	>	massFactors_.clear();
901	>	massFactors_.resize(getNAtoms(), 1.0);
902
903		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
904	<	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
904	>	for (cg = mol->beginCutoffGroup(ci); cg != NULL;
905	>	cg = mol->nextCutoffGroup(ci)) {
906
907		totalMass = cg->getMass();
908		for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
909		// Check for massless groups - set mfact to 1 if true
910	<	if (totalMass != 0)
911	<	mfact.push_back(atom->getMass()/totalMass);
910	>	if (totalMass != 0)
911	>	massFactors_[atom->getLocalIndex()] = atom->getMass()/totalMass;
912		else
913	<	mfact.push_back( 1.0 );
913	>	massFactors_[atom->getLocalIndex()] = 1.0;
914		}
915		}
916		}
917
918	<	//fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
871	<	vector<int> identArray;
918	>	// Build the identArray_
919
920	<	//to avoid memory reallocation, reserve enough space identArray
921	<	identArray.reserve(getNAtoms());
875	<
920	>	identArray_.clear();
921	>	identArray_.reserve(getNAtoms());
922		for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
923		for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
924	<	identArray.push_back(atom->getIdent());
924	>	identArray_.push_back(atom->getIdent());
925		}
926		}
881	–
882	–	//fill molMembershipArray
883	–	//molMembershipArray is filled by SimCreator
884	–	vector<int> molMembershipArray(nGlobalAtoms_);
885	–	for (int i = 0; i < nGlobalAtoms_; i++) {
886	–	molMembershipArray[i] = globalMolMembership_[i] + 1;
887	–	}
927
928	<	//setup fortran simulation
928	>	//scan topology
929
891	–	nExclude = excludedInteractions_.getSize();
892	–	nOneTwo = oneTwoInteractions_.getSize();
893	–	nOneThree = oneThreeInteractions_.getSize();
894	–	nOneFour = oneFourInteractions_.getSize();
895	–
930		int* excludeList = excludedInteractions_.getPairList();
931		int* oneTwoList = oneTwoInteractions_.getPairList();
932		int* oneThreeList = oneThreeInteractions_.getPairList();
933		int* oneFourList = oneFourInteractions_.getPairList();
934
935	<	setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0],
902	<	&nExclude, excludeList,
903	<	&nOneTwo, oneTwoList,
904	<	&nOneThree, oneThreeList,
905	<	&nOneFour, oneFourList,
906	<	&molMembershipArray[0], &mfact[0], &nCutoffGroups_,
907	<	&fortranGlobalGroupMembership[0], &isError);
908	<
909	<	if( isError ){
910	<
911	<	sprintf( painCave.errMsg,
912	<	"There was an error setting the simulation information in fortran.\n" );
913	<	painCave.isFatal = 1;
914	<	painCave.severity = OPENMD_ERROR;
915	<	simError();
916	<	}
917	<
918	<
919	<	sprintf( checkPointMsg,
920	<	"succesfully sent the simulation information to fortran.\n");
921	<
922	<	errorCheckPoint();
923	<
924	<	// Setup number of neighbors in neighbor list if present
925	<	if (simParams_->haveNeighborListNeighbors()) {
926	<	int nlistNeighbors = simParams_->getNeighborListNeighbors();
927	<	setNeighbors(&nlistNeighbors);
928	<	}
929	<
930	<
935	>	topologyDone_ = true;
936		}
937
933	–
934	–	void SimInfo::setupFortranParallel() {
935	–	#ifdef IS_MPI
936	–	//SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
937	–	vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
938	–	vector<int> localToGlobalCutoffGroupIndex;
939	–	SimInfo::MoleculeIterator mi;
940	–	Molecule::AtomIterator ai;
941	–	Molecule::CutoffGroupIterator ci;
942	–	Molecule* mol;
943	–	Atom* atom;
944	–	CutoffGroup* cg;
945	–	mpiSimData parallelData;
946	–	int isError;
947	–
948	–	for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
949	–
950	–	//local index(index in DataStorge) of atom is important
951	–	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
952	–	localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
953	–	}
954	–
955	–	//local index of cutoff group is trivial, it only depends on the order of travesing
956	–	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
957	–	localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
958	–	}
959	–
960	–	}
961	–
962	–	//fill up mpiSimData struct
963	–	parallelData.nMolGlobal = getNGlobalMolecules();
964	–	parallelData.nMolLocal = getNMolecules();
965	–	parallelData.nAtomsGlobal = getNGlobalAtoms();
966	–	parallelData.nAtomsLocal = getNAtoms();
967	–	parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
968	–	parallelData.nGroupsLocal = getNCutoffGroups();
969	–	parallelData.myNode = worldRank;
970	–	MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
971	–
972	–	//pass mpiSimData struct and index arrays to fortran
973	–	setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
974	–	&localToGlobalAtomIndex[0], &(parallelData.nGroupsLocal),
975	–	&localToGlobalCutoffGroupIndex[0], &isError);
976	–
977	–	if (isError) {
978	–	sprintf(painCave.errMsg,
979	–	"mpiRefresh errror: fortran didn't like something we gave it.\n");
980	–	painCave.isFatal = 1;
981	–	simError();
982	–	}
983	–
984	–	sprintf(checkPointMsg, " mpiRefresh successful.\n");
985	–	errorCheckPoint();
986	–
987	–	#endif
988	–	}
989	–
990	–
991	–	void SimInfo::setupSwitchingFunction() {
992	–	int ft = CUBIC;
993	–
994	–	if (simParams_->haveSwitchingFunctionType()) {
995	–	string funcType = simParams_->getSwitchingFunctionType();
996	–	toUpper(funcType);
997	–	if (funcType == "CUBIC") {
998	–	ft = CUBIC;
999	–	} else {
1000	–	if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1001	–	ft = FIFTH_ORDER_POLY;
1002	–	} else {
1003	–	// throw error
1004	–	sprintf( painCave.errMsg,
1005	–	"SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n"
1006	–	"\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".",
1007	–	funcType.c_str() );
1008	–	painCave.isFatal = 1;
1009	–	simError();
1010	–	}
1011	–	}
1012	–	}
1013	–
1014	–	// send switching function notification to switcheroo
1015	–	setFunctionType(&ft);
1016	–
1017	–	}
1018	–
1019	–	void SimInfo::setupAccumulateBoxDipole() {
1020	–
1021	–	// we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
1022	–	if ( simParams_->haveAccumulateBoxDipole() )
1023	–	if ( simParams_->getAccumulateBoxDipole() ) {
1024	–	calcBoxDipole_ = true;
1025	–	}
1026	–
1027	–	}
1028	–
938		void SimInfo::addProperty(GenericData* genData) {
939		properties_.addProperty(genData);
940		}
#	Line 1060 \| Line 969 \| namespace OpenMD {
969		Molecule* mol;
970		RigidBody* rb;
971		Atom* atom;
972	+	CutoffGroup* cg;
973		SimInfo::MoleculeIterator mi;
974		Molecule::RigidBodyIterator rbIter;
975	<	Molecule::AtomIterator atomIter;;
975	>	Molecule::AtomIterator atomIter;
976	>	Molecule::CutoffGroupIterator cgIter;
977
978		for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
979
980	<	for (atom = mol->beginAtom(atomIter); atom != NULL; atom = mol->nextAtom(atomIter)) {
980	>	for (atom = mol->beginAtom(atomIter); atom != NULL;
981	>	atom = mol->nextAtom(atomIter)) {
982		atom->setSnapshotManager(sman_);
983		}
984
985	<	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
985	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL;
986	>	rb = mol->nextRigidBody(rbIter)) {
987		rb->setSnapshotManager(sman_);
988		}
989	+
990	+	for (cg = mol->beginCutoffGroup(cgIter); cg != NULL;
991	+	cg = mol->nextCutoffGroup(cgIter)) {
992	+	cg->setSnapshotManager(sman_);
993	+	}
994		}
995
996		}
1079	–
1080	–	Vector3d SimInfo::getComVel(){
1081	–	SimInfo::MoleculeIterator i;
1082	–	Molecule* mol;
1083	–
1084	–	Vector3d comVel(0.0);
1085	–	RealType totalMass = 0.0;
1086	–
1087	–
1088	–	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1089	–	RealType mass = mol->getMass();
1090	–	totalMass += mass;
1091	–	comVel += mass * mol->getComVel();
1092	–	}
1093	–
1094	–	#ifdef IS_MPI
1095	–	RealType tmpMass = totalMass;
1096	–	Vector3d tmpComVel(comVel);
1097	–	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1098	–	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1099	–	#endif
1100	–
1101	–	comVel /= totalMass;
1102	–
1103	–	return comVel;
1104	–	}
1105	–
1106	–	Vector3d SimInfo::getCom(){
1107	–	SimInfo::MoleculeIterator i;
1108	–	Molecule* mol;
1109	–
1110	–	Vector3d com(0.0);
1111	–	RealType totalMass = 0.0;
1112	–
1113	–	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1114	–	RealType mass = mol->getMass();
1115	–	totalMass += mass;
1116	–	com += mass * mol->getCom();
1117	–	}
1118	–
1119	–	#ifdef IS_MPI
1120	–	RealType tmpMass = totalMass;
1121	–	Vector3d tmpCom(com);
1122	–	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1123	–	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1124	–	#endif
997
1126	–	com /= totalMass;
998
1128	–	return com;
1129	–
1130	–	}
1131	–
999		ostream& operator <<(ostream& o, SimInfo& info) {
1000
1001		return o;
1002		}
1003
1004	<
1138	<	/*
1139	<	Returns center of mass and center of mass velocity in one function call.
1140	<	*/
1141	<
1142	<	void SimInfo::getComAll(Vector3d &com, Vector3d &comVel){
1143	<	SimInfo::MoleculeIterator i;
1144	<	Molecule* mol;
1145	<
1146	<
1147	<	RealType totalMass = 0.0;
1148	<
1149	<
1150	<	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1151	<	RealType mass = mol->getMass();
1152	<	totalMass += mass;
1153	<	com += mass * mol->getCom();
1154	<	comVel += mass * mol->getComVel();
1155	<	}
1156	<
1157	<	#ifdef IS_MPI
1158	<	RealType tmpMass = totalMass;
1159	<	Vector3d tmpCom(com);
1160	<	Vector3d tmpComVel(comVel);
1161	<	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1162	<	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1163	<	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1164	<	#endif
1165	<
1166	<	com /= totalMass;
1167	<	comVel /= totalMass;
1168	<	}
1169	<
1170	<	/*
1171	<	Return intertia tensor for entire system and angular momentum Vector.
1172	<
1173	<
1174	<	[ Ixx -Ixy -Ixz ]
1175	<	J =\| -Iyx Iyy -Iyz \|
1176	<	[ -Izx -Iyz Izz ]
1177	<	*/
1178	<
1179	<	void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
1180	<
1181	<
1182	<	RealType xx = 0.0;
1183	<	RealType yy = 0.0;
1184	<	RealType zz = 0.0;
1185	<	RealType xy = 0.0;
1186	<	RealType xz = 0.0;
1187	<	RealType yz = 0.0;
1188	<	Vector3d com(0.0);
1189	<	Vector3d comVel(0.0);
1190	<
1191	<	getComAll(com, comVel);
1192	<
1193	<	SimInfo::MoleculeIterator i;
1194	<	Molecule* mol;
1195	<
1196	<	Vector3d thisq(0.0);
1197	<	Vector3d thisv(0.0);
1198	<
1199	<	RealType thisMass = 0.0;
1200	<
1201	<
1202	<
1203	<
1204	<	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1205	<
1206	<	thisq = mol->getCom()-com;
1207	<	thisv = mol->getComVel()-comVel;
1208	<	thisMass = mol->getMass();
1209	<	// Compute moment of intertia coefficients.
1210	<	xx += thisq[0]thisq[0]thisMass;
1211	<	yy += thisq[1]thisq[1]thisMass;
1212	<	zz += thisq[2]thisq[2]thisMass;
1213	<
1214	<	// compute products of intertia
1215	<	xy += thisq[0]thisq[1]thisMass;
1216	<	xz += thisq[0]thisq[2]thisMass;
1217	<	yz += thisq[1]thisq[2]thisMass;
1218	<
1219	<	angularMomentum += cross( thisq, thisv ) * thisMass;
1220	<
1221	<	}
1222	<
1223	<
1224	<	inertiaTensor(0,0) = yy + zz;
1225	<	inertiaTensor(0,1) = -xy;
1226	<	inertiaTensor(0,2) = -xz;
1227	<	inertiaTensor(1,0) = -xy;
1228	<	inertiaTensor(1,1) = xx + zz;
1229	<	inertiaTensor(1,2) = -yz;
1230	<	inertiaTensor(2,0) = -xz;
1231	<	inertiaTensor(2,1) = -yz;
1232	<	inertiaTensor(2,2) = xx + yy;
1233	<
1234	<	#ifdef IS_MPI
1235	<	Mat3x3d tmpI(inertiaTensor);
1236	<	Vector3d tmpAngMom;
1237	<	MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1238	<	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1239	<	#endif
1240	<
1241	<	return;
1242	<	}
1243	<
1244	<	//Returns the angular momentum of the system
1245	<	Vector3d SimInfo::getAngularMomentum(){
1246	<
1247	<	Vector3d com(0.0);
1248	<	Vector3d comVel(0.0);
1249	<	Vector3d angularMomentum(0.0);
1250	<
1251	<	getComAll(com,comVel);
1252	<
1253	<	SimInfo::MoleculeIterator i;
1254	<	Molecule* mol;
1255	<
1256	<	Vector3d thisr(0.0);
1257	<	Vector3d thisp(0.0);
1258	<
1259	<	RealType thisMass;
1260	<
1261	<	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1262	<	thisMass = mol->getMass();
1263	<	thisr = mol->getCom()-com;
1264	<	thisp = (mol->getComVel()-comVel)*thisMass;
1265	<
1266	<	angularMomentum += cross( thisr, thisp );
1267	<
1268	<	}
1269	<
1270	<	#ifdef IS_MPI
1271	<	Vector3d tmpAngMom;
1272	<	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1273	<	#endif
1274	<
1275	<	return angularMomentum;
1276	<	}
1277	<
1004	>
1005		StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1006	<	return IOIndexToIntegrableObject.at(index);
1006	>	if (index >= int(IOIndexToIntegrableObject.size())) {
1007	>	sprintf(painCave.errMsg,
1008	>	"SimInfo::getIOIndexToIntegrableObject Error: Integrable Object\n"
1009	>	"\tindex exceeds number of known objects!\n");
1010	>	painCave.isFatal = 1;
1011	>	simError();
1012	>	return NULL;
1013	>	} else
1014	>	return IOIndexToIntegrableObject.at(index);
1015		}
1016
1017		void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1018		IOIndexToIntegrableObject= v;
1019		}
1020
1286	–	/* Returns the Volume of the simulation based on a ellipsoid with semi-axes
1287	–	based on the radius of gyration V=4/3PiR_1R_2R_3
1288	–	where R_i are related to the principle inertia moments R_i = sqrt(C*I_i/N), this reduces to
1289	–	V = 4/3Pi(C/N)^3/2*sqrt(det(I)). See S.E. Baltazar et. al. Comp. Mat. Sci. 37 (2006) 526-536.
1290	–	*/
1291	–	void SimInfo::getGyrationalVolume(RealType &volume){
1292	–	Mat3x3d intTensor;
1293	–	RealType det;
1294	–	Vector3d dummyAngMom;
1295	–	RealType sysconstants;
1296	–	RealType geomCnst;
1297	–
1298	–	geomCnst = 3.0/2.0;
1299	–	/* Get the inertial tensor and angular momentum for free*/
1300	–	getInertiaTensor(intTensor,dummyAngMom);
1301	–
1302	–	det = intTensor.determinant();
1303	–	sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1304	–	volume = 4.0/3.0NumericConstant::PIpow(sysconstants,3.0/2.0)*sqrt(det);
1305	–	return;
1306	–	}
1307	–
1308	–	void SimInfo::getGyrationalVolume(RealType &volume, RealType &detI){
1309	–	Mat3x3d intTensor;
1310	–	Vector3d dummyAngMom;
1311	–	RealType sysconstants;
1312	–	RealType geomCnst;
1313	–
1314	–	geomCnst = 3.0/2.0;
1315	–	/* Get the inertial tensor and angular momentum for free*/
1316	–	getInertiaTensor(intTensor,dummyAngMom);
1317	–
1318	–	detI = intTensor.determinant();
1319	–	sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1320	–	volume = 4.0/3.0NumericConstant::PIpow(sysconstants,3.0/2.0)*sqrt(detI);
1321	–	return;
1322	–	}
1323	–	/*
1324	–	void SimInfo::setStuntDoubleFromGlobalIndex(vector<StuntDouble*> v) {
1325	–	assert( v.size() == nAtoms_ + nRigidBodies_);
1326	–	sdByGlobalIndex_ = v;
1327	–	}
1328	–
1329	–	StuntDouble* SimInfo::getStuntDoubleFromGlobalIndex(int index) {
1330	–	//assert(index < nAtoms_ + nRigidBodies_);
1331	–	return sdByGlobalIndex_.at(index);
1332	–	}
1333	–	*/
1021		int SimInfo::getNGlobalConstraints() {
1022		int nGlobalConstraints;
1023		#ifdef IS_MPI
1024	<	MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
1025	<	MPI_COMM_WORLD);
1024	>	MPI::COMM_WORLD.Allreduce(&nConstraints_, &nGlobalConstraints, 1,
1025	>	MPI::INT, MPI::SUM);
1026		#else
1027		nGlobalConstraints = nConstraints_;
1028		#endif

Diff Legend

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

Comparing branches/development/src/brains/SimInfo.cpp (file contents): Revision 1529 by gezelter, Mon Dec 27 18:35:59 2010 UTC vs. Revision 1830 by gezelter, Wed Jan 9 22:02:30 2013 UTC

Diff Legend

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1529 by gezelter, Mon Dec 27 18:35:59 2010 UTC vs.
Revision 1830 by gezelter, Wed Jan 9 22:02:30 2013 UTC