Commit 408a9bcc authored by miller86's avatar miller86

updating Silo plugin and build_visit for 4.10

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23845 18c085ea-50e0-402c-830e-de6fd14e8384
parent cdabb6c0
......@@ -63,7 +63,7 @@ VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.1/${VISITARCH})
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.7/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.11/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz /usr/lib z TYPE STRING)
##
......@@ -85,8 +85,7 @@ VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/pyside/1.1.1/${VISITARCH}/)
##
## Silo
##
#VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.9.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR /Users/miller86/silo/trunk/my_install)
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.10/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
##
......
This diff is collapsed.
......@@ -1441,7 +1441,7 @@ avtSiloWriter::WriteUnstructuredMesh(DBfile *dbfile, vtkUnstructuredGrid *ug,
if (npointcells == nzones && npointcells == npts)
{
DBPutPointmesh(dbfile, meshName.c_str(), dim, (DB_DTPTR2) coords,
DBPutPointmesh(dbfile, meshName.c_str(), dim, coords,
npts, coordType, optlist);
}
else
......@@ -1463,7 +1463,7 @@ avtSiloWriter::WriteUnstructuredMesh(DBfile *dbfile, vtkUnstructuredGrid *ug,
//
// Now write the actual mesh.
//
DBPutUcdmesh(dbfile, (char *) meshName.c_str(), dim, NULL, (DB_DTPTR2) coords, npts,
DBPutUcdmesh(dbfile, (char *) meshName.c_str(), dim, NULL, coords, npts,
nzones, "zonelist", NULL, coordType, optlist);
}
EndVar(dbfile, nlevels);
......@@ -1580,7 +1580,7 @@ avtSiloWriter::WriteCurvilinearMesh(DBfile *dbfile, vtkStructuredGrid *sg,
//
int nlevels = 0;
string meshName = BeginVar(dbfile, meshname, nlevels);
DBPutQuadmesh(dbfile, (char *) meshName.c_str(), NULL, (DB_DTPTR2) coords, dims, ndims,
DBPutQuadmesh(dbfile, (char *) meshName.c_str(), NULL, coords, dims, ndims,
coordType, DB_NONCOLLINEAR, optlist);
EndVar(dbfile, nlevels);
......@@ -1691,7 +1691,7 @@ avtSiloWriter::WriteRectilinearMesh(DBfile *dbfile, vtkRectilinearGrid *rg,
//
int nlevels = 0;
string meshName = BeginVar(dbfile, meshname, nlevels);
DBPutQuadmesh(dbfile, (char *) meshName.c_str(), NULL, (DB_DTPTR2) vcoords, dims, ndims,
DBPutQuadmesh(dbfile, (char *) meshName.c_str(), NULL, vcoords, dims, ndims,
DB_DOUBLE, DB_COLLINEAR, optlist);
EndVar(dbfile, nlevels);
......@@ -1835,7 +1835,7 @@ avtSiloWriter::WritePolygonalMesh(DBfile *dbfile, vtkPolyData *pd,
string meshName = BeginVar(dbfile, meshname, nlevels);
if (npointcells == nzones && npointcells == npts)
{
DBPutPointmesh(dbfile, (char *) meshName.c_str(), ndims, (DB_DTPTR2) coords,
DBPutPointmesh(dbfile, (char *) meshName.c_str(), ndims, coords,
npts, DB_FLOAT, optlist);
}
else
......@@ -1855,7 +1855,7 @@ avtSiloWriter::WritePolygonalMesh(DBfile *dbfile, vtkPolyData *pd,
//
// Now write the actual mesh.
//
DBPutUcdmesh(dbfile, (char *) meshName.c_str(), ndims, NULL, (DB_DTPTR2) coords, npts,
DBPutUcdmesh(dbfile, (char *) meshName.c_str(), ndims, NULL, coords, npts,
nzones, "zonelist", NULL, coordType, optlist);
}
EndVar(dbfile, nlevels);
......@@ -2076,12 +2076,12 @@ avtSiloWriter::WriteUcdvarsHelper(DBfile *dbfile, vtkDataSetAttributes *ds,
if (isPointMesh && centering == DB_NODECENT)
DBPutPointvar1(dbfile, (char *) varName.c_str(),
(char *) meshName.c_str(),
(DB_DTPTR1) arr2->GetVoidPointer(0),
arr2->GetVoidPointer(0),
nTuples, GetSiloType(arr2), optlist);
else
DBPutUcdvar1(dbfile, (char *) varName.c_str(),
(char *) meshName.c_str(),
(DB_DTPTR1) arr2->GetVoidPointer(0), nTuples, NULL, 0,
arr2->GetVoidPointer(0), nTuples, NULL, 0,
GetSiloType(arr2), centering, optlist);
}
else
......@@ -2110,11 +2110,11 @@ avtSiloWriter::WriteUcdvarsHelper(DBfile *dbfile, vtkDataSetAttributes *ds,
if (isPointMesh && centering == DB_NODECENT)
DBPutPointvar(dbfile, (char *) varName.c_str(),
(char *) meshName.c_str(),
ncomps, (DB_DTPTR2) vars, nTuples, DB_DOUBLE, optlist);
ncomps, vars, nTuples, DB_DOUBLE, optlist);
else
DBPutUcdvar(dbfile, (char *) varName.c_str(),
(char *) meshName.c_str(),
ncomps, varnames, (DB_DTPTR2) vars, nTuples, NULL, 0, DB_DOUBLE,
ncomps, varnames, vars, nTuples, NULL, 0, DB_DOUBLE,
centering, optlist);
for (j = 0 ; j < (size_t)ncomps ; j++)
......@@ -2233,7 +2233,7 @@ avtSiloWriter::WriteQuadvarsHelper(DBfile *dbfile, vtkDataSetAttributes *ds,
DBPutQuadvar1(dbfile, (char *) varName.c_str(),
(char *) meshName.c_str(),
(DB_DTPTR1) arr->GetVoidPointer(0), dims, ndims, NULL,
arr->GetVoidPointer(0), dims, ndims, NULL,
0, GetSiloType(arr), centering, optlist);
}
else
......@@ -2263,7 +2263,7 @@ avtSiloWriter::WriteQuadvarsHelper(DBfile *dbfile, vtkDataSetAttributes *ds,
DBPutQuadvar(dbfile, (char *) varName.c_str(),
(char *) meshName.c_str(),
ncomps, varnames, (DB_DTPTR2) vars, dims, ndims, NULL, 0,
ncomps, varnames, vars, dims, ndims, NULL, 0,
DB_DOUBLE, centering, optlist);
for (j = 0 ; j < (size_t)ncomps ; j++)
......
function bv_silo_initialize
{
export DO_SILO="no"
export ON_SILO="off"
export DO_SILO="no"
export ON_SILO="off"
export DO_SILEX="no"
add_extra_commandline_args "silo" "silex" 0 "Enable silex when building Silo"
}
function bv_silo_enable
{
DO_SILO="yes"
ON_SILO="on"
DO_SILO="yes"
ON_SILO="on"
}
function bv_silo_disable
{
DO_SILO="no"
ON_SILO="off"
DO_SILO="no"
ON_SILO="off"
}
function bv_silo_silex
{
info "Enabling silex in Silo build"
DO_SILEX="yes"
bv_silo_enable
}
function bv_silo_depends_on
......@@ -37,13 +46,13 @@ function bv_silo_depends_on
function bv_silo_info
{
export SILO_VERSION=${SILO_VERSION:-"4.9.1"}
export SILO_VERSION=${SILO_VERSION:-"4.10"}
export SILO_FILE=${SILO_FILE:-"silo-${SILO_VERSION}.tar.gz"}
export SILO_COMPATIBILITY_VERSION=${SILO_COMPATIBILITY_VERSION:-"4.9"}
export SILO_COMPATIBILITY_VERSION=${SILO_COMPATIBILITY_VERSION:-"4.10"}
export SILO_BUILD_DIR=${SILO_BUILD_DIR:-"silo-${SILO_VERSION}"}
export SILO_URL=${SILO_URL:-https://wci.llnl.gov/codes/silo/silo-${SILO_VERSION}}
export SILO_MD5_CHECKSUM="aea6992437e1ed75cddcec1d91c6ff36"
export SILO_SHA256_CHECKSUM="4908eb77577e26948aedee5976deedc3d2c1fd01b6fc5bd9cb61772cbbe2a56e"
export SILO_MD5_CHECKSUM="a700464ea46264170c1475b1b2029504"
export SILO_SHA256_CHECKSUM="c00e3b221dcd9ad5efeffcba328bca2766aabb04438dea181ba93604302dfafd"
}
function bv_silo_print
......@@ -57,6 +66,7 @@ function bv_silo_print
function bv_silo_print_usage
{
printf "%-15s %s [%s]\n" "--silo" "Build Silo support" "$DO_SILO"
printf "%-15s %s [%s]\n" "--silex" "Enable silex when building Silo" "$DO_SILEX"
}
function bv_silo_graphical
......@@ -173,11 +183,15 @@ function build_silo
else
WITHSZIPARG="--without-szlib"
fi
if [[ "$DO_QT" != "yes" || "$OPSYS" == "Darwin" || "$DO_STATIC_BUILD" == "yes" || "$IS_QT5" == "yes" ]] ; then
WITHSILOQTARG="--disable-silex"
if [[ "$DO_SILEX" == "no" || "$DO_QT" != "yes" || "$DO_STATIC_BUILD" == "yes" || "$IS_QT5" == "yes" ]] ; then
WITHSILOQTARG='--disable-silex'
else
export SILOQTDIR="$QT_INSTALL_DIR" #"${VISITDIR}/qt/${QT_VERSION}/${VISITARCH}"
WITHSILOQTARG='--with-Qt-dir=$SILOQTDIR --with-Qt-lib="QtGui -lQtCore"'
if [[ "$OPSYS" == "Darwin" ]] ; then
WITHSILOQTARG='--enable-silex --with-Qt-dir=$SILOQTDIR --with-Qt-lib="m -F${SILOQTDIR}/lib -framework QtGui -framework QtCore"'
else
WITHSILOQTARG='--enable-silex --with-Qt-dir=$SILOQTDIR --with-Qt-lib="QtGui -lQtCore"'
fi
fi
if [[ "$DO_ZLIB" == "yes" ]] ; then
......
......@@ -104,6 +104,6 @@ namespace GaussIntegration
void get_node_local_coord_tet(int node_id, double &y1, double &y2,
double &y3, double &y4);
//- get nodal volume coordinates for tetrahedron element
};
}
#endif
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