Commit 5489145d authored by Keith Bennett's avatar Keith Bennett

Merge branch 'release/1.5.14'

parents 305fbc8c 66a33597
<?xml version="1.0"?>
<Plugin name="SDF" type="database" label="Self Describing Format"
version="1.5.12" enabled="true" mdspecificcode="false"
version="1.5.14" 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.12" enabled="true" mdspecificcode="false"
version="1.5.14" enabled="true" mdspecificcode="false"
engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD"
haswriter="false" hasoptions="true" filePatternsStrict="false"
opensWholeDirectory="false">
......
......@@ -50,7 +50,10 @@
#include <InvalidFilesException.h>
#include <InvalidVariableException.h>
#ifndef _WIN32
#include <dlfcn.h>
#endif
#include "commit_info.h"
#include "build_date.h"
#include "sdf_helper.h"
......@@ -64,6 +67,7 @@ int avtSDFFileFormat::extension_not_found = 0;
sdf_extension_t *avtSDFFileFormat::sdf_extension_load(sdf_file_t *h)
{
#ifndef _WIN32
if (avtSDFFileFormat::extension_not_found) return NULL;
debug1 << "avtSDFFileFormat::sdf_extension_load " << h << endl;
......@@ -87,11 +91,15 @@ sdf_extension_t *avtSDFFileFormat::sdf_extension_load(sdf_file_t *h)
if (!ext) avtSDFFileFormat::extension_not_found = 1;
return ext;
#else
return NULL;
#endif
}
void avtSDFFileFormat::sdf_extension_unload(void)
{
#ifndef _WIN32
if (!sdf_extension_handle) return;
sdf_extension_destroy_t *sdf_extension_destroy =
......@@ -104,6 +112,7 @@ void avtSDFFileFormat::sdf_extension_unload(void)
sdf_extension_destroy = NULL;
ext = NULL;
#endif
return;
}
......@@ -637,10 +646,7 @@ avtSDFFileFormat::GetMesh(int domain, const char *meshname)
|| b->blocktype == SDF_BLOCKTYPE_POINT_VARIABLE)
return GetCurve(domain, b);
if (b->populate_data)
b->populate_data(h, b);
else
sdf_helper_read_data(h, b);
sdf_helper_read_data(h, b);
if (b->blocktype == SDF_BLOCKTYPE_POINT_MESH) {
vtkPoints *points = vtkPoints::New();
......@@ -1574,7 +1580,7 @@ avtSDFFileFormat::GetSpeciesType(sdf_block_t *sblock, int domain)
int nelements_local = vfm_block->nelements_local;
int ndims = vfm_block->ndims;
int dims[ndims];
int *dims = new int[ndims];
for (int i = 0; i < ndims; i++) dims[i] = vfm_block->dims[i];
int nmf = 0;
......@@ -1637,6 +1643,7 @@ avtSDFFileFormat::GetSpeciesType(sdf_block_t *sblock, int domain)
delete [] vfm_ptrs;
delete [] speclist;
delete [] specmf;
delete [] dims;
#ifdef SDF_DEBUG
debug1 << "avtSDFFileFormat:: SDF debug buffer: ";
......
xml2info.exe -clobber SDF2.xml
xml2cmake.exe -clobber SDF2.xml
"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -G "Visual Studio 15 2017 Win64" .
"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe" /Build Release SDF_database.sln
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