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 1535 by gezelter, Fri Dec 31 18:31:56 2010 UTC vs.
Revision 1577 by gezelter, Wed Jun 8 20:26:56 2011 UTC

# Line 385 | Line 385 | namespace OpenMD {
385      
386      //create the molecules
387      createMolecules(info);
388    
388      
389      //allocate memory for DataStorage(circular reference, need to
390      //break it)
# Line 412 | Line 411 | namespace OpenMD {
411      
412      if (loadInitCoords)
413        loadCoordinates(info, mdFileName);    
415    
414      return info;
415    }
416    
# Line 720 | Line 718 | namespace OpenMD {
718          
719        }      
720      }
721 <    
721 >  
722   #ifdef IS_MPI    
723      // Since the globalGroupMembership has been zero filled and we've only
724      // poked values into the atoms we know, we can do an Allreduce
# Line 797 | Line 795 | namespace OpenMD {
795    
796    void SimCreator::loadCoordinates(SimInfo* info, const std::string& mdFileName) {
797      Globals* simParams;
798 +
799      simParams = info->getSimParams();
800      
802    
801      DumpReader reader(info, mdFileName);
802      int nframes = reader.getNFrames();
803 <    
803 >
804      if (nframes > 0) {
805        reader.readFrame(nframes - 1);
806      } else {
# Line 813 | Line 811 | namespace OpenMD {
811        painCave.isFatal = 1;
812        simError();
813      }
816    
814      //copy the current snapshot to previous snapshot
815      info->getSnapshotManager()->advance();
816    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines