Commit 0387a2fe authored by bonnell's avatar bonnell

Add donor-mesh expressions to the expression list used by CMFE expressions, resolves #974.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21291 18c085ea-50e0-402c-830e-de6fd14e8384
parent 9b63e90c
......@@ -375,6 +375,10 @@ avtCMFEExpression::ProcessArguments(ArgsExpr *args,
// Add support for only reading necessary domains to evaluate CMFE.
// (specifically for pos_cmfe + PICS/parallelize over seeds)
//
// Kathleen Biagas, Tue Jul 2 16:44:43 MST 2013
// CMFE may contain expressions, but the ParsingExprList won't contain them,
// so add any Expression from the donor's MetaData to the new_list.
//
// ****************************************************************************
void
......@@ -387,10 +391,16 @@ avtCMFEExpression::Execute()
EXCEPTION1(InvalidFilesException, db.c_str());
int actualTimestep = GetTimestate(dbp);
avtDatabaseMetaData *md = dbp->GetMetaData(actualTimestep);
ParsingExprList *pel = ParsingExprList::Instance();
ExpressionList original_list = *(pel->GetList());
ExpressionList db_list = md->GetExprList();
ExpressionList new_list = original_list;
if (db_list != original_list)
{
for (int i = 0; i < db_list.GetNumExpressions(); ++i)
new_list.AddExpressions(db_list.GetExpressions(i));
}
Expression exp2;
exp2.SetName("_avt_internal_cmfe_expr");
std::string var_wo_quotes = var;
......
......@@ -110,7 +110,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>CMFE expressions involving virtual database specifications, and saved in VisIt settings would not load properly.</li>
<li>CMFE expressions created via the Data-Level Comparisons window would crashe the engine on Windows.</li>
<li>VisIt could not plot an expression when switching active sources.</li>
<li></li>
<li>CMFE containing expressions from a donor database could not be plotted.</li>
<li></li>
</ul>
......
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