Commit 085526dd authored by js9's avatar js9
Browse files

merge from 2.1RC: allow "ELEMENTS" and "ZONES" in Tecplot ZONE records.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12627 18c085ea-50e0-402c-830e-de6fd14e8384
parent 714d1889
......@@ -851,6 +851,9 @@ avtTecplotFileFormat::ParsePOINT(int numI, int numJ, int numK)
// Allow the "$" which seems to appear alone on the last line of some
// ASCII tecplot files.
//
// Jeremy Meredith, Mon Sep 27 16:03:56 EDT 2010
// Accept "NODES" and "ELEMENTS" as aliases for "N" and "E" in ZONE records.
//
// ****************************************************************************
void
......@@ -1051,7 +1054,9 @@ avtTecplotFileFormat::ReadFile()
tok != "J" &&
tok != "K" &&
tok != "N" &&
tok != "NODES" &&
tok != "E" &&
tok != "ELEMENTS" &&
tok != "ET" &&
tok != "F" &&
tok != "ZONETYPE" &&
......@@ -1082,11 +1087,11 @@ avtTecplotFileFormat::ReadFile()
{
numK = atoi(GetNextToken().c_str());
}
else if (tok == "N")
else if (tok == "N" || tok == "NODES")
{
numNodes = atoi(GetNextToken().c_str());
}
else if (tok == "E")
else if (tok == "E" || tok == "ELEMENTS")
{
numElements = atoi(GetNextToken().c_str());
}
......
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