Commit 032be0c6 authored by hrchilds's avatar hrchilds

Workaround bug in legacy Nek files where time and cycle are concatenated.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13560 18c085ea-50e0-402c-830e-de6fd14e8384
parent 024b9d48
......@@ -2150,6 +2150,11 @@ avtNek5000FileFormat::GetFileName(int rawTimestep, int pardir, char *outFileName
// Hank Childs, Wed May 12 10:53:33 PDT 2010
// Adapt time setting for Nek files that are part of .visit files.
//
// Hank Childs, Mon Jan 17 12:03:57 PST 2011
// Add support for case where there is non-parallel, binary Nek files
// with a new mesh at every time slice, and a bug where time and cycle
// get combined.
//
// ****************************************************************************
void
......@@ -2190,7 +2195,10 @@ avtNek5000FileFormat::UpdateCyclesAndTimes()
if (!bParFormat)
{
f >> dummy >> dummy >> dummy >> dummy >> t >> c >> v; //skip #blocks and block size
std::string tString, cString;
f >> dummy >> dummy >> dummy >> dummy >> tString >> cString >> v; //skip #blocks and block size
t = atof(tString.c_str());
c = atoi(cString.c_str());
}
else
{
......@@ -2223,6 +2231,12 @@ avtNek5000FileFormat::UpdateCyclesAndTimes()
// cycle number will be X Y
if (v.find("X") != std::string::npos)
iTimestepsWithMesh[curTimestep] = true;
// Nek has a bug where the time and cycle sometimes run together (e.g. 2.52000E+0110110 for
// time 25.2, cycle 10110). If that happens, then v will be Y
if (v.find("Y") != std::string::npos)
iTimestepsWithMesh[curTimestep] = true;
delete[] meshfilename;
readTimeInfoFor[curTimestep] = true;
}
......
......@@ -56,6 +56,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>VisIt can now read many GMV files.</li>
<li>The MFIX reader was re-written so that it supports multiple domains and ghost zones and scales well.</li>
<li>The Xdmf reader was modified so that the GUI displays a single grid, when the grid consists of a collection of grids, rather than all the individual grids in the collection.</li>
<li>The Nek5000 reader can now work around the bug in legacy Nek files where the time and cycle are concatenated. This bug only affected binary, non-parallel files with a new mesh at every time slice.</li>
<li></li>
</ul>
......@@ -122,7 +123,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>xmledit, xml2info and xml2avt all now support expression-creating-operators.</li>
<li>The avtGradientExpression module was re-factored so that other modules can access these gradients without creating a mini-pipeline.</li>
<li>The data diretory can now be built on Windows.</li>
<li>VISIT_BOXLIB2D_DIR and VISIT_BOXLIB3D_DIR were replaced with VISIT_BOXLIB_DIR. In order to continue being able to build the BoxLib reader you must upgrad to the new BoxLib library and update your config site file. If you don't do this the build system will silently fail to build the BoxLib reader.</li>
<li>VISIT_BOXLIB2D_DIR and VISIT_BOXLIB3D_DIR were replaced with VISIT_BOXLIB_DIR. In order to continue being able to build the BoxLib reader you must upgrade to the new BoxLib library and update your config site file. If you don't do this the build system will silently fail to build the BoxLib reader.</li>
<li></li>
</ul>
......
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