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

This commit is contained in:
william
2014-01-30 10:17:57 +00:00
13 changed files with 21 additions and 11 deletions

View File

@ -2,6 +2,6 @@ boundaryInfo.C
boundaryTemplates.C boundaryTemplates.C
caseInfo.C caseInfo.C
solverTemplate.C solverTemplate.C
createZeroDirectory.C createZeroFolder.C
EXE = $(FOAM_APPBIN)/createZeroFolder EXE = $(FOAM_APPBIN)/createZeroFolder

View File

@ -41,6 +41,10 @@ if ($?FOAM_VERBOSE && $?prompt) then
echo " $boost_version at $BOOST_ARCH_PATH" echo " $boost_version at $BOOST_ARCH_PATH"
endif endif
if ( -d "$CGAL_ARCH_PATH" ) then
_foamAddLib $CGAL_ARCH_PATH/lib
endif
if ( -d "$BOOST_ARCH_PATH" ) then if ( -d "$BOOST_ARCH_PATH" ) then
_foamAddLib $BOOST_ARCH_PATH/lib _foamAddLib $BOOST_ARCH_PATH/lib
endif endif

View File

@ -42,6 +42,11 @@ then
echo " $boost_version at $BOOST_ARCH_PATH" echo " $boost_version at $BOOST_ARCH_PATH"
fi fi
if [ -d "$CGAL_ARCH_PATH" ]
then
_foamAddLib $CGAL_ARCH_PATH/lib
fi
if [ -d "$BOOST_ARCH_PATH" ] if [ -d "$BOOST_ARCH_PATH" ]
then then
_foamAddLib $BOOST_ARCH_PATH/lib _foamAddLib $BOOST_ARCH_PATH/lib

View File

@ -562,7 +562,7 @@ endif
# cleanup environment: # cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~
unalias _foamAddPath _foamAddLib _foamAddMan #- keep _foamAddPath _foamAddLib _foamAddMan
unset foamCompiler minBufferSize unset foamCompiler minBufferSize
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View File

@ -569,6 +569,7 @@ export MPI_BUFFER_SIZE
# cleanup environment: # cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~
unset _foamAddPath _foamAddLib _foamAddMan foamCompiler minBufferSize #keep _foamAddPath _foamAddLib _foamAddMan
unset foamCompiler minBufferSize
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -25,7 +25,7 @@ Class
Foam::Rosenbrock23 Foam::Rosenbrock23
Description Description
L-stable embedded Rosenbrock ODE solver of order (3)4. L-stable embedded Rosenbrock ODE solver of order (2)3.
References: References:
\verbatim \verbatim

View File

@ -27,7 +27,7 @@ initialChemicalTimeStep 1e-07;
odeCoeffs odeCoeffs
{ {
solver SIBS; solver seulex;
eps 0.05; eps 0.05;
} }

View File

@ -27,7 +27,7 @@ initialChemicalTimeStep 1e-07;
odeCoeffs odeCoeffs
{ {
solver SIBS; solver seulex;
absTol 1e-12; absTol 1e-12;
relTol 0.01; relTol 0.01;
} }

View File

@ -33,7 +33,7 @@ EulerImplicitCoeffs
odeCoeffs odeCoeffs
{ {
solver SIBS; solver seulex;
eps 0.05; eps 0.05;
} }

View File

@ -33,7 +33,7 @@ EulerImplicitCoeffs
odeCoeffs odeCoeffs
{ {
solver RK; solver seulex;
eps 0.05; eps 0.05;
} }

View File

@ -33,7 +33,7 @@ EulerImplicitCoeffs
odeCoeffs odeCoeffs
{ {
solver RK; solver seulex;
eps 0.05; eps 0.05;
} }

View File

@ -27,7 +27,7 @@ initialChemicalTimeStep 1e-07;
odeCoeffs odeCoeffs
{ {
solver SIBS; solver seulex;
eps 0.05; eps 0.05;
} }