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/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2011-02-21 11:25:30 +00:00
parent cfa58e0819 9353af41b3
commit 69a0fa1967
30 changed files with 104 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H
View File

@ -23,16 +23,21 @@
);
}
fvScalarMatrix DrhoDtEqn
(
fvc::ddt(rho) + psi*correction(fvm::ddt(p))
+ fvc::div(phi)
==
parcels.Srho()
+ massSource.SuTot()
);
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{
fvScalarMatrix pEqn
(
fvc::ddt(rho) + psi*correction(fvm::ddt(p))
+ fvc::div(phi)
DrhoDtEqn
- fvm::laplacian(rho*rAU, p)
==
parcels.Srho()
+ massSource.SuTot()
);
pEqn.solve();

3
applications/utilities/errorEstimation/estimateScalarError/Make/files
View File

@ -1,3 +0,0 @@
estimateScalarError.C
EXE = $(FOAM_APPBIN)/estimateScalarError

9
applications/utilities/errorEstimation/estimateScalarError/Make/options
View File

@ -1,9 +0,0 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/errorEstimation/lnInclude
EXE_LIBS = \
-lerrorEstimation \
-lfiniteVolume \
-lmeshTools \
-ldynamicMesh

133
applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
View File

@ -1,133 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM 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.
OpenFOAM 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 OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
estimateScalarError
Description
Estimates the error in the solution for a scalar transport equation in the
standard form
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "errorEstimate.H"
#include "resError.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
timeSelector::addOptions();
# include "setRootCase.H"
# include "createTime.H"
instantList timeDirs = timeSelector::select0(runTime, args);
# include "createMesh.H"
Info<< "\nEstimating error in scalar transport equation\n"
<< "Reading transportProperties\n" << endl;
IOdictionary transportProperties
(
IOobject
(
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
Info<< "Reading diffusivity DT\n" << endl;
dimensionedScalar DT
(
transportProperties.lookup("DT")
);
forAll(timeDirs, timeI)
{
runTime.setTime(timeDirs[timeI], timeI);
Info<< "Time = " << runTime.timeName() << endl;
mesh.readUpdate();
IOobject THeader
(
"T",
runTime.timeName(),
mesh,
IOobject::MUST_READ
);
IOobject Uheader
(
"U",
runTime.timeName(),
mesh,
IOobject::MUST_READ
);
if (THeader.headerOk() && Uheader.headerOk())
{
Info<< "Reading T" << endl;
volScalarField T(THeader, mesh);
Info<< "Reading U" << endl;
volVectorField U(Uheader, mesh);
# include "createPhi.H"
errorEstimate<scalar> ee
(
resError::div(phi, T)
- resError::laplacian(DT, T)
);
ee.residual()().write();
volScalarField e(ee.error());
e.write();
mag(e)().write();
}
else
{
Info<< " No T or U" << endl;
}
Info<< endl;
}
Info<< "End\n" << endl;
return 0;
}
// ************************************************************************* //

4
applications/utilities/errorEstimation/icoErrorEstimate/Make/files
View File

@ -1,4 +0,0 @@
icoErrorEstimate.C
EXE = $(FOAM_APPBIN)/icoErrorEstimate

9
applications/utilities/errorEstimation/icoErrorEstimate/Make/options
View File

@ -1,9 +0,0 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/errorEstimation/lnInclude
EXE_LIBS = \
-lerrorEstimation \
-lmeshTools \
-ldynamicMesh \
-lfiniteVolume

129
applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
View File

@ -1,129 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM 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.
OpenFOAM 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 OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
icoErrorEstimate
Description
Estimates error for the incompressible laminar CFD application icoFoam.
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "errorEstimate.H"
#include "resError.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
timeSelector::addOptions();
# include "setRootCase.H"
# include "createTime.H"
instantList timeDirs = timeSelector::select0(runTime, args);
# include "createMesh.H"
Info<< "\nEstimating error in the incompressible momentum equation\n"
<< "Reading transportProperties\n" << endl;
IOdictionary transportProperties
(
IOobject
(
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
dimensionedScalar nu
(
transportProperties.lookup("nu")
);
forAll(timeDirs, timeI)
{
runTime.setTime(timeDirs[timeI], timeI);
Info<< "Time = " << runTime.timeName() << endl;
mesh.readUpdate();
IOobject pHeader
(
"p",
runTime.timeName(),
mesh,
IOobject::MUST_READ
);
IOobject Uheader
(
"U",
runTime.timeName(),
mesh,
IOobject::MUST_READ
);
if (pHeader.headerOk() && Uheader.headerOk())
{
Info<< "Reading p" << endl;
volScalarField p(pHeader, mesh);
Info<< "Reading U" << endl;
volVectorField U(Uheader, mesh);
# include "createPhi.H"
errorEstimate<vector> ee
(
resError::div(phi, U)
- resError::laplacian(nu, U)
==
-fvc::grad(p)
);
volVectorField e(ee.error());
e.write();
mag(e)().write();
}
else
{
Info<< " No p or U" << endl;
}
Info<< endl;
}
Info<< "End\n" << endl;
return 0;
}
// ************************************************************************* //

4
applications/utilities/errorEstimation/icoMomentError/Make/files
View File

@ -1,4 +0,0 @@
icoMomentError.C
EXE = $(FOAM_APPBIN)/icoMomentError

9
applications/utilities/errorEstimation/icoMomentError/Make/options
View File

@ -1,9 +0,0 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/errorEstimation/lnInclude
EXE_LIBS = \
-lerrorEstimation \
-lmeshTools \
-ldynamicMesh \
-lfiniteVolume

188
applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
View File

@ -1,188 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM 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.
OpenFOAM 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 OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
icoMomentError
Description
Estimates error for the incompressible laminar CFD application icoFoam.
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "linear.H"
#include "gaussConvectionScheme.H"
#include "gaussLaplacianScheme.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
timeSelector::addOptions();
# include "setRootCase.H"
# include "createTime.H"
instantList timeDirs = timeSelector::select0(runTime, args);
# include "createMesh.H"
Info<< "\nEstimating error in the incompressible momentum equation\n"
<< "Reading transportProperties\n" << endl;
IOdictionary transportProperties
(
IOobject
(
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
dimensionedScalar nu
(
transportProperties.lookup("nu")
);
forAll(timeDirs, timeI)
{
runTime.setTime(timeDirs[timeI], timeI);
Info<< "Time = " << runTime.timeName() << endl;
mesh.readUpdate();
IOobject pHeader
(
"p",
runTime.timeName(),
mesh,
IOobject::MUST_READ
);
IOobject Uheader
(
"U",
runTime.timeName(),
mesh,
IOobject::MUST_READ
);
if (pHeader.headerOk() && Uheader.headerOk())
{
Info<< "Reading p" << endl;
volScalarField p(pHeader, mesh);
Info<< "Reading U" << endl;
volVectorField U(Uheader, mesh);
# include "createPhi.H"
volScalarField ek(0.5*magSqr(U));
volTensorField gradU(fvc::grad(U));
// Divergence of the error in U squared
volScalarField L
(
IOobject
(
"L",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh,
dimensionedScalar("one", dimLength, 1.0)
);
L.internalField() =
mesh.V()/fvc::surfaceSum(mesh.magSf())().internalField();
// Warning: 4th row of this equation specially modified
// for the momentum equation. The "real" formulation would
// have diffusivity*(gradV && gradV)
volScalarField momError
(
IOobject
(
"momErrorL" + U.name(),
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
sqrt
(
2.0*mag
(
(
fv::gaussConvectionScheme<scalar>
(
mesh,
phi,
tmp<surfaceInterpolationScheme<scalar> >
(
new linear<scalar>(mesh)
)
).fvcDiv(phi, ek)
- nu*
fv::gaussLaplacianScheme<scalar, scalar>(mesh)
.fvcLaplacian
(
ek
)
- (U & fvc::grad(p))
// + nu*(gradU && gradU)
+ 0.5*nu*
(
gradU && (gradU + gradU.T())
)
)*L/(mag(U) + nu/L)
)
)
);
momError.boundaryField() = 0.0;
momError.write();
}
else
{
Info<< " No p or U" << endl;
}
Info<< endl;
}
Info<< "End\n" << endl;
return 0;
}
// ************************************************************************* //

3
applications/utilities/errorEstimation/momentScalarError/Make/files
View File

@ -1,3 +0,0 @@
momentScalarError.C
EXE = $(FOAM_APPBIN)/momentScalarError

8
applications/utilities/errorEstimation/momentScalarError/Make/options
View File

@ -1,8 +0,0 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/errorEstimation/lnInclude
EXE_LIBS = \
-lmeshTools \
-ldynamicMesh \
-lfiniteVolume

185
applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
View File

@ -1,185 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM 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.
OpenFOAM 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 OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
momentScalarError
Description
Estimates the error in the solution for a scalar transport equation in the
standard form
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "linear.H"
#include "gaussConvectionScheme.H"
#include "gaussLaplacianScheme.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
timeSelector::addOptions();
# include "setRootCase.H"
# include "createTime.H"
instantList timeDirs = timeSelector::select0(runTime, args);
# include "createMesh.H"
Info<< "\nEstimating error in scalar transport equation\n"
<< "Reading transportProperties\n" << endl;
IOdictionary transportProperties
(
IOobject
(
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
Info<< "Reading diffusivity DT\n" << endl;
dimensionedScalar DT
(
transportProperties.lookup("DT")
);
forAll(timeDirs, timeI)
{
runTime.setTime(timeDirs[timeI], timeI);
Info<< "Time = " << runTime.timeName() << endl;
mesh.readUpdate();
IOobject THeader
(
"T",
runTime.timeName(),
mesh,
IOobject::MUST_READ
);
IOobject Uheader
(
"U",
runTime.timeName(),
mesh,
IOobject::MUST_READ
);
if (THeader.headerOk() && Uheader.headerOk())
{
Info<< "Reading T" << endl;
volScalarField T(THeader, mesh);
Info<< "Reading U" << endl;
volVectorField U(Uheader, mesh);
# include "createPhi.H"
volVectorField gradT(fvc::grad(T));
volScalarField TE(0.5*sqr(T));
volScalarField L
(
IOobject
(
"L",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh,
dimensionedScalar("one", dimLength, 1.0)
);
L.internalField() =
mesh.V()/fvc::surfaceSum(mesh.magSf())().internalField();
// Divergence of the error in the T squared
volScalarField momError
(
IOobject
(
"momErrorL" + T.name(),
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
sqrt
(
2.0*mag
(
(
fv::gaussConvectionScheme<scalar>
(
mesh,
phi,
tmp<surfaceInterpolationScheme<scalar> >
(
new linear<scalar>(mesh)
)
).fvcDiv(phi, TE)
- DT*
fv::gaussLaplacianScheme<scalar, scalar>(mesh)
.fvcLaplacian
(
TE
)
+ DT*(gradT & gradT)
)*L/(mag(U) + DT/L)
)
)
);
momError.boundaryField() = 0.0;
momError.write();
}
else
{
Info<< " No T or U" << endl;
}
Info<< endl;
}
Info<< "End\n" << endl;
return 0;
}
// ************************************************************************* //

1
applications/utilities/miscellaneous/foamDebugSwitches/Make/options
View File

@ -19,7 +19,6 @@ EXE_LIBS = \
-ldynamicMesh \
-ledgeMesh \
-lengine \
-lerrorEstimation \
-lextrudeModel \
-lfieldFunctionObjects \
-lfileFormats \

BIN
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio2009.zip
View File

Binary file not shown.

2
etc/apps/paraview3/bashrc
View File

@ -38,7 +38,7 @@ cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platform
# determine the cmake to be used
unset CMAKE_HOME
for cmake in cmake-2.8.3 cmake-2.8.1
for cmake in cmake-2.8.4 cmake-2.8.3 cmake-2.8.1
do
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
if [ -r $cmake ]

2
etc/apps/paraview3/cshrc
View File

@ -39,7 +39,7 @@ if ( $status == 0 ) setenv PATH $cleaned
# determine the cmake to be used
unsetenv CMAKE_HOME
foreach cmake ( cmake-2.8.3 cmake-2.8.1 )
foreach cmake ( cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 )
set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
if ( -r $cmake ) then
setenv CMAKE_HOME $cmake

7
etc/settings.csh
View File

@ -84,7 +84,7 @@ _foamAddLib ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}:${FOAM_EXT_L
# Compiler settings
# ~~~~~~~~~~~~~~~~~
unset gcc_version gmp_version mpfr_version mpc_version
unsetenv MPFR_ARCH_PATH
unsetenv MPFR_ARCH_PATH GMP_ARCH_PATH
# Location of compiler installation
@ -178,6 +178,7 @@ case ThirdParty:
# used by boost/CGAL:
setenv MPFR_ARCH_PATH $mpfrDir
setenv GMP_ARCH_PATH $gmpDir
endif
unset gcc_version gccDir
unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir
@ -228,7 +229,7 @@ endif
# boost and CGAL
# ~~~~~~~~~~~~~~
set boost_version=boost_1_42_0
set boost_version=boost_1_45_0
set cgal_version=CGAL-3.7
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
@ -243,7 +244,7 @@ if ( -d "$CGAL_ARCH_PATH" ) then
endif
_foamAddLib $CGAL_ARCH_PATH/lib
else
unsetenv BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH
unsetenv BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH GMP_ARCH_PATH
endif
unset boost_version cgal_version

7
etc/settings.sh
View File

@ -107,7 +107,7 @@ _foamAddLib $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN:$FOAM_EXT_LIBBIN:$
# Compiler settings
# ~~~~~~~~~~~~~~~~~
unset gcc_version gmp_version mpfr_version mpc_version
unset MPFR_ARCH_PATH
unset MPFR_ARCH_PATH GMP_ARCH_PATH
# Location of compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -198,6 +198,7 @@ OpenFOAM | ThirdParty)
# used by boost/CGAL:
export MPFR_ARCH_PATH=$mpfrDir
export GMP_ARCH_PATH=$gmpDir
fi
unset gcc_version gccDir
unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir
@ -247,7 +248,7 @@ fi
# boost and CGAL
# ~~~~~~~~~~~~~~
boost_version=boost_1_42_0
boost_version=boost_1_45_0
cgal_version=CGAL-3.7
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
@ -264,7 +265,7 @@ then
fi
_foamAddLib $CGAL_ARCH_PATH/lib
else
unset BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH
unset BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH GMP_ARCH_PATH
fi
unset boost_version cgal_version

10
src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,11 +46,11 @@ UNARY_FUNCTION(tensor, tensor, dev2, transform)
UNARY_FUNCTION(scalar, tensor, det, transform)
UNARY_FUNCTION(tensor, tensor, cof, cof)
UNARY_FUNCTION(tensor, tensor, inv, inv)
UNARY_FUNCTION(vector, tensor, eigenValues, sign)
UNARY_FUNCTION(tensor, tensor, eigenVectors, transform)
UNARY_FUNCTION(vector, tensor, eigenValues, transform)
UNARY_FUNCTION(tensor, tensor, eigenVectors, sign)
UNARY_FUNCTION(vector, symmTensor, eigenValues, sign)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, transform)
UNARY_FUNCTION(vector, symmTensor, eigenValues, transform)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, sign)
// * * * * * * * * * * * * * * * global operators * * * * * * * * * * * * * //

10
src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -59,11 +59,11 @@ UNARY_FUNCTION(tensor, tensor, dev2, transform)
UNARY_FUNCTION(scalar, tensor, det, transform)
UNARY_FUNCTION(tensor, tensor, cof, cof)
UNARY_FUNCTION(tensor, tensor, inv, inv)
UNARY_FUNCTION(vector, tensor, eigenValues, sign)
UNARY_FUNCTION(tensor, tensor, eigenVectors, transform)
UNARY_FUNCTION(vector, tensor, eigenValues, transform)
UNARY_FUNCTION(tensor, tensor, eigenVectors, sign)
UNARY_FUNCTION(vector, symmTensor, eigenValues, sign)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, transform)
UNARY_FUNCTION(vector, symmTensor, eigenValues, transform)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, sign)
// * * * * * * * * * * * * * * * global operators * * * * * * * * * * * * * //

21
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,8 +26,21 @@ License
#include "Reaction.H"
#include "DynamicList.H"
// * * * * * * * * * * * * * * * * Static Data * * * * * * * * * * * * * * * //
template<class ReactionThermo>
Foam::label Foam::Reaction<ReactionThermo>::nUnNamedReactions = 0;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class ReactionThermo>
Foam::label Foam::Reaction<ReactionThermo>::getNewReactionID()
{
return nUnNamedReactions++;
}
template<class ReactionThermo>
Foam::string Foam::Reaction<ReactionThermo>::reactionStr() const
{
@ -114,6 +127,7 @@ Foam::Reaction<ReactionThermo>::Reaction
)
:
ReactionThermo(*thermoDatabase[species[0]]),
name_("un-named-reaction-" + Foam::name(getNewReactionID())),
species_(species),
lhs_(lhs),
rhs_(rhs)
@ -130,6 +144,7 @@ Foam::Reaction<ReactionThermo>::Reaction
)
:
ReactionThermo(r),
name_(r.name() + "Copy"),
species_(species),
lhs_(r.lhs_),
rhs_(r.rhs_)
@ -236,6 +251,7 @@ Foam::Reaction<ReactionThermo>::Reaction
)
:
ReactionThermo(*thermoDatabase[species[0]]),
name_("un-named-reaction" + Foam::name(getNewReactionID())),
species_(species)
{
setLRhs(is);
@ -252,6 +268,7 @@ Foam::Reaction<ReactionThermo>::Reaction
)
:
ReactionThermo(*thermoDatabase[species[0]]),
name_(dict.dictName()),
species_(species)
{
setLRhs(IStringStream(dict.lookup("reaction"))());
@ -318,7 +335,7 @@ Foam::Reaction<ReactionThermo>::New
const dictionary& dict
)
{
const word& reactionTypeName = dict.dictName();
const word& reactionTypeName = dict.lookup("type");
typename dictionaryConstructorTable::iterator cstrIter
= dictionaryConstructorTablePtr_->find(reactionTypeName);

17
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -69,6 +69,12 @@ class Reaction
public:
// Static data
//- Number of un-named reactions
static label nUnNamedReactions;
// Public data types
//- Class to hold the specie index and its coefficients in the
@ -112,6 +118,9 @@ private:
// Private data
//- Name of reaction
const word name_;
//- List of specie names present in reaction system
const speciesTable& species_;
@ -136,6 +145,9 @@ private:
//- Disallow default bitwise assignment
void operator=(const Reaction<ReactionThermo>&);
//- Return new reaction ID for un-named reactions
label getNewReactionID();
public:
@ -282,6 +294,9 @@ public:
// Access
inline word& name();
inline const word& name() const;
inline const List<specieCoeffs>& lhs() const;
inline const List<specieCoeffs>& rhs() const;

16
src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,6 +32,20 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ReactionThermo>
inline word& Reaction<ReactionThermo>::name()
{
return name_;
}
template<class ReactionThermo>
inline const word& Reaction<ReactionThermo>::name() const
{
return name_;
}
template<class ReactionThermo>
inline const List<typename Reaction<ReactionThermo>::specieCoeffs>&
Reaction<ReactionThermo>::lhs() const

9
src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -105,13 +105,15 @@ bool Foam::ReactionList<ThermoType>::readReactionDict()
forAllConstIter(dictionary, reactions, iter)
{
const word reactionName = iter().keyword();
this->append
(
Reaction<ThermoType>::New
(
species_,
thermoDb_,
reactions.subDict(iter().keyword())
reactions.subDict(reactionName)
).ptr()
);
}
@ -129,8 +131,9 @@ void Foam::ReactionList<ThermoType>::write(Ostream& os) const
forAllConstIter(typename SLPtrList<Reaction<ThermoType> >, *this, iter)
{
const Reaction<ThermoType>& r = iter();
os << indent << r.type() << nl
os << indent << r.name() << nl
<< indent << token::BEGIN_BLOCK << incrIndent << nl;
os.writeKeyword("type") << r.type() << token::END_STATEMENT << nl;
r.write(os);
os << decrIndent << indent << token::END_BLOCK << nl;
}

3
tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions
View File

@ -9,8 +9,9 @@ species
reactions
{
irreversibleArrheniusReaction
methaneReaction
{
type irreversibleArrheniusReaction;
reaction "CH4 + 2O2 = CO2 + 2H2O";
A 5.2e16;
beta 0;

6
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.inp
View File

@ -10,15 +10,17 @@ species
reactions
{
irreversibleArrheniusReaction
methaneReaction
{
type irreversibleArrheniusReaction;
reaction "CH4 + 2O2^1.0 = CO2 + 2H2O^1.0";
A 7e+06;
beta 0;
Ta 10063.8;
}
irreversibleArrheniusReaction
hydrogenReaction
{
type irreversibleArrheniusReaction;
reaction "H2 + 0.5O2^1.0 = H2O";
A 4.74342e+12;
beta 0;

3
tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/reactions
View File

@ -9,8 +9,9 @@ species
reactions
{
irreversibleArrheniusReaction
methaneReaction
{
type irreversibleArrheniusReaction;
reaction "CH4 + 2O2 = CO2 + 2H2O";
A 5.2e16;
beta 0;

3
wmake/rules/General/CGAL
View File

@ -2,7 +2,8 @@ CGAL_INC = \
-Wno-old-style-cast \
-I$(CGAL_ARCH_PATH)/include \
-I$(MPFR_ARCH_PATH)/include \
-I$(BOOST_ARCH_PATH)/include/boost
-I$(GMP_ARCH_PATH)/include \
-I$(BOOST_ARCH_PATH)/include
CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib \