Switch to PyFoam version 0.5.7
This commit is contained in:
parent
a5bb457f39
commit
4bf399fa58
5 changed files with 11 additions and 5 deletions
3
ThirdParty/AllMake
vendored
3
ThirdParty/AllMake
vendored
|
@ -72,6 +72,9 @@ echo
|
||||||
./AllMake.stage4
|
./AllMake.stage4
|
||||||
|
|
||||||
# Running stage 5
|
# Running stage 5
|
||||||
|
# This stage depends on a properly compiled installation
|
||||||
|
# of OpenFOAM. On a brand new installation of OpenFOAM-1.6-ext,
|
||||||
|
# this stage should be called last in your compilation process
|
||||||
./AllMake.stage5
|
./AllMake.stage5
|
||||||
|
|
||||||
echo ========================================
|
echo ========================================
|
||||||
|
|
3
ThirdParty/AllMake.stage3
vendored
3
ThirdParty/AllMake.stage3
vendored
|
@ -128,7 +128,8 @@ fi
|
||||||
# PyFoam
|
# PyFoam
|
||||||
if [ -z "$PYFOAM_SYSTEM" ]
|
if [ -z "$PYFOAM_SYSTEM" ]
|
||||||
then
|
then
|
||||||
( rpm_make -p PyFoam-0.5.6 -s PyFoam-0.5.6.spec -u http://openfoamwiki.net/images/b/b8/PyFoam-0.5.6.tar.gz -n PyFoam-0.5.6-1.noarch -a noarch)
|
# ( rpm_make -p PyFoam-0.5.6 -s PyFoam-0.5.6.spec -u http://openfoamwiki.net/images/b/b8/PyFoam-0.5.6.tar.gz -n PyFoam-0.5.6-1.noarch -a noarch)
|
||||||
|
( rpm_make -p PyFoam-0.5.7 -s PyFoam-0.5.7.spec -u http://openfoamwiki.net/images/d/dc/PyFoam-0.5.7.tar.gz -n PyFoam-0.5.7-1.noarch -a noarch)
|
||||||
else
|
else
|
||||||
echo "Using system installed PyFoam"
|
echo "Using system installed PyFoam"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
2
ThirdParty/AllMake.stage5
vendored
2
ThirdParty/AllMake.stage5
vendored
|
@ -31,6 +31,8 @@
|
||||||
#
|
#
|
||||||
# Requirements:
|
# Requirements:
|
||||||
# 1: Your OpenFOAM environment must be properly initialized
|
# 1: Your OpenFOAM environment must be properly initialized
|
||||||
|
# 2: OpenFOAM must already been compiled because swak4Foam depends on
|
||||||
|
# OpenFOAM include files and libraries
|
||||||
#
|
#
|
||||||
# Author:
|
# Author:
|
||||||
# Martin Beaudoin, Hydro-Quebec, (2012)
|
# Martin Beaudoin, Hydro-Quebec, (2012)
|
||||||
|
|
|
@ -437,8 +437,8 @@ endif
|
||||||
|
|
||||||
# PyFoam
|
# PyFoam
|
||||||
# ~~~~~~
|
# ~~~~~~
|
||||||
if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.5.6 ) then
|
if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.5.7 ) then
|
||||||
_foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.6/platforms/noarch/etc/PyFoam-0.5.6.csh
|
_foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.7/platforms/noarch/etc/PyFoam-0.5.7.csh
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# QT
|
# QT
|
||||||
|
|
|
@ -524,8 +524,8 @@ export MPI_BUFFER_SIZE
|
||||||
|
|
||||||
# Load PyFoam
|
# Load PyFoam
|
||||||
# ~~~~~~~~~~~
|
# ~~~~~~~~~~~
|
||||||
[ -z "$PYFOAM_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.6 ] && {
|
[ -z "$PYFOAM_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.7 ] && {
|
||||||
_foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.6/platforms/noarch/etc/PyFoam-0.5.6.sh
|
_foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.7/platforms/noarch/etc/PyFoam-0.5.7.sh
|
||||||
}
|
}
|
||||||
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " PYFOAM_DIR is initialized to: $PYFOAM_DIR"
|
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " PYFOAM_DIR is initialized to: $PYFOAM_DIR"
|
||||||
|
|
||||||
|
|
Reference in a new issue