Commit 8722afa3 authored by camp's avatar camp

Problem with Nek data files with 8 byte data.

The dimensions of the data VisIt would display were wrong.
Changed the data size to match the type of NEK data; float or double.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@26770 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7436d195
...@@ -2742,6 +2742,11 @@ avtNek5000FileFormat::GetAuxiliaryData(const char *var, ...@@ -2742,6 +2742,11 @@ avtNek5000FileFormat::GetAuxiliaryData(const char *var,
// Renamed method as this is now an internal routine and not part associated // Renamed method as this is now an internal routine and not part associated
// with the virtual method GetAuxiliaryData. // with the virtual method GetAuxiliaryData.
// //
// David Camp, Tue Jul 21 10:56:18 PDT 2015
// Changed the data size to match the type of NEK data; float or double.
// I checked with the NEK team and the meta data will always be float, so
// no need for meta data code to change. It is expecting float data.
//
// **************************************************************************** // ****************************************************************************
avtIntervalTree * avtIntervalTree *
...@@ -2784,9 +2789,9 @@ avtNek5000FileFormat::GetBoundingBoxIntervalTree(int timestep) ...@@ -2784,9 +2789,9 @@ avtNek5000FileFormat::GetBoundingBoxIntervalTree(int timestep)
{ {
long iFileSizeWithoutMetaData = 136 long iFileSizeWithoutMetaData = 136
+ sizeof(int)*aBlocksPerFile[ii] + sizeof(int)*aBlocksPerFile[ii]
+ ((long)nFloatsPerDomain)*sizeof(float)*((long)aBlocksPerFile[ii]); + ((long)nFloatsPerDomain)*iPrecision*((long)aBlocksPerFile[ii]);
long iMDSize = (nFloatsPerDomain * 2 * sizeof(float) * aBlocksPerFile[ii]) / long iMDSize = (nFloatsPerDomain * 2 * iPrecision * aBlocksPerFile[ii]) /
(iBlockSize[0]*iBlockSize[1]*iBlockSize[2]); (iBlockSize[0]*iBlockSize[1]*iBlockSize[2]);
GetFileName(timestep, ii, blockfilename, (int)fileTemplate.size() + 64); GetFileName(timestep, ii, blockfilename, (int)fileTemplate.size() + 64);
......
...@@ -61,7 +61,7 @@ enhancements and bug-fixes that were added to this release.</p> ...@@ -61,7 +61,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>The PLOT3D reader has been enhanced to <i>auto-detect</i> the format options normally specified by the <i>.vp3d meta file</i> or via <i>Read options.</i>Auto-detection works for most binary files, but not for ascii. It is always on, and if successful, will override the values specified in the <i>.vp3d meta file</i> or <i>Read options.</i> If not successful, the reader will fallback to use the other settings.</li> <li>The PLOT3D reader has been enhanced to <i>auto-detect</i> the format options normally specified by the <i>.vp3d meta file</i> or via <i>Read options.</i>Auto-detection works for most binary files, but not for ascii. It is always on, and if successful, will override the values specified in the <i>.vp3d meta file</i> or <i>Read options.</i> If not successful, the reader will fallback to use the other settings.</li>
<li>The PLOT3D reader now supports time-series solution files, specified in the form 'somefile*.q', (where '*' matches a number specifing the timestate) or 'somefile??3?.q'. Use the '?' form to sub-select from the time series. The q filename in this form can be used in the <i>.vp3d meta file</i>, or via <i>Read Options.</i> The '.q' extension is the default.</li> <li>The PLOT3D reader now supports time-series solution files, specified in the form 'somefile*.q', (where '*' matches a number specifing the timestate) or 'somefile??3?.q'. Use the '?' form to sub-select from the time series. The q filename in this form can be used in the <i>.vp3d meta file</i>, or via <i>Read Options.</i> The '.q' extension is the default.</li>
<li></li> <li></li>
<li></li> <li>The Nek5000 reader had an issue with #std 8 data files (double size data). The data dimensions would be read wrong. This has been fixed.</li>
</ul> </ul>
<a name="Plot_changes"></a> <a name="Plot_changes"></a>
......
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