Commit 0ef22f5f authored by Keith Bennett's avatar Keith Bennett

Merge branch 'release/1.5.11'

parents b136c33a a0aee71e
<?xml version="1.0"?>
<Plugin name="SDF" type="database" label="Self Describing Format"
version="1.5.10" enabled="true" mdspecificcode="false"
version="1.5.11" enabled="true" mdspecificcode="false"
engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD"
haswriter="false" hasoptions="true" filePatternsStrict="false"
opensWholeDirectory="false">
......
<?xml version="1.0"?>
<Plugin name="SDF" type="database" label="Self Describing Format"
version="1.5.10" enabled="true" mdspecificcode="false"
version="1.5.11" enabled="true" mdspecificcode="false"
engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD"
haswriter="false" hasoptions="true" filePatternsStrict="false"
opensWholeDirectory="false">
......
......@@ -225,15 +225,22 @@ avtSDFFileFormat::avtSDFFileFormat(const char *filename,
use_float = 0;
use_random = 0;
use_boundary = 0;
use_allboundary = 0;
for (int i = 0; readOpts && i < readOpts->GetNumberOfOptions(); i++) {
if (readOpts->GetName(i) == SDF_RDOPT_CONVERT_FLOAT)
use_float = readOpts->GetBool(SDF_RDOPT_CONVERT_FLOAT) ? 1 : 0;
else if (readOpts->GetName(i) == SDF_RDOPT_RANDOMISE)
use_random = readOpts->GetBool(SDF_RDOPT_RANDOMISE) ? 1 : 0;
else if (readOpts->GetName(i) == SDF_RDOPT_BOUNDARY)
use_boundary = readOpts->GetBool(SDF_RDOPT_BOUNDARY) ? 1 : 0;
else if (readOpts->GetName(i) == SDF_RDOPT_ALLBOUNDARY)
use_allboundary = readOpts->GetBool(SDF_RDOPT_ALLBOUNDARY) ? 1 : 0;
else
debug1 << "Ignoring unknown option \"" << readOpts->GetName(i)
<< "\"" << endl;
}
if (use_allboundary) use_boundary = 1;
stack_handle = stack_init();
ext = NULL;
......@@ -393,6 +400,14 @@ avtSDFFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
b->blocktype == SDF_BLOCKTYPE_PLAIN_DERIVED ||
b->blocktype == SDF_BLOCKTYPE_POINT_DERIVED) {
if (use_allboundary == 0 && b->mesh_id &&
memcmp(b->mesh_id, "boundary", 8) == 0) {
if (use_boundary == 0)
continue;
else if (b->mesh_id[8] == '_')
continue;
}
// Now fill the metadata for a 1d or nd scalar variable
sdf_block_t *mesh = sdf_find_block_by_id(h, b->mesh_id);
if (!mesh) continue;
......
......@@ -163,7 +163,8 @@ class avtSDFFileFormat : public avtSTMDFileFormat
protected:
// DATA MEMBERS
int rank, ncpus, ndomains, use_float, use_random, step;
int rank, ncpus, ndomains, step;
int use_float, use_random, use_boundary, use_allboundary;
double time;
comm_t comm;
sdf_file_t *h;
......
......@@ -42,6 +42,8 @@ GetSDFReadOptions(void)
DBOptionsAttributes *rv = new DBOptionsAttributes;
rv->SetBool(SDF_RDOPT_CONVERT_FLOAT, false);
rv->SetBool(SDF_RDOPT_RANDOMISE, false);
rv->SetBool(SDF_RDOPT_BOUNDARY, false);
rv->SetBool(SDF_RDOPT_ALLBOUNDARY, false);
return rv;
}
......
......@@ -25,6 +25,8 @@ namespace SDFDBOptions
const char *const SDF_RDOPT_CONVERT_FLOAT =
"Read double variables as floats to save memory";
const char *const SDF_RDOPT_RANDOMISE = "Randomise particle data";
const char *const SDF_RDOPT_BOUNDARY = "Populate boundary variables";
const char *const SDF_RDOPT_ALLBOUNDARY = "Populate side boundary variables";
}
// ****************************************************************************
......
......@@ -163,7 +163,22 @@ CC=mpicc," Makefile > .Makefile.tmp
else
xml2cmake -clobber $PRIVATE ${fmt}${version}.xml
if [ -n "$PLUGINDIR" ] ; then
sed -i '/VISIT_PLUGIN_DIR/ s;".*";"'$PLUGINDIR'";' CMakeLists.txt
# Change the VisIt plugin directory
sed '/VISIT_PLUGIN_DIR/ s;".*";"'$PLUGINDIR'";' \
CMakeLists.txt > $tmpdir/tmp
\mv -f $tmpdir/tmp CMakeLists.txt
# Add directories to the runtime path.
# This avoids having to set LD_LIBRARY_PATH in the bash environment
# to find sdf_extension.so.
# Assume that it is one level up from the VisIt plugin directory.
# FIXME: This should be configurable.
RPATH=$(dirname $PLUGINDIR)
sed '/PROJECT/ a\
LIST(APPEND CMAKE_INSTALL_RPATH "'"$RPATH"'")\
SET(CMAKE_BUILD_WITH_INSTALL_RPATH ON)\
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)' CMakeLists.txt > $tmpdir/tmp
\mv -f $tmpdir/tmp CMakeLists.txt
fi
setup=$(grep -w PluginVsInstall.cmake CMakeLists.txt | cut -f2 -d\")
if [ $build_type -ne 2 ]; then
......
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