Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

This commit is contained in:
william
2014-01-24 16:17:58 +00:00
72 changed files with 448 additions and 948 deletions

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -60,6 +60,12 @@ noPhaseChange::~noPhaseChange()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool noPhaseChange::active() const
{
return false;
}
void noPhaseChange::correctModel
(
const scalar,

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -85,6 +85,9 @@ public:
// Evolution
//- Return the model 'active' status - default active = true
virtual bool active() const;
//- Correct
virtual void correctModel
(

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -81,6 +81,11 @@ void phaseChangeModel::correct
volScalarField& dEnergy
)
{
if (!active())
{
return;
}
correctModel
(
dt,

View File

@ -20,8 +20,8 @@ runAnsysToFoam()
runAnsysToFoam flange.ans 0.001
runApplication $application
runApplication foamToFieldview9
runApplication foamToEnsight
runApplication foamToEnsightParts
runApplication foamToVTK
# ----------------------------------------------------------------- end-of-file

View File

@ -1,52 +0,0 @@
/*--------------------------------*- 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;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
inlet
{
type patch;
nFaces 30;
startFace 24170;
}
outlet
{
type patch;
nFaces 57;
startFace 24200;
}
upperWall
{
type wall;
nFaces 223;
startFace 24257;
}
lowerWall
{
type wall;
nFaces 250;
startFace 24480;
}
frontAndBack
{
type empty;
nFaces 24450;
startFace 24730;
}
)
// ************************************************************************* //

View File

@ -28,7 +28,7 @@ gradSchemes
divSchemes
{
default none;
div(phi,T) Gauss limitedLinear 1;
div(phi,T) Gauss linearUpwind grad(T);
}
laplacianSchemes

View File

@ -25,50 +25,10 @@ solvers
relTol 0.01;
}
Urel
"(Urel|k|epsilon|omega|R|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
k
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
epsilon
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
omega
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
R
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}

View File

@ -28,10 +28,10 @@ gradSchemes
divSchemes
{
default none;
div(phi,k) Gauss linear;
div(phi,epsilon) Gauss linear;
div(phi,R) Gauss linear;
div(phi,nuTilda) Gauss linear;
div(phi,k) bounded Gauss linear;
div(phi,epsilon) bounded Gauss linear;
div(phi,R) bounded Gauss linear;
div(phi,nuTilda) bounded Gauss linear;
div((nuEff*dev(T(grad(U))))) Gauss linear;
}

View File

@ -25,34 +25,10 @@ solvers
relTol 0;
}
k
"(k|epsilon|R|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
epsilon
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
R
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0;
}

View File

@ -28,10 +28,10 @@ gradSchemes
divSchemes
{
default none;
div(phi,k) Gauss linear;
div(phi,epsilon) Gauss linear;
div(phi,R) Gauss linear;
div(phi,nuTilda) Gauss linear;
div(phi,k) bounded Gauss linear;
div(phi,epsilon) bounded Gauss linear;
div(phi,R) bounded Gauss linear;
div(phi,nuTilda) bounded Gauss linear;
div((nuEff*dev(T(grad(U))))) Gauss linear;
}

View File

@ -25,34 +25,10 @@ solvers
relTol 0;
}
k
"(k|epsilon|R|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
epsilon
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
R
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0;
}

View File

@ -28,11 +28,11 @@ gradSchemes
divSchemes
{
default none;
div(phi,k) Gauss linear;
div(phi,epsilon) Gauss linear;
div(phi,omega) Gauss linear;
div(phi,R) Gauss linear;
div(phi,nuTilda) Gauss linear;
div(phi,k) bounded Gauss linear;
div(phi,epsilon) bounded Gauss linear;
div(phi,omega) bounded Gauss linear;
div(phi,R) bounded Gauss linear;
div(phi,nuTilda) bounded Gauss linear;
div((nuEff*dev(T(grad(U))))) Gauss linear;
}

View File

@ -25,42 +25,10 @@ solvers
relTol 0;
}
k
"(k|epsilon|omega|R|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
epsilon
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
omega
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
R
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0;
}

View File

@ -27,8 +27,8 @@ solvers
U
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
}

View File

@ -27,8 +27,8 @@ solvers
U
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
}

View File

@ -27,8 +27,8 @@ solvers
U
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
}

View File

@ -27,8 +27,8 @@ solvers
U
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
}

View File

@ -19,16 +19,22 @@ solvers
{
p
{
solver PCG;
preconditioner DIC;
tolerance 1e-06;
relTol 0;
solver GAMG;
tolerance 0;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
U
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
}

View File

@ -19,18 +19,30 @@ solvers
{
pcorr
{
solver PCG;
preconditioner DIC;
solver GAMG;
tolerance 0.02;
relTol 0;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration no;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
p
{
solver PCG;
preconditioner DIC;
tolerance 1e-06;
solver GAMG;
tolerance 0;
relTol 0.01;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration no;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
pFinal
@ -42,8 +54,8 @@ solvers
U
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}

View File

@ -37,7 +37,7 @@ boundaryField
value uniform (0 0 0);
}
innerCylinder
outerCylinder
{
type fixedValue;
value uniform (0 0 0);

View File

@ -20,7 +20,6 @@ runApplication renumberMesh -overwrite
# force removal of fields generated by snappy
\rm -rf 0
cp -rf 0.org 0
# - generate face/cell sets and zones

View File

@ -201,10 +201,6 @@ castellatedMeshControls
refinementSurfaces
{
innerCylinder
{
level (2 3);
}
innerCylinderSmall
{
level (4 4);
@ -265,11 +261,6 @@ castellatedMeshControls
mode inside;
levels ((1E15 4));
}
outerCylinder
{
mode inside;
levels ((1E15 0));
}
}

View File

@ -14,10 +14,10 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
innerCylinder.obj
{
#include "surfaceFeatureExtractDictDefaults"
}
//innerCylinder.obj
//{
// #include "surfaceFeatureExtractDictDefaults"
//}
innerCylinderSmall.obj

View File

@ -24,7 +24,7 @@ solvers
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration on;
cacheAgglomeration true;
agglomerator faceAreaPair;
nCellsInCoarsestLevel 10;
mergeLevels 1;
@ -46,8 +46,8 @@ solvers
"(U|k|omega)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0.1;
}

View File

@ -19,8 +19,8 @@ solvers
{
p
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-12;
relTol 0;
}

View File

@ -43,8 +43,8 @@ solvers
"(U|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}

View File

@ -43,8 +43,8 @@ solvers
"(U|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}

View File

@ -19,24 +19,30 @@ solvers
{
p
{
solver PCG;
preconditioner DIC;
tolerance 1e-06;
relTol 0.05;
solver GAMG;
tolerance 0;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
pFinal
{
solver PCG;
preconditioner DIC;
$p;
smoother DICGaussSeidel;
tolerance 1e-06;
relTol 0;
}
"(U|k)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}

View File

@ -21,8 +21,8 @@ solvers
{
solver GAMG;
tolerance 1e-06;
relTol 0.01;
smoother GaussSeidel;
relTol 0.1;
smoother DICGaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
@ -31,20 +31,15 @@ solvers
pFinal
{
solver GAMG;
$p;
tolerance 1e-06;
relTol 0;
smoother GaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
"(U|kl|kt|omega)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0.01;
}

View File

@ -23,7 +23,7 @@ solvers
tolerance 1e-7;
relTol 0.01;
smoother GaussSeidel;
smoother DICGaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
@ -39,8 +39,8 @@ solvers
"(U|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}

View File

@ -18,76 +18,34 @@ solvers
{
p
{
solver GAMG;
tolerance 1e-6;
relTol 0.1;
solver GAMG;
tolerance 1e-6;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 50;//10;
agglomerator faceAreaPair;
mergeLevels 1;
agglomerator faceAreaPair;
mergeLevels 1;
};
pFinal
{
solver GAMG;
tolerance 1e-6;
relTol 0;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 50;//10;
agglomerator faceAreaPair;
mergeLevels 1;
$p;
tolerance 1e-6;
relTol 0;
};
U
"(U|k|B|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
UFinal
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
k
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-07;
relTol 0;
};
B
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-07;
relTol 0;
};
nuTilda
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-07;
relTol 0;
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-07;
relTol 0;
};
}
@ -97,12 +55,6 @@ PISO
nNonOrthogonalCorrectors 1;
}
PIMPLE
{
nCorrectors 2;
nNonOrthogonalCorrectors 1;
}
relaxationFactors
{
"U.*" 1;

View File

@ -30,37 +30,20 @@ solvers
nCellsInCoarsestLevel 10;
mergeLevels 1;
}
U
pFinal
{
$p;
tolerance 1e-6;
relTol 0;
};
"(U|nuTilda)"
{
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-08;
relTol 0.1;
nSweeps 1;
}
k
{
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-08;
relTol 0.1;
nSweeps 1;
}
omega
{
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-08;
relTol 0.1;
nSweeps 1;
}
nuTilda
{
solver smoothSolver;
smoother GaussSeidel;
nSweeps 2;
tolerance 1e-08;
relT 0.1;
}
}
@ -78,8 +61,6 @@ relaxationFactors
{
p 0.3;
U 0.5;
k 0.7;
omega 0.7;
nuTilda 0.5;
}

View File

@ -19,48 +19,30 @@ solvers
{
p
{
solver PCG;
preconditioner DIC;
solver GAMG;
tolerance 1e-06;
relTol 0.05;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration on;
agglomerator faceAreaPair;
nCellsInCoarsestLevel 10;
mergeLevels 1;
}
pFinal
{
solver PCG;
preconditioner DIC;
$p;
smoother DICGaussSeidel;
tolerance 1e-06;
relTol 0;
}
U
"(U|k|B|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
k
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
B
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-05;
relTol 0;
}

View File

@ -19,48 +19,30 @@ solvers
{
p
{
solver PCG;
preconditioner DIC;
tolerance 1e-06;
relTol 0.05;
solver GAMG;
tolerance 1e-07;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration on;
agglomerator faceAreaPair;
nCellsInCoarsestLevel 10;
mergeLevels 1;
}
pFinal
{
solver PCG;
preconditioner DIC;
tolerance 1e-06;
$p;
smoother DICGaussSeidel;
tolerance 1e-6;
relTol 0;
}
};
U
"(U|k|B|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
k
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
B
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-05;
relTol 0;
}

View File

@ -19,56 +19,29 @@ solvers
{
p
{
solver PCG;
preconditioner DIC;
solver GAMG;
tolerance 1e-06;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration on;
agglomerator faceAreaPair;
nCellsInCoarsestLevel 10;
mergeLevels 1;
}
pFinal
{
solver PCG;
preconditioner DIC;
$p;
tolerance 1e-06;
relTol 0;
}
U
"(U|k|epsilon|R|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
k
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
epsilon
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
R
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-05;
relTol 0;
}

View File

@ -19,16 +19,21 @@ solvers
{
p
{
solver PCG;
preconditioner DIC;
solver GAMG;
tolerance 1e-06;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration on;
agglomerator faceAreaPair;
nCellsInCoarsestLevel 10;
mergeLevels 1;
}
pFinal
{
solver PCG;
preconditioner DIC;
$p;
tolerance 1e-06;
relTol 0;
}
@ -42,34 +47,10 @@ solvers
relTol (0 0 0);
}
k
"(k|epsilon|R|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
epsilon
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
R
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-05;
relTol 0;
}

View File

@ -33,8 +33,8 @@ solvers
hU
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-10;
relTol 0.1;
}

View File

@ -32,13 +32,7 @@ solvers
pFinal
{
solver GAMG;
smoother GaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
$p;
tolerance 1e-06;
relTol 0;
}
@ -46,16 +40,14 @@ solvers
"(U|k|epsilon)"
{
solver smoothSolver;
smoother GaussSeidel;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}
"(U|k|epsilon)Final"
{
solver PBiCG;
preconditioner DILU;
$U;
tolerance 1e-05;
relTol 0;
}

View File

@ -19,48 +19,22 @@ solvers
{
p
{
solver PCG;
preconditioner DIC;
solver GAMG;
tolerance 1e-06;
relTol 0.01;
}
U
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration on;
agglomerator faceAreaPair;
nCellsInCoarsestLevel 10;
mergeLevels 1;
}
k
"(U|k|epsilon|R|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
epsilon
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
R
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}

View File

@ -19,48 +19,22 @@ solvers
{
p
{
solver PCG;
preconditioner DIC;
solver GAMG;
tolerance 1e-06;
relTol 0.01;
}
U
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration on;
agglomerator faceAreaPair;
nCellsInCoarsestLevel 10;
mergeLevels 1;
}
k
"(U|k|epsilon|R|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
epsilon
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
R
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}

View File

@ -25,7 +25,7 @@ solvers
p
{
solver GAMG;
tolerance 0;
tolerance 1e-6;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;

View File

@ -20,7 +20,7 @@ solvers
p
{
solver GAMG;
tolerance 0;
tolerance 1e-6;
relTol 0.01;
smoother GaussSeidel;
nPreSweeps 0;

View File

@ -32,15 +32,16 @@ solvers
relTol 0;
}
"(U|h)"
U
{
solver smoothSolver;
smoother symGaussSeidel;
tolerance 0;
relTol 0.1;
maxIter 50;
}
"(U|h)Final"
UFinal
{
$U;
relTol 0;
@ -73,9 +74,19 @@ solvers
relTol 0;
}
"(Yi|O2|N2|H2O)"
"(h|Yi|O2|N2|H2O)"
{
$hFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
hFinal
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
}

View File

@ -83,12 +83,12 @@ subModels
((0.6 0.35 1.45) (0 0 -1))
);
massTotal 10;
massTotal 5;
parcelsPerInjector 20000;
parcelsPerSecond 500;
parcelBasisType mass;
flowRateProfile constant 0.1;
Umag constant 3.0;
flowRateProfile constant 1;
Umag constant 1;
thetaInner constant 0;
thetaOuter constant 45;

View File

@ -34,9 +34,9 @@ solvers
"(U|h|k|epsilon)"
{
solver smoothSolver;
smoother symGaussSeidel;
tolerance 0;
solver PBiCG;
preconditioner DILU;
tolerance 1e-5;
relTol 0.1;
}

View File

@ -24,7 +24,9 @@ boundaryField
{
sides
{
type zeroGradient;
type inletOutlet;
inletValue $internalField;
value $internalField;
}
region0_to_wallFilmRegion_wallFilmFaces
{

View File

@ -24,7 +24,9 @@ boundaryField
{
sides
{
type zeroGradient;
type inletOutlet;
inletValue $internalField;
value $internalField;
}
region0_to_wallFilmRegion_wallFilmFaces
{

View File

@ -24,7 +24,9 @@ boundaryField
{
sides
{
type zeroGradient;
type inletOutlet;
inletValue $internalField;
value $internalField;
}
region0_to_wallFilmRegion_wallFilmFaces
{

View File

@ -23,8 +23,9 @@ boundaryField
{
sides
{
type fixedValue;
value uniform 300;
type inletOutlet;
inletValue $internalField;
value $internalField;
}
region0_to_wallFilmRegion_wallFilmFaces
{

View File

@ -32,31 +32,27 @@ solvers
relTol 0;
}
"(U|h)"
U
{
solver smoothSolver;
smoother symGaussSeidel;
tolerance 0;
relTol 0.1;
maxIter 50;
}
"(U|h)Final"
UFinal
{
$U;
relTol 0;
tolerance 1e-05;
}
"(k|epsilon)"
{
$UFinal;
}
p_rgh
{
solver GAMG;
tolerance 0;
relTol 0.1;
relTol 0.01;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
@ -64,18 +60,29 @@ solvers
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
maxIter 50;
}
p_rghFinal
{
$p_rgh;
tolerance 1e-06;
tolerance 1e-05;
relTol 0;
}
"(Yi|O2|N2|H2O)"
"(h|Yi|O2|N2|H2O)"
{
$hFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
hFinal
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
}
@ -90,11 +97,11 @@ relaxationFactors
{
fields
{
".*Final" 1;
".*" 1;
}
equations
{
".*Final" 1;
".*" 1;
}
}

View File

@ -19,15 +19,15 @@ solvers
{
"(Uf|hf|deltaf\*rhof)"
{
solver smoothSolver;
smoother symGaussSeidel;
solver PBiCG;
preconditioner DILU;
tolerance 1e-10;
relTol 0;
}
deltaf
{
solver smoothSolver;
smoother symGaussSeidel;
solver PBiCG;
preconditioner DILU;
tolerance 1e-10;
relTol 0;
}
@ -46,9 +46,11 @@ relaxationFactors
{
fields
{
".*" 1;
}
equations
{
".*" 1;
}
}

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|h|k|epsilon)"
"(U|k|epsilon)"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|h|k|epsilon)Final"
"(U|k|epsilon)Final"
{
$U;
tolerance 1e-06;
@ -70,7 +70,21 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
h
{
$Yi;
relTol 0.1;
}
hFinal
{
$Yi;
}
}

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|h|k|epsilon)"
"(U|k|epsilon)"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|h|k|epsilon)Final"
"(U|k|epsilon)Final"
{
$U;
tolerance 1e-05;
@ -71,7 +71,19 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
h
{
$Yi;
relTol 0.1;
}
hFinal
{
$Yi;
}
}

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
"(U|h|k|omega)"
"(U|k|omega)"
{
solver smoothSolver;
smoother symGaussSeidel;
@ -40,7 +40,7 @@ solvers
relTol 0.1;
}
"(U|h|k|omega)Final"
"(U|k|omega)Final"
{
$U;
tolerance 1e-06;
@ -59,7 +59,6 @@ solvers
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
maxIter 50;
}
pFinal
@ -71,23 +70,31 @@ solvers
"(Yi|O2|N2|H2O)"
{
$hFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
h
{
$Yi;
relTol 0.1;
}
hFinal
{
$Yi;
}
}
PIMPLE
{
nCorrectors 3;
transonic no;
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
momentumPredictor yes;
}
potentialFlow
{
// used for potentialFoam initialisation
nNonOrthogonalCorrectors 5;
}
relaxationFactors
{
fields
@ -95,8 +102,9 @@ relaxationFactors
}
equations
{
".*" 1;
".*Final" 1;
}
}
// ************************************************************************* //

View File

@ -32,11 +32,11 @@ solvers
relTol 0;
}
"(U|h)"
"(U|k|epsilon)"
{
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
tolerance 1e-06;
relTol 0.1;
}
@ -61,26 +61,30 @@ solvers
relTol 0;
}
"(U|h)Final"
"(U|k|epsilon)Final"
{
$U;
tolerance 1e-05;
tolerance 1e-06;
relTol 0;
}
"(k|epsilon)"
{
$U;
}
"(k|epsilon)Final"
{
$UFinal;
}
"(Yi|O2|N2|H2O)"
{
$UFinal;
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
h
{
$Yi;
relTol 0.1;
}
hFinal
{
$Yi;
}
}

View File

@ -21,6 +21,9 @@ internalField uniform (0 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type uniformFixedValue;

View File

@ -21,6 +21,9 @@ internalField uniform 1;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type fixedValue;
@ -33,17 +36,10 @@ boundaryField
inletValue $internalField;
}
outerCylinder
wall
{
type zeroGradient;
value $internalField;
}
"propeller.*"
{
type zeroGradient;
value $internalField;
}
}
// ************************************************************************* //

View File

@ -21,6 +21,9 @@ internalField uniform 0.0495;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type fixedValue;
@ -34,13 +37,7 @@ boundaryField
value $internalField;
}
outerCylinder
{
type epsilonWallFunction;
value $internalField;
}
"propeller.*"
wall
{
type epsilonWallFunction;
value $internalField;

View File

@ -21,6 +21,9 @@ internalField uniform 0.06;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type fixedValue;
@ -34,13 +37,7 @@ boundaryField
value $internalField;
}
outerCylinder
{
type kqRWallFunction;
value $internalField;
}
"propeller.*"
wall
{
type kqRWallFunction;
value $internalField;

View File

@ -21,6 +21,9 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type calculated;
@ -33,13 +36,7 @@ boundaryField
value uniform 0;
}
outerCylinder
{
type nutkWallFunction;
value uniform 0;
}
"propeller.*"
wall
{
type nutkWallFunction;
value uniform 0;

View File

@ -21,6 +21,9 @@ internalField uniform 1e5;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type fixedFluxPressure;
@ -32,12 +35,7 @@ boundaryField
value $internalField;
}
outerCylinder
{
type fixedFluxPressure;
}
"propeller.*"
wall
{
type fixedFluxPressure;
}

View File

@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
# remove surface
\rm -f constant/triSurface/propellerTip.obj.gz
\rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
cleanCase

View File

@ -15,41 +15,30 @@ runApplication blockMesh
runApplication surfaceFeatureExtract
runApplication snappyHexMesh -overwrite
runApplication renumberMesh -overwrite
# force removal of fields generated by snappy
\rm -rf 0
cp -rf 0.org 0
# - generate face/cell sets and zones
#runApplication setSet -batch removeRedundantZones.setSet
#mv log.setSet log.removeRedundantZones.setSet
runApplication topoSet -dict system/removeRedundantZones.topoSetDict
mv log.topoSet log.removeRedundantZones.topoSet
#runApplication setSet -batch createInletOutletSets.setSet
#mv log.setSet log.createInletOutletSets.setSet
runApplication topoSet -dict system/createInletOutletSets.topoSetDict
mv log.topoSet log.createInletOutletSets.topoSet
#runApplication setSet -batch createAMIFaces.setSet
#mv log.setSet log.createAMIFaces.setSet
runApplication topoSet -dict system/createAMIFaces.topoSetDict
mv log.topoSet log.createAMIFaces.topoSet
#mv log.topoSet log.createInletOutletSets.topoSet
# - create the inlet/outlet patches
# - create the inlet/outlet and AMI patches
runApplication createPatch -overwrite
# - test by running moveDynamicMes
#runApplication moveDynamicMesh -checkAMI
# - apply the initial fields
cp -rf 0.org 0
# - create the AMI faces by creating baffles, and then splitting the mesh
runApplication createBaffles -overwrite
runApplication mergeOrSplitBaffles -split -overwrite

View File

@ -1,110 +0,0 @@
/*--------------------------------*- 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 dictionary;
object topoSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
actions
(
{
name innerCylinderSmall;
type cellSet;
action new;
source cylinderToCell;
sourceInfo
{
p1 (0 -0.08 0);
p2 (0 0.06 0);
radius 0.12;
}
}
{
name outerCells;
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set innerCylinderSmall;
}
}
{
name outerCells;
type cellSet;
action invert;
}
{
name innerCylinderSmall;
type cellZoneSet;
action new;
source setToCellZone;
sourceInfo
{
set innerCylinderSmall;
}
}
{
name innerCylinderSmallFace;
type faceSet;
action new;
source cellToFace;
sourceInfo
{
set innerCylinderSmall;
option all;
}
}
{
name innerCylinderSmallFace;
type faceSet;
action subset;
source cellToFace;
sourceInfo
{
set outerCells;
option all;
}
}
{
name innerCylinderSmall;
type faceZoneSet;
action new;
source setsToFaceZone;
sourceInfo
{
faceSet innerCylinderSmallFace;
cellSet innerCylinderSmall;
}
}
// Dummy faceSet for creating initial patches
{
name dummyFaces;
type faceSet;
action new;
source labelToFace;
sourceInfo
{
value ();
}
}
);
// ************************************************************************* //

View File

@ -1,58 +0,0 @@
/*--------------------------------*- 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 dictionary;
object createBafflesDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Whether to convert internal faces only (so leave boundary faces intact).
// This is only relevant if your face selection type can pick up boundary
// faces.
internalFacesOnly true;
// Baffles to create.
baffles
{
baffleFaces
{
//- Use predefined faceZone to select faces and orientation.
type faceZone;
zoneName innerCylinderSmall;
patches
{
master
{
//- Master side patch
name AMI1;
type cyclicAMI;
matchTolerance 0.0001;
neighbourPatch AMI2;
transform noOrdering;
}
slave
{
//- Slave side patch
name AMI2;
type cyclicAMI;
matchTolerance 0.0001;
neighbourPatch AMI1;
transform noOrdering;
}
}
}
}
// ************************************************************************* //

View File

@ -24,7 +24,7 @@ actions
source patchToFace;
sourceInfo
{
name outerCylinder;
name innerCylinder;
}
}

View File

@ -23,27 +23,50 @@ pointSync false;
patches
(
{
name inlet;
//- Master side patch
name AMI1;
patchInfo
{
type cyclicAMI;
matchTolerance 0.0001;
neighbourPatch AMI2;
transform noOrdering;
}
constructFrom patches;
patches (innerCylinderSmall);
}
{
//- Slave side patch
name AMI2;
patchInfo
{
type cyclicAMI;
matchTolerance 0.0001;
neighbourPatch AMI1;
transform noOrdering;
}
constructFrom patches;
patches (innerCylinderSmall_slave);
}
{
name inlet;
patchInfo
{
type patch;
}
constructFrom set;
set inletFaces;
}
{
name outlet;
patchInfo
{
type patch;
}
constructFrom set;
set outletFaces;
}
);

View File

@ -1,32 +0,0 @@
/*--------------------------------*- 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 dictionary;
object topoSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
actions
(
{
name innerCylinder;
type cellZoneSet;
action remove;
}
{
name innerCylinderSmall;
type cellZoneSet;
action remove;
}
);
// ************************************************************************* //

View File

@ -201,16 +201,11 @@ castellatedMeshControls
refinementSurfaces
{
innerCylinder
{
level (2 3);
cellZone innerCylinder;
faceZone innerCylinder;
cellZoneInside inside;
}
innerCylinderSmall
{
level (4 4);
faceType boundary;
cellZone innerCylinderSmall;
faceZone innerCylinderSmall;
cellZoneInside inside;
@ -266,11 +261,6 @@ castellatedMeshControls
mode inside;
levels ((1E15 4));
}
outerCylinder
{
mode inside;
levels ((1E15 0));
}
}
@ -288,7 +278,7 @@ castellatedMeshControls
// Whether any faceZones (as specified in the refinementSurfaces)
// are only on the boundary of corresponding cellZones or also allow
// free-standing zone faces. Not used if there are no faceZones.
allowFreeStandingZoneFaces true;
allowFreeStandingZoneFaces false;
}
@ -312,10 +302,22 @@ snapControls
// before upon reaching a correct mesh.
nRelaxIter 5;
//- Highly experimental and wip: number of feature edge snapping
// iterations. Leave out altogether to disable.
// Do not use here since mesh resolution too low and baffles present
nFeatureSnapIter 20;
// Feature snapping
// Number of feature edge snapping iterations.
// Leave out altogether to disable.
nFeatureSnapIter 10;
// Detect (geometric only) features by sampling the surface
// (default=false).
implicitFeatureSnap true;
// Use castellatedMeshControls::features (default = true)
explicitFeatureSnap false;
// Detect features between multiple surfaces
// (only for explicitFeatureSnap, default = false)
multiRegionFeatureSnap true;
}
@ -466,15 +468,6 @@ meshQualityControls
}
// Advanced
// Flags for optional output
// 0 : only write final meshes
// 1 : write intermediate meshes
// 2 : write volScalarField with cellLevel for postprocessing
// 4 : write current intersections as .obj files
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.

View File

@ -14,10 +14,10 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
innerCylinder.obj
{
#include "surfaceFeatureExtractDictDefaults"
}
//innerCylinder.obj
//{
// #include "surfaceFeatureExtractDictDefaults"
//}
innerCylinderSmall.obj

View File

@ -35,10 +35,10 @@ solvers
nPreSweeps 0;
nPostSweeps 2;
nFinestSweeps 2;
cacheAgglomeration off;
cacheAgglomeration on;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 2;
mergeLevels 1;
}
tolerance 1e-05;
relTol 0;

View File

@ -35,10 +35,10 @@ solvers
nPreSweeps 0;
nPostSweeps 2;
nFinestSweeps 2;
cacheAgglomeration off;
cacheAgglomeration on;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 2;
mergeLevels 1;
}
tolerance 1e-05;
relTol 0;