Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit befc1bc3 authored by hrchilds's avatar hrchilds

Renamings:

1) RefashionDataObjectInformation to UpdateDataObjectInformation
2) avtPipelineSpecification to avtContract
3) avtDataSpeficiation to avtDataRequest
4) PerformRestriction to ModifyContract
5) Terminating <-> Originating for Sources/Sinks



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@3193 18c085ea-50e0-402c-830e-de6fd14e8384
parent 90892d44
......@@ -146,7 +146,7 @@ avtDDFConstructor::~avtDDFConstructor()
avtDDF *
avtDDFConstructor::ConstructDDF(ConstructDDFAttributes *atts,
avtPipelineSpecification_p spec)
avtContract_p spec)
{
int i, j, k, l;
......@@ -274,7 +274,7 @@ avtDDFConstructor::ConstructDDF(ConstructDDFAttributes *atts,
//
// Make the input pipeline execute again to get the variables we need.
//
int timeStart = spec->GetDataSpecification()->GetTimestep();
int timeStart = spec->GetDataRequest()->GetTimestep();
int timeEnd = timeStart+1;
int timeStride = 1;
if (atts->GetOverTime())
......@@ -296,13 +296,13 @@ avtDDFConstructor::ConstructDDF(ConstructDDFAttributes *atts,
{
for (int time = timeStart ; time < timeEnd ; time += timeStride)
{
avtPipelineSpecification_p spec2 =
new avtPipelineSpecification(spec);
avtDataSpecification_p dspec = spec2->GetDataSpecification();
dspec->AddSecondaryVariable(atts->GetCodomainName().c_str());
avtContract_p spec2 =
new avtContract(spec);
avtDataRequest_p dataRequest = spec2->GetDataRequest();
dataRequest->AddSecondaryVariable(atts->GetCodomainName().c_str());
for (i = 0 ; i < atts->GetVarnames().size() ; i++)
dspec->AddSecondaryVariable(atts->GetVarnames()[i].c_str());
dspec->SetTimestep(time);
dataRequest->AddSecondaryVariable(atts->GetVarnames()[i].c_str());
dataRequest->SetTimestep(time);
GetInput()->Update(spec2);
if (GetInput()->GetInfo().GetValidity().HasErrorOccurred())
{
......
......@@ -45,7 +45,7 @@
#include <ddf_exports.h>
#include <avtOriginatingDatasetSink.h>
#include <avtTerminatingDatasetSink.h>
#include <vector>
#include <string>
......@@ -67,14 +67,14 @@ class avtDDF;
//
// ****************************************************************************
class AVTDDF_API avtDDFConstructor : public virtual avtOriginatingDatasetSink
class AVTDDF_API avtDDFConstructor : public virtual avtTerminatingDatasetSink
{
public:
avtDDFConstructor();
virtual ~avtDDFConstructor();
avtDDF *ConstructDDF(ConstructDDFAttributes *,
avtPipelineSpecification_p);
avtContract_p);
};
......
......@@ -734,7 +734,7 @@ avtDatabase::PopulateDataObjectInformation(avtDataObject_p &dob,
const char *var,
int ts,
const vector<bool> &selectionsApplied,
avtDataSpecification_p spec)
avtDataRequest_p spec)
{
int i;
......@@ -1976,7 +1976,7 @@ avtDatabase::GetIOInformation(int stateIndex)
// ****************************************************************************
bool
avtDatabase::CanDoDynamicLoadBalancing(avtDataSpecification_p)
avtDatabase::CanDoDynamicLoadBalancing(avtDataRequest_p)
{
return true;
}
......@@ -1998,7 +1998,7 @@ avtDatabase::CanDoDynamicLoadBalancing(avtDataSpecification_p)
// ****************************************************************************
int
avtDatabase::NumStagesForFetch(avtDataSpecification_p)
avtDatabase::NumStagesForFetch(avtDataRequest_p)
{
return 1;
}
......@@ -2098,7 +2098,7 @@ avtDatabase::GetFileListFromTextFile(const char *textfile,
// Queries the db regarding var info for a specific pick point.
//
// Arguments:
// dspec A database specification.
// dataRequest A database specification.
// pa The pick attributes in which to story the var information.
//
// Programmer: Kathleen Bonnell
......@@ -2487,7 +2487,7 @@ avtDatabase::Query(PickAttributes *pa)
// ****************************************************************************
bool
avtDatabase::GetExtentsFromAuxiliaryData(avtDataSpecification_p spec,
avtDatabase::GetExtentsFromAuxiliaryData(avtDataRequest_p spec,
const char *var, const char *type, double *extents)
{
if (*spec == NULL)
......@@ -2495,7 +2495,7 @@ avtDatabase::GetExtentsFromAuxiliaryData(avtDataSpecification_p spec,
VoidRefList list;
avtDataSpecification_p tmp_spec = new avtDataSpecification(spec, -1);
avtDataRequest_p tmp_spec = new avtDataRequest(spec, -1);
GetAuxiliaryData(tmp_spec, list, type, (void *) var);
if (list.nList != 1 || *(list.list[0]) == NULL)
......
......@@ -50,7 +50,7 @@
#include <void_ref_ptr.h>
#include <avtDataSpecification.h>
#include <avtDataRequest.h>
#include <avtDataset.h>
#include <avtIOInformation.h>
#include <avtTypes.h>
......@@ -295,7 +295,7 @@ class DATABASE_API avtDatabase
avtDataObject_p GetOutput(const char *, int);
virtual void GetAuxiliaryData(avtDataSpecification_p,
virtual void GetAuxiliaryData(avtDataRequest_p,
VoidRefList &,
const char *type,void *args)=0;
......@@ -316,8 +316,8 @@ class DATABASE_API avtDatabase
virtual bool MetaDataIsInvariant(void);
virtual bool SILIsInvariant(void);
virtual bool CanDoDynamicLoadBalancing(
avtDataSpecification_p);
virtual int NumStagesForFetch(avtDataSpecification_p);
avtDataRequest_p);
virtual int NumStagesForFetch(avtDataRequest_p);
const avtIOInformation &GetIOInformation(int stateIndex);
......@@ -403,8 +403,8 @@ class DATABASE_API avtDatabase
const char *,
int,
const vector<bool> &selsApplied,
avtDataSpecification_p =NULL);
bool GetExtentsFromAuxiliaryData(avtDataSpecification_p spec,
avtDataRequest_p =NULL);
bool GetExtentsFromAuxiliaryData(avtDataRequest_p spec,
const char *var,
const char *type,
double *extents);
......
......@@ -75,7 +75,7 @@ class DATABASE_API avtDatasetDatabase : public avtDatabase
avtDataObjectSource *CreateSource(const char *, int);
virtual avtDataTree_p GetOutput(avtDataSpecification_p,
virtual avtDataTree_p GetOutput(avtDataRequest_p,
avtSourceFromDatabase *) = 0;
};
......
......@@ -331,21 +331,21 @@ class DATABASE_API avtGenericDatabase : public avtDatasetDatabase
avtGenericDatabase(avtFileFormatInterface *);
virtual ~avtGenericDatabase();
virtual void GetAuxiliaryData(avtDataSpecification_p,
virtual void GetAuxiliaryData(avtDataRequest_p,
VoidRefList &,
const char *type, void *args);
virtual avtDataTree_p GetOutput(avtDataSpecification_p,
virtual avtDataTree_p GetOutput(avtDataRequest_p,
avtSourceFromDatabase *);
virtual void FreeUpResources(void);
virtual int NumStagesForFetch(avtDataSpecification_p);
virtual int NumStagesForFetch(avtDataRequest_p);
virtual const char *GetFilename(int);
virtual bool HasInvariantMetaData(void) const;
virtual bool HasInvariantSIL(void) const;
virtual bool CanDoDynamicLoadBalancing(
avtDataSpecification_p);
avtDataRequest_p);
virtual void ActivateTimestep(int stateIndex);
......@@ -376,49 +376,49 @@ class DATABASE_API avtGenericDatabase : public avtDatasetDatabase
vtkDataSet *GetDataset(const char *, int, int, const char *,
const std::vector<CharStrRef> &,
avtDataSpecification_p,
avtDataRequest_p,
avtSourceFromDatabase *);
vtkDataSet *GetScalarVarDataset(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataSet *GetMeshDataset(const char *, int, int,
const char *, const avtDataSpecification_p);
const char *, const avtDataRequest_p);
vtkDataSet *GetVectorVarDataset(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataSet *GetSymmetricTensorVarDataset(const char *, int,
int, const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataSet *GetTensorVarDataset(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataSet *GetArrayVarDataset(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataSet *GetMaterialDataset(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataSet *GetSpeciesDataset(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataSet *GetLabelVarDataset(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataArray *GetScalarVariable(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataArray *GetVectorVariable(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataArray *GetSymmetricTensorVariable(const char *,int,int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataArray *GetTensorVariable(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataArray *GetArrayVariable(const char *, int, int,
const char *,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataArray *GetSpeciesVariable(const char *, int, int,
const char *, int);
vtkDataArray *GetLabelVariable(const char *, int, int,
......@@ -428,9 +428,9 @@ class DATABASE_API avtGenericDatabase : public avtDatasetDatabase
void AddSecondaryVariables(vtkDataSet *, int, int,
const char *,
const std::vector<CharStrRef> &,
const avtDataSpecification_p);
const avtDataRequest_p);
vtkDataSet *GetMesh(const char *, int, int, const char *,
avtDataSpecification_p);
avtDataRequest_p);
void AddOriginalCellsArray(vtkDataSet *, const int);
void AddOriginalNodesArray(vtkDataSet *, const int);
......@@ -450,56 +450,56 @@ class DATABASE_API avtGenericDatabase : public avtDatasetDatabase
avtMaterial *, int, bool, bool, bool,
bool, int, int, float, bool, bool&, bool&,bool,
avtMaterial *&);
avtMaterial *GetMaterial(int, const char *, int, const avtDataSpecification_p = 0);
avtMaterial *GetMaterial(int, const char *, int, const avtDataRequest_p = 0);
avtSpecies *GetSpecies(int, const char *, int);
void GetMaterialIndices(avtMaterial *,
stringVector &,
intVector &);
void ReadDataset(avtDatasetCollection &,
intVector &, avtDataSpecification_p &,
intVector &, avtDataRequest_p &,
avtSourceFromDatabase *,
boolVector &);
avtDomainBoundaries *GetDomainBoundaryInformation(
avtDatasetCollection &, intVector &,
avtDataSpecification_p,
avtDataRequest_p,
bool confirmInputMeshHasRightSize = true);
bool CommunicateGhosts(avtGhostDataType,
avtDatasetCollection &, intVector &,
avtDataSpecification_p &,
avtDataRequest_p &,
avtSourceFromDatabase *, intVector &,bool);
bool CommunicateGhostZonesFromDomainBoundaries(
avtDomainBoundaries *,
avtDatasetCollection &, intVector &,
avtDataSpecification_p &,
avtDataRequest_p &,
avtSourceFromDatabase *);
bool CommunicateGhostZonesFromDomainBoundariesFromFile(
avtDatasetCollection &, intVector &,
avtDataSpecification_p &,
avtDataRequest_p &,
avtSourceFromDatabase *);
bool CommunicateGhostNodesFromDomainBoundariesFromFile(
avtDatasetCollection &, intVector &,
avtDataSpecification_p &,
avtDataRequest_p &,
avtSourceFromDatabase *, intVector &);
bool CommunicateGhostZonesFromGlobalNodeIds(
avtDatasetCollection &, intVector &,
avtDataSpecification_p &,
avtDataRequest_p &,
avtSourceFromDatabase *);
bool CommunicateGhostNodesFromGlobalNodeIds(
avtDatasetCollection &, intVector &,
avtDataSpecification_p &,
avtDataRequest_p &,
avtSourceFromDatabase *);
bool ApplyGhostForDomainNesting(avtDatasetCollection &,
intVector &, intVector &,
avtDataSpecification_p &, bool);
avtDataRequest_p &, bool);
void MaterialSelect(avtDatasetCollection &,
intVector &, avtDataSpecification_p &,
intVector &, avtDataRequest_p &,
avtSourceFromDatabase *, bool);
void SpeciesSelect(avtDatasetCollection &,
intVector &, boolVector &,
avtDataSpecification_p &,
avtDataRequest_p &,
avtSourceFromDatabase *);
void EnumScalarSelect(avtDatasetCollection &,
const boolVector &,
......@@ -514,18 +514,18 @@ class DATABASE_API avtGenericDatabase : public avtDatasetDatabase
void CreateGlobalZones(avtDatasetCollection &,
intVector &,
avtSourceFromDatabase *,
avtDataSpecification_p &);
avtDataRequest_p &);
void CreateGlobalNodes(avtDatasetCollection &,
intVector &,
avtSourceFromDatabase *,
avtDataSpecification_p &);
avtDataRequest_p &);
void CreateStructuredIndices(avtDatasetCollection &,
avtSourceFromDatabase*);
bool CreateSimplifiedNestingRepresentation(
avtDatasetCollection &,
intVector &, intVector &,
avtSourceFromDatabase*,
avtDataSpecification_p &);
avtDataRequest_p &);
vtkUnstructuredGrid *CreateSimplifiedNestingRepresentation(
vtkRectilinearGrid *, int,
intVector &,
......@@ -534,7 +534,7 @@ class DATABASE_API avtGenericDatabase : public avtDatasetDatabase
avtGhostDataType);
void CreateAMRIndices(avtDatasetCollection &,
intVector &,
avtDataSpecification_p &,
avtDataRequest_p &,
avtSourceFromDatabase*,
int level);
void UpdateInternalState(int);
......
......@@ -187,7 +187,7 @@ avtSourceFromDatabase::~avtSourceFromDatabase()
// ****************************************************************************
bool
avtSourceFromDatabase::FetchDataset(avtDataSpecification_p spec,
avtSourceFromDatabase::FetchDataset(avtDataRequest_p spec,
avtDataTree_p &tree)
{
TRY
......@@ -294,7 +294,7 @@ avtSourceFromDatabase::FetchDataset(avtDataSpecification_p spec,
// change. No good copy constructor for data specification, so make use
// a two-step process.
//
lastSpec = new avtDataSpecification(spec, 0);
lastSpec = new avtDataRequest(spec, 0);
lastSpec = spec;
// '5723 BEGIN
......@@ -325,7 +325,7 @@ avtSourceFromDatabase::FetchDataset(avtDataSpecification_p spec,
void
avtSourceFromDatabase::FetchVariableAuxiliaryData(const char *type, void *args,
avtDataSpecification_p spec, VoidRefList &output)
avtDataRequest_p spec, VoidRefList &output)
{
database->GetAuxiliaryData(spec, output, type, args);
}
......@@ -348,20 +348,20 @@ avtSourceFromDatabase::FetchVariableAuxiliaryData(const char *type, void *args,
//
// Modifications:
// Kathleen Bonnell, Mon Jun 28 07:48:55 PDT 2004
// Use timestep from DataSpecification.
// Use timestep from DataRequest.
//
// ****************************************************************************
void
avtSourceFromDatabase::FetchMeshAuxiliaryData(const char *type, void *args,
avtDataSpecification_p spec, VoidRefList &output)
avtDataRequest_p spec, VoidRefList &output)
{
//
// We only have hooks to the variable defined on the mesh. We can get
// the mesh name by accessing the database object.
//
string mn = database->GetMetaData(spec->GetTimestep())->MeshForVar(variable);
avtDataSpecification_p newspec =new avtDataSpecification(spec, mn.c_str());
avtDataRequest_p newspec =new avtDataRequest(spec, mn.c_str());
database->GetAuxiliaryData(newspec, output, type, args);
}
......@@ -384,13 +384,13 @@ avtSourceFromDatabase::FetchMeshAuxiliaryData(const char *type, void *args,
//
// Modifications:
// Kathleen Bonnell, Mon Jun 28 07:48:55 PDT 2004
// Use timestep from DataSpecification.
// Use timestep from DataRequest.
//
// ****************************************************************************
void
avtSourceFromDatabase::FetchMaterialAuxiliaryData(const char *type, void *args,
avtDataSpecification_p spec, VoidRefList &output)
avtDataRequest_p spec, VoidRefList &output)
{
//
// We only have hooks to the variable defined on the material. We can get
......@@ -398,7 +398,7 @@ avtSourceFromDatabase::FetchMaterialAuxiliaryData(const char *type, void *args,
//
string mn = database->GetMetaData(spec->GetTimestep())->MeshForVar(variable);
string mat = database->GetMetaData(spec->GetTimestep())->MaterialOnMesh(mn);
avtDataSpecification_p newspec =new avtDataSpecification(spec, mat.c_str());
avtDataRequest_p newspec =new avtDataRequest(spec, mat.c_str());
database->GetAuxiliaryData(newspec, output, type, args);
}
......@@ -421,13 +421,13 @@ avtSourceFromDatabase::FetchMaterialAuxiliaryData(const char *type, void *args,
//
// Modifications:
// Kathleen Bonnell, Mon Jun 28 07:48:55 PDT 2004
// Use timestep from DataSpecification.
// Use timestep from DataRequest.
//
// ****************************************************************************
void
avtSourceFromDatabase::FetchSpeciesAuxiliaryData(const char *type, void *args,
avtDataSpecification_p spec, VoidRefList &output)
avtDataRequest_p spec, VoidRefList &output)
{
//
// We only have hooks to the variable defined on the species. We can get
......@@ -435,13 +435,13 @@ avtSourceFromDatabase::FetchSpeciesAuxiliaryData(const char *type, void *args,
//
string mn = database->GetMetaData(spec->GetTimestep())->MeshForVar(variable);
string sp = database->GetMetaData(spec->GetTimestep())->SpeciesOnMesh(mn);
avtDataSpecification_p newspec =new avtDataSpecification(spec, sp.c_str());
avtDataRequest_p newspec =new avtDataRequest(spec, sp.c_str());
database->GetAuxiliaryData(newspec, output, type, args);
}
// ****************************************************************************
// Method: avtSourceFromDatabase::GetFullDataSpecification
// Method: avtSourceFromDatabase::GetFullDataRequest
//
// Purpose:
// Gets the full database specification for this variable on this
......@@ -470,8 +470,8 @@ avtSourceFromDatabase::FetchSpeciesAuxiliaryData(const char *type, void *args,
//
// ****************************************************************************
avtDataSpecification_p
avtSourceFromDatabase::GetFullDataSpecification(void)
avtDataRequest_p
avtSourceFromDatabase::GetFullDataRequest(void)
{
const char *acting_var = variable;
if (*lastSpec != NULL)
......@@ -487,8 +487,8 @@ avtSourceFromDatabase::GetFullDataSpecification(void)
string mesh = md->MeshForVar(variable);
silr->SetTopSet(mesh.c_str());
avtDataSpecification_p rv =
new avtDataSpecification(acting_var, timestep, silr);
avtDataRequest_p rv =
new avtDataRequest(acting_var, timestep, silr);
// '5723 BEGIN
if (*lastSpec != NULL)
......@@ -561,7 +561,7 @@ avtSourceFromDatabase::DatabaseProgress(int cur, int tot, const char *desc)
// ****************************************************************************
int
avtSourceFromDatabase::NumStagesForFetch(avtDataSpecification_p spec)
avtSourceFromDatabase::NumStagesForFetch(avtDataRequest_p spec)
{
return database->NumStagesForFetch(spec);
}
......@@ -719,7 +719,7 @@ avtSourceFromDatabase::GetSIL(int timestate)
void
avtSourceFromDatabase::ReleaseData(void)
{
avtTerminatingDatasetSource::ReleaseData();
avtOriginatingDatasetSource::ReleaseData();
if (GetOutput()->GetInfo().GetValidity().GetIsThisDynamic())
{
database->FreeUpResources();
......
......@@ -45,7 +45,7 @@
#include <database_exports.h>
#include <avtTerminatingDatasetSource.h>
#include <avtOriginatingDatasetSource.h>
#include <avtDataTree.h>
......@@ -71,7 +71,7 @@ class PickAttributes;
// Made FetchDomain return an avtDomain.
//
// Kathleen Bonnell, Tue Dec 19 09:06:23 PST 2000
// Renamed avtTerminatingSource as avtTerminatingDatasetSource.
// Renamed avtOriginatingSource as avtOriginatingDatasetSource.
//
// Kathleen Bonnell, Fri Feb 9 16:38:40 PST 2001
// Made FetchDomain return avtDomainTree_p.
......@@ -125,7 +125,7 @@ class PickAttributes;
//
// ****************************************************************************
class DATABASE_API avtSourceFromDatabase : public avtTerminatingDatasetSource
class DATABASE_API avtSourceFromDatabase : public avtOriginatingDatasetSource
{
public:
avtSourceFromDatabase(avtDatasetDatabase *,
......@@ -133,18 +133,18 @@ class DATABASE_API avtSourceFromDatabase : public avtTerminatingDatasetSource
virtual ~avtSourceFromDatabase();
virtual void FetchMeshAuxiliaryData(const char *type, void *args,
avtDataSpecification_p, VoidRefList &);
avtDataRequest_p, VoidRefList &);
virtual void FetchVariableAuxiliaryData(const char *type,
void *args, avtDataSpecification_p, VoidRefList &);
void *args, avtDataRequest_p, VoidRefList &);
virtual void FetchMaterialAuxiliaryData(const char *type,
void *args, avtDataSpecification_p, VoidRefList &);
void *args, avtDataRequest_p, VoidRefList &);
virtual void FetchSpeciesAuxiliaryData(const char *type,
void *args, avtDataSpecification_p, VoidRefList &);
void *args, avtDataRequest_p, VoidRefList &);
avtSIL *GetSIL(int stateIndex);
virtual avtDataSpecification_p
GetFullDataSpecification(void);
virtual avtDataRequest_p
GetFullDataRequest(void);
void InvalidateZones(void);
void DatabaseProgress(int, int, const char *);
......@@ -162,10 +162,10 @@ class DATABASE_API avtSourceFromDatabase : public avtTerminatingDatasetSource
avtDatasetDatabase *database;
char *variable;
int timestep;
avtDataSpecification_p lastSpec;
avtDataRequest_p lastSpec;
virtual bool FetchDataset(avtDataSpecification_p, avtDataTree_p &);
virtual int NumStagesForFetch(avtDataSpecification_p);