Commit b73c64c2 authored by js9's avatar js9
Browse files

merge from 2.1RC: add manual space between vals in Tecplot writer output


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12631 18c085ea-50e0-402c-830e-de6fd14e8384
parent ecb5ab04
......@@ -322,6 +322,10 @@ avtTecplotWriter::CloseFile(void)
// Brad Whitlock, Wed Sep 2 09:59:41 PDT 2009
// I made the variables be written here instead of in WriteHeaders.
//
// Jeremy Meredith, Tue Sep 28 10:30:33 EDT 2010
// Added at least one character of manual whitespace in between values.
// Not sure how, but a problem was reported where none showed up.
//
// ****************************************************************************
void
......@@ -359,6 +363,8 @@ avtTecplotWriter::WriteCurvilinearMesh(vtkStructuredGrid *sg, int chunk)
file << vtk_ptr[3*i + d];
if ((i+1)%10==0 || i==npts-1)
file <<"\n";
else
file <<" ";
}
file << endl;
}
......@@ -380,6 +386,9 @@ avtTecplotWriter::WriteCurvilinearMesh(vtkStructuredGrid *sg, int chunk)
// Creation: Wed Sep 2 10:02:07 PDT 2009
//
// Modifications:
// Jeremy Meredith, Tue Sep 28 10:30:33 EDT 2010
// Added at least one character of manual whitespace in between values.
// Not sure how, but a problem was reported where none showed up.
//
// ****************************************************************************
......@@ -425,6 +434,8 @@ avtTecplotWriter::WriteRectilinearMesh(vtkRectilinearGrid *rgrid, int chunk)
file << pt[d];
if ((id+1)%10==0 || id==npts_1)
file <<"\n";
else
file <<" ";
}
}
}
......@@ -451,6 +462,10 @@ avtTecplotWriter::WriteRectilinearMesh(vtkRectilinearGrid *rgrid, int chunk)
// I made the variables get written here instead of in WriteHeaders. I also
// added support for 2D.
//
// Jeremy Meredith, Tue Sep 28 10:30:33 EDT 2010
// Added at least one character of manual whitespace in between values.
// Not sure how, but a problem was reported where none showed up.
//
// ****************************************************************************
void
......@@ -670,7 +685,7 @@ avtTecplotWriter::WriteUnstructuredMesh(vtkUnstructuredGrid *ug, int chunk)
for (int i = 0 ; i < 4 ; i++)
{
file.width(INT_COLUMN_WIDTH);
file << ids[subids[t*4 + i]]+1;
file << ids[subids[t*4 + i]]+1 << " ";
}
file << endl;
}
......@@ -680,7 +695,7 @@ avtTecplotWriter::WriteUnstructuredMesh(vtkUnstructuredGrid *ug, int chunk)
for (int i = 0 ; i < 3 ; i++)
{
file.width(INT_COLUMN_WIDTH);
file << ids[subids[t*3 + i]]+1;
file << ids[subids[t*3 + i]]+1 << " ";
}
file << endl;
}
......@@ -703,7 +718,7 @@ avtTecplotWriter::WriteUnstructuredMesh(vtkUnstructuredGrid *ug, int chunk)
for (int j = 0 ; j < cell->GetNumberOfPoints() ; j++)
{
file.width(INT_COLUMN_WIDTH);
file << cell->GetPointId(j)+1;
file << cell->GetPointId(j)+1 << " ";
}
file << endl;
}
......@@ -725,6 +740,9 @@ avtTecplotWriter::WriteUnstructuredMesh(vtkUnstructuredGrid *ug, int chunk)
// Creation: Wed Sep 2 14:22:26 PDT 2009
//
// Modifications:
// Jeremy Meredith, Tue Sep 28 10:30:33 EDT 2010
// Added at least one character of manual whitespace in between values.
// Not sure how, but a problem was reported where none showed up.
//
// ****************************************************************************
......@@ -797,13 +815,13 @@ avtTecplotWriter::WritePolyData(vtkPolyData *pd, int chunk)
for(int i = 0; i < 3; ++i)
{
file.width(INT_COLUMN_WIDTH);
file << pts[q2t[0][i]]+1;
file << pts[q2t[0][i]]+1 << " ";
}
file << endl;
for(int i = 0; i < 3; ++i)
{
file.width(INT_COLUMN_WIDTH);
file << pts[q2t[1][i]]+1;
file << pts[q2t[1][i]]+1 << " ";
}
file << endl;
}
......@@ -812,7 +830,7 @@ avtTecplotWriter::WritePolyData(vtkPolyData *pd, int chunk)
for(int i = 0; i < npts; ++i)
{
file.width(INT_COLUMN_WIDTH);
file << pts[i]+1;
file << pts[i]+1 << " ";
}
file << endl;
}
......@@ -836,6 +854,10 @@ avtTecplotWriter::WritePolyData(vtkPolyData *pd, int chunk)
// Brad Whitlock, Wed Sep 2 10:04:15 PDT 2009
// I changed how the numbers get formatted.
//
// Jeremy Meredith, Tue Sep 28 10:30:33 EDT 2010
// Added at least one character of manual whitespace in between values.
// Not sure how, but a problem was reported where none showed up.
//
// ****************************************************************************
void
......@@ -870,6 +892,8 @@ avtTecplotWriter::WriteDataArrays(vtkDataSet *ds1)
file << ptr[i];
if ((i+1)%10==0 || i==npts-1)
file <<"\n";
else
file <<" ";
}
file << endl;
}
......@@ -889,6 +913,8 @@ avtTecplotWriter::WriteDataArrays(vtkDataSet *ds1)
file << ptr[i];
if ((i+1)%10==0 || i==npts-1)
file <<"\n";
else
file <<" ";
}
file << endl;
}
......@@ -910,6 +936,9 @@ avtTecplotWriter::WriteDataArrays(vtkDataSet *ds1)
// Creation: Wed Sep 2 14:25:38 PDT 2009
//
// Modifications:
// Jeremy Meredith, Tue Sep 28 10:30:33 EDT 2010
// Added at least one character of manual whitespace in between values.
// Not sure how, but a problem was reported where none showed up.
//
// ****************************************************************************
......@@ -929,6 +958,8 @@ avtTecplotWriter::WritePoints(vtkPoints *pts, int dim)
file << *vtk_ptr;
if ((i+1)%10==0 || i==npts-1)
file <<"\n";
else
file <<" ";
}
file << endl;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment