Commit e6ec953f authored by bonnell's avatar bonnell

Remove commented-out unused vars. Regnerate some python state objects

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23654 18c085ea-50e0-402c-830e-de6fd14e8384
parent 976d6aca
......@@ -133,7 +133,7 @@ Definition:
// in a request to GetMesh(), GetVar(), ...
//
// Programmer: Eric Brugger
// Creation: December 20, 2013
// Creation: December 20, 2013
// ****************************************************************************
void
......@@ -141,7 +141,7 @@ avtDatabaseMetaData::SetFormatCanDoMultires(bool can)
{
if (can)
{
// see if there are any meshes with other than a single block
// see if there are any meshes with other than a single block
bool someMeshesHaveOtherThanOneBlock = false;
for (int i = 0; i < GetNumMeshes(); i++)
{
......@@ -2049,7 +2049,7 @@ avtDatabaseMetaData::ConvertCSGDomainToBlockAndRegion(const char *const var,
if (mmd && mmd->meshType == AVT_CSG_MESH)
{
const intVector& groupIds = mmd->groupIds;
if (groupIds.size() > domainAsVisItSeesIt)
if (groupIds.size() > (size_t)domainAsVisItSeesIt)
{
int i, j = groupIds[domainAsVisItSeesIt];
for (i = domainAsVisItSeesIt; i >= 0 && groupIds[i] == j; i--)
......
......@@ -90,6 +90,8 @@
</Function>
<Function name="SetFormatCanDoDomainDecomposition" user="false" member="true">
</Function>
<Function name="SetFormatCanDoMultires" user="false" member="true">
</Function>
<Function name="SetCycle" user="true" member="true">
</Function>
<Function name="SetCycleIsAccurate" user="true" member="true">
......
......@@ -1800,12 +1800,10 @@ avtMeshMetaData::Print(ostream &out, int indent) const
out << "The logical cell bound are not set." << std::endl;
break;
// Report nothing as the logical bounds are not applicable
// default:
// out << "The logical bounds are not applicable." << std::endl;
// break;
default:
break;
// Report nothing as the logical bounds are not applicable
default:
// out << "The logical bounds are not applicable." << std::endl;
break;
}
}
......@@ -1826,11 +1824,9 @@ avtMeshMetaData::Print(ostream &out, int indent) const
out << "The number of cells is not set." << std::endl;
break;
// Report nothing as the number of cells is not applicable
// default:
// out << "The number of cells is not applicable." << std::endl;
// break;
// Report nothing as the number of cells is not applicable
default:
// out << "The number of cells is not applicable." << std::endl;
break;
}
}
......@@ -1965,7 +1961,7 @@ avtMeshMetaData::SetAMRInfo(const std::string &levelName,
const std::vector<int> &patchesPerLevel)
{
int i;
int nlevels = patchesPerLevel.size();
int nlevels = (int)patchesPerLevel.size();
// Basic setup stuff
int numBlocks = 0;
......
......@@ -619,10 +619,10 @@ avtMeshMetaData::Print(ostream &out, int indent) const
out << "The logical cell bound are not set." << std::endl;
break;
// Report nothing as the logical bounds are not applicable
// default:
// out << "The logical bounds are not applicable." << std::endl;
// break;
// Report nothing as the logical bounds are not applicable
default:
// out << "The logical bounds are not applicable." << std::endl;
break;
}
}
......@@ -643,15 +643,15 @@ avtMeshMetaData::Print(ostream &out, int indent) const
out << "The number of cells is not set." << std::endl;
break;
// Report nothing as the number of cells is not applicable
// default:
// out << "The number of cells is not applicable." << std::endl;
// break;
// Report nothing as the number of cells is not applicable
default:
// out << "The number of cells is not applicable." << std::endl;
break;
}
}
if ((int)blockNames.size() == numBlocks)
if (blockNames.size() == (size_t)numBlocks)
{
Indent(out, indent);
out << "Block names: " << std::endl;
......
......@@ -279,7 +279,6 @@ ParentProcess::Connect(int numRead, int numWrite, int *argc, char **argv[],
const char *mName = "ParentProcess::Connect: ";
char **argv2 = *argv;
bool rhostSpecified = false;
//bool nWriteSpecified = false, nReadSpecified = false;
int i, deleteCount = 0, port = 0;
// Log the arguments.
......@@ -290,7 +289,8 @@ ParentProcess::Connect(int numRead, int numWrite, int *argc, char **argv[],
for (i = 0; i < *argc ; ++i)
{
debug5 << argv2[i];
if(i < *argc-1) {
if(i < *argc-1)
{
debug5 << ", ";
}
}
......@@ -373,7 +373,6 @@ ParentProcess::Connect(int numRead, int numWrite, int *argc, char **argv[],
if(numRead > 0)
{
debug5 << mName << "Creating read sockets" << endl;
//nReadSpecified = true;
writeConnections = new Connection*[numRead];
for(int j = 0; j < numRead; ++j)
{
......@@ -389,7 +388,6 @@ ParentProcess::Connect(int numRead, int numWrite, int *argc, char **argv[],
if(numWrite > 0)
{
debug5 << mName << "Creating write sockets" << endl;
//nWriteSpecified = true;
readConnections = new Connection*[numWrite];
for(int j = 0; j < numWrite; ++j)
{
......
......@@ -419,7 +419,6 @@ static int
Listen(int port, struct sockaddr_in &sin)
{
int on = 1;
//bool portFound = false;
// Open a socket.
int listenSock = socket(AF_INET, SOCK_STREAM, 0);
......
......@@ -466,7 +466,6 @@ StringHelpers::FindRE(const char *strToSearch, const char *re)
{
regex_t cre;
regmatch_t pm;
//int reerr;
if (regcomp(&cre, re, REG_EXTENDED))
return FindError;
......
......@@ -1149,10 +1149,6 @@ static void CylinderPPRToQuadric(const double *const cyl, double *quadric)
}
static void ConePNLAToQuadric(const double *const cone, double *quadric)
{
// point
// double px = cone[0];
// double py = cone[1];
// double pz = cone[2];
// normal
double nx = cone[3];
......@@ -2560,7 +2556,6 @@ vtkCSGGrid::DiscretizeSpaceMultiPass(int specificZone,
}
// Evaluate the cell tags against this region
//int ncells = rv->GetNumberOfCells();
vtkIntArray *in = vtkIntArray::New();
in->SetNumberOfComponents(1);
in->SetNumberOfTuples(rv->GetNumberOfCells());
......@@ -3093,7 +3088,8 @@ vtkCSGGrid::DiscretizeSpace3(
MakeMeshZonesByCuttingBox4(curBox, boundaryToStateMap,
boundaryToSenseMap, gridZones[specificZone],
points, ugrid, nodemap);
if (!flatNessHandledIt) {
if (!flatNessHandledIt)
{
debug1 << "vtkCSGGrid: Flatness passed; Cutter4 failed. Subdividing..." << endl;
}
}
......
......@@ -175,7 +175,6 @@ vtkVisItStructuredGridNormals::ExecutePoint(vtkStructuredGrid *input,
for (i = 0 ; i < fastDim ; i++)
{
float normal[3] = { 0, 0, 0 };
//int nQuads = 0;
double anchor[3];
int idx = j*fastDim + i;
......
......@@ -128,7 +128,6 @@ PyDict_To_MapNode(PyObject *obj, MapNode &mn)
if (!PyDict_Check(obj))
return false;
//bool success = true;
Py_ssize_t pos = 0;
PyObject *key = NULL;
PyObject *value = NULL;
......
......@@ -11080,7 +11080,6 @@ visit_Query_deprecated(PyObject *self, PyObject *args)
int arg1 = 0, arg2 = 0;
double darg;
doubleVector darg1(3), darg2(2), darg3(2);
//bool dumpSteps = false;
PyObject *tuple = NULL;
bool parse_success = false;
......
......@@ -797,7 +797,6 @@ mpicom_gather(PyObject *self, PyObject *args)
return NULL;
}
//int rcv_idx = 0;
for(int i=0;i<nprocs;i++)
{
Buffer obj_buff((void*)&rcv_buffer[rcv_displacements[i]]);
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtArrayMetaData(int);
std::string
PyavtArrayMetaData_ToString(const avtArrayMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
str = PyavtVarMetaData_ToString(atts, prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtBaseVarMetaData(int);
std::string
PyavtBaseVarMetaData_ToString(const avtBaseVarMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sname = \"%s\"\n", prefix, atts->name.c_str());
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtCurveMetaData(int);
std::string
PyavtCurveMetaData_ToString(const avtCurveMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
str = PyavtVarMetaData_ToString(atts, prefix);
......
......@@ -87,8 +87,8 @@ static PyObject *NewavtDatabaseMetaData(int);
std::string
PyavtDatabaseMetaData_ToString(const avtDatabaseMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
if(atts->GetHasTemporalExtents())
SNPRINTF(tmpStr, 1000, "%shasTemporalExtents = 1\n", prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtDefaultPlotMetaData(int);
std::string
PyavtDefaultPlotMetaData_ToString(const avtDefaultPlotMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%spluginID = \"%s\"\n", prefix, atts->pluginID.c_str());
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtLabelMetaData(int);
std::string
PyavtLabelMetaData_ToString(const avtLabelMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000]; (void) tmpStr;
std::string str;
char tmpStr[1000]; (void)tmpStr;
str = PyavtVarMetaData_ToString(atts, prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtMatSpeciesMetaData(int);
std::string
PyavtMatSpeciesMetaData_ToString(const avtMatSpeciesMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%snumSpecies = %d\n", prefix, atts->numSpecies);
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtMaterialMetaData(int);
std::string
PyavtMaterialMetaData_ToString(const avtMaterialMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
str = PyavtBaseVarMetaData_ToString(atts, prefix);
......
......@@ -78,8 +78,8 @@ static PyObject *NewavtMeshMetaData(int);
std::string
PyavtMeshMetaData_ToString(const avtMeshMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sname = \"%s\"\n", prefix, atts->name.c_str());
str += tmpStr;
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtScalarMetaData(int);
std::string
PyavtScalarMetaData_ToString(const avtScalarMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
str = PyavtVarMetaData_ToString(atts, prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtSimulationCommandSpecification(int);
std::string
PyavtSimulationCommandSpecification_ToString(const avtSimulationCommandSpecification *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sname = \"%s\"\n", prefix, atts->GetName().c_str());
str += tmpStr;
......@@ -504,6 +504,8 @@ PyavtSimulationCommandSpecification_setattr(PyObject *self, char *name, PyObject
Py_DECREF(obj);
Py_DECREF(tuple);
if( obj == NULL)
PyErr_Format(PyExc_RuntimeError, "Unable to set unknown attribute: '%s'", name);
return (obj != NULL) ? 0 : -1;
}
......
......@@ -75,8 +75,8 @@ static PyObject *NewavtSimulationInformation(int);
std::string
PyavtSimulationInformation_ToString(const avtSimulationInformation *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%shost = \"%s\"\n", prefix, atts->GetHost().c_str());
str += tmpStr;
......
......@@ -74,8 +74,8 @@ static PyObject *NewavtSpeciesMetaData(int);
std::string
PyavtSpeciesMetaData_ToString(const avtSpeciesMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
SNPRINTF(tmpStr, 1000, "%sname = \"%s\"\n", prefix, atts->name.c_str());
str += tmpStr;
......
......@@ -74,8 +74,8 @@ static PyObject *NewavtSubsetsMetaData(int);
std::string
PyavtSubsetsMetaData_ToString(const avtSubsetsMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
str = PyavtVarMetaData_ToString(atts, prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtSymmetricTensorMetaData(int);
std::string
PyavtSymmetricTensorMetaData_ToString(const avtSymmetricTensorMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
str = PyavtVarMetaData_ToString(atts, prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtTensorMetaData(int);
std::string
PyavtTensorMetaData_ToString(const avtTensorMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
str = PyavtVarMetaData_ToString(atts, prefix);
......
......@@ -74,8 +74,8 @@ static PyObject *NewavtVarMetaData(int);
std::string
PyavtVarMetaData_ToString(const avtVarMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
str = PyavtBaseVarMetaData_ToString(atts, prefix);
......
......@@ -73,8 +73,8 @@ static PyObject *NewavtVectorMetaData(int);
std::string
PyavtVectorMetaData_ToString(const avtVectorMetaData *atts, const char *prefix)
{
std::string str;
char tmpStr[1000];
std::string str;
char tmpStr[1000]; (void)tmpStr;
str = PyavtVarMetaData_ToString(atts, prefix);
......
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