Commit a0af4ff1 authored by miller86's avatar miller86

2.10RC->Trunk: fixed handling of buggy mmesh_name member of multi-block objects

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@28171 18c085ea-50e0-402c-830e-de6fd14e8384
parent a443ff29
......@@ -2689,6 +2689,10 @@ GetRestrictedMaterialIndices(const avtDatabaseMetaData *md, const char *const va
//
// Mark C. Miller, Tue Feb 2 15:01:05 PST 2016
// Add support for all-empty multi-vars.
//
// Mark C. Miller, Thu Feb 25 12:40:17 PST 2016
// Add logic to check mesh identified by mmesh_name member and then fall
// back to fuzzy match if it doesn't exist.
// ****************************************************************************
void
avtSiloFileFormat::ReadMultivars(DBfile *dbfile,
......@@ -2738,9 +2742,23 @@ avtSiloFileFormat::ReadMultivars(DBfile *dbfile,
DBGetDir(dbfile, cwd);
meshname = FileFunctions::Absname(cwd,mv->mmesh_name,"/");
meshname.erase(meshname.begin());
debug5 << "Variable \"" << multivar_names[i]
<< "\" indicates it is defined on mesh \""
<< meshname.c_str() << "\"" << endl;
if (!DBInqVarExists(dbfile, meshname.c_str()))
{
debug5 << "Although 'mmesh_name' member indicates variable \"" << multivar_names[i]
<< "\" is defined on mesh \"" << meshname.c_str() << "\", "
<< "the associated mesh does not exist." << endl;
meshname = DetermineMultiMeshForSubVariable(dbfile,
multivar_names[i], mv_ent, dirname);
debug5 << "Guessing variable \"" << multivar_names[i]
<< "\" is defined on mesh \""
<< meshname.c_str() << "\"" << endl;
}
else
{
debug5 << "Variable \"" << multivar_names[i]
<< "\" indicates it is defined on mesh \""
<< meshname.c_str() << "\"" << endl;
}
}
else
{
......@@ -3675,6 +3693,10 @@ avtSiloFileFormat::ReadMaterials(DBfile *dbfile,
//
// Mark C. Miller, Tue Feb 2 15:01:05 PST 2016
// Add support for all-empty multi-mats.
//
// Mark C. Miller, Thu Feb 25 12:40:17 PST 2016
// Add logic to check mesh identified by mmesh_name member and then fall
// back to fuzzy match if it doesn't exist.
// ****************************************************************************
void
avtSiloFileFormat::ReadMultimats(DBfile *dbfile,
......@@ -3821,9 +3843,23 @@ avtSiloFileFormat::ReadMultimats(DBfile *dbfile,
DBGetDir(dbfile, cwd);
meshname = FileFunctions::Absname(cwd,mm->mmesh_name,"/");
meshname.erase(meshname.begin());
debug5 << "Material \"" << multimat_names[i]
<< "\" indicates it is defined on mesh \""
<< meshname.c_str() << "\"" << endl;
if (!DBInqVarExists(dbfile, meshname.c_str()))
{
debug5 << "Although 'mmesh_name' member indicates material \"" << multimat_names[i]
<< "\" is defined on mesh \"" << meshname.c_str() << "\", "
<< "the associated mesh does not exist." << endl;
meshname = DetermineMultiMeshForSubVariable(dbfile,
multimat_names[i], mm_ent, dirname);
debug5 << "Guessing material \"" << multimat_names[i]
<< "\" is defined on mesh \""
<< meshname.c_str() << "\"" << endl;
}
else
{
debug5 << "Material \"" << multimat_names[i]
<< "\" indicates it is defined on mesh \""
<< meshname.c_str() << "\"" << endl;
}
}
else if (!is_all_empty)
{
......
......@@ -34,6 +34,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>Fixed a bug opening Silo files larger than 4 Gbytes on Windows.</li>
<li>Fixed the tensorVectorMult bug in the SPH Resample Operator found by Cody Raskin.</li>
<li>Fixed a bug that prevented the SPH Resample Operator from working with the Volume Plot.</li>
<li>Fixed handling of buggy mmesh_name member of multi-block objects in Silo files.</li>
</ul>
<a name="Enhancements"></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