diff --git a/applications/utilities/preProcessing/createZeroFolder/boundaryTemplates.C b/applications/utilities/preProcessing/createZeroFolder/boundaryTemplates.C
index 1c894d02a656593a9b4177925b59cbfee2db3a0c..25cf2c4437491d6f69b46a4ffe62a5f7f46559b7 100644
--- a/applications/utilities/preProcessing/createZeroFolder/boundaryTemplates.C
+++ b/applications/utilities/preProcessing/createZeroFolder/boundaryTemplates.C
@@ -100,16 +100,22 @@ Foam::boundaryTemplates::boundaryTemplates
// read general boundary options
forAll(patchTypes, i)
{
- IOobject io
- (
- fileName(BCDir/regionType/patchTypes[i] + "Options"),
- runTime,
- IOobject::MUST_READ
- );
+ fileName optFile(BCDir/regionType/patchTypes[i] + "Options");
- if (io.headerOk())
+ IFstream is(optFile);
+
+ if (is.good())
{
- IOdictionary dict(io);
+ IOdictionary dict
+ (
+ IOobject
+ (
+ optFile,
+ runTime,
+ IOobject::MUST_READ
+ )
+ );
+
regionOptions.add(patchTypes[i], dictionary(dict));
}
}
@@ -117,16 +123,27 @@ Foam::boundaryTemplates::boundaryTemplates
// add solver type boundary options
forAll(patchTypes, i)
{
- IOobject io
+ // options are optional - however, if file exists, assume that it
+ // is to be read
+ fileName optFile
(
- fileName(BCDir/regionType/solverType/patchTypes[i] + "Options"),
- runTime,
- IOobject::MUST_READ
+ BCDir/regionType/solverType/patchTypes[i] + "Options"
);
- if (io.headerOk())
+ IFstream is(optFile);
+
+ if (is.good())
{
- IOdictionary dict(io);
+ IOdictionary dict
+ (
+ IOobject
+ (
+ optFile,
+ runTime,
+ IOobject::MUST_READ
+ )
+ );
+
regionOptions.subDict(patchTypes[i]).merge(dict);
}
}
diff --git a/etc/templates/boundaryConditions/boundaries b/etc/templates/boundaryConditions/boundaries
index 3ae64b17676eae6a7d5cab4a3b62b9c57bc90ce1..3ea816776d17ae5762968396bdaa1060bdb6fa13 100644
--- a/etc/templates/boundaryConditions/boundaries
+++ b/etc/templates/boundaryConditions/boundaries
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/buoyant/inlet b/etc/templates/boundaryConditions/fluid/buoyant/inlet
index e66a7700df06981e8a05328e29fd72f900411bbd..b1a3bca3e785a7b9b73b131e3311622bd151aa2d 100644
--- a/etc/templates/boundaryConditions/fluid/buoyant/inlet
+++ b/etc/templates/boundaryConditions/fluid/buoyant/inlet
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -17,16 +17,6 @@ FoamFile
subSonic
{
- p
- {
- type calculated;
- value ${:VALUE.p};
- }
- p_rgh
- {
- type fixedFluxPressure;
- value ${:VALUE.p_rgh};
- }
T
{
type fixedValue;
@@ -34,12 +24,12 @@ subSonic
}
mut
{
- type fixedValue;
+ type calculated;
value ${:VALUE.mut};
}
alphat
{
- type fixedValue;
+ type calculated;
value ${:VALUE.alphat};
}
}
diff --git a/etc/templates/boundaryConditions/fluid/buoyant/inletOptions b/etc/templates/boundaryConditions/fluid/buoyant/inletOptions
index 1256b51f26f4174d1ab38729e5069603eb8f57fb..8253283a6e2d8f91d7e2be4e5609f0ad1d8ba4fc 100644
--- a/etc/templates/boundaryConditions/fluid/buoyant/inletOptions
+++ b/etc/templates/boundaryConditions/fluid/buoyant/inletOptions
@@ -1,7 +1,7 @@
-l/*--------------------------------*- C++ -*----------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "templates";
- object inlet;
+ object inletOptions;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,7 +49,8 @@ flowSpecification
}
p_rgh
{
- type zeroGradient;
+ type fixedFluxPressure;
+ value ${:VALUE.p_rgh};
}
}
flowRate
diff --git a/etc/templates/boundaryConditions/fluid/buoyant/outlet b/etc/templates/boundaryConditions/fluid/buoyant/outlet
index 1ca83b47355c349cb34d64ef1ae2fe3a2349bd11..8628dd59f60e8568e8ba82c3c9fe62edc427c48e 100644
--- a/etc/templates/boundaryConditions/fluid/buoyant/outlet
+++ b/etc/templates/boundaryConditions/fluid/buoyant/outlet
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/buoyant/outletOptions b/etc/templates/boundaryConditions/fluid/buoyant/outletOptions
index 268e50efd746be2bc3093f4584730c8da09a0028..d2a2274991f2eb3d36e5e38498fccb9baf1dd073 100644
--- a/etc/templates/boundaryConditions/fluid/buoyant/outletOptions
+++ b/etc/templates/boundaryConditions/fluid/buoyant/outletOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -19,6 +19,11 @@ returnFlow
{
default
{
+ p
+ {
+ type calculated;
+ value ${:VALUE.p};
+ }
p_rgh
{
type fixedValue;
@@ -27,6 +32,11 @@ returnFlow
}
wall
{
+ p
+ {
+ type calculated;
+ value ${:VALUE.p};
+ }
p_rgh
{
type fixedValue;
@@ -35,6 +45,11 @@ returnFlow
}
atmosphere
{
+ p
+ {
+ type calculated;
+ value ${:VALUE.p};
+ }
p_rgh
{
type totalPressure;
@@ -43,8 +58,8 @@ returnFlow
rho rho;
psi none;
gamma 1;
- p0 ${:outlet.p_rgh};
- value ${:outlet.p_rgh};
+ p0 ${:VALUE.p_rgh};
+ value ${:VALUE.p_rgh};
}
}
}
diff --git a/etc/templates/boundaryConditions/fluid/buoyant/wall b/etc/templates/boundaryConditions/fluid/buoyant/wall
index 5e51fbdc20b7124df50214316e447f42d27b9b23..cad9f5fa1babd45d948d4b4fe9010960baa80e7f 100644
--- a/etc/templates/boundaryConditions/fluid/buoyant/wall
+++ b/etc/templates/boundaryConditions/fluid/buoyant/wall
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/buoyant/wallOptions b/etc/templates/boundaryConditions/fluid/buoyant/wallOptions
index 40423888e2a127140faa3ebd195f5347a1ea76b6..860fc2b10a06baab3b8d1fcc6b1291faa3311cf4 100644
--- a/etc/templates/boundaryConditions/fluid/buoyant/wallOptions
+++ b/etc/templates/boundaryConditions/fluid/buoyant/wallOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/compressible/inlet b/etc/templates/boundaryConditions/fluid/compressible/inlet
index e6c69f33d461a3fe6ec00b40c6edce709d386e8b..b1a3bca3e785a7b9b73b131e3311622bd151aa2d 100644
--- a/etc/templates/boundaryConditions/fluid/compressible/inlet
+++ b/etc/templates/boundaryConditions/fluid/compressible/inlet
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -24,12 +24,12 @@ subSonic
}
mut
{
- type fixedValue;
+ type calculated;
value ${:VALUE.mut};
}
alphat
{
- type fixedValue;
+ type calculated;
value ${:VALUE.alphat};
}
}
diff --git a/etc/templates/boundaryConditions/fluid/compressible/inletOptions b/etc/templates/boundaryConditions/fluid/compressible/inletOptions
index 218eec65ad44d43d10fb56a0704556d9c5787b37..dbf35fbbf75cedd3651aaa0daffd26da587875f1 100644
--- a/etc/templates/boundaryConditions/fluid/compressible/inletOptions
+++ b/etc/templates/boundaryConditions/fluid/compressible/inletOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/compressible/outlet b/etc/templates/boundaryConditions/fluid/compressible/outlet
index d5846132bd4f3e4fddb61e5169af70950416c007..573c2c097db264a810bf41bcee6b1f9b66873990 100644
--- a/etc/templates/boundaryConditions/fluid/compressible/outlet
+++ b/etc/templates/boundaryConditions/fluid/compressible/outlet
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/compressible/outletOptions b/etc/templates/boundaryConditions/fluid/compressible/outletOptions
index 569da985aa6d64bdb73e54f84b19c509969461b4..99c89390f88b36dee5518439a068c0f406313335 100644
--- a/etc/templates/boundaryConditions/fluid/compressible/outletOptions
+++ b/etc/templates/boundaryConditions/fluid/compressible/outletOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/compressible/wall b/etc/templates/boundaryConditions/fluid/compressible/wall
index aecd3329030b7482a53b4405cb03c8ac3b690ea7..e4030bd48421dea1cacdc7d6dc8853d107f4cecd 100644
--- a/etc/templates/boundaryConditions/fluid/compressible/wall
+++ b/etc/templates/boundaryConditions/fluid/compressible/wall
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/compressible/wallOptions b/etc/templates/boundaryConditions/fluid/compressible/wallOptions
index 40423888e2a127140faa3ebd195f5347a1ea76b6..860fc2b10a06baab3b8d1fcc6b1291faa3311cf4 100644
--- a/etc/templates/boundaryConditions/fluid/compressible/wallOptions
+++ b/etc/templates/boundaryConditions/fluid/compressible/wallOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/incompressible/inlet b/etc/templates/boundaryConditions/fluid/incompressible/inlet
index e5b4828b1cd70f33829902e20bc0522a715a9d8c..572a119801c9cd0f9d242fda72fc02e2871c75c1 100644
--- a/etc/templates/boundaryConditions/fluid/incompressible/inlet
+++ b/etc/templates/boundaryConditions/fluid/incompressible/inlet
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -19,7 +19,7 @@ subSonic
{
nut
{
- type fixedValue;
+ type calculated;
value ${:VALUE.nut};
}
}
diff --git a/etc/templates/boundaryConditions/fluid/incompressible/inletOptions b/etc/templates/boundaryConditions/fluid/incompressible/inletOptions
index 9299b12d03dde7cc3d80e50068269e1e89fa5f6b..fba9b640465da26caea9a10f86d8dcc9682563e3 100644
--- a/etc/templates/boundaryConditions/fluid/incompressible/inletOptions
+++ b/etc/templates/boundaryConditions/fluid/incompressible/inletOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/incompressible/outlet b/etc/templates/boundaryConditions/fluid/incompressible/outlet
index cb2f67dab861be816950e2734c367050ebbea02e..985205858351571889b38268f4f759718a9601f3 100644
--- a/etc/templates/boundaryConditions/fluid/incompressible/outlet
+++ b/etc/templates/boundaryConditions/fluid/incompressible/outlet
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/incompressible/wall b/etc/templates/boundaryConditions/fluid/incompressible/wall
index 1a0377ef3842dc51852b76418835963038426d19..a94c65523a57596b3274d81a9102ecfe4d48a064 100644
--- a/etc/templates/boundaryConditions/fluid/incompressible/wall
+++ b/etc/templates/boundaryConditions/fluid/incompressible/wall
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/incompressible/wallOptions b/etc/templates/boundaryConditions/fluid/incompressible/wallOptions
index ffafd12b7e63c48cc987f9a80f1bb0aadb28a958..682da5960e87d7d7029fbf18087b64e33a6f06e5 100644
--- a/etc/templates/boundaryConditions/fluid/incompressible/wallOptions
+++ b/etc/templates/boundaryConditions/fluid/incompressible/wallOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/inlet b/etc/templates/boundaryConditions/fluid/inlet
index 8dae7541f58f178dfb5ed54cb0bb3d7a1bd9bac3..057882de7fa39ba93b152b00166e7f245bf7da3d 100644
--- a/etc/templates/boundaryConditions/fluid/inlet
+++ b/etc/templates/boundaryConditions/fluid/inlet
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/inletOptions b/etc/templates/boundaryConditions/fluid/inletOptions
index e0568cf66786d5b4ec11f0b1e027ee2b45b61727..89e0794d8c32ad4ff59f3cb7a67d732d54655c45 100644
--- a/etc/templates/boundaryConditions/fluid/inletOptions
+++ b/etc/templates/boundaryConditions/fluid/inletOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/outlet b/etc/templates/boundaryConditions/fluid/outlet
index 4027a99702f03b043f47c635c2f1ff027f9e692f..b2c3befeabe96063e80feb524d467f87d334fced 100644
--- a/etc/templates/boundaryConditions/fluid/outlet
+++ b/etc/templates/boundaryConditions/fluid/outlet
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/outletOptions b/etc/templates/boundaryConditions/fluid/outletOptions
index 075b0e8bca0e8a6ea1220a0ce1029c81dd2ece6a..8f81d719d0430774395e522242034d4b79ca5681 100644
--- a/etc/templates/boundaryConditions/fluid/outletOptions
+++ b/etc/templates/boundaryConditions/fluid/outletOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "templates";
- object outlet;
+ object outletOptions;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/etc/templates/boundaryConditions/fluid/wall b/etc/templates/boundaryConditions/fluid/wall
index f20bcb8abfac2d8b930bf6e10de5ee4d50c4fa14..0ceeb4eaddde7d3d7041de4fe6ee032c36532f29 100644
--- a/etc/templates/boundaryConditions/fluid/wall
+++ b/etc/templates/boundaryConditions/fluid/wall
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/fluid/wallOptions b/etc/templates/boundaryConditions/fluid/wallOptions
index a1f68a5bba29554d3c46131e4c65f3e2a78d0fc1..2e1df029990b1b09007e0e2c65fa9f60fd7fc695 100644
--- a/etc/templates/boundaryConditions/fluid/wallOptions
+++ b/etc/templates/boundaryConditions/fluid/wallOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/boundaryConditions/solid/wall b/etc/templates/boundaryConditions/solid/wall
index 29ae7ff665941e9525c38f71f5a697e2c4bce2aa..0e8eb5cea8756271e3ed201456221f3c0edba72f 100644
--- a/etc/templates/boundaryConditions/solid/wall
+++ b/etc/templates/boundaryConditions/solid/wall
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -20,7 +20,7 @@ thermal
p
{
type calculated;
- value ${:VALUE.T};
+ value ${:VALUE.p};
}
OPTIONS (heatTransfer);
diff --git a/etc/templates/boundaryConditions/solid/wallOptions b/etc/templates/boundaryConditions/solid/wallOptions
index f2c015cdabe7c13f7298ff08fa19b49db0f70a2f..c8ccccc66e247461111937fbf3b77c61dc6bb621 100644
--- a/etc/templates/boundaryConditions/solid/wallOptions
+++ b/etc/templates/boundaryConditions/solid/wallOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,37 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-wallFunction
-{
- highReynolds
- {
- mut
- {
- type compressible::mutkWallFunction;
- value ${:VALUE.nut};
- }
- alphat
- {
- type compressible::alphatWallFunction;
- value ${:VALUE.alphat};
- }
- }
- lowReynolds
- {
- mut
- {
- type fixedValue;
- value uniform 0;
- }
- alphat
- {
- type fixedValue;
- value uniform 0;
- }
- }
-}
-
-
heatTransfer
{
adiabatic
diff --git a/etc/templates/models/turbulence/kEpsilon b/etc/templates/models/turbulence/kEpsilon
index 8365d855e2069e602614f9ea3bc7a40faea1bb0a..e5c0fdb6257df22d93e0a8135b459bf78d519e56 100644
--- a/etc/templates/models/turbulence/kEpsilon
+++ b/etc/templates/models/turbulence/kEpsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/models/turbulence/kOmega b/etc/templates/models/turbulence/kOmega
index 97af79cd0bb50a913ceaca0f3dc07c68f684658d..5bf9aaaafbdc9f2685300da8243e6afd5d0ba25b 100644
--- a/etc/templates/models/turbulence/kOmega
+++ b/etc/templates/models/turbulence/kOmega
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/models/turbulence/kOmegaSST b/etc/templates/models/turbulence/kOmegaSST
index 97af79cd0bb50a913ceaca0f3dc07c68f684658d..5bf9aaaafbdc9f2685300da8243e6afd5d0ba25b 100644
--- a/etc/templates/models/turbulence/kOmegaSST
+++ b/etc/templates/models/turbulence/kOmegaSST
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/models/turbulence/laminar b/etc/templates/models/turbulence/laminar
index 012d41f87d1025914609c617f9824b2f2ea01296..a9afb33e8c0ed33b65752a42b17ced78d4765f64 100644
--- a/etc/templates/models/turbulence/laminar
+++ b/etc/templates/models/turbulence/laminar
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/solvers/chtMultiRegionFoam b/etc/templates/solvers/chtMultiRegionFoam
index 392246b1b36dc5627122da585b644b48106458d0..7e509ff9418bfb3ff5c132ee1c2d09b4a5f50d99 100644
--- a/etc/templates/solvers/chtMultiRegionFoam
+++ b/etc/templates/solvers/chtMultiRegionFoam
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,11 +26,6 @@ fluidModels
fluidFields
{
- alphat
- {
- type scalar;
- dimensions [1 -1 -1 0 0];
- }
U
{
type vector;
diff --git a/etc/templates/solvers/icoFoam b/etc/templates/solvers/icoFoam
index 0d0ade999bf55e62d1d996b8ec8662a07e0a6af4..7af8b4558d21af90bc7ed28ab535da53ae0803e2 100644
--- a/etc/templates/solvers/icoFoam
+++ b/etc/templates/solvers/icoFoam
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/solvers/pimpleFoam b/etc/templates/solvers/pimpleFoam
index 61abf0e14b84f6b7dea5fc8b41c3a62d9ff44af2..10253a3b7327758f20fe9cc331a23605e9f9d91c 100644
--- a/etc/templates/solvers/pimpleFoam
+++ b/etc/templates/solvers/pimpleFoam
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/solvers/pisoFoam b/etc/templates/solvers/pisoFoam
index 8cdb267f95438ceccf1c33017ce76f6cbed2cd29..5785197c61e8b0aa15d6d1284098fcbfb4914379 100644
--- a/etc/templates/solvers/pisoFoam
+++ b/etc/templates/solvers/pisoFoam
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/solvers/rhoPimpleDyMFoam b/etc/templates/solvers/rhoPimpleDyMFoam
index 5714246ee4694604b9dda1cd3a744bcfac3a615d..6b73013d5a704a7e018f7bdd18ace6207d76d7c5 100644
--- a/etc/templates/solvers/rhoPimpleDyMFoam
+++ b/etc/templates/solvers/rhoPimpleDyMFoam
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/solvers/rhoPimpleFoam b/etc/templates/solvers/rhoPimpleFoam
index 016f399c268390b77e6504a2f70ccc0a679a68aa..2d9d17a142cf975ed364e67d75c7f27c57d03296 100644
--- a/etc/templates/solvers/rhoPimpleFoam
+++ b/etc/templates/solvers/rhoPimpleFoam
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/templates/solvers/simpleFoam b/etc/templates/solvers/simpleFoam
index 3eadf0caf6bda06015ae91ad639791bc6aaabbee..b87bb823b04f69cbd0884101e93a5f02281c2050 100644
--- a/etc/templates/solvers/simpleFoam
+++ b/etc/templates/solvers/simpleFoam
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.0 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
index f75a11b10ca8598d64bb46490cfce5011661a820..be9c35449c077f7313f807b84432e32fc3c28950 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
@@ -51,7 +51,7 @@ solvers
{
solver GAMG;
tolerance 0;
- relTol 0.1;
+ relTol 0.05;
smoother DICGaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
@@ -86,11 +86,17 @@ solvers
}
}
+potentialFlow
+{
+ // used for potentialFoam initialisation
+ nNonOrthogonalCorrectors 5;
+}
+
PIMPLE
{
transonic no;
nOuterCorrectors 1;
- nCorrectors 2;
+ nCorrectors 3;
nNonOrthogonalCorrectors 0;
momentumPredictor yes;
}
@@ -102,7 +108,7 @@ relaxationFactors
}
equations
{
- ".*Final" 1;
+ ".*" 1;
}
}