[cig-commits] r7293 - short/3D/PyLith/trunk/libsrc/meshio
brad at geodynamics.org
brad at geodynamics.org
Mon Jun 18 17:09:45 PDT 2007
Author: brad
Date: 2007-06-18 17:09:45 -0700 (Mon, 18 Jun 2007)
New Revision: 7293
Modified:
short/3D/PyLith/trunk/libsrc/meshio/GMVFileAscii.cc
short/3D/PyLith/trunk/libsrc/meshio/GMVFileBinary.cc
short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc
short/3D/PyLith/trunk/libsrc/meshio/PsetFileAscii.cc
short/3D/PyLith/trunk/libsrc/meshio/PsetFileBinary.cc
Log:
Added 'here' markers to journal info calls.
Modified: short/3D/PyLith/trunk/libsrc/meshio/GMVFileAscii.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/GMVFileAscii.cc 2007-06-18 23:34:54 UTC (rev 7292)
+++ short/3D/PyLith/trunk/libsrc/meshio/GMVFileAscii.cc 2007-06-19 00:09:45 UTC (rev 7293)
@@ -72,7 +72,8 @@
throw std::runtime_error(msg.str());
} // if
- info << "Reading ASCII GMV file '" << _filename << "'." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading ASCII GMV file '" << _filename << "'." << journal::endl;
_readHeader(fin);
@@ -152,7 +153,8 @@
journal::info_t info("gmvfile");
fin >> *numVertices;
- info << "Reading " << *numVertices << " nodes." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading " << *numVertices << " nodes." << journal::endl;
coordinates->resize(*numVertices * (*spaceDim));
// NOTE: Order of loops is different than what we usually have
@@ -160,7 +162,8 @@
for (int iVertex=0; iVertex < *numVertices; ++iVertex)
fin >> (*coordinates)[iVertex*(*spaceDim)+iDim];
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // readVertices
#include <iostream>
@@ -181,7 +184,8 @@
fin >> *numCells;
std::string cellString = "";
- info << "Reading " << numCells << " cells." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading " << numCells << " cells." << journal::endl;
for (int iCell=0; iCell < *numCells; ++iCell) {
std::string cellStringCur;
int numCornersCur = 0;
@@ -209,7 +213,8 @@
*cells -= 1; // use zero base
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // readCells
// ----------------------------------------------------------------------
@@ -220,7 +225,8 @@
{ // _readVariables
journal::info_t info("gmvfile");
- info << "Reading variables..." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading variables..." << journal::endl;
std::string varName;
fin >> varName;
@@ -241,7 +247,8 @@
fin >> varName;
} // while
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _readVariables
// ----------------------------------------------------------------------
@@ -252,7 +259,8 @@
{ // _readFlags
journal::info_t info("gmvfile");
- info << "Reading flags..." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading flags..." << journal::endl;
std::string varName;
fin >> varName;
@@ -276,7 +284,8 @@
fin >> varName;
} // while
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _readFlags
// ----------------------------------------------------------------------
@@ -289,7 +298,8 @@
assert(0 != materialIds);
journal::info_t info("gmvfile");
- info << "Reading materials..." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading materials..." << journal::endl;
int numMaterials = 0;
int dataType = 0;
@@ -309,7 +319,8 @@
fin >> materials[iVertex];
} // else
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _readMaterials
Modified: short/3D/PyLith/trunk/libsrc/meshio/GMVFileBinary.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/GMVFileBinary.cc 2007-06-18 23:34:54 UTC (rev 7292)
+++ short/3D/PyLith/trunk/libsrc/meshio/GMVFileBinary.cc 2007-06-19 00:09:45 UTC (rev 7293)
@@ -76,7 +76,8 @@
throw std::runtime_error(msg.str());
} // if
- info << "Reading binary GMV file '" << _filename << "'." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading binary GMV file '" << _filename << "'." << journal::endl;
_readHeader(fin);
@@ -160,7 +161,8 @@
if (_flipEndian)
BinaryIO::swapByteOrder((char*) numVertices, 1, sizeof(int));
assert(*numVertices > 0);
- info << "Reading " << *numVertices << " nodes." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading " << *numVertices << " nodes." << journal::endl;
const int size = (*numVertices) * (*spaceDim);
float_array buffer(size);
@@ -175,7 +177,8 @@
for (int iVertex=0; iVertex < *numVertices; ++iVertex)
(*coordinates)[iVertex*(*spaceDim)+iDim] = buffer[i++];
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _readVertices
// ----------------------------------------------------------------------
@@ -194,7 +197,8 @@
fin.read((char*) numCells, sizeof(int));
if (_flipEndian)
BinaryIO::swapByteOrder((char*) numCells, 1, sizeof(int));
- info << "Reading " << *numCells << " cells." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading " << *numCells << " cells." << journal::endl;
std::string cellString = "";
for (int iCell=0; iCell < *numCells; ++iCell) {
const int stringLen = 8;
@@ -229,7 +233,8 @@
*cells -= 1; // use zero base
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _readCells
// ----------------------------------------------------------------------
@@ -239,7 +244,8 @@
const int numCells)
{ // _readVariables
journal::info_t info("gmvfile");
- info << "Reading variables..." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading variables..." << journal::endl;
const int varNameLen = 8;
std::string varName = BinaryIO::readString(fin, varNameLen);
@@ -258,7 +264,8 @@
varName = BinaryIO::readString(fin, varNameLen);
} // while
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _readVariables
// ----------------------------------------------------------------------
@@ -268,7 +275,8 @@
const int numCells)
{ // _readFlags
journal::info_t info("gmvfile");
- info << "Reading flags..." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading flags..." << journal::endl;
const int varNameLen = 8;
std::string varName = BinaryIO::readString(fin, varNameLen);
@@ -295,7 +303,8 @@
varName = BinaryIO::readString(fin, varNameLen);
} // while
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _readFlags
// ----------------------------------------------------------------------
@@ -308,7 +317,8 @@
assert(0 != materialIds);
journal::info_t info("gmvfile");
- info << "Reading materials..." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading materials..." << journal::endl;
int numMaterials = 0;
fin.read((char*) &numMaterials, sizeof(int));
@@ -335,7 +345,8 @@
fin.read((char*) &buffer[0], sizeof(int)*numVertices);
} // else
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _readMaterials
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc 2007-06-18 23:34:54 UTC (rev 7292)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc 2007-06-19 00:09:45 UTC (rev 7293)
@@ -122,7 +122,8 @@
if (0 == num_nodes)
throw std::runtime_error("Could not get dimension 'num_nodes'.");
*numVertices = num_nodes->size();
- info << "Reading " << *numVertices << " vertices." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading " << *numVertices << " vertices." << journal::endl;
NcVar* coord = ncfile.get_var("coord");
if (0 == coord)
@@ -177,7 +178,8 @@
throw std::runtime_error("Could not get dimension 'num_el_blk'.");
const int numMaterials = num_el_blk->size();
- info << "Reading " << numCells << " cells in " << numMaterials
+ info << journal::at(__HERE__)
+ << "Reading " << *numCells << " cells in " << numMaterials
<< " blocks." << journal::endl;
NcVar* eb_prop1 = ncfile.get_var("eb_prop1");
@@ -246,7 +248,8 @@
if (0 == num_node_sets)
throw std::runtime_error("Could not get dimension 'num_node_sets'.");
const int numGroups = num_node_sets->size();
- info << "Found " << numGroups << " node sets." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Found " << numGroups << " node sets." << journal::endl;
NcVar* ns_prop1 = ncfile.get_var("ns_prop1");
if (0 == ns_prop1)
@@ -265,7 +268,8 @@
if (0 == node_ns)
throw std::runtime_error("Could not get node set.");
const int size = node_ns->num_vals();
- info << "Reading node set " << ids[iGroup] << " with "
+ info << journal::at(__HERE__)
+ << "Reading node set " << ids[iGroup] << " with "
<< size << " nodes." << journal::endl;
points.resize(size);
Modified: short/3D/PyLith/trunk/libsrc/meshio/PsetFileAscii.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/PsetFileAscii.cc 2007-06-18 23:34:54 UTC (rev 7292)
+++ short/3D/PyLith/trunk/libsrc/meshio/PsetFileAscii.cc 2007-06-19 00:09:45 UTC (rev 7293)
@@ -56,7 +56,8 @@
throw std::runtime_error(msg.str());
} // if
- info << "Reading ASCII Pset file '" << _filename << "'." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading ASCII Pset file '" << _filename << "'." << journal::endl;
_readHeader(fin);
@@ -66,7 +67,8 @@
groups->resize(numGroups);
// Read groups
- info << "Reading " << numGroups << " point sets from file." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading " << numGroups << " point sets from file." << journal::endl;
for (int iGroup=0; iGroup < numGroups; ++iGroup)
_readPset(fin, &(*groups)[iGroup]);
} // read
@@ -87,7 +89,8 @@
throw std::runtime_error(msg.str());
} // if
- info << "Writing ASCII Pset file '" << _filename << "'." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Writing ASCII Pset file '" << _filename << "'." << journal::endl;
_writeHeader(fout);
@@ -96,7 +99,8 @@
fout << std::setw(4) << numGroups << std::endl;
// Write groups
- info << "Writing " << numGroups << " point sets to file." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Writing " << numGroups << " point sets to file." << journal::endl;
for (int iGroup=0; iGroup < numGroups; ++iGroup)
_writePset(fout, groups[iGroup]);
} // write
@@ -136,7 +140,8 @@
int size = 0;
fin >> group->name >> group->id >> size;
- info << "Reading point set '" << group->name << "' with " << size
+ info << journal::at(__HERE__)
+ << "Reading point set '" << group->name << "' with " << size
<< " points." << journal::endl;
group->points.resize(size);
@@ -145,7 +150,8 @@
group->points -= 1; // use zero base
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _readPset
// ----------------------------------------------------------------------
@@ -156,7 +162,8 @@
journal::info_t info("psetfile");
const int size = group.points.size();
- info << "Writing point set '" << group.name << "' with " << size
+ info << journal::at(__HERE__)
+ << "Writing point set '" << group.name << "' with " << size
<< " points." << journal::endl;
fout << group.name << " " << group.id << " " << size << std::endl;
@@ -170,7 +177,8 @@
} // if
} // for
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _writePset
Modified: short/3D/PyLith/trunk/libsrc/meshio/PsetFileBinary.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/PsetFileBinary.cc 2007-06-18 23:34:54 UTC (rev 7292)
+++ short/3D/PyLith/trunk/libsrc/meshio/PsetFileBinary.cc 2007-06-19 00:09:45 UTC (rev 7293)
@@ -60,7 +60,8 @@
throw std::runtime_error(msg.str());
} // if
- info << "Reading binary Pset file '" << _filename << "'." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading binary Pset file '" << _filename << "'." << journal::endl;
_readHeader(fin);
@@ -74,7 +75,8 @@
std::string extra = BinaryIO::readString(fin, 8);
// Read groups
- info << "Reading " << numGroups << " point sets from file." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Reading " << numGroups << " point sets from file." << journal::endl;
for (int iGroup=0; iGroup < numGroups; ++iGroup)
_readPset(fin, &(*groups)[iGroup]);
} // read
@@ -95,7 +97,8 @@
throw std::runtime_error(msg.str());
} // if
- info << "Writing binary Pset file '" << _filename << "'." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Writing binary Pset file '" << _filename << "'." << journal::endl;
_writeHeader(fout);
@@ -106,7 +109,8 @@
fout.write((char*) &numGroups, sizeof(numGroups));
// Write groups
- info << "Writing " << numGroups << " point sets to file." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Writing " << numGroups << " point sets to file." << journal::endl;
for (int iGroup=0; iGroup < numGroups; ++iGroup)
_writePset(fout, groups[iGroup]);
} // write
@@ -158,7 +162,8 @@
if (_flipEndian)
BinaryIO::swapByteOrder((char*) &size, 1, sizeof(size));
assert(size >= 0);
- info << "Reading point set '" << group->name << "' with " << size
+ info << journal::at(__HERE__)
+ << "Reading point set '" << group->name << "' with " << size
<< " points." << journal::endl;
group->points.resize(size);
@@ -169,7 +174,8 @@
group->points -= 1; // use zero base
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _readPset
// ----------------------------------------------------------------------
@@ -179,7 +185,8 @@
{ // _writePset
journal::info_t info("psetfile");
const int size = group.points.size();
- info << "Writing point set '" << group.name << "' with " << size
+ info << journal::at(__HERE__)
+ << "Writing point set '" << group.name << "' with " << size
<< " points." << journal::endl;
fout.write((char*) group.name.c_str(), 32);
@@ -200,7 +207,8 @@
BinaryIO::swapByteOrder((char*) &pointsIO[0], size, sizeof(int));
fout.write((char*) &pointsIO[0], size*sizeof(int));
- info << "Done." << journal::endl;
+ info << journal::at(__HERE__)
+ << "Done." << journal::endl;
} // _writePset
More information about the cig-commits
mailing list