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 commit 'OpenCFD/master' into olesenm

Browse Source 
Conflicts:
	applications/utilities/mesh/manipulation/createBaffles/createBaffles.C

Can't use [0] to assign the first value of a DynamicList unless it has been
preceded by a setSize() - use append() instead.
This commit is contained in:
Mark Olesen
2009-05-06 09:33:38 +02:00
parent 6e10b0defd 395298292d
commit 51f443a345
51 changed files with 480 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/OSspecific/Unix/signals/sigFpe.C
View File

@ -46,6 +46,7 @@ License
#endif
#include <stdint.h>
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -69,7 +70,7 @@ void* Foam::sigFpe::my_malloc_hook(size_t size, const void *caller)
// initialize to signalling nan
# ifdef SP
const uint32_t sNAN = 0x7ff7fffflu;
const uint32_t sNAN = 0x7ff7fffflu;
int nScalars = size / sizeof(scalar);
@ -82,7 +83,7 @@ void* Foam::sigFpe::my_malloc_hook(size_t size, const void *caller)
# else
const uint64_t sNAN = 0x7ff7ffffffffffffllu;
const uint64_t sNAN = 0x7ff7ffffffffffffllu;
int nScalars = size/sizeof(scalar);
@ -115,7 +116,7 @@ void Foam::sigFpe::sigFpeHandler(int)
(
"Foam::sigSegv::sigFpeHandler()"
) << "Cannot reset SIGFPE trapping"
<< abort(FatalError);
<< abort(FatalError);
}
// Update jobInfo file
@ -153,7 +154,7 @@ Foam::sigFpe::~sigFpe()
(
"Foam::sigFpe::~sigFpe()"
) << "Cannot reset SIGFPE trapping"
<< abort(FatalError);
<< abort(FatalError);
}
# endif
@ -208,7 +209,7 @@ void Foam::sigFpe::set()
(
"Foam::sigFpe::set()"
) << "Cannot set SIGFPE trapping"
<< abort(FatalError);
<< abort(FatalError);
}

2
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
View File

