Commit 2c589e86 authored by cyrush's avatar cyrush

tessellation refactor

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@19324 18c085ea-50e0-402c-830e-de6fd14e8384
parent b2ad5e1d
This diff is collapsed.
......@@ -50,6 +50,8 @@ Database/avtSILGenerator.C
Database/avtSourceFromDatabase.C
Database/avtVariableCache.C
Database/avtTransformManager.C
Database/avtPolygonToTrianglesTesselator.C
Database/avtPolyhedralSplit.C
)
SET(FORMATS_SOURCES
......@@ -105,6 +107,7 @@ ${VISIT_SOURCE_DIR}/avt/Pipeline/Sources
${VISIT_SOURCE_DIR}/visit_vtk/full
${VISIT_SOURCE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
${VISIT_SOURCE_DIR}/third_party_builtin/tess2
)
# Add link directories
......@@ -118,12 +121,12 @@ ENDIF(NOT VISIT_DBIO_ONLY)
#********************************* SERIAL ************************************
ADD_LIBRARY(avtdatabase_ser ${AVTDATABASE_SOURCES})
TARGET_LINK_LIBRARIES(avtdatabase_ser visitcommon avtdbatts ${AVTMIR_SER} avtpipeline_ser visit_vtk)
TARGET_LINK_LIBRARIES(avtdatabase_ser visitcommon avtdbatts ${AVTMIR_SER} avtpipeline_ser visit_vtk tess2)
VISIT_INSTALL_TARGETS(avtdatabase_ser)
#********************************* PARALLEL **********************************
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(avtdatabase_par ${AVTDATABASE_SOURCES})
TARGET_LINK_LIBRARIES(avtdatabase_par visitcommon avtdbatts ${AVTMIR_PAR} avtpipeline_par visit_vtk)
TARGET_LINK_LIBRARIES(avtdatabase_par visitcommon avtdbatts ${AVTMIR_PAR} avtpipeline_par visit_vtk tess2)
VISIT_INSTALL_TARGETS(avtdatabase_par)
ENDIF(VISIT_PARALLEL)
This diff is collapsed.
/*****************************************************************************
*
* Copyright (c) 2000 - 2012, Lawrence Livermore National Security, LLC
* Produced at the Lawrence Livermore National Laboratory
* LLNL-CODE-442911
* All rights reserved.
*
* This file is part of VisIt. For details, see https://visit.llnl.gov/. The
* full copyright notice is contained in the file COPYRIGHT located at the root
* of the VisIt distribution or at http://www.llnl.gov/visit/copyright.html.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the disclaimer below.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the disclaimer (as noted below) in the
* documentation and/or other materials provided with the distribution.
* - Neither the name of the LLNS/LLNL nor the names of its contributors may
* be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY,
* LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
* DAMAGE.
*
*****************************************************************************/
#ifndef AVT_POLYGON_TO_TRIANGLES_TESSELATOR_H
#define AVT_POLYGON_TO_TRIANGLES_TESSELATOR_H
#include <vector>
#include "database_exports.h"
// ****************************************************************************
// Class: avtPolygonToTrianglesTesselator
//
// Purpose: Uses tess2 to create triangles from polygon contours.
//
// Programmer: Cyrus Harrison
// Creation: Tue Oct 9 12:51:23 PDT 2012
//
// Modifications:
//
// ****************************************************************************
class VertexManager;
class vtkPoints;
class vtkPolyData;
class TESSalloc;
class TESStesselator;
//
// Note on Cyrus' spelling quandry: tesselator vs tessellator
// tess2 uses "tesselator" - for "Tessellate", two 'l's
// is correct, but I not sure about "tesselator" - so I stuck with one 'l'
// for class names.
//
class DATABASE_API avtPolygonToTrianglesTesselator
{
public:
avtPolygonToTrianglesTesselator(vtkPoints *);
virtual ~avtPolygonToTrianglesTesselator();
// set normal use for tessellation
void SetNormal(double x, double y, double z);
void SetNormal(const double *vals);
// define a contour
void BeginContour();
void AddContourVertex(double *vals);
void AddContourVertex(double x, double y, double z);
void EndContour();
// access to vertex point ids
int GetVertexId(double *vals);
// exec tessellation
int Tessellate();
// this variant adds the generated tris to vtkPolyData
int Tessellate(vtkPolyData *pd);
// these provide access results of last Tessellate call
int GetNumberOfTriangles() const;
void GetTriangleIndices(int i, int &a, int &b, int &c) const;
private:
// normal vector used for tessellation
double tessNorm[3];
// holds verts for current contour
std::vector<double> verts;
// bookkeeping for tess2 memory allocator
int tessMemAllocated;
// tess2 objs
TESSalloc *tessMemAllocator;
TESStesselator *tessObj;
// used to take care of dup verts
VertexManager *vertexManager;
// ref to external vtkPoints object
vtkPoints *xPoints;
};
#endif
......@@ -36,7 +36,7 @@
*
*****************************************************************************/
#include <PolyhedralSplit.h>
#include <avtPolyhedralSplit.h>
#include <vtkDataArray.h>
#include <vtkUnsignedIntArray.h>
#include <map>
......@@ -44,9 +44,9 @@
#include <DebugStream.h>
// ****************************************************************************
// Method: PolyhedralSplit::PolyhedralSplit
// Method: avtPolyhedralSplit::avtPolyhedralSplit
//
// Purpose:
// Purpose:
// Constructor
//
// Arguments:
......@@ -60,54 +60,54 @@
//
// ****************************************************************************
PolyhedralSplit::PolyhedralSplit() : polyhedralSplit(), nodesForPolyhedralCells()
avtPolyhedralSplit::avtPolyhedralSplit() : polyhedralSplit(), nodesForPolyhedralCells()
{
}
// ****************************************************************************
// Method: PolyhedralSplit::~PolyhedralSplit
// Method: avtPolyhedralSplit::~avtPolyhedralSplit
//
// Purpose:
// Purpose:
// Destructor.
//
// Programmer: Brad Whitlock
// Creation: Fri Mar 12 15:17:13 PST 2010
//
// Modifications:
//
//
// ****************************************************************************
PolyhedralSplit::~PolyhedralSplit()
avtPolyhedralSplit::~avtPolyhedralSplit()
{
}
// ****************************************************************************
// Method: PolyhedralSplit::Destruct
// Method: avtPolyhedralSplit::Destruct
//
// Purpose:
// Purpose:
// Static destructor function
//
// Arguments:
// ptr : Pointer to the PolyhedralSplit object to delete.
// ptr : Pointer to the avtPolyhedralSplit object to delete.
//
// Programmer: Brad Whitlock
// Creation: Fri Mar 12 15:17:27 PST 2010
//
// Modifications:
//
//
// ****************************************************************************
void
PolyhedralSplit::Destruct(void *ptr)
avtPolyhedralSplit::Destruct(void *ptr)
{
PolyhedralSplit *This = (PolyhedralSplit *)ptr;
avtPolyhedralSplit *This = (avtPolyhedralSplit *)ptr;
delete This;
}
// ****************************************************************************
// Method: PolyhedralSplit::AppendCellSplits
// Method: avtPolyhedralSplit::AppendCellSplits
//
// Purpose:
// Purpose:
// Record the cellid and number of splits for the next polyhedral cell.
//
// Arguments:
......@@ -118,20 +118,20 @@ PolyhedralSplit::Destruct(void *ptr)
// Creation: Fri Mar 12 15:17:55 PST 2010
//
// Modifications:
//
//
// ****************************************************************************
void
PolyhedralSplit::AppendCellSplits(int cellid, int nsplits)
avtPolyhedralSplit::AppendCellSplits(int cellid, int nsplits)
{
polyhedralSplit.push_back(cellid);
polyhedralSplit.push_back(nsplits);
}
// ****************************************************************************
// Method: PolyhedralSplit::AppendPolyhedralNode
// Method: avtPolyhedralSplit::AppendPolyhedralNode
//
// Purpose:
// Purpose:
// Store a polyhedral node id.
//
// Arguments:
......@@ -141,19 +141,19 @@ PolyhedralSplit::AppendCellSplits(int cellid, int nsplits)
// Creation: Fri Mar 12 16:50:25 PST 2010
//
// Modifications:
//
//
// ****************************************************************************
void
PolyhedralSplit::AppendPolyhedralNode(int id)
avtPolyhedralSplit::AppendPolyhedralNode(int id)
{
nodesForPolyhedralCells.push_back(id);
}
// ****************************************************************************
// Method: PolyhedralSplit::ExpandDataArray
// Method: avtPolyhedralSplit::ExpandDataArray
//
// Purpose:
// Purpose:
// Return a copy of the input data array with polyhedral cells' data
// replicated the appropriate number of times.
//
......@@ -183,10 +183,10 @@ PolyhedralSplit::AppendPolyhedralNode(int id)
// ****************************************************************************
vtkDataArray *
PolyhedralSplit::ExpandDataArray(vtkDataArray *input, bool zoneCent,
avtPolyhedralSplit::ExpandDataArray(vtkDataArray *input, bool zoneCent,
bool averageNodes) const
{
const char *mName = "PolyhedralSplit::ExpandDataArray: ";
const char *mName = "avtPolyhedralSplit::ExpandDataArray: ";
vtkDataArray *output = NULL;
int polyhedralCellCount = polyhedralSplit.size() / 2;
......@@ -201,7 +201,7 @@ PolyhedralSplit::ExpandDataArray(vtkDataArray *input, bool zoneCent,
debug4 << mName << "Expanding zonal data" << endl;
output = input->NewInstance();
int bloat = 0;
for(size_t i = 1; i < polyhedralSplit.size(); i += 2)
bloat += (polyhedralSplit[i] - 1);
output->SetNumberOfComponents(input->GetNumberOfComponents());
......@@ -306,13 +306,13 @@ PolyhedralSplit::ExpandDataArray(vtkDataArray *input, bool zoneCent,
debug4 << mName << "Output data has " << output->GetNumberOfTuples()
<< " tuples" << endl;
return output;
return output;
}
// ****************************************************************************
// Method: PolyhedralSplit::CreateOriginalCells
// Method: avtPolyhedralSplit::CreateOriginalCells
//
// Purpose:
// Purpose:
// Creates an original cells array based on the polyhedral split data.
//
// Arguments:
......@@ -321,7 +321,7 @@ PolyhedralSplit::ExpandDataArray(vtkDataArray *input, bool zoneCent,
//
// Returns: An original cells array.
//
// Note:
// Note:
//
// Programmer: Brad Whitlock
// Creation: Fri Mar 12 15:20:24 PST 2010
......@@ -329,11 +329,11 @@ PolyhedralSplit::ExpandDataArray(vtkDataArray *input, bool zoneCent,
// Modifications:
// Brad Whitlock, Tue Oct 26 16:23:45 PDT 2010
// I turned polyhedralSplit into a vector.
//
//
// ****************************************************************************
vtkDataArray *
PolyhedralSplit::CreateOriginalCells(int domain, int normalCellCount) const
avtPolyhedralSplit::CreateOriginalCells(int domain, int normalCellCount) const
{
vtkUnsignedIntArray *originalCells = vtkUnsignedIntArray::New();
originalCells->SetNumberOfComponents(2);
......
......@@ -35,21 +35,21 @@
* DAMAGE.
*
*****************************************************************************/
#ifndef POLYHEDRAL_SPLIT_H
#define POLYHEDRAL_SPLIT_H
#ifndef AVT_POLYHEDRAL_SPLIT_H
#define AVT_POLYHEDRAL_SPLIT_H
#include <vectortypes.h>
class vtkDataArray;
// ****************************************************************************
// Class: PolyhedralSplit
// Class: avtPolyhedralSplit
//
// Purpose:
// This class contains a list of polyhedral cells that were split into zoo
// cells and their split count. The class also contains methods for expanding
// data arrays to account for the cell splitting.
//
// Notes:
// Notes:
//
// Programmer: Brad Whitlock
// Creation: Fri Mar 12 11:29:46 PST 2010
......@@ -58,14 +58,18 @@ class vtkDataArray;
// Brad Whitlock, Tue Oct 26 16:23:45 PDT 2010
// I turned polyhedralSplit into a vector so we could add polyhedral split
// information as we discover it.
//
//
// Cyrus Harrison, Tue Oct 9 14:12:12 PDT 2012
// Moved here from the SimV2 reader, since other db readers do/may need
// to use this functionality.
//
// ****************************************************************************
class PolyhedralSplit
class avtPolyhedralSplit
{
public:
PolyhedralSplit();
~PolyhedralSplit();
avtPolyhedralSplit();
~avtPolyhedralSplit();
static void Destruct(void *);
......
<?xml version="1.0"?>
<Plugin name="CCM" type="database" label="CCM" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD" haswriter="false" hasoptions="false">
<Plugin name="CCM" type="database" label="CCM" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD" haswriter="false" hasoptions="false" filePatternsStrict="false" opensWholeDirectory="false">
<CXXFLAGS>
${CCMIO_INCLUDE_DIR}
${MESA_INCLUDE_DIR}
</CXXFLAGS>
<LDFLAGS>
${CCMIO_LIBRARY_DIR}
</LDFLAGS>
<LIBS>
${CCMIO_LIB}
${TESSELLATION_LIBRARY}
</LIBS>
<FilePatterns>
*.ccm
......
......@@ -27,7 +27,6 @@ avtCCMFileFormat.C
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CCMIO_INCLUDE_DIR}
${MESA_INCLUDE_DIR}
${VISIT_COMMON_INCLUDES}
${VISIT_INCLUDE_DIR}/avt/DBAtts/MetaData
${VISIT_INCLUDE_DIR}/avt/DBAtts/SIL
......@@ -60,19 +59,19 @@ SET(INSTALLTARGETS ICCMDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MCCMDatabase ${LIBM_SOURCES} )
TARGET_LINK_LIBRARIES(MCCMDatabase visitcommon avtdbatts avtdatabase_ser ${CCMIO_LIB} ${TESSELLATION_LIBRARY} )
TARGET_LINK_LIBRARIES(MCCMDatabase visitcommon avtdbatts avtdatabase_ser ${CCMIO_LIB} )
ADD_TARGET_DEFINITIONS(MCCMDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MCCMDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(ECCMDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ECCMDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${CCMIO_LIB} ${TESSELLATION_LIBRARY} )
TARGET_LINK_LIBRARIES(ECCMDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${CCMIO_LIB} )
ADD_TARGET_DEFINITIONS(ECCMDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ECCMDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(ECCMDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ECCMDatabase_par visitcommon avtdatabase_par avtpipeline_par ${CCMIO_LIB} ${TESSELLATION_LIBRARY} )
TARGET_LINK_LIBRARIES(ECCMDatabase_par visitcommon avtdatabase_par avtpipeline_par ${CCMIO_LIB} )
ADD_TARGET_DEFINITIONS(ECCMDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ECCMDatabase_par)
ENDIF(VISIT_PARALLEL)
......
This diff is collapsed.
......@@ -16,7 +16,6 @@ SET(LIBM_SOURCES
GMVMDServerPluginInfo.C
${COMMON_SOURCES}
avtGMVFileFormat.C
gmvPolyhedralSplit.C
gmvread.c
)
......@@ -25,15 +24,12 @@ GMVEnginePluginInfo.C
${COMMON_SOURCES}
avtGMVFileFormat.C
gmvMaterialEncoder.C
gmvPolyhedralSplit.C
gmvread.c
)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${VISIT_INCLUDE_DIR}/databases/PDB
${VISIT_INCLUDE_DIR}/databases/SimV2
${MESA_INCLUDE_DIR}
${VISIT_COMMON_INCLUDES}
${VISIT_INCLUDE_DIR}/avt/DBAtts/MetaData
${VISIT_INCLUDE_DIR}/avt/DBAtts/SIL
......@@ -66,19 +62,19 @@ SET(INSTALLTARGETS IGMVDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MGMVDatabase ${LIBM_SOURCES} )
TARGET_LINK_LIBRARIES(MGMVDatabase visitcommon avtdbatts avtdatabase_ser ${TESSELLATION_LIBRARY} )
TARGET_LINK_LIBRARIES(MGMVDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MGMVDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MGMVDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EGMVDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EGMVDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${TESSELLATION_LIBRARY} )
TARGET_LINK_LIBRARIES(EGMVDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser )
ADD_TARGET_DEFINITIONS(EGMVDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EGMVDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EGMVDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EGMVDatabase_par visitcommon avtdatabase_par avtpipeline_par ${TESSELLATION_LIBRARY} )
TARGET_LINK_LIBRARIES(EGMVDatabase_par visitcommon avtdatabase_par avtpipeline_par )
ADD_TARGET_DEFINITIONS(EGMVDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EGMVDatabase_par)
ENDIF(VISIT_PARALLEL)
......
......@@ -2,24 +2,17 @@
<Plugin name="GMV" type="database" label="GMV" version="1.0" enabled="true" mdspecificcode="true" engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD" haswriter="false" hasoptions="false" filePatternsStrict="false" opensWholeDirectory="false">
<CXXFLAGS>
${VISIT_INCLUDE_DIR}/databases/PDB
${VISIT_INCLUDE_DIR}/databases/SimV2
${MESA_INCLUDE_DIR}
</CXXFLAGS>
<LIBS>
${TESSELLATION_LIBRARY}
</LIBS>
<FilePatterns>
*.gmv
</FilePatterns>
<Files components="M">
avtGMVFileFormat.C
gmvPolyhedralSplit.C
gmvread.c
</Files>
<Files components="E">
avtGMVFileFormat.C
gmvMaterialEncoder.C
gmvPolyhedralSplit.C
gmvread.c
</Files>
<Attribute name="" purpose="" persistent="true" keyframe="true" exportAPI="" exportInclude="">
......
This diff is collapsed.
......@@ -50,7 +50,7 @@
#include <avtDatabaseMetaData.h>
class gmvPolyhedralSplit;
class avtPolyhedralSplit;
// ****************************************************************************
// Class: avtGMVFileFormat
......@@ -73,7 +73,7 @@ public:
virtual double GetTime(void);
virtual const char *GetType(void) { return "GMV"; };
virtual void FreeUpResources(void);
virtual void FreeUpResources(void);
virtual void ActivateTimestep(void);
......@@ -82,7 +82,7 @@ public:
virtual vtkDataArray *GetVectorVar(int, const char *);
virtual void *GetAuxiliaryData(const char *var, int domain,
const char *type, void *args,
const char *type, void *args,
DestructorFunction &);
protected:
void ReadData();
......@@ -93,7 +93,7 @@ protected:
vtkDataSet *dataset;
vtkDataArray *material;
int materialCentering;
gmvPolyhedralSplit *polyhedralSplit;
avtPolyhedralSplit *polyhedralSplit;
};
// DATA MEMBERS
......
#define PolygonToTriangles gmvPolygonToTriangles
#include "../Shapefile/PolygonToTriangles.C"
#ifndef PolyhedralSplit
#define PolyhedralSplit gmvPolyhedralSplit
#endif
#include <PolyhedralSplit.C>
#ifndef PolyhedralSplit
#define PolyhedralSplit gmvPolyhedralSplit
#endif
#include <PolyhedralSplit.h>
......@@ -32,7 +32,6 @@ dbfFile.C
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${MESA_INCLUDE_DIR}
${VISIT_COMMON_INCLUDES}
${VISIT_INCLUDE_DIR}/avt/DBAtts/MetaData
${VISIT_INCLUDE_DIR}/avt/DBAtts/SIL
......@@ -65,19 +64,19 @@ SET(INSTALLTARGETS IShapefileDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MShapefileDatabase ${LIBM_SOURCES} )
TARGET_LINK_LIBRARIES(MShapefileDatabase visitcommon avtdbatts avtdatabase_ser ${TESSELLATION_LIBRARY} )
TARGET_LINK_LIBRARIES(MShapefileDatabase visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MShapefileDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MShapefileDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EShapefileDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EShapefileDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${TESSELLATION_LIBRARY} )
TARGET_LINK_LIBRARIES(EShapefileDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser )
ADD_TARGET_DEFINITIONS(EShapefileDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EShapefileDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EShapefileDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EShapefileDatabase_par visitcommon avtdatabase_par avtpipeline_par ${TESSELLATION_LIBRARY} )
TARGET_LINK_LIBRARIES(EShapefileDatabase_par visitcommon avtdatabase_par avtpipeline_par )
ADD_TARGET_DEFINITIONS(EShapefileDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EShapefileDatabase_par)
ENDIF(VISIT_PARALLEL)
......
This diff is collapsed.
<?xml version="1.0"?>
<Plugin name="Shapefile" type="database" label="ESRI Shapefile" version="1.0" enabled="true" mdspecificcode="true" onlyengine="false" noengine="false" dbtype="STSD" haswriter="false" hasoptions="true">
<CXXFLAGS>
${MESA_INCLUDE_DIR}
</CXXFLAGS>
<LIBS>
${TESSELLATION_LIBRARY}
</LIBS>
<Plugin name="Shapefile" type="database" label="ESRI Shapefile" version="1.0" enabled="true" mdspecificcode="true" engspecificcode="false" onlyengine="false" noengine="false" dbtype="STSD" haswriter="false" hasoptions="true" filePatternsStrict="false" opensWholeDirectory="false">
<FilePatterns>
*.shp
*.shx
......@@ -23,6 +17,6 @@
esriShapefile.C
dbfFile.C
</Files>
<Attribute name="" purpose="" persistent="false" exportAPI="" exportInclude="">
<Attribute name="" purpose="" persistent="false" keyframe="true" exportAPI="" exportInclude="">
</Attribute>
</Plugin>
......@@ -24,14 +24,12 @@ ${COMMON_SOURCES}
avtSimV2FileFormat.C
avtSimV2Writer.C
SimV2GetMesh.C
PolyhedralSplit.C
)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${VISIT_INCLUDE_DIR}/sim/V2/lib
${VISIT_INCLUDE_DIR}/sim/V2/runtime
${MESA_INCLUDE_DIR}
${VISIT_COMMON_INCLUDES}
${VISIT_INCLUDE_DIR}/avt/DBAtts/MetaData
${VISIT_INCLUDE_DIR}/avt/DBAtts/SIL
......@@ -64,19 +62,19 @@ SET(INSTALLTARGETS ISimV2Database)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MSimV2Database ${LIBM_SOURCES} )
TARGET_LINK_LIBRARIES(MSimV2Database visitcommon avtdbatts avtdatabase_ser ${TESSELLATION_LIBRARY} )
TARGET_LINK_LIBRARIES(MSimV2Database visitcommon avtdbatts avtdatabase_ser )
ADD_TARGET_DEFINITIONS(MSimV2Database MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MSimV2Database)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(ESimV2Database_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ESimV2Database_ser visitcommon avtdatabase_ser avtpipeline_ser ${TESSELLATION_LIBRARY} simV2runtime_ser )
TARGET_LINK_LIBRARIES(ESimV2Database_ser visitcommon avtdatabase_ser avtpipeline_ser simV2runtime_ser )
ADD_TARGET_DEFINITIONS(ESimV2Database_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ESimV2Database_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(ESimV2Database_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ESimV2Database_par visitcommon avtdatabase_par avtpipeline_par ${TESSELLATION_LIBRARY} simV2runtime_par )
TARGET_LINK_LIBRARIES(ESimV2Database_par visitcommon avtdatabase_par avtpipeline_par simV2runtime_par )
ADD_TARGET_DEFINITIONS(ESimV2Database_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} ESimV2Database_par)
ENDIF(VISIT_PARALLEL)
......
#define PolygonToTriangles simv2PolygonToTriangles
#include "../Shapefile/PolygonToTriangles.C"
<?xml version="1.0"?>
<Plugin name="SimV2" type="database" label="SimulationV2" version="1.0" enabled="true" mdspecificcode="true" engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD" haswriter="true" hasoptions="false" filePatternsStrict="false">
<FilePatterns>
*.sim2
</FilePatterns>
<Plugin name="SimV2" type="database" label="SimulationV2" version="1.0" enabled="true" mdspecificcode="true" engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD" haswriter="true" hasoptions="false" filePatternsStrict="false" opensWholeDirectory="false">
<CXXFLAGS>
${VISIT_INCLUDE_DIR}/sim/V2/lib
${VISIT_INCLUDE_DIR}/sim/V2/runtime
${MESA_INCLUDE_DIR}
</CXXFLAGS>
<LDFLAGS>
${ICET_LIBRARY_DIR}
</LDFLAGS>
<LIBS>
${TESSELLATION_LIBRARY}
</LIBS>
<FilePatterns>
*.sim2
</FilePatterns>
<Files components="E">
avtSimV2FileFormat.C
avtSimV2Writer.C
SimV2GetMesh.C
PolyhedralSplit.C
</Files>
<LIBS components="ESer">
simV2runtime_ser
......
This diff is collapsed.
This diff is collapsed.
......@@ -36,6 +36,9 @@
#
# Modifications:
#
# Cyrus Harrison, Tue Oct 9 15:44:53 PDT 2012
# Added tess2
#