Commit cd085afa authored by hrchilds's avatar hrchilds
Browse files

Merge RC to trunk, picking up memory bloat fix for PlainText

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11490 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5c66fd21
......@@ -157,6 +157,11 @@ avtPlainTextFileFormat::avtPlainTextFileFormat(const char *fn,
// Programmer: Jeremy Meredith
// Creation: January 24, 2008
//
// Modifications:
//
// Hank Childs, Wed May 26 09:05:44 PDT 2010
// Fix memory bloat issue from STL.
//
// ****************************************************************************
void
......@@ -164,6 +169,9 @@ avtPlainTextFileFormat::FreeUpResources(void)
{
variableNames.clear();
data.clear();
std::vector< std::vector<float> > tmp;
data.swap(tmp); // this makes capacity() drop to 0, which is better than
// what clear() does.
fileRead = false;
}
......
......@@ -18,6 +18,7 @@
<li>A bug was fixed where number of passive scalars in legacy Nek files was being misinterpreted.</li>
<li>If a non-compliant Nek file is encountered, VisIt is better at reporting to the user why the file is non-compliant.</li>
<li>It no longer crashes the GUI when you delete the last variable in the Threshold operator's attributes window.</li>
<li>Large, time-varying PlainText files can now be processed with a constant memory footprint.</li>
</ul>
<p><b><font size="4">Enhancements in version 2.0.1</font></b></p>
<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