fixed time/cycle reporting
@@ -4460,58 +4460,54 @@ void avtVsFileFormat::UpdateCyclesAndTimes(avtDatabaseMetaData* md)
<< std::endl;
}
+ // If time data is present, tell VisIt
+ if (registry->hasTime()) {
+ VsLog::debugLog() << CLASSFUNCLINE
+ << "This file supplies time: "
+ << registry->getTime() << std::endl;
+
+ md->SetTime(timeStep, registry->getTime());
+ md->SetTimeIsAccurate(true, registry->getTime());
+ }
+
+ // If time cycle is present, tell VisIt
+ if (registry->hasCycle()) {
+ VsLog::debugLog() << CLASSFUNCLINE
+ << "This file supplies cycle: "
+ << registry->getCycle() << std::endl;
+
+ md->SetCycle(timeStep, registry->getCycle());
+ md->SetCycleIsAccurate(true, registry->getCycle());
+ }
+
// If time data is present, tell VisIt
// if (registry->hasTime()) {
// VsLog::debugLog() << CLASSFUNCLINE
// << "This file supplies time: "
// << registry->getTime() << std::endl;
- // md->SetTime(timeStep, registry->getTime());
- // md->SetTimeIsAccurate(true, registry->getTime());
+ // std::vector<double> times;
+ // times.resize( 1 );
+ // times[0] = registry->getTime();
- // // md->SetTimesAreAccurate(true);
+ // md->SetTimesAreAccurate(true);
+ // md->SetTimes( times );
// }
- // If time cycle is present, tell VisIt
+ // If cycle data is present, tell VisIt
// if (registry->hasCycle()) {
// VsLog::debugLog() << CLASSFUNCLINE
// << "This file supplies cycle: "
// << registry->getCycle() << std::endl;
- // md->SetCycle(timeStep, registry->getCycle());
- // md->SetCycleIsAccurate(true, registry->getCycle());
+ // std::vector<int> cycles;
+ // cycles.resize( 1 );
+ // cycles[0] = registry->getCycle();
- // // md->SetCyclesAreAccurate(true);
+ // md->SetCyclesAreAccurate(true);
+ // md->SetCycles( cycles );
// }
- // If time data is present, tell VisIt
- if (registry->hasTime()) {
- VsLog::debugLog() << CLASSFUNCLINE
- << "This file supplies time: "
- << registry->getTime() << std::endl;
-
- std::vector<double> times;
- times.resize( 1 );
- times[0] = registry->getTime();
-
- md->SetTimesAreAccurate(true);
- md->SetTimes( times );
- }
-
- // If cycle data is present, tell VisIt
- if (registry->hasCycle()) {
- VsLog::debugLog() << CLASSFUNCLINE
- << "This file supplies cycle: "
- << registry->getCycle() << std::endl;
-
- std::vector<int> cycles;
- cycles.resize( 1 );
- cycles[0] = registry->getCycle();
-
- md->SetCyclesAreAccurate(true);
- md->SetCycles( cycles );
- }
-
if (registry->hasLowerBounds() && registry->hasUpperBounds()) {
VsLog::debugLog() << CLASSFUNCLINE
