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

Comparing trunk/src/io/DumpWriter.cpp (file contents):
Revision 791 by chuckv, Tue Dec 6 17:52:45 2005 UTC vs.
Revision 965 by tim, Fri May 19 20:45:55 2006 UTC

# Line 202 | Line 202 | namespace oopse {
202  
203    void DumpWriter::writeCommentLine(std::ostream& os, Snapshot* s) {
204  
205 <    double currentTime;
205 >    RealType currentTime;
206      Mat3x3d hmat;
207 <    double chi;
208 <    double integralOfChiDt;
207 >    RealType chi;
208 >    RealType integralOfChiDt;
209      Mat3x3d eta;
210      
211      currentTime = s->getTime();
# Line 221 | Line 221 | namespace oopse {
221  
222      //write out additional parameters, such as chi and eta
223  
224 <    os << chi << "\t" << integralOfChiDt << "\t;";
224 >    os << chi << "\t" << integralOfChiDt << ";\t";
225  
226      os << eta(0, 0) << "\t" << eta(1, 0) << "\t" << eta(2, 0) << ";\t"
227         << eta(0, 1) << "\t" << eta(1, 1) << "\t" << eta(2, 1) << ";\t"
# Line 347 | Line 347 | namespace oopse {
347      int myPotato;
348      int nProc;
349      int which_node;
350 <    double atomData[19];
350 >    RealType atomData[19];
351      int isDirectional;
352      char MPIatomTypeString[MINIBUFFERSIZE];
353      int msgLen; // the length of message actually recieved at master nodes
# Line 422 | Line 422 | namespace oopse {
422  
423              myPotato++;
424  
425 <            MPI_Recv(atomData, 19, MPI_DOUBLE, which_node, myPotato,
425 >            MPI_Recv(atomData, 19, MPI_REALTYPE, which_node, myPotato,
426                       MPI_COMM_WORLD, &istatus);
427              myPotato++;
428  
429 <            MPI_Get_count(&istatus, MPI_DOUBLE, &msgLen);
429 >            MPI_Get_count(&istatus, MPI_REALTYPE, &msgLen);
430  
431              if (msgLen == 13 || msgLen == 19)
432                isDirectional = 1;
# Line 606 | Line 606 | namespace oopse {
606                }
607              }
608  
609 <            sprintf(writeLine, "\n");
610 <            os << writeLine;
609 >            os << writeLine << "\n";
610  
611            } //end for(iter = integrableObject.begin())
612          }
# Line 726 | Line 725 | namespace oopse {
725              myPotato++;
726  
727              if (isDirectional && needForceVector_) {
728 <              MPI_Send(atomData, 19, MPI_DOUBLE, 0, myPotato,
728 >              MPI_Send(atomData, 19, MPI_REALTYPE, 0, myPotato,
729                         MPI_COMM_WORLD);
730              } else if (isDirectional) {
731 <              MPI_Send(atomData, 13, MPI_DOUBLE, 0, myPotato,
731 >              MPI_Send(atomData, 13, MPI_REALTYPE, 0, myPotato,
732                         MPI_COMM_WORLD);
733              } else if (needForceVector_) {
734 <              MPI_Send(atomData, 12, MPI_DOUBLE, 0, myPotato,
734 >              MPI_Send(atomData, 12, MPI_REALTYPE, 0, myPotato,
735                         MPI_COMM_WORLD);
736              } else {
737 <              MPI_Send(atomData, 6, MPI_DOUBLE, 0, myPotato,
737 >              MPI_Send(atomData, 6, MPI_REALTYPE, 0, myPotato,
738                         MPI_COMM_WORLD);
739              }
740  

Diff Legend

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