Commit 24e00d48 authored by miller86's avatar miller86
Browse files

Merging 1.12RC: fixing problems with ghost zone info on ucdmesh

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8785 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5209f4de
......@@ -8054,6 +8054,11 @@ MakePHZonelistFromZonelistArbFragment(const int *nl, int shapecnt)
//
// Mark C. Miller, Fri Oct 30 14:03:13 PDT 2009
// Handle Silo's DB_DTPTR configuration option.
//
// Mark C. Miller, Sun Nov 1 17:51:05 PST 2009
// Fixed off by one indexing problem for last+1...numCells loop to create
// ghost values. Fixed missing call to set VTK array name for ghost data.
// Fixed missing delete for gvals.
// ****************************************************************************
void
......@@ -8445,7 +8450,7 @@ avtSiloFileFormat::ReadInConnectivity(vtkUnstructuredGrid *ugrid,
gvals[i] = val;
for (i = first; i <= last; i++)
gvals[i] = 0;
for (i = last; i < numCells; i++)
for (i = last+1; i < numCells; i++)
gvals[i] = val;
//
......@@ -8469,7 +8474,9 @@ avtSiloFileFormat::ReadInConnectivity(vtkUnstructuredGrid *ugrid,
vtkDataArray *ghostZones = CopyUcdVar<unsigned char,vtkUnsignedCharArray>(&tmp,
cellReMap?*cellReMap:noremap);
delete [] tmp.vals;
delete [] gvals;
ghostZones->SetName("avtGhostZones");
ugrid->GetCellData()->AddArray(ghostZones);
ghostZones->Delete();
ugrid->SetUpdateGhostLevel(0);
......@@ -8867,6 +8874,10 @@ ArbInsertArbitrary(vtkUnstructuredGrid *ugrid, DBphzonelist *phzl, int gz,
//
// Mark C. Miller, Fri Oct 30 14:03:13 PDT 2009
// Handle Silo's DB_DTPTR configuration option.
//
// Mark C. Miller, Sun Nov 1 17:51:05 PST 2009
// Fixed off by one indexing problem for hi_off+1...numCells loop to create
// ghost values. Fixed missing delete for gvals.
// ****************************************************************************
void
avtSiloFileFormat::ReadInArbConnectivity(const char *meshname,
......@@ -9094,7 +9105,7 @@ avtSiloFileFormat::ReadInArbConnectivity(const char *meshname,
gvals[i] = val;
for (i = phzl->lo_offset; i <= phzl->hi_offset; i++)
gvals[i] = 0;
for (i = phzl->hi_offset; i < phzl->nzones; i++)
for (i = phzl->hi_offset+1; i < phzl->nzones; i++)
gvals[i] = val;
//
......@@ -9119,6 +9130,7 @@ avtSiloFileFormat::ReadInArbConnectivity(const char *meshname,
#endif
vtkDataArray *ghostZones = CopyUcdVar<unsigned char,vtkUnsignedCharArray>(&tmp, *remap);
delete [] tmp.vals;
delete [] gvals;
//
// Assign the ghost zone array to the ugrid object.
......
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