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

src/paraview-plugins/Allwclean

@@ -12,8 +12,11 @@ wclean libso blockMeshReader/library
 wclean libso foamReader/library
 
 # Cleanup client-server and/or combined plugins
-rm -f $FOAM_LIBBIN/libPVblockMeshReader* 2>/dev/null
-rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null
+if [ -d "$FOAM_PV_PLUGIN_LIBBIN" ]
+then
+    echo "Remaining plugins: $FOAM_PV_PLUGIN_LIBBIN"
+    # rm -rf "$FOAM_PV_PLUGIN_LIBBIN"
+fi
 
 # Cleanup generated files - remove entire top-level
 removeObjectDir "$PWD"

src/paraview-plugins/blockMeshReader/CMakeLists-Project.txt

@@ -39,9 +39,9 @@ add_paraview_property_group_widget(IFACES0 IFACES0_SRCS
 )
 
 add_paraview_plugin(
-    PVblockMeshReader_SM "${foam_api}"
+    ParaFoamBlockReader "${foam_api}"
     SERVER_MANAGER_XML
-        plugin/PVblockMeshReader_SM.xml
+        plugin/ParaFoamBlockReader.xml
     SERVER_MANAGER_SOURCES
         plugin/reader/vtkPVblockMeshReader.cxx
     GUI_INTERFACES
@@ -53,10 +53,10 @@ add_paraview_plugin(
 )
 
 target_link_libraries(
-    PVblockMeshReader_SM
+    ParaFoamBlockReader
     LINK_PUBLIC
     vtkPVFoamCommon${foamPvLibQualifier}
-    vtkPVblockMesh${foamPvLibQualifier}
+    vtkPVblockReader${foamPvLibQualifier}
     ${OPENFOAM_LIBNAMES}
 )
 

src/paraview-plugins/blockMeshReader/library/Make/files

 vtkPVblockMesh.C
 vtkPVblockMeshConvert.C
 
-LIB = $(FOAM_LIBBIN)/libvtkPVblockMesh-pv${PARAVIEW_API}
+LIB = $(FOAM_LIBBIN)/libvtkPVblockReader-pv${PARAVIEW_API}

src/paraview-plugins/blockMeshReader/plugin/PVblockMeshReader_SM.xml → src/paraview-plugins/blockMeshReader/plugin/ParaFoamBlockReader.xml

 <ServerManagerConfiguration>
   <ProxyGroup name="sources">
   <SourceProxy
-    name="PVblockMeshReader"
+    name="ParaFoamBlockReader"
     class="vtkPVblockMeshReader">
 
     <!-- File name - compulsory -->

src/paraview-plugins/foamReader/CMakeLists-Project.txt

@@ -45,9 +45,9 @@ add_paraview_property_group_widget(IFACES0 IFACES0_SRCS
 )
 
 add_paraview_plugin(
-    PVFoamReader_SM "${foam_api}"
+    ParaFoamReader "${foam_api}"
     SERVER_MANAGER_XML
-        plugin/PVFoamReader_SM.xml
+        plugin/ParaFoamReader.xml
     SERVER_MANAGER_SOURCES
         plugin/reader/vtkPVFoamReader.cxx
     GUI_INTERFACES
@@ -59,10 +59,10 @@ add_paraview_plugin(
 )
 
 target_link_libraries(
-    PVFoamReader_SM
+    ParaFoamReader
     LINK_PUBLIC
     vtkPVFoamCommon${foamPvLibQualifier}
-    vtkPVFoam${foamPvLibQualifier}
+    vtkPVFoamReader${foamPvLibQualifier}
     ${OPENFOAM_LIBNAMES}
 )
 

src/paraview-plugins/foamReader/library/Make/files

@@ -5,4 +5,4 @@ vtkPVFoamMeshLagrangian.C
 vtkPVFoamMeshVolume.C
 vtkPVFoamUpdateInfo.C
 
-LIB = $(FOAM_LIBBIN)/libvtkPVFoam-pv${PARAVIEW_API}
+LIB = $(FOAM_LIBBIN)/libvtkPVFoamReader-pv${PARAVIEW_API}

src/paraview-plugins/foamReader/plugin/PVFoamReader_SM.xml → src/paraview-plugins/foamReader/plugin/ParaFoamReader.xml

 <ServerManagerConfiguration>
   <ProxyGroup name="sources">
   <SourceProxy
-    name="PVFoamReader"
+    name="ParaFoamReader"
     class="vtkPVFoamReader">
 
     <!-- File name - compulsory -->