ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/SimCreator.cpp
(Generate patch)

Comparing branches/development/src/brains/SimCreator.cpp (file contents):
Revision 1798 by gezelter, Thu Sep 13 14:10:11 2012 UTC vs.
Revision 1838 by gezelter, Tue Jan 22 16:20:11 2013 UTC

# Line 44 | Line 44
44   * @file SimCreator.cpp
45   * @author tlin
46   * @date 11/03/2004
47 – * @time 13:51am
47   * @version 1.0
48   */
49   #include <exception>
# Line 100 | Line 99 | namespace OpenMD {
99   #ifdef IS_MPI            
100        int streamSize;
101        const int masterNode = 0;
102 <      int commStatus;
102 >
103        if (worldRank == masterNode) {
104 <        commStatus = MPI_Bcast(&mdFileVersion, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
104 >        MPI::COMM_WORLD.Bcast(&mdFileVersion, 1, MPI::INT, masterNode);
105   #endif                
106          SimplePreprocessor preprocessor;
107          preprocessor.preprocess(rawMetaDataStream, filename, startOfMetaDataBlock, ppStream);
# Line 110 | Line 109 | namespace OpenMD {
109   #ifdef IS_MPI            
110          //brocasting the stream size
111          streamSize = ppStream.str().size() +1;
112 <        commStatus = MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);                  
113 <
114 <        commStatus = MPI_Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())), streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
116 <            
117 <                
112 >        MPI::COMM_WORLD.Bcast(&streamSize, 1, MPI::LONG, masterNode);
113 >        MPI::COMM_WORLD.Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())), streamSize, MPI::CHAR, masterNode);
114 >                          
115        } else {
116 +        MPI::COMM_WORLD.Bcast(&mdFileVersion, 1, MPI::INT, masterNode);
117  
120 –        commStatus = MPI_Bcast(&mdFileVersion, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
121 –
118          //get stream size
119 <        commStatus = MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);  
119 >        MPI::COMM_WORLD.Bcast(&streamSize, 1, MPI::LONG, masterNode);
120  
121          char* buf = new char[streamSize];
122          assert(buf);
123                  
124          //receive file content
125 <        commStatus = MPI_Bcast(buf, streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
125 >        MPI::COMM_WORLD.Bcast(buf, streamSize, MPI::CHAR, masterNode);
126                  
127          ppStream.str(buf);
128          delete [] buf;
133 –
129        }
130   #endif            
131        // Create a scanner that reads from the input stream
# Line 255 | Line 250 | namespace OpenMD {
250      std::string mdRawData;
251      int metaDataBlockStart = -1;
252      int metaDataBlockEnd = -1;
253 <    int i;
253 >    int i, j;
254      streamoff mdOffset;
255      int mdFileVersion;
256  
257 +    // Create a string for embedding the version information in the MetaData
258 +    std::string version;
259 +    version.assign("## Last run using OpenMD Version: ");
260 +    version.append(OPENMD_VERSION_MAJOR);
261 +    version.append(".");
262 +    version.append(OPENMD_VERSION_MINOR);
263  
264 +    std::string svnrev;
265 +    //convert a macro from compiler to a string in c++
266 +    STR_DEFINE(svnrev, SVN_REV );
267 +    version.append(" Revision: ");
268 +    // If there's no SVN revision, just call this the RELEASE revision.
269 +    if (!svnrev.empty()) {
270 +      version.append(svnrev);
271 +    } else {
272 +      version.append("RELEASE");
273 +    }
274 +  
275   #ifdef IS_MPI            
276      const int masterNode = 0;
277      if (worldRank == masterNode) {
# Line 354 | Line 366 | namespace OpenMD {
366  
367        mdRawData.clear();
368  
369 +      bool foundVersion = false;
370 +
371        for (int i = 0; i < metaDataBlockEnd - metaDataBlockStart - 1; ++i) {
372          mdFile_.getline(buffer, bufferSize);
373 <        mdRawData += buffer;
373 >        std::string line = trimLeftCopy(buffer);
374 >        j = CaseInsensitiveFind(line, "## Last run using OpenMD Version");
375 >        if (static_cast<size_t>(j) != string::npos) {
376 >          foundVersion = true;
377 >          mdRawData += version;
378 >        } else {
379 >          mdRawData += buffer;
380 >        }
381          mdRawData += "\n";
382        }
383 <
383 >      
384 >      if (!foundVersion) mdRawData += version + "\n";
385 >      
386        mdFile_.close();
387  
388   #ifdef IS_MPI
# Line 499 | Line 522 | namespace OpenMD {
522      int nTarget;
523      int done;
524      int i;
502 –    int j;
525      int loops;
526      int which_proc;
527      int nProcessors;
# Line 545 | Line 567 | namespace OpenMD {
567        nTarget = (int)(precast + 0.5);
568        
569        for(i = 0; i < nGlobalMols; i++) {
570 +
571          done = 0;
572          loops = 0;
573          
# Line 569 | Line 592 | namespace OpenMD {
592            // and be done with it.
593            
594            if (loops > 100) {
595 +
596              sprintf(painCave.errMsg,
597 <                    "I've tried 100 times to assign molecule %d to a "
598 <                    " processor, but can't find a good spot.\n"
599 <                    "I'm assigning it at random to processor %d.\n",
597 >                    "There have been 100 attempts to assign molecule %d to an\n"
598 >                    "\tunderworked processor, but there's no good place to\n"
599 >                    "\tleave it.  OpenMD is assigning it at random to processor %d.\n",
600                      i, which_proc);
601 <            
601 >          
602              painCave.isFatal = 0;
603 +            painCave.severity = OPENMD_INFO;
604              simError();
605              
606              molToProcMap[i] = which_proc;
# Line 620 | Line 645 | namespace OpenMD {
645        }
646        
647        delete myRandom;
648 <      
648 >
649        // Spray out this nonsense to all other processors:
650        MPI::COMM_WORLD.Bcast(&molToProcMap[0], nGlobalMols, MPI::INT, 0);
651      } else {
652        
653        // Listen to your marching orders from processor 0:
654        MPI::COMM_WORLD.Bcast(&molToProcMap[0], nGlobalMols, MPI::INT, 0);
655 +
656      }
657      
658      info->setMolToProcMap(molToProcMap);
# Line 775 | Line 801 | namespace OpenMD {
801        storageLayout |= DataStorage::dslFlucQForce;
802      }
803  
804 +    info->setStorageLayout(storageLayout);
805 +
806      return storageLayout;
807    }
808  
# Line 792 | Line 820 | namespace OpenMD {
820      int beginRigidBodyIndex;
821      int beginCutoffGroupIndex;
822      int nGlobalAtoms = info->getNGlobalAtoms();
823 +    int nGlobalRigidBodies = info->getNGlobalRigidBodies();
824      
825      beginAtomIndex = 0;
826      //rigidbody's index begins right after atom's
# Line 867 | Line 896 | namespace OpenMD {
896   #endif
897      
898      //fill molMembership
899 <    std::vector<int> globalMolMembership(info->getNGlobalAtoms(), 0);
899 >    std::vector<int> globalMolMembership(info->getNGlobalAtoms() +
900 >                                         info->getNGlobalRigidBodies(), 0);
901      
902 <    for(mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
902 >    for(mol = info->beginMolecule(mi); mol != NULL;
903 >        mol = info->nextMolecule(mi)) {
904        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
905          globalMolMembership[atom->getGlobalIndex()] = mol->getGlobalIndex();
906        }
907 +      for (rb = mol->beginRigidBody(ri); rb != NULL;
908 +           rb = mol->nextRigidBody(ri)) {
909 +        globalMolMembership[rb->getGlobalIndex()] = mol->getGlobalIndex();
910 +      }
911      }
912      
913   #ifdef IS_MPI
914 <    std::vector<int> tmpMolMembership(info->getNGlobalAtoms(), 0);
914 >    std::vector<int> tmpMolMembership(info->getNGlobalAtoms() +
915 >                                      info->getNGlobalRigidBodies(), 0);
916      MPI::COMM_WORLD.Allreduce(&globalMolMembership[0], &tmpMolMembership[0],
917 <                              nGlobalAtoms,
917 >                              nGlobalAtoms + nGlobalRigidBodies,
918                                MPI::INT, MPI::SUM);
919      
920      info->setGlobalMolMembership(tmpMolMembership);
# Line 890 | Line 926 | namespace OpenMD {
926      // here the molecules are listed by their global indices.
927  
928      std::vector<int> nIOPerMol(info->getNGlobalMolecules(), 0);
929 <    for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
929 >    for (mol = info->beginMolecule(mi); mol != NULL;
930 >         mol = info->nextMolecule(mi)) {
931        nIOPerMol[mol->getGlobalIndex()] = mol->getNIntegrableObjects();      
932      }
933      
# Line 911 | Line 948 | namespace OpenMD {
948      }
949      
950      std::vector<StuntDouble*> IOIndexToIntegrableObject(info->getNGlobalIntegrableObjects(), (StuntDouble*)NULL);
951 <    for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
951 >    for (mol = info->beginMolecule(mi); mol != NULL;
952 >         mol = info->nextMolecule(mi)) {
953        int myGlobalIndex = mol->getGlobalIndex();
954        int globalIO = startingIOIndexForMol[myGlobalIndex];
955        for (StuntDouble* sd = mol->beginIntegrableObject(ioi); sd != NULL;
# Line 927 | Line 965 | namespace OpenMD {
965    }
966    
967    void SimCreator::loadCoordinates(SimInfo* info, const std::string& mdFileName) {
930 –    Globals* simParams;
931 –
932 –    simParams = info->getSimParams();
968      
969      DumpReader reader(info, mdFileName);
970      int nframes = reader.getNFrames();
971 <
971 >    
972      if (nframes > 0) {
973        reader.readFrame(nframes - 1);
974      } else {

Diff Legend

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