diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options index b40ecb51d..d1f434031 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(ParaView_DIR)/VTK \ + -I$(ParaView_DIR)/include/$(ParaView_MAJOR) \ -I$(ParaView_INST_DIR) \ -I$(ParaView_INST_DIR)/VTK \ -I$(ParaView_INST_DIR)/VTK/Common \ diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C index 7a05cde21..867ddf099 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C @@ -268,7 +268,7 @@ void Foam::vtkPV3Foam::convertMeshCellZones mesh ); - subsetMesh.setLargeCellSubset(zMesh[zoneId]); + subsetMesh.setLargeCellSubset(labelHashSet(zMesh[zoneId])); vtkUnstructuredGrid* vtkmesh = volumeVTKMesh ( diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc index 6afdb8c04..8427e6d80 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/apps/paraview3/bashrc @@ -70,7 +70,7 @@ if [ "$PYTHONPATH" ]; then else export PYTHONPATH=$ParaView_DIR/Utilities/VTKPythonWrapping fi -if [ $WM_ARCH = "darwinPpc" -o $WM_ARCH = "darwinIntel" ] +if [ $WM_ARCH_BASE = "darwin" ] then export PYTHONPATH=$PYTHONPATH:$ParaView_DIR/bin fi @@ -79,6 +79,25 @@ if [ -r $ParaView_DIR ] then export PATH=$ParaView_DIR/bin:$PATH export PV_PLUGIN_PATH=$FOAM_LIBBIN + if [ "$WM_ARCH_BASE" == "darwin" ] + then + export PATH=$ParaView_DIR/bin/paraview.app/Contents/MacOS:$PATH + export DYLD_LIBRARY_PATH=$ParaView_DIR/bin:$DYLD_LIBRARY_PATH + export DYLD_LIBRARY_PATH=$ParaView_DIR/lib/$ParaView_MAJOR:$DYLD_LIBRARY_PATH + + # Move plugins to a separate directory because paraview crashes + # when it tries to load one of the other libraries in $FOAM_LIBBIN as a plugin + export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview + if [ ! -e $PV_PLUGIN_PATH ] + then + echo "Creating $PV_PLUGIN_PATH" + mkdir $PV_PLUGIN_PATH + fi + for i in $(find $FOAM_LIBBIN -depth 1 -name "libPV*") + do + ln -sf $i $PV_PLUGIN_PATH + done + fi fi unset cmake paraviewPython