ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/trunk/src/brains/SimCreator.cpp

Comparing trunk/src/brains/SimCreator.cpp (file contents):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1938 by gezelter, Thu Oct 31 15:32:17 2013 UTC

#	Line 35 | Line 35
35		*
36		* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37		* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	<	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
39	<	* [4]  Vardeman & Gezelter, in progress (2009).
38	>	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).
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		/**
44		* @file SimCreator.cpp
45		* @author tlin
46		* @date 11/03/2004
46	–	* @time 13:51am
47		* @version 1.0
48		*/
49	+
50	+	#ifdef IS_MPI
51	+	#include "mpi.h"
52	+	#include "math/ParallelRandNumGen.hpp"
53	+	#endif
54	+
55		#include <exception>
56		#include <iostream>
57		#include <sstream>
#	Line 55 | Line 61
61		#include "brains/SimCreator.hpp"
62		#include "brains/SimSnapshotManager.hpp"
63		#include "io/DumpReader.hpp"
64	<	#include "UseTheForce/ForceFieldFactory.hpp"
64	>	#include "brains/ForceField.hpp"
65		#include "utils/simError.h"
66		#include "utils/StringUtils.hpp"
67		#include "math/SeqRandNumGen.hpp"
#	Line 75 | Line 81
81		#include "antlr/NoViableAltForCharException.hpp"
82		#include "antlr/NoViableAltException.hpp"
83
84	<	#ifdef IS_MPI
85	<	#include "math/ParallelRandNumGen.hpp"
86	<	#endif
84	>	#include "types/DirectionalAdapter.hpp"
85	>	#include "types/MultipoleAdapter.hpp"
86	>	#include "types/EAMAdapter.hpp"
87	>	#include "types/SuttonChenAdapter.hpp"
88	>	#include "types/PolarizableAdapter.hpp"
89	>	#include "types/FixedChargeAdapter.hpp"
90	>	#include "types/FluctuatingChargeAdapter.hpp"
91
92	+
93		namespace OpenMD {
94
95	<	Globals* SimCreator::parseFile(std::istream& rawMetaDataStream, const std::string& filename, int startOfMetaDataBlock ){
95	>	Globals* SimCreator::parseFile(std::istream& rawMetaDataStream, const std::string& filename, int mdFileVersion, int startOfMetaDataBlock ){
96		Globals* simParams = NULL;
97		try {
98
#	Line 90 | Line 101 | namespace OpenMD {
101		#ifdef IS_MPI
102		int streamSize;
103		const int masterNode = 0;
104	<	int commStatus;
104	>
105		if (worldRank == masterNode) {
106	<	#endif
107	<
106	>	MPI::COMM_WORLD.Bcast(&mdFileVersion, 1, MPI::INT, masterNode);
107	>	#endif
108		SimplePreprocessor preprocessor;
109		preprocessor.preprocess(rawMetaDataStream, filename, startOfMetaDataBlock, ppStream);
110
111		#ifdef IS_MPI
112		//brocasting the stream size
113		streamSize = ppStream.str().size() +1;
114	<	commStatus = MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);
115	<
116	<	commStatus = MPI_Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())), streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
106	<
107	<
114	>	MPI::COMM_WORLD.Bcast(&streamSize, 1, MPI::LONG, masterNode);
115	>	MPI::COMM_WORLD.Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())), streamSize, MPI::CHAR, masterNode);
116	>
117		} else {
118	+	MPI::COMM_WORLD.Bcast(&mdFileVersion, 1, MPI::INT, masterNode);
119	+
120		//get stream size
121	<	commStatus = MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);
121	>	MPI::COMM_WORLD.Bcast(&streamSize, 1, MPI::LONG, masterNode);
122
123		char* buf = new char[streamSize];
124		assert(buf);
125
126		//receive file content
127	<	commStatus = MPI_Bcast(buf, streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
127	>	MPI::COMM_WORLD.Bcast(buf, streamSize, MPI::CHAR, masterNode);
128
129		ppStream.str(buf);
130		delete [] buf;
120	–
131		}
132		#endif
133		// Create a scanner that reads from the input stream
#	Line 229 | Line 239 | namespace OpenMD {
239		simError();
240		}
241
242	+	simParams->setMDfileVersion(mdFileVersion);
243		return simParams;
244		}
245
246		SimInfo*  SimCreator::createSim(const std::string & mdFileName,
247		bool loadInitCoords) {
248	<
248	>
249		const int bufferSize = 65535;
250		char buffer[bufferSize];
251		int lineNo = 0;
252		std::string mdRawData;
253		int metaDataBlockStart = -1;
254		int metaDataBlockEnd = -1;
255	<	int i;
256	<	int mdOffset;
255	>	int i, j;
256	>	streamoff mdOffset;
257	>	int mdFileVersion;
258
259	+	// Create a string for embedding the version information in the MetaData
260	+	std::string version;
261	+	version.assign("## Last run using OpenMD Version: ");
262	+	version.append(OPENMD_VERSION_MAJOR);
263	+	version.append(".");
264	+	version.append(OPENMD_VERSION_MINOR);
265	+
266	+	std::string svnrev;
267	+	//convert a macro from compiler to a string in c++
268	+	STR_DEFINE(svnrev, SVN_REV );
269	+	version.append(" Revision: ");
270	+	// If there's no SVN revision, just call this the RELEASE revision.
271	+	if (!svnrev.empty()) {
272	+	version.append(svnrev);
273	+	} else {
274	+	version.append("RELEASE");
275	+	}
276	+
277		#ifdef IS_MPI
278		const int masterNode = 0;
279		if (worldRank == masterNode) {
280		#endif
281
282	<	std::ifstream mdFile_(mdFileName.c_str());
282	>	std::ifstream mdFile_;
283	>	mdFile_.open(mdFileName.c_str(), ifstream::in | ifstream::binary);
284
285		if (mdFile_.fail()) {
286		sprintf(painCave.errMsg,
#	Line 276 | Line 307 | namespace OpenMD {
307		painCave.isFatal = 1;
308		simError();
309		}
310	+
311	+	// found the correct opening string, now try to get the file
312	+	// format version number.
313
314	+	StringTokenizer tokenizer(line, "=<> \t\n\r");
315	+	std::string fileType = tokenizer.nextToken();
316	+	toUpper(fileType);
317	+
318	+	mdFileVersion = 0;
319	+
320	+	if (fileType == "OPENMD") {
321	+	while (tokenizer.hasMoreTokens()) {
322	+	std::string token(tokenizer.nextToken());
323	+	toUpper(token);
324	+	if (token == "VERSION") {
325	+	mdFileVersion = tokenizer.nextTokenAsInt();
326	+	break;
327	+	}
328	+	}
329	+	}
330	+
331		//scan through the input stream and find MetaData tag
332		while(mdFile_.getline(buffer, bufferSize)) {
333		++lineNo;
#	Line 317 | Line 368 | namespace OpenMD {
368
369		mdRawData.clear();
370
371	+	bool foundVersion = false;
372	+
373		for (int i = 0; i < metaDataBlockEnd - metaDataBlockStart - 1; ++i) {
374		mdFile_.getline(buffer, bufferSize);
375	<	mdRawData += buffer;
375	>	std::string line = trimLeftCopy(buffer);
376	>	j = CaseInsensitiveFind(line, "## Last run using OpenMD Version");
377	>	if (static_cast<size_t>(j) != string::npos) {
378	>	foundVersion = true;
379	>	mdRawData += version;
380	>	} else {
381	>	mdRawData += buffer;
382	>	}
383		mdRawData += "\n";
384		}
385	<
385	>
386	>	if (!foundVersion) mdRawData += version + "\n";
387	>
388		mdFile_.close();
389
390		#ifdef IS_MPI
#	Line 332 | Line 394 | namespace OpenMD {
394		std::stringstream rawMetaDataStream(mdRawData);
395
396		//parse meta-data file
397	<	Globals* simParams = parseFile(rawMetaDataStream, mdFileName, metaDataBlockStart+1);
397	>	Globals* simParams = parseFile(rawMetaDataStream, mdFileName, mdFileVersion,
398	>	metaDataBlockStart + 1);
399
400		//create the force field
401	<	ForceField * ff = ForceFieldFactory::getInstance()->createForceField(simParams->getForceField());
401	>	ForceField * ff = new ForceField(simParams->getForceField());
402
403		if (ff == NULL) {
404		sprintf(painCave.errMsg,
#	Line 369 | Line 432 | namespace OpenMD {
432		}
433
434		ff->parse(forcefieldFileName);
372	–	ff->setFortranForceOptions();
435		//create SimInfo
436		SimInfo * info = new SimInfo(ff, simParams);
437
#	Line 387 | Line 449 | namespace OpenMD {
449		//create the molecules
450		createMolecules(info);
451
452	<
452	>	//find the storage layout
453	>
454	>	int storageLayout = computeStorageLayout(info);
455	>
456		//allocate memory for DataStorage(circular reference, need to
457		//break it)
458	<	info->setSnapshotManager(new SimSnapshotManager(info));
458	>	info->setSnapshotManager(new SimSnapshotManager(info, storageLayout));
459
460		//set the global index of atoms, rigidbodies and cutoffgroups
461		//(only need to be set once, the global index will never change
#	Line 413 | Line 478 | namespace OpenMD {
478
479		if (loadInitCoords)
480		loadCoordinates(info, mdFileName);
416	–
481		return info;
482		}
483
#	Line 448 | Line 512 | namespace OpenMD {
512
513		#ifdef IS_MPI
514		void SimCreator::divideMolecules(SimInfo *info) {
451	–	RealType numerator;
452	–	RealType denominator;
453	–	RealType precast;
454	–	RealType x;
455	–	RealType y;
515		RealType a;
457	–	int old_atoms;
458	–	int add_atoms;
459	–	int new_atoms;
460	–	int nTarget;
461	–	int done;
462	–	int i;
463	–	int j;
464	–	int loops;
465	–	int which_proc;
516		int nProcessors;
517		std::vector<int> atomsPerProc;
518		int nGlobalMols = info->getNGlobalMolecules();
519	<	std::vector<int> molToProcMap(nGlobalMols, -1); // default to an error condition:
519	>	std::vector<int> molToProcMap(nGlobalMols, -1); // default to an
520	>	// error
521	>	// condition:
522
523	<	MPI_Comm_size(MPI_COMM_WORLD, &nProcessors);
523	>	nProcessors = MPI::COMM_WORLD.Get_size();
524
525		if (nProcessors > nGlobalMols) {
526		sprintf(painCave.errMsg,
#	Line 477 | Line 529 | namespace OpenMD {
529		"\tthe number of molecules.  This will not result in a \n"
530		"\tusable division of atoms for force decomposition.\n"
531		"\tEither try a smaller number of processors, or run the\n"
532	<	"\tsingle-processor version of OpenMD.\n", nProcessors, nGlobalMols);
532	>	"\tsingle-processor version of OpenMD.\n", nProcessors,
533	>	nGlobalMols);
534
535		painCave.isFatal = 1;
536		simError();
537		}
538
486	–	int seedValue;
539		Globals * simParams = info->getSimParams();
540	<	SeqRandNumGen* myRandom; //divide labor does not need Parallel random number generator
540	>	SeqRandNumGen* myRandom; //divide labor does not need Parallel
541	>	//random number generator
542		if (simParams->haveSeed()) {
543	<	seedValue = simParams->getSeed();
543	>	int seedValue = simParams->getSeed();
544		myRandom = new SeqRandNumGen(seedValue);
545		}else {
546		myRandom = new SeqRandNumGen();
#	Line 500 | Line 553 | namespace OpenMD {
553		atomsPerProc.insert(atomsPerProc.end(), nProcessors, 0);
554
555		if (worldRank == 0) {
556	<	numerator = info->getNGlobalAtoms();
557	<	denominator = nProcessors;
558	<	precast = numerator / denominator;
559	<	nTarget = (int)(precast + 0.5);
556	>	RealType numerator = info->getNGlobalAtoms();
557	>	RealType denominator = nProcessors;
558	>	RealType precast = numerator / denominator;
559	>	int nTarget = (int)(precast + 0.5);
560
561	<	for(i = 0; i < nGlobalMols; i++) {
562	<	done = 0;
563	<	loops = 0;
561	>	for(int i = 0; i < nGlobalMols; i++) {
562	>
563	>	int done = 0;
564	>	int loops = 0;
565
566		while (!done) {
567		loops++;
568
569		// Pick a processor at random
570
571	<	which_proc = (int) (myRandom->rand() * nProcessors);
571	>	int which_proc = (int) (myRandom->rand() * nProcessors);
572
573		//get the molecule stamp first
574		int stampId = info->getMoleculeStampId(i);
575		MoleculeStamp * moleculeStamp = info->getMoleculeStamp(stampId);
576
577		// How many atoms does this processor have so far?
578	<	old_atoms = atomsPerProc[which_proc];
579	<	add_atoms = moleculeStamp->getNAtoms();
580	<	new_atoms = old_atoms + add_atoms;
578	>	int old_atoms = atomsPerProc[which_proc];
579	>	int add_atoms = moleculeStamp->getNAtoms();
580	>	int new_atoms = old_atoms + add_atoms;
581
582		// If we've been through this loop too many times, we need
583		// to just give up and assign the molecule to this processor
584		// and be done with it.
585
586		if (loops > 100) {
587	+
588		sprintf(painCave.errMsg,
589	<	"I've tried 100 times to assign molecule %d to a "
590	<	" processor, but can't find a good spot.\n"
591	<	"I'm assigning it at random to processor %d.\n",
589	>	"There have been 100 attempts to assign molecule %d to an\n"
590	>	"\tunderworked processor, but there's no good place to\n"
591	>	"\tleave it.  OpenMD is assigning it at random to processor %d.\n",
592		i, which_proc);
593	<
593	>
594		painCave.isFatal = 0;
595	+	painCave.severity = OPENMD_INFO;
596		simError();
597
598		molToProcMap[i] = which_proc;
#	Line 565 | Line 621 | namespace OpenMD {
621		//           Pacc(x) = exp(- a * x)
622		// where a = penalty / (average atoms per molecule)
623
624	<	x = (RealType)(new_atoms - nTarget);
625	<	y = myRandom->rand();
624	>	RealType x = (RealType)(new_atoms - nTarget);
625	>	RealType y = myRandom->rand();
626
627		if (y < exp(- a * x)) {
628		molToProcMap[i] = which_proc;
#	Line 581 | Line 637 | namespace OpenMD {
637		}
638
639		delete myRandom;
640	<
640	>
641		// Spray out this nonsense to all other processors:
642	<
587	<	MPI_Bcast(&molToProcMap[0], nGlobalMols, MPI_INT, 0, MPI_COMM_WORLD);
642	>	MPI::COMM_WORLD.Bcast(&molToProcMap[0], nGlobalMols, MPI::INT, 0);
643		} else {
644
645		// Listen to your marching orders from processor 0:
646	<
647	<	MPI_Bcast(&molToProcMap[0], nGlobalMols, MPI_INT, 0, MPI_COMM_WORLD);
646	>	MPI::COMM_WORLD.Bcast(&molToProcMap[0], nGlobalMols, MPI::INT, 0);
647	>
648		}
649
650		info->setMolToProcMap(molToProcMap);
#	Line 612 | Line 667 | namespace OpenMD {
667		#endif
668
669		stampId = info->getMoleculeStampId(i);
670	<	Molecule * mol = molCreator.createMolecule(info->getForceField(), info->getMoleculeStamp(stampId),
671	<	stampId, i, info->getLocalIndexManager());
670	>	Molecule * mol = molCreator.createMolecule(info->getForceField(),
671	>	info->getMoleculeStamp(stampId),
672	>	stampId, i,
673	>	info->getLocalIndexManager());
674
675		info->addMolecule(mol);
676
#	Line 625 | Line 682 | namespace OpenMD {
682
683		} //end for(int i=0)
684		}
685	+
686	+	int SimCreator::computeStorageLayout(SimInfo* info) {
687	+
688	+	Globals* simParams = info->getSimParams();
689	+	int nRigidBodies = info->getNGlobalRigidBodies();
690	+	set<AtomType*> atomTypes = info->getSimulatedAtomTypes();
691	+	set<AtomType*>::iterator i;
692	+	bool hasDirectionalAtoms = false;
693	+	bool hasFixedCharge = false;
694	+	bool hasDipoles = false;
695	+	bool hasQuadrupoles = false;
696	+	bool hasPolarizable = false;
697	+	bool hasFluctuatingCharge = false;
698	+	bool hasMetallic = false;
699	+	int storageLayout = 0;
700	+	storageLayout |= DataStorage::dslPosition;
701	+	storageLayout |= DataStorage::dslVelocity;
702	+	storageLayout |= DataStorage::dslForce;
703	+
704	+	for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
705	+
706	+	DirectionalAdapter da = DirectionalAdapter( (*i) );
707	+	MultipoleAdapter ma = MultipoleAdapter( (*i) );
708	+	EAMAdapter ea = EAMAdapter( (*i) );
709	+	SuttonChenAdapter sca = SuttonChenAdapter( (*i) );
710	+	PolarizableAdapter pa = PolarizableAdapter( (*i) );
711	+	FixedChargeAdapter fca = FixedChargeAdapter( (*i) );
712	+	FluctuatingChargeAdapter fqa = FluctuatingChargeAdapter( (*i) );
713	+
714	+	if (da.isDirectional()){
715	+	hasDirectionalAtoms = true;
716	+	}
717	+	if (ma.isDipole()){
718	+	hasDipoles = true;
719	+	}
720	+	if (ma.isQuadrupole()){
721	+	hasQuadrupoles = true;
722	+	}
723	+	if (ea.isEAM() || sca.isSuttonChen()){
724	+	hasMetallic = true;
725	+	}
726	+	if ( fca.isFixedCharge() ){
727	+	hasFixedCharge = true;
728	+	}
729	+	if ( fqa.isFluctuatingCharge() ){
730	+	hasFluctuatingCharge = true;
731	+	}
732	+	if ( pa.isPolarizable() ){
733	+	hasPolarizable = true;
734	+	}
735	+	}
736
737	+	if (nRigidBodies > 0 || hasDirectionalAtoms) {
738	+	storageLayout |= DataStorage::dslAmat;
739	+	if(storageLayout & DataStorage::dslVelocity) {
740	+	storageLayout |= DataStorage::dslAngularMomentum;
741	+	}
742	+	if (storageLayout & DataStorage::dslForce) {
743	+	storageLayout |= DataStorage::dslTorque;
744	+	}
745	+	}
746	+	if (hasDipoles) {
747	+	storageLayout |= DataStorage::dslDipole;
748	+	}
749	+	if (hasQuadrupoles) {
750	+	storageLayout |= DataStorage::dslQuadrupole;
751	+	}
752	+	if (hasFixedCharge || hasFluctuatingCharge) {
753	+	storageLayout |= DataStorage::dslSkippedCharge;
754	+	}
755	+	if (hasMetallic) {
756	+	storageLayout |= DataStorage::dslDensity;
757	+	storageLayout |= DataStorage::dslFunctional;
758	+	storageLayout |= DataStorage::dslFunctionalDerivative;
759	+	}
760	+	if (hasPolarizable) {
761	+	storageLayout |= DataStorage::dslElectricField;
762	+	}
763	+	if (hasFluctuatingCharge){
764	+	storageLayout |= DataStorage::dslFlucQPosition;
765	+	if(storageLayout & DataStorage::dslVelocity) {
766	+	storageLayout |= DataStorage::dslFlucQVelocity;
767	+	}
768	+	if (storageLayout & DataStorage::dslForce) {
769	+	storageLayout |= DataStorage::dslFlucQForce;
770	+	}
771	+	}
772	+
773	+	// if the user has asked for them, make sure we've got the memory for the
774	+	// objects defined.
775	+
776	+	if (simParams->getOutputParticlePotential()) {
777	+	storageLayout |= DataStorage::dslParticlePot;
778	+	}
779	+
780	+	if (simParams->havePrintHeatFlux()) {
781	+	if (simParams->getPrintHeatFlux()) {
782	+	storageLayout |= DataStorage::dslParticlePot;
783	+	}
784	+	}
785	+
786	+	if (simParams->getOutputElectricField() | simParams->haveElectricField()) {
787	+	storageLayout |= DataStorage::dslElectricField;
788	+	}
789	+
790	+	if (simParams->getOutputFluctuatingCharges()) {
791	+	storageLayout |= DataStorage::dslFlucQPosition;
792	+	storageLayout |= DataStorage::dslFlucQVelocity;
793	+	storageLayout |= DataStorage::dslFlucQForce;
794	+	}
795	+
796	+	info->setStorageLayout(storageLayout);
797	+
798	+	return storageLayout;
799	+	}
800	+
801		void SimCreator::setGlobalIndex(SimInfo *info) {
802		SimInfo::MoleculeIterator mi;
803		Molecule::AtomIterator ai;
#	Line 640 | Line 812 | namespace OpenMD {
812		int beginRigidBodyIndex;
813		int beginCutoffGroupIndex;
814		int nGlobalAtoms = info->getNGlobalAtoms();
815	<
644	<	/**@todo fixme */
645	<	#ifndef IS_MPI
815	>	int nGlobalRigidBodies = info->getNGlobalRigidBodies();
816
817		beginAtomIndex = 0;
648	–	beginRigidBodyIndex = 0;
649	–	beginCutoffGroupIndex = 0;
650	–
651	–	#else
652	–
653	–	int nproc;
654	–	int myNode;
655	–
656	–	myNode = worldRank;
657	–	MPI_Comm_size(MPI_COMM_WORLD, &nproc);
658	–
659	–	std::vector < int > tmpAtomsInProc(nproc, 0);
660	–	std::vector < int > tmpRigidBodiesInProc(nproc, 0);
661	–	std::vector < int > tmpCutoffGroupsInProc(nproc, 0);
662	–	std::vector < int > NumAtomsInProc(nproc, 0);
663	–	std::vector < int > NumRigidBodiesInProc(nproc, 0);
664	–	std::vector < int > NumCutoffGroupsInProc(nproc, 0);
665	–
666	–	tmpAtomsInProc[myNode] = info->getNAtoms();
667	–	tmpRigidBodiesInProc[myNode] = info->getNRigidBodies();
668	–	tmpCutoffGroupsInProc[myNode] = info->getNCutoffGroups();
669	–
670	–	//do MPI_ALLREDUCE to exchange the total number of atoms, rigidbodies and cutoff groups
671	–	MPI_Allreduce(&tmpAtomsInProc[0], &NumAtomsInProc[0], nproc, MPI_INT,
672	–	MPI_SUM, MPI_COMM_WORLD);
673	–	MPI_Allreduce(&tmpRigidBodiesInProc[0], &NumRigidBodiesInProc[0], nproc,
674	–	MPI_INT, MPI_SUM, MPI_COMM_WORLD);
675	–	MPI_Allreduce(&tmpCutoffGroupsInProc[0], &NumCutoffGroupsInProc[0], nproc,
676	–	MPI_INT, MPI_SUM, MPI_COMM_WORLD);
677	–
678	–	beginAtomIndex = 0;
679	–	beginRigidBodyIndex = 0;
680	–	beginCutoffGroupIndex = 0;
681	–
682	–	for(int i = 0; i < myNode; i++) {
683	–	beginAtomIndex += NumAtomsInProc[i];
684	–	beginRigidBodyIndex += NumRigidBodiesInProc[i];
685	–	beginCutoffGroupIndex += NumCutoffGroupsInProc[i];
686	–	}
687	–
688	–	#endif
689	–
818		//rigidbody's index begins right after atom's
819	<	beginRigidBodyIndex += info->getNGlobalAtoms();
820	<
821	<	for(mol = info->beginMolecule(mi); mol != NULL;
822	<	mol = info->nextMolecule(mi)) {
819	>	beginRigidBodyIndex = info->getNGlobalAtoms();
820	>	beginCutoffGroupIndex = 0;
821	>
822	>	for(int i = 0; i < info->getNGlobalMolecules(); i++) {
823
824	<	//local index(index in DataStorge) of atom is important
825	<	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
826	<	atom->setGlobalIndex(beginAtomIndex++);
824	>	#ifdef IS_MPI
825	>	if (info->getMolToProc(i) == worldRank) {
826	>	#endif
827	>	// stuff to do if I own this molecule
828	>	mol = info->getMoleculeByGlobalIndex(i);
829	>
830	>	//local index(index in DataStorge) of atom is important
831	>	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
832	>	atom->setGlobalIndex(beginAtomIndex++);
833	>	}
834	>
835	>	for(rb = mol->beginRigidBody(ri); rb != NULL;
836	>	rb = mol->nextRigidBody(ri)) {
837	>	rb->setGlobalIndex(beginRigidBodyIndex++);
838	>	}
839	>
840	>	//local index of cutoff group is trivial, it only depends on
841	>	//the order of travesing
842	>	for(cg = mol->beginCutoffGroup(ci); cg != NULL;
843	>	cg = mol->nextCutoffGroup(ci)) {
844	>	cg->setGlobalIndex(beginCutoffGroupIndex++);
845	>	}
846	>
847	>	#ifdef IS_MPI
848	>	}  else {
849	>
850	>	// stuff to do if I don't own this molecule
851	>
852	>	int stampId = info->getMoleculeStampId(i);
853	>	MoleculeStamp* stamp = info->getMoleculeStamp(stampId);
854	>
855	>	beginAtomIndex += stamp->getNAtoms();
856	>	beginRigidBodyIndex += stamp->getNRigidBodies();
857	>	beginCutoffGroupIndex += stamp->getNCutoffGroups() + stamp->getNFreeAtoms();
858		}
859	<
860	<	for(rb = mol->beginRigidBody(ri); rb != NULL;
861	<	rb = mol->nextRigidBody(ri)) {
862	<	rb->setGlobalIndex(beginRigidBodyIndex++);
704	<	}
705	<
706	<	//local index of cutoff group is trivial, it only depends on the order of travesing
707	<	for(cg = mol->beginCutoffGroup(ci); cg != NULL;
708	<	cg = mol->nextCutoffGroup(ci)) {
709	<	cg->setGlobalIndex(beginCutoffGroupIndex++);
710	<	}
711	<	}
712	<
859	>	#endif
860	>
861	>	} //end for(int i=0)
862	>
863		//fill globalGroupMembership
864		std::vector<int> globalGroupMembership(info->getNGlobalAtoms(), 0);
865		for(mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
#	Line 721 | Line 871 | namespace OpenMD {
871
872		}
873		}
874	<
874	>
875		#ifdef IS_MPI
876		// Since the globalGroupMembership has been zero filled and we've only
877		// poked values into the atoms we know, we can do an Allreduce
#	Line 729 | Line 879 | namespace OpenMD {
879		// This would be prettier if we could use MPI_IN_PLACE like the MPI-2
880		// docs said we could.
881		std::vector<int> tmpGroupMembership(info->getNGlobalAtoms(), 0);
882	<	MPI_Allreduce(&globalGroupMembership[0], &tmpGroupMembership[0], nGlobalAtoms,
883	<	MPI_INT, MPI_SUM, MPI_COMM_WORLD);
882	>	MPI::COMM_WORLD.Allreduce(&globalGroupMembership[0],
883	>	&tmpGroupMembership[0], nGlobalAtoms,
884	>	MPI::INT, MPI::SUM);
885		info->setGlobalGroupMembership(tmpGroupMembership);
886		#else
887		info->setGlobalGroupMembership(globalGroupMembership);
888		#endif
889
890		//fill molMembership
891	<	std::vector<int> globalMolMembership(info->getNGlobalAtoms(), 0);
891	>	std::vector<int> globalMolMembership(info->getNGlobalAtoms() +
892	>	info->getNGlobalRigidBodies(), 0);
893
894	<	for(mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
894	>	for(mol = info->beginMolecule(mi); mol != NULL;
895	>	mol = info->nextMolecule(mi)) {
896		for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
897		globalMolMembership[atom->getGlobalIndex()] = mol->getGlobalIndex();
898		}
899	+	for (rb = mol->beginRigidBody(ri); rb != NULL;
900	+	rb = mol->nextRigidBody(ri)) {
901	+	globalMolMembership[rb->getGlobalIndex()] = mol->getGlobalIndex();
902	+	}
903		}
904
905		#ifdef IS_MPI
906	<	std::vector<int> tmpMolMembership(info->getNGlobalAtoms(), 0);
906	>	std::vector<int> tmpMolMembership(info->getNGlobalAtoms() +
907	>	info->getNGlobalRigidBodies(), 0);
908	>	MPI::COMM_WORLD.Allreduce(&globalMolMembership[0], &tmpMolMembership[0],
909	>	nGlobalAtoms + nGlobalRigidBodies,
910	>	MPI::INT, MPI::SUM);
911
751	–	MPI_Allreduce(&globalMolMembership[0], &tmpMolMembership[0], nGlobalAtoms,
752	–	MPI_INT, MPI_SUM, MPI_COMM_WORLD);
753	–
912		info->setGlobalMolMembership(tmpMolMembership);
913		#else
914		info->setGlobalMolMembership(globalMolMembership);
#	Line 760 | Line 918 | namespace OpenMD {
918		// here the molecules are listed by their global indices.
919
920		std::vector<int> nIOPerMol(info->getNGlobalMolecules(), 0);
921	<	for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
921	>	for (mol = info->beginMolecule(mi); mol != NULL;
922	>	mol = info->nextMolecule(mi)) {
923		nIOPerMol[mol->getGlobalIndex()] = mol->getNIntegrableObjects();
924		}
925
926		#ifdef IS_MPI
927		std::vector<int> numIntegrableObjectsPerMol(info->getNGlobalMolecules(), 0);
928	<	MPI_Allreduce(&nIOPerMol[0], &numIntegrableObjectsPerMol[0],
929	<	info->getNGlobalMolecules(), MPI_INT, MPI_SUM, MPI_COMM_WORLD);
928	>	MPI::COMM_WORLD.Allreduce(&nIOPerMol[0], &numIntegrableObjectsPerMol[0],
929	>	info->getNGlobalMolecules(), MPI::INT, MPI::SUM);
930		#else
931		std::vector<int> numIntegrableObjectsPerMol = nIOPerMol;
932		#endif
#	Line 781 | Line 940 | namespace OpenMD {
940		}
941
942		std::vector<StuntDouble*> IOIndexToIntegrableObject(info->getNGlobalIntegrableObjects(), (StuntDouble*)NULL);
943	<	for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
943	>	for (mol = info->beginMolecule(mi); mol != NULL;
944	>	mol = info->nextMolecule(mi)) {
945		int myGlobalIndex = mol->getGlobalIndex();
946		int globalIO = startingIOIndexForMol[myGlobalIndex];
947	<	for (StuntDouble* integrableObject = mol->beginIntegrableObject(ioi); integrableObject != NULL;
948	<	integrableObject = mol->nextIntegrableObject(ioi)) {
949	<	integrableObject->setGlobalIntegrableObjectIndex(globalIO);
950	<	IOIndexToIntegrableObject[globalIO] = integrableObject;
947	>	for (StuntDouble* sd = mol->beginIntegrableObject(ioi); sd != NULL;
948	>	sd = mol->nextIntegrableObject(ioi)) {
949	>	sd->setGlobalIntegrableObjectIndex(globalIO);
950	>	IOIndexToIntegrableObject[globalIO] = sd;
951		globalIO++;
952		}
953		}
954	<
954	>
955		info->setIOIndexToIntegrableObject(IOIndexToIntegrableObject);
956
957		}
958
959		void SimCreator::loadCoordinates(SimInfo* info, const std::string& mdFileName) {
800	–	Globals* simParams;
801	–	simParams = info->getSimParams();
960
803	–
961		DumpReader reader(info, mdFileName);
962		int nframes = reader.getNFrames();
963
#	Line 814 | Line 971 | namespace OpenMD {
971		painCave.isFatal = 1;
972		simError();
973		}
817	–
974		//copy the current snapshot to previous snapshot
975		info->getSnapshotManager()->advance();
976		}

Comparing trunk/src/brains/SimCreator.cpp (property svn:keywords):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1938 by gezelter, Thu Oct 31 15:32:17 2013 UTC

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

Diff Legend

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