From 863a804cfdc43d93304e6b7049ad0e9d2bb21a87 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 30 Jan 2014 10:15:38 +0000
Subject: [PATCH] ENH: createZero folder utility and template updates
---
.../createZeroFolder/boundaryTemplates.C | 45 +++++++++++++------
etc/templates/boundaryConditions/boundaries | 2 +-
.../boundaryConditions/fluid/buoyant/inlet | 16 ++-----
.../fluid/buoyant/inletOptions | 9 ++--
.../boundaryConditions/fluid/buoyant/outlet | 2 +-
.../fluid/buoyant/outletOptions | 21 +++++++--
.../boundaryConditions/fluid/buoyant/wall | 2 +-
.../fluid/buoyant/wallOptions | 2 +-
.../fluid/compressible/inlet | 6 +--
.../fluid/compressible/inletOptions | 2 +-
.../fluid/compressible/outlet | 2 +-
.../fluid/compressible/outletOptions | 2 +-
.../fluid/compressible/wall | 2 +-
.../fluid/compressible/wallOptions | 2 +-
.../fluid/incompressible/inlet | 4 +-
.../fluid/incompressible/inletOptions | 2 +-
.../fluid/incompressible/outlet | 2 +-
.../fluid/incompressible/wall | 2 +-
.../fluid/incompressible/wallOptions | 2 +-
etc/templates/boundaryConditions/fluid/inlet | 2 +-
.../boundaryConditions/fluid/inletOptions | 2 +-
etc/templates/boundaryConditions/fluid/outlet | 2 +-
.../boundaryConditions/fluid/outletOptions | 4 +-
etc/templates/boundaryConditions/fluid/wall | 2 +-
.../boundaryConditions/fluid/wallOptions | 2 +-
etc/templates/boundaryConditions/solid/wall | 4 +-
.../boundaryConditions/solid/wallOptions | 33 +-------------
etc/templates/models/turbulence/kEpsilon | 2 +-
etc/templates/models/turbulence/kOmega | 2 +-
etc/templates/models/turbulence/kOmegaSST | 2 +-
etc/templates/models/turbulence/laminar | 2 +-
etc/templates/solvers/chtMultiRegionFoam | 7 +--
etc/templates/solvers/icoFoam | 2 +-
etc/templates/solvers/pimpleFoam | 2 +-
etc/templates/solvers/pisoFoam | 2 +-
etc/templates/solvers/rhoPimpleDyMFoam | 2 +-
etc/templates/solvers/rhoPimpleFoam | 2 +-
etc/templates/solvers/simpleFoam | 2 +-
38 files changed, 96 insertions(+), 109 deletions(-)
diff --git a/applications/utilities/preProcessing/createZeroFolder/boundaryTemplates.C b/applications/utilities/preProcessing/createZeroFolder/boundaryTemplates.C
index 1c894d02a65..25cf2c44374 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 3ae64b17676..3ea816776d1 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 e66a7700df0..b1a3bca3e78 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 1256b51f26f..8253283a6e2 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 1ca83b47355..8628dd59f60 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 268e50efd74..d2a2274991f 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 5e51fbdc20b..cad9f5fa1ba 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 40423888e2a..860fc2b10a0 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 e6c69f33d46..b1a3bca3e78 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 218eec65ad4..dbf35fbbf75 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 d5846132bd4..573c2c097db 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 569da985aa6..99c89390f88 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 aecd3329030..e4030bd4842 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 40423888e2a..860fc2b10a0 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 e5b4828b1cd..572a119801c 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 9299b12d03d..fba9b640465 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 cb2f67dab86..98520585835 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 1a0377ef384..a94c65523a5 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 ffafd12b7e6..682da5960e8 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 8dae7541f58..057882de7fa 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 e0568cf6678..89e0794d8c3 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 4027a99702f..b2c3befeabe 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 075b0e8bca0..8f81d719d04 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 f20bcb8abfa..0ceeb4eaddd 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 a1f68a5bba2..2e1df029990 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 29ae7ff6659..0e8eb5cea87 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 f2c015cdabe..c8ccccc66e2 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 8365d855e20..e5c0fdb6257 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 97af79cd0bb..5bf9aaaafbd 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 97af79cd0bb..5bf9aaaafbd 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 012d41f87d1..a9afb33e8c0 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 392246b1b36..7e509ff9418 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 0d0ade999bf..7af8b4558d2 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 61abf0e14b8..10253a3b732 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 8cdb267f954..5785197c61e 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 5714246ee46..6b73013d5a7 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 016f399c268..2d9d17a142c 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 3eadf0caf6b..b87bb823b04 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 | |
\*---------------------------------------------------------------------------*/
--
GitLab