Commit 9dd2d207 authored by hrchilds's avatar hrchilds
Browse files

Don't uniformly declare all times as inaccurate if some are out of sequence.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12400 18c085ea-50e0-402c-830e-de6fd14e8384
parent df288814
......@@ -304,6 +304,10 @@ avtMTMDFileFormatInterface::GetFilename(int ts)
// Hank Childs, Fri Aug 27 13:46:28 PDT 2010
// Don't overwrite values if they are not monotonic.
//
// Hank Childs, Tue Aug 31 16:31:07 PDT 2010
// Don't uniformly declare all times as inaccurate if they are out of
// sequence.
//
// ****************************************************************************
void
......@@ -389,6 +393,7 @@ avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
cycles.push_back(0);
else
cycles.push_back(cycles[i-1]+1);
md->SetCycleIsAccurate(i, false);
}
}
}
......@@ -397,7 +402,8 @@ avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
// Ok, now put cycles into the metadata
//
md->SetCycles(cycles);
md->SetCyclesAreAccurate(cyclesLookGood);
if (cyclesLookGood)
md->SetCyclesAreAccurate(cyclesLookGood);
}
if (md->AreAllTimesAccurateAndValid(nTotalTimesteps) != true)
......@@ -441,6 +447,7 @@ avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
times.push_back(0.);
else
times.push_back(times[i-1]+0.0); // same time
md->SetTimeIsAccurate(i, false);
}
}
}
......@@ -454,10 +461,6 @@ avtMTMDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
md->SetTimesAreAccurate(true);
md->SetTemporalExtents(times[0], times[times.size() - 1]);
}
else
{
md->SetTimesAreAccurate(false);
}
}
}
......
......@@ -426,6 +426,10 @@ avtMTSDFileFormatInterface::GetFilename(int ts)
// Hank Childs, Fri Aug 27 13:46:28 PDT 2010
// Don't overwrite values if they are not monotonic.
//
// Hank Childs, Tue Aug 31 16:31:07 PDT 2010
// Don't uniformly declare all times as inaccurate if they are out of
// sequence.
//
// ****************************************************************************
void
......@@ -512,6 +516,7 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
cycles.push_back(0);
else
cycles.push_back(cycles[i-1]+1);
md->SetCycleIsAccurate(i, false);
}
else
cycles.push_back(c);
......@@ -522,7 +527,8 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
// Ok, now put cycles into the metadata
//
md->SetCycles(cycles);
md->SetCyclesAreAccurate(cyclesLookGood);
if (cyclesLookGood)
md->SetCyclesAreAccurate(cyclesLookGood);
}
if (md->AreAllTimesAccurateAndValid(nTotalTimesteps) != true)
......@@ -566,6 +572,7 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
times.push_back(0.);
else
times.push_back(times[i-1]+0.0); // same time
md->SetTimeIsAccurate(i, false);
}
}
}
......@@ -579,10 +586,6 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md,
md->SetTimesAreAccurate(true);
md->SetTemporalExtents(times[0], times[times.size() - 1]);
}
else
{
md->SetTimesAreAccurate(false);
}
}
//
......
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