Commit 87b95996 authored by bonnell's avatar bonnell

Fix time-derivative expressions of compound variables.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21295 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7f663310
......@@ -1542,6 +1542,11 @@ avtDatabase::AddMeshQualityExpressions(avtDatabaseMetaData *md)
// Mark C. Miller, Thu Feb 12 11:33:59 PST 2009
// Removed std:: qualification on some STL classes due to use of using
// statements at top
//
// Kathleen Biagas, Wed Jul 3 14:25:43 PDT 2013
// Variable names may be compound (eg "mesh/ireg") so make sure they are
// enclosed in angle-brackets at the beginning of the created expression.
//
// ****************************************************************************
void
......@@ -1669,7 +1674,7 @@ avtDatabase::AddTimeDerivativeExpressions(avtDatabaseMetaData *md)
+ smd->meshName + "_lasttime";
new_expr.SetName(expr_name);
char buff[1024];
SNPRINTF(buff, 1024, "(%s - conn_cmfe(<[-1]id:%s>, %s)) / (<%s> - <%s>)",
SNPRINTF(buff, 1024, "(<%s> - conn_cmfe(<[-1]id:%s>, %s)) / (<%s> - <%s>)",
smd->name.c_str(), smd->name.c_str(), smd->meshName.c_str(),
time_expr_name.c_str(), last_time_expr_name.c_str());
new_expr.SetDefinition(buff);
......@@ -1688,7 +1693,7 @@ avtDatabase::AddTimeDerivativeExpressions(avtDatabaseMetaData *md)
+ smd->meshName + "_lasttime";
new_expr.SetName(expr_name);
char buff[1024];
SNPRINTF(buff, 1024, "%s - pos_cmfe(<[-1]id:%s>, %s, 0.) / (<%s> - <%s>)",
SNPRINTF(buff, 1024, "<%s> - pos_cmfe(<[-1]id:%s>, %s, 0.) / (<%s> - <%s>)",
smd->name.c_str(), smd->name.c_str(), smd->meshName.c_str(),
time_expr_name.c_str(), last_time_expr_name.c_str());
new_expr.SetDefinition(buff);
......@@ -1716,7 +1721,7 @@ avtDatabase::AddTimeDerivativeExpressions(avtDatabaseMetaData *md)
+ smd->meshName + "_lasttime";
new_expr.SetName(expr_name);
char buff[1024];
SNPRINTF(buff, 1024, "%s - conn_cmfe(<[-1]id:%s>, %s) / (<%s> - <%s>)",
SNPRINTF(buff, 1024, "<%s> - conn_cmfe(<[-1]id:%s>, %s) / (<%s> - <%s>)",
smd->name.c_str(), smd->name.c_str(), smd->meshName.c_str(),
time_expr_name.c_str(), last_time_expr_name.c_str());
new_expr.SetDefinition(buff);
......@@ -1735,7 +1740,7 @@ avtDatabase::AddTimeDerivativeExpressions(avtDatabaseMetaData *md)
+ smd->meshName + "_lasttime";
new_expr.SetName(expr_name);
char buff[1024];
SNPRINTF(buff, 1024, "%s - pos_cmfe(<[-1]id:%s>, %s, 0.) / (<%s> - <%s>)",
SNPRINTF(buff, 1024, "<%s> - pos_cmfe(<[-1]id:%s>, %s, 0.) / (<%s> - <%s>)",
smd->name.c_str(), smd->name.c_str(), smd->meshName.c_str(),
time_expr_name.c_str(), last_time_expr_name.c_str());
new_expr.SetDefinition(buff);
......
......@@ -111,6 +111,7 @@ enhancements and bug-fixes that were added to this release.</p>
<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>CMFE containing expressions from a donor database could not be plotted.</li>
<li>Time-derivative expressions containing compound variables (eg <i>mesh/ireg</i>) 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