Commit 8527f638 authored by whitlocb's avatar whitlocb
Browse files

FVCOM reader fixes.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12669 18c085ea-50e0-402c-830e-de6fd14e8384
parent fd485f74
......@@ -82,6 +82,9 @@ avtFVCOMParticleFileFormat::Identify(NETCDFFileObject *fileObject)
// its interface has changed to accept both a number of timestep groups
// and a number of blocks.
//
// Brad Whitlock, Mon Oct 4 11:20:51 PDT 2010
// I changed the code back to using 2 constructors so it works again.
//
// ****************************************************************************
avtFileFormatInterface *
......@@ -95,8 +98,13 @@ avtFVCOMParticleFileFormat::CreateInterface(NETCDFFileObject *f,
ffl[i] = new avtMTSDFileFormat*[nBlock];
for (int j = 0 ; j < nBlock ; j++)
{
ffl[i][j] = new avtFVCOMParticleFileFormat(list[i*nBlock+j],
(i==0) ? f : NULL);
if(f != 0)
{
ffl[i][j] = new avtFVCOMParticleFileFormat(list[i*nBlock+j], f);
f = 0;
}
else
ffl[i][j] = new avtFVCOMParticleFileFormat(list[i*nBlock+j]);
}
}
......
......@@ -121,8 +121,11 @@ avtFVCOM_MTMDFileFormat::Identify(NETCDFFileObject *fileObject)
// Creation: Thu May 4 16:18:57 PST 2006
//
// Modifications:
// Jeremy Meredith, Thu Jan 28 15:49:05 EST 2010
// MTMD files can now be grouped into longer sequences.
// Jeremy Meredith, Thu Jan 28 15:49:05 EST 2010
// MTMD files can now be grouped into longer sequences.
//
// Brad Whitlock, Mon Oct 4 11:20:51 PDT 2010
// I changed the code back to using 2 constructors so it works again.
//
// ****************************************************************************
......@@ -136,7 +139,13 @@ avtFVCOM_MTMDFileFormat::CreateInterface(NETCDFFileObject *f,
avtMTMDFileFormat **ffl = new avtMTMDFileFormat*[nTimestepGroups];
for (int i = 0 ; i < nTimestepGroups ; i++)
{
ffl[i] = new avtFVCOM_MTMDFileFormat(list[i*nBlock], (i==0)?f:NULL);
if(f != 0)
{
ffl[i] = new avtFVCOM_MTMDFileFormat(list[i*nBlock], f);
f = 0;
}
else
ffl[i] = new avtFVCOM_MTMDFileFormat(list[i*nBlock]);
}
return new avtMTMDFileFormatInterface(ffl, nTimestepGroups);
}
......
......@@ -105,6 +105,9 @@ avtFVCOM_MTSDFileFormat::Identify(NETCDFFileObject *fileObject)
// its interface has changed to accept both a number of timestep groups
// and a number of blocks.
//
// Brad Whitlock, Mon Oct 4 11:20:51 PDT 2010
// I changed the code back to using 2 constructors so it works again.
//
// ****************************************************************************
......@@ -119,8 +122,13 @@ avtFVCOM_MTSDFileFormat::CreateInterface(NETCDFFileObject *f,
ffl[i] = new avtMTSDFileFormat*[nBlock];
for (int j = 0 ; j < nBlock ; j++)
{
ffl[i][j] = new avtFVCOM_MTSDFileFormat(list[i*nBlock+j],
(i==0) ? f : NULL);
if(f != 0)
{
ffl[i][j] = new avtFVCOM_MTSDFileFormat(list[i*nBlock+j], f);
f = 0;
}
else
ffl[i][j] = new avtFVCOM_MTSDFileFormat(list[i*nBlock+j]);
}
}
......
......@@ -18,6 +18,7 @@
<li>Clicking <b>Print</b> in the Print dialog now prints on all platforms.</li>
<li>The molecule plot now correctly uses 'sphere imposters' in scalable
rendering mode.</li>
<li>The FVCOM reader can group files again.</li>
</ul>
<p><b><font size="4">Enhancements in version 2.1.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