Commit 0b0e85b7 authored by Mark Olesen's avatar Mark Olesen

COMP: reorganized paraview library names for more clarity

- OpenFOAM reader:
     (vtkPVFoam, PVFoamReader_SM)
  => (vtkPVFoamReader, ParaFoamReader)

- blockMesh reader:
     (vtkPVblockMesh, PVblockMeshReader_SM)
  => (vtkPVblockReader, ParaFoamBlockReader)

* provides better correspondence between library and module names
parent 9bc0deca
...@@ -12,8 +12,11 @@ wclean libso blockMeshReader/library ...@@ -12,8 +12,11 @@ wclean libso blockMeshReader/library
wclean libso foamReader/library wclean libso foamReader/library
# Cleanup client-server and/or combined plugins # Cleanup client-server and/or combined plugins
rm -f $FOAM_LIBBIN/libPVblockMeshReader* 2>/dev/null if [ -d "$FOAM_PV_PLUGIN_LIBBIN" ]
rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null then
echo "Remaining plugins: $FOAM_PV_PLUGIN_LIBBIN"
# rm -rf "$FOAM_PV_PLUGIN_LIBBIN"
fi
# Cleanup generated files - remove entire top-level # Cleanup generated files - remove entire top-level
removeObjectDir "$PWD" removeObjectDir "$PWD"
......
...@@ -39,9 +39,9 @@ add_paraview_property_group_widget(IFACES0 IFACES0_SRCS ...@@ -39,9 +39,9 @@ add_paraview_property_group_widget(IFACES0 IFACES0_SRCS
) )
add_paraview_plugin( add_paraview_plugin(
PVblockMeshReader_SM "${foam_api}" ParaFoamBlockReader "${foam_api}"
SERVER_MANAGER_XML SERVER_MANAGER_XML
plugin/PVblockMeshReader_SM.xml plugin/ParaFoamBlockReader.xml
SERVER_MANAGER_SOURCES SERVER_MANAGER_SOURCES
plugin/reader/vtkPVblockMeshReader.cxx plugin/reader/vtkPVblockMeshReader.cxx
GUI_INTERFACES GUI_INTERFACES
...@@ -53,10 +53,10 @@ add_paraview_plugin( ...@@ -53,10 +53,10 @@ add_paraview_plugin(
) )
target_link_libraries( target_link_libraries(
PVblockMeshReader_SM ParaFoamBlockReader
LINK_PUBLIC LINK_PUBLIC
vtkPVFoamCommon${foamPvLibQualifier} vtkPVFoamCommon${foamPvLibQualifier}
vtkPVblockMesh${foamPvLibQualifier} vtkPVblockReader${foamPvLibQualifier}
${OPENFOAM_LIBNAMES} ${OPENFOAM_LIBNAMES}
) )
......
vtkPVblockMesh.C vtkPVblockMesh.C
vtkPVblockMeshConvert.C vtkPVblockMeshConvert.C
LIB = $(FOAM_LIBBIN)/libvtkPVblockMesh-pv${PARAVIEW_API} LIB = $(FOAM_LIBBIN)/libvtkPVblockReader-pv${PARAVIEW_API}
<ServerManagerConfiguration> <ServerManagerConfiguration>
<ProxyGroup name="sources"> <ProxyGroup name="sources">
<SourceProxy <SourceProxy
name="PVblockMeshReader" name="ParaFoamBlockReader"
class="vtkPVblockMeshReader"> class="vtkPVblockMeshReader">
<!-- File name - compulsory --> <!-- File name - compulsory -->
......
...@@ -45,9 +45,9 @@ add_paraview_property_group_widget(IFACES0 IFACES0_SRCS ...@@ -45,9 +45,9 @@ add_paraview_property_group_widget(IFACES0 IFACES0_SRCS
) )
add_paraview_plugin( add_paraview_plugin(
PVFoamReader_SM "${foam_api}" ParaFoamReader "${foam_api}"
SERVER_MANAGER_XML SERVER_MANAGER_XML
plugin/PVFoamReader_SM.xml plugin/ParaFoamReader.xml
SERVER_MANAGER_SOURCES SERVER_MANAGER_SOURCES
plugin/reader/vtkPVFoamReader.cxx plugin/reader/vtkPVFoamReader.cxx
GUI_INTERFACES GUI_INTERFACES
...@@ -59,10 +59,10 @@ add_paraview_plugin( ...@@ -59,10 +59,10 @@ add_paraview_plugin(
) )
target_link_libraries( target_link_libraries(
PVFoamReader_SM ParaFoamReader
LINK_PUBLIC LINK_PUBLIC
vtkPVFoamCommon${foamPvLibQualifier} vtkPVFoamCommon${foamPvLibQualifier}
vtkPVFoam${foamPvLibQualifier} vtkPVFoamReader${foamPvLibQualifier}
${OPENFOAM_LIBNAMES} ${OPENFOAM_LIBNAMES}
) )
......
...@@ -5,4 +5,4 @@ vtkPVFoamMeshLagrangian.C ...@@ -5,4 +5,4 @@ vtkPVFoamMeshLagrangian.C
vtkPVFoamMeshVolume.C vtkPVFoamMeshVolume.C
vtkPVFoamUpdateInfo.C vtkPVFoamUpdateInfo.C
LIB = $(FOAM_LIBBIN)/libvtkPVFoam-pv${PARAVIEW_API} LIB = $(FOAM_LIBBIN)/libvtkPVFoamReader-pv${PARAVIEW_API}
<ServerManagerConfiguration> <ServerManagerConfiguration>
<ProxyGroup name="sources"> <ProxyGroup name="sources">
<SourceProxy <SourceProxy
name="PVFoamReader" name="ParaFoamReader"
class="vtkPVFoamReader"> class="vtkPVFoamReader">
<!-- File name - compulsory --> <!-- File name - compulsory -->
......
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