From 8e0981d9ed28706ec723b28d6d76530ab899e751 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 9 Sep 2016 11:01:37 +0100
Subject: [PATCH 01/42] functionObjectList::readFunctionObject: Added support
for region specification
Now the postProcess utility '-region' option works correctly, e.g. for
the chtMultiRegionSimpleFoam/heatExchanger case
postProcess -region air -func "mag(U)"
calculates 'mag(U)' for all the time steps in region 'air'.
---
.../functionObjectList/functionObjectList.C | 33 +++++++++++++++++--
.../functionObjectList/functionObjectList.H | 3 +-
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 7bd1882942b..04cfc5acfb4 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -151,7 +151,8 @@ bool Foam::functionObjectList::readFunctionObject
(
const string& funcNameArgs,
dictionary& functionsDict,
- HashSet<word>& requiredFields
+ HashSet<word>& requiredFields,
+ const word& region
)
{
// Parse the optional functionObject arguments:
@@ -291,6 +292,12 @@ bool Foam::functionObjectList::readFunctionObject
funcDict.set(entry::New(entryStream).ptr());
}
+ // Insert the region name if specified
+ if (region != word::null)
+ {
+ funcDict.set("region", region);
+ }
+
// Merge this functionObject dictionary into functionsDict
dictionary funcArgsDict;
funcArgsDict.add(string::validate<word>(funcNameArgs), funcDict);
@@ -352,6 +359,14 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
dictionary& functionsDict = controlDict.subDict("functions");
+ word region = word::null;
+
+ // Set the region name if specified
+ if (args.optionFound("region"))
+ {
+ region = args["region"];
+ }
+
if
(
args.optionFound("dict")
@@ -377,7 +392,13 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
if (args.optionFound("func"))
{
- readFunctionObject(args["func"], functionsDict, requiredFields);
+ readFunctionObject
+ (
+ args["func"],
+ functionsDict,
+ requiredFields,
+ region
+ );
}
if (args.optionFound("funcs"))
@@ -386,7 +407,13 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
forAll(funcs, i)
{
- readFunctionObject(funcs[i], functionsDict, requiredFields);
+ readFunctionObject
+ (
+ funcs[i],
+ functionsDict,
+ requiredFields,
+ region
+ );
}
}
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index da27e7d7f36..405e6133692 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -218,7 +218,8 @@ public:
(
const string& funcNameArgs0,
dictionary& functionsDict,
- HashSet<word>& requiredFields
+ HashSet<word>& requiredFields,
+ const word& region = word::null
);
//- Read and set the function objects if their data have changed
--
GitLab
From cb1a012b66b3e0d72cef50197b6cd3d0887c7693 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 9 Sep 2016 12:20:25 +0100
Subject: [PATCH 02/42] structuredRenumber: Corrected to run in parallel Patch
contributed by Mattijs Janssens
---
.../structuredRenumber/OppositeFaceCellWave.C | 331 ++++++++++++++++++
.../structuredRenumber/OppositeFaceCellWave.H | 143 ++++++++
.../OppositeFaceCellWaveName.C | 36 ++
.../structuredRenumber/structuredRenumber.C | 154 +++++---
.../structuredRenumber/structuredRenumber.H | 35 +-
5 files changed, 651 insertions(+), 48 deletions(-)
create mode 100644 src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.C
create mode 100644 src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H
create mode 100644 src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWaveName.C
diff --git a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.C b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.C
new file mode 100644
index 00000000000..4e865bd0b11
--- /dev/null
+++ b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.C
@@ -0,0 +1,331 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "OppositeFaceCellWave.H"
+#include "polyMesh.H"
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+template<class Type, class TrackingData>
+void Foam::OppositeFaceCellWave<Type, TrackingData>::opposingFaceLabels
+(
+ const label celli,
+ const label masterFaceLabel,
+ DynamicList<label>& oppositeFaceLabels
+) const
+{
+ // Variant of cell::opposingFaceLabel
+
+ // Algorithm:
+ // Go through all the faces of the cell and find the one which
+ // does not share a single vertex with the master face. If there
+ // are two or more such faces, return the first one and issue a
+ // warning; if there is no opposite face, return -1;
+
+ const face& masterFace = this->mesh_.faces()[masterFaceLabel];
+
+ const labelList& curFaceLabels = this->mesh_.cells()[celli];
+
+ oppositeFaceLabels.clear();
+
+ forAll(curFaceLabels, facei)
+ {
+ // Compare the face with the master
+ const face& curFace = this->mesh_.faces()[curFaceLabels[facei]];
+
+ // Skip the master face
+ if (curFaceLabels[facei] != masterFaceLabel)
+ {
+ bool sharedPoint = false;
+
+ // Compare every vertex of the current face against the
+ // vertices of the master face
+ forAll(curFace, pointi)
+ {
+ const label l = curFace[pointi];
+
+ forAll(masterFace, masterPointi)
+ {
+ if (masterFace[masterPointi] == l)
+ {
+ sharedPoint = true;
+ break;
+ }
+ }
+
+ if (sharedPoint) break;
+ }
+
+ // If no points are shared, this is the opposite face
+ if (!sharedPoint)
+ {
+ // Found opposite face
+ oppositeFaceLabels.append(curFaceLabels[facei]);
+ }
+ }
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+// Iterate, propagating changedFacesInfo across mesh, until no change (or
+// maxIter reached). Initial cell values specified.
+template<class Type, class TrackingData>
+Foam::OppositeFaceCellWave<Type, TrackingData>::OppositeFaceCellWave
+(
+ const polyMesh& mesh,
+ const labelList& changedFaces,
+ const List<Type>& changedFacesInfo,
+ UList<Type>& allFaceInfo,
+ UList<Type>& allCellInfo,
+ const label maxIter,
+ TrackingData& td
+)
+:
+ FaceCellWave<Type, TrackingData>
+ (
+ mesh,
+ changedFaces,
+ changedFacesInfo,
+ allFaceInfo,
+ allCellInfo,
+ 0, //maxIter,
+ td
+ ),
+ changedOppositeFaces_(this->mesh_.nCells())
+{
+ // Iterate until nothing changes
+ label iter = this->iterate(maxIter);
+
+ if ((maxIter > 0) && (iter >= maxIter))
+ {
+ FatalErrorInFunction
+ << "Maximum number of iterations reached. Increase maxIter."
+ << endl
+ << " maxIter:" << maxIter << endl
+ << " nChangedCells:" << this->changedCells_.size() << endl
+ << " nChangedFaces:" << this->changedFaces_.size() << endl
+ << exit(FatalError);
+ }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class Type, class TrackingData>
+Foam::label Foam::OppositeFaceCellWave<Type, TrackingData>::faceToCell()
+{
+ const labelList& owner = this->mesh_.faceOwner();
+ const labelList& neighbour = this->mesh_.faceNeighbour();
+ label nInternalFaces = this->mesh_.nInternalFaces();
+
+ DynamicList<label> oppositeFaceLabels;
+
+ forAll(this->changedFaces_, changedFacei)
+ {
+ label facei = this->changedFaces_[changedFacei];
+
+ if (!this->changedFace_[facei])
+ {
+ FatalErrorInFunction
+ << "Face " << facei
+ << " not marked as having been changed"
+ << abort(FatalError);
+ }
+
+
+ const Type& neighbourWallInfo = this->allFaceInfo_[facei];
+
+ // Evaluate all connected cells
+
+ // Owner
+ {
+ label celli = owner[facei];
+ Type& currentWallInfo = this->allCellInfo_[celli];
+
+ if (!currentWallInfo.equal(neighbourWallInfo, this->td_))
+ {
+ // Check if cell is prismatic w.r.t facei
+ opposingFaceLabels(celli, facei, oppositeFaceLabels);
+
+ if (oppositeFaceLabels.size())
+ {
+ label sz = this->changedCells_.size();
+ this->updateCell
+ (
+ celli,
+ facei,
+ neighbourWallInfo,
+ this->propagationTol_,
+ currentWallInfo
+ );
+ if (this->changedCells_.size() > sz)
+ {
+ label oppFacei = -1;
+ if (oppositeFaceLabels.size() == 1)
+ {
+ oppFacei = oppositeFaceLabels[0];
+ }
+ changedOppositeFaces_.append(oppFacei);
+ }
+ }
+ }
+ }
+
+ // Neighbour.
+ if (facei < nInternalFaces)
+ {
+ label celli = neighbour[facei];
+ Type& currentWallInfo2 = this->allCellInfo_[celli];
+
+ if (!currentWallInfo2.equal(neighbourWallInfo, this->td_))
+ {
+ // Check if cell is prismatic w.r.t facei
+ opposingFaceLabels(celli, facei, oppositeFaceLabels);
+
+ if (oppositeFaceLabels.size())
+ {
+ label sz = this->changedCells_.size();
+ this->updateCell
+ (
+ celli,
+ facei,
+ neighbourWallInfo,
+ this->propagationTol_,
+ currentWallInfo2
+ );
+ if (this->changedCells_.size() > sz)
+ {
+ label oppFacei = -1;
+ if (oppositeFaceLabels.size() == 1)
+ {
+ oppFacei = oppositeFaceLabels[0];
+ }
+ changedOppositeFaces_.append(oppFacei);
+ }
+ }
+ }
+ }
+
+ // Reset status of face
+ this->changedFace_[facei] = false;
+ }
+
+ // Handled all changed faces by now
+ this->changedFaces_.clear();
+
+ if (debug & 2)
+ {
+ Pout<< " Changed cells : " << this->changedCells_.size()
+ << endl;
+ }
+
+ // Sum changedCells over all procs
+ label totNChanged = this->changedCells_.size();
+
+ reduce(totNChanged, sumOp<label>());
+
+ return totNChanged;
+}
+
+
+template<class Type, class TrackingData>
+Foam::label Foam::OppositeFaceCellWave<Type, TrackingData>::cellToFace()
+{
+ forAll(this->changedCells_, changedCelli)
+ {
+ label celli = this->changedCells_[changedCelli];
+ label facei = changedOppositeFaces_[changedCelli];
+
+ if (!this->changedCell_[celli])
+ {
+ FatalErrorInFunction
+ << "Cell " << celli << " not marked as having been changed"
+ << abort(FatalError);
+ }
+
+ if (facei != -1)
+ {
+ const Type& neighbourWallInfo = this->allCellInfo_[celli];
+
+ // Evaluate facei
+
+ Type& currentWallInfo = this->allFaceInfo_[facei];
+
+ if (!currentWallInfo.equal(neighbourWallInfo, this->td_))
+ {
+ this->updateFace
+ (
+ facei,
+ celli,
+ neighbourWallInfo,
+ this->propagationTol_,
+ currentWallInfo
+ );
+ }
+ }
+
+ // Reset status of cell
+ this->changedCell_[celli] = false;
+ }
+
+ // Handled all changed cells by now
+ this->changedCells_.clear();
+ changedOppositeFaces_.clear();
+
+ if (this->hasCyclicPatches_)
+ {
+ // Transfer changed faces across cyclic halves
+ this->handleCyclicPatches();
+ }
+
+ if (this->hasCyclicAMIPatches_)
+ {
+ this->handleAMICyclicPatches();
+ }
+
+ if (Pstream::parRun())
+ {
+ // Transfer changed faces from neighbouring processors.
+ this->handleProcPatches();
+ }
+
+ if (debug & 2)
+ {
+ Pout<< " Changed faces : " << this->changedFaces_.size()
+ << endl;
+ }
+
+ // Sum nChangedFaces over all procs
+ label totNChanged = this->changedFaces_.size();
+
+ reduce(totNChanged, sumOp<label>());
+
+ return totNChanged;
+}
+
+
+// ************************************************************************* //
diff --git a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H
new file mode 100644
index 00000000000..bcfe3cb0dda
--- /dev/null
+++ b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWave.H
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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::OppositeFaceCellWave
+
+Description
+ Version of FaceCellWave that walks through prismatic cells only.
+
+ Used to determine mesh structure. In the front walking routines
+ (faceToCell and faceToCell) it
+ - walks across prismatic cells only
+ - and only to a single opposite face
+
+ Notes:
+ A cell with a split faces will be marked but not walked through (since
+ there is no single opposite face.
+
+SourceFiles
+ OppositeFaceCellWave.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef OppositeFaceCellWave_H
+#define OppositeFaceCellWave_H
+
+#include "FaceCellWave.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class OppositeFaceCellWaveName Declaration
+\*---------------------------------------------------------------------------*/
+
+TemplateName(OppositeFaceCellWave);
+
+
+/*---------------------------------------------------------------------------*\
+ Class OppositeFaceCellWave Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class TrackingData = int>
+class OppositeFaceCellWave
+:
+ public FaceCellWave<Type, TrackingData>,
+ public OppositeFaceCellWaveName
+{
+protected:
+
+ // Protected data
+
+ //- For every entry in changedCells (i.e. the cell front) gives
+ // the face that it needs to transfer to
+ DynamicList<label> changedOppositeFaces_;
+
+
+ // Protected Member Functions
+
+ //- Determine 'opposite' faces (= faces not sharing a vertex) on cell
+ void opposingFaceLabels
+ (
+ const label celli,
+ const label facei,
+ DynamicList<label>&
+ ) const;
+
+
+public:
+
+ // Constructors
+
+ //- Construct from mesh and list of changed faces with the Type
+ // for these faces. Iterates until nothing changes or maxIter reached.
+ // (maxIter can be 0)
+ OppositeFaceCellWave
+ (
+ const polyMesh&,
+ const labelList& initialChangedFaces,
+ const List<Type>& changedFacesInfo,
+ UList<Type>& allFaceInfo,
+ UList<Type>& allCellInfo,
+ const label maxIter,
+ TrackingData& td = FaceCellWave<Type, TrackingData>::dummyTrackData_
+ );
+
+
+ //- Destructor
+ virtual ~OppositeFaceCellWave()
+ {};
+
+
+ // Member Functions
+
+ //- Propagate from face to cell. Returns total number of cells
+ // (over all processors) changed.
+ virtual label faceToCell();
+
+ //- Propagate from cell to face. Returns total number of faces
+ // (over all processors) changed. (Faces on processorpatches are
+ // counted double)
+ virtual label cellToFace();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+ #include "OppositeFaceCellWave.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWaveName.C b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWaveName.C
new file mode 100644
index 00000000000..ddad4b6ec2c
--- /dev/null
+++ b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWaveName.C
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "OppositeFaceCellWave.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+defineTypeNameAndDebug(OppositeFaceCellWaveName, 0);
+}
+
+
+// ************************************************************************* //
diff --git a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
index 093d44bb25b..e227f2861fb 100644
--- a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
+++ b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
@@ -27,7 +27,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "topoDistanceData.H"
#include "fvMeshSubset.H"
-#include "FaceCellWave.H"
+#include "OppositeFaceCellWave.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,7 +54,7 @@ Foam::structuredRenumber::structuredRenumber
renumberMethod(renumberDict),
methodDict_(renumberDict.subDict(typeName + "Coeffs")),
patches_(methodDict_.lookup("patches")),
- //nLayers_(readLabel(methodDict_.lookup("nLayers"))),
+ nLayers_(methodDict_.lookupOrDefault<label>("nLayers", labelMax)),
depthFirst_(methodDict_.lookup("depthFirst")),
method_(renumberMethod::New(methodDict_)),
reverse_(methodDict_.lookup("reverse"))
@@ -63,6 +63,75 @@ Foam::structuredRenumber::structuredRenumber
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+bool Foam::structuredRenumber::layerLess::operator()
+(
+ const label a,
+ const label b
+)
+{
+ const topoDistanceData& ta = distance_[a];
+ const topoDistanceData& tb = distance_[b];
+
+ int dummy;
+
+ if (ta.valid(dummy))
+ {
+ if (tb.valid(dummy))
+ {
+ if (depthFirst_)
+ {
+ if (ta.data() < tb.data())
+ {
+ // Sort column first
+ return true;
+ }
+ else if (ta.data() > tb.data())
+ {
+ return false;
+ }
+ else
+ {
+ // Same column. Sort according to layer
+ return ta.distance() < tb.distance();
+ }
+ }
+ else
+ {
+ if (ta.distance() < tb.distance())
+ {
+ return true;
+ }
+ else if (ta.distance() > tb.distance())
+ {
+ return false;
+ }
+ else
+ {
+ // Same layer; sort according to current values
+ return ta.data() < tb.data();
+ }
+ }
+ }
+ else
+ {
+ return true;
+ }
+ }
+ else
+ {
+ if (tb.valid(dummy))
+ {
+ return false;
+ }
+ else
+ {
+ // Both not valid; fall back to cell indices for sorting
+ return order_[a] < order_[b];
+ }
+ }
+}
+
+
Foam::labelList Foam::structuredRenumber::renumber
(
const polyMesh& mesh,
@@ -104,18 +173,13 @@ Foam::labelList Foam::structuredRenumber::renumber
const label nLayers = nTotalCells/nTotalSeeds;
Info<< type() << " : seeding " << nTotalSeeds
- << " cells on " << nLayers << " layers" << nl
+ << " cells on (estimated) " << nLayers << " layers" << nl
<< endl;
- // Avoid subsetMesh, FaceCellWave going through proc boundaries
- bool oldParRun = Pstream::parRun();
- Pstream::parRun() = false;
-
-
// Work array. Used here to temporarily store the original-to-ordered
// index. Later on used to store the ordered-to-original.
- labelList orderedToOld(points.size(), -1);
+ labelList orderedToOld(mesh.nCells(), -1);
// Subset the layer of cells next to the patch
{
@@ -125,20 +189,23 @@ Foam::labelList Foam::structuredRenumber::renumber
pointField subPoints(points, subsetter.cellMap());
- // Decompose the layer of cells
+ // Locally renumber the layer of cells
labelList subOrder(method_().renumber(subMesh, subPoints));
labelList subOrigToOrdered(invert(subOrder.size(), subOrder));
- // Transfer to final decomposition
+ globalIndex globalSubCells(subOrder.size());
+
+ // Transfer to final decomposition and convert into global numbering
forAll(subOrder, i)
{
- orderedToOld[subsetter.cellMap()[i]] = subOrigToOrdered[i];
+ orderedToOld[subsetter.cellMap()[i]] =
+ globalSubCells.toGlobal(subOrigToOrdered[i]);
}
}
- // Walk out.
+ // Walk sub-ordering (=column index) out.
labelList patchFaces(nFaces);
List<topoDistanceData> patchData(nFaces);
nFaces = 0;
@@ -151,7 +218,7 @@ Foam::labelList Foam::structuredRenumber::renumber
patchFaces[nFaces] = pp.start()+i;
patchData[nFaces] = topoDistanceData
(
- orderedToOld[fc[i]],// passive data: order of originating face
+ orderedToOld[fc[i]],// passive data: global column
0 // distance: layer
);
nFaces++;
@@ -163,50 +230,43 @@ Foam::labelList Foam::structuredRenumber::renumber
List<topoDistanceData> faceData(mesh.nFaces());
// Propagate information inwards
- FaceCellWave<topoDistanceData> deltaCalc
+ OppositeFaceCellWave<topoDistanceData> deltaCalc
(
mesh,
patchFaces,
patchData,
faceData,
cellData,
- nTotalCells+1
+ 0
);
+ deltaCalc.iterate(nLayers_);
- Pstream::parRun() = oldParRun;
+ Info<< type() << " : did not visit "
+ << deltaCalc.getUnsetCells()
+ << " cells out of " << nTotalCells
+ << "; using " << method_().type() << " renumbering for these" << endl;
+ // Get cell order using the method(). These values will get overwitten
+ // by any visited cell so are used only if the number of nLayers is limited.
+ labelList oldToOrdered
+ (
+ invert
+ (
+ mesh.nCells(),
+ method_().renumber(mesh, points)
+ )
+ );
- // And extract.
- // Note that distance is distance from face so starts at 1.
- bool haveWarned = false;
- forAll(orderedToOld, celli)
- {
- if (!cellData[celli].valid(deltaCalc.data()))
- {
- if (!haveWarned)
- {
- WarningInFunction
- << "Did not visit some cells, e.g. cell " << celli
- << " at " << mesh.cellCentres()[celli] << endl
- << "Assigning these cells to domain 0." << endl;
- haveWarned = true;
- }
- orderedToOld[celli] = 0;
- }
- else
- {
- label layerI = cellData[celli].distance();
- if (depthFirst_)
- {
- orderedToOld[nLayers*cellData[celli].data()+layerI] = celli;
- }
- else
- {
- orderedToOld[cellData[celli].data()+nLayers*layerI] = celli;
- }
- }
- }
+ // Use specialised sorting to sorted either layers or columns first
+ // Done so that at no point we need to combine both into a single
+ // index and we might run out of label size.
+ sortedOrder
+ (
+ cellData,
+ orderedToOld,
+ layerLess(depthFirst_, oldToOrdered, cellData)
+ );
// Return furthest away cell first
if (reverse_)
diff --git a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
index b95f7d7036f..407fbf2329c 100644
--- a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
+++ b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -41,6 +41,7 @@ SourceFiles
#define structuredRenumber_H
#include "renumberMethod.H"
+#include "topoDistanceData.H"
#include "Switch.H"
namespace Foam
@@ -54,12 +55,44 @@ class structuredRenumber
:
public renumberMethod
{
+public:
+
+ // Public classes
+
+ //- Less function class that can be used for sorting according to
+ // column and layer
+ class layerLess
+ {
+ const Switch depthFirst_;
+ const labelList& order_;
+ const List<topoDistanceData>& distance_;
+
+ public:
+
+ layerLess
+ (
+ const Switch depthFirst,
+ const labelList& order,
+ const List<topoDistanceData>& distance
+ )
+ :
+ depthFirst_(depthFirst),
+ order_(order),
+ distance_(distance)
+ {}
+
+ bool operator()(const label a, const label b);
+ };
+
+
// Private data
const dictionary methodDict_;
const wordReList patches_;
+ const label nLayers_;
+
const Switch depthFirst_;
const autoPtr<renumberMethod> method_;
--
GitLab
From 4fcdb0b4e4ca0fac2954eef6ca352751e69bbd3a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 9 Sep 2016 12:29:06 +0100
Subject: [PATCH 03/42] codedFvOption: Added cellSet support Patch provided by
Mattijs Janssens Resolves bug-report
http://bugs.openfoam.org/view.php?id=2240
---
etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C | 2 +-
etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H | 4 ++--
src/fvOptions/sources/general/codedSource/CodedSource.C | 1 +
src/fvOptions/sources/general/codedSource/CodedSource.H | 6 ++----
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C
index b3bcb86ecd4..6cb5cc0d7bd 100644
--- a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C
@@ -104,7 +104,7 @@ ${typeName}FvOption${SourceType}
const fvMesh& mesh
)
:
- option(name, modelType, dict, mesh)
+ cellSetOption(name, modelType, dict, mesh)
{
if (${verbose:-false})
{
diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
index 2a10ff9b35b..c2764193628 100644
--- a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
+++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
@@ -105,7 +105,7 @@ SourceFiles
#ifndef codedFvOptionTemplate_H
#define codedFvOptionTemplate_H
-#include "fvOption.H"
+#include "cellSetOption.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -121,7 +121,7 @@ namespace fv
class ${typeName}FvOption${SourceType}
:
- public option
+ public cellSetOption
{
public:
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.C b/src/fvOptions/sources/general/codedSource/CodedSource.C
index 3933d87f8df..267354e313f 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.C
@@ -68,6 +68,7 @@ void Foam::fv::CodedSource<Type>::prepare
"-I$(LIB_SRC)/finiteVolume/lnInclude \\\n"
"-I$(LIB_SRC)/meshTools/lnInclude \\\n"
"-I$(LIB_SRC)/sampling/lnInclude \\\n"
+ "-I$(LIB_SRC)/fvOptions/lnInclude \\\n"
+ context.options()
+ "\n\nLIB_LIBS = \\\n"
+ " -lmeshTools \\\n"
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.H b/src/fvOptions/sources/general/codedSource/CodedSource.H
index b484e91587b..2e742bc0059 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.H
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.H
@@ -57,14 +57,12 @@ Usage
{
type scalarCodedSource;
- active yes;
-
scalarCodedSourceCoeffs
{
selectionMode all;
- fieldNames (h);
- name sourceTime;
+ fields (h);
+ name sourceTime;
codeInclude
#{
--
GitLab
From 0a1300d8821471111d1e1b0102dc380a7b3d0438 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 9 Sep 2016 14:53:10 +0100
Subject: [PATCH 04/42] wmake: Updated '-q' option to work on Ubuntu and other
'dash'-based GNU/Linux distributions
---
wmake/wmake | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/wmake/wmake b/wmake/wmake
index 0e42e771962..e7402a581b4 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#------------------------------------------------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
@@ -335,13 +335,13 @@ if [ "$all" = "queue" ]
then
[ -n "$update" ] || wmakeLnIncludeAll $parOpt
- ( \
- WM_COLLECT_DIR=$WM_PROJECT_DIR/platforms/${WM_OPTIONS}/${PWD////_} \
- WM_SCHEDULER=wmakeCollect \
- trap '$WM_SCHEDULER -kill' TERM INT; \
+ (
+ export WM_COLLECT_DIR=$WM_PROJECT_DIR/platforms/${WM_OPTIONS}/${PWD////_}
+ WM_SCHEDULER=wmakeCollect
+ trap '$WM_SCHEDULER -kill' TERM INT
$WM_SCHEDULER -clean \
&& wmake -all objects \
- && $WM_SCHEDULER \
+ && $WM_SCHEDULER
) && wmake -all
exit $?
fi
--
GitLab
From 8e37aa0a3736a50367255920097974f9b2f92c7b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 9 Sep 2016 14:54:12 +0100
Subject: [PATCH 05/42] renumberMethods: Added missing .C file for
structuredRenumber
---
src/renumber/renumberMethods/Make/files | 1 +
.../structuredRenumber/OppositeFaceCellWaveName.C | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/renumber/renumberMethods/Make/files b/src/renumber/renumberMethods/Make/files
index 4fe9cd69fb9..c0a66850387 100644
--- a/src/renumber/renumberMethods/Make/files
+++ b/src/renumber/renumberMethods/Make/files
@@ -4,5 +4,6 @@ CuthillMcKeeRenumber/CuthillMcKeeRenumber.C
randomRenumber/randomRenumber.C
springRenumber/springRenumber.C
structuredRenumber/structuredRenumber.C
+structuredRenumber/OppositeFaceCellWaveName.C
LIB = $(FOAM_LIBBIN)/librenumberMethods
diff --git a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWaveName.C b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWaveName.C
index ddad4b6ec2c..9af627e95db 100644
--- a/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWaveName.C
+++ b/src/renumber/renumberMethods/structuredRenumber/OppositeFaceCellWaveName.C
@@ -29,7 +29,7 @@ License
namespace Foam
{
-defineTypeNameAndDebug(OppositeFaceCellWaveName, 0);
+ defineTypeNameAndDebug(OppositeFaceCellWaveName, 0);
}
--
GitLab
From 86ccbca39080525980a26e12b0e0c5a99a6e494e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 9 Sep 2016 16:23:28 +0100
Subject: [PATCH 06/42] combustionModels/FSD: Corrected Renamed 'omega' to
'FSDomega' to avoid a clash with the k-omega turbulence models.
Resolves bug-report http://bugs.openfoam.org/view.php?id=2237
---
.../reactionRateFlameArea.C | 30 +--------------
.../reactionRateFlameArea.H | 11 +-----
.../relaxation/relaxation.C | 9 +++--
.../combustionModel/combustionModel.H | 19 ++++------
.../combustionModel/combustionModelI.H | 37 +++++++------------
.../psiChemistryCombustion.C | 9 +----
.../psiChemistryCombustion.H | 5 +--
.../psiCombustionModel/psiCombustionModel.H | 5 +--
.../psiThermoCombustion/psiThermoCombustion.C | 9 +----
.../psiThermoCombustion/psiThermoCombustion.H | 5 +--
.../rhoChemistryCombustion.C | 9 +----
.../rhoChemistryCombustion.H | 5 +--
.../rhoCombustionModel/rhoCombustionModel.H | 5 +--
.../rhoThermoCombustion/rhoThermoCombustion.C | 9 +----
.../rhoThermoCombustion/rhoThermoCombustion.H | 5 +--
.../les/smallPoolFire2D/0/{omega => FSDomega} | 2 +-
.../constant/combustionProperties | 2 +
.../les/smallPoolFire2D/system/fvSchemes | 2 +
.../les/smallPoolFire2D/system/fvSolution | 4 +-
19 files changed, 46 insertions(+), 136 deletions(-)
rename tutorials/combustion/fireFoam/les/smallPoolFire2D/0/{omega => FSDomega} (98%)
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.C
index 06dca4d56ce..4e767ca3ad1 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.C
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,32 +36,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::reactionRateFlameArea::reactionRateFlameArea
-(
- const dictionary& dict,
- const fvMesh& mesh,
- const combustionModel& combModel
-)
-:
- coeffDict_(dictionary::null),
- mesh_(mesh),
- combModel_(combModel),
- fuel_(dict.lookup("fuel")),
- omega_
- (
- IOobject
- (
- "omega",
- mesh_.time().timeName(),
- mesh_,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh_
- )
-{}
-
-
Foam::reactionRateFlameArea::reactionRateFlameArea
(
const word& modelType,
@@ -78,7 +52,7 @@ Foam::reactionRateFlameArea::reactionRateFlameArea
(
IOobject
(
- "omega",
+ "FSDomega",
mesh_.time().timeName(),
mesh_,
IOobject::MUST_READ,
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.H b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.H
index b6267a3892e..4ae4271a9a8 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.H
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -111,14 +111,6 @@ public:
// Constructors
- //- Construct from dictionary and psiReactionThermo
- reactionRateFlameArea
- (
- const dictionary& dict,
- const fvMesh& mesh,
- const combustionModel& combModel
- );
-
//- Construct from components
reactionRateFlameArea
(
@@ -160,7 +152,6 @@ public:
//- Update from dictionary
virtual bool read(const dictionary& dictProperties);
-
};
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
index f26b698b6fe..c714bc5cd25 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -123,13 +123,14 @@ void Foam::reactionRateFlameAreaModels::relaxation::correct
/(sqr(omega0 - omegaInf) + sqr(omegaMin))
);
- const volScalarField rho(combModel_.rho());
- const surfaceScalarField phi(combModel_.phi());
+ const volScalarField& rho = combModel_.rho();
+ const tmp<surfaceScalarField> tphi = combModel_.phi();
+ const surfaceScalarField& phi = tphi();
solve
(
fvm::ddt(rho, omega_)
- + fvm::div(phi, omega_, "div(phi,omega)")
+ + fvm::div(phi, omega_)
==
rho*Rc*omega0
- fvm::SuSp(rho*(tau + Rc), omega_)
diff --git a/src/combustionModels/combustionModel/combustionModel.H b/src/combustionModels/combustionModel/combustionModel.H
index 5368d1af801..2eb74cc3b57 100644
--- a/src/combustionModels/combustionModel/combustionModel.H
+++ b/src/combustionModels/combustionModel/combustionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -111,20 +111,17 @@ public:
//- Return const access to the mesh database
inline const fvMesh& mesh() const;
- //- Return const access to phi
- inline const surfaceScalarField& phi() const;
-
- //- Return const access to rho
- virtual tmp<volScalarField> rho() const = 0;
+ //- Set turbulence
+ inline void setTurbulence(compressibleTurbulenceModel& turbModel);
//- Return access to turbulence
inline const compressibleTurbulenceModel& turbulence() const;
- //- Set turbulence
- inline void setTurbulence
- (
- compressibleTurbulenceModel& turbModel
- );
+ //- Return const access to rho
+ inline const volScalarField& rho() const;
+
+ //- Return const access to phi
+ inline tmp<surfaceScalarField> phi() const;
//- Is combustion active?
inline const Switch& active() const;
diff --git a/src/combustionModels/combustionModel/combustionModelI.H b/src/combustionModels/combustionModel/combustionModelI.H
index e095c5f7e04..135dbe40387 100644
--- a/src/combustionModels/combustionModel/combustionModelI.H
+++ b/src/combustionModels/combustionModel/combustionModelI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,42 +31,31 @@ inline const Foam::fvMesh& Foam::combustionModel::mesh() const
}
-inline const Foam::surfaceScalarField& Foam::combustionModel::phi() const
+inline const Foam::compressibleTurbulenceModel&
+Foam::combustionModel::turbulence() const
{
- if (turbulencePtr_)
- {
- return turbulencePtr_->phi();
- }
- else
+ if (!turbulencePtr_)
{
FatalErrorInFunction
<< "turbulencePtr_ is empty. Please use "
<< "combustionModel::setTurbulence "
<< "(compressibleTurbulenceModel& )"
<< abort(FatalError);
-
- return turbulencePtr_->phi();
}
+
+ return *turbulencePtr_;
}
-inline const Foam::compressibleTurbulenceModel&
-Foam::combustionModel::turbulence() const
+inline const Foam::volScalarField& Foam::combustionModel::rho() const
{
- if (turbulencePtr_)
- {
- return *turbulencePtr_;
- }
- else
- {
- FatalErrorInFunction
- << "turbulencePtr_ is empty. Please use "
- << "combustionModel::setTurbulence "
- << "(compressibleTurbulenceModel& )"
- << abort(FatalError);
+ return turbulence().rho();
+}
- return *turbulencePtr_;
- }
+
+inline Foam::tmp<Foam::surfaceScalarField> Foam::combustionModel::phi() const
+{
+ return turbulence().alphaRhoPhi();
}
diff --git a/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C
index be0ccfabfbd..b28116706e3 100644
--- a/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C
+++ b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -61,11 +61,4 @@ Foam::combustionModels::psiChemistryCombustion::thermo() const
}
-Foam::tmp<Foam::volScalarField>
-Foam::combustionModels::psiChemistryCombustion::rho() const
-{
- return chemistryPtr_->thermo().rho();
-}
-
-
// ************************************************************************* //
diff --git a/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H
index e3725d35d34..5c16c8ad8e7 100644
--- a/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H
+++ b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -95,9 +95,6 @@ public:
//- Return const access to the thermo package
virtual const psiReactionThermo& thermo() const;
-
- //- Return const access to the density field
- virtual tmp<volScalarField> rho() const;
};
diff --git a/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.H b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.H
index 64c5234bfc4..36bd824f416 100644
--- a/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.H
+++ b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -120,9 +120,6 @@ public:
//- Return const access to the thermo package
virtual const psiReactionThermo& thermo() const = 0;
- //- Return tmp of rho
- virtual tmp<volScalarField> rho() const = 0;
-
// IO
diff --git a/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C b/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C
index 6d45d60ef5f..25450e2473f 100644
--- a/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C
+++ b/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -61,11 +61,4 @@ Foam::combustionModels::psiThermoCombustion::thermo() const
}
-Foam::tmp<Foam::volScalarField>
-Foam::combustionModels::psiThermoCombustion::rho() const
-{
- return thermoPtr_->rho();
-}
-
-
// ************************************************************************* //
diff --git a/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.H b/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.H
index 44a55155ada..f922e1a44d8 100644
--- a/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.H
+++ b/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -95,9 +95,6 @@ public:
//- Return const access to the thermo package
virtual const psiReactionThermo& thermo() const;
-
- //- Return const access to the density field
- virtual tmp<volScalarField> rho() const;
};
diff --git a/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C
index 70ce698d7be..b6d1ac11723 100644
--- a/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C
+++ b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -61,11 +61,4 @@ Foam::combustionModels::rhoChemistryCombustion::thermo() const
}
-Foam::tmp<Foam::volScalarField>
-Foam::combustionModels::rhoChemistryCombustion::rho() const
-{
- return chemistryPtr_->thermo().rho();
-}
-
-
// ************************************************************************* //
diff --git a/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H
index 2a37812e05b..c8389c0ea53 100644
--- a/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H
+++ b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -95,9 +95,6 @@ public:
//- Return const access to the thermo package
virtual const rhoReactionThermo& thermo() const;
-
- //- Return const access to the density field
- virtual tmp<volScalarField> rho() const;
};
diff --git a/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.H b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.H
index 341b5b6dcd6..0266c74b3e0 100644
--- a/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.H
+++ b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -127,9 +127,6 @@ public:
//- Return const access to the thermo package
virtual const rhoReactionThermo& thermo() const = 0;
- //- Return tmp of rho
- virtual tmp<volScalarField> rho() const = 0;
-
// IO
diff --git a/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C b/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C
index ef95710f2a4..aa645f0898a 100644
--- a/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C
+++ b/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -61,11 +61,4 @@ Foam::combustionModels::rhoThermoCombustion::thermo() const
}
-Foam::tmp<Foam::volScalarField>
-Foam::combustionModels::rhoThermoCombustion::rho() const
-{
- return thermoPtr_().rho();
-}
-
-
// ************************************************************************* //
diff --git a/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.H b/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.H
index 6982569fa6f..43041d46010 100644
--- a/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.H
+++ b/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -95,9 +95,6 @@ public:
//- Return const access to the thermo package
virtual const rhoReactionThermo& thermo() const;
-
- //- Return const access to the density field
- virtual tmp<volScalarField> rho() const;
};
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/omega b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/FSDomega
similarity index 98%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/omega
rename to tutorials/combustion/fireFoam/les/smallPoolFire2D/0/FSDomega
index faca2f4dd86..f91a845488e 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/omega
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/FSDomega
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object omega;
+ object FSDomega;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties
index 51e80f82d64..dff08d26af8 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties
@@ -35,6 +35,8 @@ FSDCoeffs
fuel Methane;
+ semiImplicit no;
+
relaxationCoeffs
{
C 2.0;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
index 82cb86a5110..60500f78323 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
@@ -30,8 +30,10 @@ divSchemes
default none;
div(phi,U) Gauss LUST grad(U);
+ div(U) Gauss linear;
div(phi,K) Gauss linear;
div(phi,k) Gauss limitedLinear 1;
+ div(phi,FSDomega) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss multivariateSelection
{
O2 limitedLinear01 1;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
index 4506a37939c..063fada2c7f 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
@@ -54,7 +54,7 @@ solvers
}
- "(U|Yi|k|h|omega)"
+ "(U|Yi|k|h|FSDomega)"
{
solver PBiCGStab;
preconditioner DILU;
@@ -63,7 +63,7 @@ solvers
nSweeps 1;
};
- "(U|Yi|k|h|omega)Final"
+ "(U|Yi|k|h|FSDomega)Final"
{
$U;
tolerance 1e-6;
--
GitLab
From b5e263be0d2fdd71d3741d0ed699304e1c1bf408 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Fri, 9 Sep 2016 20:00:26 +0100
Subject: [PATCH 07/42] foamEtcFile: replaced redundant package directory name
---
bin/foamEtcFile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/foamEtcFile b/bin/foamEtcFile
index 4deb76e192b..3d3d01864e4 100755
--- a/bin/foamEtcFile
+++ b/bin/foamEtcFile
@@ -103,7 +103,7 @@ OpenFOAM-*) # standard naming convention OpenFOAM-<VERSION>
version="${projectDirName##OpenFOAM-}"
;;
-openfoam[0-9]* | openfoamdev) # debian naming convention 'openfoam<VERSION>'
+openfoam[0-9]* | openfoam-dev) # debian naming convention 'openfoam<VERSION>'
versionNum="${projectDirName##openfoam}"
case "$versionNum" in
??) # convert 2 digit version number to decimal delineated
--
GitLab
From 34928b7c82d10d35d92f1f89fe1476564613548d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 9 Sep 2016 21:48:29 +0100
Subject: [PATCH 08/42] reactingEulerFoam/interfacialModels/dragModels:
Corrected file permissions
---
.../interfacialModels/dragModels/Beetstra/Beetstra.C | 0
.../interfacialModels/dragModels/Beetstra/Beetstra.H | 0
.../interfacialModels/dragModels/Tenneti/Tenneti.C | 0
.../interfacialModels/dragModels/Tenneti/Tenneti.H | 3 ++-
4 files changed, 2 insertions(+), 1 deletion(-)
mode change 100755 => 100644 applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C
mode change 100755 => 100644 applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H
mode change 100755 => 100644 applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C
mode change 100755 => 100644 applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C
old mode 100755
new mode 100644
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H
old mode 100755
new mode 100644
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C
old mode 100755
new mode 100644
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H
old mode 100755
new mode 100644
index 3003dbc5941..bc1601e976b
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H
@@ -58,6 +58,7 @@ namespace dragModels
{
class SchillerNaumann;
+
/*---------------------------------------------------------------------------*\
Class Tenneti Declaration
\*---------------------------------------------------------------------------*/
@@ -68,7 +69,7 @@ class Tenneti
{
// Private data
- //- Ergun drag model
+ //- SchillerNaumann drag model
autoPtr<SchillerNaumann> SchillerNaumann_;
//- Residual Reynolds Number
--
GitLab
From b3e52247536497f279ac195105bc8374bf49fc03 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 10 Sep 2016 16:44:01 +0100
Subject: [PATCH 09/42] GAMGSolverSolve: Replace PBiCG with PBiCGStab to solve
the coarsest-level of asymmetric matrices
---
.../matrices/lduMatrix/solvers/GAMG/GAMGSolver.H | 6 +++---
.../lduMatrix/solvers/GAMG/GAMGSolverSolve.C | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
index 4a2990cc540..c909cbc2eb9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
@@ -39,7 +39,7 @@ Description
- Coarse matrix scaling: performed by correction scaling, using steepest
descent optimisation.
- Type of cycle: V-cycle with optional pre-smoothing.
- - Coarsest-level matrix solved using PCG or PBiCG.
+ - Coarsest-level matrix solved using PCG or PBiCGStab.
SourceFiles
GAMGSolver.C
@@ -300,9 +300,9 @@ class GAMGSolver
const scalar relTol
) const;
- //- Create and return the dictionary to specify the PBiCG solver
+ //- Create and return the dictionary to specify the PBiCGStab solver
// to solve the coarsest level
- dictionary PBiCGsolverDict
+ dictionary PBiCGStabSolverDict
(
const scalar tol,
const scalar relTol
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index fbd1b401798..c4157d57f2c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -25,7 +25,7 @@ License
#include "GAMGSolver.H"
#include "PCG.H"
-#include "PBiCG.H"
+#include "PBiCGStab.H"
#include "SubField.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@@ -533,13 +533,13 @@ Foam::dictionary Foam::GAMGSolver::PCGsolverDict
}
-Foam::dictionary Foam::GAMGSolver::PBiCGsolverDict
+Foam::dictionary Foam::GAMGSolver::PBiCGStabSolverDict
(
const scalar tol,
const scalar relTol
) const
{
- dictionary dict(IStringStream("solver PBiCG; preconditioner DILU;")());
+ dictionary dict(IStringStream("solver PBiCGStab; preconditioner DILU;")());
dict.add("tolerance", tol);
dict.add("relTol", relTol);
@@ -612,14 +612,14 @@ void Foam::GAMGSolver::solveCoarsestLevel
//
// if (allMatrix.asymmetric())
// {
- // coarseSolverPerf = PBiCG
+ // coarseSolverPerf = PBiCGStab
// (
// "coarsestLevelCorr",
// allMatrix,
// procInterfaceLevelsBouCoeffs_[coarsestLevel],
// procInterfaceLevelsIntCoeffs_[coarsestLevel],
// procInterfaceLevels_[coarsestLevel],
- // PBiCGsolverDict(tolerance_, relTol_)
+ // PBiCGStabSolverDict(tolerance_, relTol_)
// ).solve
// (
// coarsestCorrField,
@@ -673,14 +673,14 @@ void Foam::GAMGSolver::solveCoarsestLevel
if (matrixLevels_[coarsestLevel].asymmetric())
{
- coarseSolverPerf = PBiCG
+ coarseSolverPerf = PBiCGStab
(
"coarsestLevelCorr",
matrixLevels_[coarsestLevel],
interfaceLevelsBouCoeffs_[coarsestLevel],
interfaceLevelsIntCoeffs_[coarsestLevel],
interfaceLevels_[coarsestLevel],
- PBiCGsolverDict(tolerance_, relTol_)
+ PBiCGStabSolverDict(tolerance_, relTol_)
).solve
(
coarsestCorrField,
--
GitLab
From e75d811b7d67872266c0175c1eebb7c2c33e88e1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 14 Sep 2016 09:41:03 +0100
Subject: [PATCH 10/42] MGridGenGAMGAgglomeration: Update call to
continueAgglomerating Resolves bug-report
http://bugs.openfoam.org/view.php?id=2244
---
.../MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
index 6959e4b2fde..644a585366d 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
@@ -286,7 +286,7 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
);
}
- if (continueAgglomerating(nCoarseCells))
+ if (continueAgglomerating(finalAgglomPtr().size(), nCoarseCells))
{
nCells_[nCreatedLevels] = nCoarseCells;
restrictAddressing_.set(nCreatedLevels, finalAgglomPtr);
--
GitLab
From 8dc78d188a6bc97a99cc5b5e768fc7915d0ed6f7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 14 Sep 2016 09:59:02 +0100
Subject: [PATCH 11/42] rigidBodyMeshMotionSolver: experimental nDoF
mesh-motion solver supporting the displacement-based elliptic solvers
Specification for the tutorials/multiphase/interDyMFoam/ras/floatingObject case:
dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ("librigidBodyMeshMotion.so" "libfvMotionSolvers.so");
solver rigidBodyMotionSolver;
rigidBodyMotionSolverCoeffs
{
report on;
meshSolver
{
solver displacementLaplacian;
displacementLaplacianCoeffs
{
diffusivity inverseDistance (floatingObject);
}
}
.
.
.
---
.../rigidBodyMotion/rigidBodyMotion.C | 22 ++
.../rigidBodyMotion/rigidBodyMotion.H | 8 +
src/rigidBodyMeshMotion/Make/files | 3 +-
.../rigidBodyMeshMotion.C | 0
.../rigidBodyMeshMotion.H | 0
.../rigidBodyMeshMotionSolver.C | 334 ++++++++++++++++++
.../rigidBodyMeshMotionSolver.H | 184 ++++++++++
7 files changed, 550 insertions(+), 1 deletion(-)
rename src/rigidBodyMeshMotion/{ => rigidBodyMeshMotion}/rigidBodyMeshMotion.C (100%)
rename src/rigidBodyMeshMotion/{ => rigidBodyMeshMotion}/rigidBodyMeshMotion.H (100%)
create mode 100644 src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
create mode 100644 src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
index f14acc6e60a..94794dfe50a 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
@@ -178,6 +178,28 @@ void Foam::RBD::rigidBodyMotion::status(const label bodyID) const
}
+Foam::tmp<Foam::pointField> Foam::RBD::rigidBodyMotion::transformPoints
+(
+ const label bodyID,
+ const pointField& initialPoints
+) const
+{
+ // Calculate the transform from the initial state in the global frame
+ // to the current state in the global frame
+ spatialTransform X(X0(bodyID).inv() & X00(bodyID));
+
+ tmp<pointField> tpoints(new pointField(initialPoints.size()));
+ pointField& points = tpoints.ref();
+
+ forAll(points, i)
+ {
+ points[i] = X.transformPoint(initialPoints[i]);
+ }
+
+ return tpoints;
+}
+
+
Foam::tmp<Foam::pointField> Foam::RBD::rigidBodyMotion::transformPoints
(
const label bodyID,
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
index c386169064b..d065d9797c2 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
@@ -183,6 +183,14 @@ public:
// Transformations
+ //- Transform the given initial pointField of the specified body
+ // to correspond to the current motion state
+ tmp<pointField> transformPoints
+ (
+ const label bodyID,
+ const pointField& initialPoints
+ ) const;
+
//- Transform the given initial pointField of the specified body
// to correspond to the current motion state scaled using
// 'slerp' interpolation
diff --git a/src/rigidBodyMeshMotion/Make/files b/src/rigidBodyMeshMotion/Make/files
index f7fcbc13617..57443ab01dd 100644
--- a/src/rigidBodyMeshMotion/Make/files
+++ b/src/rigidBodyMeshMotion/Make/files
@@ -1,3 +1,4 @@
-rigidBodyMeshMotion.C
+rigidBodyMeshMotion/rigidBodyMeshMotion.C
+rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
LIB = $(FOAM_LIBBIN)/librigidBodyMeshMotion
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
similarity index 100%
rename from src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
rename to src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
similarity index 100%
rename from src/rigidBodyMeshMotion/rigidBodyMeshMotion.H
rename to src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
new file mode 100644
index 00000000000..f6476e46a03
--- /dev/null
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
@@ -0,0 +1,334 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "rigidBodyMeshMotionSolver.H"
+#include "addToRunTimeSelectionTable.H"
+#include "polyMesh.H"
+#include "pointPatchDist.H"
+#include "pointConstraints.H"
+#include "uniformDimensionedFields.H"
+#include "forces.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(rigidBodyMeshMotionSolver, 0);
+
+ addToRunTimeSelectionTable
+ (
+ motionSolver,
+ rigidBodyMeshMotionSolver,
+ dictionary
+ );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::rigidBodyMeshMotionSolver::bodyMesh::bodyMesh
+(
+ const polyMesh& mesh,
+ const word& name,
+ const label bodyID,
+ const dictionary& dict
+)
+:
+ name_(name),
+ bodyID_(bodyID),
+ patches_(wordReList(dict.lookup("patches"))),
+ patchSet_(mesh.boundaryMesh().patchSet(patches_))
+{}
+
+
+Foam::rigidBodyMeshMotionSolver::rigidBodyMeshMotionSolver
+(
+ const polyMesh& mesh,
+ const IOdictionary& dict
+)
+:
+ motionSolver(mesh, dict, typeName),
+ model_
+ (
+ coeffDict(),
+ IOobject
+ (
+ "rigidBodyMotionState",
+ mesh.time().timeName(),
+ "uniform",
+ mesh
+ ).headerOk()
+ ? IOdictionary
+ (
+ IOobject
+ (
+ "rigidBodyMotionState",
+ mesh.time().timeName(),
+ "uniform",
+ mesh,
+ IOobject::READ_IF_PRESENT,
+ IOobject::NO_WRITE,
+ false
+ )
+ )
+ : coeffDict()
+ ),
+ test_(coeffDict().lookupOrDefault<Switch>("test", false)),
+ rhoInf_(1.0),
+ rhoName_(coeffDict().lookupOrDefault<word>("rho", "rho")),
+ curTimeIndex_(-1),
+ meshSolverPtr_
+ (
+ motionSolver::New
+ (
+ mesh,
+ IOdictionary
+ (
+ IOobject
+ (
+ "rigidBodyMotionSolver:meshSolver",
+ mesh.time().constant(),
+ mesh
+ ),
+ coeffDict().subDict("meshSolver")
+ )
+ )
+ ),
+ meshSolver_(refCast<displacementMotionSolver>(meshSolverPtr_()))
+{
+ if (rhoName_ == "rhoInf")
+ {
+ rhoInf_ = readScalar(coeffDict().lookup("rhoInf"));
+ }
+
+ const dictionary& bodiesDict = coeffDict().subDict("bodies");
+
+ forAllConstIter(IDLList<entry>, bodiesDict, iter)
+ {
+ const dictionary& bodyDict = iter().dict();
+
+ if (bodyDict.found("patches"))
+ {
+ const label bodyID = model_.bodyID(iter().keyword());
+
+ if (bodyID == -1)
+ {
+ FatalErrorInFunction
+ << "Body " << iter().keyword()
+ << " has been merged with another body"
+ " and cannot be assigned a set of patches"
+ << exit(FatalError);
+ }
+
+ bodyMeshes_.append
+ (
+ new bodyMesh
+ (
+ mesh,
+ iter().keyword(),
+ bodyID,
+ bodyDict
+ )
+ );
+ }
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::rigidBodyMeshMotionSolver::~rigidBodyMeshMotionSolver()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::pointField>
+Foam::rigidBodyMeshMotionSolver::curPoints() const
+{
+ return meshSolverPtr_->curPoints();
+}
+
+
+void Foam::rigidBodyMeshMotionSolver::solve()
+{
+ const Time& t = mesh().time();
+
+ if (mesh().nPoints() != meshSolver_.points0().size())
+ {
+ FatalErrorInFunction
+ << "The number of points in the mesh seems to have changed." << endl
+ << "In constant/polyMesh there are " << meshSolver_.points0().size()
+ << " points; in the current mesh there are " << mesh().nPoints()
+ << " points." << exit(FatalError);
+ }
+
+ // Store the motion state at the beginning of the time-step
+ if (curTimeIndex_ != this->db().time().timeIndex())
+ {
+ model_.newTime();
+ curTimeIndex_ = this->db().time().timeIndex();
+ }
+
+ if (db().foundObject<uniformDimensionedVectorField>("g"))
+ {
+ model_.g() =
+ db().lookupObject<uniformDimensionedVectorField>("g").value();
+ }
+
+ if (test_)
+ {
+ label nIter(readLabel(coeffDict().lookup("nIter")));
+
+ for (label i=0; i<nIter; i++)
+ {
+ model_.solve
+ (
+ t.deltaTValue(),
+ scalarField(model_.nDoF(), Zero),
+ Field<spatialVector>(model_.nBodies(), Zero)
+ );
+ }
+ }
+ else
+ {
+ Field<spatialVector> fx(model_.nBodies(), Zero);
+
+ forAll(bodyMeshes_, bi)
+ {
+ const label bodyID = bodyMeshes_[bi].bodyID_;
+
+ dictionary forcesDict;
+ forcesDict.add("type", functionObjects::forces::typeName);
+ forcesDict.add("patches", bodyMeshes_[bi].patches_);
+ forcesDict.add("rhoInf", rhoInf_);
+ forcesDict.add("rho", rhoName_);
+ forcesDict.add("CofR", vector::zero);
+
+ functionObjects::forces f("forces", db(), forcesDict);
+ f.calcForcesMoment();
+
+ fx[bodyID] = spatialVector(f.momentEff(), f.forceEff());
+ }
+
+ model_.solve
+ (
+ t.deltaTValue(),
+ scalarField(model_.nDoF(), Zero),
+ fx
+ );
+ }
+
+ if (Pstream::master() && model_.report())
+ {
+ forAll(bodyMeshes_, bi)
+ {
+ model_.status(bodyMeshes_[bi].bodyID_);
+ }
+ }
+
+ // Update the displacements
+ forAll(bodyMeshes_, bi)
+ {
+ forAllConstIter(labelHashSet, bodyMeshes_[bi].patchSet_, iter)
+ {
+ label patchi = iter.key();
+
+ pointField patchPoints0
+ (
+ meshSolver_.pointDisplacement().boundaryField()[patchi]
+ .patchInternalField(meshSolver_.points0())
+ );
+
+ meshSolver_.pointDisplacement().boundaryFieldRef()[patchi] ==
+ (
+ model_.transformPoints
+ (
+ bodyMeshes_[bi].bodyID_,
+ patchPoints0
+ ) - patchPoints0
+ )();
+ }
+ }
+
+ meshSolverPtr_->solve();
+}
+
+
+bool Foam::rigidBodyMeshMotionSolver::writeObject
+(
+ IOstream::streamFormat fmt,
+ IOstream::versionNumber ver,
+ IOstream::compressionType cmp
+) const
+{
+ IOdictionary dict
+ (
+ IOobject
+ (
+ "rigidBodyMotionState",
+ mesh().time().timeName(),
+ "uniform",
+ mesh(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ )
+ );
+
+ model_.state().write(dict);
+ return dict.regIOobject::write();
+}
+
+
+bool Foam::rigidBodyMeshMotionSolver::read()
+{
+ if (motionSolver::read())
+ {
+ model_.read(coeffDict());
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+
+void Foam::rigidBodyMeshMotionSolver::movePoints(const pointField& points)
+{
+ meshSolverPtr_->movePoints(points);
+}
+
+
+void Foam::rigidBodyMeshMotionSolver::updateMesh(const mapPolyMesh& mpm)
+{
+ meshSolverPtr_->updateMesh(mpm);
+}
+
+
+// ************************************************************************* //
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
new file mode 100644
index 00000000000..26dfb21899b
--- /dev/null
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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::rigidBodyMeshMotionSolver
+
+Description
+ Rigid-body mesh motion solver for fvMesh.
+
+ Applies septernion interpolation of movement as function of distance to the
+ object surface.
+
+SourceFiles
+ rigidBodyMeshMotionSolver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef rigidBodyMeshMotionSolver_H
+#define rigidBodyMeshMotionSolver_H
+
+#include "displacementMotionSolver.H"
+#include "rigidBodyMotion.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class rigidBodyMeshMotionSolver Declaration
+\*---------------------------------------------------------------------------*/
+
+class rigidBodyMeshMotionSolver
+:
+ public motionSolver
+{
+ //- Class containing the patches and point motion weighting for each body
+ class bodyMesh
+ {
+ //- Name of the body
+ const word name_;
+
+ //- ID of the body in the RBD::rigidBodyMotion
+ const label bodyID_;
+
+ //- List of mesh patches associated with this body
+ const wordReList patches_;
+
+ //- Patches to integrate forces
+ const labelHashSet patchSet_;
+
+
+ public:
+
+ friend class rigidBodyMeshMotionSolver;
+
+ bodyMesh
+ (
+ const polyMesh& mesh,
+ const word& name,
+ const label bodyID,
+ const dictionary& dict
+ );
+ };
+
+
+ // Private data
+
+ //- Rigid-body model
+ RBD::rigidBodyMotion model_;
+
+ //- List of the bodyMeshes containing the patches and point motion
+ // weighting for each body
+ PtrList<bodyMesh> bodyMeshes_;
+
+ //- Switch for test-mode in which only the
+ // gravitational body-force is applied
+ Switch test_;
+
+ //- Reference density required by the forces object for
+ // incompressible calculations, required if rho == rhoInf
+ scalar rhoInf_;
+
+ //- Name of density field, optional unless used for an
+ // incompressible simulation, when this needs to be specified
+ // as rhoInf
+ word rhoName_;
+
+ //- Current time index (used for updating)
+ label curTimeIndex_;
+
+ autoPtr<motionSolver> meshSolverPtr_;
+
+ displacementMotionSolver& meshSolver_;
+
+
+ // Private Member Functions
+
+ //- Disallow default bitwise copy construct
+ rigidBodyMeshMotionSolver
+ (
+ const rigidBodyMeshMotionSolver&
+ );
+
+ //- Disallow default bitwise assignment
+ void operator=(const rigidBodyMeshMotionSolver&);
+
+
+public:
+
+ //- Runtime type information
+ TypeName("rigidBodyMotionSolver");
+
+
+ // Constructors
+
+ //- Construct from polyMesh and IOdictionary
+ rigidBodyMeshMotionSolver
+ (
+ const polyMesh&,
+ const IOdictionary& dict
+ );
+
+
+ //- Destructor
+ ~rigidBodyMeshMotionSolver();
+
+
+ // Member Functions
+
+ //- Return point location obtained from the current motion field
+ virtual tmp<pointField> curPoints() const;
+
+ //- Solve for motion
+ virtual void solve();
+
+ //- Write state using given format, version and compression
+ virtual bool writeObject
+ (
+ IOstream::streamFormat fmt,
+ IOstream::versionNumber ver,
+ IOstream::compressionType cmp
+ ) const;
+
+ //- Read dynamicMeshDict dictionary
+ virtual bool read();
+
+ //- Update local data for geometry changes
+ virtual void movePoints(const pointField&);
+
+ //- Update local data for topology changes
+ virtual void updateMesh(const mapPolyMesh&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
--
GitLab
From f281477d85c21530c935879eafc71b388a0d25dd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 14 Sep 2016 14:14:14 +0100
Subject: [PATCH 12/42] rigidBodyMotion: Change the transform averaging to use
approximate inverse-distance weighting Now works correctly for an arbitrary
number of bodies Resolves bug-report
http://bugs.openfoam.org/view.php?id=2211
---
.../rigidBodyMotion/rigidBodyMotion.C | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
index 94794dfe50a..6cf2514c04e 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
@@ -271,25 +271,23 @@ Foam::tmp<Foam::pointField> Foam::RBD::rigidBodyMotion::transformPoints
forAll(points, i)
{
- // Sum (1 - wi) and find the maximum wi
- scalar sum1mw = 0;
- scalar maxw = 0;
+ // Initialize to 1 for the far-field weight
+ scalar sum1mw = 1;
forAll(bodyIDs, bi)
{
w[bi] = (*(weights[bi]))[i];
- sum1mw += 1 - w[bi];
- maxw = max(maxw, w[bi]);
+ sum1mw += w[bi]/(1 + SMALL - w[bi]);
}
- // Calculate the limiter for (1 - wi) to ensure the sum(wi) = maxw
- scalar lambda = (w.size() - 1 - maxw)/sum1mw;
+ // Calculate the limiter for wi/(1 - wi) to ensure the sum(wi) = 1
+ scalar lambda = 1/sum1mw;
- // Limit (1 - wi) and sum the resulting wi
+ // Limit wi/(1 - wi) and sum the resulting wi
scalar sumw = 0;
forAll(bodyIDs, bi)
{
- w[bi] = 1 - lambda*(1 - w[bi]);
+ w[bi] = lambda*w[bi]/(1 + SMALL - w[bi]);
sumw += w[bi];
}
--
GitLab
From 7cc35abc3a121700fd27872306a316b5c5892da2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 16 Sep 2016 11:10:03 +0100
Subject: [PATCH 13/42] GAMGAgglomeration: corrected continueAgglomerating
Patch provided by Mattijs Janssens Resolves bug-report
http://bugs.openfoam.org/view.php?id=2226
---
.../GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index eb73b6f436d..65898e9c134 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -211,9 +211,9 @@ bool Foam::GAMGAgglomeration::continueAgglomerating
) const
{
const label nTotalCoarseCells = returnReduce(nCoarseCells, sumOp<label>());
- if (nTotalCoarseCells >= Pstream::nProcs()*nCellsInCoarsestLevel_)
+ if (nTotalCoarseCells < Pstream::nProcs()*nCellsInCoarsestLevel_)
{
- return true;
+ return false;
}
else
{
--
GitLab
From 899fe81eba8c811425c43e27005ac21d076d7c02 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 16 Sep 2016 14:49:50 +0100
Subject: [PATCH 14/42] PatchToPatchInterpolate: Update to use the tmp ref()
non-const access function Resolves bug-report
http://bugs.openfoam.org/view.php?id=2248
---
.../patchToPatchInterpolation/PatchToPatchInterpolate.C | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
index 5ce595791e6..82857f50192 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
@@ -54,7 +54,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
new Field<Type>(toPatch_.nPoints(), Zero)
);
- Field<Type>& result = tresult();
+ Field<Type>& result = tresult.ref();
const List<typename FromPatch::FaceType>& fromPatchLocalFaces =
fromPatch_.localFaces();
@@ -118,7 +118,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
new Field<Type>(toPatch_.size(), Zero)
);
- Field<Type>& result = tresult();
+ Field<Type>& result = tresult.ref();
const labelListList& fromPatchFaceFaces = fromPatch_.faceFaces();
--
GitLab
From 91c8c053a96209478b605487e98dd5832d063f74 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 16 Sep 2016 17:39:50 +0100
Subject: [PATCH 15/42] setInitialMultiRegionDeltaT: update to be consistent
with the standard setInitialDeltaT Resolves bug-report
http://bugs.openfoam.org/bug_change_status_page.php
---
.../include/setInitialMultiRegionDeltaT.H | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H
index bf831e93c23..f768c3c8b82 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Global
- setInitialDeltaT
+ setInitialMultiRegionDeltaT
Description
Set the initial timestep for the CHT MultiRegion solver.
@@ -48,7 +48,7 @@ if (adjustTimeStep)
min
(
min(maxCo/CoNum, maxDi/DiNum)*runTime.deltaT().value(),
- maxDeltaT
+ min(runTime.deltaTValue(), maxDeltaT)
)
);
Info<< "deltaT = " << runTime.deltaT().value() << endl;
--
GitLab
From fd2ac09c4e4b740abaa8e9ab1002f67aacb170b7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 17 Sep 2016 14:53:15 +0100
Subject: [PATCH 16/42] mapFields: reset the FOAM_CASE environment variable
Patch proveded by Alexey Matveichev Resolves bug-report
http://bugs.openfoam.org/view.php?id=2229
---
.../utilities/preProcessing/mapFields/createTimes.H | 6 ++++++
applications/utilities/preProcessing/mapFields/mapFields.C | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/applications/utilities/preProcessing/mapFields/createTimes.H b/applications/utilities/preProcessing/mapFields/createTimes.H
index 91e6a349aec..bcac99a3ae5 100644
--- a/applications/utilities/preProcessing/mapFields/createTimes.H
+++ b/applications/utilities/preProcessing/mapFields/createTimes.H
@@ -1,11 +1,17 @@
Info<< "\nCreate databases as time" << endl;
+ const auto caseDirOrig = getEnv("FOAM_CASE");
+ const auto caseNameOrig = getEnv("FOAM_CASE_NAME");
+ setEnv("FOAM_CASE", rootDirSource/caseDirSource, true);
+ setEnv("FOAM_CASE_NAME", caseDirSource, true);
Time runTimeSource
(
Time::controlDictName,
rootDirSource,
caseDirSource
);
+ setEnv("FOAM_CASE", caseDirOrig, true);
+ setEnv("FOAM_CASE_NAME", caseNameOrig, true);
Time runTimeTarget
(
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 16e70e88e8e..1dca92e47c6 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -236,8 +236,8 @@ int main(int argc, char *argv[])
fileName rootDirTarget(args.rootPath());
fileName caseDirTarget(args.globalCaseName());
- const fileName casePath = args[1];
- const fileName rootDirSource = casePath.path();
+ fileName casePath = args[1];
+ const fileName rootDirSource = casePath.path().toAbsolute();
const fileName caseDirSource = casePath.name();
Info<< "Source: " << rootDirSource << " " << caseDirSource << endl;
--
GitLab
From 3aa78f2bf382b931e159a523e09653853ff52ed7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 19 Sep 2016 07:52:42 +0100
Subject: [PATCH 17/42] blockMesh: Added block face orientation checks to aid
debugging
Individual inward-pointing faces are checked and if all faces are
inward-pointing the block is inside-out. These errors are fatal and the
message indicates which block the error occurs in and where in the
blockMeshDict the block is defined.
---
.../blockDescriptor/blockDescriptor.C | 65 ++++++++++++++++++-
.../blockDescriptor/blockDescriptor.H | 3 +
2 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
index 1bdb4a82d7d..f8f148756dd 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
@@ -23,9 +23,66 @@ License
\*---------------------------------------------------------------------------*/
-#include "error.H"
#include "blockDescriptor.H"
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+void Foam::blockDescriptor::check(const Istream& is)
+{
+ const point blockCentre(blockShape_.centre(blockPointField_));
+ const faceList faces(blockShape_.faces());
+
+ // Check each face is outward-pointing with respect to the block centre
+ label outwardFaceCount = 0;
+ boolList correctFaces(faces.size(), true);
+
+ forAll(faces, i)
+ {
+ point faceCentre(faces[i].centre(blockPointField_));
+ vector faceNormal(faces[i].normal(blockPointField_));
+ if (mag(faceNormal) > SMALL)
+ {
+ if (((faceCentre - blockCentre) & faceNormal) > 0)
+ {
+ outwardFaceCount++;
+ }
+ else
+ {
+ correctFaces[i] = false;
+ }
+ }
+ else
+ {
+ outwardFaceCount++;
+ }
+ }
+
+ // If all faces are inward-pointing the block is inside-out
+ if (outwardFaceCount == 0)
+ {
+ FatalIOErrorInFunction(is)
+ << "Block " << *this << " is inside-out"
+ << exit(FatalIOError);
+ }
+ else if (outwardFaceCount != faces.size())
+ {
+ FatalIOErrorInFunction(is)
+ << "Block " << *this << " has inward-pointing faces"
+ << nl << " ";
+
+ forAll(correctFaces, i)
+ {
+ if (!correctFaces[i])
+ {
+ FatalIOError<< faces[i] << token::SPACE;
+ }
+ }
+
+ FatalIOError << exit(FatalIOError);
+ }
+}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::blockDescriptor::blockDescriptor
@@ -156,11 +213,13 @@ Foam::blockDescriptor::blockDescriptor
}
else
{
- FatalErrorInFunction
+ FatalIOErrorInFunction(is)
<< "Unknown definition of expansion ratios: " << expRatios
- << exit(FatalError);
+ << exit(FatalIOError);
}
+ check(is);
+
// Create a list of edges
makeBlockEdges();
}
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
index c245eefccc9..37bba39bba9 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
@@ -90,6 +90,9 @@ class blockDescriptor
// Private Member Functions
+ //- Check block has outward-pointing faces
+ void check(const Istream& is);
+
//- Set the points/weights for all edges
void makeBlockEdges();
--
GitLab
From b32bd3f29599417728e59bb7a1a7aabde1a7c6f3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 19 Sep 2016 22:08:39 +0100
Subject: [PATCH 18/42] solvers: Moved createRDeltaT.H into createFields.H so
that it is available with the -postProcess option
Required to support LTS with the -postProcess option with sub-models dependent on ddt
terms during construction, in particular reactingTwoPhaseEulerFoam.
---
applications/solvers/combustion/reactingFoam/createFields.H | 2 ++
applications/solvers/combustion/reactingFoam/reactingFoam.C | 1 -
.../reactingFoam/rhoReactingBuoyantFoam/createFields.H | 2 ++
.../rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C | 1 -
.../combustion/reactingFoam/rhoReactingFoam/createFields.H | 2 ++
.../combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C | 1 -
applications/solvers/compressible/rhoCentralFoam/createFields.H | 2 ++
.../rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C | 2 ++
.../solvers/compressible/rhoCentralFoam/rhoCentralFoam.C | 1 -
applications/solvers/compressible/rhoPimpleFoam/createFields.H | 2 ++
.../rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C | 1 -
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C | 1 -
.../solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C | 1 -
.../solvers/lagrangian/coalChemistryFoam/createFields.H | 2 ++
.../solvers/lagrangian/reactingParcelFoam/createFields.H | 2 ++
.../solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C | 1 -
applications/solvers/multiphase/interFoam/createFields.H | 2 ++
.../solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C | 1 -
applications/solvers/multiphase/interFoam/interFoam.C | 1 -
.../solvers/multiphase/interFoam/interMixingFoam/createFields.H | 2 ++
.../multiphase/interFoam/interMixingFoam/interMixingFoam.C | 1 -
.../reactingMultiphaseEulerFoam/createFields.H | 1 +
.../reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C | 1 -
.../reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H | 1 +
.../reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C | 1 -
25 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H
index bebae9978cb..e4475e5d1b5 100644
--- a/applications/solvers/combustion/reactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "createRDeltaT.H"
+
Info<< "Creating reaction model\n" << endl;
autoPtr<combustionModels::psiCombustionModel> reaction
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index efcc5eb0e18..1ad7568022b 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -49,7 +49,6 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "createControl.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createFieldRefs.H"
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H
index 02e1e65b5c8..a4b328f3674 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "createRDeltaT.H"
+
Info<< "Creating reaction model\n" << endl;
autoPtr<combustionModels::rhoCombustionModel> reaction
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
index 8c868175388..4d9258e3da5 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
@@ -50,7 +50,6 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "createControl.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createFieldRefs.H"
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H
index c5d3bf6a674..fbd45dd20c9 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "createRDeltaT.H"
+
Info<< "Creating reaction model\n" << endl;
autoPtr<combustionModels::rhoCombustionModel> reaction
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
index 479399a2b0e..b6cda2184c5 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
@@ -50,7 +50,6 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "createControl.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createFieldRefs.H"
diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H
index d4255938103..b7cbdd067f8 100644
--- a/applications/solvers/compressible/rhoCentralFoam/createFields.H
+++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "createRDeltaT.H"
+
Info<< "Reading thermophysical properties\n" << endl;
autoPtr<psiThermo> pThermo
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
index 3a61fcaab0a..7f31cf3cb43 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
@@ -36,6 +36,8 @@ Description
#include "turbulentFluidThermoModel.H"
#include "fixedRhoFvPatchScalarField.H"
#include "directionInterpolate.H"
+#include "localEulerDdtScheme.H"
+#include "fvcSmooth.H"
#include "motionSolver.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index d276cce8082..2d5357bf242 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -51,7 +51,6 @@ int main(int argc, char *argv[])
#include "createFields.H"
#include "createFieldRefs.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
turbulence->validate();
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 8d1ccb82fd6..a7ee3eca457 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "createRDeltaT.H"
+
Info<< "Reading thermophysical properties\n" << endl;
autoPtr<psiThermo> pThermo
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
index 9613b4a9a69..c7046bb9b40 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
@@ -57,7 +57,6 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "createControl.H"
- #include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createFieldRefs.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 94df912700f..108ad9aa0e4 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -53,7 +53,6 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "createControl.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createFieldRefs.H"
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 809571a35fd..cb12fc2b9c9 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -53,7 +53,6 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "createControl.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
#include "createFields.H"
#include "createFieldRefs.H"
#include "createFvOptions.H"
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
index 33313ca0704..d3daf7265c1 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "createRDeltaT.H"
+
#include "readGravitationalAcceleration.H"
Info<< "Creating combustion model\n" << endl;
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
index c04c242f45f..e5ed566eba8 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "createRDeltaT.H"
+
#include "readGravitationalAcceleration.H"
Info<< "Creating combustion model\n" << endl;
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index 06838171f1a..dc9fd5c49ac 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -52,7 +52,6 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "createControl.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
#include "createFields.H"
#include "createFieldRefs.H"
#include "createFvOptions.H"
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index 77cabdc4c15..4a82afbd294 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "createRDeltaT.H"
+
Info<< "Reading field p_rgh\n" << endl;
volScalarField p_rgh
(
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index 07206d3c529..0534896b68c 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -60,7 +60,6 @@ int main(int argc, char *argv[])
#include "createControl.H"
#include "createTimeControls.H"
#include "createDyMControls.H"
- #include "createRDeltaT.H"
#include "createFields.H"
#include "createFvOptions.H"
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index c5c4be315b2..5db4d7d32e7 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -62,7 +62,6 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "createControl.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createFvOptions.H"
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
index 07e174717b3..5b152b78a7a 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "createRDeltaT.H"
+
Info<< "Reading field p_rgh\n" << endl;
volScalarField p_rgh
(
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
index 28d8d6d4bf0..b26630d3609 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
@@ -52,7 +52,6 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "createControl.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createFvOptions.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
index 8eafafb2fda..1fc5b19ca79 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
@@ -1,3 +1,4 @@
+#include "createRDeltaT.H"
#include "readGravitationalAcceleration.H"
#include "readhRef.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
index d1b1619567d..11af0415fb8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
@@ -50,7 +50,6 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "createControl.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
#include "createFields.H"
#include "createFieldRefs.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
index 932c05cb0d2..697269ff40d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
@@ -1,3 +1,4 @@
+#include "createRDeltaT.H"
#include "readGravitationalAcceleration.H"
#include "readhRef.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
index 032b9bce43e..e6fe5259dea 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
@@ -51,7 +51,6 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "createControl.H"
#include "createTimeControls.H"
- #include "createRDeltaT.H"
#include "createFields.H"
#include "createFieldRefs.H"
--
GitLab
From e468d1ecc95cad60c7547f8b2aea61c659aebd38 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 20 Sep 2016 14:50:41 +0100
Subject: [PATCH 19/42] reactingParcelFilmFoam: Corrected support for
-postProcess option
---
.../solvers/lagrangian/reactingParcelFilmFoam/Make/options | 2 +-
.../lagrangian/reactingParcelFilmFoam/createFieldRefs.H | 4 ++++
.../solvers/lagrangian/reactingParcelFilmFoam/createFields.H | 2 --
.../reactingParcelFilmFoam/createSurfaceFilmModel.H | 2 --
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index 8b2729e8c09..014cd4e3563 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I. \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I${LIB_SRC}/sampling/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \
@@ -25,7 +26,6 @@ EXE_INC = \
-I$(LIB_SRC)/combustionModels/lnInclude \
-I$(FOAM_SOLVERS)/combustion/reactingFoam
-
EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFieldRefs.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFieldRefs.H
index 4748421aa45..14914688ca1 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFieldRefs.H
@@ -1 +1,5 @@
const label inertIndex(composition.species()[inertSpecie]);
+
+const volScalarField& T = thermo.T();
+const volScalarField& psi = thermo.psi();
+filmModelType& surfaceFilm = tsurfaceFilm();
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
index 313c82d0e2e..8ec3c94169e 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
@@ -37,8 +37,6 @@ volScalarField rho
);
volScalarField& p = thermo.p();
-const volScalarField& T = thermo.T();
-const volScalarField& psi = thermo.psi();
Info<< "\nReading field U\n" << endl;
volVectorField U
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H
index 1db870f0aa7..ffdbcbf6a90 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H
@@ -3,5 +3,3 @@ Info<< "\nConstructing surface film model" << endl;
typedef regionModels::surfaceFilmModels::surfaceFilmModel filmModelType;
autoPtr<filmModelType> tsurfaceFilm(filmModelType::New(mesh, g));
-filmModelType& surfaceFilm = tsurfaceFilm();
-
--
GitLab
From 49d3b6eae9da3e39f34945948144e119bc5c6512 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 20 Sep 2016 14:51:13 +0100
Subject: [PATCH 20/42] foamList: Added missing
-I$(LIB_SRC)/meshTools/lnInclude needed for recent changes to AMI
---
applications/utilities/miscellaneous/foamList/Make/options | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options
index 441805c465f..84027a1c28d 100644
--- a/applications/utilities/miscellaneous/foamList/Make/options
+++ b/applications/utilities/miscellaneous/foamList/Make/options
@@ -6,7 +6,8 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lbarotropicCompressibilityModel \
--
GitLab
From 6b42dbae41281c35726837733c28e3567c907e6d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 20 Sep 2016 15:05:43 +0100
Subject: [PATCH 21/42] TurbulenceModels: Created a general base-class and
selection mechanism for laminar stress models
Renamed the original 'laminar' model to 'Stokes' to indicate it is a
linear stress model supporting both Newtonian and non-Newtonian
viscosity.
This general framework will support linear, non-linear, visco-elastic
etc. laminar transport models.
For backward compatibility the 'Stokes' laminar stress model can be
selected either the original 'laminar' 'simulationType'
specification in turbulenceProperties:
simulationType laminar;
or using the new more general 'laminarModel' specification:
simulationType laminar;
laminar
{
laminarModel Stokes;
}
which allows other laminar stress models to be selected.
---
.../DPMTurbulenceModels/DPMTurbulenceModels.C | 11 +-
.../compressibleTurbulenceModels.C | 13 +-
.../multiphaseCompressibleTurbulenceModels.C | 9 +-
.../phaseCompressibleTurbulenceModels.C | 9 +-
.../phaseCompressibleTurbulenceModels.C | 9 +-
.../makeTurbulenceModel.H | 34 +-
.../turbulentFluidThermoModel.H | 2 +
.../turbulentFluidThermoModels.C | 9 +
.../turbulentFluidThermoModels.H | 6 +-
.../turbulentTransportModel.H | 2 +
.../turbulentTransportModels.C | 9 +
.../turbulentTransportModels.H | 6 +-
.../laminar/{laminar.C => Stokes/Stokes.C} | 87 ++---
.../laminar/{laminar.H => Stokes/Stokes.H} | 42 ++-
.../laminar/laminarModel/laminarModel.C | 339 ++++++++++++++++++
.../laminar/laminarModel/laminarModel.H | 208 +++++++++++
.../laminar/laminarModel/laminarModelDoc.H | 32 ++
.../turbulenceModels/makeTurbulenceModel.H | 10 +-
18 files changed, 750 insertions(+), 87 deletions(-)
rename src/TurbulenceModels/turbulenceModels/laminar/{laminar.C => Stokes/Stokes.C} (75%)
rename src/TurbulenceModels/turbulenceModels/laminar/{laminar.H => Stokes/Stokes.H} (82%)
create mode 100644 src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
create mode 100644 src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H
create mode 100644 src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModelDoc.H
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
index 66b480df0e9..ae345c2066e 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
@@ -28,8 +28,8 @@ License
#include "addToRunTimeSelectionTable.H"
#include "makeTurbulenceModel.H"
-#include "laminar.H"
-#include "turbulentTransportModel.H"
+#include "laminarModel.H"
+#include "RASModel.H"
#include "LESModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,6 +52,10 @@ makeBaseTurbulenceModel
singlePhaseTransportModel
);
+#define makeLaminarModel(Type) \
+ makeTemplatedTurbulenceModel \
+ (singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, laminar, Type)
+
#define makeRASModel(Type) \
makeTemplatedTurbulenceModel \
(singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, RAS, Type)
@@ -60,6 +64,9 @@ makeBaseTurbulenceModel
makeTemplatedTurbulenceModel \
(singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, LES, Type)
+#include "Stokes.H"
+makeLaminarModel(Stokes);
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
diff --git a/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C b/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C
index 4cb722f5f4c..abf89c1500b 100644
--- a/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C
@@ -28,7 +28,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "makeTurbulenceModel.H"
-#include "laminar.H"
+#include "laminarModel.H"
#include "RASModel.H"
#include "LESModel.H"
@@ -52,6 +52,14 @@ makeBaseTurbulenceModel
incompressibleTwoPhaseInteractingMixture
);
+#define makeLaminarModel(Type) \
+ makeTemplatedTurbulenceModel \
+ ( \
+ incompressibleTwoPhaseInteractingMixtureCompressibleTurbulenceModel, \
+ laminar, \
+ Type \
+ )
+
#define makeRASModel(Type) \
makeTemplatedTurbulenceModel \
( \
@@ -68,6 +76,9 @@ makeBaseTurbulenceModel
Type \
)
+#include "Stokes.H"
+makeLaminarModel(Stokes);
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
index 083c2567f35..92089901d6b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
@@ -27,7 +27,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "makeTurbulenceModel.H"
-#include "laminar.H"
+#include "laminarModel.H"
#include "RASModel.H"
#include "LESModel.H"
@@ -53,6 +53,10 @@ makeBaseTurbulenceModel
phaseModel
);
+#define makeLaminarModel(Type) \
+ makeTemplatedLaminarModel \
+ (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type)
+
#define makeRASModel(Type) \
makeTemplatedTurbulenceModel \
(phaseModelPhaseCompressibleTurbulenceModel, RAS, Type)
@@ -61,6 +65,9 @@ makeBaseTurbulenceModel
makeTemplatedTurbulenceModel \
(phaseModelPhaseCompressibleTurbulenceModel, LES, Type)
+#include "Stokes.H"
+makeLaminarModel(Stokes);
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
index bd04977f2b8..bcf7911619a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
@@ -27,7 +27,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "makeTurbulenceModel.H"
-#include "laminar.H"
+#include "laminarModel.H"
#include "RASModel.H"
#include "LESModel.H"
@@ -53,6 +53,10 @@ makeBaseTurbulenceModel
phaseModel
);
+#define makeLaminarModel(Type) \
+ makeTemplatedLaminarModel \
+ (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type)
+
#define makeRASModel(Type) \
makeTemplatedTurbulenceModel \
(phaseModelPhaseCompressibleTurbulenceModel, RAS, Type)
@@ -61,6 +65,9 @@ makeBaseTurbulenceModel
makeTemplatedTurbulenceModel \
(phaseModelPhaseCompressibleTurbulenceModel, LES, Type)
+#include "Stokes.H"
+makeLaminarModel(Stokes);
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
index c60dea0f77f..68711365607 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
@@ -32,7 +32,7 @@ License
#include "ThermalDiffusivity.H"
#include "EddyDiffusivity.H"
-#include "laminar.H"
+#include "laminarModel.H"
#include "RASModel.H"
#include "LESModel.H"
@@ -58,6 +58,10 @@ makeBaseTurbulenceModel
phaseModel
);
+#define makeLaminarModel(Type) \
+ makeTemplatedLaminarModel \
+ (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type)
+
#define makeRASModel(Type) \
makeTemplatedTurbulenceModel \
(phaseModelPhaseCompressibleTurbulenceModel, RAS, Type)
@@ -66,6 +70,9 @@ makeBaseTurbulenceModel
makeTemplatedTurbulenceModel \
(phaseModelPhaseCompressibleTurbulenceModel, LES, Type)
+#include "Stokes.H"
+makeLaminarModel(Stokes);
+
#include "kEpsilon.H"
makeRASModel(kEpsilon);
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
index da2dd7188ad..e4e5358e33f 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -34,7 +34,8 @@ License
{ \
typedef TDModel<BaseModel<Transport>> \
Transport##BaseModel; \
- typedef laminar<Transport##BaseModel> Laminar##Transport##BaseModel; \
+ typedef laminarModel<Transport##BaseModel> \
+ laminar##Transport##BaseModel; \
typedef RASModel<EddyDiffusivity<Transport##BaseModel>> \
RAS##Transport##BaseModel; \
typedef LESModel<EddyDiffusivity<Transport##BaseModel>> \
@@ -65,14 +66,18 @@ License
Transport##BaseModel; \
\
\
- typedef laminar<Transport##BaseModel> Laminar##Transport##BaseModel; \
+ typedef laminarModel<Transport##BaseModel> \
+ laminar##Transport##BaseModel; \
\
- defineNamedTemplateTypeNameAndDebug(Laminar##Transport##BaseModel, 0); \
+ defineNamedTemplateTypeNameAndDebug(laminar##Transport##BaseModel, 0); \
+ \
+ defineTemplateRunTimeSelectionTable \
+ (laminar##Transport##BaseModel, dictionary); \
\
addToRunTimeSelectionTable \
( \
Transport##baseModel, \
- Laminar##Transport##BaseModel, \
+ laminar##Transport##BaseModel, \
dictionary \
); \
\
@@ -110,6 +115,27 @@ License
}
+#define makeTemplatedLaminarModel(BaseModel, SType, Type) \
+ typedef Foam::SType##Models::Type<Foam::BaseModel> \
+ Type##SType##BaseModel; \
+ defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \
+ \
+ namespace Foam \
+ { \
+ namespace SType##Models \
+ { \
+ typedef Type<BaseModel> Type##SType##BaseModel; \
+ \
+ addToRunTimeSelectionTable \
+ ( \
+ SType##BaseModel, \
+ Type##SType##BaseModel, \
+ dictionary \
+ ); \
+ } \
+ }
+
+
#define makeTemplatedTurbulenceModel(BaseModel, SType, Type) \
typedef Foam::SType##Models::Type<Foam::EddyDiffusivity<Foam::BaseModel>> \
Type##SType##BaseModel; \
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
index 33067385017..98bc0b57830 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
@@ -46,6 +46,7 @@ SourceFiles
#include "CompressibleTurbulenceModel.H"
#include "ThermalDiffusivity.H"
#include "EddyDiffusivity.H"
+#include "laminarModel.H"
#include "RASModel.H"
#include "LESModel.H"
#include "fluidThermo.H"
@@ -59,6 +60,7 @@ namespace Foam
typedef ThermalDiffusivity<CompressibleTurbulenceModel<fluidThermo>>
turbulenceModel;
+ typedef laminarModel<turbulenceModel> laminarModel;
typedef RASModel<EddyDiffusivity<turbulenceModel>> RASModel;
typedef LESModel<EddyDiffusivity<turbulenceModel>> LESModel;
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
index 0bf0cf00e9d..83c184f49a8 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@@ -37,6 +37,15 @@ makeBaseTurbulenceModel
fluidThermo
);
+
+// -------------------------------------------------------------------------- //
+// Laminar models
+// -------------------------------------------------------------------------- //
+
+#include "Stokes.H"
+makeLaminarModel(Stokes);
+
+
// -------------------------------------------------------------------------- //
// RAS models
// -------------------------------------------------------------------------- //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H
index 67ba5cf4ead..54b8c3ebefb 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H
@@ -32,7 +32,7 @@ License
#include "ThermalDiffusivity.H"
#include "EddyDiffusivity.H"
-#include "laminar.H"
+#include "laminarModel.H"
#include "RASModel.H"
#include "LESModel.H"
@@ -48,6 +48,10 @@ makeTurbulenceModelTypes
fluidThermo
);
+#define makeLaminarModel(Type) \
+ makeTemplatedLaminarModel \
+ (fluidThermoCompressibleTurbulenceModel, laminar, Type)
+
#define makeRASModel(Type) \
makeTemplatedTurbulenceModel \
(fluidThermoCompressibleTurbulenceModel, RAS, Type)
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
index 31b9a37c158..268425e1a1a 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
@@ -44,6 +44,7 @@ SourceFiles
#define turbulentTransportModel_H
#include "IncompressibleTurbulenceModel.H"
+#include "laminarModel.H"
#include "RASModel.H"
#include "LESModel.H"
#include "incompressible/transportModel/transportModel.H"
@@ -56,6 +57,7 @@ namespace Foam
{
typedef IncompressibleTurbulenceModel<transportModel> turbulenceModel;
+ typedef laminarModel<turbulenceModel> laminarModel;
typedef RASModel<turbulenceModel> RASModel;
typedef LESModel<turbulenceModel> LESModel;
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
index 31d3cfc901a..1679dbcb4a4 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
@@ -36,6 +36,15 @@ makeBaseTurbulenceModel
transportModel
);
+
+// -------------------------------------------------------------------------- //
+// Laminar models
+// -------------------------------------------------------------------------- //
+
+#include "Stokes.H"
+makeLaminarModel(Stokes);
+
+
// -------------------------------------------------------------------------- //
// RAS models
// -------------------------------------------------------------------------- //
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.H
index c86c93ab7ea..b0501ac0a4f 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.H
@@ -28,7 +28,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "makeTurbulenceModel.H"
-#include "laminar.H"
+#include "laminarModel.H"
#include "RASModel.H"
#include "LESModel.H"
@@ -43,6 +43,10 @@ makeTurbulenceModelTypes
transportModel
);
+#define makeLaminarModel(Type) \
+ makeTemplatedTurbulenceModel \
+ (transportModelIncompressibleTurbulenceModel, laminar, Type)
+
#define makeRASModel(Type) \
makeTemplatedTurbulenceModel \
(transportModelIncompressibleTurbulenceModel, RAS, Type)
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C
similarity index 75%
rename from src/TurbulenceModels/turbulenceModels/laminar/laminar.C
rename to src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C
index 2e60815a415..792e4c82a88 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C
@@ -23,17 +23,24 @@ License
\*---------------------------------------------------------------------------*/
-#include "laminar.H"
+#include "Stokes.H"
#include "volFields.H"
#include "surfaceFields.H"
#include "fvcGrad.H"
#include "fvcDiv.H"
#include "fvmLaplacian.H"
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace laminarModels
+{
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class BasicTurbulenceModel>
-Foam::laminar<BasicTurbulenceModel>::laminar
+Stokes<BasicTurbulenceModel>::Stokes
(
const alphaField& alpha,
const rhoField& rho,
@@ -44,7 +51,7 @@ Foam::laminar<BasicTurbulenceModel>::laminar
const word& propertiesName
)
:
- linearViscousStress<BasicTurbulenceModel>
+ linearViscousStress<laminarModel<BasicTurbulenceModel>>
(
typeName,
alpha,
@@ -58,57 +65,26 @@ Foam::laminar<BasicTurbulenceModel>::laminar
{}
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-template<class BasicTurbulenceModel>
-Foam::autoPtr<Foam::laminar<BasicTurbulenceModel>>
-Foam::laminar<BasicTurbulenceModel>::New
-(
- const alphaField& alpha,
- const rhoField& rho,
- const volVectorField& U,
- const surfaceScalarField& alphaRhoPhi,
- const surfaceScalarField& phi,
- const transportModel& transport,
- const word& propertiesName
-)
-{
- return autoPtr<laminar>
- (
- new laminar
- (
- alpha,
- rho,
- U,
- alphaRhoPhi,
- phi,
- transport,
- propertiesName
- )
- );
-}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class BasicTurbulenceModel>
-const Foam::dictionary&
-Foam::laminar<BasicTurbulenceModel>::coeffDict() const
+const dictionary&
+Stokes<BasicTurbulenceModel>::coeffDict() const
{
return dictionary::null;
}
template<class BasicTurbulenceModel>
-bool Foam::laminar<BasicTurbulenceModel>::read()
+bool Stokes<BasicTurbulenceModel>::read()
{
return true;
}
template<class BasicTurbulenceModel>
-Foam::tmp<Foam::volScalarField>
-Foam::laminar<BasicTurbulenceModel>::nut() const
+tmp<volScalarField>
+Stokes<BasicTurbulenceModel>::nut() const
{
return tmp<volScalarField>
(
@@ -131,8 +107,8 @@ Foam::laminar<BasicTurbulenceModel>::nut() const
template<class BasicTurbulenceModel>
-Foam::tmp<Foam::scalarField>
-Foam::laminar<BasicTurbulenceModel>::nut
+tmp<scalarField>
+Stokes<BasicTurbulenceModel>::nut
(
const label patchi
) const
@@ -145,8 +121,8 @@ Foam::laminar<BasicTurbulenceModel>::nut
template<class BasicTurbulenceModel>
-Foam::tmp<Foam::volScalarField>
-Foam::laminar<BasicTurbulenceModel>::nuEff() const
+tmp<volScalarField>
+Stokes<BasicTurbulenceModel>::nuEff() const
{
return tmp<volScalarField>
(
@@ -159,8 +135,8 @@ Foam::laminar<BasicTurbulenceModel>::nuEff() const
template<class BasicTurbulenceModel>
-Foam::tmp<Foam::scalarField>
-Foam::laminar<BasicTurbulenceModel>::nuEff
+tmp<scalarField>
+Stokes<BasicTurbulenceModel>::nuEff
(
const label patchi
) const
@@ -170,8 +146,8 @@ Foam::laminar<BasicTurbulenceModel>::nuEff
template<class BasicTurbulenceModel>
-Foam::tmp<Foam::volScalarField>
-Foam::laminar<BasicTurbulenceModel>::k() const
+tmp<volScalarField>
+Stokes<BasicTurbulenceModel>::k() const
{
return tmp<volScalarField>
(
@@ -194,8 +170,8 @@ Foam::laminar<BasicTurbulenceModel>::k() const
template<class BasicTurbulenceModel>
-Foam::tmp<Foam::volScalarField>
-Foam::laminar<BasicTurbulenceModel>::epsilon() const
+tmp<volScalarField>
+Stokes<BasicTurbulenceModel>::epsilon() const
{
return tmp<volScalarField>
(
@@ -221,8 +197,8 @@ Foam::laminar<BasicTurbulenceModel>::epsilon() const
template<class BasicTurbulenceModel>
-Foam::tmp<Foam::volSymmTensorField>
-Foam::laminar<BasicTurbulenceModel>::R() const
+tmp<volSymmTensorField>
+Stokes<BasicTurbulenceModel>::R() const
{
return tmp<volSymmTensorField>
(
@@ -248,10 +224,15 @@ Foam::laminar<BasicTurbulenceModel>::R() const
template<class BasicTurbulenceModel>
-void Foam::laminar<BasicTurbulenceModel>::correct()
+void Stokes<BasicTurbulenceModel>::correct()
{
- BasicTurbulenceModel::correct();
+ laminarModel<BasicTurbulenceModel>::correct();
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace laminarModels
+} // End namespace Foam
+
// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminar.H b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H
similarity index 82%
rename from src/TurbulenceModels/turbulenceModels/laminar/laminar.H
rename to src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H
index 114287c0b65..a714cbf294a 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminar.H
+++ b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H
@@ -22,34 +22,37 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::laminar
+ Foam::Stokes
Description
- Turbulence model for laminar flow.
+ Turbulence model for Stokes flow.
SourceFiles
- laminar.C
+ Stokes.C
\*---------------------------------------------------------------------------*/
-#ifndef laminar_H
-#define laminar_H
+#ifndef Stokes_H
+#define Stokes_H
+#include "laminarModel.H"
#include "linearViscousStress.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
+namespace laminarModels
+{
/*---------------------------------------------------------------------------* \
- Class laminar Declaration
+ Class Stokes Declaration
\*---------------------------------------------------------------------------*/
template<class BasicTurbulenceModel>
-class laminar
+class Stokes
:
- public linearViscousStress<BasicTurbulenceModel>
+ public linearViscousStress<laminarModel<BasicTurbulenceModel>>
{
public:
@@ -60,13 +63,13 @@ public:
//- Runtime type information
- TypeName("laminar");
+ TypeName("Stokes");
// Constructors
//- Construct from components
- laminar
+ Stokes
(
const alphaField& alpha,
const rhoField& rho,
@@ -81,7 +84,7 @@ public:
// Selectors
//- Return a reference to the selected turbulence model
- static autoPtr<laminar> New
+ static autoPtr<Stokes> New
(
const alphaField& alpha,
const rhoField& rho,
@@ -94,7 +97,7 @@ public:
//- Destructor
- virtual ~laminar()
+ virtual ~Stokes()
{}
@@ -106,41 +109,42 @@ public:
//- Read turbulenceProperties dictionary
virtual bool read();
- //- Return the turbulence viscosity, i.e. 0 for laminar flow
+ //- Return the turbulence viscosity, i.e. 0 for Stokes flow
virtual tmp<volScalarField> nut() const;
//- Return the turbulence viscosity on patch
virtual tmp<scalarField> nut(const label patchi) const;
- //- Return the effective viscosity, i.e. the laminar viscosity
+ //- Return the effective viscosity, i.e. the Stokes viscosity
virtual tmp<volScalarField> nuEff() const;
//- Return the effective viscosity on patch
virtual tmp<scalarField> nuEff(const label patchi) const;
- //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
+ //- Return the turbulence kinetic energy, i.e. 0 for Stokes flow
virtual tmp<volScalarField> k() const;
//- Return the turbulence kinetic energy dissipation rate,
- // i.e. 0 for laminar flow
+ // i.e. 0 for Stokes flow
virtual tmp<volScalarField> epsilon() const;
- //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
+ //- Return the Reynolds stress tensor, i.e. 0 for Stokes flow
virtual tmp<volSymmTensorField> R() const;
- //- Correct the laminar viscosity
+ //- Correct the Stokes viscosity
virtual void correct();
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace laminarModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
- #include "laminar.C"
+ #include "Stokes.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
new file mode 100644
index 00000000000..0bd0bb49e3a
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
@@ -0,0 +1,339 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "laminarModel.H"
+#include "Stokes.H"
+
+// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+void Foam::laminarModel<BasicTurbulenceModel>::printCoeffs(const word& type)
+{
+ if (printCoeffs_)
+ {
+ Info<< type << "Coeffs" << coeffDict_ << endl;
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+Foam::laminarModel<BasicTurbulenceModel>::laminarModel
+(
+ const word& type,
+ const alphaField& alpha,
+ const rhoField& rho,
+ const volVectorField& U,
+ const surfaceScalarField& alphaRhoPhi,
+ const surfaceScalarField& phi,
+ const transportModel& transport,
+ const word& propertiesName
+)
+:
+ BasicTurbulenceModel
+ (
+ type,
+ alpha,
+ rho,
+ U,
+ alphaRhoPhi,
+ phi,
+ transport,
+ propertiesName
+ ),
+
+ laminarDict_(this->subOrEmptyDict("laminar")),
+ printCoeffs_(laminarDict_.lookupOrDefault<Switch>("printCoeffs", false)),
+ coeffDict_(laminarDict_.subOrEmptyDict(type + "Coeffs"))
+{
+ // Force the construction of the mesh deltaCoeffs which may be needed
+ // for the construction of the derived models and BCs
+ this->mesh_.deltaCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+Foam::autoPtr<Foam::laminarModel<BasicTurbulenceModel>>
+Foam::laminarModel<BasicTurbulenceModel>::New
+(
+ const alphaField& alpha,
+ const rhoField& rho,
+ const volVectorField& U,
+ const surfaceScalarField& alphaRhoPhi,
+ const surfaceScalarField& phi,
+ const transportModel& transport,
+ const word& propertiesName
+)
+{
+ IOdictionary modelDict
+ (
+ IOobject
+ (
+ IOobject::groupName(propertiesName, U.group()),
+ U.time().constant(),
+ U.db(),
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
+ )
+ );
+
+ if (modelDict.found("laminar"))
+ {
+ // get model name, but do not register the dictionary
+ // otherwise it is registered in the database twice
+ const word modelType
+ (
+ modelDict.subDict("laminar").lookup("laminarModel")
+ );
+
+ Info<< "Selecting laminar stress model " << modelType << endl;
+
+ typename dictionaryConstructorTable::iterator cstrIter =
+ dictionaryConstructorTablePtr_->find(modelType);
+
+ if (cstrIter == dictionaryConstructorTablePtr_->end())
+ {
+ FatalErrorInFunction
+ << "Unknown laminarModel type "
+ << modelType << nl << nl
+ << "Valid laminarModel types:" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
+ }
+
+ return autoPtr<laminarModel>
+ (
+ cstrIter()
+ (
+ alpha,
+ rho,
+ U,
+ alphaRhoPhi,
+ phi,
+ transport, propertiesName)
+ );
+ }
+ else
+ {
+ Info<< "Selecting laminar stress model "
+ << laminarModels::Stokes<BasicTurbulenceModel>::typeName << endl;
+
+ return autoPtr<laminarModel>
+ (
+ new laminarModels::Stokes<BasicTurbulenceModel>
+ (
+ alpha,
+ rho,
+ U,
+ alphaRhoPhi,
+ phi,
+ transport,
+ propertiesName
+ )
+ );
+ }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool Foam::laminarModel<BasicTurbulenceModel>::read()
+{
+ if (BasicTurbulenceModel::read())
+ {
+ laminarDict_ <<= this->subDict("laminar");
+
+ if
+ (
+ const dictionary* dictPtr =
+ laminarDict_.subDictPtr(type() + "Coeffs")
+ )
+ {
+ coeffDict_ <<= *dictPtr;
+ }
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volScalarField>
+Foam::laminarModel<BasicTurbulenceModel>::nut() const
+{
+ return tmp<volScalarField>
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ IOobject::groupName("nut", this->U_.group()),
+ this->runTime_.timeName(),
+ this->mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ this->mesh_,
+ dimensionedScalar("nut", dimViscosity, 0.0)
+ )
+ );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::scalarField>
+Foam::laminarModel<BasicTurbulenceModel>::nut
+(
+ const label patchi
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField(this->mesh_.boundary()[patchi].size(), 0.0)
+ );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volScalarField>
+Foam::laminarModel<BasicTurbulenceModel>::nuEff() const
+{
+ return tmp<volScalarField>
+ (
+ new volScalarField
+ (
+ IOobject::groupName("nuEff", this->U_.group()), this->nu()
+ )
+ );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::scalarField>
+Foam::laminarModel<BasicTurbulenceModel>::nuEff
+(
+ const label patchi
+) const
+{
+ return this->nu(patchi);
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volScalarField>
+Foam::laminarModel<BasicTurbulenceModel>::k() const
+{
+ return tmp<volScalarField>
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ IOobject::groupName("k", this->U_.group()),
+ this->runTime_.timeName(),
+ this->mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ this->mesh_,
+ dimensionedScalar("k", sqr(this->U_.dimensions()), 0.0)
+ )
+ );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volScalarField>
+Foam::laminarModel<BasicTurbulenceModel>::epsilon() const
+{
+ return tmp<volScalarField>
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ IOobject::groupName("epsilon", this->U_.group()),
+ this->runTime_.timeName(),
+ this->mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ this->mesh_,
+ dimensionedScalar
+ (
+ "epsilon", sqr(this->U_.dimensions())/dimTime, 0.0
+ )
+ )
+ );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volSymmTensorField>
+Foam::laminarModel<BasicTurbulenceModel>::R() const
+{
+ return tmp<volSymmTensorField>
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ IOobject::groupName("R", this->U_.group()),
+ this->runTime_.timeName(),
+ this->mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ this->mesh_,
+ dimensionedSymmTensor
+ (
+ "R", sqr(this->U_.dimensions()), Zero
+ )
+ )
+ );
+}
+
+
+template<class BasicTurbulenceModel>
+void Foam::laminarModel<BasicTurbulenceModel>::correct()
+{
+ BasicTurbulenceModel::correct();
+}
+
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H
new file mode 100644
index 00000000000..ad5466e0fff
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H
@@ -0,0 +1,208 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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::laminarModel
+
+Description
+ Templated abstract base class for laminar transport models
+
+SourceFiles
+ laminarModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef laminarModel_H
+#define laminarModel_H
+
+#include "TurbulenceModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class laminarModel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class BasicTurbulenceModel>
+class laminarModel
+:
+ public BasicTurbulenceModel
+{
+
+protected:
+
+ // Protected data
+
+ //- laminar coefficients dictionary
+ dictionary laminarDict_;
+
+ //- Flag to print the model coeffs at run-time
+ Switch printCoeffs_;
+
+ //- Model coefficients dictionary
+ dictionary coeffDict_;
+
+
+ // Protected Member Functions
+
+ //- Print model coefficients
+ virtual void printCoeffs(const word& type);
+
+
+private:
+
+ // Private Member Functions
+
+ //- Disallow default bitwise copy construct
+ laminarModel(const laminarModel&);
+
+ //- Disallow default bitwise assignment
+ void operator=(const laminarModel&);
+
+
+public:
+
+ typedef typename BasicTurbulenceModel::alphaField alphaField;
+ typedef typename BasicTurbulenceModel::rhoField rhoField;
+ typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
+ //- Runtime type information
+ TypeName("laminar");
+
+
+ // Declare run-time constructor selection table
+
+ declareRunTimeSelectionTable
+ (
+ autoPtr,
+ laminarModel,
+ dictionary,
+ (
+ const alphaField& alpha,
+ const rhoField& rho,
+ const volVectorField& U,
+ const surfaceScalarField& alphaRhoPhi,
+ const surfaceScalarField& phi,
+ const transportModel& transport,
+ const word& propertiesName
+ ),
+ (alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName)
+ );
+
+
+ // Constructors
+
+ //- Construct from components
+ laminarModel
+ (
+ const word& type,
+ const alphaField& alpha,
+ const rhoField& rho,
+ const volVectorField& U,
+ const surfaceScalarField& alphaRhoPhi,
+ const surfaceScalarField& phi,
+ const transportModel& transport,
+ const word& propertiesName
+ );
+
+
+ // Selectors
+
+ //- Return a reference to the selected laminar model
+ static autoPtr<laminarModel> New
+ (
+ const alphaField& alpha,
+ const rhoField& rho,
+ const volVectorField& U,
+ const surfaceScalarField& alphaRhoPhi,
+ const surfaceScalarField& phi,
+ const transportModel& transport,
+ const word& propertiesName = turbulenceModel::propertiesName
+ );
+
+
+ //- Destructor
+ virtual ~laminarModel()
+ {}
+
+
+ // Member Functions
+
+ //- Read model coefficients if they have changed
+ virtual bool read();
+
+
+ // Access
+
+ //- Const access to the coefficients dictionary
+ virtual const dictionary& coeffDict() const
+ {
+ return coeffDict_;
+ }
+
+ //- Return the turbulence viscosity, i.e. 0 for laminar flow
+ virtual tmp<volScalarField> nut() const;
+
+ //- Return the turbulence viscosity on patch
+ virtual tmp<scalarField> nut(const label patchi) const;
+
+ //- Return the effective viscosity, i.e. the laminar viscosity
+ virtual tmp<volScalarField> nuEff() const;
+
+ //- Return the effective viscosity on patch
+ virtual tmp<scalarField> nuEff(const label patchi) const;
+
+ //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
+ virtual tmp<volScalarField> k() const;
+
+ //- Return the turbulence kinetic energy dissipation rate,
+ // i.e. 0 for laminar flow
+ virtual tmp<volScalarField> epsilon() const;
+
+ //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
+ virtual tmp<volSymmTensorField> R() const;
+
+ //- Correct the laminar transport
+ virtual void correct();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+ #include "laminarModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModelDoc.H b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModelDoc.H
new file mode 100644
index 00000000000..e58e1c6d43f
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModelDoc.H
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\defgroup grpLaminar laminar transport model
+@{
+ \ingroup grpTurbulence
+ This group contains laminar models.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H b/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H
index 1b226749e80..64ba83fee25 100644
--- a/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H
@@ -28,7 +28,8 @@ License
namespace Foam \
{ \
typedef BaseModel<Transport> Transport##BaseModel; \
- typedef laminar<Transport##BaseModel> Laminar##Transport##BaseModel; \
+ typedef laminarModel<Transport##BaseModel> \
+ laminar##Transport##BaseModel; \
typedef RASModel<Transport##BaseModel> RAS##Transport##BaseModel; \
typedef LESModel<Transport##BaseModel> LES##Transport##BaseModel; \
}
@@ -53,12 +54,15 @@ License
); \
\
\
- defineNamedTemplateTypeNameAndDebug(Laminar##Transport##BaseModel, 0); \
+ defineNamedTemplateTypeNameAndDebug(laminar##Transport##BaseModel, 0); \
+ \
+ defineTemplateRunTimeSelectionTable \
+ (laminar##Transport##BaseModel, dictionary); \
\
addToRunTimeSelectionTable \
( \
Transport##baseModel, \
- Laminar##Transport##BaseModel, \
+ laminar##Transport##BaseModel, \
dictionary \
); \
\
--
GitLab
From 6baa2aaf58b6f1b89780ccd27d1b62a15ce69c72 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Tue, 20 Sep 2016 18:24:09 +0100
Subject: [PATCH 22/42] Organisation of pimpleFoam tutorials into categories of
turbulence modelling
---
.../pimpleFoam/{ => LES}/channel395/0.orig/U | 0
.../pimpleFoam/{ => LES}/channel395/0.orig/k | 0
.../pimpleFoam/{ => LES}/channel395/0.orig/nuTilda | 0
.../pimpleFoam/{ => LES}/channel395/0.orig/nut | 0
.../pimpleFoam/{ => LES}/channel395/0.orig/p | 0
.../pimpleFoam/{ => LES}/channel395/0/B.gz | Bin
.../pimpleFoam/{ => LES}/channel395/0/U.gz | Bin
.../pimpleFoam/{ => LES}/channel395/0/k.gz | Bin
.../pimpleFoam/{ => LES}/channel395/0/nuTilda.gz | Bin
.../pimpleFoam/{ => LES}/channel395/0/nut.gz | Bin
.../pimpleFoam/{ => LES}/channel395/0/p.gz | Bin
.../pimpleFoam/{ => LES}/channel395/Allrun | 0
.../{ => LES}/channel395/constant/fvOptions | 0
.../{ => LES}/channel395/constant/postChannelDict | 0
.../channel395/constant/transportProperties | 0
.../channel395/constant/turbulenceProperties | 0
.../{ => LES}/channel395/system/blockMeshDict | 0
.../{ => LES}/channel395/system/controlDict | 0
.../{ => LES}/channel395/system/decomposeParDict | 0
.../{ => LES}/channel395/system/fvSchemes | 0
.../{ => LES}/channel395/system/fvSolution | 0
.../pimpleFoam/{ => RAS}/TJunction/0/U | 0
.../pimpleFoam/{ => RAS}/TJunction/0/epsilon | 0
.../pimpleFoam/{ => RAS}/TJunction/0/k | 0
.../pimpleFoam/{ => RAS}/TJunction/0/nuTilda | 0
.../pimpleFoam/{ => RAS}/TJunction/0/nut | 0
.../pimpleFoam/{ => RAS}/TJunction/0/p | 0
.../pimpleFoam/{ => RAS}/TJunction/README.txt | 0
.../TJunction/constant/transportProperties | 0
.../TJunction/constant/turbulenceProperties | 0
.../{ => RAS}/TJunction/system/blockMeshDict | 0
.../{ => RAS}/TJunction/system/controlDict | 0
.../pimpleFoam/{ => RAS}/TJunction/system/fvSchemes | 0
.../{ => RAS}/TJunction/system/fvSolution | 0
.../pimpleFoam/{ => RAS}/TJunctionFan/0.orig/U | 0
.../{ => RAS}/TJunctionFan/0.orig/epsilon | 0
.../pimpleFoam/{ => RAS}/TJunctionFan/0.orig/k | 0
.../{ => RAS}/TJunctionFan/0.orig/nuTilda | 0
.../pimpleFoam/{ => RAS}/TJunctionFan/0.orig/nut | 0
.../pimpleFoam/{ => RAS}/TJunctionFan/0.orig/p | 0
.../pimpleFoam/{ => RAS}/TJunctionFan/Allclean | 0
.../pimpleFoam/{ => RAS}/TJunctionFan/Allrun | 0
.../pimpleFoam/{ => RAS}/TJunctionFan/README.txt | 0
.../TJunctionFan/constant/transportProperties | 0
.../TJunctionFan/constant/turbulenceProperties | 0
.../{ => RAS}/TJunctionFan/system/blockMeshDict | 0
.../{ => RAS}/TJunctionFan/system/controlDict | 0
.../{ => RAS}/TJunctionFan/system/createBafflesDict | 0
.../{ => RAS}/TJunctionFan/system/fvSchemes | 0
.../{ => RAS}/TJunctionFan/system/fvSolution | 0
.../{ => RAS}/TJunctionFan/system/topoSetDict | 0
.../pimpleFoam/{ => RAS}/elipsekkLOmega/0/U | 0
.../pimpleFoam/{ => RAS}/elipsekkLOmega/0/kl | 0
.../pimpleFoam/{ => RAS}/elipsekkLOmega/0/kt | 0
.../pimpleFoam/{ => RAS}/elipsekkLOmega/0/nut | 0
.../pimpleFoam/{ => RAS}/elipsekkLOmega/0/omega | 0
.../pimpleFoam/{ => RAS}/elipsekkLOmega/0/p | 0
.../pimpleFoam/{ => RAS}/elipsekkLOmega/Allclean | 0
.../pimpleFoam/{ => RAS}/elipsekkLOmega/Allrun | 0
.../elipsekkLOmega/constant/transportProperties | 0
.../elipsekkLOmega/constant/turbulenceProperties | 0
.../{ => RAS}/elipsekkLOmega/system/blockMeshDict | 0
.../elipsekkLOmega/system/changeDictionaryDict | 0
.../elipsekkLOmega/system/changeDictionaryDict.X | 0
.../elipsekkLOmega/system/changeDictionaryDict.Y | 0
.../{ => RAS}/elipsekkLOmega/system/controlDict | 0
.../{ => RAS}/elipsekkLOmega/system/createPatchDict | 0
.../{ => RAS}/elipsekkLOmega/system/fvSchemes | 0
.../{ => RAS}/elipsekkLOmega/system/fvSolution | 0
.../{ => RAS}/elipsekkLOmega/system/mirrorMeshDict | 0
.../{ => RAS}/elipsekkLOmega/system/topoSetDict | 0
.../pimpleFoam/{ => RAS}/pitzDaily/0/U | 0
.../pimpleFoam/{ => RAS}/pitzDaily/0/epsilon | 0
.../pimpleFoam/{ => RAS}/pitzDaily/0/k | 0
.../pimpleFoam/{ => RAS}/pitzDaily/0/nuTilda | 0
.../pimpleFoam/{ => RAS}/pitzDaily/0/nut | 0
.../pimpleFoam/{ => RAS}/pitzDaily/0/p | 0
.../pitzDaily/constant/transportProperties | 0
.../pitzDaily/constant/turbulenceProperties | 0
.../{ => RAS}/pitzDaily/system/blockMeshDict | 0
.../{ => RAS}/pitzDaily/system/controlDict | 0
.../pimpleFoam/{ => RAS}/pitzDaily/system/fvSchemes | 0
.../{ => RAS}/pitzDaily/system/fvSolution | 0
83 files changed, 0 insertions(+), 0 deletions(-)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0.orig/U (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0.orig/k (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0.orig/nuTilda (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0.orig/nut (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0.orig/p (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0/B.gz (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0/U.gz (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0/k.gz (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0/nuTilda.gz (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0/nut.gz (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/0/p.gz (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/Allrun (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/constant/fvOptions (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/constant/postChannelDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/constant/transportProperties (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/constant/turbulenceProperties (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/system/blockMeshDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/system/controlDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/system/decomposeParDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/system/fvSchemes (100%)
rename tutorials/incompressible/pimpleFoam/{ => LES}/channel395/system/fvSolution (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/0/U (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/0/epsilon (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/0/k (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/0/nuTilda (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/0/nut (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/0/p (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/README.txt (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/constant/transportProperties (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/constant/turbulenceProperties (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/system/blockMeshDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/system/controlDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/system/fvSchemes (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunction/system/fvSolution (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/0.orig/U (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/0.orig/epsilon (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/0.orig/k (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/0.orig/nuTilda (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/0.orig/nut (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/0.orig/p (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/Allclean (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/Allrun (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/README.txt (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/constant/transportProperties (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/constant/turbulenceProperties (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/system/blockMeshDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/system/controlDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/system/createBafflesDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/system/fvSchemes (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/system/fvSolution (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/TJunctionFan/system/topoSetDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/0/U (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/0/kl (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/0/kt (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/0/nut (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/0/omega (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/0/p (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/Allclean (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/Allrun (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/constant/transportProperties (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/constant/turbulenceProperties (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/system/blockMeshDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/system/changeDictionaryDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/system/changeDictionaryDict.X (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/system/changeDictionaryDict.Y (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/system/controlDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/system/createPatchDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/system/fvSchemes (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/system/fvSolution (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/system/mirrorMeshDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/elipsekkLOmega/system/topoSetDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/0/U (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/0/epsilon (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/0/k (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/0/nuTilda (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/0/nut (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/0/p (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/constant/transportProperties (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/constant/turbulenceProperties (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/system/blockMeshDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/system/controlDict (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/system/fvSchemes (100%)
rename tutorials/incompressible/pimpleFoam/{ => RAS}/pitzDaily/system/fvSolution (100%)
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.orig/U b/tutorials/incompressible/pimpleFoam/LES/channel395/0.orig/U
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0.orig/U
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0.orig/U
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.orig/k b/tutorials/incompressible/pimpleFoam/LES/channel395/0.orig/k
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0.orig/k
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0.orig/k
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.orig/nuTilda b/tutorials/incompressible/pimpleFoam/LES/channel395/0.orig/nuTilda
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0.orig/nuTilda
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0.orig/nuTilda
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.orig/nut b/tutorials/incompressible/pimpleFoam/LES/channel395/0.orig/nut
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0.orig/nut
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0.orig/nut
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.orig/p b/tutorials/incompressible/pimpleFoam/LES/channel395/0.orig/p
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0.orig/p
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0.orig/p
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0/B.gz b/tutorials/incompressible/pimpleFoam/LES/channel395/0/B.gz
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0/B.gz
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0/B.gz
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0/U.gz b/tutorials/incompressible/pimpleFoam/LES/channel395/0/U.gz
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0/U.gz
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0/U.gz
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0/k.gz b/tutorials/incompressible/pimpleFoam/LES/channel395/0/k.gz
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0/k.gz
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0/k.gz
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0/nuTilda.gz b/tutorials/incompressible/pimpleFoam/LES/channel395/0/nuTilda.gz
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0/nuTilda.gz
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0/nuTilda.gz
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0/nut.gz b/tutorials/incompressible/pimpleFoam/LES/channel395/0/nut.gz
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0/nut.gz
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0/nut.gz
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0/p.gz b/tutorials/incompressible/pimpleFoam/LES/channel395/0/p.gz
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/0/p.gz
rename to tutorials/incompressible/pimpleFoam/LES/channel395/0/p.gz
diff --git a/tutorials/incompressible/pimpleFoam/channel395/Allrun b/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/Allrun
rename to tutorials/incompressible/pimpleFoam/LES/channel395/Allrun
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions b/tutorials/incompressible/pimpleFoam/LES/channel395/constant/fvOptions
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions
rename to tutorials/incompressible/pimpleFoam/LES/channel395/constant/fvOptions
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/postChannelDict b/tutorials/incompressible/pimpleFoam/LES/channel395/constant/postChannelDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/constant/postChannelDict
rename to tutorials/incompressible/pimpleFoam/LES/channel395/constant/postChannelDict
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/channel395/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/constant/transportProperties
rename to tutorials/incompressible/pimpleFoam/LES/channel395/constant/transportProperties
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/channel395/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/constant/turbulenceProperties
rename to tutorials/incompressible/pimpleFoam/LES/channel395/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/channel395/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/system/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/LES/channel395/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/channel395/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/system/controlDict
rename to tutorials/incompressible/pimpleFoam/LES/channel395/system/controlDict
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/channel395/system/decomposeParDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict
rename to tutorials/incompressible/pimpleFoam/LES/channel395/system/decomposeParDict
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/channel395/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes
rename to tutorials/incompressible/pimpleFoam/LES/channel395/system/fvSchemes
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/channel395/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/system/fvSolution
rename to tutorials/incompressible/pimpleFoam/LES/channel395/system/fvSolution
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/U b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/U
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/0/U
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/0/U
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/epsilon
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/0/epsilon
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/k b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/k
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/0/k
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/0/k
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/nuTilda b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nuTilda
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/0/nuTilda
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nuTilda
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/nut b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nut
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/0/nut
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nut
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/p b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/p
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/0/p
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/0/p
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/README.txt b/tutorials/incompressible/pimpleFoam/RAS/TJunction/README.txt
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/README.txt
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/README.txt
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/transportProperties
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/system/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/U
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/U
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/U
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/epsilon
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/epsilon
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/epsilon
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/k
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/k
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/k
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/nuTilda b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nuTilda
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/nuTilda
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nuTilda
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nut
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/nut
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nut
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/p
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/Allclean b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allclean
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/Allclean
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allclean
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/README.txt b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/README.txt
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/README.txt
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/README.txt
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/transportProperties
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/system/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/controlDict
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/system/createBafflesDict
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSchemes
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict
rename to tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/U b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/U
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/U
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/U
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kl b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/kl
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kl
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/kl
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kt b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/kt
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kt
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/kt
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/nut b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/nut
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/nut
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/nut
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/omega b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/omega
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/omega
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/omega
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/p b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/p
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/p
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/0/p
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allclean
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allclean
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/transportProperties
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/transportProperties
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/turbulenceProperties
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/changeDictionaryDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/changeDictionaryDict
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/changeDictionaryDict.X
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/changeDictionaryDict.X
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/changeDictionaryDict.Y
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/changeDictionaryDict.Y
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/controlDict
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/controlDict
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/createPatchDict b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/createPatchDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/createPatchDict
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/createPatchDict
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/fvSchemes
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/fvSolution
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/mirrorMeshDict b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/mirrorMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/mirrorMeshDict
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/mirrorMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/topoSetDict
rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/U b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/U
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/0/U
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/U
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/epsilon b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/epsilon
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/0/epsilon
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/epsilon
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/k b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/k
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/0/k
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/k
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/nuTilda b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nuTilda
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/0/nuTilda
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nuTilda
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/nut b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nut
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/0/nut
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nut
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/p b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/p
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/0/p
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/p
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/transportProperties
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/constant/turbulenceProperties
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/system/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/system/controlDict
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSchemes
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution
rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSolution
--
GitLab
From bb3c0c3593b21b62b85ad7c6c337f6c253993fb7 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Tue, 20 Sep 2016 18:38:15 +0100
Subject: [PATCH 23/42] Maxwell model for viscoelasticity using the
upper-convected time derivative of the stress tensor. See
http://en.wikipedia.org/wiki/Upper-convected_Maxwell_model
The model includes an additional viscosity (nu) from the transport
model from which it is instantiated, which makes it equivalent to the
Oldroyd-B model for the case of an incompressible transport model.
See https://en.wikipedia.org/wiki/Oldroyd-B_model
---
.../turbulentFluidThermoModels.C | 3 +
.../laminar/Maxwell/Maxwell.C | 240 ++++++++++++++++++
.../laminar/Maxwell/Maxwell.H | 174 +++++++++++++
.../pimpleFoam/laminar/planarContraction/0/U | 46 ++++
.../pimpleFoam/laminar/planarContraction/0/p | 42 +++
.../laminar/planarContraction/0/sigma | 38 +++
.../constant/transportProperties | 21 ++
.../constant/turbulenceProperties | 32 +++
.../planarContraction/system/blockMeshDict | 112 ++++++++
.../planarContraction/system/controlDict | 52 ++++
.../planarContraction/system/fvSchemes | 54 ++++
.../planarContraction/system/fvSolution | 67 +++++
.../laminar/planarContraction/system/graphs | 62 +++++
.../pimpleFoam/laminar/planarPoiseuille/0/U | 32 +++
.../pimpleFoam/laminar/planarPoiseuille/0/p | 31 +++
.../laminar/planarPoiseuille/0/sigma | 32 +++
.../laminar/planarPoiseuille/Allclean | 12 +
.../laminar/planarPoiseuille/Allrun | 15 ++
.../planarPoiseuille/constant/fvOptions | 38 +++
.../constant/transportProperties | 21 ++
.../constant/turbulenceProperties | 32 +++
.../planarPoiseuille/system/blockMeshDict | 96 +++++++
.../planarPoiseuille/system/controlDict | 54 ++++
.../laminar/planarPoiseuille/system/fvSchemes | 54 ++++
.../planarPoiseuille/system/fvSolution | 67 +++++
.../laminar/planarPoiseuille/system/probes | 21 ++
.../laminar/planarPoiseuille/system/residuals | 19 ++
.../planarPoiseuille/system/singleGraph | 48 ++++
.../validation/WatersKing/Make/files | 3 +
.../validation/WatersKing/Make/options | 14 +
.../validation/WatersKing/WatersKing.C | 146 +++++++++++
.../validation/WatersKing/createFields.H | 64 +++++
.../planarPoiseuille/validation/createGraph | 27 ++
33 files changed, 1769 insertions(+)
create mode 100644 src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C
create mode 100644 src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/U
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/p
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/transportProperties
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/blockMeshDict
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSchemes
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSolution
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/U
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/p
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/sigma
create mode 100755 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean
create mode 100755 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/fvOptions
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/transportProperties
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/turbulenceProperties
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/blockMeshDict
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/fvSchemes
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/fvSolution
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/probes
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/residuals
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/singleGraph
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/files
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/options
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/WatersKing.C
create mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H
create mode 100755 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
index 83c184f49a8..6506c213870 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@@ -45,6 +45,9 @@ makeBaseTurbulenceModel
#include "Stokes.H"
makeLaminarModel(Stokes);
+#include "Maxwell.H"
+makeLaminarModel(Maxwell);
+
// -------------------------------------------------------------------------- //
// RAS models
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C
new file mode 100644
index 00000000000..1a7f409cd19
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C
@@ -0,0 +1,240 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "Maxwell.H"
+#include "fvOptions.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace laminarModels
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+Maxwell<BasicTurbulenceModel>::Maxwell
+(
+ const alphaField& alpha,
+ const rhoField& rho,
+ const volVectorField& U,
+ const surfaceScalarField& alphaRhoPhi,
+ const surfaceScalarField& phi,
+ const transportModel& transport,
+ const word& propertiesName,
+ const word& type
+)
+:
+ laminarModel<BasicTurbulenceModel>
+ (
+ type,
+ alpha,
+ rho,
+ U,
+ alphaRhoPhi,
+ phi,
+ transport,
+ propertiesName
+ ),
+
+ nuM_
+ (
+ dimensioned<scalar>
+ (
+ "nuM",
+ dimViscosity,
+ this->coeffDict_.lookup("nuM")
+ )
+ ),
+
+ lambda_
+ (
+ dimensioned<scalar>
+ (
+ "lambda",
+ dimTime,
+ this->coeffDict_.lookup("lambda")
+ )
+ ),
+
+ sigma_
+ (
+ IOobject
+ (
+ IOobject::groupName("sigma", U.group()),
+ this->runTime_.timeName(),
+ this->mesh_,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ this->mesh_
+ )
+{
+ if (type == typeName)
+ {
+ this->printCoeffs(type);
+ }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool Maxwell<BasicTurbulenceModel>::read()
+{
+ if (laminarModel<BasicTurbulenceModel>::read())
+ {
+ nuM_.readIfPresent(this->coeffDict());
+ lambda_.readIfPresent(this->coeffDict());
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+template<class BasicTurbulenceModel>
+tmp<Foam::volSymmTensorField>
+Maxwell<BasicTurbulenceModel>::R() const
+{
+ return sigma_;
+}
+
+template<class BasicTurbulenceModel>
+tmp<Foam::volSymmTensorField>
+Maxwell<BasicTurbulenceModel>::devRhoReff() const
+{
+ return tmp<volSymmTensorField>
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ IOobject::groupName("devRhoReff", this->U_.group()),
+ this->runTime_.timeName(),
+ this->mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ this->alpha_*this->rho_*sigma_
+ - (this->alpha_*this->rho_*this->nu())
+ *dev(twoSymm(fvc::grad(this->U_)))
+ )
+ );
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<Foam::fvVectorMatrix>
+Maxwell<BasicTurbulenceModel>::divDevRhoReff
+(
+ volVectorField& U
+) const
+{
+ return
+ (
+ fvc::div
+ (
+ this->alpha_*this->rho_*this->nuM_*fvc::grad(U)
+ )
+ + fvc::div(this->alpha_*this->rho_*sigma_)
+ - fvc::div(this->alpha_*this->rho_*this->nu()*dev2(T(fvc::grad(U))))
+ - fvm::laplacian(this->alpha_*this->rho_*nu0(), U)
+ );
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<Foam::fvVectorMatrix>
+Maxwell<BasicTurbulenceModel>::divDevRhoReff
+(
+ const volScalarField& rho,
+ volVectorField& U
+) const
+{
+ return
+ (
+ fvc::div
+ (
+ this->alpha_*rho*this->nuM_*fvc::grad(U)
+ )
+ + fvc::div(this->alpha_*rho*sigma_)
+ - fvc::div(this->alpha_*rho*this->nu()*dev2(T(fvc::grad(U))))
+ - fvm::laplacian(this->alpha_*rho*nu0(), U)
+ );
+}
+
+
+template<class BasicTurbulenceModel>
+void Maxwell<BasicTurbulenceModel>::correct()
+{
+ // Local references
+ const alphaField& alpha = this->alpha_;
+ const rhoField& rho = this->rho_;
+ const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
+ const volVectorField& U = this->U_;
+ volSymmTensorField& sigma = this->sigma_;
+ fv::options& fvOptions(fv::options::New(this->mesh_));
+
+ laminarModel<BasicTurbulenceModel>::correct();
+
+ tmp<volTensorField> tgradU(fvc::grad(U));
+ const volTensorField& gradU = tgradU();
+ dimensionedScalar rLambda = 1.0/(lambda_);
+
+ // Note sigma is positive on lhs of momentum eqn
+ volSymmTensorField P
+ (
+ twoSymm(sigma & gradU)
+ - nuM_*rLambda*twoSymm(gradU)
+ );
+
+ // Viscoelastic stress equation
+ tmp<fvSymmTensorMatrix> sigmaEqn
+ (
+ fvm::ddt(alpha, rho, sigma)
+ + fvm::div(alphaRhoPhi, sigma)
+ + fvm::Sp(alpha*rho*rLambda, sigma)
+ ==
+ alpha*rho*P
+ + fvOptions(alpha, rho, sigma)
+ );
+
+ sigmaEqn.ref().relax();
+ fvOptions.constrain(sigmaEqn.ref());
+ solve(sigmaEqn);
+ fvOptions.correct(sigma_);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace laminarModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H
new file mode 100644
index 00000000000..85c4d38d510
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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::laminarModels::Maxwell
+
+Group
+ grpLaminar
+
+Description
+ Maxwell model for viscoelasticity using the upper-convected time
+ derivative of the stress tensor.
+ See http://en.wikipedia.org/wiki/Upper-convected_Maxwell_model
+
+ The model includes an additional viscosity (nu) from the transport
+ model from which it is instantiated, which makes it equivalent to
+ the Oldroyd-B model for the case of an incompressible transport
+ model (where nu is non-zero).
+ See https://en.wikipedia.org/wiki/Oldroyd-B_model
+
+ Reference:
+ \verbatim
+ Amoreira, L. J., & Oliveira, P. J. (2010).
+ Comparison of different formulations for the numerical calculation
+ of unsteady incompressible viscoelastic fluid flow.
+ Adv. Appl. Math. Mech, 4, 483-502.
+ \endverbatim
+
+SourceFiles
+ Maxwell.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Maxwell_H
+#define Maxwell_H
+
+#include "laminarModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace laminarModels
+{
+
+/*---------------------------------------------------------------------------*\
+ Class Maxwell Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class BasicTurbulenceModel>
+class Maxwell
+:
+ public laminarModel<BasicTurbulenceModel>
+{
+
+protected:
+
+ // Protected data
+
+ // Model coefficients
+
+ dimensionedScalar nuM_;
+ dimensionedScalar lambda_;
+
+
+ // Fields
+
+ volSymmTensorField sigma_;
+
+
+ // Protected Member Functions
+
+ //- Return the turbulence viscosity
+ tmp<volScalarField> nu0() const
+ {
+ return this->nu() + nuM_;
+ }
+
+
+public:
+
+ typedef typename BasicTurbulenceModel::alphaField alphaField;
+ typedef typename BasicTurbulenceModel::rhoField rhoField;
+ typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
+ //- Runtime type information
+ TypeName("Maxwell");
+
+
+ // Constructors
+
+ //- Construct from components
+ Maxwell
+ (
+ const alphaField& alpha,
+ const rhoField& rho,
+ const volVectorField& U,
+ const surfaceScalarField& alphaRhoPhi,
+ const surfaceScalarField& phi,
+ const transportModel& transport,
+ const word& propertiesName = turbulenceModel::propertiesName,
+ const word& type = typeName
+ );
+
+
+ //- Destructor
+ virtual ~Maxwell()
+ {}
+
+
+ // Member Functions
+
+ //- Read model coefficients if they have changed
+ virtual bool read();
+
+ //- Return the Reynolds stress tensor
+ virtual tmp<volSymmTensorField> R() const;
+
+ //- Return the effective stress tensor
+ virtual tmp<volSymmTensorField> devRhoReff() const;
+
+ //- Return the source term for the momentum equation
+ virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+
+ //- Return the source term for the momentum equation
+ virtual tmp<fvVectorMatrix> divDevRhoReff
+ (
+ const volScalarField& rho,
+ volVectorField& U
+ ) const;
+
+ //- Solve the turbulence equations and correct eddy-Viscosity and
+ // related properties
+ virtual void correct();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace laminarModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+ #include "Maxwell.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/U b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/U
new file mode 100644
index 00000000000..ee40b539a66
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/U
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volVectorField;
+ object U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Uinlet (0.03876 0 0);
+
+dimensions [0 1 -1 0 0 0 0];
+
+internalField uniform (0 0 0);
+
+boundaryField
+{
+ inlet
+ {
+ type fixedValue;
+ value uniform $Uinlet;
+ }
+
+ outlet
+ {
+ type zeroGradient;
+ value uniform (0 0 0);
+ }
+
+ wall
+ {
+ type fixedValue;
+ value uniform (0 0 0);
+ }
+
+ #includeEtc "caseDicts/setConstraintTypes"
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/p b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/p
new file mode 100644
index 00000000000..f2d9ffb3b9b
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/p
@@ -0,0 +1,42 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ object p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -2 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ inlet
+ {
+ type zeroGradient;
+ }
+
+ outlet
+ {
+ type fixedValue;
+ value uniform 0;
+ }
+
+ wall
+ {
+ type zeroGradient;
+ }
+
+ #includeEtc "caseDicts/setConstraintTypes"
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma
new file mode 100644
index 00000000000..259ccfb7b76
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma
@@ -0,0 +1,38 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volSymmTensorField;
+ object R;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -2 0 0 0 0];
+
+internalField uniform (0 0 0 0 0 0);
+
+boundaryField
+{
+ inlet
+ {
+ type fixedValue;
+ value $internalField;
+ }
+
+ ".*"
+ {
+ type zeroGradient;
+ }
+
+ #includeEtc "caseDicts/setConstraintTypes"
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/transportProperties
new file mode 100644
index 00000000000..35bbd73e1e0
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 3.0.1 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel Newtonian;
+
+nu [0 2 -1 0 0 0 0] 1e-5;
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties
new file mode 100644
index 00000000000..6503cde5c3b
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+laminar
+{
+ laminarModel Maxwell;
+
+ MaxwellCoeffs
+ {
+ nuM 0.002;
+ lambda 0.03;
+ }
+
+ printCoeffs on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/blockMeshDict
new file mode 100644
index 00000000000..b4668034485
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/blockMeshDict
@@ -0,0 +1,112 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.0032;
+
+vertices
+(
+ (-40 0 -1)
+ ( 0 0 -1)
+ ( 30 0 -1)
+ (-40 1 -1)
+ ( 0 1 -1)
+ ( 30 1 -1)
+ (-40 4 -1)
+ ( 0 4 -1)
+
+ (-40 0 1)
+ ( 0 0 1)
+ ( 30 0 1)
+ (-40 1 1)
+ ( 0 1 1)
+ ( 30 1 1)
+ (-40 4 1)
+ ( 0 4 1)
+);
+
+blocks
+(
+ hex (0 1 4 3 8 9 12 11) (40 12 1) simpleGrading (0.02 0.4 1)
+ hex (1 2 5 4 9 10 13 12) (30 12 1) simpleGrading (50 0.4 1)
+ hex (3 4 7 6 11 12 15 14) (40 24 1) simpleGrading (0.02 ((0.5 0.5 4.0) (0.5 0.5 0.25)) 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+ inlet
+ {
+ type patch;
+ faces
+ (
+ (0 3 11 8)
+ (3 6 14 11)
+ );
+ }
+
+ walls
+ {
+ type wall;
+ faces
+ (
+ (6 7 15 14)
+ (7 4 12 15)
+ (4 5 13 12)
+ );
+ }
+
+ outlet
+ {
+ type patch;
+ faces
+ (
+ (2 5 13 10)
+ );
+ }
+
+ centreline
+ {
+ type symmetryPlane;
+ faces
+ (
+ (0 1 9 8)
+ (1 2 10 9)
+ );
+ }
+
+ frontAndBack
+ {
+ type empty;
+ faces
+ (
+ (0 1 4 3)
+ (3 4 7 6)
+ (1 2 5 4)
+ (8 9 12 11)
+ (11 12 15 14)
+ (9 10 13 12)
+ );
+ }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict
new file mode 100644
index 00000000000..66f6d6cfde3
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application pimpleFoam;
+
+startFrom latestTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 0.25;
+
+deltaT 2e-4;
+
+writeControl runTime;
+
+writeInterval 0.01;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 8;
+
+writeCompression off;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable true;
+
+functions
+{
+ #includeFunc graphs
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSchemes
new file mode 100644
index 00000000000..9f4397a0845
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSchemes
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default backward;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+}
+
+divSchemes
+{
+ default none;
+
+ div(phi,U) Gauss linearUpwind grad(U);
+ div(phi,sigma) Gauss vanAlbada;
+
+ div(sigma) Gauss linear;
+ div((nu*dev2(T(grad(U))))) Gauss linear;
+ div((nuM*grad(U))) Gauss linear;
+}
+
+laplacianSchemes
+{
+ default Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+}
+
+snGradSchemes
+{
+ default corrected;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSolution
new file mode 100644
index 00000000000..302add3af75
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSolution
@@ -0,0 +1,67 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver GAMG;
+ smoother DIC;
+ tolerance 1e-6;
+ relTol 0.05;
+ }
+
+ "(U|sigma)"
+ {
+ solver smoothSolver;
+ smoother symGaussSeidel;
+ tolerance 1e-6;
+ relTol 0.1;
+ }
+
+ pFinal
+ {
+ $p;
+ relTol 0;
+ }
+
+ "(U|sigma)Final"
+ {
+ $U;
+ relTol 0;
+ }
+}
+
+PIMPLE
+{
+ momentumPredictor off;
+ nOuterCorrectors 15;
+ nCorrectors 1;
+ nNonOrthogonalCorrectors 0;
+ pRefCell 0;
+ pRefValue 0;
+ turbOnFinalIterOnly no;
+}
+
+relaxationFactors
+{
+ equations
+ {
+ ".*" 1;
+ }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs
new file mode 100644
index 00000000000..6c622052c38
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs
@@ -0,0 +1,62 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Web: www.OpenFOAM.org
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+Description
+ Writes graph data for specified fields along a line, specified by start
+ and end points.
+
+\*---------------------------------------------------------------------------*/
+
+
+// Sampling and I/O settings
+#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
+
+// Override settings here, e.g.
+// setConfig { type midPoint; }
+
+type sets;
+libs ("libsampling.so");
+
+writeControl writeTime;
+
+interpolationScheme cellPoint;
+
+setFormat raw;
+
+setConfig
+{
+ type midPoint; // midPoint
+ axis distance; // x, y, z, xyz
+}
+
+sets
+(
+ lineA
+ {
+ $setConfig;
+ start (-0.0016 0 0);
+ end (-0.0016 0.0128 0);
+ }
+
+ lineB
+ {
+ $setConfig;
+ start (-0.0048 0 0);
+ end (-0.0048 0.0128 0);
+ }
+
+ lineC
+ {
+ $setConfig;
+ start (-0.032 0 0);
+ end (-0.032 0.0128 0);
+ }
+);
+
+fields (U);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/U b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/U
new file mode 100644
index 00000000000..6a258e941b7
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/U
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volVectorField;
+ object U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -1 0 0 0 0];
+
+internalField uniform (0 0 0);
+
+boundaryField
+{
+ wall
+ {
+ type fixedValue;
+ value uniform (0 0 0);
+ }
+
+ #includeEtc "caseDicts/setConstraintTypes"
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/p b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/p
new file mode 100644
index 00000000000..af35540f51a
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/p
@@ -0,0 +1,31 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ object p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -2 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ walls
+ {
+ type zeroGradient;
+ }
+
+ #includeEtc "caseDicts/setConstraintTypes"
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/sigma b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/sigma
new file mode 100644
index 00000000000..491709d9ff3
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/0/sigma
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volSymmTensorField;
+ object R;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -2 0 0 0 0];
+
+internalField uniform (0 0 0 0 0 0);
+
+boundaryField
+{
+ walls
+ {
+ type zeroGradient;
+ }
+
+ #includeEtc "caseDicts/setConstraintTypes"
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean
new file mode 100755
index 00000000000..0f2f7ba75f3
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean
@@ -0,0 +1,12 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+rm -rf postProcessing *.dat validation/*.eps
+
+wclean validation/WatersKing
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun
new file mode 100755
index 00000000000..1737ee272a0
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+runApplication $(getApplication)
+
+wmake validation/WatersKing
+runApplication WatersKing
+
+( cd validation && ./createGraph )
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/fvOptions b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/fvOptions
new file mode 100644
index 00000000000..5a267f51d28
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/fvOptions
@@ -0,0 +1,38 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object fvOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+momentumSource
+{
+ type vectorSemiImplicitSource;
+ active yes;
+
+ vectorSemiImplicitSourceCoeffs
+ {
+ timeStart 0.0;
+ duration 1000;
+ selectionMode all;
+
+ volumeMode specific;
+ injectionRateSuSp
+ {
+ U ((5 0 0) 0);
+ }
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/transportProperties
new file mode 100644
index 00000000000..ca57ed7652d
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel Newtonian;
+
+nu [0 2 -1 0 0 0 0] 0.1; // kinematic -> 0.002 dynamic
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/turbulenceProperties
new file mode 100644
index 00000000000..e7cf61543fc
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/turbulenceProperties
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+laminar
+{
+ laminarModel Maxwell;
+
+ MaxwellCoeffs
+ {
+ nuM 1;
+ lambda 5;
+ }
+
+ printCoeffs on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/blockMeshDict
new file mode 100644
index 00000000000..99174900c47
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/blockMeshDict
@@ -0,0 +1,96 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.1;
+
+vertices
+(
+ (-1 0 -1)
+ ( 1 0 -1)
+ ( 1 10 -1)
+ (-1 10 -1)
+
+ (-1 0 1)
+ ( 1 0 1)
+ ( 1 10 1)
+ (-1 10 1)
+);
+
+blocks
+(
+ hex (0 1 2 3 4 5 6 7) (1 40 1) simpleGrading (1 4 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+ left
+ {
+ type cyclic;
+ neighbourPatch right;
+ faces
+ (
+ (0 3 7 4)
+ );
+ }
+
+ right
+ {
+ type cyclic;
+ neighbourPatch left;
+ faces
+ (
+ (1 2 6 5)
+ );
+ }
+
+ walls
+ {
+ type wall;
+ faces
+ (
+ (0 1 5 4)
+ );
+ }
+
+ centreline
+ {
+ type symmetryPlane;
+ faces
+ (
+ (2 3 7 6)
+ );
+ }
+
+ frontAndBack
+ {
+ type empty;
+ faces
+ (
+ (0 1 2 3)
+ (4 5 6 7)
+ );
+ }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict
new file mode 100644
index 00000000000..a986b1ae759
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application pimpleFoam;
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 25;
+
+deltaT 5e-3;
+
+writeControl runTime;
+
+writeInterval 1;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 8;
+
+writeCompression off;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable true;
+
+functions
+{
+ #includeFunc residuals
+ #includeFunc singleGraph
+ #includeFunc probes
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/fvSchemes
new file mode 100644
index 00000000000..c7802ef9357
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/fvSchemes
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default backward;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+}
+
+divSchemes
+{
+ default none;
+
+ div(phi,U) Gauss linearUpwind grad(U);
+ div(phi,sigma) Gauss vanAlbada;
+
+ div(sigma) Gauss linear;
+ div((nu*dev2(T(grad(U))))) Gauss linear;
+ div((nuM*grad(U))) Gauss linear;
+}
+
+laplacianSchemes
+{
+ default Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+}
+
+snGradSchemes
+{
+ default uncorrected;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/fvSolution
new file mode 100644
index 00000000000..c82c0fb0101
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/fvSolution
@@ -0,0 +1,67 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver GAMG;
+ smoother DIC;
+ tolerance 1e-6;
+ relTol 0.05;
+ }
+
+ "(U|sigma)"
+ {
+ solver smoothSolver;
+ smoother symGaussSeidel;
+ tolerance 1e-6;
+ relTol 0.1;
+ }
+
+ pFinal
+ {
+ $p;
+ relTol 0;
+ }
+
+ "(U|sigma)Final"
+ {
+ $U;
+ relTol 0;
+ }
+}
+
+PIMPLE
+{
+ momentumPredictor off;
+ nOuterCorrectors 15;
+ nCorrectors 3;
+ nNonOrthogonalCorrectors 0;
+ pRefCell 0;
+ pRefValue 0;
+ turbOnFinalIterOnly no;
+}
+
+relaxationFactors
+{
+ equations
+ {
+ ".*" 1;
+ }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/probes b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/probes
new file mode 100644
index 00000000000..6bec7ba300b
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/probes
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Web: www.OpenFOAM.org
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+Description
+ Writes out values of fields from cells nearest to specified locations.
+
+\*---------------------------------------------------------------------------*/
+
+#includeEtc "caseDicts/postProcessing/probes/probes.cfg"
+
+fields (U);
+probeLocations
+(
+ (0 1 0)
+);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/residuals b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/residuals
new file mode 100644
index 00000000000..af061576bd1
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/residuals
@@ -0,0 +1,19 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Web: www.OpenFOAM.org
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+Description
+ For specified fields, writes out the initial residuals for the first
+ solution of each time step; for non-scalar fields (e.g. vectors), writes
+ the largest of the residuals for each component (e.g. x, y, z).
+
+\*---------------------------------------------------------------------------*/
+
+#includeEtc "caseDicts/postProcessing/numerical/residuals.cfg"
+
+fields (p sigma);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/singleGraph b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/singleGraph
new file mode 100644
index 00000000000..560dd1c51a1
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/singleGraph
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Web: www.OpenFOAM.org
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+Description
+ Writes graph data for specified fields along a line, specified by start
+ and end points.
+
+\*---------------------------------------------------------------------------*/
+
+
+// Sampling and I/O settings
+#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
+
+// Override settings here, e.g.
+// setConfig { type midPoint; }
+
+type sets;
+libs ("libsampling.so");
+
+writeControl writeTime;
+
+interpolationScheme cellPoint;
+
+setFormat raw;
+
+setConfig
+{
+ type midPoint; // midPoint
+ axis distance; // x, y, z, xyz
+}
+
+sets
+(
+ line
+ {
+ $setConfig;
+ start (0 0 0);
+ end (0 1 0);
+ }
+);
+
+fields (U);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/files b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/files
new file mode 100644
index 00000000000..af1834eae11
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/files
@@ -0,0 +1,3 @@
+WatersKing.C
+
+EXE = $(FOAM_USER_APPBIN)/WatersKing
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/options b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/options
new file mode 100644
index 00000000000..780009c8767
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/options
@@ -0,0 +1,14 @@
+EXE_INC = \
+ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+ -I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude
+
+EXE_LIBS = \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels \
+ -lfiniteVolume \
+ -lmeshTools
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/WatersKing.C b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/WatersKing.C
new file mode 100644
index 00000000000..4f9ebd896be
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/WatersKing.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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/>.
+
+Application
+ WatersKing
+
+Description
+ Analytical solution for the start-up planar Poiseuille flow of an
+ Oldroyd-B fluid.
+
+ References:
+ \verbatim
+ Waters, N. D., & King, M. J. (1970).
+ Unsteady flow of an elasto-viscous liquid.
+ Rheologica Acta, 9, 345-355.
+
+ Amoreira, L. J., & Oliveira, P. J. (2010).
+ Comparison of different formulations for the numerical
+ calculation of unsteady incompressible viscoelastic fluid
+ flow. Adv. Appl. Math. Mech, 4, 483-502.
+ \endverbatim
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "singlePhaseTransportModel.H"
+#include "turbulentTransportModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+ #include "setRootCase.H"
+ #include "createTime.H"
+
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ #include "createMesh.H"
+ #include "createFields.H"
+
+ const scalar h = mesh.bounds().span().y();
+ Info<< "Height from centreline to wall = " << h << endl;
+
+ label centrelineID = mesh.boundary().findPatchID("centreline");
+ const vector patchToCell =
+ mesh.boundary()[centrelineID].Cf()[0]
+ - mesh.C()[mesh.findNearestCell(location)];
+
+ const scalar y = patchToCell.y()/h;
+ Info<< "Normalised distance from centreline = " << y << nl << endl;
+
+ const scalar nu0 = nu1 + nu2;
+ const scalar E = lambda*nu0/(rho*sqr(h));
+ const scalar beta = nu2/nu0;
+ const scalar UInf = K*sqr(h)/3.0/nu0;
+
+ Info<< "Waters and King parameters:" << nl
+ << "E = " << E << nl
+ << "beta = " << beta << nl
+ << "K = " << K << nl
+ << "UInf = " << UInf << nl << endl;
+
+ label order = 8;
+
+ scalarField ak(order, 0);
+ scalarField bk(order, 0);
+ scalarField ck(order, 0);
+ scalarField B(order, 0);
+
+ forAll(ak, i)
+ {
+ scalar k = i + 1;
+ ak[i] = (2.0*k - 1)/2.0*constant::mathematical::pi*::sqrt(E);
+ bk[i] = (1.0 + beta*sqr(ak[i]))/2.0;
+ ck[i] = ::sqrt(mag(sqr(bk[i]) - sqr(ak[i])));
+ B[i] = 48*::pow(-1, k)/::pow((2*k - 1)*constant::mathematical::pi, 3)*
+ ::cos((2*k - 1)*constant::mathematical::pi*y/2);
+ }
+
+ scalarField A(order, 0);
+ OFstream file(runTime.path()/"WatersKing.dat");
+ const scalar LOGVGREAT = ::log(VGREAT);
+ while (!runTime.end())
+ {
+ scalar t = runTime.timeOutputValue()/lambda;
+ forAll(A, i)
+ {
+ if (bk[i]*t < LOGVGREAT)
+ {
+ if (bk[i] >= ak[i])
+ {
+ A[i] = (bk[i] - sqr(ak[i]))/ck[i]*::sinh(ck[i]*t)
+ + ::cosh(ck[i]*t);
+ }
+ else
+ {
+ A[i] = (bk[i] - sqr(ak[i]))/ck[i]*::sin(ck[i]*t)
+ + ::cos(ck[i]*t);
+ }
+ A[i] *= ::exp(-bk[i]*t);
+ }
+ else
+ {
+ Info<< "Coefficient A[" << order << "] = 0" << endl;
+ order = i;
+ Info<< "Resizing A and B to " << order << endl;
+ A.resize(order);
+ B.resize(order);
+ }
+ }
+ scalar U = UInf*(1.5*(1 - sqr(y)) + sum(A*B));
+ file<< runTime.timeName() << token::TAB << U << endl;
+ runTime++;
+ }
+
+ Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+ << " ClockTime = " << runTime.elapsedClockTime() << " s"
+ << nl << endl;
+
+ Info<< "End\n" << endl;
+
+ return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H
new file mode 100644
index 00000000000..4ae80853b46
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H
@@ -0,0 +1,64 @@
+Info<< "Reading transportProperties\n" << endl;
+IOdictionary transportProperties
+(
+ IOobject
+ (
+ "transportProperties",
+ runTime.constant(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ )
+);
+const scalar nu2 =
+ dimensionedScalar
+ (
+ "nu",
+ dimViscosity,
+ transportProperties.lookup("nu")
+ ).value();
+
+Info<< "Reading viscoelastic properties\n" << endl;
+IOdictionary turbulenceProperties
+(
+ IOobject
+ (
+ "turbulenceProperties",
+ runTime.constant(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ )
+);
+const dictionary& MaxwellCoeffs =
+ turbulenceProperties.subDict("laminar").subDict("MaxwellCoeffs");
+const scalar nu1 = readScalar(MaxwellCoeffs.lookup("nuM"));
+const scalar lambda = readScalar(MaxwellCoeffs.lookup("lambda"));
+
+const scalar rho = 1;
+
+Info<< "Reading pressure gradient\n" << endl;
+IOdictionary fvOptions
+(
+ IOobject
+ (
+ "fvOptions",
+ runTime.constant(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ )
+);
+const dictionary& gradPDict =
+ fvOptions.subDict("momentumSource").subDict
+ (
+ "vectorSemiImplicitSourceCoeffs"
+ ).subDict
+ (
+ "injectionRateSuSp"
+ );
+const scalar K =
+ Tuple2<vector, scalar>(gradPDict.lookup("U")).first().x();
+
+dictionary probes(IFstream(runTime.system()/"probes")());
+const point location = pointField(probes.lookup("probeLocations"))[0];
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph
new file mode 100755
index 00000000000..a30402600ef
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+tail -n +4 ../postProcessing/probes/0/U | \
+ tr -s " " | tr -d '(' | cut -d " " -f2-3 > ../Numerical.dat
+
+if ! which gnuplot > /dev/null 2>&1
+then
+ echo "gnuplot not found - skipping graph creation" >&2
+ exit 1
+fi
+
+gnuplot<<EOF
+ set terminal postscript eps color enhanced "Helvetica,20"
+ set output "planarPoiseuille.eps"
+ set xlabel "Time / [s]" font "Helvetica,24"
+ set ylabel "Velocity / [m/s]" font "Helvetica,24"
+ set grid
+ set key right top
+ set xrange [0:25]
+ set yrange [0:8]
+ plot \
+ "../Numerical.dat" t "OpenFOAM (every 100 pts)" \
+ with linespoints pointinterval 100 lt 1 pt 6 ps 1.5, \
+ "../WatersKing.dat" with lines t "Analytical" lt -1
+EOF
+
+# ----------------------------------------------------------------- end-of-file
--
GitLab
From 1e94682f24922a35bf0546e60fd764e2dae5c41f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 20 Sep 2016 19:03:40 +0100
Subject: [PATCH 24/42] tutorials: Renamed sub-directories ras -> RAS and les
-> LES
---
tutorials/combustion/XiFoam/{ras => RAS}/Allclean | 0
tutorials/combustion/XiFoam/{ras => RAS}/Allrun | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/Su | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/T | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/Tu | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/U | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/Xi | 0
.../{ras => RAS}/moriyoshiHomogeneous/0/alphat | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/b | 0
.../{ras => RAS}/moriyoshiHomogeneous/0/epsilon | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/ft | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/fu | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/k | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/nut | 0
.../XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/p | 0
.../constant/combustionProperties | 0
.../constant/thermophysicalProperties | 0
.../constant/thermophysicalProperties.hydrogen | 0
.../constant/turbulenceProperties | 0
.../moriyoshiHomogeneous/system/blockMeshDict | 0
.../moriyoshiHomogeneous/system/controlDict | 0
.../moriyoshiHomogeneous/system/fvSchemes | 0
.../moriyoshiHomogeneous/system/fvSolution | 0
.../flameSpreadWaterSuppressionPanel/0/C3H8 | 0
.../flameSpreadWaterSuppressionPanel/0/IDefault | 0
.../flameSpreadWaterSuppressionPanel/0/N2 | 0
.../flameSpreadWaterSuppressionPanel/0/O2 | 0
.../flameSpreadWaterSuppressionPanel/0/T | 0
.../flameSpreadWaterSuppressionPanel/0/U | 0
.../flameSpreadWaterSuppressionPanel/0/Ydefault | 0
.../flameSpreadWaterSuppressionPanel/0/alphat | 0
.../0/filmRegion/Tf | 0
.../0/filmRegion/Uf | 0
.../0/filmRegion/deltaf | 0
.../flameSpreadWaterSuppressionPanel/0/k | 0
.../flameSpreadWaterSuppressionPanel/0/nut | 0
.../flameSpreadWaterSuppressionPanel/0/p | 0
.../flameSpreadWaterSuppressionPanel/0/p_rgh | 0
.../flameSpreadWaterSuppressionPanel/0/ph_rgh.orig | 0
.../0/pyrolysisRegion/Qr | 0
.../0/pyrolysisRegion/T | 0
.../0/pyrolysisRegion/Y0Default | 0
.../0/pyrolysisRegion/char | 0
.../0/pyrolysisRegion/p | 0
.../0/pyrolysisRegion/wood | 0
.../flameSpreadWaterSuppressionPanel/Allclean | 0
.../flameSpreadWaterSuppressionPanel/Allrun | 0
.../constant/additionalControls | 0
.../constant/combustionProperties | 0
.../flameSpreadWaterSuppressionPanel/constant/g | 0
.../flameSpreadWaterSuppressionPanel/constant/pRef | 0
.../constant/pyrolysisRegion/chemistryProperties | 0
.../constant/pyrolysisRegion/radiationProperties | 0
.../constant/pyrolysisRegion/reactions | 0
.../constant/pyrolysisRegion/thermo.solid | 0
.../pyrolysisRegion/thermophysicalProperties | 0
.../constant/pyrolysisZones | 0
.../constant/radiationProperties | 0
.../constant/reactingCloud1Positions | 0
.../constant/reactingCloud1Properties | 0
.../constant/reactions | 0
.../constant/surfaceFilmProperties | 0
.../constant/thermo.compressibleGas | 0
.../constant/thermophysicalProperties | 0
.../constant/turbulenceProperties | 0
.../system/blockMeshDict | 0
.../system/controlDict | 0
.../system/createPatchDict | 0
.../system/extrudeToRegionMeshDictFilm | 0
.../system/extrudeToRegionMeshDictPyr | 0
.../system/filmRegion/changeDictionaryDict | 0
.../system/filmRegion/createPatchDict | 0
.../system/filmRegion/fvSchemes | 0
.../system/filmRegion/fvSolution | 0
.../system/filmRegion/topoSetDict | 0
.../system/fvSchemes | 0
.../system/fvSolution | 0
.../system/pyrolysisRegion/fvSchemes | 0
.../system/pyrolysisRegion/fvSolution | 0
.../system/topoSetDict | 0
.../{les => LES}/oppositeBurningPanels/0/C3H8 | 0
.../fireFoam/{les => LES}/oppositeBurningPanels/0/G | 0
.../{les => LES}/oppositeBurningPanels/0/IDefault | 0
.../{les => LES}/oppositeBurningPanels/0/N2 | 0
.../{les => LES}/oppositeBurningPanels/0/O2 | 0
.../fireFoam/{les => LES}/oppositeBurningPanels/0/T | 0
.../fireFoam/{les => LES}/oppositeBurningPanels/0/U | 0
.../{les => LES}/oppositeBurningPanels/0/Ydefault | 0
.../{les => LES}/oppositeBurningPanels/0/alphat | 0
.../fireFoam/{les => LES}/oppositeBurningPanels/0/k | 0
.../{les => LES}/oppositeBurningPanels/0/nut | 0
.../fireFoam/{les => LES}/oppositeBurningPanels/0/p | 0
.../{les => LES}/oppositeBurningPanels/0/p_rgh | 0
.../oppositeBurningPanels/0/panelRegion/Qr | 0
.../oppositeBurningPanels/0/panelRegion/T | 0
.../oppositeBurningPanels/0/panelRegion/Y0Default | 0
.../oppositeBurningPanels/0/panelRegion/char | 0
.../oppositeBurningPanels/0/panelRegion/p | 0
.../oppositeBurningPanels/0/panelRegion/wood | 0
.../oppositeBurningPanels/0/ph_rgh.orig | 0
.../{les => LES}/oppositeBurningPanels/Allclean | 0
.../{les => LES}/oppositeBurningPanels/Allrun | 0
.../constant/additionalControls | 0
.../constant/combustionProperties | 0
.../{les => LES}/oppositeBurningPanels/constant/g | 0
.../oppositeBurningPanels/constant/hRef | 0
.../oppositeBurningPanels/constant/pRef | 0
.../constant/panelRegion/chemistryProperties | 0
.../constant/panelRegion/radiationProperties | 0
.../constant/panelRegion/reactions | 1 -
.../constant/panelRegion/thermo.solid | 0
.../constant/panelRegion/thermophysicalProperties | 0
.../oppositeBurningPanels/constant/pyrolysisZones | 0
.../constant/radiationProperties | 0
.../constant/reactingCloud1Properties | 0
.../oppositeBurningPanels/constant/reactions | 0
.../constant/surfaceFilmProperties | 0
.../constant/thermo.compressibleGas | 0
.../constant/thermophysicalProperties | 0
.../constant/turbulenceProperties | 0
.../oppositeBurningPanels/system/blockMeshDict | 0
.../system/cRefine.topoSetDict | 0
.../oppositeBurningPanels/system/controlDict | 0
.../oppositeBurningPanels/system/createPatchDict | 0
.../oppositeBurningPanels/system/decomposeParDict | 0
.../system/extrudeToRegionMeshDict | 0
.../oppositeBurningPanels/system/f.topoSetDict | 0
.../system/fBurner.topoSetDict | 0
.../oppositeBurningPanels/system/fvSchemes | 0
.../oppositeBurningPanels/system/fvSolution | 0
.../system/panelRegion/decomposeParDict | 0
.../system/panelRegion/fvSchemes | 0
.../system/panelRegion/fvSolution | 0
.../oppositeBurningPanels/system/refineMeshDict | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/CH4 | 0
.../{les => LES}/smallPoolFire2D/0/FSDomega | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/G | 0
.../{les => LES}/smallPoolFire2D/0/IDefault | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/N2 | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/O2 | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/T | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/U | 0
.../{les => LES}/smallPoolFire2D/0/Ydefault | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/alphat | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/k | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/nut | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/p | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/p_rgh | 0
.../{les => LES}/smallPoolFire2D/0/ph_rgh.orig | 0
.../fireFoam/{les => LES}/smallPoolFire2D/0/soot | 0
.../fireFoam/{les => LES}/smallPoolFire2D/Allclean | 0
.../fireFoam/{les => LES}/smallPoolFire2D/Allrun | 0
.../smallPoolFire2D/constant/additionalControls | 0
.../smallPoolFire2D/constant/combustionProperties | 0
.../{les => LES}/smallPoolFire2D/constant/g | 0
.../{les => LES}/smallPoolFire2D/constant/hRef | 0
.../{les => LES}/smallPoolFire2D/constant/pRef | 0
.../smallPoolFire2D/constant/pyrolysisZones | 0
.../smallPoolFire2D/constant/radiationProperties | 0
.../constant/reactingCloud1Properties | 0
.../{les => LES}/smallPoolFire2D/constant/reactions | 0
.../smallPoolFire2D/constant/surfaceFilmProperties | 0
.../smallPoolFire2D/constant/thermo.compressibleGas | 0
.../constant/thermophysicalProperties | 0
.../smallPoolFire2D/constant/turbulenceProperties | 0
.../smallPoolFire2D/system/blockMeshDict | 0
.../{les => LES}/smallPoolFire2D/system/controlDict | 0
.../smallPoolFire2D/system/createPatchDict | 0
.../{les => LES}/smallPoolFire2D/system/fvSchemes | 0
.../{les => LES}/smallPoolFire2D/system/fvSolution | 0
.../{les => LES}/smallPoolFire2D/system/topoSetDict | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/CH4 | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/G | 0
.../{les => LES}/smallPoolFire3D/0/IDefault | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/N2 | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/O2 | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/T | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/U | 0
.../{les => LES}/smallPoolFire3D/0/Ydefault | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/alphat | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/k | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/nut | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/p | 0
.../fireFoam/{les => LES}/smallPoolFire3D/0/p_rgh | 0
.../{les => LES}/smallPoolFire3D/0/ph_rgh.orig | 0
.../fireFoam/{les => LES}/smallPoolFire3D/Allclean | 0
.../fireFoam/{les => LES}/smallPoolFire3D/Allrun | 0
.../smallPoolFire3D/constant/additionalControls | 0
.../smallPoolFire3D/constant/chemistryProperties | 0
.../smallPoolFire3D/constant/combustionProperties | 0
.../{les => LES}/smallPoolFire3D/constant/g | 0
.../{les => LES}/smallPoolFire3D/constant/hRef | 0
.../{les => LES}/smallPoolFire3D/constant/pRef | 0
.../smallPoolFire3D/constant/pyrolysisZones | 0
.../smallPoolFire3D/constant/radiationProperties | 0
.../constant/reactingCloud1Properties | 0
.../{les => LES}/smallPoolFire3D/constant/reactions | 0
.../smallPoolFire3D/constant/surfaceFilmProperties | 0
.../smallPoolFire3D/constant/thermo.compressibleGas | 0
.../constant/thermophysicalProperties | 0
.../smallPoolFire3D/constant/turbulenceProperties | 0
.../smallPoolFire3D/system/blockMeshDict | 0
.../{les => LES}/smallPoolFire3D/system/controlDict | 0
.../smallPoolFire3D/system/createPatchDict | 0
.../smallPoolFire3D/system/decomposeParDict | 0
.../{les => LES}/smallPoolFire3D/system/fvSchemes | 0
.../{les => LES}/smallPoolFire3D/system/fvSolution | 0
.../{les => LES}/smallPoolFire3D/system/topoSetDict | 0
.../rhoPimpleFoam/{les => LES}/pitzDaily/0/T | 0
.../rhoPimpleFoam/{les => LES}/pitzDaily/0/U | 0
.../rhoPimpleFoam/{les => LES}/pitzDaily/0/alphat | 0
.../rhoPimpleFoam/{les => LES}/pitzDaily/0/k | 0
.../rhoPimpleFoam/{les => LES}/pitzDaily/0/muTilda | 0
.../rhoPimpleFoam/{les => LES}/pitzDaily/0/nut | 0
.../rhoPimpleFoam/{les => LES}/pitzDaily/0/p | 0
.../pitzDaily/constant/thermophysicalProperties | 0
.../pitzDaily/constant/turbulenceProperties | 0
.../{les => LES}/pitzDaily/system/blockMeshDict | 0
.../{les => LES}/pitzDaily/system/controlDict | 0
.../{les => LES}/pitzDaily/system/fvSchemes | 0
.../{les => LES}/pitzDaily/system/fvSolution | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuct/0/T | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuct/0/U | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuct/0/alphat | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuct/0/epsilon | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuct/0/k | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuct/0/nut | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuct/0/p | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuct/Allrun | 0
.../{ras => RAS}/angledDuct/constant/fvOptions | 0
.../angledDuct/constant/thermophysicalProperties | 0
.../angledDuct/constant/turbulenceProperties | 0
.../{ras => RAS}/angledDuct/system/blockMeshDict.m4 | 0
.../{ras => RAS}/angledDuct/system/controlDict | 0
.../{ras => RAS}/angledDuct/system/fvSchemes | 0
.../{ras => RAS}/angledDuct/system/fvSolution | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/T | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/U | 0
.../{ras => RAS}/angledDuctLTS/0/alphat | 0
.../{ras => RAS}/angledDuctLTS/0/epsilon | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/k | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/nut | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/p | 0
.../rhoPimpleFoam/{ras => RAS}/angledDuctLTS/Allrun | 0
.../{ras => RAS}/angledDuctLTS/constant/fvOptions | 0
.../angledDuctLTS/constant/thermophysicalProperties | 0
.../angledDuctLTS/constant/turbulenceProperties | 0
.../angledDuctLTS/system/blockMeshDict.m4 | 0
.../{ras => RAS}/angledDuctLTS/system/controlDict | 0
.../{ras => RAS}/angledDuctLTS/system/fvSchemes | 0
.../{ras => RAS}/angledDuctLTS/system/fvSolution | 0
.../rhoPimpleFoam/{ras => RAS}/cavity/0/T | 0
.../rhoPimpleFoam/{ras => RAS}/cavity/0/U | 0
.../rhoPimpleFoam/{ras => RAS}/cavity/0/alphat | 0
.../rhoPimpleFoam/{ras => RAS}/cavity/0/epsilon | 0
.../rhoPimpleFoam/{ras => RAS}/cavity/0/k | 0
.../rhoPimpleFoam/{ras => RAS}/cavity/0/nut | 0
.../rhoPimpleFoam/{ras => RAS}/cavity/0/omega | 0
.../rhoPimpleFoam/{ras => RAS}/cavity/0/p | 0
.../cavity/constant/thermophysicalProperties | 0
.../cavity/constant/turbulenceProperties | 0
.../{ras => RAS}/cavity/system/blockMeshDict | 0
.../{ras => RAS}/cavity/system/controlDict | 0
.../{ras => RAS}/cavity/system/fvSchemes | 0
.../{ras => RAS}/cavity/system/fvSolution | 0
.../rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/T | 0
.../rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/U | 0
.../{ras => RAS}/mixerVessel2D/0/alphat | 0
.../{ras => RAS}/mixerVessel2D/0/epsilon | 0
.../rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/k | 0
.../rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/nut | 0
.../rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/p | 0
.../rhoPimpleFoam/{ras => RAS}/mixerVessel2D/Allrun | 0
.../mixerVessel2D/constant/MRFProperties | 0
.../{ras => RAS}/mixerVessel2D/constant/fvOptions | 0
.../mixerVessel2D/constant/thermophysicalProperties | 0
.../mixerVessel2D/constant/transportProperties | 0
.../mixerVessel2D/constant/turbulenceProperties | 0
.../{ras => RAS}/mixerVessel2D/makeMesh | 0
.../mixerVessel2D/system/blockMeshDict.m4 | 0
.../{ras => RAS}/mixerVessel2D/system/controlDict | 0
.../{ras => RAS}/mixerVessel2D/system/fvSchemes | 0
.../{ras => RAS}/mixerVessel2D/system/fvSolution | 0
.../sonicFoam/{ras => RAS}/nacaAirfoil/0/T | 0
.../sonicFoam/{ras => RAS}/nacaAirfoil/0/U | 0
.../sonicFoam/{ras => RAS}/nacaAirfoil/0/alphat | 0
.../sonicFoam/{ras => RAS}/nacaAirfoil/0/epsilon | 0
.../sonicFoam/{ras => RAS}/nacaAirfoil/0/k | 0
.../sonicFoam/{ras => RAS}/nacaAirfoil/0/nut | 0
.../sonicFoam/{ras => RAS}/nacaAirfoil/0/p | 0
.../sonicFoam/{ras => RAS}/nacaAirfoil/Allclean | 0
.../sonicFoam/{ras => RAS}/nacaAirfoil/Allrun | 0
.../{ras => RAS}/nacaAirfoil/Running_Notes | 0
.../nacaAirfoil/constant/thermophysicalProperties | 0
.../nacaAirfoil/constant/turbulenceProperties | 0
.../nacaAirfoil/prostar/nacaAirfoil.bnd.gz | Bin
.../nacaAirfoil/prostar/nacaAirfoil.cel.gz | Bin
.../nacaAirfoil/prostar/nacaAirfoil.vrt.gz | Bin
.../{ras => RAS}/nacaAirfoil/system/controlDict | 0
.../{ras => RAS}/nacaAirfoil/system/fvSchemes | 0
.../{ras => RAS}/nacaAirfoil/system/fvSolution | 0
.../compressible/sonicFoam/{ras => RAS}/prism/0/T | 0
.../compressible/sonicFoam/{ras => RAS}/prism/0/U | 0
.../sonicFoam/{ras => RAS}/prism/0/alphat | 0
.../sonicFoam/{ras => RAS}/prism/0/epsilon | 0
.../compressible/sonicFoam/{ras => RAS}/prism/0/k | 0
.../compressible/sonicFoam/{ras => RAS}/prism/0/nut | 0
.../compressible/sonicFoam/{ras => RAS}/prism/0/p | 0
.../prism/constant/thermophysicalProperties | 0
.../prism/constant/turbulenceProperties | 0
.../{ras => RAS}/prism/system/blockMeshDict | 0
.../sonicFoam/{ras => RAS}/prism/system/controlDict | 0
.../sonicFoam/{ras => RAS}/prism/system/fvSchemes | 0
.../sonicFoam/{ras => RAS}/prism/system/fvSolution | 0
.../pisoFoam/{les => LES}/motorBike/Allclean | 0
.../pisoFoam/{les => LES}/motorBike/Allrun | 0
.../pisoFoam/{les => LES}/motorBike/lesFiles/Allrun | 0
.../{les => LES}/motorBike/lesFiles/controlDict | 0
.../{les => LES}/motorBike/lesFiles/fvSchemes | 0
.../{les => LES}/motorBike/lesFiles/fvSolution | 0
.../motorBike/lesFiles/turbulenceProperties | 0
.../{les => LES}/motorBike/motorBike/0.orig/U | 0
.../motorBike/motorBike/0.orig/include/fixedInlet | 0
.../motorBike/0.orig/include/frontBackUpperPatches | 0
.../motorBike/0.orig/include/initialConditions | 0
.../{les => LES}/motorBike/motorBike/0.orig/k | 0
.../{les => LES}/motorBike/motorBike/0.orig/nuTilda | 0
.../{les => LES}/motorBike/motorBike/0.orig/nut | 0
.../{les => LES}/motorBike/motorBike/0.orig/p | 0
.../{les => LES}/motorBike/motorBike/Allclean | 0
.../{les => LES}/motorBike/motorBike/Allrun | 0
.../constant/polyMesh/blockMeshDict.8pSmall | 0
.../motorBike/constant/transportProperties | 0
.../motorBike/motorBike/constant/triSurface/README | 0
.../motorBike/constant/turbulenceProperties | 0
.../motorBike/motorBike/system/blockMeshDict | 0
.../motorBike/motorBike/system/controlDict | 0
.../motorBike/motorBike/system/cuttingPlane | 0
.../motorBike/motorBike/system/decomposeParDict | 0
.../motorBike/system/decomposeParDict.hierarchical | 0
.../motorBike/system/decomposeParDict.ptscotch | 0
.../motorBike/motorBike/system/forceCoeffs | 0
.../motorBike/motorBike/system/fvSchemes | 0
.../motorBike/motorBike/system/fvSolution | 0
.../motorBike/motorBike/system/snappyHexMeshDict | 0
.../motorBike/motorBike/system/streamLines | 0
.../pisoFoam/{les => LES}/pitzDaily/0/U | 0
.../pisoFoam/{les => LES}/pitzDaily/0/k | 0
.../pisoFoam/{les => LES}/pitzDaily/0/nuTilda | 0
.../pisoFoam/{les => LES}/pitzDaily/0/nut | 0
.../pisoFoam/{les => LES}/pitzDaily/0/p | 0
.../pisoFoam/{les => LES}/pitzDaily/0/s | 0
.../pitzDaily/constant/transportProperties | 0
.../pitzDaily/constant/turbulenceProperties | 0
.../{les => LES}/pitzDaily/system/blockMeshDict | 0
.../{les => LES}/pitzDaily/system/controlDict | 0
.../{les => LES}/pitzDaily/system/fvSchemes | 0
.../{les => LES}/pitzDaily/system/fvSolution | 0
.../pisoFoam/{les => LES}/pitzDailyMapped/0/U | 0
.../pisoFoam/{les => LES}/pitzDailyMapped/0/k | 0
.../pisoFoam/{les => LES}/pitzDailyMapped/0/nuTilda | 0
.../pisoFoam/{les => LES}/pitzDailyMapped/0/nut | 0
.../pisoFoam/{les => LES}/pitzDailyMapped/0/p | 0
.../pitzDailyMapped/constant/transportProperties | 0
.../pitzDailyMapped/constant/turbulenceProperties | 0
.../pitzDailyMapped/system/blockMeshDict | 0
.../{les => LES}/pitzDailyMapped/system/controlDict | 0
.../pitzDailyMapped/system/decomposeParDict | 0
.../{les => LES}/pitzDailyMapped/system/fvSchemes | 0
.../{les => LES}/pitzDailyMapped/system/fvSolution | 0
.../incompressible/pisoFoam/{ras => RAS}/cavity/0/U | 0
.../pisoFoam/{ras => RAS}/cavity/0/epsilon | 0
.../incompressible/pisoFoam/{ras => RAS}/cavity/0/k | 0
.../pisoFoam/{ras => RAS}/cavity/0/nuTilda | 0
.../pisoFoam/{ras => RAS}/cavity/0/nut | 0
.../pisoFoam/{ras => RAS}/cavity/0/omega | 0
.../incompressible/pisoFoam/{ras => RAS}/cavity/0/p | 0
.../cavity/constant/transportProperties | 0
.../cavity/constant/turbulenceProperties | 0
.../{ras => RAS}/cavity/system/blockMeshDict | 0
.../pisoFoam/{ras => RAS}/cavity/system/controlDict | 0
.../pisoFoam/{ras => RAS}/cavity/system/fvSchemes | 0
.../pisoFoam/{ras => RAS}/cavity/system/fvSolution | 0
.../pisoFoam/{ras => RAS}/cavityCoupledU/0/U | 0
.../pisoFoam/{ras => RAS}/cavityCoupledU/0/epsilon | 0
.../pisoFoam/{ras => RAS}/cavityCoupledU/0/k | 0
.../pisoFoam/{ras => RAS}/cavityCoupledU/0/nuTilda | 0
.../pisoFoam/{ras => RAS}/cavityCoupledU/0/nut | 0
.../pisoFoam/{ras => RAS}/cavityCoupledU/0/p | 0
.../cavityCoupledU/constant/transportProperties | 0
.../cavityCoupledU/constant/turbulenceProperties | 0
.../cavityCoupledU/system/blockMeshDict | 0
.../{ras => RAS}/cavityCoupledU/system/controlDict | 0
.../{ras => RAS}/cavityCoupledU/system/fvSchemes | 0
.../{ras => RAS}/cavityCoupledU/system/fvSolution | 0
.../multiphase/cavitatingFoam/{les => LES}/Allrun | 0
.../cavitatingFoam/{les => LES}/throttle/0/U | 0
.../{les => LES}/throttle/0/alpha.vapour | 0
.../cavitatingFoam/{les => LES}/throttle/0/k | 0
.../cavitatingFoam/{les => LES}/throttle/0/nut | 0
.../cavitatingFoam/{les => LES}/throttle/0/p | 0
.../cavitatingFoam/{les => LES}/throttle/0/rho | 0
.../cavitatingFoam/{les => LES}/throttle/Allclean | 0
.../cavitatingFoam/{les => LES}/throttle/Allrun | 0
.../throttle/constant/thermodynamicProperties | 0
.../throttle/constant/transportProperties | 0
.../throttle/constant/turbulenceProperties | 0
.../{les => LES}/throttle/system/blockMeshDict | 0
.../{les => LES}/throttle/system/controlDict | 0
.../{les => LES}/throttle/system/fvSchemes | 0
.../{les => LES}/throttle/system/fvSolution | 0
.../{les => LES}/throttle/system/refineMeshDict | 0
.../{les => LES}/throttle/system/topoSetDict.1 | 0
.../{les => LES}/throttle/system/topoSetDict.2 | 0
.../{les => LES}/throttle/system/topoSetDict.3 | 0
.../cavitatingFoam/{les => LES}/throttle3D/0.orig/U | 0
.../{les => LES}/throttle3D/0.orig/alpha.vapour | 0
.../cavitatingFoam/{les => LES}/throttle3D/0.orig/k | 0
.../{les => LES}/throttle3D/0.orig/nut | 0
.../cavitatingFoam/{les => LES}/throttle3D/0.orig/p | 0
.../{les => LES}/throttle3D/0.orig/rho | 0
.../cavitatingFoam/{les => LES}/throttle3D/Allclean | 0
.../cavitatingFoam/{les => LES}/throttle3D/Allrun | 0
.../throttle3D/constant/thermodynamicProperties | 0
.../throttle3D/constant/transportProperties | 0
.../throttle3D/constant/turbulenceProperties | 0
.../{les => LES}/throttle3D/system/blockMeshDict | 0
.../{les => LES}/throttle3D/system/controlDict | 0
.../{les => LES}/throttle3D/system/decomposeParDict | 0
.../{les => LES}/throttle3D/system/fvSchemes | 0
.../{les => LES}/throttle3D/system/fvSolution | 0
.../{les => LES}/throttle3D/system/mapFieldsDict | 0
.../{les => LES}/throttle3D/system/refineMeshDict | 0
.../{les => LES}/throttle3D/system/topoSetDict.1 | 0
.../{les => LES}/throttle3D/system/topoSetDict.2 | 0
.../{les => LES}/throttle3D/system/topoSetDict.3 | 0
.../cavitatingFoam/{ras => RAS}/throttle/0/U | 0
.../{ras => RAS}/throttle/0/alpha.vapour | 0
.../cavitatingFoam/{ras => RAS}/throttle/0/k | 0
.../cavitatingFoam/{ras => RAS}/throttle/0/nut | 0
.../cavitatingFoam/{ras => RAS}/throttle/0/omega | 0
.../cavitatingFoam/{ras => RAS}/throttle/0/p | 0
.../cavitatingFoam/{ras => RAS}/throttle/0/rho | 0
.../cavitatingFoam/{ras => RAS}/throttle/Allclean | 0
.../cavitatingFoam/{ras => RAS}/throttle/Allrun | 0
.../throttle/constant/thermodynamicProperties | 0
.../throttle/constant/transportProperties | 0
.../throttle/constant/turbulenceProperties | 0
.../{ras => RAS}/throttle/system/blockMeshDict | 0
.../{ras => RAS}/throttle/system/controlDict | 0
.../{ras => RAS}/throttle/system/fvSchemes | 0
.../{ras => RAS}/throttle/system/fvSolution | 0
.../{ras => RAS}/throttle/system/refineMeshDict | 0
.../{ras => RAS}/throttle/system/topoSetDict.1 | 0
.../{ras => RAS}/throttle/system/topoSetDict.2 | 0
.../{ras => RAS}/throttle/system/topoSetDict.3 | 0
.../{ras => RAS}/sloshingTank2D/0/T | 0
.../{ras => RAS}/sloshingTank2D/0/U | 0
.../{ras => RAS}/sloshingTank2D/0/alpha.water.orig | 0
.../{ras => RAS}/sloshingTank2D/0/p | 0
.../{ras => RAS}/sloshingTank2D/0/p_rgh | 0
.../{ras => RAS}/sloshingTank2D/Allclean | 0
.../{ras => RAS}/sloshingTank2D/Allrun | 0
.../sloshingTank2D/constant/dynamicMeshDict | 0
.../{ras => RAS}/sloshingTank2D/constant/g | 0
.../constant/thermophysicalProperties | 0
.../constant/thermophysicalProperties.air | 0
.../constant/thermophysicalProperties.water | 0
.../sloshingTank2D/constant/transportProperties | 0
.../sloshingTank2D/constant/turbulenceProperties | 0
.../sloshingTank2D/system/blockMeshDict.m4 | 0
.../{ras => RAS}/sloshingTank2D/system/controlDict | 0
.../sloshingTank2D/system/decomposeParDict | 0
.../{ras => RAS}/sloshingTank2D/system/fvSchemes | 0
.../{ras => RAS}/sloshingTank2D/system/fvSolution | 0
.../sloshingTank2D/system/setFieldsDict | 0
.../multiphase/driftFluxFoam/{ras => RAS}/dahl/0/U | 0
.../driftFluxFoam/{ras => RAS}/dahl/0/alpha.sludge | 0
.../driftFluxFoam/{ras => RAS}/dahl/0/epsilon | 0
.../multiphase/driftFluxFoam/{ras => RAS}/dahl/0/k | 0
.../driftFluxFoam/{ras => RAS}/dahl/0/nut | 0
.../driftFluxFoam/{ras => RAS}/dahl/0/p_rgh | 0
.../driftFluxFoam/{ras => RAS}/dahl/constant/g | 0
.../{ras => RAS}/dahl/constant/transportProperties | 0
.../{ras => RAS}/dahl/constant/turbulenceProperties | 0
.../{ras => RAS}/dahl/system/blockMeshDict | 0
.../{ras => RAS}/dahl/system/controlDict | 0
.../{ras => RAS}/dahl/system/fvSchemes | 0
.../{ras => RAS}/dahl/system/fvSolution | 0
.../driftFluxFoam/{ras => RAS}/mixerVessel2D/0/U | 0
.../{ras => RAS}/mixerVessel2D/0/alpha.sludge | 0
.../{ras => RAS}/mixerVessel2D/0/epsilon | 0
.../driftFluxFoam/{ras => RAS}/mixerVessel2D/0/k | 0
.../driftFluxFoam/{ras => RAS}/mixerVessel2D/0/nut | 0
.../{ras => RAS}/mixerVessel2D/0/p_rgh | 0
.../driftFluxFoam/{ras => RAS}/mixerVessel2D/Allrun | 0
.../mixerVessel2D/constant/MRFProperties | 0
.../{ras => RAS}/mixerVessel2D/constant/g | 0
.../mixerVessel2D/constant/transportProperties | 0
.../mixerVessel2D/constant/turbulenceProperties | 0
.../{ras => RAS}/mixerVessel2D/makeMesh | 0
.../mixerVessel2D/system/blockMeshDict.m4 | 0
.../{ras => RAS}/mixerVessel2D/system/controlDict | 0
.../{ras => RAS}/mixerVessel2D/system/fvSchemes | 0
.../{ras => RAS}/mixerVessel2D/system/fvSolution | 0
.../{ras => RAS}/mixerVessel2D/system/setFieldsDict | 0
.../{ras => RAS}/mixerVessel2D/system/topoSetDict | 0
.../driftFluxFoam/{ras => RAS}/tank3D/0/U | 0
.../{ras => RAS}/tank3D/0/alpha.sludge | 0
.../driftFluxFoam/{ras => RAS}/tank3D/0/epsilon | 0
.../driftFluxFoam/{ras => RAS}/tank3D/0/k | 0
.../driftFluxFoam/{ras => RAS}/tank3D/0/nut | 0
.../driftFluxFoam/{ras => RAS}/tank3D/0/p_rgh | 0
.../driftFluxFoam/{ras => RAS}/tank3D/Allclean | 0
.../driftFluxFoam/{ras => RAS}/tank3D/Allrun | 0
.../driftFluxFoam/{ras => RAS}/tank3D/constant/g | 0
.../{ras => RAS}/tank3D/constant/polyMesh/boundary | 0
.../{ras => RAS}/tank3D/constant/polyMesh/cells.gz | Bin
.../{ras => RAS}/tank3D/constant/polyMesh/faces.gz | Bin
.../tank3D/constant/polyMesh/neighbour.gz | Bin
.../{ras => RAS}/tank3D/constant/polyMesh/owner.gz | Bin
.../{ras => RAS}/tank3D/constant/polyMesh/points.gz | Bin
.../tank3D/constant/transportProperties | 0
.../tank3D/constant/turbulenceProperties | 0
.../{ras => RAS}/tank3D/system/controlDict | 0
.../{ras => RAS}/tank3D/system/fvSchemes | 0
.../{ras => RAS}/tank3D/system/fvSolution | 0
.../interDyMFoam/{ras => RAS}/DTCHull/0.orig/U | 0
.../{ras => RAS}/DTCHull/0.orig/alpha.water | 0
.../interDyMFoam/{ras => RAS}/DTCHull/0.orig/k | 0
.../interDyMFoam/{ras => RAS}/DTCHull/0.orig/nut | 0
.../interDyMFoam/{ras => RAS}/DTCHull/0.orig/omega | 0
.../interDyMFoam/{ras => RAS}/DTCHull/0.orig/p_rgh | 0
.../{ras => RAS}/DTCHull/0.orig/pointDisplacement | 0
.../interDyMFoam/{ras => RAS}/DTCHull/Allclean | 0
.../interDyMFoam/{ras => RAS}/DTCHull/Allrun | 0
.../interDyMFoam/{ras => RAS}/DTCHull/README | 0
.../{ras => RAS}/DTCHull/constant/dynamicMeshDict | 0
.../DTCHull/constant/dynamicMeshDict.sixDoF | 0
.../interDyMFoam/{ras => RAS}/DTCHull/constant/g | 0
.../interDyMFoam/{ras => RAS}/DTCHull/constant/hRef | 0
.../DTCHull/constant/transportProperties | 0
.../{ras => RAS}/DTCHull/constant/triSurface/README | 0
.../DTCHull/constant/turbulenceProperties | 0
.../{ras => RAS}/DTCHull/system/blockMeshDict | 0
.../{ras => RAS}/DTCHull/system/controlDict | 0
.../{ras => RAS}/DTCHull/system/decomposeParDict | 0
.../{ras => RAS}/DTCHull/system/fvSchemes | 0
.../{ras => RAS}/DTCHull/system/fvSolution | 0
.../{ras => RAS}/DTCHull/system/meshQualityDict | 0
.../{ras => RAS}/DTCHull/system/refineMeshDict | 0
.../{ras => RAS}/DTCHull/system/setFieldsDict | 0
.../{ras => RAS}/DTCHull/system/snappyHexMeshDict | 0
.../DTCHull/system/surfaceFeatureExtractDict | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.1 | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.2 | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.3 | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.4 | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.5 | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.6 | 0
.../{ras => RAS}/damBreakWithObstacle/0.orig/U | 0
.../damBreakWithObstacle/0.orig/alpha.water | 0
.../damBreakWithObstacle/0.orig/alpha.water.orig | 0
.../{ras => RAS}/damBreakWithObstacle/0.orig/k | 0
.../{ras => RAS}/damBreakWithObstacle/0.orig/nut | 0
.../{ras => RAS}/damBreakWithObstacle/0.orig/omega | 0
.../{ras => RAS}/damBreakWithObstacle/0.orig/p_rgh | 0
.../{ras => RAS}/damBreakWithObstacle/Allclean | 0
.../{ras => RAS}/damBreakWithObstacle/Allrun | 0
.../damBreakWithObstacle/constant/dynamicMeshDict | 0
.../{ras => RAS}/damBreakWithObstacle/constant/g | 0
.../constant/transportProperties | 0
.../constant/turbulenceProperties | 0
.../damBreakWithObstacle/createObstacle.setSet | 0
.../damBreakWithObstacle/system/blockMeshDict | 0
.../damBreakWithObstacle/system/controlDict | 0
.../damBreakWithObstacle/system/decomposeParDict | 0
.../damBreakWithObstacle/system/fvSchemes | 0
.../damBreakWithObstacle/system/fvSolution | 0
.../damBreakWithObstacle/system/setFieldsDict | 0
.../damBreakWithObstacle/system/topoSetDict | 0
.../{ras => RAS}/floatingObject/0.orig/U | 0
.../{ras => RAS}/floatingObject/0.orig/alpha.water | 0
.../{ras => RAS}/floatingObject/0.orig/epsilon | 0
.../{ras => RAS}/floatingObject/0.orig/k | 0
.../{ras => RAS}/floatingObject/0.orig/nut | 0
.../{ras => RAS}/floatingObject/0.orig/p_rgh | 0
.../floatingObject/0.orig/pointDisplacement | 0
.../{ras => RAS}/floatingObject/Allclean | 0
.../interDyMFoam/{ras => RAS}/floatingObject/Allrun | 0
.../floatingObject/constant/dynamicMeshDict | 0
.../floatingObject/constant/dynamicMeshDict.sixDoF | 0
.../{ras => RAS}/floatingObject/constant/g | 0
.../floatingObject/constant/transportProperties | 0
.../floatingObject/constant/turbulenceProperties | 0
.../floatingObject/system/blockMeshDict | 0
.../{ras => RAS}/floatingObject/system/controlDict | 0
.../floatingObject/system/decomposeParDict | 0
.../{ras => RAS}/floatingObject/system/fvSchemes | 0
.../{ras => RAS}/floatingObject/system/fvSolution | 0
.../floatingObject/system/setFieldsDict | 0
.../{ras => RAS}/floatingObject/system/topoSetDict | 0
.../{ras => RAS}/mixerVesselAMI/0.orig/U | 0
.../{ras => RAS}/mixerVesselAMI/0.orig/alpha.water | 0
.../{ras => RAS}/mixerVesselAMI/0.orig/epsilon | 0
.../{ras => RAS}/mixerVesselAMI/0.orig/k | 0
.../{ras => RAS}/mixerVesselAMI/0.orig/nut | 0
.../{ras => RAS}/mixerVesselAMI/0.orig/p_rgh | 0
.../{ras => RAS}/mixerVesselAMI/Allclean | 0
.../interDyMFoam/{ras => RAS}/mixerVesselAMI/Allrun | 0
.../{ras => RAS}/mixerVesselAMI/Allrun.pre | 0
.../mixerVesselAMI/constant/dynamicMeshDict | 0
.../{ras => RAS}/mixerVesselAMI/constant/g | 0
.../mixerVesselAMI/constant/transportProperties | 0
.../mixerVesselAMI/constant/triSurface/baffles.stl | 0
.../mixerVesselAMI/constant/triSurface/gasInlet.stl | 0
.../mixerVesselAMI/constant/triSurface/outlet.stl | 0
.../mixerVesselAMI/constant/triSurface/problemFaces | 0
.../mixerVesselAMI/constant/triSurface/rotating.stl | 0
.../mixerVesselAMI/constant/triSurface/shaft.stl | 0
.../constant/triSurface/shaftRotating.stl | 0
.../mixerVesselAMI/constant/triSurface/sparger.stl | 0
.../mixerVesselAMI/constant/triSurface/stirrer.stl | 0
.../mixerVesselAMI/constant/triSurface/vessel.stl | 0
.../mixerVesselAMI/constant/turbulenceProperties | 0
.../mixerVesselAMI/system/blockMeshDict | 0
.../{ras => RAS}/mixerVesselAMI/system/controlDict | 0
.../mixerVesselAMI/system/createBafflesDict | 0
.../mixerVesselAMI/system/decomposeParDict | 0
.../{ras => RAS}/mixerVesselAMI/system/fvSchemes | 0
.../{ras => RAS}/mixerVesselAMI/system/fvSolution | 0
.../mixerVesselAMI/system/setFieldsDict | 0
.../mixerVesselAMI/system/snappyHexMeshDict | 0
.../mixerVesselAMI/system/surfaceFeatureExtractDict | 0
.../interDyMFoam/{ras => RAS}/sloshingTank2D/0/U | 0
.../{ras => RAS}/sloshingTank2D/0/alpha.water.orig | 0
.../{ras => RAS}/sloshingTank2D/0/p_rgh | 0
.../{ras => RAS}/sloshingTank2D/Allclean | 0
.../interDyMFoam/{ras => RAS}/sloshingTank2D/Allrun | 0
.../sloshingTank2D/constant/dynamicMeshDict | 0
.../{ras => RAS}/sloshingTank2D/constant/g | 0
.../sloshingTank2D/constant/transportProperties | 0
.../sloshingTank2D/constant/turbulenceProperties | 0
.../sloshingTank2D/system/blockMeshDict.m4 | 0
.../{ras => RAS}/sloshingTank2D/system/controlDict | 0
.../sloshingTank2D/system/decomposeParDict | 0
.../{ras => RAS}/sloshingTank2D/system/fvSchemes | 0
.../{ras => RAS}/sloshingTank2D/system/fvSolution | 0
.../sloshingTank2D/system/setFieldsDict | 0
.../{ras => RAS}/sloshingTank2D3DoF/0/U | 0
.../sloshingTank2D3DoF/0/alpha.water.orig | 0
.../{ras => RAS}/sloshingTank2D3DoF/0/p_rgh | 0
.../{ras => RAS}/sloshingTank2D3DoF/Allclean | 0
.../{ras => RAS}/sloshingTank2D3DoF/Allrun | 0
.../sloshingTank2D3DoF/constant/dynamicMeshDict | 0
.../{ras => RAS}/sloshingTank2D3DoF/constant/g | 0
.../sloshingTank2D3DoF/constant/transportProperties | 0
.../constant/turbulenceProperties | 0
.../sloshingTank2D3DoF/system/blockMeshDict.m4 | 0
.../sloshingTank2D3DoF/system/controlDict | 0
.../sloshingTank2D3DoF/system/decomposeParDict | 0
.../sloshingTank2D3DoF/system/fvSchemes | 0
.../sloshingTank2D3DoF/system/fvSolution | 0
.../sloshingTank2D3DoF/system/setFieldsDict | 0
.../interDyMFoam/{ras => RAS}/sloshingTank3D/0/U | 0
.../{ras => RAS}/sloshingTank3D/0/alpha.water.orig | 0
.../{ras => RAS}/sloshingTank3D/0/p_rgh | 0
.../{ras => RAS}/sloshingTank3D/Allclean | 0
.../interDyMFoam/{ras => RAS}/sloshingTank3D/Allrun | 0
.../sloshingTank3D/constant/dynamicMeshDict | 0
.../{ras => RAS}/sloshingTank3D/constant/g | 0
.../sloshingTank3D/constant/transportProperties | 0
.../sloshingTank3D/constant/turbulenceProperties | 0
.../sloshingTank3D/system/blockMeshDict.m4 | 0
.../{ras => RAS}/sloshingTank3D/system/controlDict | 0
.../sloshingTank3D/system/decomposeParDict | 0
.../{ras => RAS}/sloshingTank3D/system/fvSchemes | 0
.../{ras => RAS}/sloshingTank3D/system/fvSolution | 0
.../sloshingTank3D/system/setFieldsDict | 0
.../{ras => RAS}/sloshingTank3D3DoF/0/U | 0
.../sloshingTank3D3DoF/0/alpha.water.orig | 0
.../{ras => RAS}/sloshingTank3D3DoF/0/p_rgh | 0
.../{ras => RAS}/sloshingTank3D3DoF/Allclean | 0
.../{ras => RAS}/sloshingTank3D3DoF/Allrun | 0
.../sloshingTank3D3DoF/constant/dynamicMeshDict | 0
.../{ras => RAS}/sloshingTank3D3DoF/constant/g | 0
.../sloshingTank3D3DoF/constant/transportProperties | 0
.../constant/turbulenceProperties | 0
.../sloshingTank3D3DoF/system/blockMeshDict.m4 | 0
.../sloshingTank3D3DoF/system/controlDict | 0
.../sloshingTank3D3DoF/system/decomposeParDict | 0
.../sloshingTank3D3DoF/system/fvSchemes | 0
.../sloshingTank3D3DoF/system/fvSolution | 0
.../sloshingTank3D3DoF/system/setFieldsDict | 0
.../{ras => RAS}/sloshingTank3D6DoF/0/U | 0
.../sloshingTank3D6DoF/0/alpha.water.orig | 0
.../{ras => RAS}/sloshingTank3D6DoF/0/p_rgh | 0
.../{ras => RAS}/sloshingTank3D6DoF/Allclean | 0
.../{ras => RAS}/sloshingTank3D6DoF/Allrun | 0
.../sloshingTank3D6DoF/constant/6DoF.dat | 1 -
.../sloshingTank3D6DoF/constant/dynamicMeshDict | 0
.../{ras => RAS}/sloshingTank3D6DoF/constant/g | 0
.../sloshingTank3D6DoF/constant/transportProperties | 0
.../constant/turbulenceProperties | 0
.../sloshingTank3D6DoF/gen6DoF/Make/files | 0
.../sloshingTank3D6DoF/gen6DoF/Make/options | 0
.../sloshingTank3D6DoF/gen6DoF/gen6DoF.C | 0
.../sloshingTank3D6DoF/system/blockMeshDict.m4 | 0
.../sloshingTank3D6DoF/system/controlDict | 0
.../sloshingTank3D6DoF/system/decomposeParDict | 0
.../sloshingTank3D6DoF/system/fvSchemes | 0
.../sloshingTank3D6DoF/system/fvSolution | 0
.../sloshingTank3D6DoF/system/setFieldsDict | 0
.../interDyMFoam/{ras => RAS}/testTubeMixer/0/U | 0
.../{ras => RAS}/testTubeMixer/0/alpha.water.orig | 0
.../interDyMFoam/{ras => RAS}/testTubeMixer/0/p_rgh | 0
.../{ras => RAS}/testTubeMixer/Allclean | 0
.../interDyMFoam/{ras => RAS}/testTubeMixer/Allrun | 0
.../testTubeMixer/constant/dynamicMeshDict | 0
.../{ras => RAS}/testTubeMixer/constant/g | 0
.../testTubeMixer/constant/transportProperties | 0
.../testTubeMixer/constant/turbulenceProperties | 0
.../{ras => RAS}/testTubeMixer/system/blockMeshDict | 0
.../{ras => RAS}/testTubeMixer/system/controlDict | 0
.../testTubeMixer/system/decomposeParDict | 0
.../{ras => RAS}/testTubeMixer/system/fvSchemes | 0
.../{ras => RAS}/testTubeMixer/system/fvSolution | 0
.../{ras => RAS}/testTubeMixer/system/setFieldsDict | 0
.../interFoam/{les => LES}/nozzleFlow2D/0/U | 0
.../{les => LES}/nozzleFlow2D/0/alpha.fuel | 0
.../{les => LES}/nozzleFlow2D/0/data/Ubulk | 0
.../{les => LES}/nozzleFlow2D/0/data/ptrace | 0
.../interFoam/{les => LES}/nozzleFlow2D/0/k | 0
.../interFoam/{les => LES}/nozzleFlow2D/0/nuTilda | 0
.../interFoam/{les => LES}/nozzleFlow2D/0/nut | 0
.../interFoam/{les => LES}/nozzleFlow2D/0/p_rgh | 0
.../interFoam/{les => LES}/nozzleFlow2D/Allclean | 0
.../interFoam/{les => LES}/nozzleFlow2D/Allrun | 0
.../interFoam/{les => LES}/nozzleFlow2D/constant/g | 0
.../nozzleFlow2D/constant/transportProperties | 0
.../nozzleFlow2D/constant/turbulenceProperties | 0
.../{les => LES}/nozzleFlow2D/system/blockMeshDict | 0
.../{les => LES}/nozzleFlow2D/system/controlDict | 0
.../{les => LES}/nozzleFlow2D/system/fvSchemes | 0
.../{les => LES}/nozzleFlow2D/system/fvSolution | 0
.../{les => LES}/nozzleFlow2D/system/refineMeshDict | 0
.../{les => LES}/nozzleFlow2D/system/topoSetDict.1 | 0
.../{les => LES}/nozzleFlow2D/system/topoSetDict.2 | 0
.../interFoam/{ras => RAS}/DTCHull/0.orig/U | 0
.../{ras => RAS}/DTCHull/0.orig/alpha.water | 0
.../interFoam/{ras => RAS}/DTCHull/0.orig/k | 0
.../interFoam/{ras => RAS}/DTCHull/0.orig/nut | 0
.../interFoam/{ras => RAS}/DTCHull/0.orig/omega | 0
.../interFoam/{ras => RAS}/DTCHull/0.orig/p_rgh | 0
.../{ras => RAS}/DTCHull/0.orig/pointDisplacement | 0
.../interFoam/{ras => RAS}/DTCHull/Allclean | 0
.../interFoam/{ras => RAS}/DTCHull/Allrun | 0
.../interFoam/{ras => RAS}/DTCHull/README | 0
.../interFoam/{ras => RAS}/DTCHull/constant/g | 0
.../interFoam/{ras => RAS}/DTCHull/constant/hRef | 0
.../DTCHull/constant/transportProperties | 0
.../{ras => RAS}/DTCHull/constant/triSurface/README | 0
.../DTCHull/constant/turbulenceProperties | 0
.../{ras => RAS}/DTCHull/system/blockMeshDict | 0
.../{ras => RAS}/DTCHull/system/controlDict | 0
.../{ras => RAS}/DTCHull/system/decomposeParDict | 0
.../interFoam/{ras => RAS}/DTCHull/system/fvSchemes | 0
.../{ras => RAS}/DTCHull/system/fvSolution | 0
.../{ras => RAS}/DTCHull/system/meshQualityDict | 0
.../{ras => RAS}/DTCHull/system/refineMeshDict | 0
.../{ras => RAS}/DTCHull/system/setFieldsDict | 0
.../{ras => RAS}/DTCHull/system/snappyHexMeshDict | 0
.../DTCHull/system/surfaceFeatureExtractDict | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.1 | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.2 | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.3 | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.4 | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.5 | 0
.../{ras => RAS}/DTCHull/system/topoSetDict.6 | 0
.../interFoam/{ras => RAS}/angledDuct/0/U | 0
.../interFoam/{ras => RAS}/angledDuct/0/alpha.water | 0
.../interFoam/{ras => RAS}/angledDuct/0/epsilon | 0
.../interFoam/{ras => RAS}/angledDuct/0/k | 0
.../interFoam/{ras => RAS}/angledDuct/0/nut | 0
.../interFoam/{ras => RAS}/angledDuct/0/p_rgh | 0
.../interFoam/{ras => RAS}/angledDuct/Allrun | 0
.../{ras => RAS}/angledDuct/constant/fvOptions | 0
.../interFoam/{ras => RAS}/angledDuct/constant/g | 0
.../angledDuct/constant/transportProperties | 0
.../angledDuct/constant/turbulenceProperties | 0
.../{ras => RAS}/angledDuct/system/blockMeshDict.m4 | 0
.../{ras => RAS}/angledDuct/system/controlDict | 0
.../{ras => RAS}/angledDuct/system/fvSchemes | 0
.../{ras => RAS}/angledDuct/system/fvSolution | 0
.../interFoam/{ras => RAS}/damBreak/Allclean | 0
.../interFoam/{ras => RAS}/damBreak/Allrun | 0
.../interFoam/{ras => RAS}/damBreak/damBreak/0/U | 0
.../{ras => RAS}/damBreak/damBreak/0/alpha.water | 0
.../damBreak/damBreak/0/alpha.water.orig | 0
.../{ras => RAS}/damBreak/damBreak/0/epsilon | 0
.../interFoam/{ras => RAS}/damBreak/damBreak/0/k | 0
.../{ras => RAS}/damBreak/damBreak/0/nuTilda | 0
.../interFoam/{ras => RAS}/damBreak/damBreak/0/nut | 0
.../{ras => RAS}/damBreak/damBreak/0/p_rgh | 0
.../{ras => RAS}/damBreak/damBreak/Allclean | 0
.../interFoam/{ras => RAS}/damBreak/damBreak/Allrun | 0
.../{ras => RAS}/damBreak/damBreak/constant/g | 0
.../damBreak/damBreak/constant/transportProperties | 0
.../damBreak/damBreak/constant/turbulenceProperties | 0
.../damBreak/damBreak/system/blockMeshDict | 0
.../damBreak/damBreak/system/controlDict | 0
.../damBreak/damBreak/system/decomposeParDict | 0
.../{ras => RAS}/damBreak/damBreak/system/fvSchemes | 0
.../damBreak/damBreak/system/fvSolution | 0
.../damBreak/damBreak/system/setFieldsDict | 0
.../interFoam/{ras => RAS}/damBreakPorousBaffle/0/U | 0
.../{ras => RAS}/damBreakPorousBaffle/0/alpha.water | 0
.../damBreakPorousBaffle/0/alpha.water.orig | 0
.../{ras => RAS}/damBreakPorousBaffle/0/epsilon | 0
.../interFoam/{ras => RAS}/damBreakPorousBaffle/0/k | 0
.../{ras => RAS}/damBreakPorousBaffle/0/nuTilda | 0
.../{ras => RAS}/damBreakPorousBaffle/0/nut | 0
.../{ras => RAS}/damBreakPorousBaffle/0/p_rgh | 0
.../{ras => RAS}/damBreakPorousBaffle/Allclean | 0
.../{ras => RAS}/damBreakPorousBaffle/Allrun | 0
.../{ras => RAS}/damBreakPorousBaffle/constant/g | 0
.../constant/transportProperties | 0
.../constant/turbulenceProperties | 0
.../damBreakPorousBaffle/system/blockMeshDict | 0
.../system/changeDictionaryDict | 0
.../damBreakPorousBaffle/system/controlDict | 0
.../damBreakPorousBaffle/system/createBafflesDict | 0
.../damBreakPorousBaffle/system/fvSchemes | 0
.../damBreakPorousBaffle/system/fvSolution | 0
.../damBreakPorousBaffle/system/setFieldsDict | 0
.../damBreakPorousBaffle/system/topoSetDict | 0
.../interFoam/{ras => RAS}/waterChannel/0/U | 0
.../{ras => RAS}/waterChannel/0/alpha.water.orig | 0
.../interFoam/{ras => RAS}/waterChannel/0/k | 0
.../interFoam/{ras => RAS}/waterChannel/0/nut | 0
.../interFoam/{ras => RAS}/waterChannel/0/omega | 0
.../interFoam/{ras => RAS}/waterChannel/0/p_rgh | 0
.../interFoam/{ras => RAS}/waterChannel/Allclean | 0
.../interFoam/{ras => RAS}/waterChannel/Allmesh | 0
.../interFoam/{ras => RAS}/waterChannel/Allrun | 0
.../interFoam/{ras => RAS}/waterChannel/constant/g | 0
.../waterChannel/constant/transportProperties | 0
.../waterChannel/constant/turbulenceProperties | 0
.../{ras => RAS}/waterChannel/system/blockMeshDict | 0
.../{ras => RAS}/waterChannel/system/controlDict | 0
.../waterChannel/system/extrudeMeshDict | 0
.../waterChannel/system/extrudeMeshDict.1 | 0
.../waterChannel/system/extrudeMeshDict.2 | 0
.../{ras => RAS}/waterChannel/system/fvSchemes | 0
.../{ras => RAS}/waterChannel/system/fvSolution | 0
.../{ras => RAS}/waterChannel/system/setFieldsDict | 0
.../interFoam/{ras => RAS}/weirOverflow/0.orig/U | 0
.../weirOverflow/0.orig/alpha.water.orig | 0
.../{ras => RAS}/weirOverflow/0.orig/epsilon | 0
.../weirOverflow/0.orig/include/initialConditions | 0
.../interFoam/{ras => RAS}/weirOverflow/0.orig/k | 0
.../interFoam/{ras => RAS}/weirOverflow/0.orig/nut | 0
.../{ras => RAS}/weirOverflow/0.orig/p_rgh | 0
.../interFoam/{ras => RAS}/weirOverflow/Allclean | 0
.../interFoam/{ras => RAS}/weirOverflow/Allrun | 0
.../interFoam/{ras => RAS}/weirOverflow/constant/g | 0
.../weirOverflow/constant/transportProperties | 0
.../weirOverflow/constant/turbulenceProperties | 0
.../{ras => RAS}/weirOverflow/system/blockMeshDict | 0
.../{ras => RAS}/weirOverflow/system/controlDict | 0
.../{ras => RAS}/weirOverflow/system/fvSchemes | 0
.../{ras => RAS}/weirOverflow/system/fvSolution | 0
.../{ras => RAS}/weirOverflow/system/setFieldsDict | 0
873 files changed, 2 deletions(-)
rename tutorials/combustion/XiFoam/{ras => RAS}/Allclean (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/Allrun (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/Su (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/T (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/Tu (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/U (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/Xi (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/alphat (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/b (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/epsilon (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/ft (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/fu (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/k (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/nut (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/0/p (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/constant/combustionProperties (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/constant/thermophysicalProperties (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/constant/turbulenceProperties (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/system/blockMeshDict (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/system/controlDict (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/system/fvSchemes (100%)
rename tutorials/combustion/XiFoam/{ras => RAS}/moriyoshiHomogeneous/system/fvSolution (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/C3H8 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/IDefault (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/N2 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/O2 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/T (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/U (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/Ydefault (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/alphat (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/k (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/nut (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/p (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/p_rgh (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/ph_rgh.orig (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/Allclean (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/Allrun (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/additionalControls (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/combustionProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/g (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/pRef (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/reactions (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/radiationProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/reactions (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/blockMeshDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/controlDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/createPatchDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/fvSchemes (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/fvSolution (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution (100%)
rename tutorials/combustion/fireFoam/{les => LES}/flameSpreadWaterSuppressionPanel/system/topoSetDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/C3H8 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/G (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/IDefault (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/N2 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/O2 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/T (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/U (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/Ydefault (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/alphat (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/k (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/nut (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/p (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/p_rgh (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/panelRegion/Qr (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/panelRegion/T (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/panelRegion/Y0Default (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/panelRegion/char (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/panelRegion/p (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/panelRegion/wood (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/0/ph_rgh.orig (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/Allclean (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/Allrun (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/additionalControls (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/combustionProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/g (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/hRef (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/pRef (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/panelRegion/chemistryProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/panelRegion/radiationProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/panelRegion/reactions (99%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/panelRegion/thermo.solid (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/pyrolysisZones (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/radiationProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/reactingCloud1Properties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/reactions (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/surfaceFilmProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/thermo.compressibleGas (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/thermophysicalProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/constant/turbulenceProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/blockMeshDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/cRefine.topoSetDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/controlDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/createPatchDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/decomposeParDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/extrudeToRegionMeshDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/f.topoSetDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/fBurner.topoSetDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/fvSchemes (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/fvSolution (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/panelRegion/decomposeParDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/panelRegion/fvSchemes (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/panelRegion/fvSolution (100%)
rename tutorials/combustion/fireFoam/{les => LES}/oppositeBurningPanels/system/refineMeshDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/CH4 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/FSDomega (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/G (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/IDefault (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/N2 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/O2 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/T (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/U (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/Ydefault (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/alphat (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/k (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/nut (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/p (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/p_rgh (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/ph_rgh.orig (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/0/soot (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/Allclean (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/Allrun (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/additionalControls (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/combustionProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/g (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/hRef (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/pRef (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/pyrolysisZones (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/radiationProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/reactingCloud1Properties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/reactions (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/surfaceFilmProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/thermo.compressibleGas (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/thermophysicalProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/constant/turbulenceProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/system/blockMeshDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/system/controlDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/system/createPatchDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/system/fvSchemes (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/system/fvSolution (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire2D/system/topoSetDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/CH4 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/G (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/IDefault (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/N2 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/O2 (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/T (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/U (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/Ydefault (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/alphat (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/k (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/nut (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/p (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/p_rgh (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/0/ph_rgh.orig (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/Allclean (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/Allrun (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/additionalControls (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/chemistryProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/combustionProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/g (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/hRef (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/pRef (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/pyrolysisZones (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/radiationProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/reactingCloud1Properties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/reactions (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/surfaceFilmProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/thermo.compressibleGas (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/thermophysicalProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/constant/turbulenceProperties (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/system/blockMeshDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/system/controlDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/system/createPatchDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/system/decomposeParDict (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/system/fvSchemes (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/system/fvSolution (100%)
rename tutorials/combustion/fireFoam/{les => LES}/smallPoolFire3D/system/topoSetDict (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/0/T (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/0/U (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/0/alphat (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/0/k (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/0/muTilda (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/0/nut (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/0/p (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/constant/thermophysicalProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/constant/turbulenceProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/system/blockMeshDict (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/system/controlDict (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/system/fvSchemes (100%)
rename tutorials/compressible/rhoPimpleFoam/{les => LES}/pitzDaily/system/fvSolution (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/0/T (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/0/U (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/0/alphat (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/0/epsilon (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/0/k (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/0/nut (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/0/p (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/Allrun (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/constant/fvOptions (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/constant/thermophysicalProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/constant/turbulenceProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/system/blockMeshDict.m4 (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/system/controlDict (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/system/fvSchemes (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuct/system/fvSolution (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/T (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/U (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/alphat (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/epsilon (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/k (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/nut (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/0/p (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/Allrun (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/constant/fvOptions (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/constant/thermophysicalProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/constant/turbulenceProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/system/blockMeshDict.m4 (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/system/controlDict (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/system/fvSchemes (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/angledDuctLTS/system/fvSolution (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/0/T (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/0/U (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/0/alphat (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/0/epsilon (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/0/k (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/0/nut (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/0/omega (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/0/p (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/constant/thermophysicalProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/constant/turbulenceProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/system/blockMeshDict (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/system/controlDict (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/system/fvSchemes (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/cavity/system/fvSolution (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/T (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/U (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/alphat (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/epsilon (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/k (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/nut (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/0/p (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/Allrun (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/constant/MRFProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/constant/fvOptions (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/constant/thermophysicalProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/constant/transportProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/constant/turbulenceProperties (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/makeMesh (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/system/blockMeshDict.m4 (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/system/controlDict (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/system/fvSchemes (100%)
rename tutorials/compressible/rhoPimpleFoam/{ras => RAS}/mixerVessel2D/system/fvSolution (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/0/T (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/0/U (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/0/alphat (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/0/epsilon (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/0/k (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/0/nut (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/0/p (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/Allclean (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/Allrun (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/Running_Notes (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/constant/thermophysicalProperties (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/constant/turbulenceProperties (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/prostar/nacaAirfoil.bnd.gz (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/prostar/nacaAirfoil.cel.gz (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/prostar/nacaAirfoil.vrt.gz (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/system/controlDict (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/system/fvSchemes (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/nacaAirfoil/system/fvSolution (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/0/T (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/0/U (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/0/alphat (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/0/epsilon (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/0/k (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/0/nut (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/0/p (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/constant/thermophysicalProperties (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/constant/turbulenceProperties (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/system/blockMeshDict (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/system/controlDict (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/system/fvSchemes (100%)
rename tutorials/compressible/sonicFoam/{ras => RAS}/prism/system/fvSolution (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/Allclean (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/Allrun (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/lesFiles/Allrun (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/lesFiles/controlDict (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/lesFiles/fvSchemes (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/lesFiles/fvSolution (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/lesFiles/turbulenceProperties (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/0.orig/U (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/0.orig/include/fixedInlet (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/0.orig/include/frontBackUpperPatches (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/0.orig/include/initialConditions (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/0.orig/k (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/0.orig/nuTilda (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/0.orig/nut (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/0.orig/p (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/Allclean (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/Allrun (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/constant/polyMesh/blockMeshDict.8pSmall (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/constant/transportProperties (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/constant/triSurface/README (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/constant/turbulenceProperties (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/blockMeshDict (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/controlDict (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/cuttingPlane (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/decomposeParDict (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/decomposeParDict.hierarchical (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/decomposeParDict.ptscotch (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/forceCoeffs (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/fvSchemes (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/fvSolution (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/snappyHexMeshDict (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/motorBike/motorBike/system/streamLines (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/0/U (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/0/k (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/0/nuTilda (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/0/nut (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/0/p (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/0/s (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/constant/transportProperties (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/constant/turbulenceProperties (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/system/blockMeshDict (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/system/controlDict (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/system/fvSchemes (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDaily/system/fvSolution (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/0/U (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/0/k (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/0/nuTilda (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/0/nut (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/0/p (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/constant/transportProperties (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/constant/turbulenceProperties (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/system/blockMeshDict (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/system/controlDict (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/system/decomposeParDict (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/system/fvSchemes (100%)
rename tutorials/incompressible/pisoFoam/{les => LES}/pitzDailyMapped/system/fvSolution (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/0/U (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/0/epsilon (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/0/k (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/0/nuTilda (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/0/nut (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/0/omega (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/0/p (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/constant/transportProperties (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/constant/turbulenceProperties (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/system/blockMeshDict (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/system/controlDict (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/system/fvSchemes (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavity/system/fvSolution (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/0/U (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/0/epsilon (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/0/k (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/0/nuTilda (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/0/nut (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/0/p (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/constant/transportProperties (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/constant/turbulenceProperties (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/system/blockMeshDict (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/system/controlDict (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/system/fvSchemes (100%)
rename tutorials/incompressible/pisoFoam/{ras => RAS}/cavityCoupledU/system/fvSolution (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/Allrun (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/0/U (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/0/alpha.vapour (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/0/k (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/0/nut (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/0/p (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/0/rho (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/Allclean (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/Allrun (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/constant/thermodynamicProperties (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/constant/transportProperties (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/constant/turbulenceProperties (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/system/blockMeshDict (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/system/controlDict (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/system/fvSchemes (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/system/fvSolution (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/system/refineMeshDict (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/system/topoSetDict.1 (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/system/topoSetDict.2 (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle/system/topoSetDict.3 (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/0.orig/U (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/0.orig/alpha.vapour (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/0.orig/k (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/0.orig/nut (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/0.orig/p (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/0.orig/rho (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/Allclean (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/Allrun (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/constant/thermodynamicProperties (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/constant/transportProperties (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/constant/turbulenceProperties (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/system/blockMeshDict (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/system/controlDict (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/system/decomposeParDict (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/system/fvSchemes (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/system/fvSolution (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/system/mapFieldsDict (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/system/refineMeshDict (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/system/topoSetDict.1 (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/system/topoSetDict.2 (100%)
rename tutorials/multiphase/cavitatingFoam/{les => LES}/throttle3D/system/topoSetDict.3 (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/0/U (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/0/alpha.vapour (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/0/k (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/0/nut (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/0/omega (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/0/p (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/0/rho (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/Allclean (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/Allrun (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/constant/thermodynamicProperties (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/constant/transportProperties (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/constant/turbulenceProperties (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/system/blockMeshDict (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/system/controlDict (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/system/fvSchemes (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/system/fvSolution (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/system/refineMeshDict (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/system/topoSetDict.1 (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/system/topoSetDict.2 (100%)
rename tutorials/multiphase/cavitatingFoam/{ras => RAS}/throttle/system/topoSetDict.3 (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/0/T (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/0/U (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/0/alpha.water.orig (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/0/p (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/0/p_rgh (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/Allclean (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/Allrun (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/constant/g (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/constant/thermophysicalProperties (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/constant/thermophysicalProperties.air (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/constant/thermophysicalProperties.water (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/constant/transportProperties (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/constant/turbulenceProperties (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/system/blockMeshDict.m4 (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/system/controlDict (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/system/decomposeParDict (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/system/fvSchemes (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/system/fvSolution (100%)
rename tutorials/multiphase/compressibleInterDyMFoam/{ras => RAS}/sloshingTank2D/system/setFieldsDict (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/0/U (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/0/alpha.sludge (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/0/epsilon (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/0/k (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/0/nut (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/0/p_rgh (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/constant/g (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/constant/transportProperties (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/constant/turbulenceProperties (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/system/blockMeshDict (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/system/controlDict (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/system/fvSchemes (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/dahl/system/fvSolution (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/0/U (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/0/alpha.sludge (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/0/epsilon (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/0/k (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/0/nut (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/0/p_rgh (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/Allrun (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/constant/MRFProperties (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/constant/g (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/constant/transportProperties (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/constant/turbulenceProperties (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/makeMesh (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/system/blockMeshDict.m4 (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/system/controlDict (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/system/fvSchemes (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/system/fvSolution (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/system/setFieldsDict (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/mixerVessel2D/system/topoSetDict (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/0/U (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/0/alpha.sludge (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/0/epsilon (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/0/k (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/0/nut (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/0/p_rgh (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/Allclean (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/Allrun (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/constant/g (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/constant/polyMesh/boundary (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/constant/polyMesh/cells.gz (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/constant/polyMesh/faces.gz (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/constant/polyMesh/neighbour.gz (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/constant/polyMesh/owner.gz (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/constant/polyMesh/points.gz (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/constant/transportProperties (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/constant/turbulenceProperties (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/system/controlDict (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/system/fvSchemes (100%)
rename tutorials/multiphase/driftFluxFoam/{ras => RAS}/tank3D/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/0.orig/U (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/0.orig/alpha.water (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/0.orig/k (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/0.orig/nut (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/0.orig/omega (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/0.orig/p_rgh (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/0.orig/pointDisplacement (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/Allclean (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/Allrun (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/README (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/constant/dynamicMeshDict.sixDoF (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/constant/g (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/constant/hRef (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/constant/transportProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/constant/triSurface/README (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/blockMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/controlDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/decomposeParDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/fvSchemes (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/meshQualityDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/refineMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/setFieldsDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/snappyHexMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/surfaceFeatureExtractDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/topoSetDict.1 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/topoSetDict.2 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/topoSetDict.3 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/topoSetDict.4 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/topoSetDict.5 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/DTCHull/system/topoSetDict.6 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/0.orig/U (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/0.orig/alpha.water (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/0.orig/alpha.water.orig (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/0.orig/k (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/0.orig/nut (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/0.orig/omega (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/0.orig/p_rgh (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/Allclean (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/Allrun (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/constant/g (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/constant/transportProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/createObstacle.setSet (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/system/blockMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/system/controlDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/system/decomposeParDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/system/fvSchemes (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/system/setFieldsDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/damBreakWithObstacle/system/topoSetDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/0.orig/U (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/0.orig/alpha.water (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/0.orig/epsilon (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/0.orig/k (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/0.orig/nut (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/0.orig/p_rgh (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/0.orig/pointDisplacement (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/Allclean (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/Allrun (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/constant/dynamicMeshDict.sixDoF (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/constant/g (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/constant/transportProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/system/blockMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/system/controlDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/system/decomposeParDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/system/fvSchemes (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/system/setFieldsDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/floatingObject/system/topoSetDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/0.orig/U (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/0.orig/alpha.water (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/0.orig/epsilon (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/0.orig/k (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/0.orig/nut (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/0.orig/p_rgh (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/Allclean (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/Allrun (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/Allrun.pre (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/g (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/transportProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/triSurface/baffles.stl (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/triSurface/gasInlet.stl (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/triSurface/outlet.stl (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/triSurface/problemFaces (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/triSurface/rotating.stl (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/triSurface/shaft.stl (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/triSurface/shaftRotating.stl (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/triSurface/sparger.stl (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/triSurface/stirrer.stl (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/triSurface/vessel.stl (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/system/blockMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/system/controlDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/system/createBafflesDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/system/decomposeParDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/system/fvSchemes (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/system/setFieldsDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/system/snappyHexMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/mixerVesselAMI/system/surfaceFeatureExtractDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/0/U (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/0/alpha.water.orig (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/0/p_rgh (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/Allclean (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/Allrun (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/constant/g (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/constant/transportProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/system/blockMeshDict.m4 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/system/controlDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/system/decomposeParDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/system/fvSchemes (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D/system/setFieldsDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/0/U (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/0/alpha.water.orig (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/0/p_rgh (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/Allclean (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/Allrun (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/constant/g (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/constant/transportProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/system/blockMeshDict.m4 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/system/controlDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/system/decomposeParDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/system/fvSchemes (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank2D3DoF/system/setFieldsDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/0/U (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/0/alpha.water.orig (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/0/p_rgh (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/Allclean (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/Allrun (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/constant/g (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/constant/transportProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/system/blockMeshDict.m4 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/system/controlDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/system/decomposeParDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/system/fvSchemes (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D/system/setFieldsDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/0/U (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/0/alpha.water.orig (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/0/p_rgh (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/Allclean (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/Allrun (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/constant/g (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/constant/transportProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/system/blockMeshDict.m4 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/system/controlDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/system/decomposeParDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/system/fvSchemes (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D3DoF/system/setFieldsDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/0/U (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/0/alpha.water.orig (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/0/p_rgh (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/Allclean (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/Allrun (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/constant/6DoF.dat (99%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/constant/g (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/constant/transportProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/gen6DoF/Make/files (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/gen6DoF/Make/options (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/gen6DoF/gen6DoF.C (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/system/blockMeshDict.m4 (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/system/controlDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/system/decomposeParDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/system/fvSchemes (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/sloshingTank3D6DoF/system/setFieldsDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/0/U (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/0/alpha.water.orig (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/0/p_rgh (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/Allclean (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/Allrun (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/constant/dynamicMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/constant/g (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/constant/transportProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/system/blockMeshDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/system/controlDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/system/decomposeParDict (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/system/fvSchemes (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/system/fvSolution (100%)
rename tutorials/multiphase/interDyMFoam/{ras => RAS}/testTubeMixer/system/setFieldsDict (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/0/U (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/0/alpha.fuel (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/0/data/Ubulk (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/0/data/ptrace (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/0/k (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/0/nuTilda (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/0/nut (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/0/p_rgh (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/Allclean (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/Allrun (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/constant/g (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/constant/transportProperties (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/system/blockMeshDict (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/system/controlDict (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/system/fvSchemes (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/system/fvSolution (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/system/refineMeshDict (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/system/topoSetDict.1 (100%)
rename tutorials/multiphase/interFoam/{les => LES}/nozzleFlow2D/system/topoSetDict.2 (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/0.orig/U (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/0.orig/alpha.water (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/0.orig/k (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/0.orig/nut (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/0.orig/omega (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/0.orig/p_rgh (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/0.orig/pointDisplacement (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/Allclean (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/Allrun (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/README (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/constant/g (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/constant/hRef (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/constant/transportProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/constant/triSurface/README (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/blockMeshDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/controlDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/decomposeParDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/fvSchemes (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/fvSolution (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/meshQualityDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/refineMeshDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/setFieldsDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/snappyHexMeshDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/surfaceFeatureExtractDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/topoSetDict.1 (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/topoSetDict.2 (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/topoSetDict.3 (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/topoSetDict.4 (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/topoSetDict.5 (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/DTCHull/system/topoSetDict.6 (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/0/U (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/0/alpha.water (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/0/epsilon (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/0/k (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/0/nut (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/0/p_rgh (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/Allrun (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/constant/fvOptions (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/constant/g (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/constant/transportProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/system/blockMeshDict.m4 (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/system/controlDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/system/fvSchemes (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/angledDuct/system/fvSolution (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/Allclean (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/Allrun (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/0/U (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/0/alpha.water (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/0/alpha.water.orig (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/0/epsilon (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/0/k (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/0/nuTilda (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/0/nut (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/0/p_rgh (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/Allclean (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/Allrun (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/constant/g (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/constant/transportProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/system/blockMeshDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/system/controlDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/system/decomposeParDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/system/fvSchemes (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/system/fvSolution (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreak/damBreak/system/setFieldsDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/0/U (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/0/alpha.water (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/0/alpha.water.orig (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/0/epsilon (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/0/k (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/0/nuTilda (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/0/nut (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/0/p_rgh (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/Allclean (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/Allrun (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/constant/g (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/constant/transportProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/system/blockMeshDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/system/changeDictionaryDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/system/controlDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/system/createBafflesDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/system/fvSchemes (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/system/fvSolution (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/system/setFieldsDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/damBreakPorousBaffle/system/topoSetDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/0/U (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/0/alpha.water.orig (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/0/k (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/0/nut (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/0/omega (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/0/p_rgh (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/Allclean (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/Allmesh (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/Allrun (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/constant/g (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/constant/transportProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/system/blockMeshDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/system/controlDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/system/extrudeMeshDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/system/extrudeMeshDict.1 (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/system/extrudeMeshDict.2 (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/system/fvSchemes (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/system/fvSolution (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/waterChannel/system/setFieldsDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/0.orig/U (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/0.orig/alpha.water.orig (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/0.orig/epsilon (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/0.orig/include/initialConditions (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/0.orig/k (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/0.orig/nut (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/0.orig/p_rgh (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/Allclean (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/Allrun (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/constant/g (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/constant/transportProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/constant/turbulenceProperties (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/system/blockMeshDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/system/controlDict (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/system/fvSchemes (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/system/fvSolution (100%)
rename tutorials/multiphase/interFoam/{ras => RAS}/weirOverflow/system/setFieldsDict (100%)
diff --git a/tutorials/combustion/XiFoam/ras/Allclean b/tutorials/combustion/XiFoam/RAS/Allclean
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/Allclean
rename to tutorials/combustion/XiFoam/RAS/Allclean
diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/RAS/Allrun
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/Allrun
rename to tutorials/combustion/XiFoam/RAS/Allrun
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Su
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Su
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/T
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/T
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Tu
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Tu
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/U
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/U
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Xi
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Xi
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/alphat b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/alphat
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/alphat
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/alphat
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/b
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/b
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/epsilon
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/epsilon
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/ft
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/ft
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/fu
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/fu
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/k
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/k
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/nut
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/nut
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/p
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/p
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/combustionProperties
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/combustionProperties
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/turbulenceProperties
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/turbulenceProperties
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/blockMeshDict b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/blockMeshDict
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/blockMeshDict
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/controlDict
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/controlDict
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSchemes
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSchemes
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSolution
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8 b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/C3H8
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/C3H8
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/IDefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/IDefault
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2 b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/N2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/N2
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2 b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/O2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/O2
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/T
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/T
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/U
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/U
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/Ydefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/Ydefault
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphat b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/alphat
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphat
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/alphat
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/k
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/k
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/nut b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/nut
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/nut
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/nut
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/p
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/p
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/p_rgh
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/p_rgh
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/ph_rgh.orig b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/ph_rgh.orig
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/ph_rgh.orig
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/ph_rgh.orig
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allclean b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allclean
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allclean
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allclean
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/additionalControls
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/additionalControls
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/combustionProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/combustionProperties
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/g
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/g
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pRef b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pRef
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pRef
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pRef
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/reactions b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/reactions
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/reactions
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/reactions
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactions b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactions
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactions
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactions
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/blockMeshDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/blockMeshDict
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/blockMeshDict
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/controlDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/controlDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/controlDict
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/controlDict
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/createPatchDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/createPatchDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/createPatchDict
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/createPatchDict
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/topoSetDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/topoSetDict
rename to tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8 b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/C3H8
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/C3H8
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/G
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/G
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/IDefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/IDefault
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2 b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/N2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/N2
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/O2 b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/O2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/O2
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/O2
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/T
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/T
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/U
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/U
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/Ydefault b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/Ydefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/Ydefault
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/Ydefault
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphat b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/alphat
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphat
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/alphat
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/k b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/k
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/k
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/k
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/nut b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/nut
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/nut
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/nut
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/p
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/p
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/p_rgh
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/p_rgh
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/Qr
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/Qr
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/T
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/T
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Y0Default b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/Y0Default
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Y0Default
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/Y0Default
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/char b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/char
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/char
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/char
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/p b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/p
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/p
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/p
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/wood b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/wood
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/wood
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/panelRegion/wood
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/ph_rgh.orig b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/ph_rgh.orig
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/ph_rgh.orig
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0/ph_rgh.orig
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/additionalControls b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/additionalControls
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/additionalControls
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/additionalControls
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/combustionProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/combustionProperties
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/combustionProperties
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/g b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/g
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/g
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/g
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/hRef b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/hRef
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/hRef
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/hRef
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pRef b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pRef
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pRef
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pRef
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/chemistryProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/chemistryProperties
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/radiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/radiationProperties
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/radiationProperties
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/reactions b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/reactions
similarity index 99%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/reactions
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/reactions
index ee8b4281db6..7fc5f0719be 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/reactions
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/reactions
@@ -20,4 +20,3 @@ reactions
Tcrit 400;
}
}
-
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermo.solid
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermo.solid
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pyrolysisZones
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/reactingCloud1Properties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/reactingCloud1Properties
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactions b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/reactions
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactions
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/reactions
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/surfaceFilmProperties
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermo.compressibleGas
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermo.compressibleGas
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermo.compressibleGas
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermophysicalProperties
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/turbulenceProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/turbulenceProperties
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/blockMeshDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/blockMeshDict
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/blockMeshDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/cRefine.topoSetDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/cRefine.topoSetDict
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/controlDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/controlDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/createPatchDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/createPatchDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/createPatchDict
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/createPatchDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/decomposeParDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/decomposeParDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/decomposeParDict
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/decomposeParDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/extrudeToRegionMeshDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/extrudeToRegionMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/extrudeToRegionMeshDict
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/extrudeToRegionMeshDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/f.topoSetDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/f.topoSetDict
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fBurner.topoSetDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fBurner.topoSetDict
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/decomposeParDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/decomposeParDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/decomposeParDict
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/decomposeParDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSchemes
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/refineMeshDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/refineMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/refineMeshDict
rename to tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/refineMeshDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4 b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/CH4
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/CH4
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/FSDomega b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/FSDomega
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/FSDomega
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/FSDomega
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/G
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/G
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/IDefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/IDefault
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2 b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/N2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/N2
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2 b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/O2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/O2
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/T
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/T
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/U
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/U
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/Ydefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/Ydefault
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/alphat
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/alphat
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/k
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/k
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/nut
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/nut
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/p
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/p
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/p_rgh
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/p_rgh
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ph_rgh.orig b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/ph_rgh.orig
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ph_rgh.orig
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/ph_rgh.orig
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/soot
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/0/soot
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allclean b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allclean
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/Allclean
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allclean
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/additionalControls b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/additionalControls
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/additionalControls
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/additionalControls
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/combustionProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/combustionProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/g b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/g
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/g
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/g
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/hRef b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/hRef
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/hRef
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/hRef
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pRef b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pRef
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pRef
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pRef
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisZones
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactingCloud1Properties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactingCloud1Properties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactions
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactions
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/surfaceFilmProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermo.compressibleGas
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermo.compressibleGas
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermo.compressibleGas
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/turbulenceProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/blockMeshDict b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/system/blockMeshDict
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/blockMeshDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/controlDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/controlDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/createPatchDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/createPatchDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4 b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/CH4
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/CH4
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/G
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/G
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/IDefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/IDefault
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2 b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/N2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/N2
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2 b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/O2
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/O2
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/T
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/T
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/U
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/U
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/Ydefault
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/Ydefault
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/alphat
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/alphat
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/k
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/k
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/nut
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/nut
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/p
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/p
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/p_rgh
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/p_rgh
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ph_rgh.orig b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/ph_rgh.orig
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ph_rgh.orig
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/0/ph_rgh.orig
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allclean b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allclean
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/Allclean
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allclean
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/additionalControls b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/additionalControls
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/additionalControls
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/additionalControls
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/chemistryProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/chemistryProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/combustionProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/combustionProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/g
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/g
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/hRef b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/hRef
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/hRef
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/hRef
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pRef b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pRef
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pRef
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pRef
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisZones
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reactingCloud1Properties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reactingCloud1Properties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactions b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reactions
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactions
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reactions
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/surfaceFilmProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermo.compressibleGas
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermo.compressibleGas
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermo.compressibleGas
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermophysicalProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/turbulenceProperties
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/blockMeshDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/system/blockMeshDict
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/blockMeshDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/controlDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/controlDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/createPatchDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/createPatchDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/decomposeParDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/decomposeParDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSchemes
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSchemes
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict
rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/T
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/T
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/U
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/U
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphat b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/alphat
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphat
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/alphat
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/k
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/k
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/muTilda
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/muTilda
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/nut b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/nut
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/nut
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/nut
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/p
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/p
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/thermophysicalProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/blockMeshDict
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSolution
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSolution
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/T
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/T
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/U
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/U
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/alphat
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/alphat
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/epsilon
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/epsilon
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/k
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/k
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/nut
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/nut
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/nut
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/p
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0/p
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/fvOptions
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/thermophysicalProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/turbulenceProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/blockMeshDict.m4
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict.m4
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/controlDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/controlDict
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/T
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/T
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/T
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/U
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/U
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/U
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/alphat
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/alphat
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/alphat
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/epsilon
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/epsilon
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/epsilon
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/k
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/k
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/k
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/nut
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/nut
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/nut
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/p
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/p
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0/p
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/Allrun
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/fvOptions
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/thermophysicalProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/turbulenceProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/blockMeshDict.m4
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict.m4
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/controlDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/controlDict
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSolution
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSolution
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/T
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/T
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/U
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/U
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/alphat
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/0/alphat
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/alphat
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/epsilon
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/epsilon
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/k
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/k
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/nut
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/0/nut
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/nut
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/omega
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/omega
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/p
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/p
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/system/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/blockMeshDict
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/controlDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/controlDict
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSolution
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSolution
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/T
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/T
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/T
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/U
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/U
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/U
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/alphat
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/alphat
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/alphat
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/epsilon
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/epsilon
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/k
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/k
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/nut
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/nut
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/nut
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/p
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/p
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0/p
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/Allrun
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/MRFProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/MRFProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/MRFProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/MRFProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/fvOptions
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/thermophysicalProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/transportProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/transportProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/transportProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/transportProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/turbulenceProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/makeMesh b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/makeMesh
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/blockMeshDict.m4
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/controlDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/controlDict
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/T
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/T
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/U
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/U
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/alphat
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/alphat
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/epsilon
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/epsilon
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/k
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/k
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/nut b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/nut
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/nut
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/nut
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/p
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/p
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allclean b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allclean
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allrun
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allrun
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Running_Notes
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Running_Notes
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/turbulenceProperties
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.bnd.gz b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.bnd.gz
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.bnd.gz
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.bnd.gz
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.cel.gz b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.cel.gz
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.cel.gz
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.cel.gz
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.vrt.gz b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.vrt.gz
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.vrt.gz
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.vrt.gz
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSolution
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
rename to tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSolution
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/T b/tutorials/compressible/sonicFoam/RAS/prism/0/T
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/0/T
rename to tutorials/compressible/sonicFoam/RAS/prism/0/T
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/U b/tutorials/compressible/sonicFoam/RAS/prism/0/U
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/0/U
rename to tutorials/compressible/sonicFoam/RAS/prism/0/U
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/alphat b/tutorials/compressible/sonicFoam/RAS/prism/0/alphat
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/0/alphat
rename to tutorials/compressible/sonicFoam/RAS/prism/0/alphat
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/epsilon b/tutorials/compressible/sonicFoam/RAS/prism/0/epsilon
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/0/epsilon
rename to tutorials/compressible/sonicFoam/RAS/prism/0/epsilon
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/k b/tutorials/compressible/sonicFoam/RAS/prism/0/k
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/0/k
rename to tutorials/compressible/sonicFoam/RAS/prism/0/k
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/nut b/tutorials/compressible/sonicFoam/RAS/prism/0/nut
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/0/nut
rename to tutorials/compressible/sonicFoam/RAS/prism/0/nut
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/p b/tutorials/compressible/sonicFoam/RAS/prism/0/p
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/0/p
rename to tutorials/compressible/sonicFoam/RAS/prism/0/p
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
rename to tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/RAS/prism/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties
rename to tutorials/compressible/sonicFoam/RAS/prism/constant/turbulenceProperties
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/blockMeshDict b/tutorials/compressible/sonicFoam/RAS/prism/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/system/blockMeshDict
rename to tutorials/compressible/sonicFoam/RAS/prism/system/blockMeshDict
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict b/tutorials/compressible/sonicFoam/RAS/prism/system/controlDict
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/system/controlDict
rename to tutorials/compressible/sonicFoam/RAS/prism/system/controlDict
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/RAS/prism/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
rename to tutorials/compressible/sonicFoam/RAS/prism/system/fvSchemes
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution b/tutorials/compressible/sonicFoam/RAS/prism/system/fvSolution
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
rename to tutorials/compressible/sonicFoam/RAS/prism/system/fvSolution
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/Allclean b/tutorials/incompressible/pisoFoam/LES/motorBike/Allclean
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/Allclean
rename to tutorials/incompressible/pisoFoam/LES/motorBike/Allclean
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/Allrun b/tutorials/incompressible/pisoFoam/LES/motorBike/Allrun
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/Allrun
rename to tutorials/incompressible/pisoFoam/LES/motorBike/Allrun
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun
rename to tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/controlDict b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/controlDict
rename to tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
rename to tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSchemes
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSolution
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
rename to tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSolution
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/turbulenceProperties
rename to tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/turbulenceProperties
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/U b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/U
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/U
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/U
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/include/fixedInlet b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/fixedInlet
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/include/fixedInlet
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/fixedInlet
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/include/frontBackUpperPatches b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/frontBackUpperPatches
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/include/frontBackUpperPatches
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/frontBackUpperPatches
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/include/initialConditions b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/initialConditions
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/include/initialConditions
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/initialConditions
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/k b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/k
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/k
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/k
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/nuTilda b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nuTilda
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/nuTilda
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nuTilda
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/nut b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nut
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/nut
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nut
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/p b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/p
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.orig/p
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/p
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allclean b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allclean
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/blockMeshDict.8pSmall b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/polyMesh/blockMeshDict.8pSmall
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/blockMeshDict.8pSmall
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/polyMesh/blockMeshDict.8pSmall
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/transportProperties b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/transportProperties
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/transportProperties
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/triSurface/README
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/triSurface/README
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/turbulenceProperties
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/blockMeshDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/blockMeshDict
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/blockMeshDict
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/cuttingPlane
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/cuttingPlane
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.hierarchical b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.hierarchical
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.hierarchical
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.hierarchical
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.ptscotch b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.ptscotch
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.ptscotch
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.ptscotch
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/forceCoeffs
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/forceCoeffs
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSchemes
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSolution
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/U
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/0/U
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/k b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/k
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/0/k
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/0/k
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nuTilda
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nuTilda
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nut b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nut
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/0/nut
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nut
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/p b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/p
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/0/p
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/0/p
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/s b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/s
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/0/s
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/0/s
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties b/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/transportProperties
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/blockMeshDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/system/blockMeshDict
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/system/blockMeshDict
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSchemes
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution
rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSolution
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/U b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/U
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/U
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/U
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/k b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/k
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/k
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/k
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nuTilda b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nuTilda
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nuTilda
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nuTilda
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nut b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nut
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nut
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nut
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/p b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/p
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/p
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/p
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/transportProperties b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/transportProperties
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/transportProperties
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/turbulenceProperties
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/blockMeshDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/blockMeshDict
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/blockMeshDict
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/decomposeParDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/decomposeParDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/decomposeParDict
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/decomposeParDict
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSchemes
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution
rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSolution
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/U b/tutorials/incompressible/pisoFoam/RAS/cavity/0/U
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/0/U
rename to tutorials/incompressible/pisoFoam/RAS/cavity/0/U
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/epsilon b/tutorials/incompressible/pisoFoam/RAS/cavity/0/epsilon
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/0/epsilon
rename to tutorials/incompressible/pisoFoam/RAS/cavity/0/epsilon
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/k b/tutorials/incompressible/pisoFoam/RAS/cavity/0/k
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/0/k
rename to tutorials/incompressible/pisoFoam/RAS/cavity/0/k
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda b/tutorials/incompressible/pisoFoam/RAS/cavity/0/nuTilda
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda
rename to tutorials/incompressible/pisoFoam/RAS/cavity/0/nuTilda
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/nut b/tutorials/incompressible/pisoFoam/RAS/cavity/0/nut
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/0/nut
rename to tutorials/incompressible/pisoFoam/RAS/cavity/0/nut
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/omega b/tutorials/incompressible/pisoFoam/RAS/cavity/0/omega
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/0/omega
rename to tutorials/incompressible/pisoFoam/RAS/cavity/0/omega
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/p b/tutorials/incompressible/pisoFoam/RAS/cavity/0/p
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/0/p
rename to tutorials/incompressible/pisoFoam/RAS/cavity/0/p
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties b/tutorials/incompressible/pisoFoam/RAS/cavity/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties
rename to tutorials/incompressible/pisoFoam/RAS/cavity/constant/transportProperties
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/RAS/cavity/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties
rename to tutorials/incompressible/pisoFoam/RAS/cavity/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/blockMeshDict b/tutorials/incompressible/pisoFoam/RAS/cavity/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/system/blockMeshDict
rename to tutorials/incompressible/pisoFoam/RAS/cavity/system/blockMeshDict
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict b/tutorials/incompressible/pisoFoam/RAS/cavity/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
rename to tutorials/incompressible/pisoFoam/RAS/cavity/system/controlDict
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes b/tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
rename to tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSchemes
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution b/tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
rename to tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSolution
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/U b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/U
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/U
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/U
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/epsilon b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/epsilon
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/epsilon
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/epsilon
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/k b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/k
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/k
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/k
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nuTilda b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nuTilda
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nuTilda
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nuTilda
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nut b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nut
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nut
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nut
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/p b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/p
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/p
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/p
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/transportProperties b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/transportProperties
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/transportProperties
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/turbulenceProperties
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/blockMeshDict b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/blockMeshDict
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/blockMeshDict
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/controlDict b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/controlDict
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/controlDict
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSchemes
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution
rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSolution
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/LES/Allrun
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/Allrun
rename to tutorials/multiphase/cavitatingFoam/LES/Allrun
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U b/tutorials/multiphase/cavitatingFoam/LES/throttle/0/U
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/0/U
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/0/U
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour b/tutorials/multiphase/cavitatingFoam/LES/throttle/0/alpha.vapour
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/0/alpha.vapour
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/k b/tutorials/multiphase/cavitatingFoam/LES/throttle/0/k
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/0/k
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/0/k
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/LES/throttle/0/nut
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/0/nut
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/0/nut
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p b/tutorials/multiphase/cavitatingFoam/LES/throttle/0/p
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/0/p
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/0/p
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/LES/throttle/0/rho
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/0/rho
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/Allclean
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/blockMeshDict
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
rename to tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/U b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/U
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/alpha.vapour
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/k b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/k
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/nut b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/nut
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/nut
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/nut
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/p b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/p
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/rho b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/rho
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/system/blockMeshDict
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/mapFieldsDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/mapFieldsDict
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0/U
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/0/U
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0/alpha.vapour
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/0/alpha.vapour
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0/k
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/0/k
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/0/k
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0/nut
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/0/nut
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0/omega
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/0/omega
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0/p
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/0/p
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0/rho
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/0/rho
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/system/blockMeshDict
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/T b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/T
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/T
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/T
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/U b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/U
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/U
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/U
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/alpha.water.orig b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/alpha.water.orig
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/alpha.water.orig
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/p
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/p
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p_rgh b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p_rgh
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/p_rgh
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allclean b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allclean
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allclean
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allclean
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allrun
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allrun
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/g b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/g
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/g
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/g
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.air
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.air
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.air
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.water
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/transportProperties
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/transportProperties
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/turbulenceProperties
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4 b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/controlDict
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/controlDict
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/decomposeParDict
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/decomposeParDict
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/fvSchemes
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSolution
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/fvSolution
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/setFieldsDict
rename to tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/setFieldsDict
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/0/U
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha.sludge
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/epsilon b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/0/epsilon
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/k b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/0/k
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/nut b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/nut
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/0/nut
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/0/nut
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/0/p_rgh
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/constant/g
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/constant/turbulenceProperties
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/blockMeshDict b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/system/blockMeshDict
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/U
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/U
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/alpha.sludge
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha.sludge
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/alpha.sludge
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/epsilon b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/epsilon
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/epsilon
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/epsilon
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/k b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/k
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/k
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/k
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/nut b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/nut
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/nut
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/nut
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/p_rgh
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0/p_rgh
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/Allrun
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/MRFProperties
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/g
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/turbulenceProperties
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/makeMesh b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/makeMesh
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/makeMesh
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/makeMesh
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/blockMeshDict.m4
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/setFieldsDict
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/topoSetDict
rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/U
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/U
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/alpha.sludge
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha.sludge
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/alpha.sludge
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/epsilon b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/epsilon
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/0/epsilon
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/epsilon
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/k b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/k
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/0/k
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/k
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/nut b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/nut
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/0/nut
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/nut
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/0/p_rgh
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/0/p_rgh
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allclean b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/Allclean
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/Allrun
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/g
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/boundary b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/boundary
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/boundary
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/cells.gz b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/cells.gz
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/cells.gz
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/cells.gz
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/faces.gz b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/faces.gz
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/faces.gz
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/faces.gz
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/neighbour.gz b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/neighbour.gz
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/neighbour.gz
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/neighbour.gz
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/owner.gz b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/owner.gz
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/owner.gz
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/owner.gz
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/points.gz b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/points.gz
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/points.gz
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/polyMesh/points.gz
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/turbulenceProperties
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/U b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/U
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/alpha.water b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/alpha.water
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/alpha.water
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/k b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/k
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/k
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/k
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/nut b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/nut
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/nut
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/nut
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/omega b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/omega
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/omega
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/omega
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/p_rgh
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/p_rgh
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/pointDisplacement b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/pointDisplacement
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/pointDisplacement
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/0.orig/pointDisplacement
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allclean b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/Allclean
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allrun
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/README b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/README
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/README
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/README
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict.sixDoF b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/dynamicMeshDict.sixDoF
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict.sixDoF
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/dynamicMeshDict.sixDoF
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/g b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/g
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/g
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/g
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/hRef b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/hRef
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/hRef
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/hRef
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/transportProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/triSurface/README b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/triSurface/README
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/triSurface/README
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/triSurface/README
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/blockMeshDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/blockMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/decomposeParDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/fvSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/meshQualityDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/meshQualityDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/meshQualityDict
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/meshQualityDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/refineMeshDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/refineMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/refineMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/refineMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/setFieldsDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/snappyHexMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/snappyHexMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/snappyHexMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/surfaceFeatureExtractDict
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.1
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.1
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.1
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.2
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.2
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.2
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.3
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.3
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.3
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.4
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.4
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.5
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.5
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.5
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.6
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.6
rename to tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/topoSetDict.6
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/U b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/U
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/alpha.water b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/alpha.water
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/alpha.water
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/alpha.water.orig b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/alpha.water.orig
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/alpha.water.orig
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/k b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/k
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/k
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/k
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/nut b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/nut
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/nut
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/nut
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/omega b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/omega
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/omega
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/omega
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/p_rgh
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/0.orig/p_rgh
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allrun
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/g
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/g
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/transportProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/createObstacle.setSet b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/createObstacle.setSet
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/createObstacle.setSet
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/createObstacle.setSet
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/blockMeshDict b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/blockMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/decomposeParDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/fvSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/setFieldsDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/topoSetDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/topoSetDict
rename to tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/system/topoSetDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/U b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/U
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/alpha.water b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/alpha.water
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/alpha.water
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/epsilon b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/epsilon
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/epsilon
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/epsilon
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/k b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/k
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/k
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/k
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/nut b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/nut
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/nut
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/nut
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/p_rgh
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/p_rgh
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/pointDisplacement b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/pointDisplacement
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/pointDisplacement
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/0.orig/pointDisplacement
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allrun
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict.sixDoF b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict.sixDoF
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/g b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/g
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/g
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/g
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/transportProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/blockMeshDict b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/system/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/blockMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/decomposeParDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/fvSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/setFieldsDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/topoSetDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
rename to tutorials/multiphase/interDyMFoam/RAS/floatingObject/system/topoSetDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/U b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/U
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/alpha.water b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/alpha.water
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/alpha.water
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/epsilon b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/epsilon
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/epsilon
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/epsilon
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/k b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/k
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/k
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/k
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/nut b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/nut
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/nut
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/nut
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/p_rgh
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/0.orig/p_rgh
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allclean b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allclean
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun.pre
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun.pre
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/g b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/g
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/g
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/g
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/transportProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/baffles.stl b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/baffles.stl
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/baffles.stl
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/baffles.stl
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/gasInlet.stl b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/gasInlet.stl
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/gasInlet.stl
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/gasInlet.stl
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/outlet.stl b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/outlet.stl
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/outlet.stl
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/outlet.stl
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/problemFaces b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/problemFaces
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/problemFaces
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/problemFaces
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/rotating.stl b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/rotating.stl
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/rotating.stl
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/rotating.stl
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/shaft.stl b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/shaft.stl
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/shaft.stl
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/shaft.stl
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/shaftRotating.stl b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/shaftRotating.stl
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/shaftRotating.stl
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/shaftRotating.stl
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/sparger.stl b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/sparger.stl
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/sparger.stl
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/sparger.stl
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/stirrer.stl b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/stirrer.stl
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/stirrer.stl
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/stirrer.stl
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/vessel.stl b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/vessel.stl
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/triSurface/vessel.stl
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/triSurface/vessel.stl
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/blockMeshDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/blockMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/controlDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/controlDict
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/createBafflesDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/createBafflesDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/createBafflesDict
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/createBafflesDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/decomposeParDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/fvSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/setFieldsDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/surfaceFeatureExtractDict
rename to tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/U b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/0/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/U
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/0/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.orig
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/0/alpha.water.orig
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/0/p_rgh
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/Allclean
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/Allclean
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/Allrun
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/constant/g
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/constant/g
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/constant/transportProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/decomposeParDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/fvSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D/system/setFieldsDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/U b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/0/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/U
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/0/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.orig
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/0/alpha.water.orig
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/0/p_rgh
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/Allclean
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/Allclean
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/Allrun
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/constant/g
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/constant/g
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/constant/transportProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/decomposeParDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/fvSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank2D3DoF/system/setFieldsDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/U b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/0/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/U
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/0/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.orig
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/0/alpha.water.orig
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/0/p_rgh
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/Allclean
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/Allclean
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/Allrun
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/constant/g
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/constant/g
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/constant/transportProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/decomposeParDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/fvSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D/system/setFieldsDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/U b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/0/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/U
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/0/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.orig
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/0/alpha.water.orig
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/0/p_rgh
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/Allclean
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/Allclean
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/Allrun
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/constant/g
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/constant/g
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/constant/transportProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/decomposeParDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/fvSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D3DoF/system/setFieldsDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/U b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/0/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/U
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/0/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.orig
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/0/alpha.water.orig
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/0/p_rgh
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/Allclean
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/Allclean
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/Allrun
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/6DoF.dat b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/6DoF.dat
similarity index 99%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/6DoF.dat
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/6DoF.dat
index 0cf1f34768e..0257203792c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/6DoF.dat
+++ b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/6DoF.dat
@@ -102,4 +102,3 @@
(39.596 ((1.625 0.77368 -0.260102) (-3.90153 5.2878 8.12498)))
(40 ((1.82589 1.65428 -0.575807) (-8.6371 2.70906 9.12945)))
)
-
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/g
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/g
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/transportProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/Make/files b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/gen6DoF/Make/files
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/Make/files
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/gen6DoF/Make/files
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/Make/options b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/gen6DoF/Make/options
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/Make/options
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/gen6DoF/Make/options
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/gen6DoF/gen6DoF.C
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/gen6DoF/gen6DoF.C
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/decomposeParDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/fvSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/RAS/sloshingTank3D6DoF/system/setFieldsDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/U b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/0/U
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/U
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/0/U
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.orig
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/0/alpha.water.orig
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/0/p_rgh
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/Allclean
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allclean
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/Allclean
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/Allrun
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/Allrun
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/g b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/constant/g
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/g
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/constant/g
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/constant/transportProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/blockMeshDict b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/blockMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/decomposeParDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSchemes b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/fvSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/fvSolution
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/RAS/testTubeMixer/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/U
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/U
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/alpha.fuel
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/alpha.fuel
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/data/Ubulk b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/data/Ubulk
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/data/Ubulk
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/data/Ubulk
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/data/ptrace b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/data/ptrace
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/data/ptrace
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/data/ptrace
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/k
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/k
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/nuTilda
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/nuTilda
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nut b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/nut
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nut
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/nut
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/0/p_rgh
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allclean
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/blockMeshDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/system/blockMeshDict
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/U b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/0.orig/U
rename to tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/0.orig/k
rename to tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/nut b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/0.orig/nut
rename to tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/0.orig/omega
rename to tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/0.orig/pointDisplacement
rename to tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/Allclean
rename to tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/Allrun
rename to tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/README b/tutorials/multiphase/interFoam/RAS/DTCHull/README
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/README
rename to tutorials/multiphase/interFoam/RAS/DTCHull/README
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/constant/g b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/constant/g
rename to tutorials/multiphase/interFoam/RAS/DTCHull/constant/g
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/constant/hRef b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/constant/hRef
rename to tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties
rename to tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/constant/triSurface/README b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/triSurface/README
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/constant/triSurface/README
rename to tutorials/multiphase/interFoam/RAS/DTCHull/constant/triSurface/README
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/blockMeshDict
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/decomposeParDict
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/fvSchemes
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/meshQualityDict
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/refineMeshDict
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/setFieldsDict
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/snappyHexMeshDict
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/surfaceFeatureExtractDict
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.1
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.2
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.3
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.4
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.5
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.6
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/U b/tutorials/multiphase/interFoam/RAS/angledDuct/0/U
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/0/U
rename to tutorials/multiphase/interFoam/RAS/angledDuct/0/U
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/alpha.water b/tutorials/multiphase/interFoam/RAS/angledDuct/0/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/0/alpha.water
rename to tutorials/multiphase/interFoam/RAS/angledDuct/0/alpha.water
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/epsilon b/tutorials/multiphase/interFoam/RAS/angledDuct/0/epsilon
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/0/epsilon
rename to tutorials/multiphase/interFoam/RAS/angledDuct/0/epsilon
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/k b/tutorials/multiphase/interFoam/RAS/angledDuct/0/k
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/0/k
rename to tutorials/multiphase/interFoam/RAS/angledDuct/0/k
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/nut b/tutorials/multiphase/interFoam/RAS/angledDuct/0/nut
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/0/nut
rename to tutorials/multiphase/interFoam/RAS/angledDuct/0/nut
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/p_rgh b/tutorials/multiphase/interFoam/RAS/angledDuct/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/0/p_rgh
rename to tutorials/multiphase/interFoam/RAS/angledDuct/0/p_rgh
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/Allrun b/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/Allrun
rename to tutorials/multiphase/interFoam/RAS/angledDuct/Allrun
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/fvOptions b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/constant/fvOptions
rename to tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/g b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/constant/g
rename to tutorials/multiphase/interFoam/RAS/angledDuct/constant/g
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/constant/transportProperties
rename to tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/RAS/angledDuct/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/system/blockMeshDict.m4
rename to tutorials/multiphase/interFoam/RAS/angledDuct/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/system/controlDict b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/system/controlDict
rename to tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/system/fvSchemes
rename to tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSolution b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/system/fvSolution
rename to tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allclean b/tutorials/multiphase/interFoam/RAS/damBreak/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/Allclean
rename to tutorials/multiphase/interFoam/RAS/damBreak/Allclean
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allrun b/tutorials/multiphase/interFoam/RAS/damBreak/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/Allrun
rename to tutorials/multiphase/interFoam/RAS/damBreak/Allrun
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/U b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/U
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/U
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/U
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/alpha.water b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/alpha.water
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/alpha.water
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/alpha.water.orig b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/alpha.water.orig
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/alpha.water.orig
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/epsilon b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/epsilon
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/epsilon
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/epsilon
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/k b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/k
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/k
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/k
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/nuTilda b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/nuTilda
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/nuTilda
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/nuTilda
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/nut b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/nut
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/nut
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/nut
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/p_rgh
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/p_rgh
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allclean
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allrun
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allrun
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/g b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/g
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/transportProperties
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/blockMeshDict
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/controlDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/controlDict
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/decomposeParDict
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/fvSchemes
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/fvSolution
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/damBreak/system/setFieldsDict
rename to tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/U
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/U
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/alpha.water
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.orig b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.orig
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/alpha.water.orig
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/epsilon
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/epsilon
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/k b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/k
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/k
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/k
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nuTilda b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/nuTilda
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nuTilda
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/nuTilda
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nut b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/nut
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nut
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/nut
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0/p_rgh
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allclean
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allrun
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/g b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/g
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/blockMeshDict
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/createBafflesDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/createBafflesDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict
rename to tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/U b/tutorials/multiphase/interFoam/RAS/waterChannel/0/U
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/0/U
rename to tutorials/multiphase/interFoam/RAS/waterChannel/0/U
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.orig b/tutorials/multiphase/interFoam/RAS/waterChannel/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.orig
rename to tutorials/multiphase/interFoam/RAS/waterChannel/0/alpha.water.orig
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/k b/tutorials/multiphase/interFoam/RAS/waterChannel/0/k
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/0/k
rename to tutorials/multiphase/interFoam/RAS/waterChannel/0/k
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/nut b/tutorials/multiphase/interFoam/RAS/waterChannel/0/nut
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/0/nut
rename to tutorials/multiphase/interFoam/RAS/waterChannel/0/nut
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/omega b/tutorials/multiphase/interFoam/RAS/waterChannel/0/omega
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/0/omega
rename to tutorials/multiphase/interFoam/RAS/waterChannel/0/omega
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh b/tutorials/multiphase/interFoam/RAS/waterChannel/0/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
rename to tutorials/multiphase/interFoam/RAS/waterChannel/0/p_rgh
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allclean b/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/Allclean
rename to tutorials/multiphase/interFoam/RAS/waterChannel/Allclean
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allmesh b/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/Allmesh
rename to tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun b/tutorials/multiphase/interFoam/RAS/waterChannel/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/Allrun
rename to tutorials/multiphase/interFoam/RAS/waterChannel/Allrun
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/g b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/constant/g
rename to tutorials/multiphase/interFoam/RAS/waterChannel/constant/g
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
rename to tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/system/blockMeshDict
rename to tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
rename to tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict
rename to tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1 b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1
rename to tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2 b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2
rename to tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
rename to tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
rename to tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
rename to tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/U b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/U
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/alpha.water.orig b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/alpha.water.orig
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water.orig
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/epsilon b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/epsilon
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/epsilon
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/epsilon
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/include/initialConditions b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/include/initialConditions
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/include/initialConditions
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/include/initialConditions
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/k b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/k
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/k
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/k
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/nut b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/nut
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/Allclean b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/Allclean
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/g b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/constant/g
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/system/blockMeshDict
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/controlDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/system/controlDict
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
rename to tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict
--
GitLab
From 9da9a78cee4b635970997e012c7483e90afabb9b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 20 Sep 2016 21:11:41 +0100
Subject: [PATCH 25/42] turbulentTransportModels: Add new Maxwell model
---
.../turbulentTransportModels/turbulentTransportModels.C | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
index 1679dbcb4a4..709747522ff 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
@@ -44,6 +44,9 @@ makeBaseTurbulenceModel
#include "Stokes.H"
makeLaminarModel(Stokes);
+#include "Maxwell.H"
+makeLaminarModel(Maxwell);
+
// -------------------------------------------------------------------------- //
// RAS models
--
GitLab
From 1d08519d6e3be553162decd9f77aa1753c98a4de Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 20 Sep 2016 21:34:47 +0100
Subject: [PATCH 26/42] linearUpwind: Evaluate the gradient of each component
of the field to provide support all field types
Also reduces peak-storage as it now generates a volVectorField for each component
rather than the gradient of the field type.
---
.../schemes/linearUpwind/linearUpwind.C | 97 +++++++++----------
.../schemes/linearUpwind/linearUpwind.H | 9 +-
2 files changed, 51 insertions(+), 55 deletions(-)
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
index 9cc8cf488c6..6fceae45036 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
@@ -65,66 +65,65 @@ Foam::linearUpwind<Type>::correction
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
- tmp
- <
- GeometricField
- <
- typename outerProduct<vector, Type>::type,
- fvPatchField,
- volMesh
- >
- > tgradVf = gradScheme_().grad(vf, gradSchemeName_);
-
- const GeometricField
- <
- typename outerProduct<vector, Type>::type,
- fvPatchField,
- volMesh
- >& gradVf = tgradVf();
-
- forAll(faceFlux, facei)
+ for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
{
- label celli = (faceFlux[facei] > 0) ? owner[facei] : neighbour[facei];
- sfCorr[facei] = (Cf[facei] - C[celli]) & gradVf[celli];
- }
+ tmp<volVectorField> tgradVf =
+ gradScheme_().grad(vf.component(cmpt), gradSchemeName_);
+ const volVectorField& gradVf = tgradVf();
- typename GeometricField<Type, fvsPatchField, surfaceMesh>::
- Boundary& bSfCorr = sfCorr.boundaryFieldRef();
+ forAll(faceFlux, facei)
+ {
+ const label celli =
+ (faceFlux[facei] > 0) ? owner[facei] : neighbour[facei];
- forAll(bSfCorr, patchi)
- {
- fvsPatchField<Type>& pSfCorr = bSfCorr[patchi];
+ setComponent(sfCorr[facei], cmpt) =
+ (Cf[facei] - C[celli]) & gradVf[celli];
+ }
+
+ typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+ Boundary& bSfCorr = sfCorr.boundaryFieldRef();
- if (pSfCorr.coupled())
+ forAll(bSfCorr, patchi)
{
- const labelUList& pOwner =
- mesh.boundary()[patchi].faceCells();
+ fvsPatchField<Type>& pSfCorr = bSfCorr[patchi];
- const vectorField& pCf = Cf.boundaryField()[patchi];
+ if (pSfCorr.coupled())
+ {
+ const labelUList& pOwner =
+ mesh.boundary()[patchi].faceCells();
- const scalarField& pFaceFlux = faceFlux.boundaryField()[patchi];
+ const vectorField& pCf = Cf.boundaryField()[patchi];
- const Field<typename outerProduct<vector, Type>::type> pGradVfNei
- (
- gradVf.boundaryField()[patchi].patchNeighbourField()
- );
+ const scalarField& pFaceFlux = faceFlux.boundaryField()[patchi];
- // Build the d-vectors
- vectorField pd(Cf.boundaryField()[patchi].patch().delta());
+ const vectorField pGradVfNei
+ (
+ gradVf.boundaryField()[patchi].patchNeighbourField()
+ );
- forAll(pOwner, facei)
- {
- label own = pOwner[facei];
+ // Build the d-vectors
+ const vectorField pd
+ (
+ Cf.boundaryField()[patchi].patch().delta()
+ );
- if (pFaceFlux[facei] > 0)
- {
- pSfCorr[facei] = (pCf[facei] - C[own]) & gradVf[own];
- }
- else
+ forAll(pOwner, facei)
{
- pSfCorr[facei] =
- (pCf[facei] - pd[facei] - C[own]) & pGradVfNei[facei];
+ label own = pOwner[facei];
+
+ if (pFaceFlux[facei] > 0)
+ {
+ setComponent(pSfCorr[facei], cmpt) =
+ (pCf[facei] - C[own])
+ & gradVf[own];
+ }
+ else
+ {
+ setComponent(pSfCorr[facei], cmpt) =
+ (pCf[facei] - pd[facei] - C[own])
+ & pGradVfNei[facei];
+ }
}
}
}
@@ -136,9 +135,7 @@ Foam::linearUpwind<Type>::correction
namespace Foam
{
- //makelimitedSurfaceInterpolationScheme(linearUpwind)
- makelimitedSurfaceInterpolationTypeScheme(linearUpwind, scalar)
- makelimitedSurfaceInterpolationTypeScheme(linearUpwind, vector)
+ makelimitedSurfaceInterpolationScheme(linearUpwind)
}
// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
index 6039f416a76..d7f0e4351d7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
@@ -57,7 +57,7 @@ class linearUpwind
// Private Data
word gradSchemeName_;
- tmp<fv::gradScheme<Type>> gradScheme_;
+ tmp<fv::gradScheme<scalar>> gradScheme_;
// Private Member Functions
@@ -88,7 +88,7 @@ public:
gradSchemeName_("grad"),
gradScheme_
(
- new fv::gaussGrad<Type>(mesh)
+ new fv::gaussGrad<scalar>(mesh)
)
{}
@@ -105,7 +105,7 @@ public:
gradSchemeName_(schemeData),
gradScheme_
(
- fv::gradScheme<Type>::New
+ fv::gradScheme<scalar>::New
(
mesh,
mesh.gradScheme(gradSchemeName_)
@@ -125,7 +125,7 @@ public:
gradSchemeName_(schemeData),
gradScheme_
(
- fv::gradScheme<Type>::New
+ fv::gradScheme<scalar>::New
(
mesh,
mesh.gradScheme(gradSchemeName_)
@@ -148,7 +148,6 @@ public:
(
const GeometricField<Type, fvPatchField, volMesh>&
) const;
-
};
--
GitLab
From bd0b363292b58951a878b7517d71ab59910f2255 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 21 Sep 2016 09:50:49 +0100
Subject: [PATCH 27/42] linearUpwind: Specialize for volVectorField to support
cached gradients
---
.../schemes/linearUpwind/linearUpwind.C | 124 ++++++++++++++++++
.../schemes/linearUpwind/linearUpwind.H | 35 ++---
2 files changed, 135 insertions(+), 24 deletions(-)
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
index 6fceae45036..69492761b8f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
@@ -65,6 +65,15 @@ Foam::linearUpwind<Type>::correction
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
+ tmp<fv::gradScheme<scalar>> gradScheme_
+ (
+ fv::gradScheme<scalar>::New
+ (
+ mesh,
+ mesh.gradScheme(gradSchemeName_)
+ )
+ );
+
for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
{
tmp<volVectorField> tgradVf =
@@ -133,6 +142,121 @@ Foam::linearUpwind<Type>::correction
}
+template<>
+Foam::tmp<Foam::surfaceVectorField>
+Foam::linearUpwind<Foam::vector>::correction
+(
+ const volVectorField& vf
+) const
+{
+ const fvMesh& mesh = this->mesh();
+
+ tmp<GeometricField<vector, fvsPatchField, surfaceMesh>> tsfCorr
+ (
+ new GeometricField<vector, fvsPatchField, surfaceMesh>
+ (
+ IOobject
+ (
+ "linearUpwind::correction(" + vf.name() + ')',
+ mesh.time().timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ mesh,
+ dimensioned<vector>(vf.name(), vf.dimensions(), Zero)
+ )
+ );
+
+ GeometricField<vector, fvsPatchField, surfaceMesh>& sfCorr = tsfCorr.ref();
+
+ const surfaceScalarField& faceFlux = this->faceFlux_;
+
+ const labelList& owner = mesh.owner();
+ const labelList& neighbour = mesh.neighbour();
+
+ const volVectorField& C = mesh.C();
+ const surfaceVectorField& Cf = mesh.Cf();
+
+ tmp<fv::gradScheme<vector>> gradScheme_
+ (
+ fv::gradScheme<vector>::New
+ (
+ mesh,
+ mesh.gradScheme(gradSchemeName_)
+ )
+ );
+
+ tmp
+ <
+ GeometricField
+ <
+ typename outerProduct<vector, vector>::type,
+ fvPatchField,
+ volMesh
+ >
+ > tgradVf = gradScheme_().grad(vf, gradSchemeName_);
+
+ const GeometricField
+ <
+ typename outerProduct<vector, vector>::type,
+ fvPatchField,
+ volMesh
+ >& gradVf = tgradVf();
+
+ forAll(faceFlux, facei)
+ {
+ label celli = (faceFlux[facei] > 0) ? owner[facei] : neighbour[facei];
+ sfCorr[facei] = (Cf[facei] - C[celli]) & gradVf[celli];
+ }
+
+
+ typename GeometricField<vector, fvsPatchField, surfaceMesh>::
+ Boundary& bSfCorr = sfCorr.boundaryFieldRef();
+
+ forAll(bSfCorr, patchi)
+ {
+ fvsPatchField<vector>& pSfCorr = bSfCorr[patchi];
+
+ if (pSfCorr.coupled())
+ {
+ const labelUList& pOwner =
+ mesh.boundary()[patchi].faceCells();
+
+ const vectorField& pCf = Cf.boundaryField()[patchi];
+
+ const scalarField& pFaceFlux = faceFlux.boundaryField()[patchi];
+
+ const Field<typename outerProduct<vector, vector>::type> pGradVfNei
+ (
+ gradVf.boundaryField()[patchi].patchNeighbourField()
+ );
+
+ // Build the d-vectors
+ vectorField pd(Cf.boundaryField()[patchi].patch().delta());
+
+ forAll(pOwner, facei)
+ {
+ label own = pOwner[facei];
+
+ if (pFaceFlux[facei] > 0)
+ {
+ pSfCorr[facei] = (pCf[facei] - C[own]) & gradVf[own];
+ }
+ else
+ {
+ pSfCorr[facei] =
+ (pCf[facei] - pd[facei] - C[own]) & pGradVfNei[facei];
+ }
+ }
+ }
+ }
+
+ return tsfCorr;
+}
+
+
namespace Foam
{
makelimitedSurfaceInterpolationScheme(linearUpwind)
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
index d7f0e4351d7..e9d16eaddef 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
@@ -57,7 +57,6 @@ class linearUpwind
// Private Data
word gradSchemeName_;
- tmp<fv::gradScheme<scalar>> gradScheme_;
// Private Member Functions
@@ -85,11 +84,7 @@ public:
)
:
upwind<Type>(mesh, faceFlux),
- gradSchemeName_("grad"),
- gradScheme_
- (
- new fv::gaussGrad<scalar>(mesh)
- )
+ gradSchemeName_("grad")
{}
//- Construct from Istream.
@@ -102,15 +97,7 @@ public:
)
:
upwind<Type>(mesh, schemeData),
- gradSchemeName_(schemeData),
- gradScheme_
- (
- fv::gradScheme<scalar>::New
- (
- mesh,
- mesh.gradScheme(gradSchemeName_)
- )
- )
+ gradSchemeName_(schemeData)
{}
//- Construct from faceFlux and Istream
@@ -122,15 +109,7 @@ public:
)
:
upwind<Type>(mesh, faceFlux, schemeData),
- gradSchemeName_(schemeData),
- gradScheme_
- (
- fv::gradScheme<scalar>::New
- (
- mesh,
- mesh.gradScheme(gradSchemeName_)
- )
- )
+ gradSchemeName_(schemeData)
{}
@@ -151,6 +130,14 @@ public:
};
+// Specialize for volVectorField to support cached gradients
+template<>
+tmp<surfaceVectorField> linearUpwind<vector>::correction
+(
+ const volVectorField& vf
+) const;
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
--
GitLab
From 481f8e5b97a06f99aa752f6c3c345898162bc29c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 21 Sep 2016 11:09:59 +0100
Subject: [PATCH 28/42] linearUpwind: Simplified the vector specialization
---
.../schemes/linearUpwind/linearUpwind.C | 44 +++++--------------
1 file changed, 12 insertions(+), 32 deletions(-)
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
index 69492761b8f..f6e89172c51 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
@@ -99,11 +99,8 @@ Foam::linearUpwind<Type>::correction
if (pSfCorr.coupled())
{
- const labelUList& pOwner =
- mesh.boundary()[patchi].faceCells();
-
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
-
const scalarField& pFaceFlux = faceFlux.boundaryField()[patchi];
const vectorField pGradVfNei
@@ -151,9 +148,9 @@ Foam::linearUpwind<Foam::vector>::correction
{
const fvMesh& mesh = this->mesh();
- tmp<GeometricField<vector, fvsPatchField, surfaceMesh>> tsfCorr
+ tmp<surfaceVectorField> tsfCorr
(
- new GeometricField<vector, fvsPatchField, surfaceMesh>
+ new surfaceVectorField
(
IOobject
(
@@ -169,7 +166,7 @@ Foam::linearUpwind<Foam::vector>::correction
)
);
- GeometricField<vector, fvsPatchField, surfaceMesh>& sfCorr = tsfCorr.ref();
+ surfaceVectorField& sfCorr = tsfCorr.ref();
const surfaceScalarField& faceFlux = this->faceFlux_;
@@ -188,47 +185,30 @@ Foam::linearUpwind<Foam::vector>::correction
)
);
- tmp
- <
- GeometricField
- <
- typename outerProduct<vector, vector>::type,
- fvPatchField,
- volMesh
- >
- > tgradVf = gradScheme_().grad(vf, gradSchemeName_);
-
- const GeometricField
- <
- typename outerProduct<vector, vector>::type,
- fvPatchField,
- volMesh
- >& gradVf = tgradVf();
+ tmp<volTensorField> tgradVf = gradScheme_().grad(vf, gradSchemeName_);
+ const volTensorField& gradVf = tgradVf();
forAll(faceFlux, facei)
{
- label celli = (faceFlux[facei] > 0) ? owner[facei] : neighbour[facei];
+ const label celli =
+ (faceFlux[facei] > 0) ? owner[facei] : neighbour[facei];
sfCorr[facei] = (Cf[facei] - C[celli]) & gradVf[celli];
}
- typename GeometricField<vector, fvsPatchField, surfaceMesh>::
- Boundary& bSfCorr = sfCorr.boundaryFieldRef();
+ typename surfaceVectorField::Boundary& bSfCorr = sfCorr.boundaryFieldRef();
forAll(bSfCorr, patchi)
{
- fvsPatchField<vector>& pSfCorr = bSfCorr[patchi];
+ fvsPatchVectorField& pSfCorr = bSfCorr[patchi];
if (pSfCorr.coupled())
{
- const labelUList& pOwner =
- mesh.boundary()[patchi].faceCells();
-
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
-
const scalarField& pFaceFlux = faceFlux.boundaryField()[patchi];
- const Field<typename outerProduct<vector, vector>::type> pGradVfNei
+ const tensorField pGradVfNei
(
gradVf.boundaryField()[patchi].patchNeighbourField()
);
--
GitLab
From 9e1e9011a518f4c8ce2de6e990996c7e9b318836 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 21 Sep 2016 17:19:58 +0100
Subject: [PATCH 29/42] decomposePar: Corrected construction of cloud for
processors Resolves bug-report http://bugs.openfoam.org/view.php?id=2239
---
.../decomposePar/lagrangianFieldDecomposer.C | 2 +-
.../decomposePar/lagrangianFieldDecomposer.H | 2 --
.../dataConversion/foamToGMV/gmvOutput.H | 2 +-
.../USERD_get_maxsize_info.H | 2 +-
.../ensightFoamReader/USERD_set_filenames.H | 4 +--
.../USERD_set_time_set_and_step.H | 4 +--
src/OpenFOAM/fields/cloud/cloud.C | 10 +++----
src/OpenFOAM/fields/cloud/cloud.H | 4 +--
.../field/nearWallFields/nearWallFields.C | 7 ++++-
src/lagrangian/basic/Cloud/Cloud.C | 30 +++----------------
src/lagrangian/basic/Cloud/Cloud.H | 16 ----------
src/lagrangian/basic/Cloud/CloudIO.C | 19 ------------
12 files changed, 23 insertions(+), 79 deletions(-)
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
index 274e3a51a33..efb7dd2a235 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
@@ -42,7 +42,7 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
)
:
procMesh_(procMesh),
- positions_(procMesh, cloudName, false),
+ positions_(procMesh, cloudName, IDLList<passiveParticle>()),
particleIndices_(lagrangianPositions.size())
{
label pi = 0;
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
index 6e0280398d6..aca0672296a 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
@@ -101,7 +101,6 @@ public:
const label cloudI,
const IOobjectList& lagrangianObjects,
PtrList<PtrList<IOField<Type>>>& lagrangianFields
-// PtrList<IOField<Type>>& lagrangianFields
);
template<class Type>
@@ -113,7 +112,6 @@ public:
<
PtrList<CompactIOField<Field<Type>, Type>>
>& lagrangianFields
-// PtrList<CompactIOField<Field<Type>, Type >>& lagrangianFields
);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
index a6c0c7dd367..4c65e583e3a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
@@ -73,7 +73,7 @@ for (label i=0; i < nTypes; i++)
if (lagrangianHeader.headerOk())
{
- Cloud<passiveParticle> particles(mesh);
+ Cloud<passiveParticle> particles(mesh, cloud::defaultName);
IOobjectList objects(mesh, runTime.timeName(), cloud::prefix);
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H
index ca2033453e7..aab4c0c9034 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H
@@ -73,7 +73,7 @@ int USERD_get_maxsize_info
{
// Get the maximum number of spray parcels
// and store it
- Cloud<passiveParticle> lagrangian(*meshPtr);
+ Cloud<passiveParticle> lagrangian(*meshPtr, cloud::defaultName);
if (lagrangian.size() > nMaxParcels)
{
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
index fdb7c38c9f7..6167798a3b7 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
@@ -151,7 +151,7 @@ int USERD_set_filenames
{
runTime.setTime(timeDirs[n+1], n+1);
- Cloud<passiveParticle> lagrangian(*meshPtr);
+ Cloud<passiveParticle> lagrangian(*meshPtr, cloud::defaultName);
n++;
if (lagrangian.size())
@@ -177,7 +177,7 @@ int USERD_set_filenames
delete sprayPtr;
- sprayPtr = new Cloud<passiveParticle>(*meshPtr);
+ sprayPtr = new Cloud<passiveParticle>(*meshPtr, cloud::defaultName);
IOobjectList objects(*meshPtr, runTime.timeName(), cloud::prefix);
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H
index 5459f67ba6b..7bc4ba1c5c4 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H
@@ -49,9 +49,7 @@ void USERD_set_time_set_and_step
if (Numparts_available > nPatches+1)
{
delete sprayPtr;
- sprayPtr = new Cloud<passiveParticle>(*meshPtr);
+ sprayPtr = new Cloud<passiveParticle>(*meshPtr, cloud::defaultName);
}
}
}
-
-
diff --git a/src/OpenFOAM/fields/cloud/cloud.C b/src/OpenFOAM/fields/cloud/cloud.C
index 3a7b98e9680..69cba912e0e 100644
--- a/src/OpenFOAM/fields/cloud/cloud.C
+++ b/src/OpenFOAM/fields/cloud/cloud.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,10 +30,10 @@ License
namespace Foam
{
-defineTypeNameAndDebug(cloud, 0);
+ defineTypeNameAndDebug(cloud, 0);
-const word cloud::prefix("lagrangian");
-word cloud::defaultName("defaultCloud");
+ const word cloud::prefix("lagrangian");
+ word cloud::defaultName("defaultCloud");
}
@@ -45,7 +45,7 @@ Foam::cloud::cloud(const objectRegistry& obr, const word& cloudName)
(
IOobject
(
- (cloudName.size() ? cloudName : defaultName),
+ cloudName,
obr.time().timeName(),
prefix,
obr,
diff --git a/src/OpenFOAM/fields/cloud/cloud.H b/src/OpenFOAM/fields/cloud/cloud.H
index 45785883802..9b7aa432917 100644
--- a/src/OpenFOAM/fields/cloud/cloud.H
+++ b/src/OpenFOAM/fields/cloud/cloud.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -78,7 +78,7 @@ public:
// Constructors
//- Construct for the given objectRegistry and named cloud instance
- cloud(const objectRegistry&, const word& cloudName = "");
+ cloud(const objectRegistry&, const word& cloudName = defaultName);
//- Destructor
diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.C b/src/functionObjects/field/nearWallFields/nearWallFields.C
index b63ee955835..063ff610f9f 100644
--- a/src/functionObjects/field/nearWallFields/nearWallFields.C
+++ b/src/functionObjects/field/nearWallFields/nearWallFields.C
@@ -60,7 +60,12 @@ void Foam::functionObjects::nearWallFields::calcAddressing()
DebugInFunction << "nPatchFaces: " << globalWalls.size() << endl;
// Construct cloud
- Cloud<findCellParticle> cloud(mesh_, IDLList<findCellParticle>());
+ Cloud<findCellParticle> cloud
+ (
+ mesh_,
+ cloud::defaultName,
+ IDLList<findCellParticle>()
+ );
// Add particles to track to sample locations
nPatchFaces = 0;
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 1e108771a96..710e36bfd28 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -92,31 +92,6 @@ void Foam::Cloud<ParticleType>::calcCellWallFaces() const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template<class ParticleType>
-Foam::Cloud<ParticleType>::Cloud
-(
- const polyMesh& pMesh,
- const IDLList<ParticleType>& particles
-)
-:
- cloud(pMesh),
- IDLList<ParticleType>(),
- polyMesh_(pMesh),
- labels_(),
- nTrackingRescues_(),
- cellWallFacesPtr_()
-{
- checkPatches();
-
- // Ask for the tetBasePtIs to trigger all processors to build
- // them, otherwise, if some processors have no particles then
- // there is a comms mismatch.
- polyMesh_.tetBasePtIs();
-
- IDLList<ParticleType>::operator=(particles);
-}
-
-
template<class ParticleType>
Foam::Cloud<ParticleType>::Cloud
(
@@ -139,7 +114,10 @@ Foam::Cloud<ParticleType>::Cloud
// there is a comms mismatch.
polyMesh_.tetBasePtIs();
- IDLList<ParticleType>::operator=(particles);
+ if (particles.size())
+ {
+ IDLList<ParticleType>::operator=(particles);
+ }
}
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index cb6b5eee817..2ad874691b7 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -131,28 +131,12 @@ public:
//- Construct from mesh and a list of particles
Cloud
- (
- const polyMesh& mesh,
- const IDLList<ParticleType>& particles
- );
-
- //- Construct from mesh, cloud name, and a list of particles
- Cloud
(
const polyMesh& mesh,
const word& cloudName,
const IDLList<ParticleType>& particles
);
- //- Construct from mesh by reading from file
- // Optionally disable checking of class name for post-processing
- Cloud
- (
- const polyMesh& mesh,
- const bool checkClass = true
- );
-
-
//- Construct from mesh by reading from file with given cloud instance
// Optionally disable checking of class name for post-processing
Cloud
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 5cdba6ba86b..0be85442e54 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -144,25 +144,6 @@ void Foam::Cloud<ParticleType>::initCloud(const bool checkClass)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template<class ParticleType>
-Foam::Cloud<ParticleType>::Cloud
-(
- const polyMesh& pMesh,
- const bool checkClass
-)
-:
- cloud(pMesh),
- polyMesh_(pMesh),
- labels_(),
- nTrackingRescues_(),
- cellWallFacesPtr_()
-{
- checkPatches();
-
- initCloud(checkClass);
-}
-
-
template<class ParticleType>
Foam::Cloud<ParticleType>::Cloud
(
--
GitLab
From 40f8709488f867aae69497d75dc3de1e0a23af53 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 22 Sep 2016 08:34:15 +0100
Subject: [PATCH 30/42] wmake: export WM_SCHEDULER from sub-shell for non-POSIX
bash compliance
---
wmake/wmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wmake/wmake b/wmake/wmake
index e7402a581b4..ebf50cd4ba4 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -337,7 +337,7 @@ then
(
export WM_COLLECT_DIR=$WM_PROJECT_DIR/platforms/${WM_OPTIONS}/${PWD////_}
- WM_SCHEDULER=wmakeCollect
+ export WM_SCHEDULER=wmakeCollect
trap '$WM_SCHEDULER -kill' TERM INT
$WM_SCHEDULER -clean \
&& wmake -all objects \
--
GitLab
From c0f841e4f7983e41a139dfad8fd19bf8e6313558 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 22 Sep 2016 14:10:45 +0100
Subject: [PATCH 31/42] globalIndexAndTransform: Support any number of
transforms but no more than 3 per point Patch contributed by Mattijs Janssens
Resolves bug-report http://bugs.openfoam.org/view.php?id=1815
---
.../polyMesh/globalMeshData/globalMeshData.C | 86 +++---
.../polyMesh/globalMeshData/globalMeshData.H | 1 -
.../polyMesh/globalMeshData/globalPoints.C | 66 ++---
.../mapPolyMesh/mapDistribute/mapDistribute.C | 24 +-
.../mapDistributeBaseTemplates.C | 8 +-
.../globalIndexAndTransform.C | 270 +++++++++++-------
.../globalIndexAndTransform.H | 157 +++++-----
.../globalIndexAndTransformI.H | 142 ++++-----
8 files changed, 384 insertions(+), 370 deletions(-)
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index ac9649ccda7..b03e5d4fb79 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -24,19 +24,14 @@ License
\*---------------------------------------------------------------------------*/
#include "globalMeshData.H"
-#include "Time.H"
#include "Pstream.H"
#include "PstreamCombineReduceOps.H"
#include "processorPolyPatch.H"
-#include "demandDrivenData.H"
#include "globalPoints.H"
#include "polyMesh.H"
#include "mapDistribute.H"
#include "labelIOList.H"
-#include "PackedList.H"
#include "mergePoints.H"
-#include "matchPoints.H"
-#include "OFstream.H"
#include "globalIndexAndTransform.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -577,7 +572,7 @@ void Foam::globalMeshData::calcPointConnectivity
labelPairList myData(globalPointSlavesMap().constructSize());
forAll(slaves, pointi)
{
- myData[pointi] = globalIndexAndTransform::encode
+ myData[pointi] = transforms.encode
(
Pstream::myProcNo(),
pointi,
@@ -624,9 +619,9 @@ void Foam::globalMeshData::calcPointConnectivity
);
// Add transform to connectivity
const labelPair& n = myData[pTransformSlaves[i]];
- label proci = globalIndexAndTransform::processor(n);
- label index = globalIndexAndTransform::index(n);
- pConnectivity[connI++] = globalIndexAndTransform::encode
+ label proci = transforms.processor(n);
+ label index = transforms.index(n);
+ pConnectivity[connI++] = transforms.encode
(
proci,
index,
@@ -678,6 +673,8 @@ void Foam::globalMeshData::calcGlobalPointEdges
const globalIndex& globalEdgeNumbers = globalEdgeNumbering();
const labelListList& slaves = globalPointSlaves();
const labelListList& transformedSlaves = globalPointTransformedSlaves();
+ const globalIndexAndTransform& transforms = globalTransforms();
+
// Create local version
globalPointEdges.setSize(globalPointSlavesMap().constructSize());
@@ -697,11 +694,11 @@ void Foam::globalMeshData::calcGlobalPointEdges
forAll(pEdges, i)
{
label otherPointi = edges[pEdges[i]].otherVertex(pointi);
- globalPPoints[i] = globalIndexAndTransform::encode
+ globalPPoints[i] = transforms.encode
(
Pstream::myProcNo(),
otherPointi,
- globalTransforms().nullTransformIndex()
+ transforms.nullTransformIndex()
);
}
}
@@ -790,9 +787,9 @@ void Foam::globalMeshData::calcGlobalPointEdges
{
// Add transform to connectivity
const labelPair& n = otherData[j];
- label proci = globalIndexAndTransform::processor(n);
- label index = globalIndexAndTransform::index(n);
- globalPPoints[sz++] = globalIndexAndTransform::encode
+ label proci = transforms.processor(n);
+ label index = transforms.index(n);
+ globalPPoints[sz++] = transforms.encode
(
proci,
index,
@@ -834,16 +831,18 @@ Foam::label Foam::globalMeshData::findTransform
const label localPoint
) const
{
- const label remoteProci = globalIndexAndTransform::processor(remotePoint);
- const label remoteIndex = globalIndexAndTransform::index(remotePoint);
+ const globalIndexAndTransform& transforms = globalTransforms();
+
+ const label remoteProci = transforms.processor(remotePoint);
+ const label remoteIndex = transforms.index(remotePoint);
label remoteTransformI = -1;
label localTransformI = -1;
forAll(info, i)
{
- label proci = globalIndexAndTransform::processor(info[i]);
- label pointi = globalIndexAndTransform::index(info[i]);
- label transformI = globalIndexAndTransform::transformIndex(info[i]);
+ label proci = transforms.processor(info[i]);
+ label pointi = transforms.index(info[i]);
+ label transformI = transforms.transformIndex(info[i]);
if (proci == Pstream::myProcNo() && pointi == localPoint)
{
@@ -875,7 +874,7 @@ Foam::label Foam::globalMeshData::findTransform
<< abort(FatalError);
}
- return globalTransforms().subtractTransformIndex
+ return transforms.subtractTransformIndex
(
remoteTransformI,
localTransformI
@@ -893,6 +892,7 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
const edgeList& edges = coupledPatch().edges();
const globalIndex& globalEdgeNumbers = globalEdgeNumbering();
+ const globalIndexAndTransform& transforms = globalTransforms();
// The whole problem with deducting edge-connectivity from
@@ -941,11 +941,11 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
// Append myself.
eEdges.append
(
- globalIndexAndTransform::encode
+ transforms.encode
(
Pstream::myProcNo(),
edgeI,
- globalTransforms().nullTransformIndex()
+ transforms.nullTransformIndex()
)
);
@@ -986,7 +986,7 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
label proci = globalEdgeNumbers.whichProcID(pEdges0[i]);
eEdges.append
(
- globalIndexAndTransform::encode
+ transforms.encode
(
proci,
globalEdgeNumbers.toLocal(proci, pEdges0[i]),
@@ -999,7 +999,11 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
}
allEdgeConnectivity[edgeI].transfer(eEdges);
- sort(allEdgeConnectivity[edgeI], globalIndexAndTransform::less());
+ sort
+ (
+ allEdgeConnectivity[edgeI],
+ globalIndexAndTransform::less(transforms)
+ );
}
// We now have - in allEdgeConnectivity - a list of edges which are shared
@@ -1020,10 +1024,10 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
if
(
(
- globalIndexAndTransform::processor(masterInfo)
+ transforms.processor(masterInfo)
== Pstream::myProcNo()
)
- && (globalIndexAndTransform::index(masterInfo) == edgeI)
+ && (transforms.index(masterInfo) == edgeI)
)
{
// Sort into transformed and untransformed
@@ -1039,14 +1043,14 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
for (label i = 1; i < edgeInfo.size(); i++)
{
const labelPair& info = edgeInfo[i];
- label proci = globalIndexAndTransform::processor(info);
- label index = globalIndexAndTransform::index(info);
- label transform = globalIndexAndTransform::transformIndex
+ label proci = transforms.processor(info);
+ label index = transforms.index(info);
+ label transform = transforms.transformIndex
(
info
);
- if (transform == globalTransforms().nullTransformIndex())
+ if (transform == transforms.nullTransformIndex())
{
eEdges[nonTransformI++] = globalEdgeNumbers.toGlobal
(
@@ -1078,7 +1082,7 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
globalEdgeNumbers,
globalEdgeSlaves,
- globalTransforms(),
+ transforms,
transformedEdges,
globalEdgeTransformedSlavesPtr_(),
@@ -1351,6 +1355,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
const labelListList& pointSlaves = globalPointSlaves();
const labelListList& pointTransformSlaves =
globalPointTransformedSlaves();
+ const globalIndexAndTransform& transforms = globalTransforms();
// Any faces coming in through transformation
@@ -1432,7 +1437,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
label proci = globalIndices.whichProcID(slave);
label facei = globalIndices.toLocal(proci, slave);
- myBFaces[n++] = globalIndexAndTransform::encode
+ myBFaces[n++] = transforms.encode
(
proci,
facei,
@@ -1466,7 +1471,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
globalIndices,
globalPointBoundaryFaces,
- globalTransforms(),
+ transforms,
transformedFaces,
globalPointTransformedBoundaryFacesPtr_(),
@@ -1581,6 +1586,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
const labelListList& pointSlaves = globalPointSlaves();
const labelListList& pointTransformSlaves =
globalPointTransformedSlaves();
+ const globalIndexAndTransform& transforms = globalTransforms();
List<labelPairList> transformedCells(pointSlaves.size());
@@ -1660,7 +1666,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
{
label proci = globalIndices.whichProcID(slave);
label celli = globalIndices.toLocal(proci, slave);
- myBCells[n++] = globalIndexAndTransform::encode
+ myBCells[n++] = transforms.encode
(
proci,
celli,
@@ -1693,7 +1699,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
globalIndices,
globalPointBoundaryCells,
- globalTransforms(),
+ transforms,
transformedCells,
globalPointTransformedBoundaryCellsPtr_(),
@@ -1765,12 +1771,12 @@ Foam::globalMeshData::globalMeshData(const polyMesh& mesh)
processorPatchIndices_(0),
processorPatchNeighbours_(0),
nGlobalPoints_(-1),
- sharedPointLabelsPtr_(nullptr),
- sharedPointAddrPtr_(nullptr),
- sharedPointGlobalLabelsPtr_(nullptr),
+ sharedPointLabelsPtr_(NULL),
+ sharedPointAddrPtr_(NULL),
+ sharedPointGlobalLabelsPtr_(NULL),
nGlobalEdges_(-1),
- sharedEdgeLabelsPtr_(nullptr),
- sharedEdgeAddrPtr_(nullptr)
+ sharedEdgeLabelsPtr_(NULL),
+ sharedEdgeAddrPtr_(NULL)
{
updateMesh();
}
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index 8e94ec82fb9..29ca8855a6b 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -72,7 +72,6 @@ See also
mapDistribute
globalIndexAndTransform
-
SourceFiles
globalMeshData.C
globalMeshDataTemplates.C
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 524eb52abef..88b3113a58b 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -64,15 +64,15 @@ Foam::label Foam::globalPoints::findSamePoint
const labelPair& info
) const
{
- const label proci = globalIndexAndTransform::processor(info);
- const label index = globalIndexAndTransform::index(info);
+ const label proci = globalTransforms_.processor(info);
+ const label index = globalTransforms_.index(info);
forAll(allInfo, i)
{
if
(
- globalIndexAndTransform::processor(allInfo[i]) == proci
- && globalIndexAndTransform::index(allInfo[i]) == index
+ globalTransforms_.processor(allInfo[i]) == proci
+ && globalTransforms_.index(allInfo[i]) == index
)
{
return i;
@@ -98,21 +98,21 @@ Foam::labelPairList Foam::globalPoints::addSendTransform
forAll(info, i)
{
//Pout<< " adding send transform to" << nl
- // << " proc:" << globalIndexAndTransform::processor(info[i])
+ // << " proc:" << globalTransforms_.processor(info[i])
// << nl
- // << " index:" << globalIndexAndTransform::index(info[i]) << nl
+ // << " index:" << globalTransforms_.index(info[i]) << nl
// << " trafo:"
// << globalTransforms_.decodeTransformIndex
- // (globalIndexAndTransform::transformIndex(info[i]))
+ // (globalTransforms_.transformIndex(info[i]))
// << endl;
- sendInfo[i] = globalIndexAndTransform::encode
+ sendInfo[i] = globalTransforms_.encode
(
- globalIndexAndTransform::processor(info[i]),
- globalIndexAndTransform::index(info[i]),
+ globalTransforms_.processor(info[i]),
+ globalTransforms_.index(info[i]),
globalTransforms_.addToTransformIndex
(
- globalIndexAndTransform::transformIndex(info[i]),
+ globalTransforms_.transformIndex(info[i]),
patchi,
true, // patchi is sending side
tol // tolerance for comparison
@@ -204,11 +204,11 @@ bool Foam::globalPoints::mergeInfo
}
else
{
- label myTransform = globalIndexAndTransform::transformIndex
+ label myTransform = globalTransforms_.transformIndex
(
myInfo[index]
);
- label nbrTransform = globalIndexAndTransform::transformIndex
+ label nbrTransform = globalTransforms_.transformIndex
(
nbrInfo[i]
);
@@ -294,7 +294,7 @@ bool Foam::globalPoints::mergeInfo
labelPairList knownInfo
(
1,
- globalIndexAndTransform::encode
+ globalTransforms_.encode
(
Pstream::myProcNo(),
localPointi,
@@ -356,9 +356,9 @@ void Foam::globalPoints::printProcPoint
const labelPair& pointInfo
) const
{
- label proci = globalIndexAndTransform::processor(pointInfo);
- label index = globalIndexAndTransform::index(pointInfo);
- label trafoI = globalIndexAndTransform::transformIndex(pointInfo);
+ label proci = globalTransforms_.processor(pointInfo);
+ label index = globalTransforms_.index(pointInfo);
+ label trafoI = globalTransforms_.transformIndex(pointInfo);
Pout<< " proc:" << proci;
Pout<< " localpoint:";
@@ -421,7 +421,7 @@ void Foam::globalPoints::initOwnPoints
labelPairList knownInfo
(
1,
- globalIndexAndTransform::encode
+ globalTransforms_.encode
(
Pstream::myProcNo(),
localPointi,
@@ -457,7 +457,7 @@ void Foam::globalPoints::initOwnPoints
labelPairList knownInfo
(
1,
- globalIndexAndTransform::encode
+ globalTransforms_.encode
(
Pstream::myProcNo(),
localPointi,
@@ -750,8 +750,8 @@ void Foam::globalPoints::remove
// is in it. This would be an ordinary connection and can be
// handled by normal face-face connectivity.
- label proc0 = globalIndexAndTransform::processor(pointInfo[0]);
- label proc1 = globalIndexAndTransform::processor(pointInfo[1]);
+ label proc0 = globalTransforms_.processor(pointInfo[0]);
+ label proc1 = globalTransforms_.processor(pointInfo[1]);
if
(
@@ -759,14 +759,14 @@ void Foam::globalPoints::remove
proc0 == Pstream::myProcNo()
&& directNeighbours.found
(
- globalIndexAndTransform::index(pointInfo[0])
+ globalTransforms_.index(pointInfo[0])
)
)
|| (
proc1 == Pstream::myProcNo()
&& directNeighbours.found
(
- globalIndexAndTransform::index(pointInfo[1])
+ globalTransforms_.index(pointInfo[1])
)
)
)
@@ -776,14 +776,14 @@ void Foam::globalPoints::remove
{
//Pout<< "Removing direct neighbour:"
// << mesh_.points()
- // [globalIndexAndTransform::index(pointInfo[0])]
+ // [globalTransforms_.index(pointInfo[0])]
// << endl;
}
else if (proc1 == Pstream::myProcNo())
{
//Pout<< "Removing direct neighbour:"
// << mesh_.points()
- // [globalIndexAndTransform::index(pointInfo[1])]
+ // [globalTransforms_.index(pointInfo[1])]
// << endl;
}
}
@@ -812,11 +812,11 @@ void Foam::globalPoints::remove
// So this meshPoint will have info of size one only.
if
(
- globalIndexAndTransform::processor(pointInfo[0])
+ globalTransforms_.processor(pointInfo[0])
!= Pstream::myProcNo()
|| !directNeighbours.found
(
- globalIndexAndTransform::index(pointInfo[0])
+ globalTransforms_.index(pointInfo[0])
)
)
{
@@ -995,7 +995,7 @@ void Foam::globalPoints::calculateSharedPoints
forAllConstIter(Map<label>, meshToProcPoint_, iter)
{
labelPairList& pointInfo = procPoints_[iter()];
- sort(pointInfo, globalIndexAndTransform::less());
+ sort(pointInfo, globalIndexAndTransform::less(globalTransforms_));
}
@@ -1017,10 +1017,10 @@ void Foam::globalPoints::calculateSharedPoints
if
(
(
- globalIndexAndTransform::processor(masterInfo)
+ globalTransforms_.processor(masterInfo)
== Pstream::myProcNo()
)
- && (globalIndexAndTransform::index(masterInfo) == iter.key())
+ && (globalTransforms_.index(masterInfo) == iter.key())
)
{
labelList& pPoints = pointPoints_[iter.key()];
@@ -1035,9 +1035,9 @@ void Foam::globalPoints::calculateSharedPoints
for (label i = 1; i < pointInfo.size(); i++)
{
const labelPair& info = pointInfo[i];
- label proci = globalIndexAndTransform::processor(info);
- label index = globalIndexAndTransform::index(info);
- label transform = globalIndexAndTransform::transformIndex
+ label proci = globalTransforms_.processor(info);
+ label index = globalTransforms_.index(info);
+ label transform = globalTransforms_.transformIndex
(
info
);
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 05323ace546..65f5158ca50 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -270,10 +270,10 @@ Foam::mapDistribute::mapDistribute
forAll(transformedElements, i)
{
labelPair elem = transformedElements[i];
- label proci = globalIndexAndTransform::processor(elem);
+ label proci = globalTransforms.processor(elem);
if (proci != Pstream::myProcNo())
{
- label index = globalIndexAndTransform::index(elem);
+ label index = globalTransforms.index(elem);
label nCompact = compactMap[proci].size();
compactMap[proci].insert(index, nCompact);
}
@@ -301,7 +301,7 @@ Foam::mapDistribute::mapDistribute
forAll(transformedElements, i)
{
labelPair elem = transformedElements[i];
- label trafoI = globalIndexAndTransform::transformIndex(elem);
+ label trafoI = globalTransforms.transformIndex(elem);
nPerTransform[trafoI]++;
}
// Offset per transformIndex
@@ -321,9 +321,9 @@ Foam::mapDistribute::mapDistribute
forAll(transformedElements, i)
{
labelPair elem = transformedElements[i];
- label proci = globalIndexAndTransform::processor(elem);
- label index = globalIndexAndTransform::index(elem);
- label trafoI = globalIndexAndTransform::transformIndex(elem);
+ label proci = globalTransforms.processor(elem);
+ label index = globalTransforms.index(elem);
+ label trafoI = globalTransforms.transformIndex(elem);
// Get compact index for untransformed element
label rawElemI =
@@ -378,10 +378,10 @@ Foam::mapDistribute::mapDistribute
forAll(elems, i)
{
- label proci = globalIndexAndTransform::processor(elems[i]);
+ label proci = globalTransforms.processor(elems[i]);
if (proci != Pstream::myProcNo())
{
- label index = globalIndexAndTransform::index(elems[i]);
+ label index = globalTransforms.index(elems[i]);
label nCompact = compactMap[proci].size();
compactMap[proci].insert(index, nCompact);
}
@@ -413,7 +413,7 @@ Foam::mapDistribute::mapDistribute
forAll(elems, i)
{
- label trafoI = globalIndexAndTransform::transformIndex(elems[i]);
+ label trafoI = globalTransforms.transformIndex(elems[i]);
nPerTransform[trafoI]++;
}
}
@@ -438,9 +438,9 @@ Foam::mapDistribute::mapDistribute
forAll(elems, i)
{
- label proci = globalIndexAndTransform::processor(elems[i]);
- label index = globalIndexAndTransform::index(elems[i]);
- label trafoI = globalIndexAndTransform::transformIndex(elems[i]);
+ label proci = globalTransforms.processor(elems[i]);
+ label index = globalTransforms.index(elems[i]);
+ label trafoI = globalTransforms.transformIndex(elems[i]);
// Get compact index for untransformed element
label rawElemI =
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
index 0380f5d8adf..a445d79f2a6 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
@@ -461,7 +461,7 @@ void Foam::mapDistributeBase::distribute
{
// Set up sends to neighbours
- List<List<T>> sendFields(Pstream::nProcs());
+ List<List<T > > sendFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
@@ -495,7 +495,7 @@ void Foam::mapDistributeBase::distribute
// Set up receives from neighbours
- List<List<T>> recvFields(Pstream::nProcs());
+ List<List<T > > recvFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
@@ -938,7 +938,7 @@ void Foam::mapDistributeBase::distribute
{
// Set up sends to neighbours
- List<List<T>> sendFields(Pstream::nProcs());
+ List<List<T > > sendFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
@@ -972,7 +972,7 @@ void Foam::mapDistributeBase::distribute
// Set up receives from neighbours
- List<List<T>> recvFields(Pstream::nProcs());
+ List<List<T > > recvFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
index d97ea2b84c8..b6ca5a26efe 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
@@ -25,13 +25,14 @@ License
#include "globalIndexAndTransform.H"
#include "cyclicPolyPatch.H"
+#include "DynamicField.H"
+#include "globalMeshData.H"
// * * * * * * * * * * * * Private Static Data Members * * * * * * * * * * * //
namespace Foam
{
-defineTypeNameAndDebug(globalIndexAndTransform, 0);
-const label globalIndexAndTransform::base_ = 32;
+ defineTypeNameAndDebug(globalIndexAndTransform, 0);
}
@@ -127,10 +128,8 @@ void Foam::globalIndexAndTransform::determineTransforms()
{
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
- transforms_ = List<vectorTensorTransform>(6);
- scalarField maxTol(6);
-
- label nextTrans = 0;
+ DynamicList<vectorTensorTransform> localTransforms;
+ DynamicField<scalar> localTols;
label dummyMatch = -1;
@@ -170,7 +169,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
(
matchTransform
(
- transforms_,
+ localTransforms,
dummyMatch,
transform,
cpp.matchTolerance(),
@@ -178,15 +177,8 @@ void Foam::globalIndexAndTransform::determineTransforms()
) == 0
)
{
- if (nextTrans == 6)
- {
- FatalErrorInFunction
- << "More than six unsigned transforms"
- << " detected:" << nl << transforms_
- << exit(FatalError);
- }
- transforms_[nextTrans] = transform;
- maxTol[nextTrans++] = cpp.matchTolerance();
+ localTransforms.append(transform);
+ localTols.append(cpp.matchTolerance());
}
}
}
@@ -207,7 +199,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
(
matchTransform
(
- transforms_,
+ localTransforms,
dummyMatch,
transform,
cpp.matchTolerance(),
@@ -215,15 +207,8 @@ void Foam::globalIndexAndTransform::determineTransforms()
) == 0
)
{
- if (nextTrans == 6)
- {
- FatalErrorInFunction
- << "More than six unsigned transforms"
- << " detected:" << nl << transforms_
- << exit(FatalError);
- }
- transforms_[nextTrans] = transform;
- maxTol[nextTrans++] = cpp.matchTolerance();
+ localTransforms.append(transform);
+ localTols.append(cpp.matchTolerance());
}
}
}
@@ -233,21 +218,18 @@ void Foam::globalIndexAndTransform::determineTransforms()
// Collect transforms on master
-
List<List<vectorTensorTransform>> allTransforms(Pstream::nProcs());
- allTransforms[Pstream::myProcNo()] = transforms_;
+ allTransforms[Pstream::myProcNo()] = localTransforms;
Pstream::gatherList(allTransforms);
// Collect matching tolerance on master
List<scalarField> allTols(Pstream::nProcs());
- allTols[Pstream::myProcNo()] = maxTol;
+ allTols[Pstream::myProcNo()] = localTols;
Pstream::gatherList(allTols);
if (Pstream::master())
{
- transforms_ = List<vectorTensorTransform>(3);
-
- label nextTrans = 0;
+ localTransforms.clear();
forAll(allTransforms, proci)
{
@@ -264,45 +246,23 @@ void Foam::globalIndexAndTransform::determineTransforms()
(
matchTransform
(
- transforms_,
+ localTransforms,
dummyMatch,
transform,
allTols[proci][pSVI],
true
- ) == 0
+ ) == 0
)
{
- transforms_[nextTrans++] = transform;
- }
-
- if (nextTrans > 3)
- {
- FatalErrorInFunction
- << "More than three independent basic "
- << "transforms detected:" << nl
- << allTransforms
- << transforms_
- << exit(FatalError);
+ localTransforms.append(transform);
}
}
}
}
-
- transforms_.setSize(nextTrans);
}
+ transforms_.transfer(localTransforms);
Pstream::scatter(transforms_);
-
- if (transforms_.size() > 3)
- {
- WarningInFunction
- << "More than three independent basic "
- << "transforms detected:" << nl
- << transforms_ << nl
- << "This is not a space filling tiling and will probably"
- << " give problems for e.g. lagrangian tracking or interpolation"
- << endl;
- }
}
@@ -351,16 +311,12 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
{
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
- patchTransformSign_.setSize(patches.size(), Pair<label>(-1, 0));
-
- label matchTransI = -1;
+ patchTransformSign_.setSize(patches.size(), labelPair(-1, 0));
forAll(patches, patchi)
{
const polyPatch& pp = patches[patchi];
- // Pout<< nl << patchi << " " << pp.name() << endl;
-
// Note: special check for unordered cyclics. These are in fact
// transform bcs and should probably be split off.
if
@@ -375,15 +331,12 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
)
)
{
- const coupledPolyPatch& cpp =
- refCast<const coupledPolyPatch>(pp);
+ const coupledPolyPatch& cpp = refCast<const coupledPolyPatch>(pp);
if (cpp.separated())
{
const vectorField& sepVecs = cpp.separation();
- // Pout<< "sepVecs " << sepVecs << endl;
-
// This loop is implicitly expecting only a single
// value for separation()
forAll(sepVecs, sVI)
@@ -394,6 +347,7 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
{
vectorTensorTransform t(sepVec);
+ label matchTransI;
label sign = matchTransform
(
transforms_,
@@ -402,22 +356,8 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
cpp.matchTolerance(),
true
);
-
- // Pout<< sign << " " << matchTransI << endl;
-
- // List<label> permutation(transforms_.size(), 0);
-
- // permutation[matchTransI] = sign;
-
- // Pout<< encodeTransformIndex(permutation) << nl
- // << transformPermutations_
- // [
- // encodeTransformIndex(permutation)
- // ]
- // << endl;
-
patchTransformSign_[patchi] =
- Pair<label>(matchTransI, sign);
+ labelPair(matchTransI, sign);
}
}
@@ -426,8 +366,6 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
{
const tensorField& transTensors = cpp.reverseT();
- // Pout<< "transTensors " << transTensors << endl;
-
// This loop is implicitly expecting only a single
// value for reverseT()
forAll(transTensors, tTI)
@@ -438,6 +376,7 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
{
vectorTensorTransform t(transT);
+ label matchTransI;
label sign = matchTransform
(
transforms_,
@@ -447,37 +386,65 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
true
);
- // Pout<< sign << " " << matchTransI << endl;
-
- // List<label> permutation(transforms_.size(), 0);
-
- // permutation[matchTransI] = sign;
-
- // Pout<< encodeTransformIndex(permutation) << nl
- // << transformPermutations_
- // [
- // encodeTransformIndex(permutation)
- // ]
- // << endl;
-
patchTransformSign_[patchi] =
- Pair<label>(matchTransI, sign);
+ labelPair(matchTransI, sign);
}
}
}
}
}
+}
+
+
+bool Foam::globalIndexAndTransform::uniqueTransform
+(
+ const point& pt,
+ labelPairList& trafos,
+ const label patchi,
+ const labelPair& patchTrafo
+) const
+{
+ if (findIndex(trafos, patchTrafo) == -1)
+ {
+ // New transform. Check if already have 3
+ if (trafos.size() == 3)
+ {
+ if (patchi > -1)
+ {
+ WarningInFunction
+ << "Point " << pt
+ << " is on patch " << mesh_.boundaryMesh()[patchi].name();
+ }
+ else
+ {
+ WarningInFunction
+ << "Point " << pt << " is on a coupled patch";
+ }
+ Warning
+ << " with transformation " << patchTrafo
+ << " but also on 3 other patches with transforms "
+ << trafos << nl
+ << "This is not a space filling tiling and might"
+ << " indicate a setup problem and give problems"
+ << " for e.g. lagrangian tracking or interpolation" << endl;
+
+ // Already warned so no need to extend more
+ trafos.clear();
+ return false;
+ }
- // Pout<< patchTransformSign_ << endl;
+ return true;
+ }
+ else
+ {
+ return false;
+ }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::globalIndexAndTransform::globalIndexAndTransform
-(
- const polyMesh& mesh
-)
+Foam::globalIndexAndTransform::globalIndexAndTransform(const polyMesh& mesh)
:
mesh_(mesh),
transforms_(),
@@ -546,13 +513,102 @@ Foam::globalIndexAndTransform::globalIndexAndTransform
Info<< "nullTransformIndex:" << nullTransformIndex() << endl
<< endl;
}
-}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+ if (transforms_.size() > 0)
+ {
+ // Check that the transforms are space filling : any point
+ // can only use up to three transforms
+
+ const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+
+ // 1. Collect transform&sign per point and do local check
+
+ List<labelPairList> pointToTrafos(mesh_.nPoints());
+
+ forAll(patches, patchi)
+ {
+ const polyPatch& pp = patches[patchi];
+
+ const labelPair& transSign = patchTransformSign_[patchi];
+
+ if (transSign.first() > -1)
+ {
+ const labelList& mp = pp.meshPoints();
+ forAll(mp, i)
+ {
+ labelPairList& trafos = pointToTrafos[mp[i]];
+
+ bool newTransform = uniqueTransform
+ (
+ mesh_.points()[mp[i]],
+ trafos,
+ patchi,
+ transSign
+ );
+
+ if (newTransform)
+ {
+ trafos.append(transSign);
+ }
+ }
+ }
+ }
+
+
+ // Synchronise across collocated (= untransformed) points
+ // TBD: there is a big problem in that globalMeshData uses
+ // globalIndexAndTransform. Triggers recursion.
+ if (false)
+ {
+ const globalMeshData& gmd = mesh_.globalData();
+ const indirectPrimitivePatch& cpp = gmd.coupledPatch();
+ const labelList& meshPoints = cpp.meshPoints();
+ const mapDistribute& slavesMap = gmd.globalCoPointSlavesMap();
+ const labelListList& slaves = gmd.globalCoPointSlaves();
+
+ List<labelPairList> elems(slavesMap.constructSize());
+ forAll(meshPoints, i)
+ {
+ elems[i] = pointToTrafos[meshPoints[i]];
+ }
+
+ // Pull slave data onto master. No need to update transformed slots.
+ slavesMap.distribute(elems, false);
+
+ // Combine master data with slave data
+ forAll(slaves, i)
+ {
+ labelPairList& trafos = elems[i];
+
+ const labelList& slavePoints = slaves[i];
+
+ // Combine master with untransformed slave data
+ forAll(slavePoints, j)
+ {
+ const labelPairList& slaveTrafos = elems[slavePoints[j]];
+
+ forAll(slaveTrafos, slaveI)
+ {
+ bool newTransform = uniqueTransform
+ (
+ mesh_.points()[meshPoints[i]],
+ trafos,
+ -1,
+ slaveTrafos[slaveI]
+ );
-Foam::globalIndexAndTransform::~globalIndexAndTransform()
-{}
+ if (newTransform)
+ {
+ trafos.append(slaveTrafos[slaveI]);
+ }
+ }
+ }
+ }
+ }
+ }
+}
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
index 41274d7ab1c..e53a9f71d62 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
@@ -28,7 +28,9 @@ Description
Determination and storage of the possible independent transforms
introduced by coupledPolyPatches, as well as all of the possible
permutations of these transforms generated by the presence of
- multiple coupledPolyPatches, i.e. more than one cyclic boundary.
+ multiple coupledPolyPatches, i.e. more than one cyclic boundary. Note that
+ any given point can be on maximum 3 transforms only (and these transforms
+ have to be perpendicular)
Also provides global index encoding and decoding for entity
(i.e. cell) index, processor index and transform index (0 or
@@ -71,8 +73,15 @@ public:
// - transform
class less
{
+ const globalIndexAndTransform& gi_;
+
public:
+ less(const globalIndexAndTransform& gi)
+ :
+ gi_(gi)
+ {}
+
inline bool operator()(const labelPair&, const labelPair&) const;
};
@@ -87,10 +96,8 @@ private:
//- The possible independent (non-permuted) transforms of the
// geometry, i.e. for a geometry with two cyclics, this
// stores the two transforms, not the eight permutations.
- // There may not be more than three transforms in the range
- // of coupledPolyPatch geometries (separated XOR
- // non-parallel) and symmetries (cuboid periodicity only)
- // supported.
+ // Any point can not be on more than three transforms but overall
+ // the mesh can have more than three.
List<vectorTensorTransform> transforms_;
//- The permutations of the transforms, stored for lookup
@@ -105,13 +112,7 @@ private:
//- Mapping from patch index to which transform it matches (or
// -1 for none) (.first()) and what sign to use for it,
// i.e. +/- 1 (.second()).
- List<Pair<label>> patchTransformSign_;
-
-
- // Private static data
-
- //- Number of spaces to reserve for transform encoding
- static const label base_;
+ List<labelPair> patchTransformSign_;
// Private Member Functions
@@ -124,7 +125,7 @@ private:
void determineTransformPermutations();
//- Determine which patch uses which transform (if any) and which
- //- Sign to use
+ // sign to use
void determinePatchTransformSign();
//- Test a list of reference transforms to see if the test
@@ -139,16 +140,14 @@ private:
bool checkBothSigns
) const;
- //- Encode transform index. Hardcoded to 3 independent transforms max.
- inline label encodeTransformIndex
- (
- const FixedList<Foam::label, 3>& permutationIndices
- ) const;
-
- //- Decode transform index. Hardcoded to 3 independent transforms max.
- inline FixedList<label, 3> decodeTransformIndex
+ //- Return true if transform is not yet present in trafos. Issues
+ // warning if too many transforms
+ bool uniqueTransform
(
- const label transformIndex
+ const point& pt,
+ labelPairList& trafos,
+ const label patchi,
+ const labelPair& patchTrafo
) const;
//- Disallow default bitwise copy construct
@@ -160,10 +159,6 @@ private:
public:
- //- Declare friendship with the entry class for IO
- friend class globalPoints;
-
-
// Declare name of the class and its debug switch
ClassName("globalIndexAndTransform");
@@ -174,10 +169,6 @@ public:
globalIndexAndTransform(const polyMesh& mesh);
- //- Destructor
- ~globalIndexAndTransform();
-
-
// Member Functions
//- Generate a transform index from the permutation indices of
@@ -185,9 +176,12 @@ public:
// only be -1, 0 or +1.
inline label encodeTransformIndex
(
- const List<label>& permutationIndices
+ const labelList& permutationIndices
) const;
+ //- Decode transform index
+ inline labelList decodeTransformIndex(const label transformIndex) const;
+
//- Add patch transformation to transformIndex. Return new
// transformIndex. (by default the patch is the sending, not the
// receiving, patch)
@@ -221,74 +215,71 @@ public:
) const;
//- Encode index and bare index as components on own processor
- inline static labelPair encode
+ inline labelPair encode
(
const label index,
const label transformIndex
- );
+ ) const;
//- Encode index and bare index as components on given processor
- inline static labelPair encode
+ inline labelPair encode
(
const label proci,
const label index,
const label transformIndex
- );
+ ) const;
//- Index carried by the object
- inline static label index(const labelPair& globalIAndTransform);
+ inline label index(const labelPair& globalIAndTransform) const;
//- Which processor does this come from?
- inline static label processor(const labelPair& globalIAndTransform);
+ inline label processor(const labelPair& globalIAndTransform) const;
//- Transform carried by the object
- inline static label transformIndex
+ inline label transformIndex(const labelPair& globalIAndTransform) const;
+
+ //- Return the number of independent transforms
+ inline label nIndependentTransforms() const;
+
+ //- Return access to the stored independent transforms
+ inline const List<vectorTensorTransform>& transforms() const;
+
+ //- Return access to the permuted transforms
+ inline const List<vectorTensorTransform>&
+ transformPermutations() const;
+
+ //- Return the transformIndex (index in transformPermutations)
+ // of the identity transform
+ inline label nullTransformIndex() const;
+
+ //- Return access to the per-patch transform-sign pairs
+ inline const List<labelPair>& patchTransformSign() const;
+
+ //- Access the overall (permuted) transform corresponding
+ // to the transformIndex
+ inline const vectorTensorTransform& transform
(
- const labelPair& globalIAndTransform
- );
-
- // Access
-
- //- Return the number of independent transforms
- inline label nIndependentTransforms() const;
-
- //- Return access to the stored independent transforms
- inline const List<vectorTensorTransform>& transforms() const;
-
- //- Return access to the permuted transforms
- inline const List<vectorTensorTransform>&
- transformPermutations() const;
-
- //- Return the transformIndex (index in transformPermutations)
- // of the identity transform
- inline label nullTransformIndex() const;
-
- //- Return access to the per-patch transform-sign pairs
- inline const List<Pair<label>>& patchTransformSign() const;
-
- //- Access the overall (permuted) transform corresponding
- // to the transformIndex
- inline const vectorTensorTransform& transform
- (
- label transformIndex
- ) const;
-
- //- Access the all of the indices of the transform
- // permutations corresponding the transforms of the
- // listed patch indices
- inline labelList transformIndicesForPatches
- (
- const labelHashSet& patchIs
- ) const;
-
- //- Apply all of the transform permutations
- // corresponding the transforms of the listed patch
- // indices to the supplied point
- inline pointField transformPatches
- (
- const labelHashSet& patchIs,
- const point& pt
- ) const;
+ label transformIndex
+ ) const;
+
+ //- Access the all of the indices of the transform
+ // permutations corresponding the transforms of the
+ // listed patch indices. This only allows a maximum of three
+ // transformations (since routine is used to transform points and
+ // any given point can only be on 3 or less transforms)
+ inline labelList transformIndicesForPatches
+ (
+ const labelHashSet& patchIs
+ ) const;
+
+ //- Apply all of the transform permutations
+ // corresponding the transforms of the listed patch
+ // indices to the supplied point
+ inline pointField transformPatches
+ (
+ const labelHashSet& patchIs,
+ const point& pt
+ ) const;
};
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
index d6aa055543d..56e74f2c7dd 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
@@ -33,8 +33,8 @@ bool Foam::globalIndexAndTransform::less::operator()
const labelPair& b
) const
{
- label procA = globalIndexAndTransform::processor(a);
- label procB = globalIndexAndTransform::processor(b);
+ label procA = gi_.processor(a);
+ label procB = gi_.processor(b);
if (procA < procB)
{
@@ -47,8 +47,8 @@ bool Foam::globalIndexAndTransform::less::operator()
else
{
// Equal proc.
- label indexA = globalIndexAndTransform::index(a);
- label indexB = globalIndexAndTransform::index(b);
+ label indexA = gi_.index(a);
+ label indexB = gi_.index(b);
if (indexA < indexB)
{
@@ -61,8 +61,8 @@ bool Foam::globalIndexAndTransform::less::operator()
else
{
// Equal index
- label transformA = globalIndexAndTransform::transformIndex(a);
- label transformB = globalIndexAndTransform::transformIndex(b);
+ label transformA = gi_.transformIndex(a);
+ label transformB = gi_.transformIndex(b);
return transformA < transformB;
}
@@ -72,7 +72,7 @@ bool Foam::globalIndexAndTransform::less::operator()
Foam::label Foam::globalIndexAndTransform::encodeTransformIndex
(
- const List<label>& permutationIndices
+ const labelList& permutationIndices
) const
{
if (permutationIndices.size() != transforms_.size())
@@ -106,68 +106,20 @@ Foam::label Foam::globalIndexAndTransform::encodeTransformIndex
}
-Foam::label Foam::globalIndexAndTransform::encodeTransformIndex
-(
- const FixedList<Foam::label, 3>& permutation
-) const
-{
- if (nIndependentTransforms() == 0)
- {
- return 0;
- }
- if (nIndependentTransforms() == 1)
- {
- return permutation[0]+1;
- }
- else if (nIndependentTransforms() == 2)
- {
- return (permutation[1]+1)*3 + (permutation[0]+1);
- }
- else
- {
- return
- (permutation[2]+1)*9
- + (permutation[1]+1)*3
- + (permutation[0]+1);
- }
-}
-
-
-Foam::FixedList<Foam::label, 3>
-Foam::globalIndexAndTransform::decodeTransformIndex
+Foam::labelList Foam::globalIndexAndTransform::decodeTransformIndex
(
const label transformIndex
) const
{
- FixedList<label, 3> permutation(label(0));
+ labelList permutation(transforms_.size(), 0);
label t = transformIndex;
- if (nIndependentTransforms() > 0)
+ forAll(permutation, i)
{
- permutation[0] = (t%3)-1;
- if (nIndependentTransforms() > 1)
- {
- t /= 3;
- permutation[1] = (t%3)-1;
- if (nIndependentTransforms() > 2)
- {
- t /= 3;
- permutation[2] = (t%3)-1;
- }
- }
+ permutation[i] = (t%3)-1;
+ t /= 3;
}
- #ifdef FULLDEBUG
- t /= 3;
- if (t != 0)
- {
- FatalErrorInFunction
- << "transformIndex : " << transformIndex
- << " has more than 3 fields."
- << abort(FatalError);
- }
- #endif
-
return permutation;
}
@@ -180,15 +132,28 @@ Foam::label Foam::globalIndexAndTransform::addToTransformIndex
const scalar tol
) const
{
- const Pair<label>& transSign = patchTransformSign_[patchi];
+ const labelPair& transSign = patchTransformSign_[patchi];
label matchTransI = transSign.first();
- // Hardcoded for max 3 transforms only!
-
- if (matchTransI > -1 && matchTransI < 3)
+ if (matchTransI >= transforms_.size())
{
- FixedList<label, 3> permutation = decodeTransformIndex(transformIndex);
+ FatalErrorInFunction
+ << "patch:" << mesh_.boundaryMesh()[patchi].name()
+ << " transform:" << matchTransI
+ << " out of possible transforms:" << transforms_
+ << exit(FatalError);
+ return labelMin;
+ }
+ else if (matchTransI == -1)
+ {
+ // No additional transformation for this patch
+ return transformIndex;
+ }
+ else
+ {
+ // Decode current set of transforms
+ labelList permutation(decodeTransformIndex(transformIndex));
// Add patch transform
@@ -267,10 +232,6 @@ Foam::label Foam::globalIndexAndTransform::addToTransformIndex
return encodeTransformIndex(permutation);
}
- else
- {
- return transformIndex;
- }
}
@@ -287,7 +248,7 @@ Foam::label Foam::globalIndexAndTransform::minimumTransformIndex
// Count number of transforms
- FixedList<label, 3> permutation0 = decodeTransformIndex(transformIndex0);
+ labelList permutation0(decodeTransformIndex(transformIndex0));
label n0 = 0;
forAll(permutation0, i)
{
@@ -297,7 +258,7 @@ Foam::label Foam::globalIndexAndTransform::minimumTransformIndex
}
}
- FixedList<label, 3> permutation1 = decodeTransformIndex(transformIndex1);
+ labelList permutation1(decodeTransformIndex(transformIndex1));
label n1 = 0;
forAll(permutation1, i)
{
@@ -324,8 +285,8 @@ Foam::label Foam::globalIndexAndTransform::subtractTransformIndex
const label transformIndex1
) const
{
- FixedList<label, 3> permutation0 = decodeTransformIndex(transformIndex0);
- FixedList<label, 3> permutation1 = decodeTransformIndex(transformIndex1);
+ labelList permutation0(decodeTransformIndex(transformIndex0));
+ labelList permutation1(decodeTransformIndex(transformIndex1));
forAll(permutation0, i)
{
@@ -340,7 +301,7 @@ Foam::labelPair Foam::globalIndexAndTransform::encode
(
const label index,
const label transformIndex
-)
+) const
{
return encode(Pstream::myProcNo(), index, transformIndex);
}
@@ -351,21 +312,22 @@ Foam::labelPair Foam::globalIndexAndTransform::encode
const label proci,
const label index,
const label transformIndex
-)
+) const
{
- if (transformIndex < 0 || transformIndex >= base_)
+ if (transformIndex < 0 || transformIndex >= transformPermutations_.size())
{
FatalErrorInFunction
<< "TransformIndex " << transformIndex
<< " is outside allowed range of 0 to "
- << base_ - 1
+ << transformPermutations_.size() - 1
<< abort(FatalError);
}
- if (proci > labelMax/base_)
+ if (proci > labelMax/transformPermutations_.size())
{
FatalErrorInFunction
- << "Overflow : encoding processor " << proci << " in base " << base_
+ << "Overflow : encoding processor " << proci
+ << " in base " << transformPermutations_.size()
<< " exceeds capability of label (" << labelMax
<< "). Please recompile with larger datatype for label."
<< exit(FatalError);
@@ -374,7 +336,7 @@ Foam::labelPair Foam::globalIndexAndTransform::encode
return labelPair
(
index,
- transformIndex + proci*base_
+ transformIndex + proci*transformPermutations_.size()
);
}
@@ -382,7 +344,7 @@ Foam::labelPair Foam::globalIndexAndTransform::encode
Foam::label Foam::globalIndexAndTransform::index
(
const labelPair& globalIAndTransform
-)
+) const
{
return globalIAndTransform.first();
}
@@ -391,18 +353,18 @@ Foam::label Foam::globalIndexAndTransform::index
Foam::label Foam::globalIndexAndTransform::processor
(
const labelPair& globalIAndTransform
-)
+) const
{
- return globalIAndTransform.second()/base_;
+ return globalIAndTransform.second()/transformPermutations_.size();
}
Foam::label Foam::globalIndexAndTransform::transformIndex
(
const labelPair& globalIAndTransform
-)
+) const
{
- return globalIAndTransform.second() % base_;
+ return globalIAndTransform.second()%transformPermutations_.size();
}
@@ -432,7 +394,7 @@ Foam::label Foam::globalIndexAndTransform::nullTransformIndex() const
}
-const Foam::List<Foam::Pair<Foam::label>>&
+const Foam::labelPairList&
Foam::globalIndexAndTransform::patchTransformSign() const
{
return patchTransformSign_;
@@ -453,7 +415,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
const labelHashSet& patchis
) const
{
- List<label> permutation(transforms_.size(), 0);
+ labelList permutation(transforms_.size(), 0);
labelList selectedTransformIs(0);
@@ -466,7 +428,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
{
label patchi = iter.key();
- const Pair<label>& transSign = patchTransformSign_[patchi];
+ const labelPair& transSign = patchTransformSign_[patchi];
label matchTransI = transSign.first();
@@ -520,7 +482,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
}
case 2:
{
- List<label> tempPermutation = permutation;
+ labelList tempPermutation = permutation;
label a = 0;
label b = 1;
@@ -565,7 +527,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
}
case 3:
{
- List<label> tempPermutation = permutation;
+ labelList tempPermutation = permutation;
tempPermutation[0] = 0;
tempPermutation[1] = 0;
--
GitLab
From 447cdc2098fd97e7e26b8784a336f036930442e1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 22 Sep 2016 14:22:26 +0100
Subject: [PATCH 32/42] globalMeshData: Revert NULL -> nullptr
---
.../meshes/polyMesh/globalMeshData/globalMeshData.C | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index b03e5d4fb79..c994bafcf1f 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1771,12 +1771,12 @@ Foam::globalMeshData::globalMeshData(const polyMesh& mesh)
processorPatchIndices_(0),
processorPatchNeighbours_(0),
nGlobalPoints_(-1),
- sharedPointLabelsPtr_(NULL),
- sharedPointAddrPtr_(NULL),
- sharedPointGlobalLabelsPtr_(NULL),
+ sharedPointLabelsPtr_(nullptr),
+ sharedPointAddrPtr_(nullptr),
+ sharedPointGlobalLabelsPtr_(nullptr),
nGlobalEdges_(-1),
- sharedEdgeLabelsPtr_(NULL),
- sharedEdgeAddrPtr_(NULL)
+ sharedEdgeLabelsPtr_(nullptr),
+ sharedEdgeAddrPtr_(nullptr)
{
updateMesh();
}
--
GitLab
From f066a9b54ee6b9f17a58a4663f4390ab6e99cb66 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 22 Sep 2016 21:03:30 +0100
Subject: [PATCH 33/42] Updated template formatting Resolves bug-report
http://bugs.openfoam.org/view.php?id=2264
---
.../mapDistribute/mapDistributeBaseTemplates.C | 8 ++++----
.../chemistrySolver/makeChemistrySolverTypes.H | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
index a445d79f2a6..0380f5d8adf 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
@@ -461,7 +461,7 @@ void Foam::mapDistributeBase::distribute
{
// Set up sends to neighbours
- List<List<T > > sendFields(Pstream::nProcs());
+ List<List<T>> sendFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
@@ -495,7 +495,7 @@ void Foam::mapDistributeBase::distribute
// Set up receives from neighbours
- List<List<T > > recvFields(Pstream::nProcs());
+ List<List<T>> recvFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
@@ -938,7 +938,7 @@ void Foam::mapDistributeBase::distribute
{
// Set up sends to neighbours
- List<List<T > > sendFields(Pstream::nProcs());
+ List<List<T>> sendFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
@@ -972,7 +972,7 @@ void Foam::mapDistributeBase::distribute
// Set up receives from neighbours
- List<List<T > > recvFields(Pstream::nProcs());
+ List<List<T>> recvFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
index 526177de586..e98171d4bf7 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
@@ -39,8 +39,8 @@ License
#define makeChemistrySolverType(SS, Comp, Thermo) \
\
- typedef SS<chemistryModel<Comp, Thermo> > SS##Comp##Thermo; \
- typedef SS<TDACChemistryModel<Comp, Thermo> > TDAC##SS##Comp##Thermo; \
+ typedef SS<chemistryModel<Comp, Thermo>> SS##Comp##Thermo; \
+ typedef SS<TDACChemistryModel<Comp, Thermo>> TDAC##SS##Comp##Thermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
--
GitLab
From 93530f174748ad61e011d30db5f39f913c3f578b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 24 Sep 2016 08:40:13 +0100
Subject: [PATCH 34/42] blockMesh: Added support for (<block> <face>)
specification of patch faces
e.g. for the cavity tutorial the moving wall patch can be specified in
terms of the block vertices as before:
boundary
(
movingWall
{
type wall;
faces
(
(3 7 6 2)
);
}
.
.
.
or the new specification of the face as block 0, block face 3:
boundary
(
movingWall
{
type wall;
faces
(
(0 3)
);
}
---
.../blockDescriptor/blockDescriptor.C | 19 ++
src/mesh/blockMesh/blockMesh/blockMesh.H | 24 ++-
src/mesh/blockMesh/blockMesh/blockMeshCheck.C | 80 +--------
.../blockMesh/blockMesh/blockMeshTopology.C | 165 +++++++++++-------
4 files changed, 128 insertions(+), 160 deletions(-)
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
index f8f148756dd..1f8c9118c1b 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
@@ -29,6 +29,25 @@ License
void Foam::blockDescriptor::check(const Istream& is)
{
+ forAll(blockShape_, pi)
+ {
+ if (blockShape_[pi] < 0)
+ {
+ FatalIOErrorInFunction(is)
+ << "Negative point label " << blockShape_[pi]
+ << " in block " << *this
+ << exit(FatalIOError);
+ }
+ else if (blockShape_[pi] >= blockPointField_.size())
+ {
+ FatalIOErrorInFunction(is)
+ << "Point label " << blockShape_[pi]
+ << " out of range 0.." << blockPointField_.size() - 1
+ << " in block " << *this
+ << exit(FatalIOError);
+ }
+ }
+
const point blockCentre(blockShape_.centre(blockPointField_));
const faceList faces(blockShape_.faces());
diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.H b/src/mesh/blockMesh/blockMesh/blockMesh.H
index b4cad2a87d6..348a59f018d 100644
--- a/src/mesh/blockMesh/blockMesh/blockMesh.H
+++ b/src/mesh/blockMesh/blockMesh/blockMesh.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -97,21 +97,16 @@ class blockMesh
// Private Member Functions
- bool blockLabelsOK
+ template<class Source>
+ void checkPatchLabels
(
- const label blockLabel,
+ const Source& source,
+ const word& patchName,
const pointField& points,
- const cellShape& blockShape
+ faceList& patchShapes
) const;
- bool patchLabelsOK
- (
- const label patchLabel,
- const pointField& points,
- const faceList& patchShapes
- ) const;
-
- bool readPatches
+ void readPatches
(
const dictionary& meshDescription,
faceListList& tmpBlocksPatches,
@@ -120,7 +115,7 @@ class blockMesh
wordList& nbrPatchNames
);
- bool readBoundary
+ void readBoundary
(
const dictionary& meshDescription,
wordList& patchNames,
@@ -131,7 +126,8 @@ class blockMesh
void createCellShapes(cellShapeList& tmpBlockCells);
polyMesh* createTopology(const IOdictionary&, const word& regionName);
- void checkBlockMesh(const polyMesh&) const;
+
+ void check(const polyMesh&) const;
//- Determine the merge info and the final number of cells/points
void calcMergeInfo();
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshCheck.C b/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
index 2347e8efd8e..3091c16cbd3 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void Foam::blockMesh::checkBlockMesh(const polyMesh& bm) const
+void Foam::blockMesh::check(const polyMesh& bm) const
{
if (verboseOutput)
{
@@ -146,82 +146,4 @@ void Foam::blockMesh::checkBlockMesh(const polyMesh& bm) const
}
-bool Foam::blockMesh::blockLabelsOK
-(
- const label blockLabel,
- const pointField& points,
- const cellShape& blockShape
-) const
-{
- bool ok = true;
-
- forAll(blockShape, blockI)
- {
- if (blockShape[blockI] < 0)
- {
- ok = false;
-
- WarningInFunction
- << "out-of-range point label " << blockShape[blockI]
- << " (min = 0"
- << ") in block " << blockLabel << endl;
- }
- else if (blockShape[blockI] >= points.size())
- {
- ok = false;
-
- WarningInFunction
- << "out-of-range point label " << blockShape[blockI]
- << " (max = " << points.size() - 1
- << ") in block " << blockLabel << endl;
- }
- }
-
- return ok;
-}
-
-
-bool Foam::blockMesh::patchLabelsOK
-(
- const label patchLabel,
- const pointField& points,
- const faceList& patchFaces
-) const
-{
- bool ok = true;
-
- forAll(patchFaces, facei)
- {
- const labelList& f = patchFaces[facei];
-
- forAll(f, fp)
- {
- if (f[fp] < 0)
- {
- ok = false;
-
- WarningInFunction
- << "out-of-range point label " << f[fp]
- << " (min = 0"
- << ") on patch " << patchLabel
- << ", face " << facei << endl;
- }
- else if (f[fp] >= points.size())
- {
- ok = false;
-
- WarningInFunction
- << "out-of-range point label " << f[fp]
- << " (max = " << points.size() - 1
- << ") on patch " << patchLabel
- << ", face " << facei << endl;
-
- }
- }
- }
-
- return ok;
-}
-
-
// ************************************************************************* //
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
index c0223efe717..dfc1d93b2df 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
@@ -29,8 +29,79 @@ License
#include "emptyPolyPatch.H"
#include "cyclicPolyPatch.H"
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+template<class Source>
+void Foam::blockMesh::checkPatchLabels
+(
+ const Source& source,
+ const word& patchName,
+ const pointField& points,
+ faceList& patchFaces
+) const
+{
+ forAll(patchFaces, facei)
+ {
+ face& f = patchFaces[facei];
+
+ // Replace (<block> <face>) face description
+ // with the corresponding block face
+ if (f.size() == 2)
+ {
+ const label bi = f[0];
+ const label fi = f[1];
+
+ if (bi >= size())
+ {
+ FatalIOErrorInFunction(source)
+ << "Block index out of range for patch face " << f << nl
+ << " Number of blocks = " << size()
+ << ", index = " << f[0] << nl
+ << " on patch " << patchName << ", face " << facei
+ << exit(FatalIOError);
+ }
+ else if (fi >= operator[](bi).blockShape().faces().size())
+ {
+ FatalIOErrorInFunction(source)
+ << "Block face index out of range for patch face " << f
+ << nl
+ << " Number of block faces = "
+ << operator[](bi).blockShape().faces().size()
+ << ", index = " << f[1] << nl
+ << " on patch " << patchName << ", face " << facei
+ << exit(FatalIOError);
+ }
+ else
+ {
+ f = operator[](bi).blockShape().faces()[fi];
+ }
+ }
+ else
+ {
+ forAll(f, fp)
+ {
+ if (f[fp] < 0)
+ {
+ FatalIOErrorInFunction(source)
+ << "Negative point label " << f[fp] << nl
+ << " on patch " << patchName << ", face " << facei
+ << exit(FatalIOError);
+ }
+ else if (f[fp] >= points.size())
+ {
+ FatalIOErrorInFunction(source)
+ << "Point label " << f[fp]
+ << " out of range 0.." << points.size() - 1 << nl
+ << " on patch " << patchName << ", face " << facei
+ << exit(FatalIOError);
+ }
+ }
+ }
+ }
+}
+
-bool Foam::blockMesh::readPatches
+void Foam::blockMesh::readPatches
(
const dictionary& meshDescription,
faceListList& tmpBlocksPatches,
@@ -39,8 +110,6 @@ bool Foam::blockMesh::readPatches
wordList& nbrPatchNames
)
{
- bool topologyOK = true;
-
ITstream& patchStream(meshDescription.lookup("patches"));
// read number of patches in mesh
@@ -94,22 +163,22 @@ bool Foam::blockMesh::readPatches
patchStream >> tmpBlocksPatches[nPatches];
- // Catch multiple patches asap.
+ // Check for multiple patches
for (label i = 0; i < nPatches; i++)
{
if (patchNames[nPatches] == patchNames[i])
{
- FatalErrorInFunction
+ FatalIOErrorInFunction(patchStream)
<< "Duplicate patch " << patchNames[nPatches]
<< " at line " << patchStream.lineNumber()
- << ". Exiting !" << nl
- << exit(FatalError);
+ << exit(FatalIOError);
}
}
- topologyOK = topologyOK && patchLabelsOK
+ checkPatchLabels
(
- nPatches,
+ patchStream,
+ patchNames[nPatches],
blockPointField_,
tmpBlocksPatches[nPatches]
);
@@ -124,13 +193,13 @@ bool Foam::blockMesh::readPatches
word halfA = patchNames[nPatches-1] + "_half0";
word halfB = patchNames[nPatches-1] + "_half1";
- WarningInFunction
+ FatalIOErrorInFunction(patchStream)
<< "Old-style cyclic definition."
<< " Splitting patch "
<< patchNames[nPatches-1] << " into two halves "
<< halfA << " and " << halfB << endl
<< " Alternatively use new 'boundary' dictionary syntax."
- << endl;
+ << exit(FatalIOError);
// Add extra patch
if (tmpBlocksPatches.size() <= nPatches)
@@ -152,10 +221,10 @@ bool Foam::blockMesh::readPatches
// Split faces
if ((tmpBlocksPatches[nPatches-1].size() % 2) != 0)
{
- FatalErrorInFunction
+ FatalIOErrorInFunction(patchStream)
<< "Size of cyclic faces is not a multiple of 2 :"
<< tmpBlocksPatches[nPatches-1]
- << exit(FatalError);
+ << exit(FatalIOError);
}
label sz = tmpBlocksPatches[nPatches-1].size()/2;
faceList unsplitFaces(tmpBlocksPatches[nPatches-1], true);
@@ -177,12 +246,10 @@ bool Foam::blockMesh::readPatches
// Read end of blocks
patchStream.readEnd("patches");
-
- return topologyOK;
}
-bool Foam::blockMesh::readBoundary
+void Foam::blockMesh::readBoundary
(
const dictionary& meshDescription,
wordList& patchNames,
@@ -190,8 +257,6 @@ bool Foam::blockMesh::readBoundary
PtrList<dictionary>& patchDicts
)
{
- bool topologyOK = true;
-
// Read like boundary file
const PtrList<entry> patchesInfo
(
@@ -210,24 +275,26 @@ bool Foam::blockMesh::readBoundary
{
FatalIOErrorInFunction(meshDescription)
<< "Entry " << patchInfo << " in boundary section is not a"
- << " valid dictionary." << exit(FatalIOError);
+ << " valid dictionary."
+ << exit(FatalIOError);
}
patchNames[patchi] = patchInfo.keyword();
- // Construct dictionary
+
+ // Construct patch dictionary
patchDicts.set(patchi, new dictionary(patchInfo.dict()));
+
// Read block faces
patchDicts[patchi].lookup("faces") >> tmpBlocksPatches[patchi];
- topologyOK = topologyOK && patchLabelsOK
+ checkPatchLabels
(
- patchi,
+ patchInfo.dict(),
+ patchNames[patchi],
blockPointField_,
tmpBlocksPatches[patchi]
);
}
-
- return topologyOK;
}
@@ -241,14 +308,7 @@ void Foam::blockMesh::createCellShapes
tmpBlockCells.setSize(blocks.size());
forAll(blocks, blockI)
{
- tmpBlockCells[blockI] = cellShape(blocks[blockI].blockShape());
-
- if (tmpBlockCells[blockI].mag(blockPointField_) < 0.0)
- {
- WarningInFunction
- << "negative volume block : " << blockI
- << ", probably defined inside-out" << endl;
- }
+ tmpBlockCells[blockI] = blocks[blockI].blockShape();
}
}
@@ -261,8 +321,6 @@ Foam::polyMesh* Foam::blockMesh::createTopology
const word& regionName
)
{
- bool topologyOK = true;
-
blockList& blocks = *this;
word defaultPatchName = "defaultFaces";
@@ -411,13 +469,6 @@ Foam::polyMesh* Foam::blockMesh::createTopology
)
);
- topologyOK = topologyOK && blockLabelsOK
- (
- nBlocks,
- blockPointField_,
- blocks[nBlocks].blockShape()
- );
-
nBlocks++;
is >> lastToken;
@@ -448,7 +499,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology
wordList patchTypes;
wordList nbrPatchNames;
- topologyOK = topologyOK && readPatches
+ readPatches
(
meshDescription,
tmpBlocksPatches,
@@ -457,13 +508,6 @@ Foam::polyMesh* Foam::blockMesh::createTopology
nbrPatchNames
);
- if (!topologyOK)
- {
- FatalErrorInFunction
- << "Cannot create mesh due to errors in topology, exiting !"
- << nl << exit(FatalError);
- }
-
Info<< nl << "Creating block mesh topology" << endl;
cellShapeList tmpBlockCells(blocks.size());
@@ -504,14 +548,12 @@ Foam::polyMesh* Foam::blockMesh::createTopology
}
else if (word(dict.lookup("type")) != patchTypes[patchi])
{
- IOWarningInFunction
- (
- meshDescription
- ) << "For patch " << patchNames[patchi]
+ FatalIOErrorInFunction(meshDescription)
+ << "For patch " << patchNames[patchi]
<< " overriding type '" << patchTypes[patchi]
<< "' with '" << word(dict.lookup("type"))
<< "' (read from boundary file)"
- << endl;
+ << exit(FatalIOError);
}
// Override neighbourpatch name
@@ -521,7 +563,6 @@ Foam::polyMesh* Foam::blockMesh::createTopology
}
}
-
blockMeshPtr = new polyMesh
(
IOobject
@@ -548,7 +589,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology
faceListList tmpBlocksPatches;
PtrList<dictionary> patchDicts;
- topologyOK = topologyOK && readBoundary
+ readBoundary
(
meshDescription,
patchNames,
@@ -556,21 +597,11 @@ Foam::polyMesh* Foam::blockMesh::createTopology
patchDicts
);
- if (!topologyOK)
- {
- FatalErrorInFunction
- << "Cannot create mesh due to errors in topology, exiting !"
- << nl << exit(FatalError);
- }
-
-
Info<< nl << "Creating block mesh topology" << endl;
cellShapeList tmpBlockCells(blocks.size());
createCellShapes(tmpBlockCells);
- // Extract
-
blockMeshPtr = new polyMesh
(
IOobject
@@ -592,7 +623,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology
);
}
- checkBlockMesh(*blockMeshPtr);
+ check(*blockMeshPtr);
return blockMeshPtr;
}
--
GitLab
From b6feaea53be5088d3efd41490482e42ef090c8f2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 25 Sep 2016 09:11:53 +0100
Subject: [PATCH 35/42] fvPatchFields: Constructors from dictionary now call
the corresponding constructor of the fvPatchField base-class to ensure
'patchType' is set as specified.
Required substantial change to the organization of the reading of the
'value' entry requiring careful testing and there may be some residual
issues remaining. Please report any problems with the reading and
initialization of patch fields.
Resolves bug-report http://bugs.openfoam.org/view.php?id=2266
---
.../adjointOutletPressureFvPatchScalarField.C | 11 ++----
.../adjointOutletVelocityFvPatchVectorField.C | 8 ++---
...ndaryLayerInletEpsilonFvPatchScalarField.C | 4 +--
...atmBoundaryLayerInletKFvPatchScalarField.C | 4 +--
...daryLayerInletVelocityFvPatchVectorField.C | 4 +--
.../fixedShearStressFvPatchVectorField.C | 2 +-
.../SRFVelocityFvPatchVectorField.C | 6 ++--
.../SRFWallVelocityFvPatchVectorField.C | 6 ++--
.../basic/coupled/coupledFvPatchField.C | 5 +--
.../basic/coupled/coupledFvPatchField.H | 3 +-
.../extrapolatedCalculatedFvPatchField.C | 9 ++---
.../extrapolatedCalculatedFvPatchField.H | 3 +-
.../fixedGradient/fixedGradientFvPatchField.C | 2 +-
.../basic/fixedValue/fixedValueFvPatchField.C | 5 +--
.../basic/fixedValue/fixedValueFvPatchField.H | 3 +-
.../basic/mixed/mixedFvPatchField.C | 2 +-
.../basic/sliced/slicedFvPatchField.C | 2 +-
.../basic/transform/transformFvPatchField.C | 2 +-
.../zeroGradient/zeroGradientFvPatchField.C | 2 +-
.../constraint/cyclic/cyclicFvPatchField.C | 2 +-
.../cyclicACMI/cyclicACMIFvPatchField.C | 35 ++++++++++---------
.../cyclicAMI/cyclicAMIFvPatchField.C | 34 +++++++++---------
.../activeBaffleVelocityFvPatchVectorField.C | 2 +-
...ureForceBaffleVelocityFvPatchVectorField.C | 2 +-
.../fixedProfile/fixedProfileFvPatchField.C | 2 +-
.../flowRateInletVelocityFvPatchVectorField.C | 2 +-
.../movingWallVelocityFvPatchVectorField.C | 6 ++--
.../plenumPressureFvPatchScalarField.C | 4 +--
...eDirectedInletVelocityFvPatchVectorField.C | 6 ++--
.../pressureInletVelocityFvPatchVectorField.C | 6 ++--
.../prghPressureFvPatchScalarField.C | 4 +--
.../prghTotalPressureFvPatchScalarField.C | 4 +--
.../rotatingWallVelocityFvPatchVectorField.C | 2 +-
...urfaceNormalFixedValueFvPatchVectorField.C | 2 +-
.../syringePressureFvPatchScalarField.C | 2 +-
.../timeVaryingMappedFixedValueFvPatchField.C | 2 +-
.../totalPressureFvPatchScalarField.C | 2 +-
.../totalTemperatureFvPatchScalarField.C | 4 +--
...ranslatingWallVelocityFvPatchVectorField.C | 2 +-
.../turbulentInletFvPatchField.C | 2 +-
...ityHydrostaticPressureFvPatchScalarField.C | 2 +-
.../uniformFixedValueFvPatchField.C | 2 +-
.../uniformTotalPressureFvPatchScalarField.C | 2 +-
.../waveSurfacePressureFvPatchScalarField.C | 9 ++---
.../fvPatchFields/fvPatchField/fvPatchField.C | 33 +++++++++--------
.../fvPatchFields/fvPatchField/fvPatchField.H | 2 +-
.../cellMotion/cellMotionFvPatchField.C | 6 ++--
...meVaryingMappedFixedValuePointPatchField.C | 2 +-
.../genericFvPatchField/genericFvPatchField.C | 2 +-
...ysisTemperatureCoupledFvPatchScalarField.C | 6 ++--
...rolysisVelocityCoupledFvPatchVectorField.C | 6 ++--
...ilmHeightInletVelocityFvPatchVectorField.C | 8 ++---
...linedFilmNusseltHeightFvPatchScalarField.C | 6 ++--
...lmNusseltInletVelocityFvPatchVectorField.C | 6 ++--
...veViewFactorFixedValueFvPatchScalarField.C | 2 +-
.../alphaFixedPressureFvPatchScalarField.C | 4 +--
56 files changed, 138 insertions(+), 170 deletions(-)
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
index c15fde70786..c9f03a373c1 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -63,13 +63,8 @@ adjointOutletPressureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF)
-{
- fvPatchField<scalar>::operator=
- (
- scalarField("value", dict, p.size())
- );
-}
+ fixedValueFvPatchScalarField(p, iF, dict)
+{}
Foam::adjointOutletPressureFvPatchScalarField::
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
index 31134c955b0..7b00d66277f 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -50,10 +50,8 @@ adjointOutletVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF)
-{
- fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
-}
+ fixedValueFvPatchVectorField(p, iF, dict)
+{}
Foam::adjointOutletVelocityFvPatchVectorField::
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
index 9b04284c0e6..20a917ec334 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -56,7 +56,7 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
atmBoundaryLayer(patch().Cf(), dict)
{
scalarField::operator=(epsilon(patch().Cf()));
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
index de2404ab13a..65017e2520a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -56,7 +56,7 @@ atmBoundaryLayerInletKFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
atmBoundaryLayer(patch().Cf(), dict)
{
scalarField::operator=(k(patch().Cf()));
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index 652b6e07bce..348d041cb0f 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -56,7 +56,7 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict, false),
atmBoundaryLayer(patch().Cf(), dict)
{
vectorField::operator=(U(patch().Cf()));
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index 17050f28d52..bc4f5303e31 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -50,7 +50,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict, false),
tau0_(dict.lookupOrDefault<vector>("tau", Zero))
{
fvPatchField<vector>::operator=(patchInternalField());
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
index ec59dbedfc4..ba3a0457269 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
@@ -64,12 +64,10 @@ Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict),
relative_(dict.lookup("relative")),
inletValue_("inletValue", dict, p.size())
-{
- fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
-}
+{}
Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
index 17c0dc700f8..2cd69993b14 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
@@ -60,10 +60,8 @@ Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF)
-{
- fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
-}
+ fixedValueFvPatchVectorField(p, iF, dict)
+{}
Foam::SRFWallVelocityFvPatchVectorField::SRFWallVelocityFvPatchVectorField
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
index 5a6f29aa89f..d53c2505657 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
@@ -71,11 +71,12 @@ Foam::coupledFvPatchField<Type>::coupledFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const dictionary& dict,
+ const bool valueRequired
)
:
LduInterfaceField<Type>(refCast<const lduInterface>(p)),
- fvPatchField<Type>(p, iF, dict)
+ fvPatchField<Type>(p, iF, dict, valueRequired)
{}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
index 0148af1ac55..20d87b8e866 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
@@ -86,7 +86,8 @@ public:
(
const fvPatch&,
const DimensionedField<Type, volMesh>&,
- const dictionary&
+ const dictionary&,
+ const bool valueRequired=true
);
//- Construct by mapping the given coupledFvPatchField onto a new patch
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
index 3d154348800..188294d38d0 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
@@ -46,12 +46,13 @@ extrapolatedCalculatedFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict,
- const bool valueRequired
+ const dictionary& dict
)
:
- calculatedFvPatchField<Type>(p, iF, dict, valueRequired)
-{}
+ calculatedFvPatchField<Type>(p, iF, dict, false)
+{
+ evaluate();
+}
template<class Type>
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
index da998d3a85d..f9eb61e2856 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
@@ -87,8 +87,7 @@ public:
(
const fvPatch&,
const DimensionedField<Type, volMesh>&,
- const dictionary&,
- const bool valueRequired=false
+ const dictionary&
);
//- Construct by mapping given patchField<Type> onto a new patch
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
index bb789ed827c..a7a8a8562fe 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
@@ -48,7 +48,7 @@ Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
const dictionary& dict
)
:
- fvPatchField<Type>(p, iF, dict),
+ fvPatchField<Type>(p, iF, dict, false),
gradient_("gradient", dict, p.size())
{
evaluate();
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
index b6841f33533..fcde153c9d8 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
@@ -55,10 +55,11 @@ Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const dictionary& dict,
+ const bool valueRequired
)
:
- fvPatchField<Type>(p, iF, dict, true)
+ fvPatchField<Type>(p, iF, dict, valueRequired)
{}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
index 3cf2421420d..375d57fea4c 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
@@ -99,7 +99,8 @@ public:
(
const fvPatch&,
const DimensionedField<Type, volMesh>&,
- const dictionary&
+ const dictionary&,
+ const bool valueRequired=true
);
//- Construct by mapping the given fixedValueFvPatchField<Type>
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index bcec377834b..9a195de206e 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -49,7 +49,7 @@ Foam::mixedFvPatchField<Type>::mixedFvPatchField
const dictionary& dict
)
:
- fvPatchField<Type>(p, iF, dict),
+ fvPatchField<Type>(p, iF, dict, false),
refValue_("refValue", dict, p.size()),
refGrad_("refGradient", dict, p.size()),
valueFraction_("valueFraction", dict, p.size())
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
index 98bd38eb72b..ba0dd92f091 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
@@ -61,7 +61,7 @@ Foam::slicedFvPatchField<Type>::slicedFvPatchField
const dictionary& dict
)
:
- fvPatchField<Type>(p, iF, dict)
+ fvPatchField<Type>(p, iF, dict, false)
{
NotImplemented;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
index bccf65ef165..0ed9a267033 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
@@ -61,7 +61,7 @@ Foam::transformFvPatchField<Type>::transformFvPatchField
const dictionary& dict
)
:
- fvPatchField<Type>(p, iF, dict)
+ fvPatchField<Type>(p, iF, dict, false)
{}
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
index 4395534fe2a..e99530bf21c 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
@@ -47,7 +47,7 @@ Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
const dictionary& dict
)
:
- fvPatchField<Type>(p, iF, dict)
+ fvPatchField<Type>(p, iF, dict, false)
{
fvPatchField<Type>::operator=(this->patchInternalField());
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 4513dc4da65..b4241bb2710 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -48,7 +48,7 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
const dictionary& dict
)
:
- coupledFvPatchField<Type>(p, iF, dict),
+ coupledFvPatchField<Type>(p, iF, dict, false),
cyclicPatch_(refCast<const cyclicFvPatch>(p))
{
if (!isA<cyclicFvPatch>(p))
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
index c32b6f33d60..0b9335fb8f8 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@@ -44,60 +44,61 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
template<class Type>
Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
(
- const cyclicACMIFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
cyclicACMILduInterfaceField(),
- coupledFvPatchField<Type>(ptf, p, iF, mapper),
+ coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
cyclicACMIPatch_(refCast<const cyclicACMIFvPatch>(p))
{
- if (!isA<cyclicACMIFvPatch>(this->patch()))
+ if (!isA<cyclicACMIFvPatch>(p))
{
- FatalErrorInFunction
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << " patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
+
+ if (!dict.found("value") && this->coupled())
+ {
+ this->evaluate(Pstream::blocking);
+ }
}
template<class Type>
Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
(
+ const cyclicACMIFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
cyclicACMILduInterfaceField(),
- coupledFvPatchField<Type>(p, iF, dict),
+ coupledFvPatchField<Type>(ptf, p, iF, mapper),
cyclicACMIPatch_(refCast<const cyclicACMIFvPatch>(p))
{
- if (!isA<cyclicACMIFvPatch>(p))
+ if (!isA<cyclicACMIFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << " patch type '" << p.type()
+ FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
-
- if (!dict.found("value") && this->coupled())
- {
- this->evaluate(Pstream::blocking);
- }
}
+
template<class Type>
Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
(
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index f97985b115a..7d8fec72c12 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -41,57 +41,57 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
template<class Type>
Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
(
- const cyclicAMIFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
cyclicAMILduInterfaceField(),
- coupledFvPatchField<Type>(ptf, p, iF, mapper),
+ coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
cyclicAMIPatch_(refCast<const cyclicAMIFvPatch>(p))
{
- if (!isA<cyclicAMIFvPatch>(this->patch()))
+ if (!isA<cyclicAMIFvPatch>(p))
{
- FatalErrorInFunction
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << " patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
+
+ if (!dict.found("value") && this->coupled())
+ {
+ this->evaluate(Pstream::blocking);
+ }
}
template<class Type>
Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
(
+ const cyclicAMIFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
cyclicAMILduInterfaceField(),
- coupledFvPatchField<Type>(p, iF, dict),
+ coupledFvPatchField<Type>(ptf, p, iF, mapper),
cyclicAMIPatch_(refCast<const cyclicAMIFvPatch>(p))
{
- if (!isA<cyclicAMIFvPatch>(p))
+ if (!isA<cyclicAMIFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << " patch type '" << p.type()
+ FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
-
- if (!dict.found("value") && this->coupled())
- {
- this->evaluate(Pstream::blocking);
- }
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index 1ce7a7d39f4..18213659c76 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -85,7 +85,7 @@ activeBaffleVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict, false),
pName_(dict.lookupOrDefault<word>("p", "p")),
cyclicPatchName_(dict.lookup("cyclicPatch")),
cyclicPatchLabel_(p.patch().boundaryMesh().findPatchID(cyclicPatchName_)),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index 04d33d9b8af..6b86262f29c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -91,7 +91,7 @@ activePressureForceBaffleVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict, false),
pName_(dict.lookupOrDefault<word>("p", "p")),
cyclicPatchName_(dict.lookup("cyclicPatch")),
cyclicPatchLabel_(p.patch().boundaryMesh().findPatchID(cyclicPatchName_)),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index 1ea26724c65..be523343383 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -64,7 +64,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
const dictionary& dict
)
:
- fixedValueFvPatchField<Type>(p, iF),
+ fixedValueFvPatchField<Type>(p, iF, dict, false),
profile_(Function1<Type>::New("profile", dict)),
dir_(dict.lookup("direction")),
origin_(readScalar(dict.lookup("origin")))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 79b1745ddab..1e507a5dfd5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -54,7 +54,7 @@ flowRateInletVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchField<vector>(p, iF),
+ fixedValueFvPatchField<vector>(p, iF, dict, false),
rhoInlet_(dict.lookupOrDefault<scalar>("rhoInlet", -VGREAT)),
extrapolateProfile_
(
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
index 6c0bba62635..22d6a2e789b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
@@ -50,10 +50,8 @@ movingWallVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF)
-{
- fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
-}
+ fixedValueFvPatchVectorField(p, iF, dict)
+{}
Foam::movingWallVelocityFvPatchVectorField::
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
index 19476f5e7fb..aadbfcfd85e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
@@ -65,7 +65,7 @@ Foam::plenumPressureFvPatchScalarField::plenumPressureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict),
gamma_(readScalar(dict.lookup("gamma"))),
R_(readScalar(dict.lookup("R"))),
supplyMassFlowRate_(readScalar(dict.lookup("supplyMassFlowRate"))),
@@ -87,8 +87,6 @@ Foam::plenumPressureFvPatchScalarField::plenumPressureFvPatchScalarField
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
UName_(dict.lookupOrDefault<word>("U", "U"))
{
- fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
-
if (dict.found("rho"))
{
rho_ = readScalar(dict.lookup("rho"));
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
index cd4eb18b988..9ab1bc87ef4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
@@ -70,13 +70,11 @@ pressureDirectedInletVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
inletDir_("inletDirection", dict, p.size())
-{
- fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
-}
+{}
Foam::pressureDirectedInletVelocityFvPatchVectorField::
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
index 6a779ae0bda..06e58e73bb7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
@@ -66,12 +66,10 @@ pressureInletVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
-{
- fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
-}
+{}
Foam::pressureInletVelocityFvPatchVectorField::
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
index 5ea2c2c8237..c266d27f856 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -52,7 +52,7 @@ prghPressureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
p_("p", dict, p.size())
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
index 21229f7d82f..1140551128a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -55,7 +55,7 @@ prghTotalPressureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
UName_(dict.lookupOrDefault<word>("U", "U")),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index 461481f5fb7..ebc32b0790c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -52,7 +52,7 @@ rotatingWallVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchField<vector>(p, iF),
+ fixedValueFvPatchField<vector>(p, iF, dict, false),
origin_(dict.lookup("origin")),
axis_(dict.lookup("axis")),
omega_(Function1<scalar>::New("omega", dict))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
index 478600608b1..dc37c38a43e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
@@ -50,7 +50,7 @@ surfaceNormalFixedValueFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict, false),
refValue_("refValue", dict, p.size())
{
fvPatchVectorField::operator=(refValue_*patch().nf());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index 5acddd12fa3..c33db45ca26 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -50,7 +50,7 @@ Foam::syringePressureFvPatchScalarField::syringePressureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
Ap_(readScalar(dict.lookup("Ap"))),
Sp_(readScalar(dict.lookup("Sp"))),
VsI_(readScalar(dict.lookup("VsI"))),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 2222b05b1e5..cb0dbd17922 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -63,7 +63,7 @@ timeVaryingMappedFixedValueFvPatchField
const dictionary& dict
)
:
- fixedValueFvPatchField<Type>(p, iF),
+ fixedValueFvPatchField<Type>(p, iF, dict, false),
fieldTableName_(iF.name()),
setAverage_(dict.lookupOrDefault("setAverage", false)),
perturb_(dict.lookupOrDefault("perturb", 1e-5)),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
index c88c0a59ffe..bcd85572539 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
@@ -55,7 +55,7 @@ Foam::totalPressureFvPatchScalarField::totalPressureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
UName_(dict.lookupOrDefault<word>("U", "U")),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
index 7d14db67fae..15df4855926 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -70,7 +70,7 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
UName_(dict.lookupOrDefault<word>("U", "U")),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
index 37b7ada7729..d41a4247017 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
@@ -49,7 +49,7 @@ translatingWallVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchField<vector>(p, iF),
+ fixedValueFvPatchField<vector>(p, iF, dict, false),
U_(Function1<vector>::New("U", dict))
{
// Evaluate the wall velocity
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index 4527eca0098..ec71541bd0f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -51,7 +51,7 @@ Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
const dictionary& dict
)
:
- fixedValueFvPatchField<Type>(p, iF),
+ fixedValueFvPatchField<Type>(p, iF, dict, false),
ranGen_(label(0)),
fluctuationScale_(pTraits<Type>(dict.lookup("fluctuationScale"))),
referenceField_("referenceField", dict, p.size()),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index 6eea5de3bc2..ba14325c6a3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -54,7 +54,7 @@ uniformDensityHydrostaticPressureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
rho_(readScalar(dict.lookup("rho"))),
pRefValue_(readScalar(dict.lookup("pRefValue"))),
pRefPoint_(dict.lookup("pRefPoint"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index ab03ec6b0e1..e79df9bec06 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -60,7 +60,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
const dictionary& dict
)
:
- fixedValueFvPatchField<Type>(p, iF),
+ fixedValueFvPatchField<Type>(p, iF, dict, false),
uniformValue_(Function1<Type>::New("uniformValue", dict))
{
this->evaluate();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index 744ac51b472..0a37e65e809 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -56,7 +56,7 @@ uniformTotalPressureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
UName_(dict.lookupOrDefault<word>("U", "U")),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index f156caf7e84..4b25603ce04 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -82,16 +82,11 @@ waveSurfacePressureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
zetaName_(dict.lookupOrDefault<word>("zeta", "zeta")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
-{
- fvPatchField<scalar>::operator=
- (
- scalarField("value", dict, p.size())
- );
-}
+{}
Foam::waveSurfacePressureFvPatchScalarField::
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index ea2935e73d6..3c8f44baee5 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -114,24 +114,23 @@ Foam::fvPatchField<Type>::fvPatchField
manipulatedMatrix_(false),
patchType_(dict.lookupOrDefault<word>("patchType", word::null))
{
- if (dict.found("value"))
+ if (valueRequired)
{
- Field<Type>::operator=
- (
- Field<Type>("value", dict, p.size())
- );
- }
- else if (!valueRequired)
- {
- Field<Type>::operator=(Zero);
- }
- else
- {
- FatalIOErrorInFunction
- (
- dict
- ) << "Essential entry 'value' missing"
- << exit(FatalIOError);
+ if (dict.found("value"))
+ {
+ Field<Type>::operator=
+ (
+ Field<Type>("value", dict, p.size())
+ );
+ }
+ else
+ {
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "Essential entry 'value' missing"
+ << exit(FatalIOError);
+ }
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 3fc282dab7f..1d689139b94 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -200,7 +200,7 @@ public:
const fvPatch&,
const DimensionedField<Type, volMesh>&,
const dictionary&,
- const bool valueRequired=false
+ const bool valueRequired=true
);
//- Construct by mapping the given fvPatchField onto a new patch
diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
index 0ad8ad0e455..a908defc02f 100644
--- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
+++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
@@ -63,10 +63,8 @@ Foam::cellMotionFvPatchField<Type>::cellMotionFvPatchField
const dictionary& dict
)
:
- fixedValueFvPatchField<Type>(p, iF)
-{
- fvPatchField<Type>::operator=(Field<Type>("value", dict, p.size()));
-}
+ fixedValueFvPatchField<Type>(p, iF, dict)
+{}
template<class Type>
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index ec50acb65f1..4978b2aa471 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -63,7 +63,7 @@ timeVaryingMappedFixedValuePointPatchField
const dictionary& dict
)
:
- fixedValuePointPatchField<Type>(p, iF),
+ fixedValuePointPatchField<Type>(p, iF, dict, false),
fieldTableName_(iF.name()),
setAverage_(dict.lookupOrDefault("setAverage", false)),
perturb_(dict.lookupOrDefault("perturb", 1e-5)),
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 75cba4fb682..453df89828c 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -53,7 +53,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
const dictionary& dict
)
:
- calculatedFvPatchField<Type>(p, iF, dict, false),
+ calculatedFvPatchField<Type>(p, iF, dict),
actualTypeName_(dict.lookup("type")),
dict_(dict)
{
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
index 5734f736f33..6d1e2ee2dd5 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
@@ -71,7 +71,7 @@ filmPyrolysisTemperatureCoupledFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict),
filmRegionName_
(
dict.lookupOrDefault<word>("filmRegion", "surfaceFilmProperties")
@@ -82,9 +82,7 @@ filmPyrolysisTemperatureCoupledFvPatchScalarField
),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
-{
- fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
-}
+{}
Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index 4f30cb3a302..8bf2ea9908f 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -71,7 +71,7 @@ filmPyrolysisVelocityCoupledFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict),
filmRegionName_
(
dict.lookupOrDefault<word>("filmRegion", "surfaceFilmProperties")
@@ -82,9 +82,7 @@ filmPyrolysisVelocityCoupledFvPatchVectorField
),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
-{
- fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
-}
+{}
Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
index 41fec4b2eb0..18a0bc751eb 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -68,13 +68,11 @@ filmHeightInletVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
deltafName_(dict.lookupOrDefault<word>("deltaf", "deltaf"))
-{
- fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
-}
+{}
Foam::filmHeightInletVelocityFvPatchVectorField::
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
index 19ebc51bf06..48fded0fa0c 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
@@ -68,13 +68,11 @@ inclinedFilmNusseltHeightFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict),
GammaMean_(Function1<scalar>::New("GammaMean", dict)),
a_(Function1<scalar>::New("a", dict)),
omega_(Function1<scalar>::New("omega", dict))
-{
- fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
-}
+{}
Foam::inclinedFilmNusseltHeightFvPatchScalarField::
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
index 3611de9e92e..1977e3805fa 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
@@ -68,13 +68,11 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF),
+ fixedValueFvPatchVectorField(p, iF, dict),
GammaMean_(Function1<scalar>::New("GammaMean", dict)),
a_(Function1<scalar>::New("a", dict)),
omega_(Function1<scalar>::New("omega", dict))
-{
- fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
-}
+{}
Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index 866fbe8d2be..591d6d1964c 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -72,7 +72,7 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
radiationCoupledBase(p, dict),
Qro_("Qro", dict, p.size())
{
diff --git a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index e6e6ea2c106..3eb505dfa1e 100644
--- a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -66,7 +66,7 @@ alphaFixedPressureFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF),
+ fixedValueFvPatchScalarField(p, iF, dict, false),
p_("p", dict, p.size())
{
if (dict.found("value"))
--
GitLab
From fdece9b2ce8b0922c989c464247bb77a0f9aeeed Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 25 Sep 2016 16:53:37 +0100
Subject: [PATCH 36/42]
tutorials/incompressible/shallowWaterFoam/squareBump/.gmtcommands4: deleted
Resolves bug-report http://bugs.openfoam.org/view.php?id=2268
---
.../shallowWaterFoam/squareBump/.gmtcommands4 | 8 --------
1 file changed, 8 deletions(-)
delete mode 100644 tutorials/incompressible/shallowWaterFoam/squareBump/.gmtcommands4
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/.gmtcommands4 b/tutorials/incompressible/shallowWaterFoam/squareBump/.gmtcommands4
deleted file mode 100644
index 2fdd6b92b54..00000000000
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/.gmtcommands4
+++ /dev/null
@@ -1,8 +0,0 @@
-# GMT common arguments shelf
--B0/0
--JX18c/18c
--R0/1/0/1
--jX18c/18c
-EOF
-F
-
--
GitLab
From dc59c63351e72d828c2224d4a67493acfb64772d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 25 Sep 2016 16:54:20 +0100
Subject: [PATCH 37/42] processorFvPatchField: Reinstate 'value' as an optional
entry
---
.../processor/processorFvPatchField.C | 36 +++++------
.../processorCyclicFvPatchField.C | 62 +++++++++----------
2 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index acd103c2129..c428d9499d0 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -70,13 +70,12 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
template<class Type>
Foam::processorFvPatchField<Type>::processorFvPatchField
(
- const processorFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- coupledFvPatchField<Type>(ptf, p, iF, mapper),
+ coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
procPatch_(refCast<const processorFvPatch>(p)),
sendBuf_(0),
receiveBuf_(0),
@@ -85,33 +84,31 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
scalarSendBuf_(0),
scalarReceiveBuf_(0)
{
- if (!isA<processorFvPatch>(this->patch()))
+ if (!isA<processorFvPatch>(p))
{
- FatalErrorInFunction
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
- if (debug && !ptf.ready())
- {
- FatalErrorInFunction
- << "On patch " << procPatch_.name() << " outstanding request."
- << abort(FatalError);
- }
}
template<class Type>
Foam::processorFvPatchField<Type>::processorFvPatchField
(
+ const processorFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- coupledFvPatchField<Type>(p, iF, dict),
+ coupledFvPatchField<Type>(ptf, p, iF, mapper),
procPatch_(refCast<const processorFvPatch>(p)),
sendBuf_(0),
receiveBuf_(0),
@@ -120,18 +117,21 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
scalarSendBuf_(0),
scalarReceiveBuf_(0)
{
- if (!isA<processorFvPatch>(p))
+ if (!isA<processorFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << "\n patch type '" << p.type()
+ FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
+ if (debug && !ptf.ready())
+ {
+ FatalErrorInFunction
+ << "On patch " << procPatch_.name() << " outstanding request."
+ << abort(FatalError);
+ }
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index 4da794509c8..a2e322b35f7 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -47,68 +47,68 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const Field<Type>& f
+ const dictionary& dict
)
:
- processorFvPatchField<Type>(p, iF, f),
+ processorFvPatchField<Type>(p, iF, dict),
procPatch_(refCast<const processorCyclicFvPatch>(p))
-{}
+{
+ if (!isType<processorCyclicFvPatch>(p))
+ {
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "\n patch type '" << p.type()
+ << "' not constraint type '" << typeName << "'"
+ << "\n for patch " << p.name()
+ << " of field " << this->internalField().name()
+ << " in file " << this->internalField().objectPath()
+ << exit(FatalIOError);
+ }
+
+ if (Pstream::defaultCommsType == Pstream::scheduled)
+ {
+ WarningInFunction
+ << "Scheduled communication with split cyclics not supported."
+ << endl;
+ }
+}
template<class Type>
Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
(
- const processorCyclicFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const Field<Type>& f
)
:
- processorFvPatchField<Type>(ptf, p, iF, mapper),
+ processorFvPatchField<Type>(p, iF, f),
procPatch_(refCast<const processorCyclicFvPatch>(p))
-{
- if (!isType<processorCyclicFvPatch>(this->patch()))
- {
- FatalErrorInFunction
- << "' not constraint type '" << typeName << "'"
- << "\n for patch " << p.name()
- << " of field " << this->internalField().name()
- << " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
- }
-}
+{}
template<class Type>
Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
(
+ const processorCyclicFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- processorFvPatchField<Type>(p, iF, dict),
+ processorFvPatchField<Type>(ptf, p, iF, mapper),
procPatch_(refCast<const processorCyclicFvPatch>(p))
{
- if (!isType<processorCyclicFvPatch>(p))
+ if (!isType<processorCyclicFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << "\n patch type '" << p.type()
+ FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
-
- if (Pstream::defaultCommsType == Pstream::scheduled)
- {
- WarningInFunction
- << "Scheduled communication with split cyclics not supported."
- << endl;
- }
}
--
GitLab
From 1649b57a40cd5ae0bd9c2a73f8b16f5f293c4385 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 25 Sep 2016 18:38:06 +0100
Subject: [PATCH 38/42] processorFvPatchField: If the value is not supplied set
to the internal field
---
.../constraint/processor/processorFvPatchField.C | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index c428d9499d0..0a7c8e7bea5 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -96,6 +96,12 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
+
+ // If the value is not supplied set to the internal field
+ if (!dict.found("value"))
+ {
+ fvPatchField<Type>::operator=(this->patchInternalField());
+ }
}
--
GitLab
From a2a6fedf9fccd4253f67c3601dbb0093e92a8f5a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 25 Sep 2016 18:38:31 +0100
Subject: [PATCH 39/42] blockMesh::blockDescriptor: Added block indexing
description
---
.../blockMesh/blockDescriptor/blockDescriptor.H | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
index 37bba39bba9..0ff5b1e8652 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
@@ -28,6 +28,21 @@ Description
Takes the description of the block and the list of curved edges and
creates a list of points on edges together with the weighting factors
+ For a given block, the correspondence between the ordering of vertex labels
+ and face labels is shown below. For vertex numbering in the sequence 0 to 7
+ (block, centre): faces 0 (f0) and 1 are left and right, respectively; faces
+ 2 and 3 are bottom and top; and faces 4 and 5 are front the back:
+ \verbatim
+ 4 ---- 5
+ f3 |\ |\ f5
+ | | 7 ---- 6 \
+ | 0 |--- 1 | \
+ | \| \| f4
+ f2 3 ---- 2
+
+ f0 ----- f1
+ \endverbatim
+
SourceFiles
blockDescriptor.C
blockDescriptorEdges.C
--
GitLab
From abb4d6713479913b8f9c34d4d02bfa7315d152a6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 25 Sep 2016 18:43:50 +0100
Subject: [PATCH 40/42] pre-commit-hook: Added checks for multi-level template
parameters and 'NULL' Patch contributed by Bruno Santos Resolves bug-report
http://bugs.openfoam.org/view.php?id=2267
1. Spaced ending of multi-level template parameters are not allowed, such as:
List<List<scalar> >
which instead should be:
List<List<scalar>>
2. The use of the 'NULL' macro should be replaced by 'nullptr'
---
bin/tools/pre-commit-hook | 55 ++++++++++++++++++++++++++++++++++++---
1 file changed, 52 insertions(+), 3 deletions(-)
diff --git a/bin/tools/pre-commit-hook b/bin/tools/pre-commit-hook
index d3bf374e04a..f3a0b57a1a0 100755
--- a/bin/tools/pre-commit-hook
+++ b/bin/tools/pre-commit-hook
@@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -48,11 +48,14 @@
# test the specified files/directories for standards conformance.
#
#------------------------------------------------------------------------------
+
hookName="pre-commit"
+headerSeparator="-----------------------------------"
+
die()
{
echo "$hookName hook failure" 1>&2
- echo '-----------------------------------' 1>&2
+ echo $headerSeparator 1>&2
echo '' 1>&2
echo "$@" 1>&2
echo '' 1>&2
@@ -105,7 +108,7 @@ dieOnBadFiles()
if [ -n "$badFiles" ]
then
echo "$hookName hook failure" 1>&2
- echo '-----------------------------------' 1>&2
+ echo $headerSeparator 1>&2
echo "$@" 1>&2
echo '' 1>&2
echo "File(s):" 1>&2
@@ -267,6 +270,49 @@ checkLineLengthNonDirective()
}
+#
+# check for non-standard code patterns
+#
+checkNonStandardCodePatterns()
+{
+ echo "$hookName: checking for non-standard code ..." 1>&2
+
+ scope=$(gitScope $@)
+
+ badFiles=$(
+ for f in $fileList
+ do
+ # limit to *.[CH] files
+ case "$f" in
+ (*.[CH])
+ # Directly report the incorrect markers
+ git grep -n --color \
+ -e '> >' -e 'NULL' \
+ $scope"$f"
+ ;;
+ esac
+ done
+ )
+
+ dieOnBadFiles "$(cat<<MESSAGE
+Please revise the files reported below for the following non-standard code:
+
+ 1. Spaced ending of multi-level template parameters are not allowed, such as:
+
+ List<List<scalar> >
+
+ which instead should be:
+
+ List<List<scalar>>
+
+ 2. The use of the 'NULL' macro should be replaced by 'nullptr'
+
+$headerSeparator
+MESSAGE
+ )"
+}
+
+
#
# check that OpenFOAM Foundation copyright is current
#
@@ -322,6 +368,9 @@ checkIllegalCode
# ensure code conforms to 80 columns max
checkLineLengthNonDirective
+# check for non-standard code patterns
+checkNonStandardCodePatterns
+
checkCopyright
exit 0
--
GitLab
From 025791559de4684d72865d838cfabc3f6ea55bda Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 25 Sep 2016 20:05:12 +0100
Subject: [PATCH 41/42] blockMesh: Added printing of the block description to
the '-help' output
blockMesh -help
Usage: blockMesh [OPTIONS]
options:
-blockTopology write block edges and centres as .obj files
-case <dir> specify alternate case directory, default is the cwd
-dict <file> specify alternative dictionary for the blockMesh description
-noFunctionObjects
do not execute functionObjects
-region <name> specify alternative mesh region
-srcDoc display source code in browser
-doc display application documentation in browser
-help print the usage
Block description
For a given block, the correspondence between the ordering of
vertex labels and face labels is shown below.
For vertex numbering in the sequence 0 to 7 (block, centre):
faces 0 (f0) and 1 are left and right, respectively;
faces 2 and 3 are bottom and top;
and faces 4 and 5 are front the back:
4 ---- 5
f3 |\ |\ f5
| | 7 ---- 6 \
| 0 |--- 1 | \
| \| \| f4
f2 3 ---- 2
f0 ----- f1
Using: OpenFOAM-dev (see www.OpenFOAM.org)
Build: dev-dc59c63351e7
---
.../mesh/generation/blockMesh/blockMesh.C | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
index 1cfc7fe26e4..2be39caae9a 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
@@ -83,6 +83,27 @@ int main(int argc, char *argv[])
"specify alternative dictionary for the blockMesh description"
);
+ argList::addNote
+ (
+ "Block description\n"
+ "\n"
+ " For a given block, the correspondence between the ordering of\n"
+ " vertex labels and face labels is shown below.\n"
+ " For vertex numbering in the sequence 0 to 7 (block, centre):\n"
+ " faces 0 (f0) and 1 are left and right, respectively;\n"
+ " faces 2 and 3 are bottom and top;\n"
+ " and faces 4 and 5 are front the back:\n"
+ "\n"
+ " 4 ---- 5\n"
+ " f3 |\\ |\\ f5\n"
+ " | | 7 ---- 6 \\\n"
+ " | 0 |--- 1 | \\\n"
+ " | \\| \\| f4\n"
+ " f2 3 ---- 2\n"
+ "\n"
+ " f0 ----- f1\n"
+ );
+
#include "addRegionOption.H"
#include "setRootCase.H"
#include "createTime.H"
--
GitLab
From 5c921caa5560a3d0325ebc5c26c39b8709d6212f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 28 Sep 2016 19:42:07 +0100
Subject: [PATCH 42/42] fvOptions: Corrected docs: 'fieldName' -> 'fields'
Resolves bug-report http://bugs.openfoam.org/view.php?id=2273
---
.../sources/derived/actuationDiskSource/actuationDiskSource.H | 2 +-
src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H | 2 +-
src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H | 2 +-
.../sources/derived/meanVelocityForce/meanVelocityForce.H | 2 +-
.../patchMeanVelocityForce/patchMeanVelocityForce.H | 2 +-
src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
index 0411e6e81ab..66a673ed3e1 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
@@ -49,7 +49,7 @@ Usage
\verbatim
actuationDiskSourceCoeffs
{
- fieldNames (U); // names of fields to apply source
+ fields (U); // names of fields to apply source
diskDir (-1 0 0); // disk direction
Cp 0.1; // power coefficient
Ct 0.5; // thrust coefficient
diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H
index e120834482a..6f6a79584cd 100644
--- a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H
+++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H
@@ -33,7 +33,7 @@ Usage
\verbatim
buoyancyEnergyCoeffs
{
- fieldNames (h); // Name of energy field
+ fields (h); // Name of energy field
}
\endverbatim
diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H
index 691938f2d7b..c6203e0557e 100644
--- a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H
+++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H
@@ -33,7 +33,7 @@ Usage
\verbatim
buoyancyForceCoeffs
{
- fieldNames (U); // Name of velocity field
+ fields (U); // Name of velocity field
}
\endverbatim
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
index c05b8d43e67..fc12440bce4 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
@@ -36,7 +36,7 @@ Usage
meanVelocityForceCoeffs
{
selectionMode all; // Apply force to all cells
- fieldNames (U); // Name of velocity field
+ fields (U); // Name of velocity field
Ubar (10.0 0 0); // Desired mean velocity
relaxation 0.2; // Optional relaxation factor
}
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H
index 8cac6a950d8..7413cd497e1 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H
+++ b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H
@@ -36,7 +36,7 @@ Usage
patchMeanVelocityForceCoeffs
{
selectionMode all; // Apply force to all cells
- fieldNames (U); // Name of velocity field
+ fields (U); // Name of velocity field
patch inlet; // Name of the patch
Ubar (10.0 0 0); // Desired mean velocity
relaxation 0.2; // Optional relaxation factor
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index 1135d5c611f..d928e2f2ca1 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -35,7 +35,7 @@ Usage
\verbatim
rotorDiskSourceCoeffs
{
- fieldNames (U); // names of fields on which to apply source
+ fields (U); // names of fields on which to apply source
nBlades 3; // number of blades
tipEffect 0.96; // normalised radius above which lift = 0
--
GitLab