songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry 2012-10-04 18:10:29 +01:00
commit 66cd76f104
24 changed files with 422 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,6 @@ EXE_LIBS = \
-lsolidMixtureProperties \
-lsolidParticle \
-lsolidProperties \
-lsolid \
-lspecie \
-lsurfaceFilmModels \
-lsurfMesh \

1
applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
View File

@ -13,6 +13,5 @@ EXE_LIBS = \
-lfiniteVolume \
-lgenericPatchFields \
-lspecie \
-lsolid \
-lfluidThermophysicalModels \
-lsolidThermo

27
src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -82,7 +82,13 @@ Description
) \
{ \
construct##argNames##ConstructorTables(); \
argNames##ConstructorTablePtr_->insert(lookup, New); \
if (!argNames##ConstructorTablePtr_->insert(lookup, New)) \
{ \
std::cerr<< "Duplicate entry " << lookup \
<< " in runtime selection table " << #baseType \
<< std::endl; \
error::safePrintStack(std::cerr); \
} \
} \
\
~add##argNames##ConstructorToTable() \
@ -167,11 +173,20 @@ Description
) \
{ \
construct##argNames##ConstructorTables(); \
argNames##ConstructorTablePtr_->insert \
if \
( \
lookup, \
New##baseType \
); \
!argNames##ConstructorTablePtr_->insert \
( \
lookup, \
New##baseType \
) \
) \
{ \
std::cerr<< "Duplicate entry " << lookup \
<< " in runtime selection table " << #baseType \
<< std::endl; \
error::safePrintStack(std::cerr); \
} \
} \
\
~add##argNames##ConstructorToTable() \

1
src/finiteVolume/Make/files
View File

@ -84,7 +84,6 @@ fvPatchFields = fields/fvPatchFields
$(fvPatchFields)/fvPatchField/fvPatchFields.C
basicFvPatchFields = $(fvPatchFields)/basic
$(basicFvPatchFields)/basicSymmetry/basicSymmetryFvPatchFields.C
$(basicFvPatchFields)/basicSymmetry/basicSymmetryFvPatchScalarField.C
$(basicFvPatchFields)/calculated/calculatedFvPatchFields.C
$(basicFvPatchFields)/coupled/coupledFvPatchFields.C

6
src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -58,10 +58,6 @@ class basicSymmetryFvPatchField
public:
//- Runtime type information
TypeName(symmetryFvPatch::typeName_());
// Constructors
//- Construct from patch and internal field

4
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/MUSCL/MUSCL.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,6 +54,7 @@ namespace Foam
scalar
)
/*
makeLimitedSurfaceInterpolationTypeScheme
(
MUSCL,
@ -71,6 +72,7 @@ namespace Foam
rhoMagSqr,
vector
)
*/
}
// ************************************************************************* //

6
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
View File

@ -1323,7 +1323,7 @@ Foam::labelPair Foam::autoSnapDriver::findNearFeaturePoint
patchConstraints[oldPointI] = pointConstraint();
label edgeFeatI;
const pointIndexHit nearInfo = findNearFeatureEdge
findNearFeatureEdge
(
pp,
snapDist,
@ -1919,7 +1919,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
// the old point to attract to nearest edge
// instead.
label edgeFeatI;
const pointIndexHit nearInfo = findNearFeatureEdge
findNearFeatureEdge
(
pp,
snapDist,
@ -1950,7 +1950,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
// << endl;
label featI;
const pointIndexHit nearInfo = findNearFeatureEdge
findNearFeatureEdge
(
pp,
snapDist,

51
src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -67,6 +67,8 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
{
const word deltaType(dict.lookup("delta"));
Info<< "Selecting LES delta type " << deltaType << endl;
dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(deltaType);
@ -86,4 +88,51 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
}
Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
(
const word& name,
const fvMesh& mesh,
const dictionary& dict,
const dictionaryConstructorTable& additionalConstructors
)
{
const word deltaType(dict.lookup("delta"));
Info<< "Selecting LES delta type " << deltaType << endl;
// First on additional ones
dictionaryConstructorTable::const_iterator cstrIter =
additionalConstructors.find(deltaType);
if (cstrIter != additionalConstructors.end())
{
return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
}
else
{
dictionaryConstructorTable::const_iterator cstrIter =
dictionaryConstructorTablePtr_->find(deltaType);
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"LESdelta::New(const fvMesh&, const dictionary&)"
) << "Unknown LESdelta type "
<< deltaType << nl << nl
<< "Valid LESdelta types are :" << endl
<< additionalConstructors.sortedToc()
<< " and "
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
return autoPtr<LESdelta>();
}
else
{
return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
}
}
}
// ************************************************************************* //

12
src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,7 +29,6 @@ Description
SourceFiles
LESdelta.C
newDelta.C
\*---------------------------------------------------------------------------*/
@ -111,6 +110,15 @@ public:
const dictionary&
);
//- Return a reference to the selected LES delta
static autoPtr<LESdelta> New
(
const word& name,
const fvMesh&,
const dictionary&,
const dictionaryConstructorTable&
);
//- Destructor
virtual ~LESdelta()

