exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BUGFIX: Merge errors

Browse source
This commit is contained in:
Henrik Rusche 2016-05-25 14:46:38 +02:00
parent d56de58fbb
commit 591c495f63
8 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tutorials/basic/PODSolver/1DPODdiffusion/system/fvSolution
View file

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
T
solvers
{
solver PBiCG;
preconditioner DILU;

2
tutorials/basic/PODSolver/1DPODsin/system/fvSolution
View file

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
T
solvers
{
solver PBiCG;
preconditioner DILU;

2
tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
View file

@ -111,7 +111,7 @@ PIMPLE
relaxationFactors
{
U 1;
"U.*" 1;
h 1;
k 1;
epsilon 1;

14
tutorials/immersedBoundary/pitchingPlate/system/fvSolution
View file

@ -39,14 +39,6 @@ solvers
}
}
SIMPLE
{
nNonOrthogonalCorrectors 5;
pRefPoint (0 -0.45 0.05);
pRefValue 0;
}
PIMPLE
{
nOuterCorrectors 2;
@ -57,4 +49,10 @@ PIMPLE
pRefValue 0;
}
relaxationFactors
{
"U.*" 1;
}
// ************************************************************************* //

6
tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSolution
View file

@ -32,6 +32,12 @@ solvers
relTol 0.1;
}
UFinal
{
$U;
relTol 0;
}
"(k|epsilon)"
{
solver PBiCG;

2
tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
View file

@ -30,7 +30,7 @@ divSchemes
{
default none;
div(phi,U) Gauss linear grad(U);
div((nuEff*dev(grad(U).T()))) Gauss linear;
div((nuEff*dev(T(grad(U))))) Gauss linear;
}
laplacianSchemes

10
tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
View file

@ -35,9 +35,7 @@ solvers
pFinal
{
solver PCG;
preconditioner DIC;
tolerance 1e-06;
$p;
relTol 0;
}
@ -49,6 +47,12 @@ solvers
relTol 0;
}
UFinal
{
$U;
relTol 0;
}
cellMotionUx
{
solver PCG;

22
tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution
View file

@ -28,6 +28,7 @@ solvers
}
p
{
$p;
solver CG;
preconditioner DIC;
@ -38,12 +39,7 @@ solvers
}
pFinal
{
solver CG;
preconditioner DIC;
minIter 0;
maxIter 1000;
tolerance 1e-06;
$p;
relTol 0;
}
U
@ -56,6 +52,12 @@ solvers
tolerance 1e-07;
relTol 0;
}
UFinal
{
$U;
relTol 0;
}
}
PIMPLE
@ -69,14 +71,6 @@ PIMPLE
pRefValue 0;
}
SIMPLE
{
nNonOrthogonalCorrectors 4;
pRefCell 0;
pRefValue 0;
}
relaxationFactors
{
U 0.7;