zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for ParaView-4.1.0

Browse Source 
The default ParaView is now 4.0.1 pending completion of testing of 4.1.0
This commit is contained in:
Henry
2014-01-10 10:47:18 +00:00
parent 63db7ce221
commit 011fda6bbe
7 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/postProcessing/graphics/PV4Readers/Allwmake
View File

@ -2,7 +2,7 @@
cd ${0%/*} || exit 1 # run from this directory cd ${0%/*} || exit 1 # run from this directory
#set -x #set -x
if [ "$ParaView_VERSION" == "4.0.1" ] if [ "$ParaView_VERSION" == "4.0.1" -o "$ParaView_VERSION" == "4.1.0" ]
then then
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then then

47
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
View File

@ -49,32 +49,26 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
XML_GROUP sources XML_GROUP sources
) )
ADD_PARAVIEW_PLUGIN( IF("${PARAVIEW_VERSION_MINOR}" LESS 1)
PV4FoamReader_SM "1.0" ADD_PARAVIEW_PLUGIN(
SERVER_MANAGER_XML PV4FoamReader_SM.xml PV4FoamReader_SM "1.0"
SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx SERVER_MANAGER_XML PV4FoamReader_SM.xml
GUI_INTERFACES ${IFACES} SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
GUI_SOURCES pqPV4FoamReaderPanel.cxx GUI_INTERFACES ${IFACES}
${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} GUI_SOURCES pqPV4FoamReaderPanel.cxx
GUI_RESOURCE_FILES PV4FoamReader.xml ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
) GUI_RESOURCE_FILES PV4FoamReader.xml
)
# # ELSE("${PARAVIEW_VERSION_MINOR}" LESS 1)
# # Define the server-side portion of the reader plugin ADD_PARAVIEW_PLUGIN(
# # PV4FoamReader_SM "1.0"
# ADD_PARAVIEW_PLUGIN( SERVER_MANAGER_XML PV4FoamReader_SM.xml
# PV4FoamReader_SM "1.0" SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
# SERVER_MANAGER_XML PV4FoamReader_SM.xml GUI_INTERFACES ${IFACES}
# SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx GUI_SOURCES pqPV4FoamReaderPanel.cxx
# ) ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
# # )
# # Define the client-side portion of the reader plugin ENDIF("${PARAVIEW_VERSION_MINOR}" LESS 1)
# #
# ADD_PARAVIEW_PLUGIN(
# PV4FoamReader "1.0"
# GUI_RESOURCES PV3FoamReader.qrc
# )
#
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
PV4FoamReader_SM PV4FoamReader_SM
@ -82,4 +76,5 @@ TARGET_LINK_LIBRARIES(
finiteVolume finiteVolume
vtkPV4Foam vtkPV4Foam
) )
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

15
applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml
View File

@ -167,19 +167,6 @@
</Documentation> </Documentation>
</IntVectorProperty> </IntVectorProperty>
<!-- Force GUI update check box -->
<IntVectorProperty
name="UpdateGUI"
command="SetUpdateGUI"
number_of_elements="1"
default_values="0"
animateable="0">
<BooleanDomain name="bool"/>
<Documentation>
A simple way to cause a reader GUI modification.
</Documentation>
</IntVectorProperty>
<!-- <!--
| Selections | Selections
--> -->
@ -298,6 +285,8 @@
<Property name="UiShowGroupsOnly" show="0"/> <Property name="UiShowGroupsOnly" show="0"/>
<Property name="UiIncludeSets" show="0"/> <Property name="UiIncludeSets" show="0"/>
<Property name="UiIncludeZones" show="0"/> <Property name="UiIncludeZones" show="0"/>
<ReaderFactory extensions="OpenFOAM"
file_description="OpenFOAM" />
</Hints> </Hints>

2
etc/bashrc
View File

@ -211,7 +211,7 @@ _foamSource $WM_PROJECT_DIR/etc/config/aliases.sh
# Source user setup files for optional packages # Source user setup files for optional packages
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview.sh` _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview4.sh`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.sh` _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.sh`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/gperftools.sh` _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/gperftools.sh`

3
etc/config/paraview4.csh
View File

@ -39,7 +39,7 @@ if ( $status == 0 ) setenv PATH $cleaned
# determine the cmake to be used # determine the cmake to be used
unsetenv CMAKE_HOME unsetenv CMAKE_HOME
foreach cmake ( cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 ) foreach cmake ( cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 )
set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
if ( -r $cmake ) then if ( -r $cmake ) then
setenv CMAKE_HOME $cmake setenv CMAKE_HOME $cmake
@ -50,6 +50,7 @@ end
#- ParaView version, automatically determine major version: #- ParaView version, automatically determine major version:
setenv ParaView_VERSION 4.0.1 setenv ParaView_VERSION 4.0.1
#setenv ParaView_VERSION 4.1.0
setenv ParaView_MAJOR detect setenv ParaView_MAJOR detect

3
etc/config/paraview4.sh
View File

@ -38,7 +38,7 @@ cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platform
# determine the cmake to be used # determine the cmake to be used
unset CMAKE_HOME unset CMAKE_HOME
for cmake in cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 for cmake in cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 cmake-2.8.1
do do
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
if [ -r $cmake ] if [ -r $cmake ]
@ -52,6 +52,7 @@ done
#- ParaView version, automatically determine major version #- ParaView version, automatically determine major version
export ParaView_VERSION=4.0.1 export ParaView_VERSION=4.0.1
#export ParaView_VERSION=4.1.0
export ParaView_MAJOR=detect export ParaView_MAJOR=detect

2
etc/cshrc
View File

@ -201,7 +201,7 @@ _foamSource $WM_PROJECT_DIR/etc/config/aliases.csh
# Source user setup files for optional packages # Source user setup files for optional packages
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview.csh` _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview4.csh`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.csh` _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.csh`