Commit e8d33438 authored by cyrush's avatar cyrush
Browse files

merge from 2.1 rc

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12424 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3d052fce
......@@ -5586,6 +5586,10 @@ avtDatabaseMetaData::DetermineSubsetType(const std::string &inVar) const
// Brad Whitlock, Wed Mar 7 15:05:09 PST 2007
// Changed for automatic generation.
//
// Cyrus Harrison, Wed Aug 25 08:35:22 PDT 2010
// Support selection of domains, even if we only have
// a single domain.
//
// ****************************************************************************
std::string
......@@ -5626,9 +5630,8 @@ avtDatabaseMetaData::MeshForVar(const std::string &invar) const
//
return var;
}
else if ((VariableNamesEqual(GetMeshes(i).blockTitle, var) ||
VariableNamesEqual(GetMeshes(i).groupTitle, var)) &&
GetMeshes(i).numBlocks > 1)
else if ( VariableNamesEqual(GetMeshes(i).blockTitle, var) ||
VariableNamesEqual(GetMeshes(i).groupTitle, var))
{
return GetMeshes(i).name;
}
......
......@@ -697,7 +697,6 @@ avtDatabaseMetaData::ReplaceForbiddenCharacters(std::vector<char> &badChars,
}
}
Function: Add1
Declaration: void Add(avtMeshMetaData *);
Definition:
......@@ -2405,6 +2404,10 @@ Definition:
// Brad Whitlock, Wed Mar 7 15:05:09 PST 2007
// Changed for automatic generation.
//
// Cyrus Harrison, Wed Aug 25 08:35:22 PDT 2010
// Support selection of domains, even if we only have
// a single domain.
//
// ****************************************************************************
std::string
......@@ -2445,9 +2448,8 @@ avtDatabaseMetaData::MeshForVar(const std::string &invar) const
//
return var;
}
else if ((VariableNamesEqual(GetMeshes(i).blockTitle, var) ||
VariableNamesEqual(GetMeshes(i).groupTitle, var)) &&
GetMeshes(i).numBlocks > 1)
else if ( VariableNamesEqual(GetMeshes(i).blockTitle, var) ||
VariableNamesEqual(GetMeshes(i).groupTitle, var))
{
return GetMeshes(i).name;
}
......@@ -3641,3 +3643,4 @@ const intVector& avtDatabaseMetaData::GetRestrictedMatnos(const std::string& var
CHECK_VAR_TYPE(Labels);
return dummy;
}
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