Commit dd9ff5f2 authored by hrchilds's avatar hrchilds

Update from February 15, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@413 18c085ea-50e0-402c-830e-de6fd14e8384
parent 53ce8f74
......@@ -95,5 +95,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/sunos_57
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2-pre1/sunos_57/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2-pre1/sunos_57/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2-pre2/sunos_57/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2-pre2/sunos_57/lib
......@@ -95,5 +95,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/sunos_57
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2-pre1/sunos_57/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2-pre1/sunos_57/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2-pre2/sunos_57/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2-pre2/sunos_57/lib
......@@ -3352,6 +3352,9 @@ avtSiloFileFormat::GetPointVectorVar(DBfile *dbfile, const char *vname)
// Kathleen Bonnell, Tue Feb 8 17:00:46 PST 2005
// Added domain to args for GetQuadMesh.
//
// Mark C. Miller, Mon Feb 14 20:28:47 PST 2005
// Added test for DB_QUAD_CURV/RECT for valid type
//
// ****************************************************************************
vtkDataSet *
......@@ -3386,8 +3389,8 @@ avtSiloFileFormat::GetMesh(int domain, const char *m)
//
// Sort out the bad cases.
//
if (type != DB_UCDMESH && type != DB_QUADMESH && type != DB_POINTMESH
&& type != DB_MULTIMESH)
if (type != DB_UCDMESH && type != DB_QUADMESH && type != DB_QUAD_CURV &&
type != DB_QUAD_RECT && type != DB_POINTMESH && type != DB_MULTIMESH)
{
EXCEPTION1(InvalidVariableException, mesh);
}
......
......@@ -114,6 +114,9 @@
// Jeremy Meredith, Mon Feb 7 13:31:03 PST 2005
// Added VisIt version to the general plugin info.
//
// Mark C. Miller, Mon Feb 14 20:27:12 PST 2005
// Added output of SRC make macro for .depend to work in plugin dirs
//
// ****************************************************************************
class MakefileGeneratorPlugin
......@@ -326,6 +329,10 @@ class MakefileGeneratorPlugin
for (int i=0; i<defaultsfiles.size(); i++)
out << " " << defaultsfiles[i];
out << "" << endl;
out << "" << endl;
out << "SRC=$(ISRC) $(COMMONSRC) $(GSRC) $(VSRC) $(ESRC) $(SSRC)" << endl;
out << "" << endl;
out << "" << endl;
out << "JAVASRC="<<atts->name<<".java" << endl;
......@@ -427,6 +434,10 @@ class MakefileGeneratorPlugin
out << " " << defaultefiles[i];
out << endl;
out << "" << endl;
out << "" << endl;
out << "SRC=$(ISRC) $(COMMONSRC) $(GSRC) $(SSRC) $(VSRC) $(ESRC)" << endl;
out << "" << endl;
out << "" << endl;
out << "JAVASRC="<<atts->name<<".java" << endl;
......@@ -497,6 +508,10 @@ class MakefileGeneratorPlugin
out << " " << defaultefiles[i];
out << endl;
out << "" << endl;
out << "" << endl;
out << "SRC=$(ISRC) $(COMMONSRC) $(MSRC) $(ESRC)" << endl;
out << "" << endl;
out << "SHLIB_FORCED=";
for (int i=0; i<libs.size(); i++)
......
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