4
src/turbulenceModels/compressible/LES/LESModel/LESModel.H
View File

@ -51,7 +51,7 @@ SourceFiles
#define compressibleLESModel_H
#include "compressible/turbulenceModel/turbulenceModel.H"
#include "LESdelta.H"
#include "compressibleLESdelta.H"
#include "fvm.H"
#include "fvc.H"
#include "fvMatrices.H"
@ -86,7 +86,7 @@ protected:
dimensionedScalar kMin_;
autoPtr<LESdelta> delta_;
autoPtr<Foam::LESdelta> delta_;
// Protected Member Functions

1
src/turbulenceModels/compressible/LES/Make/files
View File

@ -10,6 +10,7 @@ homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
DeardorffDiffStress/DeardorffDiffStress.C
SpalartAllmaras/SpalartAllmaras.C
compressibleLESdelta/compressibleLESdelta.C
vanDriestDelta/vanDriestDelta.C
LIB = $(FOAM_LIBBIN)/libcompressibleLESModels

36
src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchFields.C → src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -23,22 +23,44 @@ License
\*---------------------------------------------------------------------------*/
#include "basicSymmetryFvPatchFields.H"
#include "fvPatchFields.H"
#include "volMesh.H"
#include "addToRunTimeSelectionTable.H"
#include "compressibleLESdelta.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace compressible
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
makePatchFields(basicSymmetry);
defineRunTimeSelectionTable(LESdelta, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
LESdelta::LESdelta(const word& name, const fvMesh& mesh)
:
foamLESdelta(name, mesh)
{}
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
Foam::autoPtr<foamLESdelta> LESdelta::New
(
const word& name,
const fvMesh& mesh,
const dictionary& dict
)
{
return foamLESdelta::New(name, mesh, dict, *dictionaryConstructorTablePtr_);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace compressible
} // End namespace Foam
// ************************************************************************* //

109
src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.H Normal file
View File

@ -0,0 +1,109 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ 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/>.
Class
Foam::compressible::LESdelta
Description
Abstract base class for compressible LES deltas
SourceFiles
compressibleLESdelta.C
\*---------------------------------------------------------------------------*/
#ifndef compressibleLESdelta_H
#define compressibleLESdelta_H
#include "LESdelta.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// To avoid macro problems typedef scoped class
typedef Foam::LESdelta foamLESdelta;
namespace compressible
{
/*---------------------------------------------------------------------------*\
Class LESdelta Declaration
\*---------------------------------------------------------------------------*/
class LESdelta
:
public foamLESdelta
{
public:
// Declare run-time constructor selection table
declareRunTimeSelectionTable
(
autoPtr,
foamLESdelta,
dictionary,
(
const word& name,
const fvMesh& mesh,
const dictionary& LESdeltaDict
),
(name, mesh, LESdeltaDict)
);
// Constructors
//- Construct from name and mesh
LESdelta(const word& name, const fvMesh& mesh);
// Selectors
//- Return a reference to the selected LES delta
static autoPtr<foamLESdelta> New
(
const word& name,
const fvMesh& mesh,
const dictionary& dict
);
//- Destructor
virtual ~LESdelta()
{}
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace compressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

6
src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -35,7 +35,7 @@ SourceFiles
#ifndef vanDriestDelta_H
#define vanDriestDelta_H
#include "LESdelta.H"
#include "compressibleLESdelta.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -56,7 +56,7 @@ class vanDriestDelta
{
// Private data
autoPtr<LESdelta> geometricDelta_;
autoPtr<Foam::LESdelta> geometricDelta_;
scalar kappa_;
scalar Aplus_;
scalar Cdelta_;

3
src/turbulenceModels/compressible/RAS/LRR/LRR.C
View File

@ -224,7 +224,8 @@ LRR::LRR
(
"LRR::LRR"
"( const volScalarField&, const volVectorField&"
", const surfaceScalarField&, incompressibleTransportModel&)"
", const surfaceScalarField&, fluidThermo&, const word&"
", const word&)"
) << "couplingFactor = " << couplingFactor_
<< " is not in range 0 - 1" << nl
<< exit(FatalError);

2
src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
View File

@ -234,7 +234,7 @@ bool laminar::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace incompressible
} // End namespace compressible
} // End namespace Foam
// ************************************************************************* //

2
src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
View File

@ -164,7 +164,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace incompressible
} // End namespace compressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
View File

@ -51,7 +51,7 @@ SourceFiles
#define incompressibleLESModel_H
#include "incompressible/turbulenceModel/turbulenceModel.H"
#include "LESdelta.H"
#include "incompressibleLESdelta.H"
#include "fvm.H"
#include "fvc.H"
#include "fvMatrices.H"
@ -86,7 +86,7 @@ protected:
dimensionedScalar kMin_;
autoPtr<LESdelta> delta_;
autoPtr<Foam::LESdelta> delta_;
// Protected Member Functions

1
src/turbulenceModels/incompressible/LES/Make/files
View File

@ -1,3 +1,4 @@
incompressibleLESdelta/incompressibleLESdelta.C
vanDriestDelta/vanDriestDelta.C
LESModel/LESModel.C

6
src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,7 +37,7 @@ SourceFiles
#ifndef IDDESDeltaDelta_H
#define IDDESDeltaDelta_H
#include "LESdelta.H"
#include "incompressibleLESdelta.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ class IDDESDelta
{
// Private data
autoPtr<LESdelta> hmax_;
autoPtr<Foam::LESdelta> hmax_;
scalar deltaCoeff_;
scalar cw_;

4
src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
View File

@ -61,8 +61,8 @@ class SpalartAllmarasIDDES
// Model constants
autoPtr<LESdelta> hmax_;
autoPtr<LESdelta> IDDESDelta_;
autoPtr<Foam::LESdelta> hmax_;
autoPtr<Foam::LESdelta> IDDESDelta_;
dimensionedScalar fwStar_;
dimensionedScalar cl_;
dimensionedScalar ct_;

66
src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.C Normal file
View File

@ -0,0 +1,66 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ 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/>.
\*---------------------------------------------------------------------------*/
#include "incompressibleLESdelta.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace incompressible
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineRunTimeSelectionTable(LESdelta, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
LESdelta::LESdelta(const word& name, const fvMesh& mesh)
:
foamLESdelta(name, mesh)
{}
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
Foam::autoPtr<foamLESdelta> LESdelta::New
(
const word& name,
const fvMesh& mesh,
const dictionary& dict
)
{
return foamLESdelta::New(name, mesh, dict, *dictionaryConstructorTablePtr_);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //

109
src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.H Normal file
View File

@ -0,0 +1,109 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ 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/>.
Class
Foam::incompressible::LESdelta
Description
Abstract base class for incompressible LES deltas
SourceFiles
incompressibleLESdelta.C
\*---------------------------------------------------------------------------*/
#ifndef incompressibleLESdelta_H
#define incompressibleLESdelta_H
#include "LESdelta.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// To avoid macro problems typedef scoped class
typedef Foam::LESdelta foamLESdelta;
namespace incompressible
{
/*---------------------------------------------------------------------------*\
Class LESdelta Declaration
\*---------------------------------------------------------------------------*/
class LESdelta
:
public foamLESdelta
{
public:
// Declare run-time constructor selection table
declareRunTimeSelectionTable
(
autoPtr,
foamLESdelta,
dictionary,
(
const word& name,
const fvMesh& mesh,
const dictionary& LESdeltaDict
),
(name, mesh, LESdeltaDict)
);
// Constructors
//- Construct from name and mesh
LESdelta(const word& name, const fvMesh& mesh);
// Selectors
//- Return a reference to the selected LES delta
static autoPtr<foamLESdelta> New
(
const word& name,
const fvMesh& mesh,
const dictionary& dict
);
//- Destructor
virtual ~LESdelta()
{}
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

6
src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -35,7 +35,7 @@ SourceFiles
#ifndef vanDriestDelta_H
#define vanDriestDelta_H
#include "LESdelta.H"
#include "incompressibleLESdelta.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -56,7 +56,7 @@ class vanDriestDelta
{
// Private data
autoPtr<LESdelta> geometricDelta_;
autoPtr<Foam::LESdelta> geometricDelta_;
scalar kappa_;
scalar Aplus_;
scalar Cdelta_;