Commit d7fb5d33 authored by Dave DeMarle's avatar Dave DeMarle

Fix dashboard warnings and test failure.

Forgot to add new regression test data set for subset.

Change-Id: I249b8003d4552fb80b8fc7ef55b9deb922bcc70a
parent 80114e9b
......@@ -54,8 +54,8 @@ void vtkXdmf3ArrayKeeper::Release(bool force)
vtkXdmf3ArrayKeeper::iterator current = it++;
if (force || (current->second != this->generation))
{
XdmfArray* at = current->first;
at->release();
XdmfArray* atCurrent = current->first;
atCurrent->release();
this->erase(current);
//cnt++;
}
......
......@@ -1000,7 +1000,7 @@ void vtkXdmf3DataSet::XdmfToVTK(
void vtkXdmf3DataSet::CopyShape(
XdmfRegularGrid *grid,
vtkImageData *dataSet,
vtkXdmf3ArrayKeeper *keeper)
vtkXdmf3ArrayKeeper *vtkNotUsed(keeper))
{
if (!dataSet)
{
......@@ -1990,9 +1990,6 @@ void vtkXdmf3DataSet::XdmfToVTKAttributes(
//--------------------------------------------------------------------------
void vtkXdmf3DataSet::XdmfSubsetToVTK(
vtkXdmf3ArraySelection *fselection,
vtkXdmf3ArraySelection *cselection,
vtkXdmf3ArraySelection *pselection,
XdmfGrid *grid,
unsigned int setnum,
vtkDataSet *dataSet,
......
......@@ -240,9 +240,6 @@ public:
// Extracts numbered subset out of grid (grid corresponds to dataSet),
// and fills in subSet with it.
static void XdmfSubsetToVTK(
vtkXdmf3ArraySelection *fselection,
vtkXdmf3ArraySelection *cselection,
vtkXdmf3ArraySelection *pselection,
XdmfGrid *grid,
unsigned int setnum,
vtkDataSet *dataSet,
......
......@@ -275,7 +275,7 @@ public:
std::string sName = set->getName();
std::string usName = this->UniqueName(sName, false);
set->setName(usName);
this->AddNamedSet(parent, sName, usName);
this->AddNamedSet(usName);
}
}
return;
......@@ -526,7 +526,7 @@ private:
}
//helper for InspectXDMF
void AddNamedSet(vtkIdType parentVertex, std::string originalName, std::string uniqueName)
void AddNamedSet(std::string uniqueName)
{
this->SetsCache->AddArray(uniqueName.c_str());
}
......@@ -1048,7 +1048,6 @@ protected:
if (dataSet && subSet && SetEnabled(set) && ForThisTime(grid))
{
vtkXdmf3DataSet::XdmfSubsetToVTK(
this->FieldArrays, this->CellArrays, this->PointArrays,
grid.get(), setnum, dataSet, subSet, keeper);
return subSet;
}
......
53e227f89406466693b7e2bc2a9b77d4
f78137dd40e417c3cc98eeed3a06e487
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