Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit 9993605f authored by miller86's avatar miller86

Merge 1.12RC to trunk: adding comments to release notes; fixing AMR mrgtrees...

Merge 1.12RC to trunk: adding comments to release notes; fixing AMR mrgtrees in concert with mmadj objects; fixing minor error with logic controlling an exception when reading point vars;

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8949 18c085ea-50e0-402c-830e-de6fd14e8384
parent 73f47763
......@@ -1765,7 +1765,9 @@ avtSiloFileFormat::ReadMultimeshes(DBfile *dbfile,
mmd->groupTitle = "levels";
mmd->groupPieceName = "level";
mmd->blockNames = amr_block_names;
mmd->meshType = AVT_AMR_MESH;
md->Add(mmd);
groupInfo.haveGroups = false;
md->AddGroupInformation(num_amr_groups, mm?mm->nblocks:0, amr_group_ids);
}
else
......@@ -4638,6 +4640,8 @@ avtSiloFileFormat::FindStandardConnectivity(DBfile *dbfile, int &ndomains,
// Cyrus harrison, Fri Oct 9 14:40:02 PDT 2009
// Guard against corner case crash for disconnected mesh subset.
//
// Mark C. Miller, Wed Nov 11 12:28:25 PST 2009
// Added guard against case where some mmadj->nodelists arrays are null.
// ****************************************************************************
void
......@@ -4716,6 +4720,9 @@ avtSiloFileFormat::FindMultiMeshAdjConnectivity(DBfile *dbfile, int &ndomains,
for( i =0; i < ndomains && idx < nnodelists; i++)
{
if (!mmadj_obj->nodelists[idx])
continue;
// the node list provides the overlap region between
// the current domain and each neighbor and an orientation
memcpy(extents_ptr, mmadj_obj->nodelists[idx],6*sizeof(int));
......@@ -7528,6 +7535,9 @@ avtSiloFileFormat::GetQuadVar(DBfile *dbfile, const char *vname,
// Brad Whitlock, Fri Aug 7 10:38:34 PDT 2009
// I added support for non-float data types.
//
// Mark C. Miller, Thu Nov 12 14:56:15 PST 2009
// Changed logic for exception for variable with more than 1 component
// to use 'nvals' instead of 'ndims'
// ****************************************************************************
vtkDataArray *
......@@ -7548,7 +7558,7 @@ avtSiloFileFormat::GetPointVar(DBfile *dbfile, const char *vname)
EXCEPTION1(InvalidVariableException, varname);
}
if(mv->ndims > 1)
if(mv->nvals > 1)
{
EXCEPTION1(InvalidVariableException, "Pointvar with more than 1 component. Fix Silo reader.");
}
......
......@@ -43,10 +43,14 @@
<li>ExportDatabase will now be much faster when exporting VTK files in parallel.</li>
<li>A bug with 2d logical mesh boundary info was corrected in the Miranda reader.</li>
<li>Support for launching on graph.llnl.gov was added.</li>
<li>A bug was fixed reading cycle/time information from CGNS files.</li>
<li>A bug where build_visit inadvertently reported collisions between the user's enviornment variables and VisIt's make variables was corrected. Users should no longer have to specify VISIT_NOCKENV=1.</li>
</ul>
<p><b><font size="4">Features added in version 1.12.1</font></b></p>
<ul>
<li>The VizSchema database reader from the Tech-X Corporation was added.</li>
<li>Support for arbitrary polyhedral meshes was added to the Silo plugin.</li>
<li>Support for AMR meshes via Silo's Mesh Region Grouping trees was added to the Silo plugin.</li>
</ul>
<p>Click the following link to view the release notes for the previous version
of VisIt: <a href="relnotes1.12.0.html">VisIt 1.12.0 Release Notes</a>.</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