Commit 302cb011 authored by bonnell's avatar bonnell

Remove no-longer-used methods 'ReturnsValidCycle' and 'ReturnsValidTime'. Resolves #2306.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@26744 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2a75c2b4
......@@ -91,15 +91,7 @@ public:
//
// If you know the cycle number, overload this function.
// Otherwise, VisIt will make up a reasonable one for you.
virtual bool ReturnsValidCycle() const
{
return true;
};
virtual int GetCycle(void);
virtual bool ReturnsValidTime() const
{
return true;
};
virtual double GetTime(void);
virtual const char *GetType(void)
......
......@@ -79,9 +79,7 @@ public:
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
// virtual bool ReturnsValidCycle() const { return true; };
// virtual int GetCycle(void);
// virtual bool ReturnsValidTime() const { return true; };
// virtual double GetTime(void);
//
......
......@@ -111,7 +111,6 @@ class avtBOVFileFormat : public avtSTMDFileFormat
virtual int GetCycle(void) { ReadTOC(); return (cycleIsAccurate ? cycle : INVALID_CYCLE); };
virtual double GetTime(void) { ReadTOC(); return (timeIsAccurate ? dtime : INVALID_TIME); };
virtual bool ReturnsValidCycle(void) { return haveReadTOC; };
void ActivateTimestep(void);
protected:
......
......@@ -81,10 +81,8 @@ class avtCaleFileFormat : public avtSTSDFileFormat
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
virtual bool ReturnsValidCycle() const { return true; };
virtual int GetCycle(void);
virtual int GetCycleFromFilename(const char *f) const;
virtual bool ReturnsValidTime() const { return true; };
virtual double GetTime(void);
//
......
......@@ -77,10 +77,8 @@ class avtCaleHDF5FileFormat : public avtSTSDFileFormat
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
virtual bool ReturnsValidCycle() const { return true; };
virtual int GetCycle(void);
virtual int GetCycleFromFilename(const char *f) const;
virtual bool ReturnsValidTime() const { return true; };
virtual double GetTime(void);
virtual const char *GetType(void) { return "CaleHDF5"; };
......
......@@ -153,9 +153,7 @@ class avtDDCMDFileFormat : public avtSTMDFileFormat
// DestructorFunction &);
//
virtual bool ReturnsValidCycle() const { return true; };
virtual int GetCycle(void);
virtual bool ReturnsValidTime() const { return true; };
virtual double GetTime(void);
void ActivateTimestep(void);
......
......@@ -82,9 +82,7 @@ public:
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
// virtual bool ReturnsValidCycle() const { return true; };
// virtual int GetCycle(void);
// virtual bool ReturnsValidTime() const { return true; };
// virtual double GetTime(void);
//
......
......@@ -68,7 +68,6 @@ class avtGULPFileFormat : public avtMTSDFileFormat
virtual ~avtGULPFileFormat() {;};
virtual int GetNTimesteps(void);
virtual bool ReturnsValidTime() const { return true; };
virtual void GetTimes(std::vector<double> &t);
virtual const char *GetType(void) { return "GULP"; };
......
......@@ -70,9 +70,7 @@ class avtGadgetFileFormat : public avtSTSDFileFormat
virtual vtkDataSet *GetMesh(const char *);
virtual vtkDataArray *GetVar(const char *);
virtual vtkDataArray *GetVectorVar(const char *);
virtual bool ReturnsValidCycle() const { return true; }
virtual int GetCycle(void);
virtual bool ReturnsValidTime() const { return true; }
virtual double GetTime(void);
virtual int GetCycleFromFilename(const char *f) const
{
......
......@@ -269,41 +269,6 @@ avtMFEMFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
}
}
// ****************************************************************************
// Method: avtMFEMFileFormat::ReturnsValidCycle
//
// Purpose:
// Returns if we have valid cycle metadata. For now this always
// returns true.
//
// Programmer: Cyrus Harrison
// Creation: Wed Oct 15 10:52:22 PDT 2014
//
// ****************************************************************************
bool
avtMFEMFileFormat::ReturnsValidCycle() const
{
// VisIt doesn't support diff times / cycles for meshes
// we loop over all meshes to see if any have valid cycle info
if(root)
{
std::vector<std::string> dset_names;
root->DataSets(dset_names);
// enumerate datasets
bool not_found = true;
for(size_t i=0; i<dset_names.size() && not_found ;i++)
{
JSONRootDataSet &dset = root->DataSet(dset_names[i]);
if(dset.HasCycle())
{
return true;
}
}
}
return false;
}
// ****************************************************************************
// Method: avtMFEMFileFormat::GetCycle
//
......@@ -339,42 +304,6 @@ avtMFEMFileFormat::GetCycle()
}
// ****************************************************************************
// Method: avtMFEMFileFormat::ReturnsValidTime
//
// Purpose:
// Returns if we have valid time metadata. For now this always
// returns true.
//
// Programmer: Cyrus Harrison
// Creation: Wed Oct 15 10:52:22 PDT 2014
//
// ****************************************************************************
bool
avtMFEMFileFormat::ReturnsValidTime() const
{
// VisIt doesn't support diff times / cycles for meshes
// we loop over all meshes to see if any have valid time info
if(root)
{
std::vector<std::string> dset_names;
root->DataSets(dset_names);
// enumerate datasets
bool not_found = true;
for(size_t i=0; i<dset_names.size() && not_found ;i++)
{
JSONRootDataSet &dset = root->DataSet(dset_names[i]);
if(dset.HasTime())
{
return true;
}
}
}
return false;
}
// ****************************************************************************
// Method: avtMFEMFileFormat::GetTime
//
......
......@@ -89,9 +89,7 @@ class avtMFEMFileFormat : public avtSTMDFileFormat
virtual vtkDataArray *GetVar(int, const char *);
virtual vtkDataArray *GetVectorVar(int, const char *);
virtual bool ReturnsValidCycle() const;
virtual int GetCycle();
virtual bool ReturnsValidTime() const;
virtual double GetTime();
virtual void ActivateTimestep(void);
......
......@@ -78,10 +78,6 @@ public:
avtMFIXCDFFileFormat(const char *, DBOptionsAttributes *);
virtual ~avtMFIXCDFFileFormat();
virtual bool ReturnsValidTime() const
{
return true;
}
virtual double GetTime(void);
//
......
......@@ -41,9 +41,7 @@ public:
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
virtual bool ReturnsValidCycle() const { return true; };
virtual int GetCycle(void);
virtual bool ReturnsValidTime() const { return true; };
virtual double GetTime(void);
//
......
......@@ -76,9 +76,7 @@ public:
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
// virtual bool ReturnsValidCycle() const { return true; };
// virtual int GetCycle(void);
// virtual bool ReturnsValidTime() const { return true; };
// virtual double GetTime(void);
//
......
......@@ -92,9 +92,7 @@ public:
// Methods overrides for an STSD file format.
virtual const char *GetType();
virtual bool ReturnsValidCycle() const { return true; }
virtual int GetCycle(void);
virtual bool ReturnsValidTime() const { return true; }
virtual double GetTime(void);
virtual void PopulateDatabaseMetaData(avtDatabaseMetaData *);
virtual vtkDataSet *GetMesh(const char *var);
......
......@@ -82,18 +82,10 @@ public:
DestructorFunction &);
virtual bool ReturnsValidCycle() const
{
return true;
};
virtual int GetCycle(void)
{
return preader_->GetCycle();
}
virtual bool ReturnsValidTime() const
{
return true;
};
virtual double GetTime(void)
{
return preader_->GetTime();
......
......@@ -82,9 +82,7 @@ class avtPlainTextFileFormat : public avtSTSDFileFormat
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
// virtual bool ReturnsValidCycle() const { return true; };
// virtual int GetCycle(void);
// virtual bool ReturnsValidTime() const { return true; };
// virtual double GetTime(void);
//
......
......@@ -76,9 +76,7 @@ class avtRAGEFileFormat : public avtSTSDFileFormat
// void *args, DestructorFunction &);
//
virtual bool ReturnsValidCycle() const {return true;}
virtual int GetCycle() {Initialize(); return cycle;}
virtual bool ReturnsValidTime() const {return true;}
virtual double GetTime() {Initialize(); return time;}
virtual const char *GetType() {return "RAGE";}
......
......@@ -92,9 +92,7 @@ public:
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
// virtual bool ReturnsValidCycle() const { return true; };
// virtual int GetCycle(void);
// virtual bool ReturnsValidTime() const { return true; };
// virtual double GetTime(void);
//
......
......@@ -94,26 +94,6 @@ avtTFTFileFormat::~avtTFTFileFormat()
FreeUpResources();
}
// ****************************************************************************
// Method: avtTFTFileFormat::ReturnsValidTime
//
// Purpose:
// Returns whether this format returns valid times.
//
// Programmer: Brad Whitlock
// Creation: Tue Feb 22 17:50:15 PST 2005
//
// Modifications:
//
// ****************************************************************************
bool
avtTFTFileFormat::ReturnsValidTime() const
{
debug4 << "avtTFTFileFormat::ReturnsValidTime" << endl;
return hasValidTime;
}
// ****************************************************************************
// Method: avtTFTFileFormat::GetTime
//
......
......@@ -74,7 +74,6 @@ public:
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
virtual bool ReturnsValidTime() const;
virtual double GetTime(void);
virtual const char *GetType(void) { return "TFT"; };
......
......@@ -85,9 +85,7 @@ public:
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
virtual bool ReturnsValidCycle() const { return true; };
virtual int GetCycle(void);
virtual bool ReturnsValidTime() const { return true; };
virtual double GetTime(void);
......
......@@ -4580,37 +4580,6 @@ void avtVsFileFormat::setAxisLabels(avtMeshMetaData* mmd)
<< "Exiting normally." << std::endl;
}
// *****************************************************************************
// Method: avtVsFileFormat::ReturnsValidCycle
//
// Purpose:
// How do you do the voododo that you do
//
// Programmer: Marc Durant
// Creation: June, 2010
//
// Modifications:
//
bool avtVsFileFormat::ReturnsValidCycle()
{
VsLog::debugLog() << CLASSFUNCLINE << " "
<< "entering" << std::endl;
LoadData();
if (registry->hasCycle())
{
VsLog::debugLog() << CLASSFUNCLINE << " "
<< "returning TRUE." << std::endl;
return true;
}
else
{
VsLog::debugLog() << CLASSFUNCLINE << " "
<< "returning FALSE." << std::endl;
return false;
}
}
// *****************************************************************************
// Method: avtVsFileFormat::GetCycle
......@@ -4647,37 +4616,6 @@ int avtVsFileFormat::GetCycle()
}
}
// *****************************************************************************
// Method: avtVsFileFormat::ReturnsValidTime
//
// Purpose:
// How do you do the voododo that you do
//
// Programmer: Marc Durant
// Creation: June, 2010
//
// Modifications:
//
bool avtVsFileFormat::ReturnsValidTime()
{
VsLog::debugLog() << CLASSFUNCLINE << " "
<< "entering" << std::endl;
LoadData();
if (registry->hasTime())
{
VsLog::debugLog() << CLASSFUNCLINE << " "
<< "returning TRUE." <<std::endl;
return true;
}
else
{
VsLog::debugLog() << CLASSFUNCLINE << " "
<< "returning FALSE." <<std::endl;
return false;
}
}
// *****************************************************************************
// Method: avtVsFileFormat::GetTime
......
......@@ -162,24 +162,12 @@ class avtVsFileFormat: public avtSTMDFileFormat {
virtual void UpdateCyclesAndTimes(avtDatabaseMetaData* md);
protected:
/**
* Determines if the associated file has a valid cycle number
* @return true if cycle is valid, otherwise false
*/
virtual bool ReturnsValidCycle();
/**
* Get the cycle for the associated file
* @return the cycle, or INVALID_CYCLE if none is available
*/
virtual int GetCycle();
/**
* Determines if the associated file has a valid time
* @return true if time is valid, otherwise false
*/
virtual bool ReturnsValidTime();
/**
* Get the time for the associated file
* @return the time, or INVALID_TIME if none is available
......
......@@ -72,9 +72,7 @@ class avtWellLogsFileFormat : public avtSTSDFileFormat
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
// virtual bool ReturnsValidCycle() const { return true; };
// virtual int GetCycle(void);
// virtual bool ReturnsValidTime() const { return true; };
// virtual double GetTime(void);
//
......
......@@ -358,26 +358,6 @@ avtZeusMPFileFormat::GetTime(void)
return haveFileTime ? fileTime : INVALID_TIME;
}
// ****************************************************************************
// Method: avtZeusMPFileFormat::ReturnsValidTime
//
// Purpose:
// Indicates whether the dataset returns a valid time.
//
// Programmer: Brad Whitlock
// Creation: Fri Jan 13 12:17:29 PDT 2006
//
// Modifications:
//
// ****************************************************************************
bool
avtZeusMPFileFormat::ReturnsValidTime() const
{
debug4 << "avtZeusMPFileFormat::ReturnsValidTime: " << (haveFileTime?"true":"false") << endl;
return haveFileTime;
}
// ****************************************************************************
// Method: avtZeusMPFileFormat::ActivateTimestep
//
......
......@@ -77,7 +77,6 @@ public:
avtZeusMPFileFormat(const char *filename);
virtual ~avtZeusMPFileFormat();
virtual bool ReturnsValidTime() const;
virtual double GetTime(void);
virtual const char *GetType(void) { return "ZeusMP HDF"; };
......
......@@ -90,9 +90,7 @@ class avtparaDISFileFormat : public avtSTSDFileFormat
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
// virtual bool ReturnsValidCycle() const { return true; };
// virtual int GetCycle(void);
// virtual bool ReturnsValidTime() const { return true; };
// virtual double GetTime(void);
//
......
......@@ -83,9 +83,7 @@ class avtparaDIS_tecplotFileFormat : public avtSTSDFileFormat
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
// virtual bool ReturnsValidCycle() const { return true; };
// virtual int GetCycle(void);
// virtual bool ReturnsValidTime() const { return true; };
// virtual double GetTime(void);
//
......
......@@ -131,9 +131,7 @@ class avtunvFileFormat : public avtSTSDFileFormat
// file. These should only be defined if the file format knows what the
// time and/or cycle is.
//
// virtual bool ReturnsValidCycle() const { return true; };
// virtual int GetCycle(void);
// virtual bool ReturnsValidTime() const { return true; };
// virtual double GetTime(void);
//
......
......@@ -893,9 +893,7 @@ class AVTGeneratorPlugin : public PluginBase
h << " // file. These should only be defined if the file format knows what the" << Endl;
h << " // time and/or cycle is." << Endl;
h << " //" << Endl;
h << " // virtual bool ReturnsValidCycle() const { return true; };" << Endl;
h << " // virtual int GetCycle(void);" << Endl;
h << " // virtual bool ReturnsValidTime() const { return true; };" << Endl;
h << " // virtual double GetTime(void);" << Endl;
h << " //" << Endl;
h << "" << Endl;
......
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