--- trunk/src/io/RestWriter.cpp 2005/03/10 15:10:24 417 +++ trunk/src/io/RestWriter.cpp 2005/04/15 22:04:00 507 @@ -1,4 +1,4 @@ - /* +/* * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. * * The University of Notre Dame grants you ("Licensee") a @@ -50,11 +50,11 @@ namespace oopse { namespace oopse { RestWriter::RestWriter(SimInfo* info) : - info_(info) { + info_(info) { - //we use master - slave mode, only master node writes to disk - outName = info_->getRestFileName(); - } + //we use master - slave mode, only master node writes to disk + outName = info_->getRestFileName(); + } RestWriter::~RestWriter() {} @@ -77,7 +77,7 @@ namespace oopse { if( !finalOut ){ sprintf( painCave.errMsg, "Could not open \"%s\" for zAngle output.\n", - outName ); + outName.c_str() ); painCave.isFatal = 1; simError(); } @@ -124,7 +124,7 @@ namespace oopse { MPI_Status ierr; int intObIndex; double zAngle; - + if (masterNode == 0) { std::map zAngData; for(int i = 0 ; i < nproc; ++i) { @@ -138,7 +138,7 @@ namespace oopse { intObIndex = integrableObject->getGlobalIndex() ; zAngle = integrableObject->getZangle(); - zAngData.insert(pair(intObIndex, zAngle)); + zAngData.insert(std::pair(intObIndex, zAngle)); } } @@ -146,7 +146,7 @@ namespace oopse { for(int k = 0; k < nIntObjectsInProc[i]; ++k) { MPI_Recv(&intObIndex, 1, MPI_INT, i, 0, MPI_COMM_WORLD,&ierr); MPI_Recv(&zAngle, 1, MPI_DOUBLE, i, 0, MPI_COMM_WORLD,&ierr); - zAngData.insert(pair(intObIndex, zAngle)); + zAngData.insert(std::pair(intObIndex, zAngle)); } }