Commit 72086ee1 authored by hrchilds's avatar hrchilds
Browse files

Update from April 12, 2007

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@873 18c085ea-50e0-402c-830e-de6fd14e8384
parent 07c4da45
......@@ -38,6 +38,9 @@
#include <WindowInformation.h>
#include <DataNode.h>
// Type map format string
const char *WindowInformation::TypeMapFormatString = "sis*i*iibbbbbbbiii*bbfffiDIi";
// ****************************************************************************
// Method: WindowInformation::WindowInformation
//
......@@ -47,13 +50,14 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
// ****************************************************************************
WindowInformation::WindowInformation() : AttributeSubject("sis*i*iibbbbbbbiii*bbfffiDIi")
WindowInformation::WindowInformation() :
AttributeSubject(WindowInformation::TypeMapFormatString)
{
activeTimeSlider = -1;
animationMode = 2;
......@@ -93,13 +97,14 @@ WindowInformation::WindowInformation() : AttributeSubject("sis*i*iibbbbbbbiii*bb
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
// ****************************************************************************
WindowInformation::WindowInformation(const WindowInformation &obj) : AttributeSubject("sis*i*iibbbbbbbiii*bbfffiDIi")
WindowInformation::WindowInformation(const WindowInformation &obj) :
AttributeSubject(WindowInformation::TypeMapFormatString)
{
int i;
......@@ -145,7 +150,7 @@ WindowInformation::WindowInformation(const WindowInformation &obj) : AttributeSu
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -165,7 +170,7 @@ WindowInformation::~WindowInformation()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -220,7 +225,7 @@ WindowInformation::operator = (const WindowInformation &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -278,7 +283,7 @@ WindowInformation::operator == (const WindowInformation &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -299,7 +304,7 @@ WindowInformation::operator != (const WindowInformation &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -320,7 +325,7 @@ WindowInformation::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -348,7 +353,7 @@ WindowInformation::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -374,7 +379,7 @@ WindowInformation::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -401,7 +406,7 @@ WindowInformation::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -571,11 +576,11 @@ WindowInformation::SetFromNode(DataNode *parentNode)
if((node = searchNode->GetNode("viewExtentsType")) != 0)
SetViewExtentsType(node->AsInt());
if((node = searchNode->GetNode("lockView")) != 0)
SetLockView(node->AsInt());
SetLockView(node->AsBool());
if((node = searchNode->GetNode("lockTime")) != 0)
SetLockTime(node->AsInt());
SetLockTime(node->AsBool());
if((node = searchNode->GetNode("lockTools")) != 0)
SetLockTools(node->AsInt());
SetLockTools(node->AsBool());
if((node = searchNode->GetNode("fullFrame")) != 0)
SetFullFrame(node->AsBool());
}
......@@ -622,8 +627,6 @@ void
WindowInformation::SetInteractionMode(int interactionMode_)
{
interactionMode = interactionMode_;
if (interactionMode > 4)
cerr << "Setting a bad interaction mode" << endl;
Select(5, (void *)&interactionMode);
}
......@@ -1005,7 +1008,7 @@ WindowInformation::SelectWindowSize()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -1054,7 +1057,7 @@ WindowInformation::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -1103,7 +1106,7 @@ WindowInformation::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -1152,7 +1155,7 @@ WindowInformation::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......
......@@ -39,11 +39,11 @@ WindowInformation::SetFromNode(DataNode *parentNode)
if((node = searchNode->GetNode("viewExtentsType")) != 0)
SetViewExtentsType(node->AsInt());
if((node = searchNode->GetNode("lockView")) != 0)
SetLockView(node->AsInt());
SetLockView(node->AsBool());
if((node = searchNode->GetNode("lockTime")) != 0)
SetLockTime(node->AsInt());
SetLockTime(node->AsBool());
if((node = searchNode->GetNode("lockTools")) != 0)
SetLockTools(node->AsInt());
SetLockTools(node->AsBool());
if((node = searchNode->GetNode("fullFrame")) != 0)
SetFullFrame(node->AsBool());
}
......@@ -143,4 +143,3 @@ WindowInformation::CreateNode(DataNode *parentNode, bool completeSave, bool forc
return (addToParent || forceAdd);
}
......@@ -50,7 +50,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 21 11:12:47 PDT 2005
// Creation: Thu Apr 12 18:16:46 PST 2007
//
// Modifications:
//
......@@ -178,6 +178,9 @@ private:
double extents[6];
int windowSize[2];
int winMode;
// Static class format string for type map.
static const char *TypeMapFormatString;
};
#endif
......@@ -51,7 +51,7 @@ const char *avtSpeciesMetaData::TypeMapFormatString = "ssbssia*";
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -77,7 +77,7 @@ avtSpeciesMetaData::avtSpeciesMetaData() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -122,7 +122,7 @@ avtSpeciesMetaData::avtSpeciesMetaData(const avtSpeciesMetaData &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -146,7 +146,7 @@ avtSpeciesMetaData::~avtSpeciesMetaData()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -193,7 +193,7 @@ avtSpeciesMetaData::operator = (const avtSpeciesMetaData &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -232,7 +232,7 @@ avtSpeciesMetaData::operator == (const avtSpeciesMetaData &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -253,7 +253,7 @@ avtSpeciesMetaData::operator != (const avtSpeciesMetaData &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -274,7 +274,7 @@ avtSpeciesMetaData::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -302,7 +302,7 @@ avtSpeciesMetaData::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -328,7 +328,7 @@ avtSpeciesMetaData::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -355,7 +355,7 @@ avtSpeciesMetaData::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -382,7 +382,7 @@ avtSpeciesMetaData::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -437,7 +437,7 @@ avtSpeciesMetaData::SelectSpecies()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -462,7 +462,7 @@ avtSpeciesMetaData::AddSpecies(const avtMatSpeciesMetaData &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -490,7 +490,7 @@ avtSpeciesMetaData::ClearSpecies()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -525,7 +525,7 @@ avtSpeciesMetaData::RemoveSpecies(int index)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -546,7 +546,7 @@ avtSpeciesMetaData::GetNumSpecies() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -567,7 +567,7 @@ avtSpeciesMetaData::GetSpecies(int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -588,7 +588,7 @@ avtSpeciesMetaData::GetSpecies(int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -609,7 +609,7 @@ avtSpeciesMetaData::operator [] (int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......
Function: avtSpeciesMetaData2
Declaration: avtSpeciesMetaData::avtSpeciesMetaData(const std::string &n, const std::string &meshn, const std::string &matn, int nummat, const intVector &ns, const std::vector<stringVector> &sn);
Declaration: avtSpeciesMetaData(const std::string &n, const std::string &meshn, const std::string &matn, int nummat, const intVector &ns, const std::vector<stringVector> &sn);
Definition:
// ****************************************************************************
// Method: avtSpeciesMetaData constructor
......
......@@ -51,7 +51,7 @@ class avtMatSpeciesMetaData;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:19 PST 2007
// Creation: Thu Apr 12 16:04:02 PST 2007
//
// Modifications:
//
......@@ -96,7 +96,7 @@ public:
const avtMatSpeciesMetaData &operator [] (int i) const;
// User-defined methods
avtSpeciesMetaData::avtSpeciesMetaData(const std::string &n, const std::string &meshn, const std::string &matn, int nummat, const intVector &ns, const std::vector<stringVector> &sn);
avtSpeciesMetaData(const std::string &n, const std::string &meshn, const std::string &matn, int nummat, const intVector &ns, const std::vector<stringVector> &sn);
void Print(ostream &, int = 0) const;
protected:
AttributeGroup *CreateSubAttributeGroup(int index);
......
......@@ -58,7 +58,7 @@
#include <MIR.h>
struct avtDatasetCollection;
struct avtMatSpeciesMetaData;
class avtMatSpeciesMetaData;
class avtDomainBoundaries;
class avtFileFormatInterface;
class avtMixedVariable;
......
......@@ -1354,8 +1354,11 @@ avtConnComponentsExpression::BoundarySet::Finalize()
// cleanup old itrees if they exist
if(itrees.size() > 0)
{
if(itrees[i] != NULL)
delete itrees[i];
for (i = 0; i < itrees.size(); i++)
{
if(itrees[i] != NULL)
delete itrees[i];
}
}
itrees.clear();
......
......@@ -188,7 +188,7 @@ int bof2bow(bowglobal bg,int ti,int bi,int vi,int xs,int ys,int zs,
int x0,int y0,int z0,float *vtab,float v0,float v1,float q,
char **rbow,int *rbowsize)
{
int i,j,k,n,ibig[256],*ip,bigcnt,s,nti,ntimax,ntab[40],ii,kio,ksio;
int i,j,k,n,ibig[256],bigcnt,s,nti,ntimax,ntab[40],ii,kio;
short *vshrt;
float td,thresh[40],a,f,fbig[256],*vtab1,vmaxtab[40],vmax;
char *outbuf,*buf;
......@@ -346,10 +346,10 @@ int bof2bow(bowglobal bg,int ti,int bi,int vi,int xs,int ys,int zs,
float *bow2bof(bowglobal bg,char *bow,int bowi)
{
int size,offset,notran,ti,bi,vi,xs,ys,zs,x0,y0,z0;
int i,j,k,n,bigcnt,ibig[256],ii,kio,ksio,*ip,ks;
int i,j,k,n,bigcnt,ibig[256],kio;
int ntab[40],nti,ntimax,s;
short *vshrt;
float v0,v1,*vtab,a,fbig[256],*fp,vmaxtab[40],vmax,f;
float v0,v1,*vtab,a,fbig[256],vmaxtab[40],vmax;
unsigned char *ub;
bowinfo binf;
......@@ -489,8 +489,8 @@ float *bow2bof(bowglobal bg,char *bow,int bowi)
bowinfo bow_getbowinfo(bowglobal bg,char *bow)
{
int i,n,ti,bi,vi,xs,ys,zs,x0,y0,z0,iscat,nb,size,offset,notran;
int ii,kio,ksio,*ip,ks;
float v0,v1,f;
int kio,ksio;
float v0,v1;
bowinfo binf;
unsigned char *ub;
......@@ -551,8 +551,8 @@ void bow_freebowinfo(bowglobal bg,bowinfo binf)
char *bow_cat(bowglobal bg,int numbow,char **bowtab)
{
int bowi,nbow,size,k,ks,js,ii,kio,ksio;
int i,b,n,nb,ti,bi,vi,xs,ys,zs,x0,y0,z0,*ip;
float v0,v1,f,*fp;
int b,n,nb,ti,bi,vi,xs,ys,zs,x0,y0,z0;
float v0,v1,f;
char *bow,*buf;
unsigned char *ub;
......@@ -652,7 +652,8 @@ int bow_test(bowglobal bg,int ti,int bi,int vi,int xs,int ys,int zs,
bow_freebowinfo(bg,binf);
return -1;
}
f1=0.0;
f1=0.0f;
fsum = 0.0f;
for (i=0;i<n;i++)
{ f=vsum[i]-vcop[i]; if (f<0.0) f= -f; fsum+=f; if (f>f1) f1=f; }
fsum/=(float)n;
......@@ -735,7 +736,7 @@ static void find_tmpdir(char *tmpdir)
static char *fioX_read(bowglobal bg,char *pathsrc)
{
int id,n,m;
int id,n;
static struct stat st_store;
static struct stat *st = &st_store;
char *buf;
......
......@@ -199,7 +199,7 @@ void fwav_destroy(fwav fw)
void fwav_atran(fwav fw,float *v)
{
int dx,dy,dz,i;
int dx,dy,dz;
float *b1,*td;
fw->v=v;
......@@ -230,7 +230,7 @@ void fwav_stran(fwav fw,float *v)
void fwav_atran_x(fwav fw,float *ba0,int dx,int dy,int dz)
{
int j,dx2,x,y,z;
int j,dx2,y,z;
float a0,a1,a2,v0,v1;
float *ba,*bu,*bv,td0,td1;
......@@ -256,7 +256,7 @@ void fwav_atran_x(fwav fw,float *ba0,int dx,int dy,int dz)
void fwav_atran_y(fwav fw,float *b0,int dx,int dy,int dz)
{
int j,dy2,x,y,z;
int j,dy2,y,z;
float *ba0,*ba1,*ba2,*bb,v1,td0,td1;
td0=fw->td0; td1=fw->td1;
......@@ -285,7 +285,7 @@ void fwav_atran_y(fwav fw,float *b0,int dx,int dy,int dz)
void fwav_atran_z(fwav fw,float *b0,int dx,int dy,int dz)
{
int j,dz2,x,y,z,dd,d;
int j,dz2,y,z,dd,d;
float *ba0,*ba1,*ba2,*bb,v1,td0,td1;
td0=fw->td0; td1=fw->td1;
......@@ -330,8 +330,8 @@ void fwav_stran_xyz(fwav fw,float *b1,int dx,int dy,int dz)
void fwav_stran_x(fwav fw,float *b1,int dx,int dy,int dz)
{
int j,dx2,dxv,x,y,z,d;
float a0,a1,a2,v0,v1;
int j,dx2,dxv,y,z,d;
float a0,a2,v0,v1;
float *ba,*bu,*bv;
dx2=HALF(dx); d=dz*dy*dx2; dxv=dx>>1;
......@@ -365,7 +365,7 @@ void fwav_stran_x(fwav fw,float *b1,int dx,int dy,int dz)
void fwav_stran_y(fwav fw,float *b1,int dx,int dy,int dz)
{
int j,dy2,x,y,z,d,dyv,y2;
int j,dy2,y,z,d,dyv,y2;
float *ba0,*ba1,*ba2,*bb;
dy2=HALF(dy); d=dx*dy2*dz; dyv=dy>>1;
......@@ -394,7 +394,7 @@ void fwav_stran_y(fwav fw,float *b1,int dx,int dy,int dz)
void fwav_stran_z(fwav fw,float *b1,int dx,int dy,int dz)
{
int j,dz2,x,y,z,dd,d,dzv,z2;
int j,dz2,y,z,dd,d,dzv,z2;
float *ba0,*ba1,*ba2,*bb;
dz2=HALF(dz); dd=dx*dy; d=dx*dy*dz2; dzv=dz>>1;
......
......@@ -1173,7 +1173,7 @@ avtBoxlib2DFileFormat::GetVectorVar(int patch, const char *var_name)
// only need one offset.
const int * offset = fab[0]->box().loVect();
IntVect pos;
int x, y, z;
int x, y;
for (y = 0; y < dims[1]; ++y)
{
pos[1] = y + offset[1] + yorigin;
......@@ -1327,14 +1327,12 @@ avtBoxlib2DFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
if (varCentering[v] == AVT_UNKNOWN_CENT)
continue;
char var_name[1024];
AddScalarVarToMetaData(md, varNames[v], mesh_name,
(avtCentering)varCentering[v]);
}
for (v = 0; v < nVectors; ++v)
{
char var_name[1024];
AddVectorVarToMetaData(md, vectorNames[v], mesh_name,
(avtCentering)vectorCentering[v], dimension);
}
......@@ -1382,7 +1380,6 @@ avtBoxlib2DFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
void
avtBoxlib2DFileFormat::CalculateDomainNesting(void)
{
int i;
int level;
//
......
......@@ -1444,14 +1444,12 @@ avtBoxlib3DFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
if (varCentering[v] == AVT_UNKNOWN_CENT)
continue;
char var_name[1024];
AddScalarVarToMetaData(md, varNames[v], mesh_name,
(avtCentering)varCentering[v]);
}
for (v = 0; v < nVectors; ++v)
{
char var_name[1024];
AddVectorVarToMetaData(md, vectorNames[v], mesh_name,
(avtCentering)vectorCentering[v], dimension);
}
......@@ -1510,7 +1508,6 @@ avtBoxlib3DFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
void
avtBoxlib3DFileFormat::CalculateDomainNesting(void)
{
int i;
int level;
//
......
......@@ -676,7 +676,7 @@ avtChomboFileFormat::InitializeReader(void)
void
avtChomboFileFormat::CalculateDomainNesting(void)
{