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

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 734 by chuckv, Tue Nov 15 16:05:38 2005 UTC vs.
Revision 1045 by chrisfen, Thu Sep 21 18:25:17 2006 UTC

#	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 "primitives/StuntDouble.hpp"
57		#include "UseTheForce/fCutoffPolicy.h"
58		#include "UseTheForce/DarkSide/fElectrostaticSummationMethod.h"
59		#include "UseTheForce/DarkSide/fElectrostaticScreeningMethod.h"
60		#include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
61		#include "UseTheForce/doForces_interface.h"
62		#include "UseTheForce/DarkSide/electrostatic_interface.h"
61	–	#include "UseTheForce/notifyCutoffs_interface.h"
63		#include "UseTheForce/DarkSide/switcheroo_interface.h"
64		#include "utils/MemoryUtils.hpp"
65		#include "utils/simError.h"
66		#include "selection/SelectionManager.hpp"
67	+	#include "io/ForceFieldOptions.hpp"
68	+	#include "UseTheForce/ForceField.hpp"
69
70		#ifdef IS_MPI
71		#include "UseTheForce/mpiComponentPlan.h"
#	Line 70 \| Line 73 \| namespace oopse {
73		#endif
74
75		namespace oopse {
76	+	std::set<int> getRigidSet(int index, std::map<int, std::set<int> >& container) {
77	+	std::map<int, std::set<int> >::iterator i = container.find(index);
78	+	std::set<int> result;
79	+	if (i != container.end()) {
80	+	result = i->second;
81	+	}
82
83	<	SimInfo::SimInfo(MakeStamps* stamps, std::vector<std::pair<MoleculeStamp*, int> >& molStampPairs,
84	<	ForceField* ff, Globals* simParams) :
85	<	stamps_(stamps), forceField_(ff), simParams_(simParams),
86	<	ndf_(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
83	>	return result;
84	>	}
85	>
86	>	SimInfo::SimInfo(ForceField* ff, Globals* simParams) :
87	>	forceField_(ff), simParams_(simParams),
88	>	ndf_(0), fdf_local(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
89		nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
90		nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
91		nAtoms_(0), nBonds_(0), nBends_(0), nTorsions_(0), nRigidBodies_(0),
92		nIntegrableObjects_(0), nCutoffGroups_(0), nConstraints_(0),
93	<	sman_(NULL), fortranInitialized_(false) {
93	>	sman_(NULL), fortranInitialized_(false), calcBoxDipole_(false) {
94
84	–
85	–	std::vector<std::pair<MoleculeStamp*, int> >::iterator i;
95		MoleculeStamp* molStamp;
96		int nMolWithSameStamp;
97		int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
#	Line 90 \| Line 99 \| namespace oopse {
99		CutoffGroupStamp* cgStamp;
100		RigidBodyStamp* rbStamp;
101		int nRigidAtoms = 0;
102	<
103	<	for (i = molStampPairs.begin(); i !=molStampPairs.end(); ++i) {
104	<	molStamp = i->first;
105	<	nMolWithSameStamp = i->second;
102	>	std::vector<Component*> components = simParams->getComponents();
103	>
104	>	for (std::vector<Component*>::iterator i = components.begin(); i !=components.end(); ++i) {
105	>	molStamp = (*i)->getMoleculeStamp();
106	>	nMolWithSameStamp = (*i)->getNMol();
107
108		addMoleculeStamp(molStamp, nMolWithSameStamp);
109
110		//calculate atoms in molecules
111		nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;
112
103	–
113		//calculate atoms in cutoff groups
114		int nAtomsInGroups = 0;
115		int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
116
117		for (int j=0; j < nCutoffGroupsInStamp; j++) {
118	<	cgStamp = molStamp->getCutoffGroup(j);
118	>	cgStamp = molStamp->getCutoffGroupStamp(j);
119		nAtomsInGroups += cgStamp->getNMembers();
120		}
121
#	Line 119 \| Line 128 \| namespace oopse {
128		int nRigidBodiesInStamp = molStamp->getNRigidBodies();
129
130		for (int j=0; j < nRigidBodiesInStamp; j++) {
131	<	rbStamp = molStamp->getRigidBody(j);
131	>	rbStamp = molStamp->getRigidBodyStamp(j);
132		nAtomsInRigidBodies += rbStamp->getNMembers();
133		}
134
#	Line 158 \| Line 167 \| namespace oopse {
167		}
168		molecules_.clear();
169
161	–	delete stamps_;
170		delete sman_;
171		delete simParams_;
172		delete forceField_;
#	Line 265 \| Line 273 \| namespace oopse {
273		}
274		}
275
276	<	}//end for (integrableObject)
277	<	}// end for (mol)
276	>	}
277	>	}
278
279		// n_constraints is local, so subtract them on each processor
280		ndf_local -= nConstraints_;
#	Line 283 \| Line 291 \| namespace oopse {
291
292		}
293
294	+	int SimInfo::getFdf() {
295	+	#ifdef IS_MPI
296	+	MPI_Allreduce(&fdf_local,&fdf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
297	+	#else
298	+	fdf_ = fdf_local;
299	+	#endif
300	+	return fdf_;
301	+	}
302	+
303		void SimInfo::calcNdfRaw() {
304		int ndfRaw_local;
305
#	Line 345 \| Line 362 \| namespace oopse {
362		int b;
363		int c;
364		int d;
365	+
366	+	std::map<int, std::set<int> > atomGroups;
367	+
368	+	Molecule::RigidBodyIterator rbIter;
369	+	RigidBody* rb;
370	+	Molecule::IntegrableObjectIterator ii;
371	+	StuntDouble* integrableObject;
372	+
373	+	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
374	+	integrableObject = mol->nextIntegrableObject(ii)) {
375	+
376	+	if (integrableObject->isRigidBody()) {
377	+	rb = static_cast<RigidBody*>(integrableObject);
378	+	std::vector<Atom*> atoms = rb->getAtoms();
379	+	std::set<int> rigidAtoms;
380	+	for (int i = 0; i < atoms.size(); ++i) {
381	+	rigidAtoms.insert(atoms[i]->getGlobalIndex());
382	+	}
383	+	for (int i = 0; i < atoms.size(); ++i) {
384	+	atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
385	+	}
386	+	} else {
387	+	std::set<int> oneAtomSet;
388	+	oneAtomSet.insert(integrableObject->getGlobalIndex());
389	+	atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
390	+	}
391	+	}
392	+
393
394	+
395		for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
396		a = bond->getAtomA()->getGlobalIndex();
397		b = bond->getAtomB()->getGlobalIndex();
#	Line 356 \| Line 402 \| namespace oopse {
402		a = bend->getAtomA()->getGlobalIndex();
403		b = bend->getAtomB()->getGlobalIndex();
404		c = bend->getAtomC()->getGlobalIndex();
405	+	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
406	+	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
407	+	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
408
409	<	exclude_.addPair(a, b);
410	<	exclude_.addPair(a, c);
411	<	exclude_.addPair(b, c);
409	>	exclude_.addPairs(rigidSetA, rigidSetB);
410	>	exclude_.addPairs(rigidSetA, rigidSetC);
411	>	exclude_.addPairs(rigidSetB, rigidSetC);
412	>
413	>	//exclude_.addPair(a, b);
414	>	//exclude_.addPair(a, c);
415	>	//exclude_.addPair(b, c);
416		}
417
418		for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
#	Line 367 \| Line 420 \| namespace oopse {
420		b = torsion->getAtomB()->getGlobalIndex();
421		c = torsion->getAtomC()->getGlobalIndex();
422		d = torsion->getAtomD()->getGlobalIndex();
423	+	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
424	+	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
425	+	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
426	+	std::set<int> rigidSetD = getRigidSet(d, atomGroups);
427
428	+	exclude_.addPairs(rigidSetA, rigidSetB);
429	+	exclude_.addPairs(rigidSetA, rigidSetC);
430	+	exclude_.addPairs(rigidSetA, rigidSetD);
431	+	exclude_.addPairs(rigidSetB, rigidSetC);
432	+	exclude_.addPairs(rigidSetB, rigidSetD);
433	+	exclude_.addPairs(rigidSetC, rigidSetD);
434	+
435	+	/*
436	+	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
437	+	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
438	+	exclude_.addPairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
439	+	exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
440	+	exclude_.addPairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
441	+	exclude_.addPairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
442	+
443	+
444		exclude_.addPair(a, b);
445		exclude_.addPair(a, c);
446		exclude_.addPair(a, d);
447		exclude_.addPair(b, c);
448		exclude_.addPair(b, d);
449		exclude_.addPair(c, d);
450	+	*/
451		}
452
379	–	Molecule::RigidBodyIterator rbIter;
380	–	RigidBody* rb;
453		for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
454		std::vector<Atom*> atoms = rb->getAtoms();
455		for (int i = 0; i < atoms.size() -1 ; ++i) {
#	Line 402 \| Line 474 \| namespace oopse {
474		int b;
475		int c;
476		int d;
477	+
478	+	std::map<int, std::set<int> > atomGroups;
479	+
480	+	Molecule::RigidBodyIterator rbIter;
481	+	RigidBody* rb;
482	+	Molecule::IntegrableObjectIterator ii;
483	+	StuntDouble* integrableObject;
484	+
485	+	for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
486	+	integrableObject = mol->nextIntegrableObject(ii)) {
487	+
488	+	if (integrableObject->isRigidBody()) {
489	+	rb = static_cast<RigidBody*>(integrableObject);
490	+	std::vector<Atom*> atoms = rb->getAtoms();
491	+	std::set<int> rigidAtoms;
492	+	for (int i = 0; i < atoms.size(); ++i) {
493	+	rigidAtoms.insert(atoms[i]->getGlobalIndex());
494	+	}
495	+	for (int i = 0; i < atoms.size(); ++i) {
496	+	atomGroups.insert(std::map<int, std::set<int> >::value_type(atoms[i]->getGlobalIndex(), rigidAtoms));
497	+	}
498	+	} else {
499	+	std::set<int> oneAtomSet;
500	+	oneAtomSet.insert(integrableObject->getGlobalIndex());
501	+	atomGroups.insert(std::map<int, std::set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));
502	+	}
503	+	}
504	+
505
506		for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
507		a = bond->getAtomA()->getGlobalIndex();
#	Line 414 \| Line 514 \| namespace oopse {
514		b = bend->getAtomB()->getGlobalIndex();
515		c = bend->getAtomC()->getGlobalIndex();
516
517	<	exclude_.removePair(a, b);
518	<	exclude_.removePair(a, c);
519	<	exclude_.removePair(b, c);
517	>	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
518	>	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
519	>	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
520	>
521	>	exclude_.removePairs(rigidSetA, rigidSetB);
522	>	exclude_.removePairs(rigidSetA, rigidSetC);
523	>	exclude_.removePairs(rigidSetB, rigidSetC);
524	>
525	>	//exclude_.removePair(a, b);
526	>	//exclude_.removePair(a, c);
527	>	//exclude_.removePair(b, c);
528		}
529
530		for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
#	Line 425 \| Line 533 \| namespace oopse {
533		c = torsion->getAtomC()->getGlobalIndex();
534		d = torsion->getAtomD()->getGlobalIndex();
535
536	+	std::set<int> rigidSetA = getRigidSet(a, atomGroups);
537	+	std::set<int> rigidSetB = getRigidSet(b, atomGroups);
538	+	std::set<int> rigidSetC = getRigidSet(c, atomGroups);
539	+	std::set<int> rigidSetD = getRigidSet(d, atomGroups);
540	+
541	+	exclude_.removePairs(rigidSetA, rigidSetB);
542	+	exclude_.removePairs(rigidSetA, rigidSetC);
543	+	exclude_.removePairs(rigidSetA, rigidSetD);
544	+	exclude_.removePairs(rigidSetB, rigidSetC);
545	+	exclude_.removePairs(rigidSetB, rigidSetD);
546	+	exclude_.removePairs(rigidSetC, rigidSetD);
547	+
548	+	/*
549	+	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetB.begin(), rigidSetB.end());
550	+	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetC.begin(), rigidSetC.end());
551	+	exclude_.removePairs(rigidSetA.begin(), rigidSetA.end(), rigidSetD.begin(), rigidSetD.end());
552	+	exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetC.begin(), rigidSetC.end());
553	+	exclude_.removePairs(rigidSetB.begin(), rigidSetB.end(), rigidSetD.begin(), rigidSetD.end());
554	+	exclude_.removePairs(rigidSetC.begin(), rigidSetC.end(), rigidSetD.begin(), rigidSetD.end());
555	+
556	+
557		exclude_.removePair(a, b);
558		exclude_.removePair(a, c);
559		exclude_.removePair(a, d);
560		exclude_.removePair(b, c);
561		exclude_.removePair(b, d);
562		exclude_.removePair(c, d);
563	+	*/
564		}
565
436	–	Molecule::RigidBodyIterator rbIter;
437	–	RigidBody* rb;
566		for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
567		std::vector<Atom*> atoms = rb->getAtoms();
568		for (int i = 0; i < atoms.size() -1 ; ++i) {
#	Line 473 \| Line 601 \| namespace oopse {
601		/** @deprecate */
602		int isError = 0;
603
604	+	setupCutoff();
605	+
606		setupElectrostaticSummationMethod( isError );
607		setupSwitchingFunction();
608	+	setupAccumulateBoxDipole();
609
610		if(isError){
611		sprintf( painCave.errMsg,
#	Line 482 \| Line 613 \| namespace oopse {
613		painCave.isFatal = 1;
614		simError();
615		}
485	–
486	–
487	–	setupCutoff();
616
617		calcNdf();
618		calcNdfRaw();
#	Line 534 \| Line 662 \| namespace oopse {
662		int usePBC = simParams_->getUsePeriodicBoundaryConditions();
663		int useRF;
664		int useSF;
665	+	int useSP;
666	+	int useBoxDipole;
667		std::string myMethod;
668
669		// set the useRF logical
#	Line 544 \| Line 674 \| namespace oopse {
674		if (simParams_->haveElectrostaticSummationMethod()) {
675		std::string myMethod = simParams_->getElectrostaticSummationMethod();
676		toUpper(myMethod);
677	<	if (myMethod == "REACTION_FIELD") {
677	>	if (myMethod == "REACTION_FIELD"){
678		useRF=1;
679	<	} else {
680	<	if (myMethod == "SHIFTED_FORCE") {
681	<	useSF = 1;
682	<	}
679	>	} else if (myMethod == "SHIFTED_FORCE"){
680	>	useSF = 1;
681	>	} else if (myMethod == "SHIFTED_POTENTIAL"){
682	>	useSP = 1;
683		}
684		}
685	+
686	+	if (simParams_->haveAccumulateBoxDipole())
687	+	if (simParams_->getAccumulateBoxDipole())
688	+	useBoxDipole = 1;
689
690		//loop over all of the atom types
691		for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
#	Line 622 \| Line 756 \| namespace oopse {
756		MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
757
758		temp = useSF;
759	<	MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
759	>	MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
760
761	+	temp = useSP;
762	+	MPI_Allreduce(&temp, &useSP, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
763	+
764	+	temp = useBoxDipole;
765	+	MPI_Allreduce(&temp, &useBoxDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
766	+
767		#endif
768
769		fInfo_.SIM_uses_PBC = usePBC;
#	Line 641 \| Line 781 \| namespace oopse {
781		fInfo_.SIM_uses_FLARB = useFLARB;
782		fInfo_.SIM_uses_RF = useRF;
783		fInfo_.SIM_uses_SF = useSF;
784	+	fInfo_.SIM_uses_SP = useSP;
785	+	fInfo_.SIM_uses_BoxDipole = useBoxDipole;
786
787		if( myMethod == "REACTION_FIELD") {
788
#	Line 672 \| Line 814 \| namespace oopse {
814		}
815
816		//calculate mass ratio of cutoff group
817	<	std::vector<double> mfact;
817	>	std::vector<RealType> mfact;
818		SimInfo::MoleculeIterator mi;
819		Molecule* mol;
820		Molecule::CutoffGroupIterator ci;
821		CutoffGroup* cg;
822		Molecule::AtomIterator ai;
823		Atom* atom;
824	<	double totalMass;
824	>	RealType totalMass;
825
826		//to avoid memory reallocation, reserve enough space for mfact
827		mfact.reserve(getNCutoffGroups());
#	Line 802 \| Line 944 \| namespace oopse {
944
945		#endif
946
947	<	double SimInfo::calcMaxCutoffRadius() {
947	>	void SimInfo::setupCutoff() {
948	>
949	>	ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
950
951	<
952	<	std::set<AtomType*> atomTypes;
809	<	std::set<AtomType*>::iterator i;
810	<	std::vector<double> cutoffRadius;
811	<
812	<	//get the unique atom types
813	<	atomTypes = getUniqueAtomTypes();
951	>	// Check the cutoff policy
952	>	int cp = TRADITIONAL_CUTOFF_POLICY; // Set to traditional by default
953
954	<	//query the max cutoff radius among these atom types
955	<	for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
956	<	cutoffRadius.push_back(forceField_->getRcutFromAtomType(*i));
954	>	std::string myPolicy;
955	>	if (forceFieldOptions_.haveCutoffPolicy()){
956	>	myPolicy = forceFieldOptions_.getCutoffPolicy();
957	>	}else if (simParams_->haveCutoffPolicy()) {
958	>	myPolicy = simParams_->getCutoffPolicy();
959		}
960
961	<	double maxCutoffRadius = *(std::max_element(cutoffRadius.begin(), cutoffRadius.end()));
821	<	#ifdef IS_MPI
822	<	//pick the max cutoff radius among the processors
823	<	#endif
824	<
825	<	return maxCutoffRadius;
826	<	}
827	<
828	<	void SimInfo::getCutoff(double& rcut, double& rsw) {
829	<
830	<	if (fInfo_.SIM_uses_Charges \| fInfo_.SIM_uses_Dipoles \| fInfo_.SIM_uses_RF) {
831	<
832	<	if (!simParams_->haveCutoffRadius()){
833	<	sprintf(painCave.errMsg,
834	<	"SimCreator Warning: No value was set for the cutoffRadius.\n"
835	<	"\tOOPSE will use a default value of 15.0 angstroms"
836	<	"\tfor the cutoffRadius.\n");
837	<	painCave.isFatal = 0;
838	<	simError();
839	<	rcut = 15.0;
840	<	} else{
841	<	rcut = simParams_->getCutoffRadius();
842	<	}
843	<
844	<	if (!simParams_->haveSwitchingRadius()){
845	<	sprintf(painCave.errMsg,
846	<	"SimCreator Warning: No value was set for switchingRadius.\n"
847	<	"\tOOPSE will use a default value of\n"
848	<	"\t0.85 * cutoffRadius for the switchingRadius\n");
849	<	painCave.isFatal = 0;
850	<	simError();
851	<	rsw = 0.85 * rcut;
852	<	} else{
853	<	rsw = simParams_->getSwitchingRadius();
854	<	}
855	<
856	<	} else {
857	<	// if charge, dipole or reaction field is not used and the cutofff radius is not specified in
858	<	//meta-data file, the maximum cutoff radius calculated from forcefiled will be used
859	<
860	<	if (simParams_->haveCutoffRadius()) {
861	<	rcut = simParams_->getCutoffRadius();
862	<	} else {
863	<	//set cutoff radius to the maximum cutoff radius based on atom types in the whole system
864	<	rcut = calcMaxCutoffRadius();
865	<	}
866	<
867	<	if (simParams_->haveSwitchingRadius()) {
868	<	rsw = simParams_->getSwitchingRadius();
869	<	} else {
870	<	rsw = rcut;
871	<	}
872	<
873	<	}
874	<	}
875	<
876	<	void SimInfo::setupCutoff() {
877	<	getCutoff(rcut_, rsw_);
878	<	double rnblist = rcut_ + 1; // skin of neighbor list
879	<
880	<	//Pass these cutoff radius etc. to fortran. This function should be called once and only once
881	<
882	<	int cp = TRADITIONAL_CUTOFF_POLICY;
883	<	if (simParams_->haveCutoffPolicy()) {
884	<	std::string myPolicy = simParams_->getCutoffPolicy();
961	>	if (!myPolicy.empty()){
962		toUpper(myPolicy);
963		if (myPolicy == "MIX") {
964		cp = MIX_CUTOFF_POLICY;
#	Line 900 \| Line 977 \| namespace oopse {
977		}
978		}
979		}
980	<	}
980	>	}
981	>	notifyFortranCutoffPolicy(&cp);
982
983	<
983	>	// Check the Skin Thickness for neighborlists
984	>	RealType skin;
985		if (simParams_->haveSkinThickness()) {
986	<	double skinThickness = simParams_->getSkinThickness();
987	<	}
986	>	skin = simParams_->getSkinThickness();
987	>	notifyFortranSkinThickness(&skin);
988	>	}
989	>
990	>	// Check if the cutoff was set explicitly:
991	>	if (simParams_->haveCutoffRadius()) {
992	>	rcut_ = simParams_->getCutoffRadius();
993	>	if (simParams_->haveSwitchingRadius()) {
994	>	rsw_ = simParams_->getSwitchingRadius();
995	>	} else {
996	>	if (fInfo_.SIM_uses_Charges \|
997	>	fInfo_.SIM_uses_Dipoles \|
998	>	fInfo_.SIM_uses_RF) {
999	>
1000	>	rsw_ = 0.85 * rcut_;
1001	>	sprintf(painCave.errMsg,
1002	>	"SimCreator Warning: No value was set for the switchingRadius.\n"
1003	>	"\tOOPSE will use a default value of 85 percent of the cutoffRadius.\n"
1004	>	"\tswitchingRadius = %f. for this simulation\n", rsw_);
1005	>	painCave.isFatal = 0;
1006	>	simError();
1007	>	} else {
1008	>	rsw_ = rcut_;
1009	>	sprintf(painCave.errMsg,
1010	>	"SimCreator Warning: No value was set for the switchingRadius.\n"
1011	>	"\tOOPSE will use the same value as the cutoffRadius.\n"
1012	>	"\tswitchingRadius = %f. for this simulation\n", rsw_);
1013	>	painCave.isFatal = 0;
1014	>	simError();
1015	>	}
1016	>	}
1017	>
1018	>	notifyFortranCutoffs(&rcut_, &rsw_);
1019	>
1020	>	} else {
1021	>
1022	>	// For electrostatic atoms, we'll assume a large safe value:
1023	>	if (fInfo_.SIM_uses_Charges \| fInfo_.SIM_uses_Dipoles \| fInfo_.SIM_uses_RF) {
1024	>	sprintf(painCave.errMsg,
1025	>	"SimCreator Warning: No value was set for the cutoffRadius.\n"
1026	>	"\tOOPSE will use a default value of 15.0 angstroms"
1027	>	"\tfor the cutoffRadius.\n");
1028	>	painCave.isFatal = 0;
1029	>	simError();
1030	>	rcut_ = 15.0;
1031	>
1032	>	if (simParams_->haveElectrostaticSummationMethod()) {
1033	>	std::string myMethod = simParams_->getElectrostaticSummationMethod();
1034	>	toUpper(myMethod);
1035	>	if (myMethod == "SHIFTED_POTENTIAL" \|\| myMethod == "SHIFTED_FORCE") {
1036	>	if (simParams_->haveSwitchingRadius()){
1037	>	sprintf(painCave.errMsg,
1038	>	"SimInfo Warning: A value was set for the switchingRadius\n"
1039	>	"\teven though the electrostaticSummationMethod was\n"
1040	>	"\tset to %s\n", myMethod.c_str());
1041	>	painCave.isFatal = 1;
1042	>	simError();
1043	>	}
1044	>	}
1045	>	}
1046	>
1047	>	if (simParams_->haveSwitchingRadius()){
1048	>	rsw_ = simParams_->getSwitchingRadius();
1049	>	} else {
1050	>	sprintf(painCave.errMsg,
1051	>	"SimCreator Warning: No value was set for switchingRadius.\n"
1052	>	"\tOOPSE will use a default value of\n"
1053	>	"\t0.85 * cutoffRadius for the switchingRadius\n");
1054	>	painCave.isFatal = 0;
1055	>	simError();
1056	>	rsw_ = 0.85 * rcut_;
1057	>	}
1058	>	notifyFortranCutoffs(&rcut_, &rsw_);
1059	>	} else {
1060	>	// We didn't set rcut explicitly, and we don't have electrostatic atoms, so
1061	>	// We'll punt and let fortran figure out the cutoffs later.
1062	>
1063	>	notifyFortranYouAreOnYourOwn();
1064
1065	<	notifyFortranCutoffs(&rcut_, &rsw_, &rnblist, &cp);
1066	<	// also send cutoff notification to electrostatics
912	<	setElectrostaticCutoffRadius(&rcut_, &rsw_);
1065	>	}
1066	>	}
1067		}
1068
1069		void SimInfo::setupElectrostaticSummationMethod( int isError ) {
#	Line 917 \| Line 1071 \| namespace oopse {
1071		int errorOut;
1072		int esm = NONE;
1073		int sm = UNDAMPED;
1074	<	double alphaVal;
1075	<	double dielectric;
1076	<
1074	>	RealType alphaVal;
1075	>	RealType dielectric;
1076	>
1077		errorOut = isError;
924	–	alphaVal = simParams_->getDampingAlpha();
1078		dielectric = simParams_->getDielectric();
1079
1080		if (simParams_->haveElectrostaticSummationMethod()) {
#	Line 944 \| Line 1097 \| namespace oopse {
1097		} else {
1098		// throw error
1099		sprintf( painCave.errMsg,
1100	<	"SimInfo error: Unknown electrostaticSummationMethod. (Input file specified %s .)\n\telectrostaticSummationMethod must be one of: \"none\", \"shifted_potential\", \"shifted_force\", or \"reaction_field\".", myMethod.c_str() );
1100	>	"SimInfo error: Unknown electrostaticSummationMethod.\n"
1101	>	"\t(Input file specified %s .)\n"
1102	>	"\telectrostaticSummationMethod must be one of: \"none\",\n"
1103	>	"\t\"shifted_potential\", \"shifted_force\", or \n"
1104	>	"\t\"reaction_field\".\n", myMethod.c_str() );
1105		painCave.isFatal = 1;
1106		simError();
1107		}
#	Line 963 \| Line 1120 \| namespace oopse {
1120		if (myScreen == "DAMPED") {
1121		sm = DAMPED;
1122		if (!simParams_->haveDampingAlpha()) {
1123	<	//throw error
1123	>	// first set a cutoff dependent alpha value
1124	>	// we assume alpha depends linearly with rcut from 0 to 20.5 ang
1125	>	alphaVal = 0.5125 - rcut_* 0.025;
1126	>	// for values rcut > 20.5, alpha is zero
1127	>	if (alphaVal < 0) alphaVal = 0;
1128	>
1129	>	// throw warning
1130		sprintf( painCave.errMsg,
1131	<	"SimInfo warning: dampingAlpha was not specified in the input file. A default value of %f (1/ang) will be used.", alphaVal);
1131	>	"SimInfo warning: dampingAlpha was not specified in the input file.\n"
1132	>	"\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
1133		painCave.isFatal = 0;
1134		simError();
1135		}
1136		} else {
1137		// throw error
1138		sprintf( painCave.errMsg,
1139	<	"SimInfo error: Unknown electrostaticScreeningMethod. (Input file specified %s .)\n\telectrostaticScreeningMethod must be one of: \"undamped\" or \"damped\".", myScreen.c_str() );
1139	>	"SimInfo error: Unknown electrostaticScreeningMethod.\n"
1140	>	"\t(Input file specified %s .)\n"
1141	>	"\telectrostaticScreeningMethod must be one of: \"undamped\"\n"
1142	>	"or \"damped\".\n", myScreen.c_str() );
1143		painCave.isFatal = 1;
1144		simError();
1145		}
#	Line 981 \| Line 1148 \| namespace oopse {
1148
1149		// let's pass some summation method variables to fortran
1150		setElectrostaticSummationMethod( &esm );
1151	+	setFortranElectrostaticMethod( &esm );
1152		setScreeningMethod( &sm );
1153		setDampingAlpha( &alphaVal );
1154		setReactionFieldDielectric( &dielectric );
1155	<	initFortranFF( &esm, &errorOut );
1155	>	initFortranFF( &errorOut );
1156		}
1157
1158		void SimInfo::setupSwitchingFunction() {
#	Line 1013 \| Line 1181 \| namespace oopse {
1181
1182		}
1183
1184	+	void SimInfo::setupAccumulateBoxDipole() {
1185	+
1186	+	// we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
1187	+	if ( simParams_->haveAccumulateBoxDipole() )
1188	+	if ( simParams_->getAccumulateBoxDipole() ) {
1189	+	setAccumulateBoxDipole();
1190	+	calcBoxDipole_ = true;
1191	+	}
1192	+
1193	+	}
1194	+
1195		void SimInfo::addProperty(GenericData* genData) {
1196		properties_.addProperty(genData);
1197		}
#	Line 1069 \| Line 1248 \| namespace oopse {
1248		Molecule* mol;
1249
1250		Vector3d comVel(0.0);
1251	<	double totalMass = 0.0;
1251	>	RealType totalMass = 0.0;
1252
1253
1254		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1255	<	double mass = mol->getMass();
1255	>	RealType mass = mol->getMass();
1256		totalMass += mass;
1257		comVel += mass * mol->getComVel();
1258		}
1259
1260		#ifdef IS_MPI
1261	<	double tmpMass = totalMass;
1261	>	RealType tmpMass = totalMass;
1262		Vector3d tmpComVel(comVel);
1263	<	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1264	<	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1263	>	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1264	>	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1265		#endif
1266
1267		comVel /= totalMass;
#	Line 1095 \| Line 1274 \| namespace oopse {
1274		Molecule* mol;
1275
1276		Vector3d com(0.0);
1277	<	double totalMass = 0.0;
1277	>	RealType totalMass = 0.0;
1278
1279		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1280	<	double mass = mol->getMass();
1280	>	RealType mass = mol->getMass();
1281		totalMass += mass;
1282		com += mass * mol->getCom();
1283		}
1284
1285		#ifdef IS_MPI
1286	<	double tmpMass = totalMass;
1286	>	RealType tmpMass = totalMass;
1287		Vector3d tmpCom(com);
1288	<	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1289	<	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1288	>	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1289	>	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1290		#endif
1291
1292		com /= totalMass;
#	Line 1131 \| Line 1310 \| namespace oopse {
1310		Molecule* mol;
1311
1312
1313	<	double totalMass = 0.0;
1313	>	RealType totalMass = 0.0;
1314
1315
1316		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1317	<	double mass = mol->getMass();
1317	>	RealType mass = mol->getMass();
1318		totalMass += mass;
1319		com += mass * mol->getCom();
1320		comVel += mass * mol->getComVel();
1321		}
1322
1323		#ifdef IS_MPI
1324	<	double tmpMass = totalMass;
1324	>	RealType tmpMass = totalMass;
1325		Vector3d tmpCom(com);
1326		Vector3d tmpComVel(comVel);
1327	<	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1328	<	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1329	<	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1327	>	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1328	>	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1329	>	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1330		#endif
1331
1332		com /= totalMass;
#	Line 1166 \| Line 1345 \| namespace oopse {
1345		void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
1346
1347
1348	<	double xx = 0.0;
1349	<	double yy = 0.0;
1350	<	double zz = 0.0;
1351	<	double xy = 0.0;
1352	<	double xz = 0.0;
1353	<	double yz = 0.0;
1348	>	RealType xx = 0.0;
1349	>	RealType yy = 0.0;
1350	>	RealType zz = 0.0;
1351	>	RealType xy = 0.0;
1352	>	RealType xz = 0.0;
1353	>	RealType yz = 0.0;
1354		Vector3d com(0.0);
1355		Vector3d comVel(0.0);
1356
#	Line 1183 \| Line 1362 \| namespace oopse {
1362		Vector3d thisq(0.0);
1363		Vector3d thisv(0.0);
1364
1365	<	double thisMass = 0.0;
1365	>	RealType thisMass = 0.0;
1366
1367
1368
#	Line 1221 \| Line 1400 \| namespace oopse {
1400		#ifdef IS_MPI
1401		Mat3x3d tmpI(inertiaTensor);
1402		Vector3d tmpAngMom;
1403	<	MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1404	<	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1403	>	MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1404	>	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1405		#endif
1406
1407		return;
#	Line 1243 \| Line 1422 \| namespace oopse {
1422		Vector3d thisr(0.0);
1423		Vector3d thisp(0.0);
1424
1425	<	double thisMass;
1425	>	RealType thisMass;
1426
1427		for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1428		thisMass = mol->getMass();
#	Line 1256 \| Line 1435 \| namespace oopse {
1435
1436		#ifdef IS_MPI
1437		Vector3d tmpAngMom;
1438	<	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1438	>	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1439		#endif
1440
1441		return angularMomentum;
1442		}
1443
1444	<
1444	>	StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1445	>	return IOIndexToIntegrableObject.at(index);
1446	>	}
1447	>
1448	>	void SimInfo::setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v) {
1449	>	IOIndexToIntegrableObject= v;
1450	>	}
1451	>
1452	>	/*
1453	>	void SimInfo::setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v) {
1454	>	assert( v.size() == nAtoms_ + nRigidBodies_);
1455	>	sdByGlobalIndex_ = v;
1456	>	}
1457	>
1458	>	StuntDouble* SimInfo::getStuntDoubleFromGlobalIndex(int index) {
1459	>	//assert(index < nAtoms_ + nRigidBodies_);
1460	>	return sdByGlobalIndex_.at(index);
1461	>	}
1462	>	*/
1463		}//end namespace oopse
1464

Diff Legend

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

Comparing trunk/src/brains/SimInfo.cpp (file contents): Revision 734 by chuckv, Tue Nov 15 16:05:38 2005 UTC vs. Revision 1045 by chrisfen, Thu Sep 21 18:25:17 2006 UTC

Diff Legend

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 734 by chuckv, Tue Nov 15 16:05:38 2005 UTC vs.
Revision 1045 by chrisfen, Thu Sep 21 18:25:17 2006 UTC