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

Comparing trunk/src/io/RestWriter.cpp (file contents):
Revision 417 by chrisfen, Thu Mar 10 15:10:24 2005 UTC vs.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 50 | Line 50 | namespace oopse {
50  
51   namespace oopse {
52    RestWriter::RestWriter(SimInfo* info) :
53 <  info_(info) {
53 >    info_(info) {
54      
55 <    //we use master - slave mode, only master node writes to disk
56 <    outName = info_->getRestFileName();
57 <  }
55 >      //we use master - slave mode, only master node writes to disk
56 >      outName = info_->getRestFileName();
57 >    }
58    
59    RestWriter::~RestWriter() {}
60    
# Line 77 | Line 77 | namespace oopse {
77        if( !finalOut ){
78          sprintf( painCave.errMsg,
79                   "Could not open \"%s\" for zAngle output.\n",
80 <                 outName );
80 >                 outName.c_str() );
81          painCave.isFatal = 1;
82          simError();
83        }
# Line 123 | Line 123 | namespace oopse {
123      
124      MPI_Status ierr;
125      int intObIndex;
126 <    double zAngle;
127 <    
126 >    RealType zAngle;
127 >  
128      if (masterNode == 0) {
129 <      std::map<int, double> zAngData;
129 >      std::map<int, RealType> zAngData;
130        for(int i = 0 ; i < nproc; ++i) {
131          if (i == masterNode) {
132            for (mol = info_->beginMolecule(mi); mol != NULL;
# Line 138 | Line 138 | namespace oopse {
138                
139                intObIndex = integrableObject->getGlobalIndex() ;
140                zAngle = integrableObject->getZangle();
141 <              zAngData.insert(pair<int, double>(intObIndex, zAngle));
141 >              zAngData.insert(std::pair<int, RealType>(intObIndex, zAngle));
142              }      
143            }
144            
145          } else {
146            for(int k = 0; k < nIntObjectsInProc[i]; ++k) {
147              MPI_Recv(&intObIndex, 1, MPI_INT, i, 0, MPI_COMM_WORLD,&ierr);
148 <            MPI_Recv(&zAngle, 1, MPI_DOUBLE, i, 0, MPI_COMM_WORLD,&ierr);
149 <            zAngData.insert(pair<int, double>(intObIndex, zAngle));
148 >            MPI_Recv(&zAngle, 1, MPI_REALTYPE, i, 0, MPI_COMM_WORLD,&ierr);
149 >            zAngData.insert(std::pair<int, RealType>(intObIndex, zAngle));
150            }
151          }
152          
# Line 156 | Line 156 | namespace oopse {
156          << info_->getSnapshotManager()->getCurrentSnapshot()->getTime()
157          << " : omega values at this time\n";
158        
159 <      std::map<int, double>::iterator l;
159 >      std::map<int, RealType>::iterator l;
160        for (l = zAngData.begin(); l != zAngData.end(); ++l) {
161          finalOut << l->second << "\n";
162        }
# Line 172 | Line 172 | namespace oopse {
172            intObIndex = integrableObject->getGlobalIndex();            
173            zAngle = integrableObject->getZangle();
174            MPI_Send(&intObIndex, 1, MPI_INT, masterNode, 0, MPI_COMM_WORLD);
175 <          MPI_Send(&zAngle, 1, MPI_DOUBLE, masterNode, 0, MPI_COMM_WORLD);
175 >          MPI_Send(&zAngle, 1, MPI_REALTYPE, masterNode, 0, MPI_COMM_WORLD);
176          }
177        }
178      }

Diff Legend

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