Commit a47363e9 authored by hrchilds's avatar hrchilds

Merge RC to trunk, picking up time iterating expressions bug.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11881 18c085ea-50e0-402c-830e-de6fd14e8384
parent 653571f7
......@@ -328,6 +328,11 @@ avtTimeIteratorExpression::Execute(void)
// Programmer: Hank Childs
// Creation: February 14, 2009
//
// Modifications:
//
// Hank Childs, Wed Jul 14 06:38:42 PDT 2010
// Fix problem with meshnames like category/meshname.
//
// ****************************************************************************
void
......@@ -350,13 +355,13 @@ avtTimeIteratorExpression::UpdateExpressions(int ts)
char expr_defn[1024];
if (cmfeType == CONN_CMFE)
{
SNPRINTF(expr_defn, 1024, "conn_cmfe(<[%d]i:%s>, %s)", ts,
SNPRINTF(expr_defn, 1024, "conn_cmfe(<[%d]i:%s>, <%s>)", ts,
varnames[i].c_str(), meshname.c_str());
}
else
{
int defVarIndex = varnames.size()-1;
SNPRINTF(expr_defn, 1024, "pos_cmfe(<[%d]i:%s>, %s, %s)", ts,
SNPRINTF(expr_defn, 1024, "pos_cmfe(<[%d]i:%s>, <%s>, %s)", ts,
varnames[i].c_str(), meshname.c_str(),
varnames[defVarIndex].c_str());
}
......
......@@ -67,3 +67,8 @@ VISIT_OPTION_DEFAULT(VISIT_EXODUSII_DIR ${VISITHOME}/exodus/4.46/${VISITARCH})
##
VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf/3.6.3/${VISITARCH})
##
## CGNS
##
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/2.4/${VISITARCH})
......@@ -17,6 +17,7 @@
<li>Color tables that include transparency can now be saved in a session and restored properly.</li>
<li>Groups of Exodus files can now be read correctly.</li>
<li>Time is now properly reported for all Cosmos++ files.</li>
<li>Time iterating expressions now work on files that have meshnames that contain the '/' character.</li>
</ul>
<p><b><font size="4">Enhancements in version 2.0.2</font></b></p>
<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