diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9370cea75..26e717d73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,11 +130,12 @@ if(GIT_FOUND)
ARGS id
OUTPUT_VARIABLE GIT_BRANCH_NAME
)
+ string(REPLACE " " "_" GIT_BRANCH_NAME ${GIT_BRANCH_NAME})
+ string(REPLACE "+" "_modified" GIT_BRANCH_NAME ${GIT_BRANCH_NAME})
+ SET(GIT_BRANCH_NAME "hg_${GIT_BRANCH_NAME}")
message("Git branch (mercurial): ${GIT_BRANCH_NAME}")
endif()
- SET(BUILDNAME "${BUILDNAME}-git-branch='hg_${GIT_BRANCH_NAME}'")
- string(REPLACE " " "_" BUILDNAME ${BUILDNAME})
- string(REPLACE "+" "_modified" BUILDNAME ${BUILDNAME})
+ SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
endif()
# Some last minute cleanup
diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3
index d23e5ac62..05e03f9ce 100755
--- a/ThirdParty/AllMake.stage3
+++ b/ThirdParty/AllMake.stage3
@@ -131,7 +131,9 @@ if [ -z "$PYFOAM_SYSTEM" ]
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.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)
- ( rpm_make -p PyFoam-0.6.1 -s PyFoam-0.6.1.spec -u http://openfoamwiki.net/images/3/33/PyFoam-0.6.1.tar.gz -n PyFoam-0.6.1-1.noarch -a noarch)
+# ( rpm_make -p PyFoam-0.6.1 -s PyFoam-0.6.1.spec -u http://openfoamwiki.net/images/3/33/PyFoam-0.6.1.tar.gz -n PyFoam-0.6.1-1.noarch -a noarch)
+# ( rpm_make -p PyFoam-0.6.2 -s PyFoam-0.6.2.spec -u http://openfoamwiki.net/images/8/89/PyFoam-0.6.2.tar.gz -n PyFoam-0.6.2-1.noarch -a noarch)
+ ( rpm_make -p PyFoam-0.6.3 -s PyFoam-0.6.3.spec -u http://openfoamwiki.net/images/e/e3/PyFoam-0.6.3-rc.tar.gz -n PyFoam-0.6.3-1.noarch -a noarch)
else
echo "Using system installed PyFoam"
echo ""
@@ -152,5 +154,3 @@ echo ========================================
echo
# ----------------------------------------------------------------- end-of-file
-
-
diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.2.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.2.spec
new file mode 100644
index 000000000..5b58e1992
--- /dev/null
+++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.2.spec
@@ -0,0 +1,201 @@
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | foam-extend: Open Source CFD
+# \\ / O peration |
+# \\ / A nd | For copyright notice see file Copyright
+# \\/ M anipulation |
+#------------------------------------------------------------------------------
+# License
+# This file is part of foam-extend.
+#
+# foam-extend is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# foam-extend is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with foam-extend. If not, see .
+#
+# Script
+# RPM spec file for PyFoam-0.6.2
+#
+# Description
+# RPM spec file for PyFoam version 0.6.2
+#
+# Author:
+# Martin Beaudoin, Hydro-Quebec, (2013)
+#
+#------------------------------------------------------------------------------
+
+# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
+%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
+%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)}
+
+# Disable the generation of debuginfo packages
+%define debug_package %{nil}
+
+# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
+%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild
+%define _tmppath %{_topdir}/tmp
+
+# Will install the package directly $WM_THIRD_PARTY_DIR
+# Some comments about package relocation:
+# By using this prefix for the Prefix: parameter in this file, you will make this
+# package relocatable.
+#
+# This is fine, as long as your software is itself relocatable.
+#
+# Simply take note that libraries built with libtool are not relocatable because the
+# prefix we specify will be hard-coded in the library .la files.
+# Ref: http://sourceware.org/autobook/autobook/autobook_80.html
+#
+# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
+# not be able to reutilize this RPM, even though it is relocatable. You will need to
+# regenerate the RPM.
+#
+%define _prefix %{_WM_THIRD_PARTY_DIR}
+
+%define name PyFoam
+%define release 1
+%define version 0.6.2
+
+%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root
+
+BuildRoot: %{buildroot}
+Summary: PyFoam
+License: Unkown
+Name: %{name}
+Version: %{version}
+Release: %{release}
+BuildArch: noarch
+URL: http://openfoamwiki.net/images/8/89/PyFoam-0.6.2.tar.gz
+Source: %url/%{name}-%{version}.tar.gz
+Prefix: %{_prefix}
+Group: Development/Tools
+
+%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/noarch
+
+%description
+%{summary}
+
+%prep
+%setup -q
+
+%build
+ # Make the shebang line portable
+ python setup.py build --executable "/usr/bin/env python"
+
+%install
+ python setup.py install --prefix=$RPM_BUILD_ROOT/%{_installPrefix}
+
+ %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'})
+
+ # Creation of OpenFOAM specific .csh and .sh files"
+
+ echo ""
+ echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}"
+ echo ""
+ #
+ # Generate package specific .sh file for OpenFOAM
+ #
+mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
+cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export PYFOAM_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
+export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
+
+# Enable access to the package applications if present
+[ -d \$PYFOAM_DIR/bin ] && _foamAddPath \$PYFOAM_DIR/bin
+
+DOT_SH_EOF
+
+ #
+ # Generate package specific .csh file for OpenFOAM
+ #
+cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+setenv PYFOAM_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
+
+if ! \$?PYTHONPATH then
+ setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
+else
+ setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
+endif
+
+
+if ( -e \$PYFOAM_DIR/bin ) then
+ _foamAddPath \$PYFOAM_DIR/bin
+endif
+
+if \$?PYFOAM_SITE_DIR then
+ if ( -e \$PYFOAM_SITE_DIR/bin ) then
+ _foamAddPath \$PYFOAM_SITE_DIR/bin
+ endif
+endif
+DOT_CSH_EOF
+
+cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh
+# In this version of the configuration script, the paths are hardcoded,
+# which makes it easier to load PyFoam without the OpenFOAM environment
+# variables
+#
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export PYFOAM_DIR=$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
+export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
+
+# Enable access to the package applications if present
+[ -d \$PYFOAM_DIR/bin ] && export PATH=\$PYFOAM_DIR/bin:\$PATH
+
+DOT_HARDCODED_SH_EOF
+
+ #
+ # Generate package specific .csh file for OpenFOAM
+ #
+cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh
+# In this version of the configuration script, the paths are hardcoded,
+# which makes it easier to load PyFoam without the OpenFOAM environment
+# variables
+#
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+setenv PYFOAM_DIR $WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
+
+if ! \$?PYTHONPATH then
+ setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
+else
+ setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
+endif
+
+
+if ( -e \$PYFOAM_DIR/bin ) then
+ _foamAddPath \$PYFOAM_DIR/bin
+endif
+
+if \$?PYFOAM_SITE_DIR then
+ if ( -e \$PYFOAM_SITE_DIR/bin ) then
+ _foamAddPath \$PYFOAM_SITE_DIR/bin
+ endif
+endif
+DOT_HARDCODED_CSH_EOF
+
+ #finally, generate a .tgz file for systems where using rpm for installing packages
+ # as a non-root user might be a problem.
+ (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version})
+
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%{_installPrefix}
diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.3.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.3.spec
new file mode 100644
index 000000000..838c52390
--- /dev/null
+++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.3.spec
@@ -0,0 +1,201 @@
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | foam-extend: Open Source CFD
+# \\ / O peration |
+# \\ / A nd | For copyright notice see file Copyright
+# \\/ M anipulation |
+#------------------------------------------------------------------------------
+# License
+# This file is part of foam-extend.
+#
+# foam-extend is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# foam-extend is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with foam-extend. If not, see .
+#
+# Script
+# RPM spec file for PyFoam-0.6.3
+#
+# Description
+# RPM spec file for PyFoam version 0.6.3
+#
+# Author:
+# Martin Beaudoin, Hydro-Quebec, (2013)
+#
+#------------------------------------------------------------------------------
+
+# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
+%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
+%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)}
+
+# Disable the generation of debuginfo packages
+%define debug_package %{nil}
+
+# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
+%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild
+%define _tmppath %{_topdir}/tmp
+
+# Will install the package directly $WM_THIRD_PARTY_DIR
+# Some comments about package relocation:
+# By using this prefix for the Prefix: parameter in this file, you will make this
+# package relocatable.
+#
+# This is fine, as long as your software is itself relocatable.
+#
+# Simply take note that libraries built with libtool are not relocatable because the
+# prefix we specify will be hard-coded in the library .la files.
+# Ref: http://sourceware.org/autobook/autobook/autobook_80.html
+#
+# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
+# not be able to reutilize this RPM, even though it is relocatable. You will need to
+# regenerate the RPM.
+#
+%define _prefix %{_WM_THIRD_PARTY_DIR}
+
+%define name PyFoam
+%define release 1
+%define version 0.6.3
+
+%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root
+
+BuildRoot: %{buildroot}
+Summary: PyFoam
+License: Unkown
+Name: %{name}
+Version: %{version}
+Release: %{release}
+BuildArch: noarch
+URL: http://openfoamwiki.net/images/e/e3/PyFoam-0.6.3-rc.tar.gz
+Source: %url/%{name}-%{version}-rc.tar.gz
+Prefix: %{_prefix}
+Group: Development/Tools
+
+%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/noarch
+
+%description
+%{summary}
+
+%prep
+%setup -q -n PyFoam-%{version}-rc
+
+%build
+ # Make the shebang line portable
+ python setup.py build --executable "/usr/bin/env python"
+
+%install
+ python setup.py install --prefix=$RPM_BUILD_ROOT/%{_installPrefix}
+
+ %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'})
+
+ # Creation of OpenFOAM specific .csh and .sh files"
+
+ echo ""
+ echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}"
+ echo ""
+ #
+ # Generate package specific .sh file for OpenFOAM
+ #
+mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
+cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export PYFOAM_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
+export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
+
+# Enable access to the package applications if present
+[ -d \$PYFOAM_DIR/bin ] && _foamAddPath \$PYFOAM_DIR/bin
+
+DOT_SH_EOF
+
+ #
+ # Generate package specific .csh file for OpenFOAM
+ #
+cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+setenv PYFOAM_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
+
+if ! \$?PYTHONPATH then
+ setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
+else
+ setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
+endif
+
+
+if ( -e \$PYFOAM_DIR/bin ) then
+ _foamAddPath \$PYFOAM_DIR/bin
+endif
+
+if \$?PYFOAM_SITE_DIR then
+ if ( -e \$PYFOAM_SITE_DIR/bin ) then
+ _foamAddPath \$PYFOAM_SITE_DIR/bin
+ endif
+endif
+DOT_CSH_EOF
+
+cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh
+# In this version of the configuration script, the paths are hardcoded,
+# which makes it easier to load PyFoam without the OpenFOAM environment
+# variables
+#
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export PYFOAM_DIR=$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
+export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
+
+# Enable access to the package applications if present
+[ -d \$PYFOAM_DIR/bin ] && export PATH=\$PYFOAM_DIR/bin:\$PATH
+
+DOT_HARDCODED_SH_EOF
+
+ #
+ # Generate package specific .csh file for OpenFOAM
+ #
+cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh
+# In this version of the configuration script, the paths are hardcoded,
+# which makes it easier to load PyFoam without the OpenFOAM environment
+# variables
+#
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+setenv PYFOAM_DIR $WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
+
+if ! \$?PYTHONPATH then
+ setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
+else
+ setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
+endif
+
+
+if ( -e \$PYFOAM_DIR/bin ) then
+ _foamAddPath \$PYFOAM_DIR/bin
+endif
+
+if \$?PYFOAM_SITE_DIR then
+ if ( -e \$PYFOAM_SITE_DIR/bin ) then
+ _foamAddPath \$PYFOAM_SITE_DIR/bin
+ endif
+endif
+DOT_HARDCODED_CSH_EOF
+
+ #finally, generate a .tgz file for systems where using rpm for installing packages
+ # as a non-root user might be a problem.
+ (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version})
+
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%{_installPrefix}
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index e350b44ad..50ddc1ed3 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -75,7 +75,14 @@ runParallel ()
echo "$APP_NAME already run on $PWD: remove log file to run"
else
echo "Running $APP_NAME in parallel on $PWD using $1 processes"
- ( mpirun -np $1 $APP_RUN -parallel < /dev/null > $LOG_NAME 2>&1 )
+ if [ -z "$WM_MPIRUN_PROG" ]
+ then
+ mpirunProg=mpirun
+ else
+ # Allow exceentric systems to override the hardcoded mpirun
+ mpirunProg=$WM_MPIRUN_PROG
+ fi
+ ( $mpirunProg -np $1 $APP_RUN -parallel < /dev/null > $LOG_NAME 2>&1 )
fi
}
diff --git a/etc/bashrc b/etc/bashrc
old mode 100644
new mode 100755
index 1514b3c25..8fff471a1
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -329,14 +329,17 @@ Darwin)
then
export WM_CC="gcc-mp-$WM_MACPORT_VERSION"
export WM_CXX="g++-mp-$WM_MACPORT_VERSION"
+ export WM_FC="gfortran-mp-$WM_MACPORT_VERSION"
elif [ "$WM_BASE_COMPILER" == "Clang" ]
then
export WM_CC="clang-mp-$WM_MACPORT_VERSION"
export WM_CXX="clang++-mp-$WM_MACPORT_VERSION"
+ # Seems like there is no Fortran-frontend for LLVM at thistime
elif [ "$WM_BASE_COMPILER" == "Dragonegg" ]
then
export WM_CC="dragonegg-$WM_MACPORT_VERSION-gcc"
export WM_CXX="dragonegg-$WM_MACPORT_VERSION-g++"
+ export WM_CXX="dragonegg-$WM_MACPORT_VERSION-gfortran"
else
echo "Unknown base compiler $WM_BASE_COMPILER"
fi
diff --git a/etc/settings.csh b/etc/settings.csh
index 16612e1dd..f86fcabe6 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -494,8 +494,8 @@ endif
# PyFoam
# ~~~~~~
-if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.1/platforms/noarch ) then
- _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.1/platforms/noarch/etc/PyFoam-0.6.1.csh
+if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.3/platforms/noarch ) then
+ _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.3/platforms/noarch/etc/PyFoam-0.6.3.csh
endif
# hwloc
diff --git a/etc/settings.sh b/etc/settings.sh
old mode 100644
new mode 100755
index a83d5e100..735a3ae7a
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -248,7 +248,13 @@ MACPORTOPENMPI)
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$FOAM_MPI
_foamAddLib $libDir
unset libDir
- ;;
+
+ which mpirun >/dev/null
+ if [ $? -ne 0 ]
+ then
+ export WM_MPIRUN_PROG=mpirun-openmpi-$WM_MACPORT_MPI_VERSION
+ fi
+ ;;
MACPORTMPICH)
export FOAM_MPI=mpich-macports-$WM_MACPORT_MPI_VERSION
@@ -260,6 +266,11 @@ MACPORTMPICH)
_foamAddLib $libDir
unset libDir
+ which mpirun >/dev/null
+ if [ $? -ne 0 ]
+ then
+ export WM_MPIRUN_PROG=mpirun-mpich-$WM_MACPORT_MPI_VERSION
+ fi
;;
SYSTEMOPENMPI)
@@ -616,8 +627,8 @@ export MPI_BUFFER_SIZE
# Load PyFoam
# ~~~~~~~~~~~
-[ -z "$PYFOAM_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.1/platforms/noarch ] && {
- _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.1/platforms/noarch/etc/PyFoam-0.6.1.sh
+[ -z "$PYFOAM_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.3/platforms/noarch ] && {
+ _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.3/platforms/noarch/etc/PyFoam-0.6.3.sh
}
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " PYFOAM_DIR is initialized to: $PYFOAM_DIR"
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.C
index d9a245e5d..e91ed60cb 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.C
@@ -584,8 +584,8 @@ steadyInertialDdtScheme::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
- this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())*
- (
+ fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
+ *(
fvc::interpolate(rDeltaT*rA*rho.oldTime())*
phi.oldTime()
- (fvc::interpolate(rDeltaT*rA*rho.oldTime()*U.oldTime())
@@ -605,14 +605,14 @@ steadyInertialDdtScheme::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
- this->fvcDdtPhiCoeff
+ fvcDdtPhiCoeff
(
U.oldTime(),
phi.oldTime()/fvc::interpolate(rho.oldTime())
- )*
- (
- fvc::interpolate(rDeltaT*rA*rho.oldTime())*
- phi.oldTime()/fvc::interpolate(rho.oldTime())
+ )
+ *(
+ fvc::interpolate(rDeltaT*rA*rho.oldTime())
+ *phi.oldTime()/fvc::interpolate(rho.oldTime())
- (
fvc::interpolate
(
@@ -634,17 +634,11 @@ steadyInertialDdtScheme::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
- this->fvcDdtPhiCoeff
- (
- rho.oldTime(),
- U.oldTime(),
- phi.oldTime()
- )*
- (
+ fvcDdtPhiCoeff(rho.oldTime(), U.oldTime(), phi.oldTime())
+ *(
fvc::interpolate(rDeltaT*rA)*phi.oldTime()
- (
- fvc::interpolate(rDeltaT*rA*U.oldTime())
- & mesh().Sf()
+ fvc::interpolate(rDeltaT*rA*U.oldTime())&mesh().Sf()
)
)
)
diff --git a/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt b/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt
index 9370cea75..26e717d73 100644
--- a/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt
+++ b/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt
@@ -130,11 +130,12 @@ if(GIT_FOUND)
ARGS id
OUTPUT_VARIABLE GIT_BRANCH_NAME
)
+ string(REPLACE " " "_" GIT_BRANCH_NAME ${GIT_BRANCH_NAME})
+ string(REPLACE "+" "_modified" GIT_BRANCH_NAME ${GIT_BRANCH_NAME})
+ SET(GIT_BRANCH_NAME "hg_${GIT_BRANCH_NAME}")
message("Git branch (mercurial): ${GIT_BRANCH_NAME}")
endif()
- SET(BUILDNAME "${BUILDNAME}-git-branch='hg_${GIT_BRANCH_NAME}'")
- string(REPLACE " " "_" BUILDNAME ${BUILDNAME})
- string(REPLACE "+" "_modified" BUILDNAME ${BUILDNAME})
+ SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
endif()
# Some last minute cleanup