Commit 8b7b625e authored by mattijs's avatar mattijs
Browse files

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-dev-OpenCFD into develop

parents bbf34525 1b94025a
......@@ -48,7 +48,13 @@ volScalarField dynamicKEqn<BasicTurbulenceModel>::Ck
const volSymmTensorField MM
(
simpleFilter_(-2.0*this->delta()*sqrt(KK)*filter_(D))
simpleFilter_
(
-2.0*this->delta()*sqrt
(
max(KK, dimensionedScalar("zero", KK.dimensions(), 0.0))
)*filter_(D)
)
);
const volScalarField Ck
......
......@@ -109,7 +109,7 @@ void Foam::fixedShearStressFvPatchVectorField::updateCoeffs()
)
);
scalarField nuEff(turbModel.nuEff()()[patch().index()]);
tmp<scalarField> nuEff(turbModel.nuEff(patch().index()));
const vectorField Uc(patchInternalField());
......@@ -117,7 +117,7 @@ void Foam::fixedShearStressFvPatchVectorField::updateCoeffs()
const scalarField& ry = patch().deltaCoeffs();
operator==(tauHat*(tauHat & (tau0_*(1.0/(ry*nuEff)) + Uc)));
operator==(tauHat*(tauHat & (tau0_*(1.0/(ry*nuEff())) + Uc)));
fixedValueFvPatchVectorField::updateCoeffs();
}
......
......@@ -24,7 +24,8 @@ runApplication topoSet -dict system/fBurner.topoSetDict
runApplication createPatch -overwrite
decomposePar -force > log.decomposePar 2>&1
# Decompose mesh, constant/boundaryRadiationProperties and fields
decomposePar -force -constant > log.decomposePar 2>&1
decomposePar -region panelRegion > log.decomposeParPanelRegion 2>&1
......
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
value uniform 0;
}
"(region0_to.*)"
{
type boundaryRadiation;
mode solidRadiation;
value uniform 0;
}
}
// ************************************************************************* //
......@@ -9,7 +9,7 @@ application=`getApplication`
runApplication blockMesh
runApplication topoSet
runApplication createPatch -overwrite
runApplication decomposePar -force
runApplication decomposePar -force -constant
# Run
runParallel $application 4
......
......@@ -16,21 +16,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
radiation on;
radiation off;
radiationModel opaqueSolid;
absorptionEmissionModel constantAbsorptionEmission;
constantAbsorptionEmissionCoeffs
{
absorptivity absorptivity [0 -1 0 0 0 0 0] 0.0; //opaque
emissivity emissivity [0 -1 0 0 0 0 0] 0.1;
E E [1 -1 -3 0 0 0 0] 0;
}
scatterModel none;
sootModel none;
radiationModel none;
// ************************************************************************* //
......@@ -25,11 +25,16 @@ rm -f constant/bottomAir/constructMap*
rm -f constant/bottomAir/finalAgglom
rm -f constant/bottomAir/globalFaceFaces
rm -f constant/bottomAir/subMap
rm -f constant/bottomAir/visibleFaceFaces
rm -f constant/bottomAir/mapDist
rm -f constant/topAir/F
rm -f constant/topAir/constructMap*
rm -f constant/topAir/finalAgglom
rm -f constant/topAir/globalFaceFaces
rm -f constant/topAir/subMap
rm -f constant/topAir/visibleFaceFaces
rm -f constant/topAir/mapDist
# ----------------------------------------------------------------- end-of-file
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
value uniform 0; // Dummy value
}
"bottomAir_to_.*"
{
type boundaryRadiation;
mode solidRadiation;
value uniform 0; // Dummy value
}
}
// ************************************************************************* //
......@@ -42,4 +42,7 @@ scatterModel none;
sootModel none;
transmissivityModel none;
// ************************************************************************* //
......@@ -33,4 +33,5 @@ scatterModel none;
sootModel none;
transmissivityModel none;
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
value uniform 0; // Dummy value
}
"topAir_to_.*"
{
type boundaryRadiation;
mode solidRadiation;
value uniform 0; // Dummy value
}
}
// ************************************************************************* //
......@@ -19,7 +19,7 @@ runApplication simpleFoam
# Copy the mesh from the steady state case and map the results to a
# mesh motion case, then solve transient.
cd ../wingMotion2D_pimpleDyMFoam
cp -r ../wingMotion2D_simpleFoam/constant/polyMesh/* constant/polyMesh/
cp -r ../wingMotion2D_simpleFoam/constant/polyMesh/ constant/
cp -r 0.org 0
runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
mv 0/pointDisplacement.unmapped 0/pointDisplacement
......
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
(
SYMP3
{
type patch;
startFace 53708;
nFaces 3191;
}
INLE1
{
type patch;
startFace 56899;
nFaces 45;
}
OUTL9
{
type patch;
startFace 56944;
nFaces 11;
}
OUTL10
{
type patch;
startFace 56955;
nFaces 11;
}
OUTL11
{
type patch;
startFace 56966;
nFaces 11;
}
OUTL12
{
type patch;
startFace 56977;
nFaces 11;
}
WALL6
{
type wall;
startFace 56988;
nFaces 1474;
}
WALL8
{
type wall;
startFace 58462;
nFaces 1640;
}
WALL61
{
type wall;
startFace 60102;
nFaces 44;
}
WALL62
{
type wall;
startFace 60146;
nFaces 78;
}
WALL63
{
type wall;
startFace 60224;
nFaces 255;
}
WALL64
{
type wall;
startFace 60479;
nFaces 157;
}
WALL65
{
type wall;
startFace 60636;
nFaces 35;
}
WALL66
{
type wall;
startFace 60671;
nFaces 60;
}
WALL67
{
type wall;
startFace 60731;
nFaces 55;
}
WALL68
{
type wall;
startFace 60786;
nFaces 116;
}
WALL69
{
type wall;
startFace 60902;
nFaces 24;
}
WALL7
{
type wall;
startFace 60926;
nFaces 121;
}
WALL70
{
type wall;
startFace 61047;
nFaces 182;
}
OUTL15
{
type patch;
startFace 61229;
nFaces 14;
}
)
// ************************************************************************* //
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment