Commit bb171c1d authored by ghweber's avatar ghweber

Merged 2.9RC changes into trunk: vec_dx for Chombo reader and release note update

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@25703 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4585b97a
......@@ -415,6 +415,9 @@ avtChomboFileFormat::ActivateTimestep(void)
// Initial bare-bones support for 4D Chombo files (fairly limited and
// "hackish")
//
// Gunther H. Weber, Tue Feb 10 21:06:28 PST 2015
// Add support for vec_dx for 4D Chombo files
//
// ****************************************************************************
extern "C" herr_t
......@@ -600,6 +603,11 @@ avtChomboFileFormat::InitializeReader(void)
H5Tinsert (doublevect3d_id, "x", HOFFSET(doublevect3d, x), H5T_NATIVE_DOUBLE);
H5Tinsert (doublevect3d_id, "y", HOFFSET(doublevect3d, y), H5T_NATIVE_DOUBLE);
H5Tinsert (doublevect3d_id, "z", HOFFSET(doublevect3d, z), H5T_NATIVE_DOUBLE);
hid_t doublevect4d_id = H5Tcreate (H5T_COMPOUND, sizeof(doublevect4d));
H5Tinsert (doublevect4d_id, "x", HOFFSET(doublevect4d, x), H5T_NATIVE_DOUBLE);
H5Tinsert (doublevect4d_id, "y", HOFFSET(doublevect4d, y), H5T_NATIVE_DOUBLE);
H5Tinsert (doublevect4d_id, "z", HOFFSET(doublevect4d, z), H5T_NATIVE_DOUBLE);
H5Tinsert (doublevect4d_id, "u", HOFFSET(doublevect4d, u), H5T_NATIVE_DOUBLE);
if (hasProbLo)
{
......@@ -873,9 +881,13 @@ avtChomboFileFormat::InitializeReader(void)
}
else
{
EXCEPTION1(InvalidDBTypeException, "vec_dx not yet supported for 4D data");
doublevect4d dx_tmp;
H5Aread(dx_id, doublevect4d_id, &dx_tmp);
dx[i].push_back(dx_tmp.x);
dx[i].push_back(dx_tmp.y);
dx[i].push_back(dx_tmp.z);
dx[i].push_back(dx_tmp.u);
}
}
else
{
......@@ -954,6 +966,7 @@ avtChomboFileFormat::InitializeReader(void)
H5Tclose(doublevect2d_id);
H5Tclose(doublevect3d_id);
H5Tclose(doublevect4d_id);
//
// Now that we know how many total patches there are, create our data
......
......@@ -108,10 +108,18 @@ struct {
double z;
} typedef doublevect3d;
struct {
double x;
double y;
double z;
double u;
} typedef doublevect4d;
union
{
doublevect2d dv2;
doublevect3d dv3;
doublevect3d dv4;
} typedef doublevect;
class DBOptionsAttributes;
......@@ -170,6 +178,9 @@ class DBOptionsAttributes;
// Initial bare-bones support for 4D Chombo files (fairly limited and
// "hackish")
//
// Gunther H. Weber, Tue Feb 10 21:06:28 PST 2015
// Add support for vec_dx for 4D Chombo files
//
// ****************************************************************************
class avtChomboFileFormat : public avtSTMDFileFormat
......
......@@ -31,6 +31,8 @@ enhancements and bug-fixes that were added to this release.</p>
<p><b><font size="4">General features added in version 2.9</font></b></p>
<ul>
<li>VisIt was ported to BlueGene/Q. The <i>build_visit_BGQ</i> script can be used to build a statically linked version of VisIt's server components for use on BlueGene/Q.</li>
<li><a href="https://www.seedme.org/">SeedMe.org</a> Integration. Share your visualizations results easily via the SeedMe python module, which is now included in VisIt's CLI. See the <a href="http://visitusers.org/index.php?title=Seedme">Seedme examples wiki page</a> on visitusers.org, the <a href="https://www.seedme.org/documentation/programmatic-python-usage"> SeedMe programatic guide</a> and the <a href="https://www.seedme.org/cli-guide">SeedMe command line guide</a> for examples.
</li>
</ul>
<a name="Advanced_Features"></a>
......@@ -63,6 +65,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>When the Exodus plugin auto-detects composite variables, it now defines expressions for them instead of advertising them as database variables.</li>
<li>Improved the auto-detection logic of composite variables in the Exodus plugin.</li>
<li>Improved support for cell-centered data in newer versions of Tecplot binary files.</li>
<li>The MFEM database plugin was updated to support version 3.0.1 of MFEM. This includes support for reading <i>mfem_root</i> files generated from the MFEM library.</li>
</ul>
<a name="Plot_changes"></a>
......@@ -114,6 +117,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>Changed failure mode of avtDatabaseMetaData::DetermineVarType() to return AVT_UNKNOWN_TYPE instead of excepting out.</li>
<li>The makemovie python script was changed so that visitmovietemplate.py can be correctly found from a development version on Windows.</li>
<li>The build_visit script was enhanced with a <i>--xdb</i> command line argument that enables the user to enable FieldView XDB output.</li>
<li>The build_visit script now supports building a limited set of the Boost C++ libraries.</li>
</ul>
<p>Click the following link to view the release notes for the previous version
......
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