diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H
index 9f9d9f6dd41457397ce54c3b69901d33b27a21c1..eb40b7665b59fcae08ca41ed2d1a4e905cebd706 100644
--- a/applications/solvers/incompressible/simpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/UEqn.H
@@ -14,4 +14,3 @@
).initialResidual();
maxResidual = max(eqnResidual, maxResidual);
-
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
index 18b915b16bde8f4f8bda4b5a13daf8d99b3b74cb..c0daa0e7ca4aaca234c295dc95f4eb326fad0b37 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
@@ -12,6 +12,7 @@
- fvm::laplacian(muEff, U)
- (fvc::grad(U) & fvc::grad(muEff))
//- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
+ //- fvc::div(rho*turbulence->nuEff()*dev(fvc::grad(U)().T()))
);
if (oCorr == nOuterCorr-1)
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
index 2ab9a8b3ccb8fc39b2188ef86e62b8ade9952fb8..9704392a10ea95e23f5afbe02a9c45bbbc736406 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatchDict
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
@@ -53,18 +53,18 @@ patches
name sidePatches;
// Type of new patch
- dictionary
- {
+ dictionary
+ {
type cyclic;
- // Optional: explicitly set transformation tensor.
+ // Optional: explicitly set transformation tensor.
// Used when matching and synchronising points.
//transform translational;
//separationVector (-2289 0 0);
- transform rotational;
- rotationAxis (1 0 0);
+ transform rotational;
+ rotationAxis (1 0 0);
rotationCentre (0 0 0);
- }
+ }
// How to construct: either from 'patches' or 'set'
constructFrom patches;
@@ -80,10 +80,10 @@ patches
name bottom;
// Type of new patch
- dictionary
- {
+ dictionary
+ {
type wall;
- }
+ }
constructFrom set;
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 859ddf20a277f137d522f75bc779f6bd98f7623d..a5adac74e87d19a1a973835265d719375a47dfb8 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -105,6 +105,8 @@ int main(int argc, char *argv[])
Foam::argList::validOptions.insert("overwrite", "");
+ Foam::argList::validOptions.insert("toleranceDict", "file with tolerances");
+
# include "setRootCase.H"
# include "createTime.H"
runTime.functionObjects().off();
@@ -168,6 +170,22 @@ int main(int argc, char *argv[])
<< "If this is not the case use the -partial option" << nl << endl;
}
+ // set up the tolerances for the sliding mesh
+ dictionary slidingTolerances;
+ if (args.options().found("toleranceDict"))
+ {
+ IOdictionary toleranceFile(
+ IOobject(
+ args.options()["toleranceDict"],
+ runTime.constant(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ )
+ );
+ slidingTolerances += toleranceFile;
+ }
+
// Check for non-empty master and slave patches
checkPatch(mesh.boundaryMesh(), masterPatchName);
checkPatch(mesh.boundaryMesh(), slavePatchName);
@@ -320,6 +338,11 @@ int main(int argc, char *argv[])
true // couple/decouple mode
)
);
+ static_cast<slidingInterface&>(stitcher[0]).setTolerances
+ (
+ slidingTolerances,
+ true
+ );
}
diff --git a/bin/foamLog b/bin/foamLog
index 47968aa1205f34945d97b21432bdbf09806474cc..06b2a2c5dc3960b6ecd70313e2e0dc03b8e1cbb6 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -452,5 +452,6 @@ done
#-----------------------------
myEcho "Generated XY files for:"
getAllQueries $DBFILE $LOG
+myEcho "End"
#------------------------------------------------------------------------------
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 0b9c08b39ef1b6d7e4ce9c2fd12ae29ad9c1b117..265b61cc4bdf461bd691281c3c62bc12deb08dd6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -1305,7 +1305,7 @@ bool Foam::cyclicPolyPatch::order
{
label baffleI = 0;
- forAll(*this, faceI)
+ forAll(pp, faceI)
{
const face& f = pp.localFaces()[faceI];
const labelList& pFaces = pp.pointFaces()[f[0]];
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index 18d1170c0073161c32dd6d9023aa0aef7fbc2d45..f90e9a036b408f4cba4a43403f624a01e70d03af 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -43,7 +43,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-const Foam::scalar Foam::slidingInterface::edgeCoPlanarTol_ = 0.8;
+const Foam::scalar Foam::slidingInterface::edgeCoPlanarTolDefault_ = 0.8;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 80d68749e84ae89a39ec3d900c418fd34457126a..316dd389b6f7843a5edaddc6a8eafac253acfa89 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -27,10 +27,8 @@ License
#include "slidingInterface.H"
#include "polyTopoChanger.H"
#include "polyMesh.H"
-#include "primitiveMesh.H"
#include "polyTopoChange.H"
#include "addToRunTimeSelectionTable.H"
-#include "triPointRef.H"
#include "plane.H"
// Index of debug signs:
@@ -173,6 +171,14 @@ Foam::slidingInterface::slidingInterface
attached_(false),
projectionAlgo_(algo),
trigger_(false),
+ pointMergeTol_(pointMergeTolDefault_),
+ edgeMergeTol_(edgeMergeTolDefault_),
+ nFacesPerSlaveEdge_(nFacesPerSlaveEdgeDefault_),
+ edgeFaceEscapeLimit_(edgeFaceEscapeLimitDefault_),
+ integralAdjTol_(integralAdjTolDefault_),
+ edgeMasterCatchFraction_(edgeMasterCatchFractionDefault_),
+ edgeCoPlanarTol_(edgeCoPlanarTolDefault_),
+ edgeEndCutoffTol_(edgeEndCutoffTolDefault_),
cutFaceMasterPtr_(NULL),
cutFaceSlavePtr_(NULL),
masterFaceCellsPtr_(NULL),
@@ -280,6 +286,9 @@ Foam::slidingInterface::slidingInterface
masterPointEdgeHitsPtr_(NULL),
projectedSlavePointsPtr_(NULL)
{
+ // Optionally default tolerances from dictionary
+ setTolerances(dict);
+
checkDefinition();
// If the interface is attached, the master and slave face zone addressing
@@ -686,6 +695,63 @@ const Foam::pointField& Foam::slidingInterface::pointProjection() const
return *projectedSlavePointsPtr_;
}
+void Foam::slidingInterface::setTolerances(const dictionary&dict, bool report)
+{
+ pointMergeTol_ = dict.lookupOrDefault<scalar>
+ (
+ "pointMergeTol",
+ pointMergeTol_
+ );
+ edgeMergeTol_ = dict.lookupOrDefault<scalar>
+ (
+ "edgeMergeTol",
+ edgeMergeTol_
+ );
+ nFacesPerSlaveEdge_ = dict.lookupOrDefault<scalar>
+ (
+ "nFacesPerSlaveEdge",
+ nFacesPerSlaveEdge_
+ );
+ edgeFaceEscapeLimit_ = dict.lookupOrDefault<scalar>
+ (
+ "edgeFaceEscapeLimit",
+ edgeFaceEscapeLimit_
+ );
+ integralAdjTol_ = dict.lookupOrDefault<scalar>
+ (
+ "integralAdjTol",
+ integralAdjTol_
+ );
+ edgeMasterCatchFraction_ = dict.lookupOrDefault<scalar>
+ (
+ "edgeMasterCatchFraction",
+ edgeMasterCatchFraction_
+ );
+ edgeCoPlanarTol_ = dict.lookupOrDefault<scalar>
+ (
+ "edgeCoPlanarTol",
+ edgeCoPlanarTol_
+ );
+ edgeEndCutoffTol_ = dict.lookupOrDefault<scalar>
+ (
+ "edgeEndCutoffTol",
+ edgeEndCutoffTol_
+ );
+
+ if (report)
+ {
+ Info<< "Sliding interface parameters:" << nl
+ << "pointMergeTol : " << pointMergeTol_ << nl
+ << "edgeMergeTol : " << edgeMergeTol_ << nl
+ << "nFacesPerSlaveEdge : " << nFacesPerSlaveEdge_ << nl
+ << "edgeFaceEscapeLimit : " << edgeFaceEscapeLimit_ << nl
+ << "integralAdjTol : " << integralAdjTol_ << nl
+ << "edgeMasterCatchFraction : " << edgeMasterCatchFraction_ << nl
+ << "edgeCoPlanarTol : " << edgeCoPlanarTol_ << nl
+ << "edgeEndCutoffTol : " << edgeEndCutoffTol_ << endl;
+ }
+}
+
void Foam::slidingInterface::write(Ostream& os) const
{
@@ -703,6 +769,14 @@ void Foam::slidingInterface::write(Ostream& os) const
}
+// To write out all those tolerances
+#define WRITE_NON_DEFAULT(name) \
+ if( name ## _ != name ## Default_ )\
+ { \
+ os << " " #name " " << name ## _ << token::END_STATEMENT << nl; \
+ }
+
+
void Foam::slidingInterface::writeDict(Ostream& os) const
{
os << nl << name() << nl << token::BEGIN_BLOCK << nl
@@ -743,6 +817,15 @@ void Foam::slidingInterface::writeDict(Ostream& os) const
<< token::END_STATEMENT << nl;
}
+ WRITE_NON_DEFAULT(pointMergeTol)
+ WRITE_NON_DEFAULT(edgeMergeTol)
+ WRITE_NON_DEFAULT(nFacesPerSlaveEdge)
+ WRITE_NON_DEFAULT(edgeFaceEscapeLimit)
+ WRITE_NON_DEFAULT(integralAdjTol)
+ WRITE_NON_DEFAULT(edgeMasterCatchFraction)
+ WRITE_NON_DEFAULT(edgeCoPlanarTol)
+ WRITE_NON_DEFAULT(edgeEndCutoffTol)
+
os << token::END_BLOCK << endl;
}
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.H b/src/dynamicMesh/slidingInterface/slidingInterface.H
index 376c969e38edde1d82de0387b79719ab3c294e9a..f86e423c65fd356a790e5a43af05f4cb163d7727 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.H
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.H
@@ -129,6 +129,32 @@ private:
//- Trigger topological change
mutable bool trigger_;
+ // Tolerances. Initialised to static ones below.
+
+ //- Point merge tolerance
+ scalar pointMergeTol_;
+
+ //- Edge merge tolerance
+ scalar edgeMergeTol_;
+
+ //- Estimated number of faces an edge goes through
+ label nFacesPerSlaveEdge_;
+
+ //- Edge-face interaction escape limit
+ label edgeFaceEscapeLimit_;
+
+ //- Integral match point adjustment tolerance
+ scalar integralAdjTol_;
+
+ //- Edge intersection master catch fraction
+ scalar edgeMasterCatchFraction_;
+
+ //- Edge intersection co-planar tolerance
+ scalar edgeCoPlanarTol_;
+
+ //- Edge end cut-off tolerance
+ scalar edgeEndCutoffTol_;
+
// Private addressing data.
@@ -256,28 +282,28 @@ private:
// Static data members
//- Point merge tolerance
- static const scalar pointMergeTol_;
+ static const scalar pointMergeTolDefault_;
//- Edge merge tolerance
- static const scalar edgeMergeTol_;
+ static const scalar edgeMergeTolDefault_;
//- Estimated number of faces an edge goes through
- static const label nFacesPerSlaveEdge_;
+ static const label nFacesPerSlaveEdgeDefault_;
//- Edge-face interaction escape limit
- static const label edgeFaceEscapeLimit_;
+ static const label edgeFaceEscapeLimitDefault_;
//- Integral match point adjustment tolerance
- static const scalar integralAdjTol_;
+ static const scalar integralAdjTolDefault_;
//- Edge intersection master catch fraction
- static const scalar edgeMasterCatchFraction_;
+ static const scalar edgeMasterCatchFractionDefault_;
//- Edge intersection co-planar tolerance
- static const scalar edgeCoPlanarTol_;
+ static const scalar edgeCoPlanarTolDefault_;
//- Edge end cut-off tolerance
- static const scalar edgeEndCutoffTol_;
+ static const scalar edgeEndCutoffTolDefault_;
public:
@@ -350,6 +376,8 @@ public:
//- Return projected points for a slave patch
const pointField& pointProjection() const;
+ //- Set the tolerances from the values in a dictionary
+ void setTolerances(const dictionary&, bool report=false);
//- Write
virtual void write(Ostream&) const;
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index a34fd0f7b9e6a553bc4b58c7886a07940731cc45..cc4643bcdea06f251d541b6dd24df118cd952304 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -26,22 +26,19 @@ License
#include "slidingInterface.H"
#include "polyMesh.H"
-#include "primitiveMesh.H"
#include "line.H"
-#include "triPointRef.H"
-#include "plane.H"
#include "polyTopoChanger.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-const Foam::scalar Foam::slidingInterface::pointMergeTol_ = 0.05;
-const Foam::scalar Foam::slidingInterface::edgeMergeTol_ = 0.01;
-const Foam::label Foam::slidingInterface::nFacesPerSlaveEdge_ = 5;
-const Foam::label Foam::slidingInterface::edgeFaceEscapeLimit_ = 10;
+const Foam::scalar Foam::slidingInterface::pointMergeTolDefault_ = 0.05;
+const Foam::scalar Foam::slidingInterface::edgeMergeTolDefault_ = 0.01;
+const Foam::label Foam::slidingInterface::nFacesPerSlaveEdgeDefault_ = 5;
+const Foam::label Foam::slidingInterface::edgeFaceEscapeLimitDefault_ = 10;
-const Foam::scalar Foam::slidingInterface::integralAdjTol_ = 0.05;
-const Foam::scalar Foam::slidingInterface::edgeMasterCatchFraction_ = 0.4;
-const Foam::scalar Foam::slidingInterface::edgeEndCutoffTol_ = 0.0001;
+const Foam::scalar Foam::slidingInterface::integralAdjTolDefault_ = 0.05;
+const Foam::scalar Foam::slidingInterface::edgeMasterCatchFractionDefault_ = 0.4;
+const Foam::scalar Foam::slidingInterface::edgeEndCutoffTolDefault_ = 0.0001;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 058021f612c4f03552630e23a0d76ec04059c2b8..ec4c323a9130756d93bc35a7ca073b8f656e6f92 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -79,7 +79,6 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
<< " (Actual type " << actualTypeName_ << ")" << nl
<< "\n Please add the 'value' entry to the write function "
"of the user-defined boundary-condition\n"
- " or link the boundary-condition into libfoamUtil.so"
<< exit(FatalIOError);
}
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 1ffc36cab022b8dd2b35c7770bbe71a688022518..6baace3863a752d9d3733a628109463bc09f17e3 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -61,7 +61,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
const incompressible::RASModel& ras
= obr_.lookupObject<incompressible::RASModel>("RASProperties");
- return rhoRef_*ras.devReff();
+ return rho()*ras.devReff();
}
else if (obr_.foundObject<compressible::LESModel>("LESProperties"))
{
@@ -75,7 +75,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
const incompressible::LESModel& les
= obr_.lookupObject<incompressible::LESModel>("LESProperties");
- return rhoRef_*les.devBeff();
+ return rho()*les.devBeff();
}
else if (obr_.foundObject<basicThermo>("thermophysicalProperties"))
{
@@ -97,7 +97,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
const volVectorField& U = obr_.lookupObject<volVectorField>(UName_);
- return -rhoRef_*laminarT.nu()*dev(twoSymm(fvc::grad(U)));
+ return -rho()*laminarT.nu()*dev(twoSymm(fvc::grad(U)));
}
else if (obr_.foundObject<dictionary>("transportProperties"))
{
@@ -108,7 +108,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
const volVectorField& U = obr_.lookupObject<volVectorField>(UName_);
- return -rhoRef_*nu*dev(twoSymm(fvc::grad(U)));
+ return -rho()*nu*dev(twoSymm(fvc::grad(U)));
}
else
{
@@ -121,6 +121,34 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
}
+Foam::tmp<Foam::volScalarField> Foam::forces::rho() const
+{
+ if (rhoName_ == "rhoInf")
+ {
+ const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+ return tmp<volScalarField>
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "rho",
+ mesh.time().timeName(),
+ mesh
+ ),
+ mesh,
+ dimensionedScalar("rho", dimDensity, rhoRef_)
+ )
+ );
+ }
+ else
+ {
+ return(obr_.lookupObject<volScalarField>(rhoName_));
+ }
+}
+
+
Foam::scalar Foam::forces::rho(const volScalarField& p) const
{
if (p.dimensions() == dimPressure)
@@ -129,6 +157,13 @@ Foam::scalar Foam::forces::rho(const volScalarField& p) const
}
else
{
+ if (rhoName_ != "rhoInf")
+ {
+ FatalErrorIn("forces::rho(const volScalarField& p)")
+ << "Dynamic pressure is expected but kinematic is provided."
+ << exit(FatalError);
+ }
+
return rhoRef_;
}
}
@@ -149,11 +184,12 @@ Foam::forces::forces
active_(true),
log_(false),
patchSet_(),
- pName_(""),
- UName_(""),
+ pName_(word::null),
+ UName_(word::null),
+ rhoName_(word::null),
directForceDensity_(false),
fDName_(""),
- rhoRef_(0),
+ rhoRef_(VGREAT),
CofR_(vector::zero),
forcesFilePtr_(NULL)
{
@@ -175,6 +211,12 @@ Foam::forces::forces
}
read(dict);
+
+ if (active_)
+ {
+ // Create the forces file if not already created
+ makeFile();
+ }
}
@@ -222,18 +264,31 @@ void Foam::forces::read(const dictionary& dict)
// Optional entries U and p
pName_ = dict.lookupOrDefault<word>("pName", "p");
UName_ = dict.lookupOrDefault<word>("UName", "U");
+ rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
- // Check whether UName and pName exists, if not deactivate forces
+ // Check whether UName, pName and rhoName exists,
+ // if not deactivate forces
if
(
!obr_.foundObject<volVectorField>(UName_)
|| !obr_.foundObject<volScalarField>(pName_)
+ || (
+ rhoName_ != "rhoInf"
+ && !obr_.foundObject<volScalarField>(rhoName_)
+ )
)
{
active_ = false;
+
WarningIn("void forces::read(const dictionary& dict)")
- << "Could not find " << UName_ << " or "
- << pName_ << " in database." << nl
+ << "Could not find " << UName_ << ", " << pName_;
+
+ if (rhoName_ != "rhoInf")
+ {
+ Info<< " or " << rhoName_;
+ }
+
+ Info<< " in database." << nl
<< " De-activating forces."
<< endl;
}
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index ba88d045b2d0cb63366787263e23d294fd417dee..6fcdccc50ecba7636a20b8896c5297f086a73940 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -132,6 +132,9 @@ protected:
//- Name of velocity field
word UName_;
+ //- Name of density field (optional)
+ word rhoName_;
+
//- Is the force density being supplied directly?
Switch directForceDensity_;
@@ -157,6 +160,9 @@ protected:
//- Return the effective viscous stress (laminar + turbulent).
tmp<volSymmTensorField> devRhoReff() const;
+ //- Return rho if rhoName is specified otherwise rhoRef
+ tmp<volScalarField> rho() const;
+
//- Return rhoRef if the pressure field is dynamic, i.e. p/rho
// otherwise return 1
scalar rho(const volScalarField& p) const;
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
index 36740cbf11005ff1e5658cb29ae2e33417586a3c..2899224d29c6568d59fcde2d8563ae6958abe446 100644
--- a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
@@ -55,8 +55,8 @@ Foam::faceZonesIntegration::faceZonesIntegration
obr_(obr),
active_(true),
log_(false),
- faceZonesSet_(),
- fItems_(),
+ zoneNames_(),
+ fieldNames_(),
filePtr_(NULL)
{
// Check if the available mesh is an fvMesh otherise deactivate
@@ -94,9 +94,9 @@ void Foam::faceZonesIntegration::read(const dictionary& dict)
{
log_ = dict.lookupOrDefault<Switch>("log", false);
- dict.lookup("fields") >> fItems_;
+ dict.lookup("fields") >> fieldNames_;
- dict.lookup("faceZones") >> faceZonesSet_;
+ dict.lookup("faceZones") >> zoneNames_;
}
}
@@ -132,11 +132,11 @@ void Foam::faceZonesIntegration::makeFile()
mkDir(faceZonesIntegrationDir);
// Open new file at start up
- filePtr_.resize(fItems_.size());
+ filePtr_.resize(fieldNames_.size());
- forAll(fItems_, Ifields)
+ forAll(fieldNames_, fieldI)
{
- const word& fieldName = fItems_[Ifields];
+ const word& fieldName = fieldNames_[fieldI];
OFstream* sPtr = new OFstream
(
@@ -163,10 +163,9 @@ void Foam::faceZonesIntegration::writeFileHeader()
os << "#Time " << setw(w);
- forAll (faceZonesSet_, zoneI)
+ forAll (zoneNames_, zoneI)
{
- const word name = faceZonesSet_[zoneI];
- os << name << setw(w);
+ os << zoneNames_[zoneI] << setw(w);
}
os << nl << endl;
@@ -192,9 +191,9 @@ void Foam::faceZonesIntegration::write()
{
makeFile();
- forAll(fItems_, fieldI)
+ forAll(fieldNames_, fieldI)
{
- const word& fieldName = fItems_[fieldI];
+ const word& fieldName = fieldNames_[fieldI];
const surfaceScalarField& sField =
obr_.lookupObject<surfaceScalarField>(fieldName);
@@ -203,17 +202,17 @@ void Foam::faceZonesIntegration::write()
// 1. integrate over all face zones
- scalarField integralVals(faceZonesSet_.size());
+ scalarField integralVals(zoneNames_.size());
- forAll(faceZonesSet_, setI)
+ forAll(integralVals, zoneI)
{
- const word name = faceZonesSet_[setI];
+ const word& name = zoneNames_[zoneI];
label zoneID = mesh.faceZones().findZoneID(name);
const faceZone& fZone = mesh.faceZones()[zoneID];
- integralVals[setI] = returnReduce
+ integralVals[zoneI] = returnReduce
(
calcIntegral(sField, fZone),
sumOp<scalar>()
@@ -231,15 +230,15 @@ void Foam::faceZonesIntegration::write()
os << obr_.time().value();
- forAll(integralVals, setI)
+ forAll(integralVals, zoneI)
{
- os << ' ' << setw(w) << integralVals[setI];
+ os << ' ' << setw(w) << integralVals[zoneI];
if (log_)
{
Info<< "faceZonesIntegration output:" << nl
- << " Integration[" << setI << "] "
- << integralVals[setI] << endl;
+ << " Integration[" << zoneI << "] "
+ << integralVals[zoneI] << endl;
}
}
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
index c2f3ad9d4bf339288bfeea72b6a00767c0f1903e..d1a1bacfd21f2537eb05652bc12b351798c9a7c4 100644
--- a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
@@ -82,11 +82,11 @@ protected:
//- Switch to send output to Info as well as to file
Switch log_;
- //- faceZones to integrate over
- wordList faceZonesSet_;
+ //- List of face zone names to integrate over
+ wordList zoneNames_;
//- Names of the surface fields
- wordList fItems_;
+ wordList fieldNames_;
//- Current open files
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
index 60c90b12881f2214c8bfd0fcbdca11c335a56c3b..28b8c89101acfb9188e6a29a0075e4e2004888d0 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
@@ -70,7 +70,7 @@ class alphatWallFunctionFvPatchScalarField
public:
//- Runtime type information
- TypeName("compressible::alphatWallFunction");
+ TypeName("alphatWallFunction");
// Constructors
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
index dde33b47e9c58ab0cec7ce41bb72c3efdd98aeed..145d82f010edc275814c6e8dc9cc94b059de5ad9 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
@@ -32,13 +32,13 @@ boundaryField
upperWall
{
- type compressible::alphaSgsJayatillekeWallFunction;
+ type alphaSgsJayatillekeWallFunction;
value uniform 0;
}
lowerWall
{
- type compressible::alphaSgsJayatillekeWallFunction;
+ type alphaSgsJayatillekeWallFunction;
value uniform 0;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
index 2f642fa18afa0908265e036bb9f29b3646c9c47b..05bf1b53293ad42e085447b264136dc549337082 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
@@ -32,13 +32,13 @@ boundaryField
upperWall
{
- type compressible::muSgsWallFunction;
+ type muSgsUSpaldingWallFunction;
value uniform 0;
}
lowerWall
{
- type compressible::muSgsWallFunction;
+ type muSgsUSpaldingWallFunction;
value uniform 0;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
index eb4a4e461df4c51d64c38b8a33c61baff06750ca..313dcceba1abd7b93d57320c4c674f1734692506 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
index bc78e8f836e50f95e8cd602284e0776e71efa78b..b536298afbde6d3d058e1e71a21879386d1a9e50 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
@@ -32,13 +32,13 @@ boundaryField
upperWall
{
- type compressible::alphaSgsJayatillekeWallFunction;
+ type alphaSgsJayatillekeWallFunction;
value uniform 0;
}
lowerWall
{
- type compressible::alphaSgsJayatillekeWallFunction;
+ type alphaSgsJayatillekeWallFunction;
value uniform 0;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
index 8f65a482659bb18407e62403a9b885901f74c46d..7a45526d54a995080e2de0fe56b082a297abb641 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
@@ -32,13 +32,13 @@ boundaryField
upperWall
{
- type compressible::muSgsWallFunction;
+ type muSgsUSpaldingWallFunction;
value uniform 0;
}
lowerWall
{
- type compressible::muSgsWallFunction;
+ type muSgsUSpaldingWallFunction;
value uniform 0;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
index 7a35f54079a65c5f68d5617efd16825496a77f0c..19a09dd2c70ea42bdd3a67d5f2b730301dfbb213 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
index 46c50d5beef0f044a1db3844d7e1cb4de392851a..5eceb3da78b840e96547e7a11d91f016d948520a 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
@@ -23,7 +23,7 @@ boundaryField
{
walls
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
}
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/alphat b/tutorials/combustion/engineFoam/kivaTest/-180/alphat
index 3c40b89e228ef532387aced7fc1641b9c333e3eb..7d6c338d7c74f91f5379c5ecd6670cf9d7f893a5 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/alphat
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/alphat
@@ -23,19 +23,19 @@ boundaryField
{
piston
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
liner
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
cylinderHead
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4
new file mode 100644
index 0000000000000000000000000000000000000000..dcdd095f09ce778b4f9b289317d1af77e70849bb
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object CH4;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0.0;
+
+boundaryField
+{
+ fuel
+ {
+ type fixedValue;
+ value uniform 1.0;
+ }
+ air
+ {
+ type fixedValue;
+ value uniform 0.0;
+ }
+ outlet
+ {
+ type inletOutlet;
+ inletValue uniform 0.0;
+ value uniform 0.0;
+
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2
new file mode 100644
index 0000000000000000000000000000000000000000..3a0de95a3cef9fa762991deb700b5d36c2e2e921
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object O2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0.77;
+
+boundaryField
+{
+ fuel
+ {
+ type fixedValue;
+ value uniform 0.0;
+ }
+ air
+ {
+ type fixedValue;
+ value uniform 0.77;
+ }
+ outlet
+ {
+ type inletOutlet;
+ inletValue uniform 0.77;
+ value uniform 0.77;
+
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2
new file mode 100644
index 0000000000000000000000000000000000000000..3a038966c2d56797f6a8e7f9d15a85cd5e1294e4
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object O2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0.23;
+
+boundaryField
+{
+ fuel
+ {
+ type fixedValue;
+ value uniform 0.0;
+ }
+ air
+ {
+ type fixedValue;
+ value uniform 0.23;
+ }
+ outlet
+ {
+ type inletOutlet;
+ inletValue uniform 0.23;
+ value uniform 0.23;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T
new file mode 100644
index 0000000000000000000000000000000000000000..254322f38e0defb9ce1268bf7b66ddc5a57607f1
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 1 0 0 0];
+
+internalField uniform 293;
+
+boundaryField
+{
+ fuel
+ {
+ type fixedValue;
+ value uniform 800;
+ }
+ air
+ {
+ type fixedValue;
+ value uniform 800;
+ }
+ outlet
+ {
+ type inletOutlet;
+ inletValue uniform 293;
+ value uniform 293;
+
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U
new file mode 100644
index 0000000000000000000000000000000000000000..56b91756dcf47af5e4ddbad80d6593281f0dc8e1
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.openfoam.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volVectorField;
+ location "0";
+ object U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -1 0 0 0 0];
+
+internalField uniform (0 0 0);
+
+boundaryField
+{
+ fuel
+ {
+ type fixedValue;
+ value uniform (0.1 0 0);
+ }
+ air
+ {
+ type fixedValue;
+ value uniform (-0.1 0 0);
+ }
+ outlet
+ {
+ type zeroGradient;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault
new file mode 100644
index 0000000000000000000000000000000000000000..da2957b4c847cd35605ba82e6bde984b5ec709f2
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object Ydefault;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0.0;
+
+boundaryField
+{
+ fuel
+ {
+ type fixedValue;
+ value uniform 0.0;
+ }
+ air
+ {
+ type fixedValue;
+ value uniform 0.0;
+ }
+ outlet
+ {
+ type inletOutlet;
+ inletValue uniform 0.0;
+ value uniform 0.0;
+
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat
new file mode 100644
index 0000000000000000000000000000000000000000..cf60ba7894adaf942a63ada5a18a086a510ce222
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0.0;
+
+boundaryField
+{
+ fuel
+ {
+ type fixedValue;
+ value uniform 0.0;
+ }
+ air
+ {
+ type fixedValue;
+ value uniform 0.0;
+ }
+ outlet
+ {
+ type zeroGradient;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon
new file mode 100644
index 0000000000000000000000000000000000000000..52209c27a3d1f591c39186ddab495677b43cad85
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -3 0 0 0 0];
+
+internalField uniform 50;
+
+boundaryField
+{
+ fuel
+ {
+ type fixedValue;
+ value uniform 1.e-5;
+ }
+ air
+ {
+ type fixedValue;
+ value uniform 1.e-5;
+ }
+ outlet
+ {
+ type zeroGradient;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k
new file mode 100644
index 0000000000000000000000000000000000000000..6b2458ec7657ebe4ab7744bad8fc4bb2dbf68646
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -2 0 0 0 0];
+
+internalField uniform 3.75e-5;
+
+boundaryField
+{
+ fuel
+ {
+ type fixedValue;
+ value uniform 3.75e-5;
+ }
+ air
+ {
+ type fixedValue;
+ value uniform 3.75e-5;
+ }
+ outlet
+ {
+ type zeroGradient;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut
new file mode 100644
index 0000000000000000000000000000000000000000..3fd75130c23483a38dd276b9c826a313c74b4d6f
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0.0;
+
+boundaryField
+{
+ fuel
+ {
+ type fixedValue;
+ value uniform 0.0;
+ }
+ air
+ {
+ type fixedValue;
+ value uniform 0.0;
+ }
+ outlet
+ {
+ type zeroGradient;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p
new file mode 100644
index 0000000000000000000000000000000000000000..bb7898548f02ca7f0f5e64876ed070abaaa12ccb
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.openfoam.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions [1 -1 -2 0 0 0 0];
+
+internalField uniform 1e5;
+
+boundaryField
+{
+ fuel
+ {
+ type zeroGradient;
+ }
+ air
+ {
+ type zeroGradient;
+ }
+ inlet2
+ {
+ type zeroGradient;
+ }
+ outlet
+ {
+ type fixedValue;
+ value uniform 1e5;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/RASProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..81b1ec9115226882e6e980b8e5f4e19cabb886d9
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/RASProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
new file mode 100644
index 0000000000000000000000000000000000000000..fd8ff1453a7bac2b7946944d54b3271ea84d9d0e
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object chemistryProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+
+chemistry on;
+
+chemistrySolver ode;
+
+initialChemicalTimeStep 1e-07;
+
+turbulentReaction on;
+
+sequentialCoeffs
+{
+ cTauChem 0.001;
+}
+
+EulerImplicitCoeffs
+{
+ cTauChem 0.05;
+ equilibriumRateLimiter off;
+}
+
+odeCoeffs
+{
+ ODESolver SIBS;
+ eps 0.05;
+ scale 1;
+}
+
+Cmix Cmix [ 0 0 0 0 0 0 0 ] 0.1;
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/g b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/g
new file mode 100644
index 0000000000000000000000000000000000000000..c0436c9ba02f2f95ab2b738fc20ca5d13df60815
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class uniformDimensionedVectorField;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..0befc6212d4836bcb5af916ab297fc45533c9c86
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.openfoam.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+ (0.0 -0.01 -0.01)
+ (0.02 -0.01 -0.01)
+ (0.02 0.01 -0.01)
+ (0.0 0.01 -0.01)
+ (0.0 -0.01 0.01)
+ (0.02 -0.01 0.01)
+ (0.02 0.01 0.01)
+ (0.0 0.01 0.01)
+);
+
+blocks
+(
+ hex (0 1 2 3 4 5 6 7) (100 40 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+ patch fuel
+ (
+ (0 4 7 3)
+ )
+ patch air
+ (
+ (1 2 6 5)
+ )
+ patch outlet
+ (
+ (0 1 5 4)
+ (7 6 2 3)
+ )
+ empty frontAndBack
+ (
+ (4 5 6 7)
+ (0 3 2 1)
+ )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/boundary b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..dca33da1db179fed3fea8c09e8f63f32e3073e36
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/boundary
@@ -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 polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+4
+(
+ fuel
+ {
+ type patch;
+ nFaces 40;
+ startFace 7860;
+ }
+ air
+ {
+ type patch;
+ nFaces 40;
+ startFace 7900;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 200;
+ startFace 7940;
+ }
+ frontAndBack
+ {
+ type empty;
+ nFaces 8000;
+ startFace 8140;
+ }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions
new file mode 100644
index 0000000000000000000000000000000000000000..e9a256e2da3ee016b83812f3ecc8b78d785cf708
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/reactions
@@ -0,0 +1,15 @@
+species
+(
+ O2
+ H2O
+ CH4
+ CO2
+ N2
+);
+
+reactions
+(
+ irreversibleArrheniusReaction
+ CH4 + 2O2 = CO2 + 2H2O
+ (5.2e16 0 14906)
+);
\ No newline at end of file
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
new file mode 100644
index 0000000000000000000000000000000000000000..9b202c3435fcd51bb6fc344090ad7a1abe032ee5
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
@@ -0,0 +1,28 @@
+(
+O2 O2 1 31.9988
+ 200 5000 1000
+ 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
+ 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
+ 1.67212e-06 170.672
+H2O H2O 1 18.0153
+ 200 5000 1000
+ 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
+ 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
+ 1.67212e-06 170.672
+CH4 CH4 1 16.0428
+ 200 6000 1000
+ 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937
+ 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132
+ 1.67212e-06 170.672
+CO2 CO2 1 44.01
+ 200 5000 1000
+ 4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396
+ 2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885
+ 1.67212e-06 170.672
+N2 N2 1 28.0134
+ 200 5000 1000
+ 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
+ 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
+ 1.67212e-06 170.672
+)
+
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..1586cb545cc98a9c3d08bd3d72f63682b28a92b0
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType hPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
+
+inertSpecie N2;
+
+chemistryReader foamChemistryReader;
+
+foamChemistryFile "$FOAM_CASE/constant/reactions";
+
+foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..f1f4b717d03445ebd1fc80a94a12c38ee7b6e395
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..d8eadc979c442324b874a8eba1c2519a47b357ef
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application reactingFoam;
+
+startFrom latestTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 1.0;
+
+deltaT 1e-6;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.1;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep yes;
+
+maxCo 0.4;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..b961fdc7453058f50f2b3b2bd92c3edcd675b365
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
@@ -0,0 +1,71 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default Euler;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+ grad(p) Gauss linear;
+}
+
+divSchemes
+{
+ default none;
+
+ div(phi,U) Gauss limitedLinearV 1;
+ div(phi,Yi_h) Gauss limitedLinear01 1;
+ div(phi,h) Gauss limitedLinear 1;
+ div(phiU,p) Gauss limitedLinear 1;
+ div(phid,p) Gauss limitedLinear 1;
+ div(phi,epsilon) Gauss limitedLinear 1;
+ div(phi,k) Gauss limitedLinear 1;
+ div((muEff*dev2(grad(U).T()))) Gauss linear;
+}
+
+laplacianSchemes
+{
+ default Gauss linear uncorrected;
+ laplacian(muEff,U) Gauss linear uncorrected;
+ laplacian(mut,U) Gauss linear uncorrected;
+ laplacian(DkEff,k) Gauss linear uncorrected;
+ laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
+ laplacian((rho*(1|A(U))),p) Gauss linear uncorrected;
+ laplacian(alphaEff,h) Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+}
+
+snGradSchemes
+{
+ default uncorrected;
+}
+
+fluxRequired
+{
+ default no;
+ p;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
new file mode 100755
index 0000000000000000000000000000000000000000..16e36d13560c3fa99da3c31e2059c6cbba4a3221
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-6;
+ relTol 0.0;
+ }
+
+ "(U|Yi|h|k|epsilon)"
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
index caf0ef5da95ca06838f701539ddcc2193327a5c4..28bd4effe69494312157b99bf8fef36d57d83e52 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
@@ -23,22 +23,22 @@ boundaryField
{
front
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
back
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
wall
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
porosityWall
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
inlet
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
index e168ce375e806ba573743875f418bfa281d6fc04..9c62cf78f329d9f167f99a36afa754e1462f6988 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
@@ -23,13 +23,13 @@ boundaryField
{
movingWall
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
index caf0ef5da95ca06838f701539ddcc2193327a5c4..28bd4effe69494312157b99bf8fef36d57d83e52 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
@@ -23,22 +23,22 @@ boundaryField
{
front
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
back
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
wall
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
porosityWall
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
inlet
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat
new file mode 100644
index 0000000000000000000000000000000000000000..6b66930cdabd88392fc289800fd921baea3a43a4
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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;
+ location "0";
+ object alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ INLE1
+ {
+ type calculated;
+ value uniform 0;
+ }
+ OUTL2
+ {
+ type calculated;
+ value uniform 0;
+ }
+ SYMP3
+ {
+ type empty;
+ }
+ WALL10
+ {
+ type alphatWallFunction;
+ Prt 0.85;
+ value uniform 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
index 8f09366b8f9f94e8168d2d8ce886377f9b4c875d..9a65ce7eec4d534d8c7aeaa332a09e8d44296fd9 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object epsilon;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,29 +21,31 @@ internalField uniform 25000;
boundaryField
{
- INLE1
+ INLE1
{
type inletOutlet;
inletValue uniform 25000;
value uniform 25000;
}
-
- OUTL2
+ OUTL2
{
type inletOutlet;
inletValue uniform 25000;
value uniform 25000;
}
-
- SYMP3
+ SYMP3
{
type empty;
}
-
- WALL10
+ WALL10
{
- type zeroGradient;
+ type compressible::epsilonWallFunction;
+ Cmu 0.09;
+ kappa 0.41;
+ E 9.8;
+ value uniform 25000;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
index 93c09e90447e0f600a15fde28924d0183916da19..552f881f4ef995e2b2977d76399dda8ab193db6b 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,29 +21,28 @@ internalField uniform 1000;
boundaryField
{
- INLE1
+ INLE1
{
type inletOutlet;
inletValue uniform 1000;
value uniform 1000;
}
-
- OUTL2
+ OUTL2
{
type inletOutlet;
inletValue uniform 1000;
value uniform 1000;
}
-
- SYMP3
+ SYMP3
{
type empty;
}
-
- WALL10
+ WALL10
{
- type zeroGradient;
+ type compressible::kqRWallFunction;
+ value uniform 1000;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut
new file mode 100644
index 0000000000000000000000000000000000000000..d10d5087061f29d22ed330a53a6868c8a3d0e62a
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+ location "0";
+ object mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ INLE1
+ {
+ type calculated;
+ value uniform 0;
+ }
+ OUTL2
+ {
+ type calculated;
+ value uniform 0;
+ }
+ SYMP3
+ {
+ type empty;
+ }
+ WALL10
+ {
+ type mutkWallFunction;
+ Cmu 0.09;
+ kappa 0.41;
+ E 9.8;
+ value uniform 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
index b15d0272a64ee98450fcc2d73fd58790a821700f..59a99aa3f008e969e793042560e7658577622325 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/alphat b/tutorials/compressible/sonicFoam/ras/prism/0/alphat
index c361d50f310dfaa3ae46d87ff9e8dfaceadb7fc7..cdb024c97e575374b671eb0791831276e49a3a12 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/alphat
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/alphat
@@ -43,7 +43,7 @@ boundaryField
}
prismWall
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
defaultFaces
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat
index 88f7153e5cc01a799ecbdb13c189f321557efee5..fcaa8d0c1dd5f6bcf88248540939fa15760f20d3 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat
@@ -23,17 +23,17 @@ boundaryField
{
floor
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
ceiling
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
fixedWalls
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
}
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
index 5addae2ddf1b5d228badc933f2fb84cd66b08ce5..4b700cf1b74aa1696f2dcf14022b46255bd595ec 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
@@ -23,25 +23,25 @@ boundaryField
{
frontAndBack
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
topAndBottom
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
hot
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
cold
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
index 2557d817890f66e6ca3f93e83aa76c8ce34d7ca6..1625699677371f38abc0461c3debb32873c713dd 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
@@ -23,19 +23,19 @@ boundaryField
{
floor
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
index 00d1a6abb3d09d629fa0b8c235616df68bfc85f6..a7132ce19d363926cd8788070eec90cfe5f0e367 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
@@ -23,22 +23,22 @@ boundaryField
{
box
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
floor
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
ceiling
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
fixedWalls
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
}
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat
index 51389bfd04d7b311701dd1dfd207abfda3dfd2e5..970624b7b938f8158674520effb5c19a5f046872 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat
@@ -23,25 +23,25 @@ boundaryField
{
box
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
floor
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nu.xy b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nu.xy
new file mode 100644
index 0000000000000000000000000000000000000000..39d86bc30fe35c3d87688848b9b0814193426c42
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nu.xy
@@ -0,0 +1,80 @@
+ 0.000625 0.001
+ 0.001875 0.001
+ 0.003125 0.001
+ 0.004375 0.001
+ 0.005625 0.001
+ 0.006875 0.001
+ 0.008125 0.001
+ 0.009375 0.001
+ 0.010625 0.001
+ 0.011875 0.001
+ 0.013125 0.001
+ 0.014375 0.001
+ 0.015625 0.001
+ 0.016875 0.001
+ 0.018125 0.001
+ 0.019375 0.001
+ 0.020625 0.001
+ 0.021875 0.001
+ 0.023125 0.001
+ 0.024375 0.001
+ 0.025625 0.001
+ 0.026875 0.001
+ 0.028125 0.001
+ 0.029375 0.001
+ 0.030625 0.001
+ 0.031875 0.001
+ 0.033125 0.001
+ 0.034375 0.001
+ 0.035625 0.001
+ 0.036875 0.001
+ 0.038125 0.001
+ 0.039375 0.001
+ 0.040625 0.001
+ 0.041875 0.001
+ 0.043125 0.001
+ 0.044375 0.001
+ 0.045625 0.001
+ 0.046875 0.001
+ 0.048125 0.001
+ 0.049375 0.001
+ 0.050625 0.001
+ 0.051875 0.001
+ 0.053125 0.001
+ 0.054375 0.001
+ 0.055625 0.001
+ 0.056875 0.001
+ 0.058125 0.001
+ 0.059375 0.001
+ 0.060625 0.001
+ 0.061875 0.001
+ 0.063125 0.001
+ 0.064375 0.001
+ 0.065625 0.001
+ 0.066875 0.001
+ 0.068125 0.001
+ 0.069375 0.001
+ 0.070625 0.001
+ 0.071875 0.001
+ 0.073125 0.001
+ 0.074375 0.001
+ 0.075625 0.001
+ 0.076875 0.001
+ 0.078125 0.001
+ 0.079375 0.001
+ 0.080625 0.001
+ 0.081875 0.001
+ 0.083125 0.001
+ 0.084375 0.001
+ 0.085625 0.001
+ 0.086875 0.001
+ 0.088125 0.001
+ 0.089375 0.001
+ 0.090625 0.001
+ 0.091875 0.001
+ 0.093125 0.001
+ 0.094375 0.001
+ 0.095625 0.001
+ 0.096875 0.001
+ 0.098125 0.001
+ 0.099375 0.001
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
index f4e64506c6ccd3dc0bf4f255d1e9eda3b57c496d..acf7b7754fb0eae6dafc4eee2c22b604642ef76f 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
@@ -19,7 +19,7 @@ Ubar Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 );
transportModel Newtonian;
-nu nu [ 0 2 -1 0 0 0 0 ] 1e-8;
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-3;
// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
deleted file mode 100644
index eeb06bac7a94a79a6638eec440d95364c0652dd1..0000000000000000000000000000000000000000
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
+++ /dev/null
@@ -1,174 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-turbulenceModel SpalartAllmaras;
-
-turbulence on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.0845;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.42;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.68;
- alphak alphaK [ 0 0 0 0 0 0 0 ] 1.39;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 1.39;
- eta0 eta0 [ 0 0 0 0 0 0 0 ] 4.38;
- beta beta [ 0 0 0 0 0 0 0 ] 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphak alphak [ 0 0 0 0 0 0 0 ] 1;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76932;
- A1 A1 [ 0 0 0 0 0 0 0 ] 1.25;
- A2 A2 [ 0 0 0 0 0 0 0 ] 1000;
- Ctau1 Ctau1 [ 0 0 0 0 0 0 0 ] -4;
- Ctau2 Ctau2 [ 0 0 0 0 0 0 0 ] 13;
- Ctau3 Ctau3 [ 0 0 0 0 0 0 0 ] -2;
- alphaKsi alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphak alphak [ 0 0 0 0 0 0 0 ] 1;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
- A1 A1 [ 0 0 0 0 0 0 0 ] 1.25;
- A2 A2 [ 0 0 0 0 0 0 0 ] 1000;
- Ctau1 Ctau1 [ 0 0 0 0 0 0 0 ] -4;
- Ctau2 Ctau2 [ 0 0 0 0 0 0 0 ] 13;
- Ctau3 Ctau3 [ 0 0 0 0 0 0 0 ] -2;
- alphaKsi alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphaZeta alphaZeta [ 0 0 0 0 0 0 0 ] 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphak alphak [ 0 0 0 0 0 0 0 ] 1;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
- A1 A1 [ 0 0 0 0 0 0 0 ] 1.25;
- A2 A2 [ 0 0 0 0 0 0 0 ] 1000;
- Ctau1 Ctau1 [ 0 0 0 0 0 0 0 ] -4;
- Ctau2 Ctau2 [ 0 0 0 0 0 0 0 ] 13;
- Ctau3 Ctau3 [ 0 0 0 0 0 0 0 ] -2;
- alphaKsi alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
- Am Am [ 0 0 0 0 0 0 0 ] 0.016;
- Aepsilon Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
- Amu Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphak alphak [ 0 0 0 0 0 0 0 ] 1;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
- Am Am [ 0 0 0 0 0 0 0 ] 0.016;
- Aepsilon Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
- Amu Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- Clrr1 Clrr1 [ 0 0 0 0 0 0 0 ] 1.8;
- Clrr2 Clrr2 [ 0 0 0 0 0 0 0 ] 0.6;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- Cs Cs [ 0 0 0 0 0 0 0 ] 0.25;
- Ceps Ceps [ 0 0 0 0 0 0 0 ] 0.15;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- Clg1 Clg1 [ 0 0 0 0 0 0 0 ] 1.8;
- Clg2 Clg2 [ 0 0 0 0 0 0 0 ] 0.6;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- C1Ref C1Ref [ 0 0 0 0 0 0 0 ] 0.5;
- C2Ref C2Ref [ 0 0 0 0 0 0 0 ] 0.3;
- Cs Cs [ 0 0 0 0 0 0 0 ] 0.25;
- Ceps Ceps [ 0 0 0 0 0 0 0 ] 0.15;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
- alphaR alphaR [ 0 0 0 0 0 0 0 ] 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut alphaNut [ 0 0 0 0 0 0 0 ] 1.5;
- Cb1 Cb1 [ 0 0 0 0 0 0 0 ] 0.1355;
- Cb2 Cb2 [ 0 0 0 0 0 0 0 ] 0.622;
- Cw2 Cw2 [ 0 0 0 0 0 0 0 ] 0.3;
- Cw3 Cw3 [ 0 0 0 0 0 0 0 ] 2;
- Cv1 Cv1 [ 0 0 0 0 0 0 0 ] 7.1;
- Cv2 Cv2 [ 0 0 0 0 0 0 0 ] 5;
-}
-
-wallFunctionCoeffs
-{
- kappa kappa [ 0 0 0 0 0 0 0 ] 0.4187;
- E E [ 0 0 0 0 0 0 0 ] 9;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
deleted file mode 100644
index eeb06bac7a94a79a6638eec440d95364c0652dd1..0000000000000000000000000000000000000000
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
+++ /dev/null
@@ -1,174 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-turbulenceModel SpalartAllmaras;
-
-turbulence on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.0845;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.42;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.68;
- alphak alphaK [ 0 0 0 0 0 0 0 ] 1.39;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 1.39;
- eta0 eta0 [ 0 0 0 0 0 0 0 ] 4.38;
- beta beta [ 0 0 0 0 0 0 0 ] 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphak alphak [ 0 0 0 0 0 0 0 ] 1;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76932;
- A1 A1 [ 0 0 0 0 0 0 0 ] 1.25;
- A2 A2 [ 0 0 0 0 0 0 0 ] 1000;
- Ctau1 Ctau1 [ 0 0 0 0 0 0 0 ] -4;
- Ctau2 Ctau2 [ 0 0 0 0 0 0 0 ] 13;
- Ctau3 Ctau3 [ 0 0 0 0 0 0 0 ] -2;
- alphaKsi alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphak alphak [ 0 0 0 0 0 0 0 ] 1;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
- A1 A1 [ 0 0 0 0 0 0 0 ] 1.25;
- A2 A2 [ 0 0 0 0 0 0 0 ] 1000;
- Ctau1 Ctau1 [ 0 0 0 0 0 0 0 ] -4;
- Ctau2 Ctau2 [ 0 0 0 0 0 0 0 ] 13;
- Ctau3 Ctau3 [ 0 0 0 0 0 0 0 ] -2;
- alphaKsi alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphaZeta alphaZeta [ 0 0 0 0 0 0 0 ] 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphak alphak [ 0 0 0 0 0 0 0 ] 1;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
- A1 A1 [ 0 0 0 0 0 0 0 ] 1.25;
- A2 A2 [ 0 0 0 0 0 0 0 ] 1000;
- Ctau1 Ctau1 [ 0 0 0 0 0 0 0 ] -4;
- Ctau2 Ctau2 [ 0 0 0 0 0 0 0 ] 13;
- Ctau3 Ctau3 [ 0 0 0 0 0 0 0 ] -2;
- alphaKsi alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
- Am Am [ 0 0 0 0 0 0 0 ] 0.016;
- Aepsilon Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
- Amu Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- alphak alphak [ 0 0 0 0 0 0 0 ] 1;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
- Am Am [ 0 0 0 0 0 0 0 ] 0.016;
- Aepsilon Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
- Amu Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- Clrr1 Clrr1 [ 0 0 0 0 0 0 0 ] 1.8;
- Clrr2 Clrr2 [ 0 0 0 0 0 0 0 ] 0.6;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- Cs Cs [ 0 0 0 0 0 0 0 ] 0.25;
- Ceps Ceps [ 0 0 0 0 0 0 0 ] 0.15;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
- Clg1 Clg1 [ 0 0 0 0 0 0 0 ] 1.8;
- Clg2 Clg2 [ 0 0 0 0 0 0 0 ] 0.6;
- C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
- C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
- C1Ref C1Ref [ 0 0 0 0 0 0 0 ] 0.5;
- C2Ref C2Ref [ 0 0 0 0 0 0 0 ] 0.3;
- Cs Cs [ 0 0 0 0 0 0 0 ] 0.25;
- Ceps Ceps [ 0 0 0 0 0 0 0 ] 0.15;
- alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
- alphaR alphaR [ 0 0 0 0 0 0 0 ] 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut alphaNut [ 0 0 0 0 0 0 0 ] 1.5;
- Cb1 Cb1 [ 0 0 0 0 0 0 0 ] 0.1355;
- Cb2 Cb2 [ 0 0 0 0 0 0 0 ] 0.622;
- Cw2 Cw2 [ 0 0 0 0 0 0 0 ] 0.3;
- Cw3 Cw3 [ 0 0 0 0 0 0 0 ] 2;
- Cv1 Cv1 [ 0 0 0 0 0 0 0 ] 7.1;
- Cv2 Cv2 [ 0 0 0 0 0 0 0 ] 5;
-}
-
-wallFunctionCoeffs
-{
- kappa kappa [ 0 0 0 0 0 0 0 ] 0.4187;
- E E [ 0 0 0 0 0 0 0 ] 9;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
index 6321b9c3360b77c4f84be957ecb29437e447163d..b29e4e70c062fddee7411681028cc511d5151720 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
@@ -23,17 +23,17 @@ boundaryField
{
top
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
bottom
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
walls
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
symmetry
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
index 458a72388d01eb02944dfb36bbd4c3091f8e8531..c87862d4ae4f758cac81ec3587a619730cfee3f1 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
@@ -23,7 +23,7 @@ boundaryField
{
walls
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
inlet
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
index 458a72388d01eb02944dfb36bbd4c3091f8e8531..c87862d4ae4f758cac81ec3587a619730cfee3f1 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
@@ -23,7 +23,7 @@ boundaryField
{
walls
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
inlet
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
index 6321b9c3360b77c4f84be957ecb29437e447163d..b29e4e70c062fddee7411681028cc511d5151720 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
@@ -23,17 +23,17 @@ boundaryField
{
top
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
bottom
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
walls
{
- type compressible::alphatWallFunction;
+ type alphatWallFunction;
value uniform 0;
}
symmetry
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..411704d7836a4f61312e668b2f93d4ae057a8e22
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication $application