diff --git a/applications/utilities/preProcessing/PDR/pdrFields/PDRarraysCalc.C b/applications/utilities/preProcessing/PDR/pdrFields/PDRarraysCalc.C
index ada22eb6a0530025e8c6f3d75e1194b8370f414e..c434e37db90f83f0442cfe90f5fea21e7708a325 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/PDRarraysCalc.C
+++ b/applications/utilities/preProcessing/PDR/pdrFields/PDRarraysCalc.C
@@ -1149,9 +1149,9 @@ static void tail_field
const UList<PDRpatchDef>& patches
)
{
- // seaGround
+ // ground
{
- os.beginBlock("seaGround");
+ os.beginBlock(pars.groundPatchName);
os.writeKeyword("type") << wall_bc << token::END_STATEMENT << nl;
putUniform(os, "value", deflt);
os.endBlock();
@@ -1222,13 +1222,14 @@ static void tail_field
os.endBlock();
}
- if ( pars.two_d )
+ if (pars.two_d)
{
os.beginBlock("z_boundaries");
os.writeEntry("type", "empty");
os.endBlock();
}
- if ( pars.outer_orthog )
+
+ if (pars.outer_orthog)
{
os.beginBlock("outer_inner");
os.writeEntry("type", "cyclicAMI");
@@ -1285,9 +1286,10 @@ void write_scalarField
os << nl;
os.beginBlock("boundaryField");
+
// outer
{
- os.beginBlock("outer");
+ os.beginBlock(pars.outerPatchName);
os.writeEntry("type", "inletOutlet");
putUniform(os, "inletValue", deflt);
@@ -1329,7 +1331,8 @@ void write_uniformField
// outer
{
- os.beginBlock("outer");
+ os.beginBlock(pars.outerPatchName);
+
if (fieldName == "alphat" || fieldName == "nut")
{
// Different b.c. for alphat & nut
@@ -1377,17 +1380,17 @@ void write_pU_fields
os << nl;
os.beginBlock("boundaryField");
- // "outer"
+ // outer
{
- os.beginBlock("outer");
+ os.beginBlock(pars.outerPatchName);
os.writeEntry("type", "inletOutlet");
putUniform(os, "inletValue", vector::zero);
os.endBlock();
}
- // seaGround
+ // ground
{
- os.beginBlock("seaGround");
+ os.beginBlock(pars.groundPatchName);
os.writeEntry("type", "zeroGradient");
os.endBlock();
}
@@ -1497,9 +1500,10 @@ void write_pU_fields
os << nl;
os.beginBlock("boundaryField");
- // "outer"
+ // outer
{
- os.beginBlock("outer");
+ os.beginBlock(pars.outerPatchName);
+
os.writeEntry("type", "waveTransmissive");
os.writeEntry("gamma", 1.3);
os.writeEntry("fieldInf", deflt);
@@ -1560,7 +1564,7 @@ void write_symmTensorField
// outer
{
- os.beginBlock("outer");
+ os.beginBlock(pars.outerPatchName);
os.writeEntry("type", "inletOutlet");
putUniform(os, "inletValue", deflt);
@@ -1628,7 +1632,7 @@ void write_symmTensorFieldV
// outer
{
- os.beginBlock("outer");
+ os.beginBlock(pars.outerPatchName);
os.writeEntry("type", "inletOutlet");
putUniform(os, "inletValue", deflt);
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.C b/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.C
index 9554f8618fba36e48a1f9ab15a0dd8c003394714..921716621a402521a0e74e93cd1bf64e8f3b5bac 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.C
+++ b/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2019 OpenCFD Ltd.
+ Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -84,6 +84,20 @@ void Foam::PDRparams::readDefaults(const dictionary& dict)
dict.readIfPresent("blockageNoCT", blockageNoCT);
dict.readIfPresent("scale", scale);
+
+ const dictionary* dictptr;
+
+ groundPatchName = "ground";
+ outerPatchName = "outer";
+
+ if ((dictptr = dict.findDict("patchNames")) != nullptr)
+ {
+ const dictionary& d = *dictptr;
+
+ d.readIfPresent("ground", groundPatchName);
+ d.readIfPresent("outer", outerPatchName);
+ }
+
UPatchBc = "fixedValue;value uniform (0 0 0)";
if (dict.readIfPresent("UPatchBc", UPatchBc))
{
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.H b/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.H
index 0d383021f69ccf0ac56a82bd9eb78731670826f7..f3b7c29a333e081252d73611d119f22e991a5f7c 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.H
+++ b/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016 Shell Research Ltd.
- Copyright (C) 2018-2019 OpenCFD Ltd.
+ Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -62,6 +62,13 @@ public:
fileName obsfile_dir;
wordList obsfile_names;
word timeName;
+
+ //- The name for the "ground" patch
+ word groundPatchName;
+
+ //- The name for the "outer" patch
+ word outerPatchName;
+
string UPatchBc; //!< "fixedValue;value uniform (0 0 0)"
bool legacyMeshSpec{false};
@@ -136,7 +143,7 @@ public:
// Constructors
- //- Construct null
+ //- Default construct
PDRparams() = default;
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/PDRutils.H b/applications/utilities/preProcessing/PDR/pdrFields/PDRutils.H
index 9d28f5b2c6d78a0cc31b15bd9ed61ca65a3d7668..9eecfb7a372161898bfd21ba739d105a9799ecb9 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/PDRutils.H
+++ b/applications/utilities/preProcessing/PDR/pdrFields/PDRutils.H
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2019 OpenCFD Ltd.
+ Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -29,9 +29,6 @@ Namespace
Description
Utilities for PDR (eg, for setFields)
-SourceFiles
- PDRUtils.C
-
\*---------------------------------------------------------------------------*/
#ifndef PDRutils_H
@@ -48,11 +45,17 @@ namespace Foam
// Forward Declarations
class PDRobstacle;
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
namespace PDRutils
{
} // End namespace PDRutils
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.H b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.H
index 0580a8015f1f71f8183a2b734aa1d0040bc83979..7328b7ecb0b16a5b22ef07ae4a9cc02966886e01 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.H
+++ b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.H
@@ -264,6 +264,8 @@ public:
);
//- Trim obstacle to ensure it is within the specified bounding box
+ //- and return the intersection type.
+ // Returns UNKNOWN for unknown types and invalid bounding boxes
volumeType trim(const boundBox& bb);
//- Surface (points, faces) representation
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleIO.C b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleIO.C
index 1d4c9182f86a7bf723aabef3b54a351a5f23dca5..342a3175cfc23d56f437f89f418b98769204a744 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleIO.C
+++ b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleIO.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2019 OpenCFD Ltd.
+ Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -199,8 +199,8 @@ Foam::scalar Foam::PDRobstacle::readFiles
obs.dia() -= floatSMALL;
- // Trim against the mesh bounds
- // - ignore if it doesn't overlap
+ // Trim against the mesh bounds.
+ // Ignore if it doesn't overlap, or bounds are invalid
const volumeType vt = obs.trim(meshBb);
switch (vt)
@@ -288,8 +288,8 @@ Foam::scalar Foam::PDRobstacle::readFiles
obs.span += point::uniform(shift2);
- // Trim against the mesh bounds
- // - ignore if it doesn't overlap
+ // Trim against the mesh bounds.
+ // Ignore if it doesn't overlap, or bounds are invalid
const volumeType vt = obs.trim(meshBb);
switch (vt)
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleLegacyRead.C b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleLegacyRead.C
index 27b1dd4fe64cbc621f98b6faa0cf045b053d3bd6..658f98b58fd23e5dbb4b876d5eb098382b4ea229 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleLegacyRead.C
+++ b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleLegacyRead.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016 Shell Research Ltd.
- Copyright (C) 2019 OpenCFD Ltd.
+ Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -385,8 +385,8 @@ Foam::scalar Foam::PDRlegacy::readObstacleFiles
obs.dia() -= floatSMALL;
- // Trim against the mesh bounds
- // - ignore if it doesn't overlap
+ // Trim against the mesh bounds.
+ // Ignore if it doesn't overlap, or bounds are invalid
const volumeType vt = obs.trim(meshBb);
switch (vt)
@@ -474,8 +474,8 @@ Foam::scalar Foam::PDRlegacy::readObstacleFiles
obs.span += point::uniform(shift2);
- // Trim against the mesh bounds
- // - ignore if it doesn't overlap
+ // Trim against the mesh bounds.
+ // Ignore if it doesn't overlap, or bounds are invalid
const volumeType vt = obs.trim(meshBb);
switch (vt)
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/optionalData/optionalData.H b/applications/utilities/preProcessing/PDR/pdrFields/optionalData/optionalData.H
new file mode 100644
index 0000000000000000000000000000000000000000..b9a1cd7ffa77f85bbe9b1e406e8af032f323d090
--- /dev/null
+++ b/applications/utilities/preProcessing/PDR/pdrFields/optionalData/optionalData.H
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | www.openfoam.com
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+ Copyright (C) 2020 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::optionalData
+
+Description
+ A simplified version of std::optional (c++17), with much simpler
+ construction semantics.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef optionalData_H
+#define optionalData_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class optionalData Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class T>
+class optionalData
+{
+ // Private Data
+
+ //- Validity of the value
+ bool good_;
+
+ //- The value
+ T value_;
+
+
+public:
+
+ // Generated Methods
+
+ //- Copy construct
+ optionalData(const optionalData<T>&) = default;
+
+ //- Move construct
+ optionalData(optionalData<T>&&) = default;
+
+ //- Copy assignment
+ optionalData<T>& operator=(const optionalData<T>&) = default;
+
+ //- Move assignment
+ optionalData<T>& operator=(optionalData<T>&&) = default;
+
+
+ // Constructors
+
+ //- Default construct
+ optionalData()
+ :
+ good_(false),
+ value_()
+ {}
+
+ //- Copy construct from value
+ optionalData(const T& val)
+ :
+ good_(true),
+ value_(val)
+ {}
+
+ //- Move construct from value
+ optionalData(T&& val)
+ :
+ good_(true),
+ value_(std::move(val))
+ {}
+
+
+ // Member Functions
+
+ //- True if it has a value
+ bool has_value() const noexcept
+ {
+ return good_;
+ }
+
+ //- Access to the value
+ T& value() noexcept
+ {
+ return value_;
+ }
+
+ //- Access to the value
+ const T& value() const noexcept
+ {
+ return value_;
+ }
+
+ //- Return value or default
+ const T& value_or(const T& deflt) const
+ {
+ return good_ ? value_ : deflt;
+ }
+
+
+ // Member Operators
+
+ //- True if it has a value
+ explicit operator bool() const noexcept
+ {
+ return good_;
+ }
+
+ //- Access the value
+ const T& operator*() const noexcept
+ {
+ return value_;
+ }
+
+ //- Access the value
+ T& operator*() noexcept
+ {
+ return value_;
+ }
+
+ //- Copy assignment from value
+ void operator=(const T& val)
+ {
+ good_ = true;
+ value_ = val;
+ }
+
+ //- Move assignment from value
+ void operator=(T&& val)
+ {
+ good_ = true;
+ value_ = std::move(val);
+ }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblock.H b/src/mesh/blockMesh/PDRblockMesh/PDRblock.H
index 0072cd01ea02a84330f2b7ce3697bd3c87f8e70a..d9cffa01316380b16311184f0696bf49535e795d 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblock.H
+++ b/src/mesh/blockMesh/PDRblockMesh/PDRblock.H
@@ -107,6 +107,9 @@ public:
EXPAND_RELATIVE //!< Relative expansion ratio
};
+ //- Named enumerations for the expansion type
+ const static Enum<expansionType> expansionNames_;
+
// Public Classes
@@ -176,18 +179,9 @@ public:
};
-private:
-
- // Data Types
-
- //- Named enumerations for the expansion type
- const static Enum<expansionType> expansionNames_;
-
-
- // Private Classes
-
//- The begin/end nodes for each segment,
//- with divisions and expansion for each segment
+ // Not normally used outside of PDRblock
struct gridControl
:
public scalarList
@@ -205,14 +199,24 @@ private:
// \see Foam::gradingDescriptor
gradingDescriptors grading() const;
+ //- Resize lists
+ void resize(label len);
+
//- Add point/divisions/expand to end of list (push_back)
void append(const scalar p, label nDiv, scalar expRatio=1);
//- Add point/divisions/expand to front of list (push_front)
void prepend(const scalar p, label nDiv, scalar expRatio=1);
+
+ //- Write as dictionary contents for specified vector direction
+ void writeDict(Ostream& os, const direction cmpt) const;
};
+private:
+
+ // Private Classes
+
//- Extracted patch settings
struct boundaryEntry
{
diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblockLocation.C b/src/mesh/blockMesh/PDRblockMesh/PDRblockLocation.C
index 6003c08a798a8034dc0d411afa5ac79f27546305..05138a4c2a9d472747a857b9d076476f00320ac6 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblockLocation.C
+++ b/src/mesh/blockMesh/PDRblockMesh/PDRblockLocation.C
@@ -129,6 +129,20 @@ Foam::gradingDescriptors Foam::PDRblock::gridControl::grading() const
}
+void Foam::PDRblock::gridControl::resize(label len)
+{
+ // Begin/end nodes for each segment
+ scalarList& knots = *this;
+
+ knots.resize(len, Zero);
+
+ len = Foam::max(0, len-1);
+
+ divisions_.resize(len, Zero);
+ expansion_.resize(len, Zero);
+}
+
+
void Foam::PDRblock::gridControl::append
(
const scalar p,
@@ -215,6 +229,37 @@ void Foam::PDRblock::gridControl::prepend
}
+void Foam::PDRblock::gridControl::writeDict
+(
+ Ostream& os,
+ const direction cmpt
+) const
+{
+ if (cmpt < vector::nComponents)
+ {
+ os.beginBlock(vector::componentNames[cmpt]);
+ }
+
+
+ const scalarList& knots = *this;
+
+ os << indent << "points "
+ << flatOutput(knots) << token::END_STATEMENT << nl;
+
+ os << indent << "nCells "
+ << flatOutput(divisions_) << token::END_STATEMENT << nl;
+
+ os << indent << "ratios "
+ << flatOutput(expansion_) << token::END_STATEMENT << nl;
+
+ if (cmpt < vector::nComponents)
+ {
+ os.endBlock();
+ }
+ os << nl;
+}
+
+
Foam::scalarMinMax Foam::PDRblock::location::edgeLimits() const
{
scalarMinMax limits;
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRep b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRep
index 135677cf4b9730e43226b72280317f1b2e94d4e7..251f659554ea8d37cb411fa75dbb58c8874a2be0 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRep
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRep
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRxp b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRxp
index 50806f8b8ce5a9a51edca6efa9dea85571b59f56..e46ee2e1502a6cfdda30f6634b96770f8446cf5d 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRxp
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRxp
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/RPers b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/RPers
index b6500ef1d8092098871e49e84976052b02593c4a..5f78a2b2d9317ee42f1072a0a4bc237b07488a4f 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/RPers
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/RPers
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Su b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Su
index 32323dac299f2d4d4e8abde1aba15bd88102a354..6fa68063ef043e09122e21c6a93c7315cd7336bd 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Su
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Su
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/T b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/T
index cc2b748f96e6bb709c87da738288128b385811a4..9c8c02b37a5dbe69c6b36e81eb3be9603542c930 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/T
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/T
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Tu b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Tu
index f3b34fa31e8d123554ca87ab81478d91908ec1d3..4a42bdcad0cc8be3fe1c5885916fb04b684d835e 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Tu
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Tu
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/U b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/U
index 6a37f90694a44eecc92b689f1e833640a5373b86..ead6b49f36668af9489cc09157859c213dc43f5f 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/U
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xi b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xi
index 65c5f777fa2837cb3d270649e32f228e93bee20b..09798c679031eb4ad2f4d1f4a7bec7b0eabf299e 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xi
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xi
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xp b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xp
index 0bc77bcf28733dbc72dea3e7fe9ccfdcb3e1a3e3..0b86e718e543e954c408663e8e38b7e4b19e19c9 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xp
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xp
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/b b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/b
index 67ba0efffb756ce7ddbd06219892c12cfd9c4e96..9e09285daecfe5e99d332dfe3211948884655287 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/b
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/b
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/epsilon b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/epsilon
index 152ee3e10febf71e6337f786ff8a2b5ff9a1a409..204b06fd5e5c4fa129b83ce2f5a1a3af8d57c9d2 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/epsilon
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type epsilonWallFunction;
value $internalField;
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/ft b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/ft
index efd9134b467d17fa47fa0517848f1ea0db5cb4cf..0bb5f74c56bd3a38ed070d578e6e54c626110fe4 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/ft
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/ft
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/k b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/k
index bf2db6bb27ab0fe2f38f0a4fa688119505717112..a33bd0b84463504c19626ad0c65dd093dd66f060 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/k
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type kqRWallFunction;
value $internalField;
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/nut b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/nut
index cabb6343a32cb4ad7b2737719b63c38438f0d05e..fc194580ebde0ae628a9ab3c077c9bbe512bfb8d 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/nut
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/nut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -28,7 +28,7 @@ boundaryField
value $internalField;
}
- seaGround
+ ground
{
type nutkWallFunction;
value $internalField;
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/p b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/p
index 217f8854c00172052afc5f7b2cce552044798087..18d68502aab49100a920185e6bcfc487693cc45a 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/p
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -28,7 +28,7 @@ boundaryField
lInf 5;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/system/PDRsetFieldsDict b/tutorials/combustion/PDRFoam/pipeLattice/system/PDRsetFieldsDict
index 3988d35d623295aebba4a1b2c16fb84349ed61ce..bddaceafdc529086a8a27cbcc9f4e86548c8aa52 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/system/PDRsetFieldsDict
+++ b/tutorials/combustion/PDRFoam/pipeLattice/system/PDRsetFieldsDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -21,18 +21,19 @@ obsFileDir "<case>/geometry";
obsFileNames (obstaclesDict);
-// legacyObsSpec true;
-//
-// obsFileNames (position.obs base.obs);
-// Some parameters for PDRfitMesh are read from this file, including
+// ------------------
+// PDRfitMesh
+// ------------------
-cellWidth 0.22;
+// Some parameters for PDRfitMesh are read from this file,
+// including the following
-outer (20 0);
+// Mandatory (here or in PDRfitMeshDict)
+cellWidth 0.22;
-outerCombFac 0;
+// Optional
+cellWidthFactor 1.0;
-sea_ground 0.0;
// ************************************************************************* //
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRep b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRep
index 135677cf4b9730e43226b72280317f1b2e94d4e7..251f659554ea8d37cb411fa75dbb58c8874a2be0 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRep
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRep
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRxp b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRxp
index 50806f8b8ce5a9a51edca6efa9dea85571b59f56..e46ee2e1502a6cfdda30f6634b96770f8446cf5d 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRxp
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRxp
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/RPers b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/RPers
index b6500ef1d8092098871e49e84976052b02593c4a..5f78a2b2d9317ee42f1072a0a4bc237b07488a4f 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/RPers
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/RPers
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Su b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Su
index 32323dac299f2d4d4e8abde1aba15bd88102a354..6fa68063ef043e09122e21c6a93c7315cd7336bd 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Su
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Su
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/T b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/T
index cc2b748f96e6bb709c87da738288128b385811a4..9c8c02b37a5dbe69c6b36e81eb3be9603542c930 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/T
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/T
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Tu b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Tu
index f3b34fa31e8d123554ca87ab81478d91908ec1d3..4a42bdcad0cc8be3fe1c5885916fb04b684d835e 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Tu
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Tu
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/U b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/U
index 387f9bc426c15ee66537346d788492787406de6c..9b0f1f616b927e42fccdcc05b7531eaaedf2e6c9 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/U
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xi b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xi
index 65c5f777fa2837cb3d270649e32f228e93bee20b..09798c679031eb4ad2f4d1f4a7bec7b0eabf299e 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xi
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xi
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xp b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xp
index 0bc77bcf28733dbc72dea3e7fe9ccfdcb3e1a3e3..0b86e718e543e954c408663e8e38b7e4b19e19c9 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xp
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xp
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/b b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/b
index 67ba0efffb756ce7ddbd06219892c12cfd9c4e96..9e09285daecfe5e99d332dfe3211948884655287 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/b
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/b
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/epsilon b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/epsilon
index 6bc9795f75b2b475fcdda7cb4813948ff8e65705..a7dd6eca0be405c122f982a7c58610da44a1b066 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/epsilon
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type compressible::epsilonWallFunction;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/ft b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/ft
index efd9134b467d17fa47fa0517848f1ea0db5cb4cf..0bb5f74c56bd3a38ed070d578e6e54c626110fe4 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/ft
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/ft
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/k b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/k
index 18b4e206ea4051f2187602b57565cbe3a337869e..aca1be015690f4f1569361673c598f7d919ae77e 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/k
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ boundaryField
inletValue $internalField;
value $internalField;
}
- seaGround
+ ground
{
type compressible::kqRWallFunction;
value $internalField;
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/p b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/p
index 217f8854c00172052afc5f7b2cce552044798087..18d68502aab49100a920185e6bcfc487693cc45a 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/p
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -28,7 +28,7 @@ boundaryField
lInf 5;
value $internalField;
}
- seaGround
+ ground
{
type zeroGradient;
}
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRsetFieldsDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRsetFieldsDict
index 3988d35d623295aebba4a1b2c16fb84349ed61ce..3609db612c76d61df431682f2b360ec8079ef3d6 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRsetFieldsDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRsetFieldsDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2006 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -21,18 +21,31 @@ obsFileDir "<case>/geometry";
obsFileNames (obstaclesDict);
-// legacyObsSpec true;
-//
-// obsFileNames (position.obs base.obs);
-// Some parameters for PDRfitMesh are read from this file, including
+// ------------------
+// PDRfitMesh
+// ------------------
+// Some parameters for PDRfitMesh are read from this file,
+// including the following
+
+// Mandatory (here or in PDRfitMeshDict)
cellWidth 0.22;
-outer (20 0);
+// Optional
+cellWidthFactor 1.0;
+
+
+// ------------------
+// Advanced
+// ------------------
-outerCombFac 0;
+// Change some predefined patch names
+patchNames
+{
+ ground ground;
+ outer outer;
+}
-sea_ground 0.0;
// ************************************************************************* //