@ -790,7 +790,7 @@ bool Foam::primitiveMesh::checkPoints
{
if (debug || report)
{
Info<< " ***Unsed points found in the mesh, "
Info<< " ***Unused points found in the mesh, "
"number unused by faces: " << nFaceErrors
<< " number unused by cells: " << nCellErrors
<< endl;

30
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
View File

@ -2804,6 +2804,22 @@ void Foam::autoLayerDriver::addLayers
<< "Layer addition iteration " << iteration << nl
<< "--------------------------" << endl;
// Unset the extrusion at the pp.
const dictionary& meshQualityDict =
(
iteration < layerParams.nRelaxedIter()
? motionDict
: motionDict.subDict("relaxed")
);
if (iteration >= layerParams.nRelaxedIter())
{
Info<< "Switched to relaxed meshQuality constraints." << endl;
}
// Make sure displacement is equal on both sides of coupled patches.
syncPatchDisplacement
(
@ -2845,6 +2861,7 @@ void Foam::autoLayerDriver::addLayers
shrinkMeshMedialDistance
(
meshMover,
meshQualityDict,
layerParams.nSmoothThickness(),
layerParams.maxThicknessToMedialRatio(),
@ -3044,19 +3061,6 @@ void Foam::autoLayerDriver::addLayers
layerFacesSet.write();
}
// Unset the extrusion at the pp.
const dictionary& meshQualityDict =
(
iteration < layerParams.nRelaxedIter()
? motionDict
: motionDict.subDict("relaxed")
);
if (iteration >= layerParams.nRelaxedIter())
{
Info<< "Switched to relaxed meshQuality constraints." << endl;
}
label nTotChanged = checkAndUnmark
(

1
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
View File

@ -473,6 +473,7 @@ class autoLayerDriver
void shrinkMeshMedialDistance
(
motionSmoother& meshMover,
const dictionary& meshQualityDict,
const label nSmoothThickness,
const scalar maxThicknessToMedialRatio,
const label nAllowableErrors,

20
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
View File

@ -792,7 +792,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
wallInfo,
pointWallDist,
edgeWallDist,
mesh.nPoints() // max iterations
mesh.globalData().nTotalPoints() // max iterations
);
}
@ -897,7 +897,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
pointMedialDist,
edgeMedialDist,
mesh.nPoints() // max iterations
mesh.globalData().nTotalPoints() // max iterations
);
// Extract medial axis distance as pointScalarField
@ -953,6 +953,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
void Foam::autoLayerDriver::shrinkMeshMedialDistance
(
motionSmoother& meshMover,
const dictionary& meshQualityDict,
const label nSmoothThickness,
const scalar maxThicknessToMedialRatio,
const label nAllowableErrors,
@ -1103,7 +1104,7 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
wallInfo,
pointWallDist,
edgeWallDist,
mesh.nPoints() // max iterations
mesh.globalData().nTotalPoints() // max iterations
);
}
@ -1138,7 +1139,18 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
oldErrorReduction = meshMover.setErrorReduction(0.0);
}
if (meshMover.scaleMesh(checkFaces, true, nAllowableErrors))
if
(
meshMover.scaleMesh
(
checkFaces,
List<labelPair>(0),
meshMover.paramDict(),
meshQualityDict,
true,
nAllowableErrors
)
)
{
Info<< "shrinkMeshMedialDistance : Successfully moved mesh" << endl;
break;

24
src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
View File

@ -1522,30 +1522,6 @@ void Foam::meshRefinement::baffleAndSplitMesh
if (debug)
{
//- Note: commented out since not properly parallel yet.
//// Dump all these faces to a faceSet.
//faceSet problemGeom(mesh_, "problemFacesGeom", 100);
//
//const labelList facePatchGeom
//(
// markFacesOnProblemCellsGeometric
// (
// motionDict,
// globalToPatch
// )
//);
//forAll(facePatchGeom, faceI)
//{
// if (facePatchGeom[faceI] != -1)
// {
// problemGeom.insert(faceI);
// }
//}
//Pout<< "Dumping " << problemGeom.size()
// << " problem faces to " << problemGeom.objectPath() << endl;
//problemGeom.write();
faceSet problemTopo(mesh_, "problemFacesTopo", 100);
const labelList facePatchTopo

128
src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.C
View File

@ -22,7 +22,40 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
S Strat=b{job=t,map=t,poli=S,sep=(m{asc=b{bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},org=f{move=80,pass=-1,bal=0.005},width=3},low=h{pass=10}f{move=80,pass=-1,bal=0.0005},type=h,vert=80,rat=0.8}|m{asc=b{bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},org=f{move=80,pass=-1,bal=0.005},width=3},low=h{pass=10}f{move=80,pass=-1,bal=0.0005},type=h,vert=80,rat=0.8})}
Default strategy:
Strat=b
{
job=t,
map=t,
poli=S,
sep=
(
m
{
asc=b
{
bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},
org=f{move=80,pass=-1,bal=0.005},width=3
},
low=h{pass=10}f{move=80,pass=-1,bal=0.0005},
type=h,
vert=80,
rat=0.8
}
| m
{
asc=b
{
bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},
org=f{move=80,pass=-1,bal=0.005},
width=3},
low=h{pass=10}f{move=80,pass=-1,bal=0.0005},
type=h,
vert=80,
rat=0.8
}
)
}
\*---------------------------------------------------------------------------*/
#include "scotchDecomp.H"
@ -31,6 +64,7 @@ S Strat=b{job=t,map=t,poli=S,sep=(m{asc=b{bnd=d{pass=40,dif=1,rem=1}f{move
#include "IFstream.H"
#include "Time.H"
#include "cyclicPolyPatch.H"
#include "OFstream.H"
extern "C"
{
@ -113,46 +147,102 @@ Foam::label Foam::scotchDecomp::decompose
check(SCOTCH_graphCheck(&grafdat), "SCOTCH_graphCheck");
// Dump graph
if (decompositionDict_.found("scotchCoeffs"))
{
const dictionary& scotchCoeffs =
decompositionDict_.subDict("scotchCoeffs");
//// Architecture
//// ~~~~~~~~~~~~
//// (fully connected network topology since using switch)
//
//SCOTCH_Arch archdat;
//check(SCOTCH_archInit(&archdat), "SCOTCH_archInit");
//check
//(
// // SCOTCH_archCmpltw for weighted.
// SCOTCH_archCmplt(&archdat, nProcessors_),
// "SCOTCH_archCmplt"
//);
Switch writeGraph(scotchCoeffs.lookup("writeGraph"));
if (writeGraph)
{
OFstream str(mesh_.time().path() / mesh_.name() + ".grf");
Info<< "Dumping Scotch graph file to " << str.name() << endl
<< "Use this in combination with gpart." << endl;
label version = 0;
str << version << nl;
// Numer of vertices
str << xadj.size()-1 << ' ' << adjncy.size() << nl;
// Numbering starts from 0
label baseval = 0;
// Has weights?
label hasEdgeWeights = 0;
label hasVertexWeights = 0;
label numericflag = 10*hasEdgeWeights+hasVertexWeights;
str << baseval << ' ' << numericflag << nl;
for (label cellI = 0; cellI < xadj.size()-1; cellI++)
{
label start = xadj[cellI];
label end = xadj[cellI+1];
str << end-start;
for (label i = start; i < end; i++)
{
str << ' ' << adjncy[i];
}
str << nl;
}
}
}
// Architecture
// ~~~~~~~~~~~~
// (fully connected network topology since using switch)
SCOTCH_Arch archdat;
check(SCOTCH_archInit(&archdat), "SCOTCH_archInit");
check
(
// SCOTCH_archCmpltw for weighted.
SCOTCH_archCmplt(&archdat, nProcessors_),
"SCOTCH_archCmplt"
);
//SCOTCH_Mapping mapdat;
//SCOTCH_graphMapInit(&grafdat, &mapdat, &archdat, NULL);
//SCOTCH_graphMapCompute(&grafdat, &mapdat, &stradat); /* Perform mapping */
//SCOTCH_graphMapExit(&grafdat, &mapdat);
finalDecomp.setSize(xadj.size()-1);
finalDecomp = 0;
check
(
SCOTCH_graphPart
SCOTCH_graphMap
(
&grafdat,
nProcessors_, // partnbr
&stradat, // const SCOTCH_Strat *
&archdat,
&stradat, // const SCOTCH_Strat *
finalDecomp.begin() // parttab
),
"SCOTCH_graphPart"
"SCOTCH_graphMap"
);
//finalDecomp.setSize(xadj.size()-1);
//check
//(
// SCOTCH_graphPart
// (
// &grafdat,
// nProcessors_, // partnbr
// &stradat, // const SCOTCH_Strat *
// finalDecomp.begin() // parttab
// ),
// "SCOTCH_graphPart"
//);
// Release storage for graph
SCOTCH_graphExit(&grafdat);
// Release storage for strategy
SCOTCH_stratExit(&stradat);
//// Release storage for network topology
//SCOTCH_archExit(&archdat);
// Release storage for network topology
SCOTCH_archExit(&archdat);
return 0;
}

6
src/dynamicMesh/motionSmoother/motionSmoother.C
View File

@ -502,6 +502,12 @@ const Foam::labelList& Foam::motionSmoother::adaptPatchIDs() const
}
const Foam::dictionary& Foam::motionSmoother::paramDict() const
{
return paramDict_;
}
Foam::pointVectorField& Foam::motionSmoother::displacement()
{
return displacement_;

2
src/dynamicMesh/motionSmoother/motionSmoother.H
View File

@ -327,6 +327,8 @@ public:
//- Patch labels that are being adapted
const labelList& adaptPatchIDs() const;
const dictionary& paramDict() const;
//- Reference to displacement field
pointVectorField& displacement();

16
src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
View File

@ -90,10 +90,10 @@ void Foam::setRefCell
" bool\n"
")",
dict
)
<< "Unable to set reference cell for field " << field.name()
<< nl << " Reference point " << refPointName
<< " found on multiple domains" << nl << exit(FatalIOError);
) << "Unable to set reference cell for field " << field.name()
<< nl << " Reference point " << refPointName
<< " found on " << sumHasRef << " domains (should be one)"
<< nl << exit(FatalIOError);
}
}
else
@ -108,10 +108,10 @@ void Foam::setRefCell
" bool\n"
")",
dict
)
<< "Unable to set reference cell for field" << field.name() << nl
<< " Please supply either " << refCellName
<< " or " << refPointName << nl << exit(FatalIOError);
) << "Unable to set reference cell for field" << field.name()
<< nl
<< " Please supply either " << refCellName
<< " or " << refPointName << nl << exit(FatalIOError);
}
refValue = readScalar(dict.lookup(refValueName));

