ViewVC Help

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

root/OpenMD/branches/development/src/brains/SimCreator.cpp

Comparing:
trunk/src/brains/SimCreator.cpp (file contents), Revision 1241 by gezelter, Fri Apr 25 15:14:47 2008 UTC vs.
branches/development/src/brains/SimCreator.cpp (file contents), Revision 1794 by gezelter, Thu Sep 6 19:44:06 2012 UTC

#	Line 6 | Line 6
6		* redistribute this software in source and binary code form, provided
7		* that the following conditions are met:
8		*
9	<	* 1. Acknowledgement of the program authors must be made in any
10	<	*    publication of scientific results based in part on use of the
11	<	*    program.  An acceptable form of acknowledgement is citation of
12	<	*    the article in which the program was described (Matthew
13	<	*    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14	<	*    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15	<	*    Parallel Simulation Engine for Molecular Dynamics,"
16	<	*    J. Comput. Chem. 26, pp. 252-271 (2005))
17	<	*
18	<	* 2. Redistributions of source code must retain the above copyright
9	>	* 1. Redistributions of source code must retain the above copyright
10		*    notice, this list of conditions and the following disclaimer.
11		*
12	<	* 3. Redistributions in binary form must reproduce the above copyright
12	>	* 2. Redistributions in binary form must reproduce the above copyright
13		*    notice, this list of conditions and the following disclaimer in the
14		*    documentation and/or other materials provided with the
15		*    distribution.
#	Line 37 | Line 28
28		* arising out of the use of or inability to use software, even if the
29		* University of Notre Dame has been advised of the possibility of
30		* such damages.
31	+	*
32	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33	+	* research, please cite the appropriate papers when you publish your
34	+	* work.  Good starting points are:
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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40	+	* [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43		/**
#	Line 55 | Line 56
56		#include "brains/SimCreator.hpp"
57		#include "brains/SimSnapshotManager.hpp"
58		#include "io/DumpReader.hpp"
59	<	#include "UseTheForce/ForceFieldFactory.hpp"
59	>	#include "brains/ForceField.hpp"
60		#include "utils/simError.h"
61		#include "utils/StringUtils.hpp"
62		#include "math/SeqRandNumGen.hpp"
#	Line 75 | Line 76
76		#include "antlr/NoViableAltForCharException.hpp"
77		#include "antlr/NoViableAltException.hpp"
78
79	+	#include "types/DirectionalAdapter.hpp"
80	+	#include "types/MultipoleAdapter.hpp"
81	+	#include "types/EAMAdapter.hpp"
82	+	#include "types/SuttonChenAdapter.hpp"
83	+	#include "types/PolarizableAdapter.hpp"
84	+	#include "types/FixedChargeAdapter.hpp"
85	+	#include "types/FluctuatingChargeAdapter.hpp"
86	+
87		#ifdef IS_MPI
88	+	#include "mpi.h"
89		#include "math/ParallelRandNumGen.hpp"
90		#endif
91
92	<	namespace oopse {
92	>	namespace OpenMD {
93
94	<	Globals* SimCreator::parseFile(std::istream& rawMetaDataStream, const std::string& filename, int startOfMetaDataBlock ){
94	>	Globals* SimCreator::parseFile(std::istream& rawMetaDataStream, const std::string& filename, int mdFileVersion, int startOfMetaDataBlock ){
95		Globals* simParams = NULL;
96		try {
97
#	Line 92 | Line 102 | namespace oopse {
102		const int masterNode = 0;
103		int commStatus;
104		if (worldRank == masterNode) {
105	<	#endif
106	<
105	>	commStatus = MPI_Bcast(&mdFileVersion, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
106	>	#endif
107		SimplePreprocessor preprocessor;
108		preprocessor.preprocess(rawMetaDataStream, filename, startOfMetaDataBlock, ppStream);
109
#	Line 106 | Line 116 | namespace oopse {
116
117
118		} else {
119	+
120	+	commStatus = MPI_Bcast(&mdFileVersion, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
121	+
122		//get stream size
123		commStatus = MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);
124	<
124	>
125		char* buf = new char[streamSize];
126		assert(buf);
127
#	Line 116 | Line 129 | namespace oopse {
129		commStatus = MPI_Bcast(buf, streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
130
131		ppStream.str(buf);
132	<	delete buf;
132	>	delete [] buf;
133
134		}
135		#endif
#	Line 145 | Line 158 | namespace oopse {
158		treeParser.initializeASTFactory(factory);
159		treeParser.setASTFactory(&factory);
160		simParams = treeParser.walkTree(parser.getAST());
148	–
161		}
162
163
#	Line 215 | Line 227 | namespace oopse {
227		painCave.isFatal = 1;
228		simError();
229		}
230	<	catch (OOPSEException& e) {
230	>	catch (OpenMDException& e) {
231		sprintf(painCave.errMsg,
232		"%s\n",
233		e.getMessage().c_str());
#	Line 230 | Line 242 | namespace oopse {
242		simError();
243		}
244
245	+	simParams->setMDfileVersion(mdFileVersion);
246		return simParams;
247		}
248
249		SimInfo*  SimCreator::createSim(const std::string & mdFileName,
250		bool loadInitCoords) {
251	<
251	>
252		const int bufferSize = 65535;
253		char buffer[bufferSize];
254		int lineNo = 0;
#	Line 243 | Line 256 | namespace oopse {
256		int metaDataBlockStart = -1;
257		int metaDataBlockEnd = -1;
258		int i;
259	<	int mdOffset;
259	>	streamoff mdOffset;
260	>	int mdFileVersion;
261
262	+
263		#ifdef IS_MPI
264		const int masterNode = 0;
265		if (worldRank == masterNode) {
266		#endif
267
268	<	std::ifstream mdFile_(mdFileName.c_str());
268	>	std::ifstream mdFile_;
269	>	mdFile_.open(mdFileName.c_str(), ifstream::in | ifstream::binary);
270
271		if (mdFile_.fail()) {
272		sprintf(painCave.errMsg,
#	Line 263 | Line 279 | namespace oopse {
279		mdFile_.getline(buffer, bufferSize);
280		++lineNo;
281		std::string line = trimLeftCopy(buffer);
282	<	i = CaseInsensitiveFind(line, "<OOPSE");
283	<	if (i == string::npos) {
282	>	i = CaseInsensitiveFind(line, "<OpenMD");
283	>	if (static_cast<size_t>(i) == string::npos) {
284	>	// try the older file strings to see if that works:
285	>	i = CaseInsensitiveFind(line, "<OOPSE");
286	>	}
287	>
288	>	if (static_cast<size_t>(i) == string::npos) {
289	>	// still no luck!
290		sprintf(painCave.errMsg,
291	<	"SimCreator: File: %s is not an OOPSE file!\n",
291	>	"SimCreator: File: %s is not a valid OpenMD file!\n",
292		mdFileName.c_str());
293		painCave.isFatal = 1;
294		simError();
295		}
296	+
297	+	// found the correct opening string, now try to get the file
298	+	// format version number.
299
300	+	StringTokenizer tokenizer(line, "=<> \t\n\r");
301	+	std::string fileType = tokenizer.nextToken();
302	+	toUpper(fileType);
303	+
304	+	mdFileVersion = 0;
305	+
306	+	if (fileType == "OPENMD") {
307	+	while (tokenizer.hasMoreTokens()) {
308	+	std::string token(tokenizer.nextToken());
309	+	toUpper(token);
310	+	if (token == "VERSION") {
311	+	mdFileVersion = tokenizer.nextTokenAsInt();
312	+	break;
313	+	}
314	+	}
315	+	}
316	+
317		//scan through the input stream and find MetaData tag
318		while(mdFile_.getline(buffer, bufferSize)) {
319		++lineNo;
#	Line 327 | Line 369 | namespace oopse {
369		std::stringstream rawMetaDataStream(mdRawData);
370
371		//parse meta-data file
372	<	Globals* simParams = parseFile(rawMetaDataStream, mdFileName, metaDataBlockStart+1);
372	>	Globals* simParams = parseFile(rawMetaDataStream, mdFileName, mdFileVersion,
373	>	metaDataBlockStart + 1);
374
375		//create the force field
376	<	ForceField * ff = ForceFieldFactory::getInstance()
377	<	->createForceField(simParams->getForceField());
335	<
376	>	ForceField * ff = new ForceField(simParams->getForceField());
377	>
378		if (ff == NULL) {
379		sprintf(painCave.errMsg,
380		"ForceField Factory can not create %s force field\n",
#	Line 365 | Line 407 | namespace oopse {
407		}
408
409		ff->parse(forcefieldFileName);
368	–	ff->setFortranForceOptions();
410		//create SimInfo
411		SimInfo * info = new SimInfo(ff, simParams);
412
#	Line 383 | Line 424 | namespace oopse {
424		//create the molecules
425		createMolecules(info);
426
427	<
427	>	//find the storage layout
428	>
429	>	int storageLayout = computeStorageLayout(info);
430	>
431		//allocate memory for DataStorage(circular reference, need to
432		//break it)
433	<	info->setSnapshotManager(new SimSnapshotManager(info));
433	>	info->setSnapshotManager(new SimSnapshotManager(info, storageLayout));
434
435		//set the global index of atoms, rigidbodies and cutoffgroups
436		//(only need to be set once, the global index will never change
#	Line 395 | Line 439 | namespace oopse {
439		//responsibility to LocalIndexManager.
440		setGlobalIndex(info);
441
442	<	//Although addExcludePairs is called inside SimInfo's addMolecule
442	>	//Although addInteractionPairs is called inside SimInfo's addMolecule
443		//method, at that point atoms don't have the global index yet
444		//(their global index are all initialized to -1).  Therefore we
445	<	//have to call addExcludePairs explicitly here. A way to work
445	>	//have to call addInteractionPairs explicitly here. A way to work
446		//around is that we can determine the beginning global indices of
447		//atoms before they get created.
448		SimInfo::MoleculeIterator mi;
449		Molecule* mol;
450		for (mol= info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
451	<	info->addExcludePairs(mol);
451	>	info->addInteractionPairs(mol);
452		}
453
454		if (loadInitCoords)
455		loadCoordinates(info, mdFileName);
412	–
456		return info;
457		}
458
#	Line 473 | Line 516 | namespace oopse {
516		"\tthe number of molecules.  This will not result in a \n"
517		"\tusable division of atoms for force decomposition.\n"
518		"\tEither try a smaller number of processors, or run the\n"
519	<	"\tsingle-processor version of OOPSE.\n", nProcessors, nGlobalMols);
519	>	"\tsingle-processor version of OpenMD.\n", nProcessors, nGlobalMols);
520
521		painCave.isFatal = 1;
522		simError();
#	Line 608 | Line 651 | namespace oopse {
651		#endif
652
653		stampId = info->getMoleculeStampId(i);
654	<	Molecule * mol = molCreator.createMolecule(info->getForceField(), info->getMoleculeStamp(stampId),
655	<	stampId, i, info->getLocalIndexManager());
654	>	Molecule * mol = molCreator.createMolecule(info->getForceField(),
655	>	info->getMoleculeStamp(stampId),
656	>	stampId, i,
657	>	info->getLocalIndexManager());
658
659		info->addMolecule(mol);
660
#	Line 622 | Line 667 | namespace oopse {
667		} //end for(int i=0)
668		}
669
670	+	int SimCreator::computeStorageLayout(SimInfo* info) {
671	+
672	+	Globals* simParams = info->getSimParams();
673	+	int nRigidBodies = info->getNGlobalRigidBodies();
674	+	set<AtomType*> atomTypes = info->getSimulatedAtomTypes();
675	+	set<AtomType*>::iterator i;
676	+	bool hasDirectionalAtoms = false;
677	+	bool hasFixedCharge = false;
678	+	bool hasDipoles = false;
679	+	bool hasQuadrupoles = false;
680	+	bool hasPolarizable = false;
681	+	bool hasFluctuatingCharge = false;
682	+	bool hasMetallic = false;
683	+	int storageLayout = 0;
684	+	storageLayout |= DataStorage::dslPosition;
685	+	storageLayout |= DataStorage::dslVelocity;
686	+	storageLayout |= DataStorage::dslForce;
687	+
688	+	for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
689	+
690	+	DirectionalAdapter da = DirectionalAdapter( (*i) );
691	+	MultipoleAdapter ma = MultipoleAdapter( (*i) );
692	+	EAMAdapter ea = EAMAdapter( (*i) );
693	+	SuttonChenAdapter sca = SuttonChenAdapter( (*i) );
694	+	PolarizableAdapter pa = PolarizableAdapter( (*i) );
695	+	FixedChargeAdapter fca = FixedChargeAdapter( (*i) );
696	+	FluctuatingChargeAdapter fqa = FluctuatingChargeAdapter( (*i) );
697	+
698	+	if (da.isDirectional()){
699	+	hasDirectionalAtoms = true;
700	+	}
701	+	if (ma.isDipole()){
702	+	hasDipoles = true;
703	+	}
704	+	if (ma.isQuadrupole()){
705	+	hasQuadrupoles = true;
706	+	}
707	+	if (ea.isEAM() || sca.isSuttonChen()){
708	+	hasMetallic = true;
709	+	}
710	+	if ( fca.isFixedCharge() ){
711	+	hasFixedCharge = true;
712	+	}
713	+	if ( fqa.isFluctuatingCharge() ){
714	+	hasFluctuatingCharge = true;
715	+	}
716	+	if ( pa.isPolarizable() ){
717	+	hasPolarizable = true;
718	+	}
719	+	}
720	+
721	+	if (nRigidBodies > 0 || hasDirectionalAtoms) {
722	+	storageLayout |= DataStorage::dslAmat;
723	+	if(storageLayout & DataStorage::dslVelocity) {
724	+	storageLayout |= DataStorage::dslAngularMomentum;
725	+	}
726	+	if (storageLayout & DataStorage::dslForce) {
727	+	storageLayout |= DataStorage::dslTorque;
728	+	}
729	+	}
730	+	if (hasDipoles) {
731	+	storageLayout |= DataStorage::dslDipole;
732	+	}
733	+	if (hasQuadrupoles) {
734	+	storageLayout |= DataStorage::dslQuadrupole;
735	+	}
736	+	if (hasFixedCharge || hasFluctuatingCharge) {
737	+	storageLayout |= DataStorage::dslSkippedCharge;
738	+	}
739	+	if (hasMetallic) {
740	+	storageLayout |= DataStorage::dslDensity;
741	+	storageLayout |= DataStorage::dslFunctional;
742	+	storageLayout |= DataStorage::dslFunctionalDerivative;
743	+	}
744	+	if (hasPolarizable) {
745	+	storageLayout |= DataStorage::dslElectricField;
746	+	}
747	+	if (hasFluctuatingCharge){
748	+	storageLayout |= DataStorage::dslFlucQPosition;
749	+	if(storageLayout & DataStorage::dslVelocity) {
750	+	storageLayout |= DataStorage::dslFlucQVelocity;
751	+	}
752	+	if (storageLayout & DataStorage::dslForce) {
753	+	storageLayout |= DataStorage::dslFlucQForce;
754	+	}
755	+	}
756	+
757	+	// if the user has asked for them, make sure we've got the memory for the
758	+	// objects defined.
759	+
760	+	if (simParams->getOutputParticlePotential()) {
761	+	storageLayout |= DataStorage::dslParticlePot;
762	+	}
763	+
764	+	if (simParams->havePrintHeatFlux()) {
765	+	if (simParams->getPrintHeatFlux()) {
766	+	storageLayout |= DataStorage::dslParticlePot;
767	+	}
768	+	}
769	+
770	+	if (simParams->getOutputElectricField()) {
771	+	storageLayout |= DataStorage::dslElectricField;
772	+	}
773	+
774	+	if (simParams->getOutputFluctuatingCharges()) {
775	+	storageLayout |= DataStorage::dslFlucQPosition;
776	+	storageLayout |= DataStorage::dslFlucQVelocity;
777	+	storageLayout |= DataStorage::dslFlucQForce;
778	+	}
779	+
780	+	return storageLayout;
781	+	}
782	+
783		void SimCreator::setGlobalIndex(SimInfo *info) {
784		SimInfo::MoleculeIterator mi;
785		Molecule::AtomIterator ai;
#	Line 636 | Line 794 | namespace oopse {
794		int beginRigidBodyIndex;
795		int beginCutoffGroupIndex;
796		int nGlobalAtoms = info->getNGlobalAtoms();
639	–
640	–	/**@todo fixme */
641	–	#ifndef IS_MPI
797
798		beginAtomIndex = 0;
644	–	beginRigidBodyIndex = 0;
645	–	beginCutoffGroupIndex = 0;
646	–
647	–	#else
648	–
649	–	int nproc;
650	–	int myNode;
651	–
652	–	myNode = worldRank;
653	–	MPI_Comm_size(MPI_COMM_WORLD, &nproc);
654	–
655	–	std::vector < int > tmpAtomsInProc(nproc, 0);
656	–	std::vector < int > tmpRigidBodiesInProc(nproc, 0);
657	–	std::vector < int > tmpCutoffGroupsInProc(nproc, 0);
658	–	std::vector < int > NumAtomsInProc(nproc, 0);
659	–	std::vector < int > NumRigidBodiesInProc(nproc, 0);
660	–	std::vector < int > NumCutoffGroupsInProc(nproc, 0);
661	–
662	–	tmpAtomsInProc[myNode] = info->getNAtoms();
663	–	tmpRigidBodiesInProc[myNode] = info->getNRigidBodies();
664	–	tmpCutoffGroupsInProc[myNode] = info->getNCutoffGroups();
665	–
666	–	//do MPI_ALLREDUCE to exchange the total number of atoms, rigidbodies and cutoff groups
667	–	MPI_Allreduce(&tmpAtomsInProc[0], &NumAtomsInProc[0], nproc, MPI_INT,
668	–	MPI_SUM, MPI_COMM_WORLD);
669	–	MPI_Allreduce(&tmpRigidBodiesInProc[0], &NumRigidBodiesInProc[0], nproc,
670	–	MPI_INT, MPI_SUM, MPI_COMM_WORLD);
671	–	MPI_Allreduce(&tmpCutoffGroupsInProc[0], &NumCutoffGroupsInProc[0], nproc,
672	–	MPI_INT, MPI_SUM, MPI_COMM_WORLD);
673	–
674	–	beginAtomIndex = 0;
675	–	beginRigidBodyIndex = 0;
676	–	beginCutoffGroupIndex = 0;
677	–
678	–	for(int i = 0; i < myNode; i++) {
679	–	beginAtomIndex += NumAtomsInProc[i];
680	–	beginRigidBodyIndex += NumRigidBodiesInProc[i];
681	–	beginCutoffGroupIndex += NumCutoffGroupsInProc[i];
682	–	}
683	–
684	–	#endif
685	–
799		//rigidbody's index begins right after atom's
800	<	beginRigidBodyIndex += info->getNGlobalAtoms();
801	<
802	<	for(mol = info->beginMolecule(mi); mol != NULL;
803	<	mol = info->nextMolecule(mi)) {
800	>	beginRigidBodyIndex = info->getNGlobalAtoms();
801	>	beginCutoffGroupIndex = 0;
802	>
803	>	for(int i = 0; i < info->getNGlobalMolecules(); i++) {
804
805	<	//local index(index in DataStorge) of atom is important
806	<	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
807	<	atom->setGlobalIndex(beginAtomIndex++);
805	>	#ifdef IS_MPI
806	>	if (info->getMolToProc(i) == worldRank) {
807	>	#endif
808	>	// stuff to do if I own this molecule
809	>	mol = info->getMoleculeByGlobalIndex(i);
810	>
811	>	//local index(index in DataStorge) of atom is important
812	>	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
813	>	atom->setGlobalIndex(beginAtomIndex++);
814	>	}
815	>
816	>	for(rb = mol->beginRigidBody(ri); rb != NULL;
817	>	rb = mol->nextRigidBody(ri)) {
818	>	rb->setGlobalIndex(beginRigidBodyIndex++);
819	>	}
820	>
821	>	//local index of cutoff group is trivial, it only depends on
822	>	//the order of travesing
823	>	for(cg = mol->beginCutoffGroup(ci); cg != NULL;
824	>	cg = mol->nextCutoffGroup(ci)) {
825	>	cg->setGlobalIndex(beginCutoffGroupIndex++);
826	>	}
827	>
828	>	#ifdef IS_MPI
829	>	}  else {
830	>
831	>	// stuff to do if I don't own this molecule
832	>
833	>	int stampId = info->getMoleculeStampId(i);
834	>	MoleculeStamp* stamp = info->getMoleculeStamp(stampId);
835	>
836	>	beginAtomIndex += stamp->getNAtoms();
837	>	beginRigidBodyIndex += stamp->getNRigidBodies();
838	>	beginCutoffGroupIndex += stamp->getNCutoffGroups() + stamp->getNFreeAtoms();
839		}
840	<
841	<	for(rb = mol->beginRigidBody(ri); rb != NULL;
842	<	rb = mol->nextRigidBody(ri)) {
843	<	rb->setGlobalIndex(beginRigidBodyIndex++);
700	<	}
701	<
702	<	//local index of cutoff group is trivial, it only depends on the order of travesing
703	<	for(cg = mol->beginCutoffGroup(ci); cg != NULL;
704	<	cg = mol->nextCutoffGroup(ci)) {
705	<	cg->setGlobalIndex(beginCutoffGroupIndex++);
706	<	}
707	<	}
708	<
840	>	#endif
841	>
842	>	} //end for(int i=0)
843	>
844		//fill globalGroupMembership
845		std::vector<int> globalGroupMembership(info->getNGlobalAtoms(), 0);
846		for(mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
#	Line 717 | Line 852 | namespace oopse {
852
853		}
854		}
855	<
855	>
856		#ifdef IS_MPI
857		// Since the globalGroupMembership has been zero filled and we've only
858		// poked values into the atoms we know, we can do an Allreduce
859		// to get the full globalGroupMembership array (We think).
860		// This would be prettier if we could use MPI_IN_PLACE like the MPI-2
861		// docs said we could.
862	<	std::vector<int> tmpGroupMembership(nGlobalAtoms, 0);
862	>	std::vector<int> tmpGroupMembership(info->getNGlobalAtoms(), 0);
863		MPI_Allreduce(&globalGroupMembership[0], &tmpGroupMembership[0], nGlobalAtoms,
864		MPI_INT, MPI_SUM, MPI_COMM_WORLD);
865		info->setGlobalGroupMembership(tmpGroupMembership);
#	Line 736 | Line 871 | namespace oopse {
871		std::vector<int> globalMolMembership(info->getNGlobalAtoms(), 0);
872
873		for(mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
739	–
874		for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
875		globalMolMembership[atom->getGlobalIndex()] = mol->getGlobalIndex();
876		}
877		}
878
879		#ifdef IS_MPI
880	<	std::vector<int> tmpMolMembership(nGlobalAtoms, 0);
880	>	std::vector<int> tmpMolMembership(info->getNGlobalAtoms(), 0);
881
882		MPI_Allreduce(&globalMolMembership[0], &tmpMolMembership[0], nGlobalAtoms,
883		MPI_INT, MPI_SUM, MPI_COMM_WORLD);
#	Line 769 | Line 903 | namespace oopse {
903		std::vector<int> numIntegrableObjectsPerMol = nIOPerMol;
904		#endif
905
906	<	std::vector<int> startingIOIndexForMol(info->getNGlobalMolecules());
907	<
908	<	int startingIndex = 0;
909	<	for (int i = 0; i < info->getNGlobalMolecules(); i++) {
910	<	startingIOIndexForMol[i] = startingIndex;
911	<	startingIndex += numIntegrableObjectsPerMol[i];
912	<	}
913	<
914	<	std::vector<StuntDouble*> IOIndexToIntegrableObject(info->getNGlobalIntegrableObjects(), (StuntDouble*)NULL);
915	<	for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
906	>	std::vector<int> startingIOIndexForMol(info->getNGlobalMolecules());
907	>
908	>	int startingIndex = 0;
909	>	for (int i = 0; i < info->getNGlobalMolecules(); i++) {
910	>	startingIOIndexForMol[i] = startingIndex;
911	>	startingIndex += numIntegrableObjectsPerMol[i];
912	>	}
913	>
914	>	std::vector<StuntDouble*> IOIndexToIntegrableObject(info->getNGlobalIntegrableObjects(), (StuntDouble*)NULL);
915	>	for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
916		int myGlobalIndex = mol->getGlobalIndex();
917		int globalIO = startingIOIndexForMol[myGlobalIndex];
918	<	for (StuntDouble* integrableObject = mol->beginIntegrableObject(ioi); integrableObject != NULL;
919	<	integrableObject = mol->nextIntegrableObject(ioi)) {
920	<	integrableObject->setGlobalIntegrableObjectIndex(globalIO);
921	<	IOIndexToIntegrableObject[globalIO] = integrableObject;
922	<	globalIO++;
918	>	for (StuntDouble* sd = mol->beginIntegrableObject(ioi); sd != NULL;
919	>	sd = mol->nextIntegrableObject(ioi)) {
920	>	sd->setGlobalIntegrableObjectIndex(globalIO);
921	>	IOIndexToIntegrableObject[globalIO] = sd;
922	>	globalIO++;
923		}
924		}
925	<
926	<	info->setIOIndexToIntegrableObject(IOIndexToIntegrableObject);
927	<
925	>
926	>	info->setIOIndexToIntegrableObject(IOIndexToIntegrableObject);
927	>
928		}
929
930		void SimCreator::loadCoordinates(SimInfo* info, const std::string& mdFileName) {
931		Globals* simParams;
932	+
933		simParams = info->getSimParams();
934
800	–
935		DumpReader reader(info, mdFileName);
936		int nframes = reader.getNFrames();
937	<
937	>
938		if (nframes > 0) {
939		reader.readFrame(nframes - 1);
940		} else {
#	Line 811 | Line 945 | int startingIndex = 0;
945		painCave.isFatal = 1;
946		simError();
947		}
814	–
948		//copy the current snapshot to previous snapshot
949		info->getSnapshotManager()->advance();
950		}
951
952	<	} //end namespace oopse
952	>	} //end namespace OpenMD
953
954

Comparing:
trunk/src/brains/SimCreator.cpp (property svn:keywords), Revision 1241 by gezelter, Fri Apr 25 15:14:47 2008 UTC vs.
branches/development/src/brains/SimCreator.cpp (property svn:keywords), Revision 1794 by gezelter, Thu Sep 6 19:44:06 2012 UTC

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

Diff Legend

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