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:
sergio
2012-10-05 11:51:36 +01:00
parent 54432bb18a e48539a63a
commit 64ade85525
32 changed files with 487 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.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
@ -195,10 +195,8 @@ void maxwellSlipUFvPatchVectorField::write(Ostream& os) const
<< thermalCreep_ << token::END_STATEMENT << nl;
os.writeKeyword("curvature") << curvature_ << token::END_STATEMENT << nl;
os.writeKeyword("refValue")
<< refValue() << token::END_STATEMENT << nl;
os.writeKeyword("valueFraction")
<< valueFraction() << token::END_STATEMENT << nl;
refValue().writeEntry("refValue", os);
valueFraction().writeEntry("valueFraction", os);
writeEntry("value", os);
}

4
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
View File

@ -310,6 +310,10 @@ addLayersControls
// make straight angle.
featureAngle 60;
//- At non-patched sides allow mesh to slip if extrusion direction makes
// angle larger than slipFeatureAngle.
slipFeatureAngle 30;
//- Maximum number of snapping relaxation iterations. Should stop
// before upon reaching a correct mesh.
nRelaxIter 5;

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

23
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 \
( \
!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
)
*/
}
// ************************************************************************* //

2
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
View File

@ -2800,7 +2800,7 @@ void Foam::autoLayerDriver::addLayers
layerParams.nSmoothNormals(),
layerParams.nSmoothSurfaceNormals(),
layerParams.minMedianAxisAngleCos(),
layerParams.featureAngle(),
layerParams.slipFeatureAngle(),
dispVec,
medialRatio,

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,

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