5
src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
View File

@ -56,7 +56,7 @@ Foam::FitData<Form, extendedStencil, Polynomial>::FitData
// Check input
if (linearLimitFactor <= SMALL || linearLimitFactor > 3)
{
FatalErrorIn("FitData<Polynomial>::FitData")
FatalErrorIn("FitData<Polynomial>::FitData(..)")
<< "linearLimitFactor requested = " << linearLimitFactor
<< " should be between zero and 3"
<< exit(FatalError);
@ -264,8 +264,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
// {
WarningIn
(
"FitData<Polynomial>::calcFit"
"(const List<point>& C, const label facei"
"FitData<Polynomial>::calcFit(..)"
) << "Could not fit face " << facei
<< " Weights = " << coeffsi
<< ", reverting to linear." << nl

13
src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.C
View File

@ -213,13 +213,12 @@ void pointPatchInterpolation::makePatchPatchWeights()
if (!isA<emptyFvPatch>(bm[patchi]) && !bm[patchi].coupled())
{
pw[nFacesAroundPoint] =
1.0/mag
(
pointLoc
- centres.boundaryField()[patchi]
[bm[patchi].patch().whichFace(curFaces[facei])]
);
vector d =
pointLoc
- centres.boundaryField()[patchi]
[bm[patchi].patch().whichFace(curFaces[facei])];
pw[nFacesAroundPoint] = 1.0/(mag(d)+VSMALL);
nFacesAroundPoint++;
}

2
src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryCM.H
View File

@ -8,7 +8,7 @@ scalar magVRel = mag(vRel);
vector p = p2().position() - p1().position();
scalar dist = mag(p);
scalar vAlign = vRel & (p/dist);
scalar vAlign = vRel & (p/(dist+SMALL));
if (vAlign > 0)
{

2
src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
View File

@ -367,6 +367,8 @@ void Foam::FreeStream<CloudType>::inflow()
rndGen.GaussNormal()*t1
+ rndGen.GaussNormal()*t2
)
+ (t1 & faceVelocity)*t1
+ (t2 & faceVelocity)*t2
+ mostProbableSpeed*uNormal*n;
scalar Ei = cloud.equipartitionInternalEnergy

8
src/meshTools/cellClassification/cellClassification.C
View File

@ -323,10 +323,10 @@ void Foam::cellClassification::markCells
MeshWave<cellInfo> cellInfoCalc
(
mesh_,
changedFaces, // Labels of changed faces
changedFacesInfo, // Information on changed faces
cellInfoList, // Information on all cells
mesh_.nCells() // max iterations
changedFaces, // Labels of changed faces
changedFacesInfo, // Information on changed faces
cellInfoList, // Information on all cells
mesh_.globalData().nTotalCells() // max iterations
);
// Get information out of cellInfoList

2
src/meshTools/cellDist/patchWave/patchDataWave.C
View File

@ -226,7 +226,7 @@ void Foam::patchDataWave<TransferType>::correct()
mesh(),
changedFaces,
faceDist,
mesh().nCells() // max iterations
mesh().globalData().nTotalCells() // max iterations
);

