Commit 7ec6f28c authored by Henry Weller's avatar Henry Weller
Browse files

Added support for ParaView-5.0.0

PV4FoamReaders: Updated to build with ParaView-5.0.0
paraFoam: Updated to load PV4FoamReaders for ParaView-5.0.0

Currently this is experimental but if it becomes clear that ParaView-4
and ParaView-5 are and will remain consistent with respect to readers
the plan is to rename

PV4 -> PV

or

PV4 -> PV45 if it is assumed that PV6 may need to be different.
parent 9fc02015
......@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory
#set -x
case "$ParaView_VERSION" in
4*)
4* | 5*)
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then
[ -n "$PV_PLUGIN_PATH" ] || {
......
......@@ -53,8 +53,8 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
ADD_PARAVIEW_PLUGIN(
PV4FoamReader_SM "1.0"
SERVER_MANAGER_XML PV4FoamReader_SM.xml
PVFoamReader_SM "1.0"
SERVER_MANAGER_XML PVFoamReader_SM.xml
SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
GUI_INTERFACES ${IFACES}
GUI_SOURCES pqPV4FoamReaderPanel.cxx
......@@ -63,8 +63,8 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
)
ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
ADD_PARAVIEW_PLUGIN(
PV4FoamReader_SM "1.0"
SERVER_MANAGER_XML PV4FoamReader_SM.xml
PVFoamReader_SM "1.0"
SERVER_MANAGER_XML PVFoamReader_SM.xml
SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
GUI_INTERFACES ${IFACES}
GUI_SOURCES pqPV4FoamReaderPanel.cxx
......@@ -73,7 +73,7 @@ ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
TARGET_LINK_LIBRARIES(
PV4FoamReader_SM
PVFoamReader_SM
LINK_PUBLIC
OpenFOAM
finiteVolume
......
......@@ -7,6 +7,7 @@ EXE_INC = \
-I../../vtkPV4Readers/lnInclude \
-I../PV4FoamReader \
-I$(ParaView_INCLUDE_DIR) \
-I$(ParaView_INCLUDE_DIR)/vtkkwiml \
$(shell \
test -f $(ParaView_INCLUDE_DIR)/vtkPolyhedron.h && \
echo "-DHAS_VTK_POLYHEDRON" || echo "-UHAS_VTK_POLYHEDRON" \
......
......@@ -52,8 +52,8 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
ADD_PARAVIEW_PLUGIN(
PV4blockMeshReader_SM "1.0"
SERVER_MANAGER_XML PV4blockMeshReader_SM.xml
PVblockMeshReader_SM "1.0"
SERVER_MANAGER_XML PVblockMeshReader_SM.xml
SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx
GUI_INTERFACES ${IFACES}
GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
......@@ -62,8 +62,8 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
)
ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
ADD_PARAVIEW_PLUGIN(
PV4blockMeshReader_SM "1.0"
SERVER_MANAGER_XML PV4blockMeshReader_SM.xml
PVblockMeshReader_SM "1.0"
SERVER_MANAGER_XML PVblockMeshReader_SM.xml
SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx
GUI_INTERFACES ${IFACES}
GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
......@@ -74,7 +74,7 @@ ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
# Build the client-side plugin
TARGET_LINK_LIBRARIES(
PV4blockMeshReader_SM
PVblockMeshReader_SM
LINK_PUBLIC
OpenFOAM
blockMesh
......
......@@ -2,6 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/mesh/blockMesh/lnInclude \
-I$(ParaView_INCLUDE_DIR) \
-I$(ParaView_INCLUDE_DIR)/vtkkwiml \
-I../../vtkPV4Readers/lnInclude \
-I../PV4blockMeshReader
......
EXE_INC = \
-I$(ParaView_INCLUDE_DIR)
-I$(ParaView_INCLUDE_DIR) \
-I$(ParaView_INCLUDE_DIR)/vtkkwiml
LIB_LIBS = \
$(GLIBS)
......@@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# License
......@@ -125,7 +125,7 @@ done
version=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\).*$/\1/'`
# Check that reader module has been built
if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPV${version}FoamReader_SM.so ]
if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPVFoamReader_SM.so ]
then
cat<< BUILDREADER
......
Supports Markdown
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