Commit 0a015241 authored by pugmire's avatar pugmire

Fix bug fix in merge from scripting branch.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21025 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2acd8b01
......@@ -153,6 +153,9 @@ avtTimeLoopFilter::~avtTimeLoopFilter()
// Dave Pugmire, Thu May 23 10:56:50 EDT 2013
// Rename the loop initialization method. Add RankOwnsSlice()
//
// Dave Pugmire, Fri May 24 14:36:29 EDT 2013
// Bug fix in merge from just above.
//
// ****************************************************************************
bool
......@@ -192,7 +195,9 @@ avtTimeLoopFilter::Update(avtContract_p spec)
for (i=0, currentTime=startTime; i<nFrames; ++i, currentTime+=stride)
{
bool shouldDoThisTimeSlice = parallelizingOverTime && RankOwnsTimeSlice(i);
bool shouldDoThisTimeSlice = true;
if (parallelizingOverTime)
shouldDoThisTimeSlice = RankOwnsTimeSlice(i);
curIter++;
if (!shouldDoThisTimeSlice)
......@@ -405,7 +410,7 @@ avtTimeLoopFilter::GetCyclesForRank()
ref_ptr<avtDatabase> dbp = avtCallback::GetDatabase(db, 0, NULL);
if (*dbp == NULL)
EXCEPTION1(InvalidFilesException, db.c_str());
avtDatabaseMetaData *md = dbp->GetMetaData(0);//,true,true,false);
avtDatabaseMetaData *md = dbp->GetMetaData(0,true,true,false);
intVector c = md->GetCycles();
std::vector<int> cycles;
......@@ -440,7 +445,7 @@ avtTimeLoopFilter::GetTimesForRank()
ref_ptr<avtDatabase> dbp = avtCallback::GetDatabase(db, 0, NULL);
if (*dbp == NULL)
EXCEPTION1(InvalidFilesException, db.c_str());
avtDatabaseMetaData *md = dbp->GetMetaData(0);//,true,true,false);
avtDatabaseMetaData *md = dbp->GetMetaData(0,true,true,false);
doubleVector t = md->GetTimes();
std::vector<double> times;
......
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