4
src/meshTools/cellDist/patchWave/patchWave.C
View File

@ -28,7 +28,7 @@ License
#include "polyMesh.H"
#include "wallPoint.H"
#include "MeshWave.H"
#include "globalMeshData.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -187,7 +187,7 @@ void Foam::patchWave::correct()
mesh(),
changedFaces,
faceDist,
mesh().nCells() // max iterations
mesh().globalData().nTotalCells() // max iterations
);

2
src/meshTools/triSurface/triangleFuncs/triangleFuncs.C
View File

@ -132,7 +132,7 @@ bool Foam::triangleFuncs::intersectAxesBundle
scalar beta = 0;
bool inter = false;
if (Foam::mag(u1) < SMALL)
if (Foam::mag(u1) < ROOTVSMALL)
{
beta = u0/u2;
if ((beta >= 0) && (beta <= 1))

9
src/thermophysicalModels/radiation/Make/options
View File

@ -1,9 +1,8 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-I$(LIB_SRC)/OpenFOAM/lnInclude \
-I radiationModel/fvDOM/interpolationLookUpTable
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
LIB_LIBS = \
-lfiniteVolume
-lfiniteVolume \
-lbasicThermophysicalModels \
-lspecie

12
src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
View File

@ -250,6 +250,15 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
)
);
}
Info<< "fvDOM : Allocated " << IRay_.size()
<< " rays with average orientation:" << nl;
forAll (IRay_, i)
{
Info<< '\t' << IRay_[i].I().name()
<< '\t' << IRay_[i].dAve() << nl;
}
Info<< endl;
}
@ -359,7 +368,8 @@ void Foam::radiation::fvDOM::updateG()
{
IRay_[rayI].addIntensity();
G_ += IRay_[rayI].I()*IRay_[rayI].omega();
Qr_ += IRay_[rayI].Qr();
//Qr_ += IRay_[rayI].Qr();
Qr_.boundaryField() += IRay_[rayI].Qr().boundaryField();
}
}

