diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
index 8f1ebc754d377bb2169c3f1ff00713c7173eb4e4..d98d75d076dc44f7b27042c5df570242b9cfad4e 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
@@ -45,38 +45,44 @@ char Foam::ISstream::nextValid()
// Return if stream is bad - ie, previous get() failed
if (bad() || isspace(c))
{
- return 0;
+ break;
}
// Is this the start of a C/C++ comment?
if (c == '/')
{
- // If cannot get another character, return this one
if (!get(c))
{
+ // cannot get another character - return this one
return '/';
}
if (c == '/')
{
- // This is the start of a C++ style one-line comment
+ // C++ style single-line comment - skip through past end-of-line
while (get(c) && c != '\n')
{}
}
else if (c == '*')
{
- // This is the start of a C style comment
+ // within a C-style comment
while (true)
{
+ // search for end of C-style comment - '*/'
if (get(c) && c == '*')
{
- if (get(c) && c == '/')
+ if (get(c))
{
- break;
- }
- else
- {
- putback(c);
+ if (c == '/')
+ {
+ // matched '*/'
+ break;
+ }
+ else if (c == '*')
+ {
+ // check again
+ putback(c);
+ }
}
}
@@ -86,17 +92,21 @@ char Foam::ISstream::nextValid()
}
}
}
- else // A lone '/' so return it.
+ else
{
+ // The '/' did not start a C/C++ comment - return it
putback(c);
return '/';
}
}
- else // c is a valid character so return it
+ else
{
+ // a valid character - return it
return c;
}
}
+
+ return 0;
}
@@ -277,8 +287,8 @@ Foam::Istream& Foam::ISstream::read(token& t)
// }
}
- // nothing converted (bad format), or trailing junk
- if (endptr == buf || *endptr != '\0')
+ // not everything converted: bad format or trailing junk
+ if (*endptr)
{
t.setBad();
}
@@ -289,7 +299,7 @@ Foam::Istream& Foam::ISstream::read(token& t)
}
- // Should be a word (which can be a single character)
+ // Should be a word (which can also be a single character)
default:
{
putback(c);
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 73a753157ea54880b08bcd30c2aef3c00dfe1920..845b852e95ba12effcba34cdfe05410831623e0d 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -117,6 +117,10 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
// get rootPath_ / globalCase_ from one of the following forms
// * [-case dir]
// * cwd
+//
+// Also export FOAM_CASE and FOAM_CASENAME environment variables
+// so they can be used immediately (eg, in decomposeParDict)
+//
void Foam::argList::getRootCase()
{
fileName casePath;
@@ -151,6 +155,26 @@ void Foam::argList::getRootCase()
rootPath_ = casePath.path();
globalCase_ = casePath.name();
case_ = globalCase_;
+
+
+ // Set the case and case-name as an environment variable
+ if (rootPath_[0] == '/')
+ {
+ // absolute path - use as-is
+ setEnv("FOAM_CASE", rootPath_/globalCase_, true);
+ setEnv("FOAM_CASENAME", globalCase_, true);
+ }
+ else
+ {
+ // qualify relative path
+ fileName casePath = cwd()/rootPath_/globalCase_;
+ casePath.clean();
+
+ setEnv("FOAM_CASE", casePath, true);
+ setEnv("FOAM_CASENAME", casePath.name(), true);
+ }
+
+
}
@@ -531,24 +555,6 @@ Foam::argList::argList
}
jobInfo.write();
-
- // Set the case and case-name as an environment variable
- if (rootPath_[0] == '/')
- {
- // absolute path - use as-is
- setEnv("FOAM_CASE", rootPath_/globalCase_, true);
- setEnv("FOAM_CASENAME", globalCase_, true);
- }
- else
- {
- // qualify relative path
- fileName casePath = cwd()/rootPath_/globalCase_;
- casePath.clean();
-
- setEnv("FOAM_CASE", casePath, true);
- setEnv("FOAM_CASENAME", casePath.name(), true);
- }
-
// Switch on signal trapping. We have to wait until after Pstream::init
// since this sets up its own ones.
sigFpe_.set(bannerEnabled);
diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
index 34e85c2e272eb3a48c93cace73178ba5fccc17b6..3251e2541eeeb5834d134dd62622477dc9c820fe 100644
--- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
+++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
@@ -81,7 +81,10 @@ Foam::porousZone::porousZone
{
Info<< "Creating porous zone: " << name_ << endl;
- if (cellZoneID_ == -1 && !Pstream::parRun())
+ bool foundZone = (cellZoneID_ != -1);
+ reduce(foundZone, orOp<bool>());
+
+ if (!foundZone && Pstream::master())
{
FatalErrorIn
(
@@ -91,6 +94,7 @@ Foam::porousZone::porousZone
<< exit(FatalError);
}
+
// porosity
if (dict_.readIfPresent("porosity", porosity_))
{
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
index a3c9fd1b50605ffb99b7943ee18b6245f9c0f714..b8c1f48ee4ab853fb65603df611d3ff7b4e5109e 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -98,16 +98,20 @@ tmp<volScalarField> kOmegaSSTSAS::Lvk2
const volScalarField& S2
) const
{
- return kappa_*sqrt(S2)
- /(
- mag(fvc::laplacian(U()))
- + dimensionedScalar
- (
- "ROOTVSMALL",
- dimensionSet(0, -1 , -1, 0, 0, 0, 0),
- ROOTVSMALL
- )
- );
+ return max
+ (
+ kappa_*sqrt(S2)
+ /(
+ mag(fvc::laplacian(U()))
+ + dimensionedScalar
+ (
+ "ROOTVSMALL",
+ dimensionSet(0, -1 , -1, 0, 0, 0, 0),
+ ROOTVSMALL
+ )
+ ),
+ Cs_*delta()
+ );
}
@@ -222,6 +226,15 @@ kOmegaSSTSAS::kOmegaSSTSAS
10.0
)
),
+ Cs_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "Cs",
+ coeffDict_,
+ 0.262
+ )
+ ),
alphaPhi_
(
dimensioned<scalar>::lookupOrAddToDict
@@ -441,6 +454,7 @@ bool kOmegaSSTSAS::read()
betaStar_.readIfPresent(coeffDict());
a1_.readIfPresent(coeffDict());
c1_.readIfPresent(coeffDict());
+ Cs_.readIfPresent(coeffDict());
alphaPhi_.readIfPresent(coeffDict());
zetaTilda2_.readIfPresent(coeffDict());
FSAS_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
index 05632f924259b7536c22277961971970cc27c114..89b9a8819021d01d4d360e7e3111dcd1db1ffbd8 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -28,8 +28,13 @@ Class
Description
kOmegaSSTSAS LES turbulence model for incompressible flows
- Note: does not have an explicit dependency on spatial discretisation
- i.e. LESdelta not used.
+ Reference:
+ DESider A European Effort on Hybrid RANS-LES Modelling:
+ Results of the European-Union Funded Project, 2004 - 2007
+ (Notes on Numerical Fluid Mechanics and Multidisciplinary Design).
+ Chapter 8 Formulation of the Scale-Adaptive Simulation (SAS) Model during
+ the DESIDER Project.
+ F. R. Menter and Y. Egorov.
SourceFiles
kOmegaSSTSAS.C
@@ -92,6 +97,7 @@ protected:
dimensionedScalar a1_;
dimensionedScalar c1_;
+ dimensionedScalar Cs_;
dimensionedScalar alphaPhi_;
dimensionedScalar zetaTilda2_;
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/U b/tutorials/multiphase/settlingFoam/ras/dahl/0/U
index 1559025ce3d01778fa5d9e464ad5e16040f758c2..a0a0043af1b42aafb9d3f5dccd99d9edcbf12f3c 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/U
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/U
@@ -20,35 +20,35 @@ internalField uniform (0.0191 0 0);
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform (0.0191 0 0);
}
- outlet
+ outlet
{
type zeroGradient;
}
- bottomWall
+ bottomWall
{
type fixedValue;
value uniform (0 0 0);
}
- endWall
+ endWall
{
type fixedValue;
value uniform (0 0 0);
}
- top
+ top
{
- type symmetryPlane;
+ type slip;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha b/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
index bf0cc9d2068176df375fb1389059dd57828a7e3d..ca6b9f8f7a0181e912ba0a0b4bc5c24a1af6a435 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
@@ -20,33 +20,33 @@ internalField uniform 0.001;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 0.001;
}
- outlet
+ outlet
{
type zeroGradient;
}
- bottomWall
+ bottomWall
{
type zeroGradient;
}
- endWall
+ endWall
{
type zeroGradient;
}
- top
+ top
{
- type symmetryPlane;
+ type zeroGradient;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon b/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
index 3e878bfecc40fd355def083876a2791a94f90a43..27b4ba3c1fee38db5552a5b98879866b91e704bd 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
@@ -20,33 +20,33 @@ internalField uniform 1.50919e-06;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 1.50919e-06;
}
- outlet
+ outlet
{
type zeroGradient;
}
- bottomWall
+ bottomWall
{
type zeroGradient;
}
- endWall
+ endWall
{
type zeroGradient;
}
- top
+ top
{
- type symmetryPlane;
+ type zeroGradient;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/k b/tutorials/multiphase/settlingFoam/ras/dahl/0/k
index 152c9e06dcd324f83064377594785a71e370a417..6bd1a6b4164ecbd395f3ec1b861933536b211248 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/k
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/k
@@ -20,33 +20,33 @@ internalField uniform 0.00015;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 0.00015;
}
- outlet
+ outlet
{
type zeroGradient;
}
- bottomWall
+ bottomWall
{
type zeroGradient;
}
- endWall
+ endWall
{
type zeroGradient;
}
- top
+ top
{
- type symmetryPlane;
+ type zeroGradient;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/p b/tutorials/multiphase/settlingFoam/ras/dahl/0/p
index 21283df64a6a1dc506822b72547348e0be8bf133..fa58407df2d464ea7f39995138d1616560260221 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/p
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/p
@@ -39,13 +39,13 @@ boundaryField
endWall
{
- type buoyantPressure;
- value uniform 0;
+ type zeroGradient;
}
top
{
- type symmetryPlane;
+ type buoyantPressure;
+ value uniform 0;
}
frontAndBack
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
index 27d4d324881b52b2a37d45b4cfbed46ed94d8051..8a9ae72772692e82face92679f1d12c10f201286 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
@@ -16,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -2 0 0 0 0];
-value ( 0 -9.81 0 );
+value (0 -9.81 0);
// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
index aca4ffd37c3fe5e674c607b8282a36928c8a426c..28b3bb25feafd4b3209bb37a2db1dfc8e73e9fd6 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
@@ -16,7 +16,7 @@ FoamFile
convertToMeters 1;
-vertices
+vertices
(
(0 0 -0.1)
(8.65 0 -0.1)
@@ -32,40 +32,40 @@ vertices
(0 1 0.1)
);
-blocks
+blocks
(
hex (0 1 2 3 6 7 8 9) (200 4 1) simpleGrading (1 1 1)
hex (3 2 4 5 9 8 10 11) (200 36 1) simpleGrading (1 1 1)
);
-edges
+edges
(
);
-patches
+patches
(
- patch inlet
+ patch inlet
(
(0 6 9 3)
(3 9 11 5)
)
- patch outlet
+ patch outlet
(
(1 2 8 7)
)
- patch bottomWall
+ patch bottomWall
(
(0 1 7 6)
)
- wall endWall
+ wall endWall
(
(2 4 10 8)
)
- symmetryPlane top
+ patch top
(
(5 11 10 4)
)
- empty frontAndBack
+ empty frontAndBack
(
(0 3 2 1)
(6 7 8 9)
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
index 15a60bdd6a7cb46ca98f57ac5f9e9f31adb2a309..03af5cc61a1de4597684a0db0b3f36286752b4b8 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: 1.6.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -43,7 +43,7 @@ FoamFile
}
top
{
- type symmetryPlane;
+ type patch;
nFaces 200;
startFace 16040;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
index 02a73ebf91b071469ea9e079364d1cdaed1c204f..ef409e071a4e9a67a9c895e574cebfc3b3bac40d 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
@@ -25,7 +25,7 @@ stopAt endTime;
endTime 6400;
-deltaT 0.2;
+deltaT 0.1;
writeControl runTime;
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
index 631ac4e0c57f653c5f8e8482d541e8e98fbef076..148cdcddc5c7ec956d8b96cf581f1b4743a3de8f 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- "(p|rho)"
+ p
{
solver PCG;
preconditioner DIC;
@@ -25,7 +25,39 @@ solvers
relTol 0;
}
- "(U|k|epsilon|Alpha)"
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ Alpha
{
solver PBiCG;
preconditioner DILU;
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/U b/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
index 709c50ae807737f9bc7d7b291cab08c0e8da0139..34520705ad68eaa7d211532d7f55e45c023cad50 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
@@ -20,120 +20,120 @@ internalField uniform (0 0 0);
boundaryField
{
- SYMP3
+ SYMP3
{
- type symmetryPlane;
+ type slip;
}
- INLE1
+ INLE1
{
type fixedValue;
value uniform (0.1315 0 0);
}
- OUTL9
+ OUTL9
{
type fixedValue;
value uniform (0 0.0177 0);
}
- OUTL10
+ OUTL10
{
type fixedValue;
value uniform (0 0.0177 0);
}
- OUTL11
+ OUTL11
{
type fixedValue;
value uniform (0 0.0177 0);
}
- OUTL12
+ OUTL12
{
type fixedValue;
value uniform (0 0.0177 0);
}
- WALL6
+ WALL6
{
type fixedValue;
value uniform (-0.003 0 0);
}
- WALL8
+ WALL8
{
type fixedValue;
value uniform (0 0 0);
}
- WALL61
+ WALL61
{
type fixedValue;
value uniform (0 0 0);
}
- WALL62
+ WALL62
{
type fixedValue;
value uniform (0 0 0);
}
- WALL63
+ WALL63
{
type fixedValue;
value uniform (0 0 0);
}
- WALL64
+ WALL64
{
type fixedValue;
value uniform (0 0 0);
}
- WALL65
+ WALL65
{
type fixedValue;
value uniform (0 0 0);
}
- WALL66
+ WALL66
{
type fixedValue;
value uniform (0 0 0);
}
- WALL67
+ WALL67
{
type fixedValue;
value uniform (0 0 0);
}
- WALL68
+ WALL68
{
type fixedValue;
value uniform (0 0 0);
}
- WALL69
+ WALL69
{
type fixedValue;
value uniform (0 0 0);
}
- WALL7
+ WALL7
{
type fixedValue;
value uniform (0 0 0);
}
- WALL70
+ WALL70
{
type fixedValue;
value uniform (0 0 0);
}
- OUTL15
+ OUTL15
{
type zeroGradient;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha b/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
index 1f11257066ea9c8cc89faed5201d74044eaf5899..18e136580a964dceebcfebe1bd472da6c9f29167 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
@@ -20,103 +20,103 @@ internalField uniform 0;
boundaryField
{
- SYMP3
+ SYMP3
{
- type symmetryPlane;
+ type zeroGradient;
}
- INLE1
+ INLE1
{
type fixedValue;
value uniform 0.002;
}
- OUTL9
+ OUTL9
{
type zeroGradient;
}
- OUTL10
+ OUTL10
{
type zeroGradient;
}
- OUTL11
+ OUTL11
{
type zeroGradient;
}
- OUTL12
+ OUTL12
{
type zeroGradient;
}
- WALL6
+ WALL6
{
type zeroGradient;
}
- WALL8
+ WALL8
{
type zeroGradient;
}
- WALL61
+ WALL61
{
type zeroGradient;
}
- WALL62
+ WALL62
{
type zeroGradient;
}
- WALL63
+ WALL63
{
type zeroGradient;
}
- WALL64
+ WALL64
{
type zeroGradient;
}
- WALL65
+ WALL65
{
type zeroGradient;
}
- WALL66
+ WALL66
{
type zeroGradient;
}
- WALL67
+ WALL67
{
type zeroGradient;
}
- WALL68
+ WALL68
{
type zeroGradient;
}
- WALL69
+ WALL69
{
type zeroGradient;
}
- WALL7
+ WALL7
{
type zeroGradient;
}
- WALL70
+ WALL70
{
type zeroGradient;
}
- OUTL15
+ OUTL15
{
type zeroGradient;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon b/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
index e1f67f23ebf7027db040a371cdf561cc96403002..634512f95121d036d093ba8d760b5f2f10b80dd5 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
@@ -20,103 +20,103 @@ internalField uniform 1.973e-07;
boundaryField
{
- SYMP3
+ SYMP3
{
- type symmetryPlane;
+ type zeroGradient;
}
- INLE1
+ INLE1
{
type fixedValue;
value uniform 1.973e-07;
}
- OUTL9
+ OUTL9
{
type zeroGradient;
}
- OUTL10
+ OUTL10
{
type zeroGradient;
}
- OUTL11
+ OUTL11
{
type zeroGradient;
}
- OUTL12
+ OUTL12
{
type zeroGradient;
}
- WALL6
+ WALL6
{
type zeroGradient;
}
- WALL8
+ WALL8
{
type zeroGradient;
}
- WALL61
+ WALL61
{
type zeroGradient;
}
- WALL62
+ WALL62
{
type zeroGradient;
}
- WALL63
+ WALL63
{
type zeroGradient;
}
- WALL64
+ WALL64
{
type zeroGradient;
}
- WALL65
+ WALL65
{
type zeroGradient;
}
- WALL66
+ WALL66
{
type zeroGradient;
}
- WALL67
+ WALL67
{
type zeroGradient;
}
- WALL68
+ WALL68
{
type zeroGradient;
}
- WALL69
+ WALL69
{
type zeroGradient;
}
- WALL7
+ WALL7
{
type zeroGradient;
}
- WALL70
+ WALL70
{
type zeroGradient;
}
- OUTL15
+ OUTL15
{
type zeroGradient;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/k b/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
index b3899fb1d7b08f96c7a7eb326ed0e0d5fd670967..5bc3ea2d5113c3a8905e20e0ba0716313fd42caa 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
@@ -20,103 +20,103 @@ internalField uniform 0.000259;
boundaryField
{
- SYMP3
+ SYMP3
{
- type symmetryPlane;
+ type zeroGradient;
}
- INLE1
+ INLE1
{
type fixedValue;
value uniform 0.000259;
}
- OUTL9
+ OUTL9
{
type zeroGradient;
}
- OUTL10
+ OUTL10
{
type zeroGradient;
}
- OUTL11
+ OUTL11
{
type zeroGradient;
}
- OUTL12
+ OUTL12
{
type zeroGradient;
}
- WALL6
+ WALL6
{
type zeroGradient;
}
- WALL8
+ WALL8
{
type zeroGradient;
}
- WALL61
+ WALL61
{
type zeroGradient;
}
- WALL62
+ WALL62
{
type zeroGradient;
}
- WALL63
+ WALL63
{
type zeroGradient;
}
- WALL64
+ WALL64
{
type zeroGradient;
}
- WALL65
+ WALL65
{
type zeroGradient;
}
- WALL66
+ WALL66
{
type zeroGradient;
}
- WALL67
+ WALL67
{
type zeroGradient;
}
- WALL68
+ WALL68
{
type zeroGradient;
}
- WALL69
+ WALL69
{
type zeroGradient;
}
- WALL7
+ WALL7
{
type zeroGradient;
}
- WALL70
+ WALL70
{
type zeroGradient;
}
- OUTL15
+ OUTL15
{
type zeroGradient;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
index b73d22a8233fc0eea9ace1c7a22cfd1d6c78bb00..0a6116408579f824f142ff327bb042244d19b084 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
@@ -22,7 +22,8 @@ boundaryField
{
SYMP3
{
- type symmetryPlane;
+ type buoyantPressure;
+ value uniform 0;
}
INLE1
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
deleted file mode 100755
index 231be442622d847cae8c39a1d8d6d7c849ed59ee..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-application=`getApplication`
-
-#runApplication blockMesh
-runApplication $application
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
index 40f8d8e84b5bd9e63d92c82855c7dfb9b6503124..5d48248b2e6256ca95f170cfbc3b177570cb0ef9 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
@@ -17,7 +17,7 @@ FoamFile
(
SYMP3
{
- type symmetryPlane;
+ type patch;
startFace 53708;
nFaces 3191;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
index 631ac4e0c57f653c5f8e8482d541e8e98fbef076..148cdcddc5c7ec956d8b96cf581f1b4743a3de8f 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- "(p|rho)"
+ p
{
solver PCG;
preconditioner DIC;
@@ -25,7 +25,39 @@ solvers
relTol 0;
}
- "(U|k|epsilon|Alpha)"
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ Alpha
{
solver PBiCG;
preconditioner DILU;