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

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2013-09-26 10:56:57 +01:00
parent 79e356f8df 5e07374949
commit 9cebba4c16
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/utilities/mesh/generation/foamyQuadMesh/Allwmake
View File

@ -4,6 +4,7 @@ set -x
if [ -d "$CGAL_ARCH_PATH" ]
then
wmake libso ../foamyHexMesh/conformalVoronoiMesh
wmake libso conformalVoronoi2DMesh
wmake
fi

10
etc/config/settings.csh
View File

@ -226,10 +226,10 @@ case ThirdParty:
breaksw
case Gcc48:
case Gcc48++0x:
set gcc_version=gcc-4.8.0
set gmp_version=gmp-5.0.4
set mpfr_version=mpfr-3.1.0
set mpc_version=mpc-0.9
set gcc_version=gcc-4.8.1
set gmp_version=gmp-5.1.2
set mpfr_version=mpfr-3.1.2
set mpc_version=mpc-1.0.1
breaksw
case Gcc47:
case Gcc47++0x:
@ -397,7 +397,7 @@ case SYSTEMOPENMPI:
breaksw
case OPENMPI:
setenv FOAM_MPI openmpi-1.6.3
setenv FOAM_MPI openmpi-1.6.5
# optional configuration tweaks:
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`

10
etc/config/settings.sh
View File

@ -247,10 +247,10 @@ OpenFOAM | ThirdParty)
mpc_version=mpc-0.9
;;
Gcc48 | Gcc48++0x)
gcc_version=gcc-4.8.0
gmp_version=gmp-5.0.4
mpfr_version=mpfr-3.1.0
mpc_version=mpc-0.9
gcc_version=gcc-4.8.1
gmp_version=gmp-5.1.2
mpfr_version=mpfr-3.1.2
mpc_version=mpc-1.0.1
;;
Gcc47 | Gcc47++0x)
gcc_version=gcc-4.7.2
@ -418,7 +418,7 @@ SYSTEMOPENMPI)
;;
OPENMPI)
export FOAM_MPI=openmpi-1.6.3
export FOAM_MPI=openmpi-1.6.5
# optional configuration tweaks:
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`

2
src/fvAgglomerationMethods/Allwmake
View File

@ -5,7 +5,7 @@ set -x
export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0
if [ -d "$ParMGridGen/MGridGen/Lib" ]
if [ -e "$FOAM_LIBBIN/libMGridGen.so" ]
then
wmake $makeType MGridGenGamgAgglomeration
fi

4
src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -217,7 +217,7 @@ Foam::laminarFlameSpeedModels::Gulders::operator()() const
dimensionedScalar
(
psiuReactionThermo_.lookup("stoichiometricAirFuelMassRatio")
)*ft/((1 + SMALL) - ft)
)*ft/max(1 - ft, SMALL)
);
}
else