[ViewVC] Diff of: OpenMD/trunk/src/brains/SimCreator.cpp

Comparing trunk/src/brains/SimCreator.cpp (file contents):
Revision 1051 by gezelter, Mon Sep 25 22:08:33 2006 UTC vs.
Revision 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC

#	Line 145 \| Line 145 \| namespace oopse {
145		treeParser.initializeASTFactory(factory);
146		treeParser.setASTFactory(&factory);
147		simParams = treeParser.walkTree(parser.getAST());
148	–
148		}
149
150
#	Line 330 \| Line 329 \| namespace oopse {
329		Globals* simParams = parseFile(rawMetaDataStream, mdFileName, metaDataBlockStart+1);
330
331		//create the force field
332	<	ForceField * ff = ForceFieldFactory::getInstance()
333	<	->createForceField(simParams->getForceField());
335	<
332	>	ForceField * ff = ForceFieldFactory::getInstance()->createForceField(simParams->getForceField());
333	>
334		if (ff == NULL) {
335		sprintf(painCave.errMsg,
336		"ForceField Factory can not create %s force field\n",
#	Line 342 \| Line 340 \| namespace oopse {
340		}
341
342		if (simParams->haveForceFieldFileName()) {
345	–	std::cout<< simParams->getForceFieldFileName() << "\n";
343		ff->setForceFieldFileName(simParams->getForceFieldFileName());
344		}
345
#	Line 592 \| Line 589 \| namespace oopse {
589		info->setMolToProcMap(molToProcMap);
590		sprintf(checkPointMsg,
591		"Successfully divided the molecules among the processors.\n");
592	<	MPIcheckPoint();
592	>	errorCheckPoint();
593		}
594
595		#endif

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