Commit ca9cecc4 authored by bonnell's avatar bonnell

Fix Nek5000 reader failure when processing config files from pre-2.7 versionso...

Fix Nek5000 reader failure when processing config files from pre-2.7 versionso of visit. Resolves #1684.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22532 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2df9174a
......@@ -279,6 +279,10 @@ using std::vector;
// Hank Childs, Mon Mar 4 18:35:27 PST 2013
// Initialize duplicateData member.
//
// Kathleen Biagas, Thu Dec 19 09:25:29 PST 2013
// Test if read options exist before attemtping to access them.
// Default to the same defaults as stored in the Options file.
//
// ****************************************************************************
avtNek5000FileFormat::avtNek5000FileFormat(const char *filename,
......@@ -298,8 +302,15 @@ avtNek5000FileFormat::avtNek5000FileFormat(const char *filename,
numberOfTimePeriods = 1;
gapBetweenTimePeriods = 0.0;
readOptionToGetAllTimes = atts->GetBool("Read all times and cycles");
duplicateData = atts->GetBool("Duplicate data for particle advection (slower for all other techniques)");
readOptionToGetAllTimes = true;
duplicateData = false;
if (atts)
{
if (atts->FindIndex("Read all times and cycles") >= 0)
readOptionToGetAllTimes = atts->GetBool("Read all times and cycles");
if (atts->FindIndex("Duplicate data for particle advection (slower for all other techniques)") >= 0)
duplicateData = atts->GetBool("Duplicate data for particle advection (slower for all other techniques)");
}
iNumBlocks = 0;
iBlockSize[0] = 1;
......
......@@ -30,6 +30,7 @@ list of changes in release 2.7.</p>
<li>Sampling options have been added to the Lineout query widget. They apply on a per-lineout basis and override the global settings available in the Controls->Lineout window.</li>
<li>Memory leaks in the viewer related to operator-created-expressions has been fixed.</li>
<li>Running the python interpreter no longer fails when running a version of Vist that is not the newest one installed when more than one version of VisIt is installed in the same location.</li>
<li>Opening Nek5000 files could fail if user had a visit config file saved from version 2.6.x</li>
</ul>
<p><b><font size="4">Enhancements in version 2.7.1</font></b></p>
......
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