Commit 87f486e9 authored by ghweber's avatar ghweber
Browse files

Reverted changes to DualMesh filter.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12387 18c085ea-50e0-402c-830e-de6fd14e8384
parent c6f1c05f
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <vtkPointData.h> #include <vtkPointData.h>
#include <vtkFloatArray.h> #include <vtkFloatArray.h>
#include <vtkRectilinearGrid.h> #include <vtkRectilinearGrid.h>
#include <vtkUnsignedCharArray.h>
// **************************************************************************** // ****************************************************************************
// Method: avtDualMeshFilter constructor // Method: avtDualMeshFilter constructor
...@@ -298,48 +297,6 @@ avtDualMeshFilter::ExecuteData(vtkDataSet *in_ds, int, std::string) ...@@ -298,48 +297,6 @@ avtDualMeshFilter::ExecuteData(vtkDataSet *in_ds, int, std::string)
result->GetPointData()->ShallowCopy(rgrid->GetCellData()); result->GetPointData()->ShallowCopy(rgrid->GetCellData());
} }
if (!expand)
{
// Update ghost zones
vtkUnsignedCharArray *inputGhostZones = (vtkUnsignedCharArray *)
in_ds->GetCellData()->GetArray("avtGhostZones");
vtkUnsignedCharArray *outputGhostZones = vtkUnsignedCharArray::New();
outputGhostZones->SetName("avtGhostZones");
if (rdims[1] > 1)
{
if (rdims[2] > 1)
{
// 3D
}
else
{
outputGhostZones->SetNumberOfTuples((rdims[0]-1)*(rdims[1]-1));
// 2D
for (int i=0; i < rdims[0]-1; ++i)
for (int j=0; j < rdims[1]-1; ++j)
{
unsigned char ghostInfo = inputGhostZones->GetValue(j*rdims[0]+i);
ghostInfo |= inputGhostZones->GetValue(j*rdims[0]+(i+1));
ghostInfo |= inputGhostZones->GetValue((j+1)*rdims[0]+i);
ghostInfo |= inputGhostZones->GetValue((j+1)*rdims[0]+(i+1));
outputGhostZones->SetValue(j*(rdims[0]-1)+i, ghostInfo);
}
}
}
else
{
EXCEPTION1(ImproperUseException,
"Converting ghost data not implemented for 1D.");
}
result->GetCellData()->AddArray(outputGhostZones);
}
ManageMemory(result); ManageMemory(result);
result->Delete(); result->Delete();
return result; return result;
......
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