Commit c41cbd1d authored by miller86's avatar miller86

fixing compilation warning fixes

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23677 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0a130204
......@@ -457,8 +457,6 @@ avtBOVFileFormat::GetMesh(int dom, const char *meshname)
return rv;
}
#define BRICKLET_READ
#ifdef BRICKLET_READ
// ****************************************************************************
// Method: ReadBricklet
//
......@@ -524,7 +522,7 @@ ReadBricklet(FILE *fp, T *dest, const long long *full_size,
for(long long y = start[1]; y < end[1]; ++y)
{
// Read in a line of data in x.
size_t result = fread((void *)ptr, sizeof(T), nxelem, fp); (void) result;
fread((void *)ptr, sizeof(T), nxelem, fp);
ptr += nxelem;
// Seek to the next line
......@@ -547,7 +545,6 @@ ReadBricklet(FILE *fp, T *dest, const long long *full_size,
}
}
}
#endif
//
// Endian conversion routines.
......@@ -967,7 +964,7 @@ avtBOVFileFormat::GetVar(int dom, const char *var)
// Determine the unit_size, which is the size of the data in the file,
// and allocate the return VTK object.
//
long long unit_size = 0; /* TODO: check on fix for uninitialized variable */
long long unit_size = 0;
vtkDataArray *rv = 0;
if(dataFormat == ByteData)
{
......@@ -1061,7 +1058,6 @@ avtBOVFileFormat::GetVar(int dom, const char *var)
<< y_stop << ", " << z_stop << endl;
debug4 << mName << "Number of tuples in bricklet: " << nvals << endl;
#ifdef BRICKLET_READ
if(!gzipped)
{
debug4 << mName << "Reading bricklet directly from file" << endl;
......@@ -1110,7 +1106,6 @@ avtBOVFileFormat::GetVar(int dom, const char *var)
}
}
else
#endif
{
debug4 << mName << "Reading whole brick to obtain bricklet" << endl;
//
......@@ -1591,7 +1586,6 @@ avtBOVFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
{
long long nx = full_size[0] / bricklet_size[0];
long long ny = full_size[1] / bricklet_size[1];
//long long nz = full_size[2] / bricklet_size[2];
long long z_off = i / (nx*ny);
long long y_off = (i % (nx*ny)) / nx;
long long x_off = i % nx;
......@@ -1616,40 +1610,6 @@ avtBOVFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
avtStructuredDomainBoundaries::Destruct);
cache->CacheVoidRef("any_mesh",
AUXILIARY_DATA_DOMAIN_BOUNDARY_INFORMATION, -1, -1, vr);
/*
avtIsenburgSGG *rdb = new avtIsenburgSGG;
rdb->SetNumberOfDomains(nbricks);
for (int i = 0 ; i < nbricks ; i++)
{
int sz[3] = { bricklet_size[0], bricklet_size[1], bricklet_size[2] };
int ori[3];
int nei[6];
int nx = full_size[0] / bricklet_size[0];
int ny = full_size[1] / bricklet_size[1];
int nz = full_size[2] / bricklet_size[2];
int z_off = i / (nx*ny);
int y_off = (i % (nx*ny)) / nx;
int x_off = i % nx;
ori[0] = x_off * (bricklet_size[0]);
ori[1] = y_off * (bricklet_size[1]);
ori[2] = z_off * (bricklet_size[2]);
nei[0] = (x_off == 0 ? -1 : i-1);
nei[1] = (x_off == (nx-1) ? -1 : i+1);
nei[2] = (y_off == 0 ? -1 : i-nx);
nei[3] = (y_off == (ny-1) ? -1 : i+nx);
nei[4] = (z_off == 0 ? -1 : i-nx*ny);
nei[5] = (z_off == (nz-1) ? -1 : i+nx*ny);
rdb->SetInfoForDomain(i, ori, sz, nei);
}
rdb->FinalizeDomainInformation();
void_ref_ptr vr = void_ref_ptr(rdb,
avtStreamingGhostGenerator::Destruct);
cache->CacheVoidRef("any_mesh",
AUXILIARY_DATA_STREAMING_GHOST_GENERATION, -1, -1, vr);
*/
}
GetMemorySize(size, rss);
......@@ -1826,11 +1786,7 @@ avtBOVFileFormat::ReadTOC(void)
}
char *currPos = header + 1;
//bool readDescr = false;
//bool readShape = false;
//bool readFortranOrder = false;
bool fortranOrder = false;
while (*currPos)
{
if (*currPos == ' ') ++currPos; // Skip one space if there
......@@ -1939,7 +1895,6 @@ avtBOVFileFormat::ReadTOC(void)
}
++currPos;
}
//readDescr = true;
}
else if (strcmp(key, "fortran_order") == 0)
{
......@@ -1971,7 +1926,6 @@ avtBOVFileFormat::ReadTOC(void)
}
++currPos;
}
//readFortranOrder = true;
}
else if (strcmp(key, "shape") == 0)
{
......@@ -2040,7 +1994,6 @@ avtBOVFileFormat::ReadTOC(void)
}
++currPos;
}
//readShape = true;
}
else
{
......@@ -2100,7 +2053,6 @@ avtBOVFileFormat::ReadTOC(void)
else if (strcmp(line, "DATA_FILE:") == 0)
{
line += strlen("DATA_FILE:") + 1;
//int len = strlen(line);
file_pattern = line;
}
else if (strcmp(line, "DATA_SIZE:") == 0)
......@@ -2151,7 +2103,6 @@ avtBOVFileFormat::ReadTOC(void)
else if (strcmp(line, "VARIABLE:") == 0)
{
line += strlen("VARIABLE:") + 1;
//int len = strlen(line);
varname = line;
}
else if (strcmp(line, "HAS_BOUNDARY:") == 0)
......
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