@ -61,6 +61,12 @@ Foam::layerParameters::layerParameters
readScalar(dict.lookup("minThickness"))
),
featureAngle_(readScalar(dict.lookup("featureAngle"))),
slipFeatureAngle_
(
dict.found("slipFeatureAngle")
? readScalar(dict.lookup("slipFeatureAngle"))
: 0.5*featureAngle_
),
concaveAngle_
(
dict.lookupOrDefault("concaveAngle", defaultConcaveAngle)

9
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
View File

@ -79,6 +79,8 @@ class layerParameters
scalar featureAngle_;
scalar slipFeatureAngle_;
scalar concaveAngle_;
label nGrow_;
@ -178,6 +180,13 @@ public:
return featureAngle_;
}
//- At non-patched sides allow mesh to slip if extrusion
// direction makes angle larger than slipFeatureAngle.
scalar slipFeatureAngle() const
{
return slipFeatureAngle_;
}
scalar concaveAngle() const
{
return concaveAngle_;

50
src/meshTools/regionSplit/regionSplit.C
View File

@ -69,7 +69,7 @@ void Foam::regionSplit::transferCoupledFaceRegion
"regionSplit::transferCoupledFaceRegion"
"(const label, const label, labelList&, labelList&) const"
) << "Problem : coupled face " << faceI
<< " on patch " << mesh_.boundaryMesh().whichPatch(faceI)
<< " on patch " << mesh().boundaryMesh().whichPatch(faceI)
<< " has region " << faceRegion[faceI]
<< " but coupled face " << otherFaceI
<< " has region " << faceRegion[otherFaceI]
@ -109,7 +109,7 @@ void Foam::regionSplit::fillSeedMask
// Collect faces on seed cell
const cell& cFaces = mesh_.cells()[seedCellID];
const cell& cFaces = mesh().cells()[seedCellID];
label nFaces = 0;
@ -144,7 +144,7 @@ void Foam::regionSplit::fillSeedMask
{
label faceI = changedFaces[i];
label own = mesh_.faceOwner()[faceI];
label own = mesh().faceOwner()[faceI];
if (cellRegion[own] == -1)
{
@ -152,9 +152,9 @@ void Foam::regionSplit::fillSeedMask
changedCells.append(own);
}
if (mesh_.isInternalFace(faceI))
if (mesh().isInternalFace(faceI))
{
label nei = mesh_.faceNeighbour()[faceI];
label nei = mesh().faceNeighbour()[faceI];
if (cellRegion[nei] == -1)
{
@ -178,7 +178,7 @@ void Foam::regionSplit::fillSeedMask
{
label cellI = changedCells[i];
const cell& cFaces = mesh_.cells()[cellI];
const cell& cFaces = mesh().cells()[cellI];
forAll(cFaces, cFaceI)
{
@ -203,7 +203,7 @@ void Foam::regionSplit::fillSeedMask
// Check for changes to any locally coupled face.
// Global connections are done later.
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
const polyBoundaryMesh& patches = mesh().boundaryMesh();
forAll(patches, patchI)
{
@ -274,7 +274,7 @@ Foam::label Foam::regionSplit::calcLocalRegionSplit
{
// Check that blockedFace is synced.
boolList syncBlockedFace(blockedFace);
syncTools::swapFaceList(mesh_, syncBlockedFace);
syncTools::swapFaceList(mesh(), syncBlockedFace);
forAll(syncBlockedFace, faceI)
{
@ -295,7 +295,7 @@ Foam::label Foam::regionSplit::calcLocalRegionSplit
// Region per face.
// -1 unassigned
// -2 blocked
labelList faceRegion(mesh_.nFaces(), -1);
labelList faceRegion(mesh().nFaces(), -1);
if (blockedFace.size())
{
@ -321,7 +321,7 @@ Foam::label Foam::regionSplit::calcLocalRegionSplit
{
// Find first unset cell
for (; unsetCellI < mesh_.nCells(); unsetCellI++)
for (; unsetCellI < mesh().nCells(); unsetCellI++)
{
if (cellRegion[unsetCellI] == -1)
{
@ -329,7 +329,7 @@ Foam::label Foam::regionSplit::calcLocalRegionSplit
}
}
if (unsetCellI >= mesh_.nCells())
if (unsetCellI >= mesh().nCells())
{
break;
}
@ -430,9 +430,9 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
}
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
const polyBoundaryMesh& patches = mesh().boundaryMesh();
labelList nbrRegion(mesh_.nFaces()-mesh_.nInternalFaces(), -1);
labelList nbrRegion(mesh().nFaces()-mesh().nInternalFaces(), -1);
forAll(patches, patchI)
{
const polyPatch& pp = patches[patchI];
@ -444,7 +444,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
(
nbrRegion,
pp.size(),
pp.start()-mesh_.nInternalFaces()
pp.start()-mesh().nInternalFaces()
);
forAll(patchCells, i)
@ -457,9 +457,9 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
}
}
}
syncTools::swapBoundaryFaceList(mesh_, nbrRegion);
syncTools::swapBoundaryFaceList(mesh(), nbrRegion);
Map<label> globalToMerged(mesh_.nFaces()-mesh_.nInternalFaces());
Map<label> globalToMerged(mesh().nFaces()-mesh().nInternalFaces());
forAll(patches, patchI)
{
@ -472,7 +472,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
(
nbrRegion,
pp.size(),
pp.start()-mesh_.nInternalFaces()
pp.start()-mesh().nInternalFaces()
);
forAll(patchCells, i)
@ -486,7 +486,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
//Pout<< "on patch:" << pp.name()
// << " cell:" << patchCells[i]
// << " at:"
// << mesh_.cellCentres()[patchCells[i]]
// << mesh().cellCentres()[patchCells[i]]
// << " was:" << cellRegion[patchCells[i]]
// << " nbr:" << patchNbrRegion[i]
// << endl;
@ -534,7 +534,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
// 4a: count. Use a labelHashSet to count regions only once.
label nCompact = 0;
{
labelHashSet localRegion(mesh_.nFaces()-mesh_.nInternalFaces());
labelHashSet localRegion(mesh().nFaces()-mesh().nInternalFaces());
forAll(cellRegion, cellI)
{
if
@ -692,8 +692,8 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
Foam::regionSplit::regionSplit(const polyMesh& mesh)
:
labelList(mesh.nCells(), -1),
mesh_(mesh)
MeshObject<polyMesh, regionSplit>(mesh),
labelList(mesh.nCells(), -1)
{
globalNumberingPtr_ = calcRegionSplit
(
@ -710,8 +710,8 @@ Foam::regionSplit::regionSplit
const boolList& blockedFace
)
:
labelList(mesh.nCells(), -1),
mesh_(mesh)
MeshObject<polyMesh, regionSplit>(mesh),
labelList(mesh.nCells(), -1)
{
globalNumberingPtr_ = calcRegionSplit
(
@ -729,8 +729,8 @@ Foam::regionSplit::regionSplit
const List<labelPair>& explicitConnections
)
:
labelList(mesh.nCells(), -1),
mesh_(mesh)
MeshObject<polyMesh, regionSplit>(mesh),
labelList(mesh.nCells(), -1)
{
globalNumberingPtr_ = calcRegionSplit
(

9
src/meshTools/regionSplit/regionSplit.H
View File

@ -98,6 +98,7 @@ SourceFiles
#include "globalIndex.H"
#include "labelPair.H"
#include "boolList.H"
#include "MeshObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -112,13 +113,11 @@ class polyMesh;
class regionSplit
:
public MeshObject<polyMesh, regionSplit>,
public labelList
{
// Private data
//- Reference to mesh
const polyMesh& mesh_;
mutable autoPtr<globalIndex> globalNumberingPtr_;
@ -161,11 +160,13 @@ class regionSplit
labelList& cellRegion
) const;
public:
//- Runtime type information
ClassName("regionSplit");
// Constructors
//- Construct from mesh
@ -185,6 +186,7 @@ public:
const List<labelPair>&
);
// Member Functions
//- Return global region numbering
@ -198,7 +200,6 @@ public:
{
return globalNumbering().size();
}
};

9
src/thermophysicalModels/specie/thermo/thermo/thermoI.H
View File

@ -298,16 +298,23 @@ template<class Thermo, template<class> class Type>
inline Foam::scalar
Foam::species::thermo<Thermo, Type>::K(const scalar p, const scalar T) const
{
if (equal(this->nMoles(), SMALL))
{
return 1.0;
}
else
{
scalar arg = -this->nMoles()*this->g(p, T)/(this->RR*T);
if (arg < 600.0)
{
return ::exp(arg);
return exp(arg);
}
else
{
return VGREAT;
}
}
}

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 "compressible/LES/compressibleLESdelta/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 "incompressible/LES/incompressibleLESdelta/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_;