--- trunk/src/brains/SimCreator.cpp 2006/08/30 18:42:29 1024 +++ trunk/src/brains/SimCreator.cpp 2008/07/14 12:35:58 1277 @@ -145,7 +145,6 @@ namespace oopse { treeParser.initializeASTFactory(factory); treeParser.setASTFactory(&factory); simParams = treeParser.walkTree(parser.getAST()); - } @@ -330,9 +329,8 @@ namespace oopse { Globals* simParams = parseFile(rawMetaDataStream, mdFileName, metaDataBlockStart+1); //create the force field - ForceField * ff = ForceFieldFactory::getInstance() - ->createForceField(simParams->getForceField()); - + ForceField * ff = ForceFieldFactory::getInstance()->createForceField(simParams->getForceField()); + if (ff == NULL) { sprintf(painCave.errMsg, "ForceField Factory can not create %s force field\n", @@ -591,7 +589,7 @@ namespace oopse { info->setMolToProcMap(molToProcMap); sprintf(checkPointMsg, "Successfully divided the molecules among the processors.\n"); - MPIcheckPoint(); + errorCheckPoint(); } #endif @@ -777,12 +775,10 @@ int startingIndex = 0; startingIndex += numIntegrableObjectsPerMol[i]; } - std::cerr << "nGIO = " << info->getNGlobalIntegrableObjects() << "\n"; std::vector IOIndexToIntegrableObject(info->getNGlobalIntegrableObjects(), (StuntDouble*)NULL); for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) { int myGlobalIndex = mol->getGlobalIndex(); int globalIO = startingIOIndexForMol[myGlobalIndex]; - std::cerr << "myGlobalIndex = " << myGlobalIndex << " globalIO = " << globalIO << "\n"; for (StuntDouble* integrableObject = mol->beginIntegrableObject(ioi); integrableObject != NULL; integrableObject = mol->nextIntegrableObject(ioi)) { integrableObject->setGlobalIntegrableObjectIndex(globalIO);