mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of develop.openfoam.com:Development/OpenFOAM-plus into feature-shared-file
Conflicts: applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C applications/utilities/postProcessing/velocityField/Co/Co.C applications/utilities/postProcessing/velocityField/Pe/Pe.C applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C applications/utilities/preProcessing/changeDictionary/changeDictionary.C applications/utilities/preProcessing/setFields/setFields.C applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C src/OpenFOAM/db/IOobject/IOobject.C src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C src/OpenFOAM/db/IOobjects/IOField/IOField.C src/OpenFOAM/db/IOobjects/IOList/IOList.C src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C src/OpenFOAM/db/Time/findInstance.C src/OpenFOAM/db/regIOobject/regIOobject.C src/OpenFOAM/db/regIOobject/regIOobjectI.H src/OpenFOAM/db/regIOobject/regIOobjectRead.C src/OpenFOAM/db/regIOobject/regIOobjectWrite.C src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C src/lagrangian/basic/Cloud/CloudIO.C src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
This commit is contained in:
mattijs
@ -3,7 +3,7 @@
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -33,12 +33,18 @@ Description
|
||||
the thickness coefficient supplied via the option -Cbl. If both options
|
||||
are provided -ybl is used.
|
||||
|
||||
Compressible modes is automatically selected based on the existence of the
|
||||
"thermophysicalProperties" dictionary required to construct the
|
||||
thermodynamics package.
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "fvCFD.H"
|
||||
#include "singlePhaseTransportModel.H"
|
||||
#include "turbulentTransportModel.H"
|
||||
#include "turbulentFluidThermoModel.H"
|
||||
#include "wallDist.H"
|
||||
#include "processorFvPatchField.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -46,6 +52,266 @@ Description
|
||||
static const scalar Cmu(0.09);
|
||||
static const scalar kappa(0.41);
|
||||
|
||||
void correctProcessorPatches(volScalarField& vf)
|
||||
{
|
||||
if (!Pstream::parRun())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Not possible to use correctBoundaryConditions on fields as they may
|
||||
// use local info as opposed to the constraint values employed here,
|
||||
// but still need to update processor patches
|
||||
|
||||
volScalarField::GeometricBoundaryField& bf = vf.boundaryField();
|
||||
|
||||
forAll(bf, patchI)
|
||||
{
|
||||
if (isA<processorFvPatchField<scalar> >(bf[patchI]))
|
||||
{
|
||||
bf[patchI].initEvaluate();
|
||||
}
|
||||
}
|
||||
|
||||
forAll(bf, patchI)
|
||||
{
|
||||
if (isA<processorFvPatchField<scalar> >(bf[patchI]))
|
||||
{
|
||||
bf[patchI].evaluate();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
template<class TurbulenceModel>
|
||||
Foam::tmp<Foam::volScalarField> calcK
|
||||
(
|
||||
TurbulenceModel& turbulence,
|
||||
const volScalarField& mask,
|
||||
const volScalarField& nut,
|
||||
const volScalarField& y,
|
||||
const dimensionedScalar& ybl,
|
||||
const scalar Cmu,
|
||||
const scalar kappa
|
||||
)
|
||||
{
|
||||
// Turbulence k
|
||||
tmp<volScalarField> tk = turbulence->k();
|
||||
volScalarField& k = tk();
|
||||
scalar ck0 = pow025(Cmu)*kappa;
|
||||
k = (1 - mask)*k + mask*sqr(nut/(ck0*min(y, ybl)));
|
||||
|
||||
// Do not correct BC
|
||||
// - operation may use inconsistent fields wrt these local manipulations
|
||||
// k.correctBoundaryConditions();
|
||||
correctProcessorPatches(k);
|
||||
|
||||
Info<< "Writing k\n" << endl;
|
||||
k.write();
|
||||
|
||||
return tk;
|
||||
}
|
||||
|
||||
|
||||
template<class TurbulenceModel>
|
||||
Foam::tmp<Foam::volScalarField> calcEpsilon
|
||||
(
|
||||
TurbulenceModel& turbulence,
|
||||
const volScalarField& mask,
|
||||
const volScalarField& k,
|
||||
const volScalarField& y,
|
||||
const dimensionedScalar& ybl,
|
||||
const scalar Cmu,
|
||||
const scalar kappa
|
||||
)
|
||||
{
|
||||
// Turbulence epsilon
|
||||
tmp<volScalarField> tepsilon = turbulence->epsilon();
|
||||
volScalarField& epsilon = tepsilon();
|
||||
scalar ce0 = ::pow(Cmu, 0.75)/kappa;
|
||||
epsilon = (1 - mask)*epsilon + mask*ce0*k*sqrt(k)/min(y, ybl);
|
||||
epsilon.max(SMALL);
|
||||
|
||||
// Do not correct BC
|
||||
// - operation may use inconsistent fields wrt these local manipulations
|
||||
// epsilon.correctBoundaryConditions();
|
||||
correctProcessorPatches(epsilon);
|
||||
|
||||
Info<< "Writing epsilon\n" << endl;
|
||||
epsilon.write();
|
||||
|
||||
return tepsilon;
|
||||
}
|
||||
|
||||
|
||||
void calcOmega
|
||||
(
|
||||
const fvMesh& mesh,
|
||||
const volScalarField& mask,
|
||||
const volScalarField& k,
|
||||
const volScalarField& epsilon
|
||||
)
|
||||
{
|
||||
// Turbulence omega
|
||||
IOobject omegaHeader
|
||||
(
|
||||
"omega",
|
||||
mesh.time().timeName(),
|
||||
mesh,
|
||||
IOobject::MUST_READ,
|
||||
IOobject::NO_WRITE,
|
||||
false
|
||||
);
|
||||
|
||||
if (omegaHeader.typeHeaderOk<volScalarField>(true))
|
||||
{
|
||||
volScalarField omega(omegaHeader, mesh);
|
||||
dimensionedScalar k0("SMALL", k.dimensions(), SMALL);
|
||||
|
||||
omega = (1 - mask)*omega + mask*epsilon/(Cmu*k + k0);
|
||||
omega.max(SMALL);
|
||||
|
||||
// Do not correct BC
|
||||
// - operation may use inconsistent fields wrt these local
|
||||
// manipulations
|
||||
// omega.correctBoundaryConditions();
|
||||
correctProcessorPatches(omega);
|
||||
|
||||
Info<< "Writing omega\n" << endl;
|
||||
omega.write();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void setField
|
||||
(
|
||||
const fvMesh& mesh,
|
||||
const word& fieldName,
|
||||
const volScalarField& value
|
||||
)
|
||||
{
|
||||
IOobject fldHeader
|
||||
(
|
||||
fieldName,
|
||||
mesh.time().timeName(),
|
||||
mesh,
|
||||
IOobject::MUST_READ,
|
||||
IOobject::NO_WRITE,
|
||||
false
|
||||
);
|
||||
|
||||
if (fldHeader.typeHeaderOk<volScalarField>(true))
|
||||
{
|
||||
volScalarField fld(fldHeader, mesh);
|
||||
fld = value;
|
||||
|
||||
// Do not correct BC
|
||||
// - operation may use inconsistent fields wrt these local
|
||||
// manipulations
|
||||
// fld.correctBoundaryConditions();
|
||||
correctProcessorPatches(fld);
|
||||
|
||||
Info<< "Writing " << fieldName << nl << endl;
|
||||
fld.write();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void calcCompressible
|
||||
(
|
||||
const fvMesh& mesh,
|
||||
const volScalarField& mask,
|
||||
const volVectorField& U,
|
||||
const volScalarField& y,
|
||||
const dimensionedScalar& ybl
|
||||
)
|
||||
{
|
||||
const Time& runTime = mesh.time();
|
||||
|
||||
autoPtr<fluidThermo> pThermo(fluidThermo::New(mesh));
|
||||
fluidThermo& thermo = pThermo();
|
||||
volScalarField rho(thermo.rho());
|
||||
|
||||
// Update/re-write phi
|
||||
#include "compressibleCreatePhi.H"
|
||||
phi.write();
|
||||
|
||||
autoPtr<compressible::turbulenceModel> turbulence
|
||||
(
|
||||
compressible::turbulenceModel::New
|
||||
(
|
||||
rho,
|
||||
U,
|
||||
phi,
|
||||
thermo
|
||||
)
|
||||
);
|
||||
|
||||
// Calculate nut - reference nut is calculated by the turbulence model
|
||||
// on its construction
|
||||
tmp<volScalarField> tnut = turbulence->nut();
|
||||
|
||||
volScalarField& nut = tnut();
|
||||
volScalarField S(mag(dev(symm(fvc::grad(U)))));
|
||||
nut = (1 - mask)*nut + mask*sqr(kappa*min(y, ybl))*::sqrt(2)*S;
|
||||
|
||||
// Do not correct BC - wall functions will 'undo' manipulation above
|
||||
// by using nut from turbulence model
|
||||
correctProcessorPatches(nut);
|
||||
nut.write();
|
||||
|
||||
tmp<volScalarField> k =
|
||||
calcK(turbulence, mask, nut, y, ybl, Cmu, kappa);
|
||||
tmp<volScalarField> epsilon =
|
||||
calcEpsilon(turbulence, mask, k, y, ybl, Cmu, kappa);
|
||||
calcOmega(mesh, mask, k, epsilon);
|
||||
setField(mesh, "nuTilda", nut);
|
||||
}
|
||||
|
||||
|
||||
void calcIncompressible
|
||||
(
|
||||
const fvMesh& mesh,
|
||||
const volScalarField& mask,
|
||||
const volVectorField& U,
|
||||
const volScalarField& y,
|
||||
const dimensionedScalar& ybl
|
||||
)
|
||||
{
|
||||
const Time& runTime = mesh.time();
|
||||
|
||||
// Update/re-write phi
|
||||
#include "createPhi.H"
|
||||
phi.write();
|
||||
|
||||
singlePhaseTransportModel laminarTransport(U, phi);
|
||||
|
||||
autoPtr<incompressible::turbulenceModel> turbulence
|
||||
(
|
||||
incompressible::turbulenceModel::New(U, phi, laminarTransport)
|
||||
);
|
||||
|
||||
tmp<volScalarField> tnut = turbulence->nut();
|
||||
|
||||
// Calculate nut - reference nut is calculated by the turbulence model
|
||||
// on its construction
|
||||
volScalarField& nut = tnut();
|
||||
volScalarField S(mag(dev(symm(fvc::grad(U)))));
|
||||
nut = (1 - mask)*nut + mask*sqr(kappa*min(y, ybl))*::sqrt(2)*S;
|
||||
|
||||
// Do not correct BC - wall functions will 'undo' manipulation above
|
||||
// by using nut from turbulence model
|
||||
correctProcessorPatches(nut);
|
||||
nut.write();
|
||||
|
||||
tmp<volScalarField> k =
|
||||
calcK(turbulence, mask, nut, y, ybl, Cmu, kappa);
|
||||
tmp<volScalarField> epsilon =
|
||||
calcEpsilon(turbulence, mask, k, y, ybl, Cmu, kappa);
|
||||
calcOmega(mesh, mask, k, epsilon);
|
||||
setField(mesh, "nuTilda", nut);
|
||||
}
|
||||
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
@ -55,6 +321,8 @@ int main(int argc, char *argv[])
|
||||
"turbulence fields based on the 1/7th power-law."
|
||||
);
|
||||
|
||||
#include "addRegionOption.H"
|
||||
|
||||
argList::addOption
|
||||
(
|
||||
"ybl",
|
||||
@ -67,17 +335,12 @@ int main(int argc, char *argv[])
|
||||
"scalar",
|
||||
"boundary-layer thickness as Cbl * mean distance to wall"
|
||||
);
|
||||
argList::addBoolOption
|
||||
(
|
||||
"writenut",
|
||||
"write nut field"
|
||||
);
|
||||
|
||||
#include "setRootCase.H"
|
||||
|
||||
if (!args.optionFound("ybl") && !args.optionFound("Cbl"))
|
||||
{
|
||||
FatalErrorIn(args.executable())
|
||||
FatalErrorInFunction
|
||||
<< "Neither option 'ybl' or 'Cbl' have been provided to calculate "
|
||||
<< "the boundary-layer thickness.\n"
|
||||
<< "Please choose either 'ybl' OR 'Cbl'."
|
||||
@ -85,7 +348,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
else if (args.optionFound("ybl") && args.optionFound("Cbl"))
|
||||
{
|
||||
FatalErrorIn(args.executable())
|
||||
FatalErrorInFunction
|
||||
<< "Both 'ybl' and 'Cbl' have been provided to calculate "
|
||||
<< "the boundary-layer thickness.\n"
|
||||
<< "Please choose either 'ybl' OR 'Cbl'."
|
||||
@ -93,7 +356,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
#include "createTime.H"
|
||||
#include "createMesh.H"
|
||||
#include "createNamedMesh.H"
|
||||
#include "createFields.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -117,113 +380,24 @@ int main(int argc, char *argv[])
|
||||
Info<< "Writing U\n" << endl;
|
||||
U.write();
|
||||
|
||||
// Update/re-write phi
|
||||
#include "createPhi.H"
|
||||
phi.write();
|
||||
|
||||
singlePhaseTransportModel laminarTransport(U, phi);
|
||||
|
||||
autoPtr<incompressible::turbulenceModel> turbulence
|
||||
if
|
||||
(
|
||||
incompressible::turbulenceModel::New(U, phi, laminarTransport)
|
||||
);
|
||||
|
||||
if (isA<incompressible::RASModel>(turbulence()))
|
||||
IOobject
|
||||
(
|
||||
basicThermo::dictName,
|
||||
runTime.constant(),
|
||||
mesh
|
||||
).typeHeaderOk<IOdictionary>(true)
|
||||
)
|
||||
{
|
||||
// Calculate nut - reference nut is calculated by the turbulence model
|
||||
// on its construction
|
||||
tmp<volScalarField> tnut = turbulence->nut();
|
||||
volScalarField& nut = tnut();
|
||||
volScalarField S(mag(dev(symm(fvc::grad(U)))));
|
||||
nut = (1 - mask)*nut + mask*sqr(kappa*min(y, ybl))*::sqrt(2)*S;
|
||||
|
||||
// do not correct BC - wall functions will 'undo' manipulation above
|
||||
// by using nut from turbulence model
|
||||
|
||||
if (args.optionFound("writenut"))
|
||||
{
|
||||
Info<< "Writing nut" << endl;
|
||||
nut.write();
|
||||
}
|
||||
|
||||
|
||||
//--- Read and modify turbulence fields
|
||||
|
||||
// Turbulence k
|
||||
tmp<volScalarField> tk = turbulence->k();
|
||||
volScalarField& k = tk();
|
||||
scalar ck0 = pow025(Cmu)*kappa;
|
||||
k = (1 - mask)*k + mask*sqr(nut/(ck0*min(y, ybl)));
|
||||
|
||||
// do not correct BC - operation may use inconsistent fields wrt these
|
||||
// local manipulations
|
||||
// k.correctBoundaryConditions();
|
||||
|
||||
Info<< "Writing k\n" << endl;
|
||||
k.write();
|
||||
|
||||
|
||||
// Turbulence epsilon
|
||||
tmp<volScalarField> tepsilon = turbulence->epsilon();
|
||||
volScalarField& epsilon = tepsilon();
|
||||
scalar ce0 = ::pow(Cmu, 0.75)/kappa;
|
||||
epsilon = (1 - mask)*epsilon + mask*ce0*k*sqrt(k)/min(y, ybl);
|
||||
|
||||
// do not correct BC - wall functions will use non-updated k from
|
||||
// turbulence model
|
||||
// epsilon.correctBoundaryConditions();
|
||||
|
||||
Info<< "Writing epsilon\n" << endl;
|
||||
epsilon.write();
|
||||
|
||||
// Turbulence omega
|
||||
IOobject omegaHeader
|
||||
(
|
||||
"omega",
|
||||
runTime.timeName(),
|
||||
mesh,
|
||||
IOobject::MUST_READ,
|
||||
IOobject::NO_WRITE,
|
||||
false
|
||||
);
|
||||
|
||||
if (omegaHeader.typeHeaderOk<volScalarField>(true))
|
||||
{
|
||||
volScalarField omega(omegaHeader, mesh);
|
||||
dimensionedScalar k0("VSMALL", k.dimensions(), VSMALL);
|
||||
omega = (1 - mask)*omega + mask*epsilon/(Cmu*k + k0);
|
||||
|
||||
// do not correct BC - wall functions will use non-updated k from
|
||||
// turbulence model
|
||||
// omega.correctBoundaryConditions();
|
||||
|
||||
Info<< "Writing omega\n" << endl;
|
||||
omega.write();
|
||||
}
|
||||
|
||||
// Turbulence nuTilda
|
||||
IOobject nuTildaHeader
|
||||
(
|
||||
"nuTilda",
|
||||
runTime.timeName(),
|
||||
mesh,
|
||||
IOobject::MUST_READ,
|
||||
IOobject::NO_WRITE,
|
||||
false
|
||||
);
|
||||
|
||||
if (nuTildaHeader.typeHeaderOk<volScalarField>(true))
|
||||
{
|
||||
volScalarField nuTilda(nuTildaHeader, mesh);
|
||||
nuTilda = nut;
|
||||
|
||||
// do not correct BC
|
||||
// nuTilda.correctBoundaryConditions();
|
||||
|
||||
Info<< "Writing nuTilda\n" << endl;
|
||||
nuTilda.write();
|
||||
}
|
||||
calcCompressible(mesh, mask, U, y, ybl);
|
||||
}
|
||||
else
|
||||
{
|
||||
calcIncompressible(mesh, mask, U, y, ybl);
|
||||
}
|
||||
|
||||
|
||||
Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
|
||||
<< " ClockTime = " << runTime.elapsedClockTime() << " s"
|
||||
|
||||
Reference in New Issue
Block a user