Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit 6e07fdf5 authored by hrchilds's avatar hrchilds

Update from July 13, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@500 18c085ea-50e0-402c-830e-de6fd14e8384
parent 76e96248
......@@ -87,13 +87,13 @@ fi
##
## HDF5
##
##DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial/32/include
##DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/32/lib
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial/64/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/64/lib
##
## Mili
##
##MILI_DIR=/usr/gapps/visit/mili/current/aix_5_ll
MILI_DIR=/usr/gapps/visit/mili/current/aix_5_xlc_64
##
## Silo
......
......@@ -2147,6 +2147,12 @@ avtKullLiteFileFormat::ReadMeshFromFile(void)
// Programmer: Hank Childs
// Creation: July 23, 2004
//
// Modifications:
//
// Hank Childs, Wed Jul 13 09:58:36 PDT 2005
// Code around strstr deficiency. If substring is longer than the
// search string, then some implementations of strstr lead to UMRs.
//
// ****************************************************************************
bool
......@@ -2161,10 +2167,17 @@ avtKullLiteFileFormat::GetMeshDimension(void)
}
bool meshIs3d = false;
if (strstr(typeofmesh, "polyhedral") != NULL ||
strstr(typeofmesh, "hexahedral") != NULL)
int search_str_len = strlen(typeofmesh);
if (search_str_len >= strlen("polyhedral") &&
strstr(typeofmesh, "polyhedral") != NULL)
meshIs3d = true;
else if (strstr(typeofmesh, "polygonal") != NULL ||
else if (search_str_len >= strlen("hexahedral") &&
strstr(typeofmesh, "hexahedral") != NULL)
meshIs3d = true;
else if (search_str_len >= strlen("polygonal") &&
strstr(typeofmesh, "polygonal") != NULL)
meshIs3d = false;
else if (search_str_len >= strlen("quadrilateral") &&
strstr(typeofmesh, "quadrilateral") != NULL)
meshIs3d = false;
else
......
......@@ -6170,6 +6170,9 @@ avtSiloFileFormat::GetExternalFacelist(int dom, const char *mesh)
// Mark C. Miller, Tue Jun 28 17:28:56 PDT 2005
// Made it handle the new "EMPTY" domain convention
//
// Hank Childs, Wed Jul 13 10:04:33 PDT 2005
// Fix memory leak.
//
// ****************************************************************************
vtkDataArray *
......@@ -6182,7 +6185,11 @@ avtSiloFileFormat::GetGlobalNodeIds(int dom, const char *mesh)
char *meshname = AllocAndDetermineMeshnameForUcdmesh(dom, mesh);
if (meshname == NULL || string(meshname) == "EMPTY")
{
if (meshname != NULL)
delete [] meshname;
return NULL;
}
//
// Some Silo objects are distributed across several files,
......
......@@ -554,6 +554,9 @@ NetworkManager::GetDBFromCache(const string &filename, int time,
// Made format argument come first. I also made it possible for an empty
// format string to make the code behave as through no format was specified.
//
// Hank Childs, Wed Jul 13 10:38:02 PDT 2005
// Added call to SetTime to prevent UMR when exporting databases.
//
// ****************************************************************************
void
......@@ -606,6 +609,7 @@ NetworkManager::StartNetwork(const string &format,
dspec->SetNeedValidFaceConnectivity(matopts.GetNeedValidConnectivity());
dspec->SetUseNewMIRAlgorithm(matopts.GetUseNewMIRAlgorithm());
workingNet->SetDataSpec(dspec);
workingNet->SetTime(dspec->GetTimestep());
// The plot starts out as NULL.
workingNet->SetPlot(NULL);
......
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