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

Comparing trunk/src/io/RestReader.cpp (file contents):
Revision 996 by chrisfen, Wed Jun 28 14:35:14 2006 UTC vs.
Revision 1241 by gezelter, Fri Apr 25 15:14:47 2008 UTC

# Line 89 | Line 89 | namespace oopse {
89      }
90      strcpy( checkPointMsg,
91              "File \"idealCrystal.in\" opened successfully for reading." );
92 <    MPIcheckPoint();
92 >    errorCheckPoint();
93   #endif
94  
95      return;  
# Line 107 | Line 107 | namespace oopse {
107      }
108      strcpy( checkPointMsg,
109              "File idealCrystal.in (and .zang0 if present) closed successfully." );
110 <    MPIcheckPoint();
110 >    errorCheckPoint();
111   #endif
112      
113      return;
# Line 543 | Line 543 | namespace oopse {
543      }
544      
545      strcpy( checkPointMsg, "zAngle file opened successfully for reading." );
546 <    MPIcheckPoint();
546 >    errorCheckPoint();
547   #endif
548      
549   #ifndef IS_MPI
# Line 671 | Line 671 | namespace oopse {
671            for (integrableObject = mol->beginIntegrableObject(ii);
672                 integrableObject != NULL;
673                 integrableObject = mol->nextIntegrableObject(ii)){
674 <            intObjIndex = integrableObject->getGlobalIndex();
674 >            intObjIndex = integrableObject->getGlobalIntegrableObjectIndex();
675              integrableObject->setZangle(tempZangs[intObjIndex]);
676            }    
677            
# Line 719 | Line 719 | namespace oopse {
719            for (integrableObject = mol->beginIntegrableObject(ii);
720                 integrableObject != NULL;
721                 integrableObject = mol->nextIntegrableObject(ii)){
722 <            intObjIndexTransfer = integrableObject->getGlobalIndex();
722 >            intObjIndexTransfer = integrableObject->getGlobalIntegrableObjectIndex();
723              // send the global index of the integrableObject
724              MPI_Send(&intObjIndexTransfer, 1, MPI_INT, 0,
725                       TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
# Line 741 | Line 741 | namespace oopse {
741      StuntDouble* integrableObject;
742      SimInfo::MoleculeIterator mi;
743      Molecule::IntegrableObjectIterator ii;
744 <    
744 >
745   #ifndef IS_MPI
746      // set all zAngles to 0.0
747      for (mol = info_->beginMolecule(mi); mol != NULL;

Diff Legend

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