3
src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
View File

@ -187,7 +187,8 @@ Foam::radiation::radiativeIntensityRay::~radiativeIntensityRay()
Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
{
// reset boundary heat flux to zero
Qr_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0);
//Qr_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0);
Qr_.boundaryField() = 0.0;
scalar maxResidual = -GREAT;

2
src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
View File

@ -138,7 +138,7 @@ void smoothDelta::calcDelta()
changedFacesInfo,
faceDeltaData,
cellDeltaData,
mesh_.nCells() // max iterations
mesh_.globalData().nTotalCells() // max iterations
);
forAll(delta_, cellI)

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

@ -14,6 +14,6 @@ SpalartAllmaras/SpalartAllmaras.C
wallFunctions=derivedFvPatchFields/wallFunctions
muSgsWallFunctions=$(wallFunctions)/muSgsWallFunctions
$(muSgsWallFunctions)/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
$(muSgsWallFunctions)/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libcompressibleLESModels

36
src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C → src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H"
#include "muSgsWallFunctionFvPatchScalarField.H"
#include "LESModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
@ -41,8 +41,8 @@ namespace LESModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField::
muSgsWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -52,10 +52,10 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
{}
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField::
muSgsWallFunctionFvPatchScalarField
(
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
const muSgsWallFunctionFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@ -65,8 +65,8 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
{}
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField::
muSgsWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -77,8 +77,8 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
{}
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField::
muSgsWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -89,20 +89,20 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
{}
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField::
muSgsWallFunctionFvPatchScalarField
(
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
const muSgsWallFunctionFvPatchScalarField& tppsf
)
:
fixedValueFvPatchScalarField(tppsf)
{}
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField::
muSgsWallFunctionFvPatchScalarField
(
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf,
const muSgsWallFunctionFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF
)
:
@ -112,7 +112,7 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void muSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
void muSgsWallFunctionFvPatchScalarField::evaluate
(
const Pstream::commsTypes
)
@ -193,7 +193,7 @@ void muSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
makePatchTypeField
(
fvPatchScalarField,
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

38
src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H → src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
View File

@ -24,18 +24,18 @@ License
Class
Foam::compressible::LESModels::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField
Description
Spalart Allmaas wall function boundary condition for compressible flows
SourceFiles
muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
muSgsWallFunctionFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
#ifndef muSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#define muSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#ifndef muSgsWallFunctionFvPatchScalarField_H
#define muSgsWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
@ -49,10 +49,10 @@ namespace LESModels
{
/*---------------------------------------------------------------------------*\
Class muSgsSpalartAllmarasWallFunctionFvPatchScalarField Declaration
Class muSgsWallFunctionFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class muSgsSpalartAllmarasWallFunctionFvPatchScalarField
class muSgsWallFunctionFvPatchScalarField
:
public fixedValueFvPatchScalarField
{
@ -62,20 +62,20 @@ class muSgsSpalartAllmarasWallFunctionFvPatchScalarField
public:
//- Runtime type information
TypeName("muSgsSpalartAllmarasWallFunction");
TypeName("muSgsWallFunction");
// Constructors
//- Construct from patch and internal field
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and Istream
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@ -83,7 +83,7 @@ public:
);
//- Construct from patch, internal field and dictionary
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@ -91,20 +91,20 @@ public:
);
//- Construct by mapping given
// muSgsSpalartAllmarasWallFunctionFvPatchScalarField
// muSgsWallFunctionFvPatchScalarField
// onto a new patch
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField
(
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const muSgsWallFunctionFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField
(
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&
const muSgsWallFunctionFvPatchScalarField&
);
//- Construct and return a clone
@ -112,14 +112,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new muSgsSpalartAllmarasWallFunctionFvPatchScalarField(*this)
new muSgsWallFunctionFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
muSgsWallFunctionFvPatchScalarField
(
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const muSgsWallFunctionFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@ -131,7 +131,7 @@ public:
{
return tmp<fvPatchScalarField>
(
new muSgsSpalartAllmarasWallFunctionFvPatchScalarField
new muSgsWallFunctionFvPatchScalarField
(
*this,
iF

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

@ -32,7 +32,7 @@ kOmegaSSTSAS/kOmegaSSTSAS.C
wallFunctions=derivedFvPatchFields/wallFunctions
nuSgsWallFunctions=$(wallFunctions)/nuSgsWallFunctions
$(nuSgsWallFunctions)/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
$(nuSgsWallFunctions)/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libincompressibleLESModels

32
src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C → src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H"
#include "nuSgsWallFunctionFvPatchScalarField.H"
#include "LESModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
@ -41,8 +41,8 @@ namespace LESModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField::
nuSgsWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -52,10 +52,10 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
{}
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField::
nuSgsWallFunctionFvPatchScalarField
(
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
const nuSgsWallFunctionFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@ -65,8 +65,8 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
{}
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField::
nuSgsWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -77,20 +77,20 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
{}
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField::
nuSgsWallFunctionFvPatchScalarField
(
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
const nuSgsWallFunctionFvPatchScalarField& tppsf
)
:
fixedValueFvPatchScalarField(tppsf)
{}
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField::
nuSgsWallFunctionFvPatchScalarField
(
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf,
const nuSgsWallFunctionFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF
)
:
@ -100,7 +100,7 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
void nuSgsWallFunctionFvPatchScalarField::evaluate
(
const Pstream::commsTypes
)
@ -174,7 +174,7 @@ void nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
makePatchTypeField
(
fvPatchScalarField,
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

36
src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H → src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
View File

@ -24,18 +24,18 @@ License
Class
Foam::incompressible::LESModels::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField
Description
Spalart Allmaras wall function boundary condition for incompressible flows
SourceFiles
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
nuSgsWallFunctionFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
#ifndef nuSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#define nuSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#ifndef nuSgsWallFunctionFvPatchScalarField_H
#define nuSgsWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
@ -49,10 +49,10 @@ namespace LESModels
{
/*---------------------------------------------------------------------------*\
Class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField Declaration
Class nuSgsWallFunctionFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
class nuSgsWallFunctionFvPatchScalarField
:
public fixedValueFvPatchScalarField
{
@ -62,20 +62,20 @@ class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
public:
//- Runtime type information
TypeName("nuSgsSpalartAllmarasWallFunction");
TypeName("nuSgsWallFunction");
// Constructors
//- Construct from patch and internal field
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@ -83,20 +83,20 @@ public:
);
//- Construct by mapping given
// nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
// nuSgsWallFunctionFvPatchScalarField
// onto a new patch
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField
(
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const nuSgsWallFunctionFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField
(
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&
const nuSgsWallFunctionFvPatchScalarField&
);
//- Construct and return a clone
@ -104,14 +104,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new nuSgsSpalartAllmarasWallFunctionFvPatchScalarField(*this)
new nuSgsWallFunctionFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
nuSgsWallFunctionFvPatchScalarField
(
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const nuSgsWallFunctionFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@ -123,7 +123,7 @@ public:
{
return tmp<fvPatchScalarField>
(
new nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
new nuSgsWallFunctionFvPatchScalarField
(
*this,
iF