diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index c23d85bfe8583c466793b02b7c8a3995a49de2b9..85bba58da3fb9cb468140847eb7157cfd65235a8 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H
index 26467976f5ea855bd82f24b057582cc073486f7c..49f280e428cde8cd74a1fcf64ddfaca2c25b8979 100644
--- a/applications/solvers/lagrangian/DPMFoam/createFields.H
+++ b/applications/solvers/lagrangian/DPMFoam/createFields.H
@@ -11,7 +11,7 @@ word continuousPhaseName
mesh,
IOobject::MUST_READ
)
- ).lookup("continuousPhaseName")
+ ).lookup("continuousPhase")
);
Info<< "Reading field U\n" << endl;
@@ -123,7 +123,7 @@ volScalarField alphac
);
word kinematicCloudName("kinematicCloud");
-args.optionReadIfPresent("cloudName", kinematicCloudName);
+args.optionReadIfPresent("cloud", kinematicCloudName);
Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
basicKinematicTypeCloud kinematicCloud
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index 77287eed8762add0ddab922cc4a1f68124078298..76c70fffd956a200f85eae6478cfce2aba769cf0 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -58,7 +58,7 @@ volScalarField mu
);
word kinematicCloudName("kinematicCloud");
-args.optionReadIfPresent("cloudName", kinematicCloudName);
+args.optionReadIfPresent("cloud", kinematicCloudName);
Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
basicKinematicCollidingCloud kinematicCloud
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
index d672386e50f80522a9dccd099d2c1699b17274fb..be0905796ba3c19f8b98aefd7ddcc8802cfb7cc1 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
index c21100b0be8a548695a23e40b65a8a35a2ae2cce..6b64ce99f3ec5c85dec29edff53244b5a5615d54 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
index 9f728049f9b6885398601cfd83e36ba49fc95b58..9aa648ce5f922b0fc3f4a210bb8c1a0d34cbab7f 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
@@ -51,7 +51,7 @@ autoPtr<compressible::turbulenceModel> turbulence
const word kinematicCloudName
(
- args.optionLookupOrDefault<word>("cloudName", "kinematicCloud")
+ args.optionLookupOrDefault<word>("cloud", "kinematicCloud")
);
Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index d3a1f829fdfb4726ef559d8e2760753d4690d2f1..006c98b7a8894a65879af2fc732cfe7c31075b63 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H
index be5356e68c356f32235babe5c2289a45a64fb611..20bb4fa240854cd8d9cf071b8ef18fc9ac1f4975 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqn.H
@@ -126,35 +126,35 @@
{
surfaceScalarField phir(phic*mixture.nHatf());
- tmp<surfaceScalarField> talphaPhiUn
- (
- fvc::flux
- (
- phi,
- alpha1,
- alphaScheme
- )
- + fvc::flux
+ alphaPhiUn =
(
- -fvc::flux(-phir, alpha2, alpharScheme),
- alpha1,
- alpharScheme
- )
- );
+ fvc::flux
+ (
+ phi,
+ alpha1,
+ alphaScheme
+ )
+ + fvc::flux
+ (
+ -fvc::flux(-phir, alpha2, alpharScheme),
+ alpha1,
+ alpharScheme
+ )
+ );
// Calculate the Crank-Nicolson off-centred alpha flux
if (ocCoeff > 0)
{
- talphaPhiUn =
- cnCoeff*talphaPhiUn + (1.0 - cnCoeff)*alphaPhi.oldTime();
+ alphaPhiUn =
+ cnCoeff*alphaPhiUn + (1.0 - cnCoeff)*alphaPhi.oldTime();
}
if (MULESCorr)
{
- tmp<surfaceScalarField> talphaPhiCorr(talphaPhiUn() - alphaPhi);
+ tmp<surfaceScalarField> talphaPhiCorr(alphaPhiUn - alphaPhi);
volScalarField alpha10("alpha10", alpha1);
- MULES::correct(alpha1, talphaPhiUn(), talphaPhiCorr.ref(), 1, 0);
+ MULES::correct(alpha1, alphaPhiUn, talphaPhiCorr.ref(), 1, 0);
// Under-relax the correction for all but the 1st corrector
if (aCorr == 0)
@@ -169,7 +169,7 @@
}
else
{
- alphaPhi = talphaPhiUn;
+ alphaPhi = alphaPhiUn;
MULES::explicitSolve(alpha1, phiCN, alphaPhi, 1, 0);
}
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index 4a82afbd294aa3a314ab5708e837f182f86c929d..f820cf874fadae78fbad2ff0ce4f5435acd993a7 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -135,6 +135,21 @@ surfaceScalarField alphaPhi
phi*fvc::interpolate(alpha1)
);
+// MULES compressed flux is registered in case scalarTransport FO needs it.
+surfaceScalarField alphaPhiUn
+(
+ IOobject
+ (
+ "alphaPhiUn",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh,
+ dimensionedScalar("zero", phi.dimensions(), 0.0)
+);
+
// MULES Correction
tmp<surfaceScalarField> talphaPhiCorr0;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
index 2f7abc70151a85dc9a972983b0dcf34e002030f3..63c85938cfdd90dafbc7e0eb13c01229d9e6542f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
@@ -49,7 +49,7 @@ Foam::copiedFixedValueFvPatchScalarField::copiedFixedValueFvPatchScalarField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
- sourceFieldName_(dict.lookup("sourceFieldName"))
+ sourceFieldName_(dict.lookup("sourceField"))
{}
@@ -109,7 +109,7 @@ void Foam::copiedFixedValueFvPatchScalarField::updateCoeffs()
void Foam::copiedFixedValueFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("sourceFieldName")
+ os.writeKeyword("sourceField")
<< sourceFieldName_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
index b2af2f1c4a8003f59546485d7d33e4d65104d3b4..f0f224d3535c71ede737227893f4f107bc19957e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
@@ -62,6 +62,7 @@ protected:
word sourceFieldName_;
+
public:
//- Runtime type information
diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index d0545b7bb81816b67058da97b6b6d990bec6aa37..f0d9c7cc3b23a18d8a001b249dcc16289057ffa0 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
- const Switch inflate(args.args()[1]);
+ const Switch inflate(args[1]);
if (inflate)
{
diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index f5a4b7c66de2f643a5c551dee4dc3c01afb78b04..5f725832d4b424e3221e3d6b06bb1aae08b65190 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
const pointConstraints& pc = pointConstraints::New(pointMesh::New(mesh));
- const Switch inflate(args.args()[1]);
+ const Switch inflate(args[1]);
if (inflate)
{
diff --git a/applications/test/passiveParticle/Test-passiveParticle.C b/applications/test/passiveParticle/Test-passiveParticle.C
index 68bea7b8efa18ec762d7e1e9a214ba105fa70f5e..96fcc35282763998eb81537b3cfd167eb8f2882b 100644
--- a/applications/test/passiveParticle/Test-passiveParticle.C
+++ b/applications/test/passiveParticle/Test-passiveParticle.C
@@ -36,7 +36,7 @@ Description
int main(int argc, char *argv[])
{
- argList::validArgs.append("cloudName");
+ argList::validArgs.append("cloud");
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 25c536e10324d176ee0025f40c0d40ae9d57447f..7385fd502936689b5ad5f9cdcffcb311161c50a3 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -602,8 +602,8 @@ int main(int argc, char *argv[])
const word& key = iter().keyword();
const dictionary& dict = iter().dict();
- const word cyclicName = dict.lookup("cyclicMasterPatchName");
- const word wallName = dict.lookup("wallPatchName");
+ const word cyclicName = dict.lookup("cyclicMasterPatch");
+ const word wallName = dict.lookup("wallPatch");
FixedList<word, 3> nameAndType;
nameAndType[0] = key;
nameAndType[1] = wallName;
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index fcdd7ec8f1033e451fdf33ac2fde9fd4fdef5853..6a07259605e98ecc6c1452a9faae245d17562e77 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
#include "createNamedMesh.H"
const word oldInstance = mesh.pointsInstance();
- word cellSetName(args.args()[1]);
+ word cellSetName(args[1]);
const bool overwrite = args.optionFound("overwrite");
const bool minSet = args.optionFound("minSet");
diff --git a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
index 2b1956e51ffde2faaf55aacd1dd8ee5fdafd2199..ec4b6e994f0c12520b4780bce4f200eae547b7e9 100644
--- a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
+++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
- std::ifstream plot3dFile(args.args()[1].c_str());
+ std::ifstream plot3dFile(args[1].c_str());
string line;
std::getline(plot3dFile, line);
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 3d1875d717287e4548d488dc03cc6c5210689204..ca276a034885ff842d159f14545bf0cef5cd4e77 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -811,7 +811,7 @@ int main(int argc, char *argv[])
args.optionReadIfPresent("ignoreCellGroups", ignoreCellGroups);
args.optionReadIfPresent("ignoreFaceGroups", ignoreFaceGroups);
- cubitFile = args.options().found("cubit");
+ cubitFile = args.optionFound("cubit");
if (cubitFile)
{
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
index cdea2a93ba1ccd0438824574372d06fdae1c921e..4441f15e4934c61cf8135312682ea1e59c98c292 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
@@ -128,16 +128,12 @@ int main(int argc, char *argv[])
fileName dictPath;
// Check if the dictionary is specified on the command-line
- if (args.optionFound("dict"))
+ if (args.optionReadIfPresent("dict", dictPath))
{
- dictPath = args["dict"];
-
- dictPath =
- (
- isDir(dictPath)
- ? dictPath/dictName
- : dictPath
- );
+ if (isDir(dictPath))
+ {
+ dictPath = dictPath / dictName;
+ }
}
// Check if dictionary is present in the constant directory
else if
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
index 3588a9878f634f72758a6f2a98a4fe1565517a86..88c9c82e01da03283d0bc30fbe25983f61999c71 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -67,14 +67,7 @@ int main(int argc, char *argv[])
// Allow override of decomposeParDict location
fileName decompDictFile;
- if (args.optionReadIfPresent("decomposeParDict", decompDictFile))
- {
- if (isDir(decompDictFile))
- {
- decompDictFile = decompDictFile / "decomposeParDict";
- }
- }
-
+ args.optionReadIfPresent("decomposeParDict", decompDictFile);
IOdictionary foamyHexMeshDict
(
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index 5e009ea114a1aec38da3d7737daddc555f376d96..410182e01c2a68cda0484476d507ed1731a60bfb 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -524,13 +524,7 @@ int main(int argc, char *argv[])
// Allow override of decomposeParDict location
fileName decompDictFile;
- if (args.optionReadIfPresent("decomposeParDict", decompDictFile))
- {
- if (isDir(decompDictFile))
- {
- decompDictFile = decompDictFile / "decomposeParDict";
- }
- }
+ args.optionReadIfPresent("decomposeParDict", decompDictFile);
labelList decomp = decompositionModel::New
(
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
index ca9d18953da736834cabf134039db516ada1b6e4..b759c7d8708520b0304ccb7ad18b863953447465 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
@@ -374,7 +374,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
runTime.functionObjects().off();
- const fileName exportName = args.args()[1];
+ const fileName exportName = args[1];
Info<< "Reading surfaces as specified in the foamyHexMeshDict and"
<< " writing a re-sampled surface to " << exportName
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
index d26bd0eaa675a973fb2bc5ea24ba826df4725a91..2c9d68c77f0fb5747c88aa2eac0e8c70eb3c7072 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
@@ -36,6 +36,7 @@ Description
#include "searchableSurfaces.H"
#include "conformationSurfaces.H"
#include "triSurfaceMesh.H"
+#include "labelVector.H"
#include "MarchingCubes.h"
@@ -52,7 +53,6 @@ int main(int argc, char *argv[])
(
"Re-sample surfaces used in foamyHexMesh operation"
);
- //argList::validArgs.append("inputFile");
argList::validArgs.append("(nx ny nz)");
argList::validArgs.append("outputName");
@@ -60,8 +60,8 @@ int main(int argc, char *argv[])
#include "createTime.H"
runTime.functionObjects().off();
- const Vector<label> n(IStringStream(args.args()[1])());
- const fileName exportName = args.args()[2];
+ const labelVector n(args.argRead<labelVector>(1));
+ const fileName exportName = args[2];
Info<< "Reading surfaces as specified in the foamyHexMeshDict and"
<< " writing re-sampled " << n << " to " << exportName
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
index 56dc462835b8a00806bb9a9f7a53465d817c26e9..62d87d667e87cd48513c61b2a59c542543b46c25 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
@@ -93,10 +93,9 @@ int main(int argc, char *argv[])
// ~~~~~~~~~~~~~~~~~~~~~~
CV2D mesh(runTime, controlDict);
- if (args.options().found("pointsFile"))
+ if (args.optionFound("pointsFile"))
{
- fileName pointFileName(IStringStream(args.options()["pointsFile"])());
- mesh.insertPoints(pointFileName);
+ mesh.insertPoints(args["pointsFile"]);
}
else
{
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 1f4414fcbdd0e5d16ef92bc0e6d21081f8c66fe2..7b998241d65bb686f7e2f22cfc751aca95b86587 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright 2015-2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -905,13 +905,7 @@ int main(int argc, char *argv[])
if (Pstream::parRun())
{
fileName decompDictFile;
- if (args.optionReadIfPresent("decomposeParDict", decompDictFile))
- {
- if (isDir(decompDictFile))
- {
- decompDictFile = decompDictFile/"decomposeParDict";
- }
- }
+ args.optionReadIfPresent("decomposeParDict", decompDictFile);
decomposeDict = IOdictionary
(
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 16b789b624b76d77e119acd90b0a934c2d7545d1..c056932f3c0ee39f192a2a4178396ca913da6f87 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -297,13 +297,13 @@ int main(int argc, char *argv[])
// set up the tolerances for the sliding mesh
dictionary slidingTolerances;
- if (args.options().found("toleranceDict"))
+ if (args.optionFound("toleranceDict"))
{
IOdictionary toleranceFile
(
IOobject
(
- args.options()["toleranceDict"],
+ args["toleranceDict"],
runTime.constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options
index 84027a1c28ddddee75f045cd41a1f2b96fa9f73a..18d4dfeb9fa278a50edc2f208210e42c83e1e8b6 100644
--- a/applications/utilities/miscellaneous/foamList/Make/options
+++ b/applications/utilities/miscellaneous/foamList/Make/options
@@ -15,10 +15,12 @@ EXE_LIBS = \
-lchemistryModel \
-lcoalCombustion \
-lcombustionModels \
- -lcompressibleTransportModels \
+ -lcompressibleEulerianInterfacialModels \
+ -lcompressibleMultiphaseEulerianInterfacialModels \
-lcompressibleTurbulenceModels \
- -lconversion \
- -ldecompose \
+ -lCompressibleTwoPhaseMixtureTurbulenceModels \
+ -lcompressibleTwoPhaseSystem \
+ -lconformalVoronoiMesh \
-ldecompositionMethods \
-ldistributed \
-ldistributionModels \
@@ -35,29 +37,32 @@ EXE_LIBS = \
-lfileFormats \
-lfiniteVolume \
-lfluidThermophysicalModels \
+ -lfoamToVTK \
-lforces \
-lfvMotionSolvers \
-lfvOptions \
-lgenericPatchFields \
- -limmiscibleIncompressibleTwoPhaseMixture \
+ -lhelpTypes \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-linterfaceProperties \
-llagrangianFunctionObjects \
-llagrangianIntermediate \
- -llagrangian \
-llagrangianSpray \
-llagrangianTurbulence \
-llaminarFlameSpeedModels \
- -lliquidMixtureProperties \
+ -lliquidPropertiesFvPatchFields \
-lliquidProperties \
-lmeshTools \
- -lmolecularMeasurements \
- -lmolecule \
+ -lmultiphaseInterFoam \
+ -lmultiphaseMixtureThermo \
+ -lmultiphaseReactingTurbulenceModels \
+ -lmultiphaseSystem \
-lODE \
-lOpenFOAM \
- -lpairPatchAgglomeration \
-lphaseChangeTwoPhaseMixtures \
+ -lphaseCompressibleTurbulenceModels \
+ -lphaseTemperatureChangeTwoPhaseMixtures \
-lpotential \
-lpyrolysisModels \
-lradiationModels \
@@ -68,7 +73,6 @@ EXE_LIBS = \
-lreactingPhaseSystem \
-lreactingTwoPhaseSystem \
-lreactionThermophysicalModels \
- -lreconstruct \
-lregionCoupled \
-lregionCoupling \
-lregionModels \
@@ -79,11 +83,9 @@ EXE_LIBS = \
-lsampling \
-lscotchDecomp \
-lsixDoFRigidBodyMotion \
- -lSLGThermo \
+ -lSloanRenumber \
-lsnappyHexMesh \
-lsolidChemistryModel \
- -lsolidMixtureProperties \
- -lsolidParticle \
-lsolidProperties \
-lsolidSpecie \
-lsolidThermo \
@@ -92,13 +94,12 @@ EXE_LIBS = \
-lsurfaceFilmDerivedFvPatchFields \
-lsurfaceFilmModels \
-lsurfMesh \
+ -ltabulatedWallFunctions \
-lthermalBaffleModels \
-lthermophysicalFunctions \
-ltopoChangerFvMesh \
- -ltriSurface \
+ -lturbulenceModelSchemes \
-lturbulenceModels \
- -ltwoPhaseMixture \
- -ltwoPhaseMixtureThermo \
-ltwoPhaseProperties \
-ltwoPhaseReactingTurbulenceModels \
-lutilityFunctionObjects
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 62723280b3b2777cda3672ff2911727ddde7ee5c..4eea56f1c0fa6290bfeffe8adbee281307b3353a 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -270,14 +270,7 @@ int main(int argc, char *argv[])
// Allow override of decomposeParDict location
fileName decompDictFile;
- if (args.optionReadIfPresent("decomposeParDict", decompDictFile))
- {
- if (isDir(decompDictFile))
- {
- decompDictFile = decompDictFile/"decomposeParDict";
- }
- }
-
+ args.optionReadIfPresent("decomposeParDict", decompDictFile);
wordList regionNames;
wordList regionDirs;
@@ -360,7 +353,6 @@ int main(int argc, char *argv[])
),
decompDictFile
)
-
).lookup("numberOfSubdomains")
);
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 65ebbc1c6f3c862f2877599f09716cde4acd4dba..c21d94b3dddcff4b7ef8e45b2d9f8ee1ef3c8a9a 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -64,6 +64,7 @@ Usage
#include "fvMeshTools.H"
#include "fvMeshDistribute.H"
#include "decompositionMethod.H"
+#include "decompositionModel.H"
#include "timeSelector.H"
#include "PstreamReduceOps.H"
#include "volFields.H"
@@ -74,7 +75,6 @@ Usage
#include "loadOrCreateMesh.H"
#include "processorFvPatchField.H"
#include "zeroGradientFvPatchFields.H"
-#include "decompositionModel.H"
#include "parFvFieldReconstructor.H"
#include "parLagrangianRedistributor.H"
@@ -2152,7 +2152,6 @@ int main(int argc, char *argv[])
bool newTimes = args.optionFound("newTimes");
-
if (env("FOAM_SIGFPE"))
{
WarningInFunction
@@ -2245,8 +2244,6 @@ int main(int argc, char *argv[])
Pstream::scatter(decompose);
-
-
// If running distributed we have problem of new processors not finding
// a system/controlDict. However if we switch on the master-only reading
// the problem becomes that the time directories are differing sizes and
@@ -2330,7 +2327,6 @@ int main(int argc, char *argv[])
// Determine any region
word regionName = polyMesh::defaultRegion;
fileName meshSubDir;
-
if (args.optionReadIfPresent("region", regionName))
{
meshSubDir = regionName/polyMesh::meshSubDir;
@@ -2774,13 +2770,7 @@ int main(int argc, char *argv[])
// Allow override of decomposeParDict location
fileName decompDictFile;
- if (args.optionReadIfPresent("decomposeParDict", decompDictFile))
- {
- if (isDir(decompDictFile))
- {
- decompDictFile = decompDictFile / "decomposeParDict";
- }
- }
+ args.optionReadIfPresent("decomposeParDict", decompDictFile);
// Determine decomposition
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
index 50e78e781c8ef9a70ae7e8553d9d272a91793df4..73a0e17417114b1520ae62d8a8d28fd4c03b9df6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
@@ -18,8 +18,10 @@ if (!fieldsToUse.found(fieldName))
fieldName,
timeDirs[n1].name(),
mesh,
- IOobject::NO_READ
- ).typeHeaderOk<volScalarField>(false)
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false // no register
+ ).typeHeaderOk<volScalarField>(false, false)
);
if (variableGood)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
index 912f48b28ac7d8b9c653d0d1e03fe31f08117ee1..9c0c612ed7fc5fe68233c257509dec635e45d517 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
@@ -7,8 +7,6 @@ if (timeDirs.size() > 1 && Pstream::master())
// We already loaded a mesh (usually from constant).
// See if any other "polyMesh/points" files exist too.
- const fileName& baseDir = mesh.time().path();
-
Info<< "Search for moving mesh ... " << flush;
forAll(timeDirs, timeI)
{
@@ -17,7 +15,6 @@ if (timeDirs.size() > 1 && Pstream::master())
meshMoving =
(
timeName != mesh.pointsInstance()
- && isDir(baseDir/timeName/polyMesh::meshSubDir)
&& IOobject
(
"points",
@@ -27,7 +24,7 @@ if (timeDirs.size() > 1 && Pstream::master())
IOobject::NO_READ,
IOobject::NO_WRITE,
false // no register
- ).typeHeaderOk<pointIOField>(true)
+ ).typeHeaderOk<pointIOField>(true, false)
);
if (meshMoving)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkMeshMoving.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkMeshMoving.H
index 51c7a11e7337648272c889c477630eea44bd44a4..8155d920cbc9a109d288d1381e485938c473b5b7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkMeshMoving.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkMeshMoving.H
@@ -8,15 +8,12 @@ if (timeDirs.size() > 1 && Pstream::master())
// We already loaded a mesh (usually from constant).
// See if any other "polyMesh/points" files exist too.
- const fileName& baseDir = mesh.time().path();
-
Info<< "Search for moving mesh ... " << flush;
forAll(timeDirs, timeI)
{
meshMoving =
(
- isDir(baseDir/timeDirs[timeI].name()/polyMesh::meshSubDir)
- && IOobject
+ IOobject
(
"points",
timeDirs[timeI].name(),
@@ -25,7 +22,7 @@ if (timeDirs.size() > 1 && Pstream::master())
IOobject::NO_READ,
IOobject::NO_WRITE,
false // no register
- ).typeHeaderOk<pointIOField>(true)
+ ).typeHeaderOk<pointIOField>(true, false)
);
if (meshMoving)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H
index a55e44e136420eafff0c92454fe786c2cfecc07b..91c718994f16c21fe2d336039b046049852551dc 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H
@@ -21,10 +21,10 @@
runTime,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
- false
+ false // no register
);
- if (io.typeHeaderOk<IOdictionary>(true))
+ if (io.typeHeaderOk<IOdictionary>(true, false))
{
io.readOpt() = IOobject::MUST_READ_IF_MODIFIED;
IOdictionary timeObject(io);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
index f894e2c136a03f990341b20fe2c96094f3d85b94..8e3f53ce966bf42adcfdb062f2daea02b28e5306 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
@@ -4,10 +4,13 @@
"points",
runTime.timeName(),
polyMesh::meshSubDir,
- mesh
+ mesh,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false // no register
);
- if (io.typeHeaderOk<pointIOField>(true))
+ if (io.typeHeaderOk<pointIOField>(true, false))
{
// Read new points
io.readOpt() = IOobject::MUST_READ;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
index c1a1f8dee71ee7676da95d69acfde3bd015d9910..50db68176cec8c8d66ac0279d57b7d5f42071f8c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
@@ -1,27 +1,20 @@
-IOobject ioPoints
-(
- "points",
- runTime.timeName(),
- mesh.name(),
- mesh
-);
-
-if (ioPoints.typeHeaderOk<pointIOField>(true))
{
- Info<< "new points available" << endl;
- // Reading new points
- pointIOField newPoints
+ IOobject io
(
- IOobject
- (
- "points",
- runTime.timeName(),
- mesh.name(),
- mesh,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
- )
+ "points",
+ runTime.timeName(),
+ mesh.name(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false // no register
);
- mesh.movePoints(newPoints);
+ if (io.typeHeaderOk<pointIOField>(true, false))
+ {
+ Info<< "new points available" << endl;
+ // Read new points
+ io.readOpt() = IOobject::MUST_READ;
+ mesh.movePoints(pointIOField(io));
+ }
}
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
index 78738e321d8a945e01e7d5cff5ef5ea432d6bd13..267d0959a8df3ee48720a9cae30207d1e63e1a47 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
@@ -9,7 +9,7 @@ IOdictionary propsDict
)
);
-const word cloudName(propsDict.lookup("cloudName"));
+const word cloudName(propsDict.lookup("cloud"));
label sampleFrequency(readLabel(propsDict.lookup("sampleFrequency")));
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
index 309d7718f6682283ce980002cf146e94c49c5d3a..67699d3c0ab6703ad83d1341f127c40b0a1e0e2d 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
@@ -4,6 +4,6 @@ const word dictName("particleTrackDict");
IOdictionary propsDict(dictIO);
-word cloudName(propsDict.lookup("cloudName"));
+word cloudName(propsDict.lookup("cloud"));
List<word> userFields(propsDict.lookup("fields"));
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 106f1b2bc2ee3e6952a249be1886412252e4c2ca..35d4faccc6072e7ccd93e5ae55ec8f59a2587ebc 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -51,13 +51,11 @@ int readNumProcs
const Time& runTime
)
{
+ const word dictName = "decomposeParDict";
fileName dictFile;
- if (args.optionReadIfPresent(optionName, dictFile))
+ if (args.optionReadIfPresent(optionName, dictFile) && isDir(dictFile))
{
- if (isDir(dictFile))
- {
- dictFile = dictFile/"decomposeParDict";
- }
+ dictFile = dictFile / dictName;
}
return readInt
@@ -68,7 +66,7 @@ int readNumProcs
(
IOobject
(
- "decomposeParDict",
+ dictName,
runTime.system(),
runTime,
IOobject::MUST_READ_IF_MODIFIED,
@@ -376,7 +374,7 @@ int main(int argc, char *argv[])
if (parallelSource && !parallelTarget)
{
- int nProcs = readNumProcs
+ const int nProcs = readNumProcs
(
args,
"sourceDecomposeParDict",
@@ -448,7 +446,7 @@ int main(int argc, char *argv[])
}
else if (!parallelSource && parallelTarget)
{
- int nProcs = readNumProcs
+ const int nProcs = readNumProcs
(
args,
"targetDecomposeParDict",
@@ -521,13 +519,13 @@ int main(int argc, char *argv[])
}
else if (parallelSource && parallelTarget)
{
- int nProcsSource = readNumProcs
+ const int nProcsSource = readNumProcs
(
args,
"sourceDecomposeParDict",
runTimeSource
);
- int nProcsTarget = readNumProcs
+ const int nProcsTarget = readNumProcs
(
args,
"targetDecomposeParDict",
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index c24520790b18206ab01aa61b85624ab290f64522..e4d09ce7799a4b8294d444be4b174797875204f2 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -1558,12 +1558,14 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
- word action(args.args()[1]);
+ const word action(args[1]);
- HashTable<booleanSurface::booleanOpType> validActions;
- validActions.insert("intersection", booleanSurface::INTERSECTION);
- validActions.insert("union", booleanSurface::UNION);
- validActions.insert("difference", booleanSurface::DIFFERENCE);
+ const HashTable<booleanSurface::booleanOpType> validActions
+ {
+ {"intersection", booleanSurface::INTERSECTION},
+ {"union", booleanSurface::UNION},
+ {"difference", booleanSurface::DIFFERENCE}
+ };
if (!validActions.found(action))
{
@@ -1580,7 +1582,7 @@ int main(int argc, char *argv[])
}
- const word surf1Name(args.args()[2]);
+ const word surf1Name(args[2]);
Info<< "Reading surface " << surf1Name << endl;
triSurfaceMesh surf1
(
diff --git a/applications/utilities/surface/surfaceInflate/surfaceInflate.C b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
index c8edf919628efabb54a55ac53486bf78cc2091ac..145e2b3490d53b974773edaba9547dec762016d0 100644
--- a/applications/utilities/surface/surfaceInflate/surfaceInflate.C
+++ b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
@@ -605,7 +605,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
runTime.functionObjects().off();
- const word inputName(args.args()[1]);
+ const word inputName(args[1]);
const scalar distance(args.argRead<scalar>(2));
const scalar extendFactor(args.argRead<scalar>(3));
const bool checkSelfIntersect = args.optionFound("checkSelfIntersection");
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index d61fbc67cd0f92302e705367946b8f3b51c9a626..d79323b718e1362d35676b0f344fba82250abec3 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -157,14 +157,10 @@ int main(int argc, char *argv[])
// Note: cannot use setSystemRunTimeDictionaryIO.H since dictionary
// is in constant
- fileName dictPath = "";
- if (args.optionFound("dict"))
+ fileName dictPath;
+ if (args.optionReadIfPresent("dict", dictPath) && isDir(dictPath))
{
- dictPath = args["dict"];
- if (isDir(dictPath))
- {
- dictPath = dictPath / dictName;
- }
+ dictPath = dictPath / dictName;
}
if (dictPath.size())
diff --git a/applications/utilities/surface/surfaceRedistributePar/Make/options b/applications/utilities/surface/surfaceRedistributePar/Make/options
index c46a4c3f38edbafb8de987a029e545d61e8ac793..d836881301c692a5747929349d88ed55c2c79c5d 100644
--- a/applications/utilities/surface/surfaceRedistributePar/Make/options
+++ b/applications/utilities/surface/surfaceRedistributePar/Make/options
@@ -1,9 +1,12 @@
EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
-I$(LIB_SRC)/parallel/distributed/lnInclude
EXE_LIBS = \
-ldistributed \
-lmeshTools \
- -ltriSurface
+ -ltriSurface \
+ -ldecompose
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index f5e113f845efa8d6ed75392a6432ed9d44fe3387..d478f8ab4071577eec16612442e90937e956eca9 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -46,6 +46,7 @@ Note
#include "distributedTriSurfaceMesh.H"
#include "mapDistribute.H"
#include "localIOdictionary.H"
+#include "decompositionModel.H"
using namespace Foam;
@@ -103,7 +104,8 @@ int main(int argc, char *argv[])
{
argList::addNote
(
- "redistribute a triSurface"
+ "Redistribute a triSurface. "
+ "The specified surface must be located in the constant/triSurface directory"
);
argList::validArgs.append("triSurfaceMesh");
@@ -127,7 +129,7 @@ int main(int argc, char *argv[])
<< "Using distribution method "
<< distTypeName << nl << endl;
- const bool keepNonMapped = args.options().found("keepNonMapped");
+ const bool keepNonMapped = args.optionFound("keepNonMapped");
if (keepNonMapped)
{
@@ -151,6 +153,37 @@ int main(int argc, char *argv[])
Random rndGen(653213);
+ // For independent decomposition, ensure that distributedTriSurfaceMesh
+ // can find the alternative decomposeParDict specified via the
+ // -decomposeParDict option.
+ if (distType == distributedTriSurfaceMesh::INDEPENDENT)
+ {
+ fileName decompDictFile;
+ args.optionReadIfPresent("decomposeParDict", decompDictFile);
+
+ IOdictionary* dict = new IOdictionary
+ (
+ decompositionModel::selectIO
+ (
+ IOobject
+ (
+ "decomposeParDict",
+ runTime.system(),
+ runTime,
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE
+ ),
+ decompDictFile
+ )
+ );
+
+ // The object must have the expected "decomposeParDict" name.
+ // This also implies that it cannot be changed during the run.
+ dict->rename("decomposeParDict");
+
+ runTime.store(dict);
+ }
+
// Determine mesh bounding boxes:
List<List<treeBoundBox>> meshBb(Pstream::nProcs());
if (distType == distributedTriSurfaceMesh::FOLLOW)
diff --git a/etc/bashrc b/etc/bashrc
index c65f5fab04bc9b0ffc53fbf99dd5464f1d2bfa5a..c4fc2e21dfb5afa25921fe251894b611a1997281 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -86,7 +86,7 @@ export WM_COMPILE_OPTION=Opt
#- MPI implementation:
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPICH | MPICH-GM | HPMPI
# | MPI | QSMPI | SGIMPI
-export WM_MPLIB=OPENMPI
+export WM_MPLIB=SYSTEMOPENMPI
#- Operating System:
# WM_OSTYPE = POSIX | ???
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index a1650b7ee38443087671cf717dc2facb0d5b20c8..7b9f07486b3447b786999e68d3e1f9a80b8fe6b1 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -95,6 +95,7 @@ $(strings)/fileName/fileNameIO.C
$(strings)/keyType/keyType.C
$(strings)/wordRe/wordRe.C
$(strings)/lists/hashedWordList.C
+$(strings)/lists/wordReListMatcher.C
$(strings)/stringOps/stringOps.C
ops = primitives/ops
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index 73b91bf3b91d96c2f4339e2fb19492d62a9eb6bb..5953185baa4d13f824c8907158241cfb39d701b3 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -417,7 +417,7 @@ Foam::fileName Foam::IOobject::path
}
-Foam::fileName Foam::IOobject::localFilePath() const
+Foam::fileName Foam::IOobject::localFilePath(const bool search) const
{
if (instance().isAbsolute())
{
@@ -443,7 +443,7 @@ Foam::fileName Foam::IOobject::localFilePath() const
}
else
{
- if (!isDir(path))
+ if (!isDir(path) && search)
{
word newInstancePath = time().findInstancePath
(
@@ -471,7 +471,7 @@ Foam::fileName Foam::IOobject::localFilePath() const
}
-Foam::fileName Foam::IOobject::globalFilePath() const
+Foam::fileName Foam::IOobject::globalFilePath(const bool search) const
{
if (instance().isAbsolute())
{
@@ -536,8 +536,8 @@ Foam::fileName Foam::IOobject::globalFilePath() const
}
}
- // Check for approximately same time
- if (!isDir(path))
+ // Check for approximately same (local) time
+ if (!isDir(path) && search)
{
word newInstancePath = time().findInstancePath
(
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index 5b115a2b07e15d668d31b30c87e704998c972548..b08b3bb66179314b7281c70b971ff4241512fba5 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -400,7 +400,7 @@ public:
fileName path
(
const word& instance,
- const fileName& local = ""
+ const fileName& local = fileName::null
) const;
//- Return complete path + object name
@@ -409,11 +409,15 @@ public:
return path()/name();
}
- //- Helper for filePath that searches locally
- fileName localFilePath() const;
+ //- Helper for filePath that searches locally.
+ // When search is false, simply use the current instance,
+ // otherwise search previous instances.
+ fileName localFilePath(const bool search=true) const;
//- Helper for filePath that searches up if in parallel
- fileName globalFilePath() const;
+ // When search is false, simply use the current instance,
+ // otherwise search previous instances.
+ fileName globalFilePath(const bool search=true) const;
// Reading
@@ -421,10 +425,16 @@ public:
//- Read header
bool readHeader(Istream&);
- //- Read header (uses typeFilePath to find file) and check header
- // info. Optionally checks headerClassName against type
+ //- Read header (uses typeFilePath to find file) and check its info.
+ // Optionally checks headerClassName against the type-name.
+ // When search is false, simply use the current instance,
+ // otherwise search previous instances.
template<class Type>
- bool typeHeaderOk(const bool checkType = true);
+ bool typeHeaderOk
+ (
+ const bool checkType = true,
+ const bool search = true
+ );
//- Helper: warn that type does not support re-reading
template<class Type>
@@ -485,18 +495,23 @@ template<>
Ostream& operator<<(Ostream& os, const InfoProxy<IOobject>& ip);
-//- Template function for obtaining global status
+//- Template function for obtaining global vs. local status
template<class T>
inline bool typeGlobal()
{
return false;
}
-//- Template function for obtaining filePath
+//- Template function for obtaining local or global filePath
template<class T>
-inline fileName typeFilePath(const IOobject& io)
+inline fileName typeFilePath(const IOobject& io, const bool search=true)
{
- return (typeGlobal<T>() ? io.globalFilePath() : io.localFilePath());
+ return
+ (
+ typeGlobal<T>()
+ ? io.globalFilePath(search)
+ : io.localFilePath(search)
+ );
}
diff --git a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
index 1ef06e3415e7902bfc452126f4c54fe71c339701..f93384bf8cc00fd49d773b34f04f03e433a5f4f0 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
@@ -32,7 +32,11 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-bool Foam::IOobject::typeHeaderOk(const bool checkType)
+bool Foam::IOobject::typeHeaderOk
+(
+ const bool checkType,
+ const bool search
+)
{
bool ok = true;
@@ -48,7 +52,7 @@ bool Foam::IOobject::typeHeaderOk(const bool checkType)
// Determine local status
if (!masterOnly || Pstream::master())
{
- Istream* isPtr = objectStream(typeFilePath<Type>(*this));
+ Istream* isPtr = objectStream(typeFilePath<Type>(*this, search));
// If the stream has failed return
if (!isPtr)
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C b/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C
index 894dd2cfc603c0a7f6825f9b282185886491df05..9ee8cb061ae9279d025f522925a0e955ae2741f5 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -30,11 +30,11 @@ namespace Foam
{
defineTemplateTypeNameAndDebug(IOMap<dictionary>, 0);
- //- Template specialisation for obtaining filePath
+ //- Template specialization for global status
template<>
- fileName typeFilePath<IOMap<dictionary>>(const IOobject& io)
+ bool typeGlobal<IOMap<dictionary>>()
{
- return io.globalFilePath();
+ return true;
}
}
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
index f97aa40b17aafb494d5041c5e2b0582fb601e724..6fbf3a10b28fe944f7af76e53c7c85c2194efae3 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
@@ -27,8 +27,8 @@ Class
Description
IOdictionary is derived from dictionary and IOobject to give the dictionary
automatic IO functionality via the objectRegistry. To facilitate IO,
- IOdictioanry is provided with a constructor from IOobject and writeData and
- write functions.
+ IOdictionary is provided with a constructor from IOobject and with
+ readData/writeData functions.
SourceFiles
IOdictionary.C
@@ -47,7 +47,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class IOdictionary Declaration
+ Class IOdictionary Declaration
\*---------------------------------------------------------------------------*/
class IOdictionary
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H
index 8705d0eb3b5a7178bb2d1a015bfeb036ac892738..abe9592abb03c58013c881f60d45c6d6491ddd3e 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H
@@ -28,8 +28,8 @@ Description
baseIOdictionary is derived from dictionary and IOobject to give the
dictionary automatic IO functionality via the objectRegistry.
To facilitate IO,
- IOdictioanry is provided with a constructor from IOobject and writeData and
- write functions.
+ baseIOdictionary is provided with a constructor from IOobject and with
+ readData/writeData functions.
SourceFiles
baseIOdictionary.C
@@ -49,7 +49,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class baseIOdictionary Declaration
+ Class baseIOdictionary Declaration
\*---------------------------------------------------------------------------*/
class baseIOdictionary
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 77ee53eec3faca5161479f055f6b7e55882b3634..5ab933097287d48961903fff47257b4d2290cac8 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -614,10 +614,29 @@ void Foam::argList::parse
// Establish rootPath_/globalCase_/case_ for master
getRootCase();
- // See if running distributed (different roots for different procs)
- label dictNProcs = -1;
- fileName source;
+ // Establish location of decomposeParDict, allow override with
+ // the -decomposeParDict option.
+ fileName source = rootPath_/globalCase_/"system"/"decomposeParDict";
+ if (options_.found("decomposeParDict"))
+ {
+ bool adjustOpt = false;
+ source = options_["decomposeParDict"];
+ if (isDir(source))
+ {
+ adjustOpt = true;
+ source = source/"decomposeParDict";
+ }
+ // Could also check for absolute path, but shouldn't be needed
+ if (adjustOpt)
+ {
+ source.clean();
+ options_.set("decomposeParDict", source);
+ }
+ }
+
+ // If running distributed (different roots for different procs)
+ label dictNProcs = -1;
if (options_.found("roots"))
{
source = "-roots";
@@ -631,16 +650,8 @@ void Foam::argList::parse
}
else
{
- source = rootPath_/globalCase_/"system"/"decomposeParDict";
- // Override with -decomposeParDict
- if (options_.found("decomposeParDict"))
- {
- source = options_["decomposeParDict"];
- if (isDir(source))
- {
- source = source/"decomposeParDict";
- }
- }
+ // Use values from decomposeParDict, the location was already
+ // established above.
IFstream decompDictStream(source);
diff --git a/src/OpenFOAM/include/setConstantMeshDictionaryIO.H b/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
index aa5a68004c27c5e72b6e9d69fd8b795543e273fc..503dff369aa992a8efbfd0821d2965f3435b6fb3 100644
--- a/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
+++ b/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
@@ -1,7 +1,6 @@
-fileName dictPath = "";
-if (args.optionFound("dict"))
+fileName dictPath;
+if (args.optionReadIfPresent("dict", dictPath))
{
- dictPath = args["dict"];
if (isDir(dictPath))
{
dictPath = dictPath / dictName;
diff --git a/src/OpenFOAM/include/setSystemMeshDictionaryIO.H b/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
index 4d5f2e68ec900c92f33af06385173fc1e487b35b..c4e5a27ae9d3c7df29908720377a40a9683a1713 100644
--- a/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
+++ b/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
@@ -1,7 +1,6 @@
-fileName dictPath = "";
-if (args.optionFound("dict"))
+fileName dictPath;
+if (args.optionReadIfPresent("dict", dictPath))
{
- dictPath = args["dict"];
if (isDir(dictPath))
{
dictPath = dictPath / dictName;
diff --git a/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H b/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
index ceebb43815ad0d230e221a5b858f74506fa51141..510f278c6087258bb0174da8f7a7a4ab7b42726a 100644
--- a/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
+++ b/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
@@ -1,7 +1,6 @@
-fileName dictPath = "";
-if (args.optionFound("dict"))
+fileName dictPath;
+if (args.optionReadIfPresent("dict", dictPath))
{
- dictPath = args["dict"];
if (isDir(dictPath))
{
dictPath = dictPath / dictName;
diff --git a/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.C b/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.C
new file mode 100644
index 0000000000000000000000000000000000000000..1a24dcbbb1949e1f8902c97e90f0e6aa4d13b017
--- /dev/null
+++ b/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.C
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
+ \\/ 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 "wordReListMatcher.H"
+#include "HashSet.H"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+Foam::wordReList Foam::wordReListMatcher::uniq(const UList<wordRe>& input)
+{
+ wordReList retain(input.size());
+ wordHashSet uniqWord;
+
+ label nUniq = 0;
+ forAll(input, i)
+ {
+ const wordRe& select = input[i];
+
+ if
+ (
+ select.isPattern()
+ || uniqWord.insert(static_cast<const word&>(select))
+ )
+ {
+ retain[nUniq++] = select;
+ }
+ }
+
+ retain.setSize(nUniq);
+ return retain;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H b/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H
index ebdd9481196a9433afa5737319880fb0addc0634..2bba686964cd2c74adbc30beb81a7ff8bf990445 100644
--- a/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H
+++ b/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -77,13 +77,20 @@ public:
inline const UList<wordRe>& operator()() const;
- // Searching
+ // Searching
//- Return true if string matches any of the regular expressions
// Smart match as regular expression or as a string.
// Optionally specify a literal match only.
inline bool match(const string&, bool literalMatch=false) const;
+
+ // Helpers
+
+ //- Return a wordReList with duplicate words filtered out.
+ // No filtering is done on regular expressions.
+ static wordReList uniq(const UList<wordRe>& input);
+
};
diff --git a/src/TurbulenceModels/compressible/Make/files b/src/TurbulenceModels/compressible/Make/files
index 3ffdd2030da7b7400d94ffc3730c04a963483350..53b83f60b9f1f76cd04ec8af55e9bf71f6cfaa9b 100644
--- a/src/TurbulenceModels/compressible/Make/files
+++ b/src/TurbulenceModels/compressible/Make/files
@@ -13,6 +13,7 @@ $(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
$(BCs)/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
$(BCs)/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
+$(BCs)/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H
index 440d57f9a45fda687c0e55a21e36874df2c3f6b0..9efc640f005d44164eda73a0346757e03b9c266b 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H
@@ -36,9 +36,9 @@ Description
Usage
\table
Property | Description | Required | Default value
- kappa | thermal conductivity option | yes |
- Cp | Heat capacity [J/Kg K]] | yes |
- mass | Total mass [Kg] | yes |
+ kappaMethod | thermal conductivity option | yes |
+ Cp | Heat capacity [J/kg.K] | yes |
+ mass | Total mass [kg] | yes |
\endtable
Example of the boundary condition specification:
@@ -47,7 +47,7 @@ Usage
{
type lumpedMassWallTemperature;
kappaMethod fluidThermo;
- kappaName none;
+ kappa none;
mass 1000;
Cp 4100;
value uniform 300.0;
@@ -86,7 +86,7 @@ private:
//- Specifc heat capacity [J/kg/K]
scalar Cp_;
- //- Mass / [kg]
+ //- Mass [kg]
scalar mass_;
//- Current time index (used for updating)
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
new file mode 100644
index 0000000000000000000000000000000000000000..55a81ea6ecdf488cce355e281e2238e6725d611f
--- /dev/null
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
@@ -0,0 +1,233 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
+ \\/ 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 "outletMappedUniformInletHeatAdditionFvPatchField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::outletMappedUniformInletHeatAdditionFvPatchField::
+outletMappedUniformInletHeatAdditionFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<scalar, volMesh>& iF
+)
+:
+ fixedValueFvPatchScalarField(p, iF),
+ outletPatchName_(),
+ phiName_("phi"),
+ Q_(0),
+ minTempLimit_(0),
+ maxTempLimit_(5000)
+{}
+
+
+Foam::outletMappedUniformInletHeatAdditionFvPatchField::
+outletMappedUniformInletHeatAdditionFvPatchField
+(
+ const outletMappedUniformInletHeatAdditionFvPatchField& ptf,
+ const fvPatch& p,
+ const DimensionedField<scalar, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+ outletPatchName_(ptf.outletPatchName_),
+ phiName_(ptf.phiName_),
+ Q_(ptf.Q_),
+ minTempLimit_(ptf.minTempLimit_),
+ maxTempLimit_(ptf.maxTempLimit_)
+{}
+
+
+Foam::outletMappedUniformInletHeatAdditionFvPatchField::
+outletMappedUniformInletHeatAdditionFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<scalar, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ fixedValueFvPatchScalarField(p, iF, dict),
+ outletPatchName_(dict.lookup("outletPatch")),
+ phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+ Q_(readScalar(dict.lookup("Q"))),
+ minTempLimit_(dict.lookupOrDefault<scalar>("minTempLimit", 0)),
+ maxTempLimit_(dict.lookupOrDefault<scalar>("maxTempLimit", 5000))
+{}
+
+
+
+Foam::outletMappedUniformInletHeatAdditionFvPatchField::
+outletMappedUniformInletHeatAdditionFvPatchField
+(
+ const outletMappedUniformInletHeatAdditionFvPatchField& ptf
+)
+:
+ fixedValueFvPatchScalarField(ptf),
+ outletPatchName_(ptf.outletPatchName_),
+ phiName_(ptf.phiName_),
+ Q_(ptf.Q_),
+ minTempLimit_(ptf.minTempLimit_),
+ maxTempLimit_(ptf.maxTempLimit_)
+{}
+
+
+
+Foam::outletMappedUniformInletHeatAdditionFvPatchField::
+outletMappedUniformInletHeatAdditionFvPatchField
+(
+ const outletMappedUniformInletHeatAdditionFvPatchField& ptf,
+ const DimensionedField<scalar, volMesh>& iF
+)
+:
+ fixedValueFvPatchScalarField(ptf, iF),
+ outletPatchName_(ptf.outletPatchName_),
+ phiName_(ptf.phiName_),
+ Q_(ptf.Q_),
+ minTempLimit_(ptf.minTempLimit_),
+ maxTempLimit_(ptf.maxTempLimit_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+
+void Foam::outletMappedUniformInletHeatAdditionFvPatchField::updateCoeffs()
+{
+ if (this->updated())
+ {
+ return;
+ }
+
+ const GeometricField<scalar, fvPatchField, volMesh>& f
+ (
+ dynamic_cast<const GeometricField<scalar, fvPatchField, volMesh>&>
+ (
+ this->internalField()
+ )
+ );
+
+ const fvPatch& p = this->patch();
+
+ label outletPatchID =
+ p.patch().boundaryMesh().findPatchID(outletPatchName_);
+
+ if (outletPatchID < 0)
+ {
+ FatalErrorInFunction
+ << "Unable to find outlet patch " << outletPatchName_
+ << abort(FatalError);
+ }
+
+ const fvPatch& outletPatch = p.boundaryMesh()[outletPatchID];
+
+ const fvPatchField<scalar>& outletPatchField =
+ f.boundaryField()[outletPatchID];
+
+ const surfaceScalarField& phi =
+ this->db().lookupObject<surfaceScalarField>
+ (
+ phiName_
+ );
+
+ const scalarField& outletPatchPhi = phi.boundaryField()[outletPatchID];
+ scalar sumOutletPatchPhi = gSum(outletPatchPhi);
+
+ if (sumOutletPatchPhi > SMALL)
+ {
+ const basicThermo& thermo =
+ this->db().lookupObject<basicThermo>(basicThermo::dictName);
+
+ scalar averageOutletField =
+ gSum(outletPatchPhi*outletPatchField)/sumOutletPatchPhi;
+
+ const scalarField Cpf(thermo.Cp()().boundaryField()[outletPatchID]);
+
+ scalar totalPhiCp = gSum(outletPatchPhi)*gAverage(Cpf);
+
+ operator==
+ (
+ min
+ (
+ max
+ (
+ averageOutletField + Q_/totalPhiCp,
+ minTempLimit_
+ ),
+ maxTempLimit_
+ )
+ );
+ }
+ else
+ {
+ scalar averageOutletField =
+ gSum(outletPatch.magSf()*outletPatchField)
+ /gSum(outletPatch.magSf());
+
+ operator==(averageOutletField);
+ }
+
+ fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+void Foam::outletMappedUniformInletHeatAdditionFvPatchField::write
+(
+ Ostream& os
+) const
+{
+ fvPatchScalarField::write(os);
+ os.writeKeyword("outletPatch")
+ << outletPatchName_ << token::END_STATEMENT << nl;
+
+ writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+
+ os.writeKeyword("Q") << Q_ << token::END_STATEMENT << nl;
+ os.writeKeyword("minTempLimit")
+ << minTempLimit_ << token::END_STATEMENT << nl;
+ os.writeKeyword("maxTempLimit")
+ << maxTempLimit_ << token::END_STATEMENT << nl;
+
+ this->writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ makePatchTypeField
+ (
+ fvPatchScalarField,
+ outletMappedUniformInletHeatAdditionFvPatchField
+ );
+}
+
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
new file mode 100644
index 0000000000000000000000000000000000000000..4dcd68855558e700609db1481f81b92f74c171fb
--- /dev/null
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
@@ -0,0 +1,202 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
+ \\/ 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::outletMappedUniformInletHeatAdditionFvPatchField
+
+Group
+ grpInletBoundaryConditions
+
+Description
+ This temperature boundary conditon averages the temperature over the
+ "outlet" patch specified by name "outletPatch" and applies an extra
+ heat source. This is set as a uniform temperature value on this patch.
+ Additionally minTempLimit/maxTempLimit limits can be applied
+
+ \heading Patch usage
+
+ \table
+ Property | Description | Required | Default value
+ outletPatch | name of outlet patch | yes |
+ Q | Heat addition | yes
+ phi | flux field name | no | phi
+ minTempLimit | min temperature limit | no | 0.0
+ maxTempLimit | max temperature limit | no | 5000.0
+ \endtable
+
+ Example of the boundary condition specification:
+ \verbatim
+ myPatch
+ {
+ type outletMappedUniformInletHeatAddition;
+ outletPatch aPatch;
+ Q 10; // Heat addition in W
+ phi phi;
+ value uniform 0;
+ }
+ \endverbatim
+
+SeeAlso
+ Foam::fixedValueFvPatchField
+
+SourceFiles
+ outletMappedUniformInletHeatAdditionFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef outletMappedUniformInletHeatAdditionFvPatchField_H
+#define outletMappedUniformInletHeatAdditionFvPatchField_H
+
+#include "fixedValueFvPatchFields.H"
+#include "fvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class outletMappedUniformInletHeatAdditionFvPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+class outletMappedUniformInletHeatAdditionFvPatchField
+:
+ public fixedValueFvPatchScalarField
+{
+ // Private data
+
+ //- Name of the outlet patch to be mapped
+ word outletPatchName_;
+
+ //- Name of the flux transporting the field
+ word phiName_;
+
+ //- Input energy
+ scalar Q_;
+
+ //- Minimum Temperature Limit
+ scalar minTempLimit_;
+
+ //- Maxmum Temperature Limit
+ scalar maxTempLimit_;
+
+
+public:
+
+ //- Runtime type information
+ TypeName("outletMappedUniformInletHeatAddition");
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ outletMappedUniformInletHeatAdditionFvPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<scalar, volMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ outletMappedUniformInletHeatAdditionFvPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<scalar, volMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given outletMappedUniformInletHeatAdditionFvPatchField
+ // onto a new patch
+ outletMappedUniformInletHeatAdditionFvPatchField
+ (
+ const outletMappedUniformInletHeatAdditionFvPatchField&,
+ const fvPatch&,
+ const DimensionedField<scalar, volMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct as copy
+ outletMappedUniformInletHeatAdditionFvPatchField
+ (
+ const outletMappedUniformInletHeatAdditionFvPatchField&
+ );
+
+ //- Construct and return a clone
+ virtual tmp<fvPatchField<scalar>> clone() const
+ {
+ return tmp<fvPatchField<scalar>>
+ (
+ new outletMappedUniformInletHeatAdditionFvPatchField(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ outletMappedUniformInletHeatAdditionFvPatchField
+ (
+ const outletMappedUniformInletHeatAdditionFvPatchField&,
+ const DimensionedField<scalar, volMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvPatchField<scalar>> clone
+ (
+ const DimensionedField<scalar, volMesh>& iF
+ ) const
+ {
+ return tmp<fvPatchField<scalar>>
+ (
+ new outletMappedUniformInletHeatAdditionFvPatchField(*this, iF)
+ );
+ }
+
+
+ // Member functions
+
+ // Access
+
+ //- Name of the outlet patch to be mapped
+ const word& outletPatchName() const
+ {
+ return outletPatchName_;
+ }
+
+
+ // Evaluation functions
+
+ //- Update the coefficients associated with the patch field
+ virtual void updateCoeffs();
+
+
+ //- Write
+ virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index b3e4a17a78dc577a9e8958c8e683038816d464e4..be069684f361db58f9657d4bcb246015a89312ab 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -204,10 +204,10 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
<< "Did not find field " << kappaName_
<< " on mesh " << mesh.name() << " patch " << patch_.name()
<< nl
- << "Please set 'kappa' to one of "
+ << "Please set 'kappaMethod' to one of "
<< KMethodTypeNames_.toc()
- << " and 'kappaName' to the name of the volScalar"
- << " or volSymmTensor field (if kappa=lookup)"
+ << " and 'kappa' to the name of the volScalar"
+ << " or volSymmTensor field (if kappaMethod=lookup)"
<< exit(FatalError);
}
@@ -218,9 +218,10 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
{
FatalErrorInFunction
<< "Unimplemented method " << KMethodTypeNames_[method_] << nl
- << "Please set 'kappa' to one of " << KMethodTypeNames_.toc()
- << " and 'kappaName' to the name of the volScalar"
- << " or volSymmTensor field (if kappa=lookup)"
+ << "Please set 'kappaMethod' to one of "
+ << KMethodTypeNames_.toc()
+ << " and 'kappa' to the name of the volScalar"
+ << " or volSymmTensor field (if kappaMethod=lookup)"
<< exit(FatalError);
}
}
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
index 4f1bf55b141fffac2cf7ecbac1c5e13768844b72..eef6e95959bf77569411df8be781710560fc5292 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -26,8 +26,8 @@ Class
Description
IDDESDelta used by the IDDES (improved low Re Spalart-Allmaras DES model)
- The min and max delta are calculated using the double distance of the min or
- max from the face centre to the cell centre.
+ The min and max delta are calculated using the face to face distance of
+ the cell.
SourceFiles
IDDESDelta.C
diff --git a/src/conversion/ccm/Allwmake b/src/conversion/ccm/Allwmake
index a3e067e1dc0b9cdef6e24986923e5cdcd85a866a..da52586adda8b48d1d4b820130b7027753de80a7 100755
--- a/src/conversion/ccm/Allwmake
+++ b/src/conversion/ccm/Allwmake
@@ -15,8 +15,13 @@ if [ "$WM_LABEL_SIZE" = 64 ]
then
# The libccmio uses int32_t.
# The OpenFOAM adapter thus requires additional work for 64-bit labels.
- echo "Skipping optional component libccm"
+ echo "Skipping optional 'libccm' adapter component"
echo " does not support 64-bit labels"
+elif [ "$WM_PRECISION_OPTION" = SP ]
+then
+ # The OpenFOAM adapter was originally only designed for 'double'
+ echo "Skipping optional 'libccm' adapter component"
+ echo " was not originally designed for 'single precision' values"
elif [ -e $CCMIO_ARCH_PATH/include/libccmio/ccmio.h \
-a -e $CCMIO_ARCH_PATH/lib/libccmio.a ]
then
diff --git a/src/fileFormats/starcd/STARCDCore.C b/src/fileFormats/starcd/STARCDCore.C
index 612b9c30911fb2913314787a888cdcb0ee7ea1bf..7ea833b488ae291e55cbbc68f7c260ba903200ee 100644
--- a/src/fileFormats/starcd/STARCDCore.C
+++ b/src/fileFormats/starcd/STARCDCore.C
@@ -230,7 +230,7 @@ void Foam::fileFormats::STARCDCore::writePoints
(
Ostream& os,
const pointField& points,
- const double scaleFactor
+ const scalar scaleFactor
)
{
writeHeader(os, HEADER_VRT);
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.C b/src/fileFormats/vtk/format/foamVtkFormatter.C
index b204ad22795410165c657f553ea44b8b63b52cff..7271dd22f5ebbee7037f5dd1484fd8b67ef5046c 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.C
@@ -116,7 +116,7 @@ Foam::foamVtkFormatter::openTag(const word& tag)
Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::closeTag(bool isEmpty)
+Foam::foamVtkFormatter::closeTag(const bool isEmpty)
{
if (!inTag_)
{
@@ -207,20 +207,23 @@ Foam::foamVtkFormatter&
Foam::foamVtkFormatter::xmlAttr
(
const word& k,
- const label v,
+ const int32_t v,
const char quote
)
{
- if (!inTag_)
- {
- WarningInFunction
- << "xml attribute '" << k << "' but not within a tag!"
- << endl;
- }
+ return xmlAttribute(k, v, quote);
+}
- os_ << ' ' << k << '=' << quote << v << quote;
- return *this;
+Foam::foamVtkFormatter&
+Foam::foamVtkFormatter::xmlAttr
+(
+ const word& k,
+ const int64_t v,
+ const char quote
+)
+{
+ return xmlAttribute(k, v, quote);
}
@@ -232,16 +235,7 @@ Foam::foamVtkFormatter::xmlAttr
const char quote
)
{
- if (!inTag_)
- {
- WarningInFunction
- << "xml attribute '" << k << "' but not within a tag!"
- << endl;
- }
-
- os_ << ' ' << k << '=' << quote << v << quote;
-
- return *this;
+ return xmlAttribute(k, v, quote);
}
@@ -253,16 +247,7 @@ Foam::foamVtkFormatter::xmlAttr
const char quote
)
{
- if (!inTag_)
- {
- WarningInFunction
- << "xml attribute '" << k << "' but not within a tag!"
- << endl;
- }
-
- os_ << ' ' << k << '=' << quote << v << quote;
-
- return *this;
+ return xmlAttribute(k, v, quote);
}
@@ -283,7 +268,18 @@ Foam::foamVtkFormatter&
Foam::foamVtkFormatter::operator()
(
const word& k,
- const label v
+ const int32_t v
+)
+{
+ return xmlAttr(k, v);
+}
+
+
+Foam::foamVtkFormatter&
+Foam::foamVtkFormatter::operator()
+(
+ const word& k,
+ const int64_t v
)
{
return xmlAttr(k, v);
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.H b/src/fileFormats/vtk/format/foamVtkFormatter.H
index 4fe0cb997773461de2a049b087af731126b359ee..65519b1955a0265fbd09154100be57124c111d69 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.H
@@ -70,6 +70,16 @@ class foamVtkFormatter
mutable bool inTag_;
+ //- Write XML attribute
+ template<class Type>
+ foamVtkFormatter& xmlAttribute
+ (
+ const word&,
+ const Type&,
+ const char quote
+ );
+
+
protected:
// Protected Member Functions
@@ -113,9 +123,9 @@ public:
virtual void writeSize(const uint64_t) = 0;
virtual void write(const uint8_t) = 0;
- virtual void write(const label) = 0;
- virtual void write(const float) = 0;
- virtual void write(const double) = 0;
+ virtual void write(const label) = 0;
+ virtual void write(const float) = 0;
+ virtual void write(const double) = 0;
virtual void flush() = 0;
@@ -136,7 +146,7 @@ public:
//- Close XML tag, optional as an empty container.
// Always adds a trailing newline.
- foamVtkFormatter& closeTag(bool isEmpty = false);
+ foamVtkFormatter& closeTag(const bool isEmpty = false);
//- End XML tag, optional with sanity check
// Always adds a trailing newline.
@@ -164,21 +174,28 @@ public:
}
-
//- Write XML attribute
foamVtkFormatter& xmlAttr
(
const word&,
const std::string&,
- const char quote='\''
+ const char quote = '\''
);
//- Write XML attribute
foamVtkFormatter& xmlAttr
(
const word&,
- const label,
- const char quote='\''
+ const int32_t,
+ const char quote = '\''
+ );
+
+ //- Write XML attribute
+ foamVtkFormatter& xmlAttr
+ (
+ const word&,
+ const int64_t,
+ const char quote = '\''
);
//- Write XML attribute
@@ -186,7 +203,7 @@ public:
(
const word&,
const uint64_t,
- const char quote='\''
+ const char quote = '\''
);
//- Write XML attribute
@@ -194,7 +211,7 @@ public:
(
const word&,
const scalar,
- const char quote='\''
+ const char quote = '\''
);
@@ -205,7 +222,10 @@ public:
foamVtkFormatter& operator()(const word&, const std::string&);
//- Write XML attribute
- foamVtkFormatter& operator()(const word&, const label);
+ foamVtkFormatter& operator()(const word&, const int32_t);
+
+ //- Write XML attribute
+ foamVtkFormatter& operator()(const word&, const int64_t);
//- Write XML attribute
foamVtkFormatter& operator()(const word&, const uint64_t);
diff --git a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C b/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
index 6e0830e2b1fab52f022a8ef6cfd81dbf15581d03..1cde34a61e278147dca32ef073238687476c8672 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
@@ -26,6 +26,28 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<class Type>
+Foam::foamVtkFormatter&
+Foam::foamVtkFormatter::xmlAttribute
+(
+ const word& k,
+ const Type& v,
+ const char quote
+)
+{
+ if (!inTag_)
+ {
+ WarningInFunction
+ << "xml attribute '" << k << "' but not within a tag!"
+ << endl;
+ }
+
+ os_ << ' ' << k << '=' << quote << v << quote;
+
+ return *this;
+}
+
+
template<class Type, int nComp>
Foam::foamVtkFormatter& Foam::foamVtkFormatter::openDataArray
(
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyFormatter.C b/src/fileFormats/vtk/format/foamVtkLegacyFormatter.C
index 177249b306a84daf44531ffb39668beb836b9a0e..89525ab0baa0ebf2555548a517f0fce491d4c259 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkLegacyFormatter.C
@@ -77,8 +77,9 @@ void Foam::foamVtkLegacyFormatter::writeSize(const uint64_t)
void Foam::foamVtkLegacyFormatter::write(const uint8_t val)
{
- // Can only handle integers
- int copy(val);
+ // Legacy can only handle 32-bit integers.
+ // Nonetheless promote to 'label' (32 or 64 bit) and deal with it later
+ label copy(val);
write(copy);
}
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
index 0338e35154588ce72288dc1b0ba09c61cb356087..77d28f589c5d4daa17f913cddfe40fc3e5a35f9c 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -122,6 +122,37 @@ Foam::porosityModel::porosityModel
<< "cannot find porous cellZone " << zoneName_
<< exit(FatalError);
}
+
+ Info<< incrIndent << indent << coordSys_ << decrIndent << endl;
+
+ const pointField& points = mesh_.points();
+ const cellList& cells = mesh_.cells();
+ const faceList& faces = mesh_.faces();
+ DynamicList<point> localPoints;
+ forAll(cellZoneIDs_, zoneI)
+ {
+ const cellZone& cZone = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+ localPoints.setCapacity(10*cells.size());
+
+ forAll(cZone, i)
+ {
+ const label cellI = cZone[i];
+ const cell& c = mesh_.cells()[cellI];
+ const pointField cellPoints(c.points(faces, points));
+
+ forAll(cellPoints, pointI)
+ {
+ const point& pt = cellPoints[pointI];
+ localPoints.append(coordSys_.localPosition(pt));
+ }
+ }
+
+ boundBox bb(localPoints, true);
+
+ Info<< " local bounds: " << bb << endl;
+
+ localPoints.clear();
+ }
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 1e507a5dfd5de242cd4b90526119254643ccff3f..2c5d40f1709bef01dfc80f2f2b07b21441d26e08 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -71,7 +71,7 @@ flowRateInletVelocityFvPatchVectorField
{
volumetric_ = false;
flowRate_ = Function1<scalar>::New("massFlowRate", dict);
- rhoName_ = word(dict.lookupOrDefault<word>("rho", "rho"));
+ rhoName_ = dict.lookupOrDefault<word>("rho", "rho");
}
else
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
index c777ff623a45ed590d39b8f1c5751eb4b2a7904c..dd367ca3f8b616254b30c7661723bd6d444174e4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
@@ -29,13 +29,13 @@ Group
Description
This boundary conditon averages the field over the "outlet" patch specified
- by name "outletPatchName" and applies this as the uniform value of the
+ by name "outletPatch" and applies this as the uniform value of the
field over this patch.
Usage
\table
Property | Description | Required | Default value
- outletPatchName | name of outlet patch | yes |
+ outletPatch | name of outlet patch | yes |
phi | flux field name | no | phi
\endtable
@@ -44,7 +44,7 @@ Usage
<patchName>
{
type outletMappedUniformInlet;
- outletPatchName aPatch;
+ outletPatch aPatch;
phi phi;
value uniform 0;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index e2bf45527fb26b37c546f9a6e85a5e6ca07e8c75..5a42c9e0d82b8d6c24fe7ab4124a1f21c846b182 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -1104,9 +1104,9 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::write(Ostream& os) const
fvPatchField<vector>::write(os);
writeEntry("value", os);
os.writeKeyword("delta") << delta_ << token::END_STATEMENT << nl;
- writeEntryIfDifferent(os, "d", 1.0, d_);
- writeEntryIfDifferent(os, "kappa", 0.41, kappa_);
- writeEntryIfDifferent(os, "perturb", 1e-5, perturb_);
+ writeEntryIfDifferent<scalar>(os, "d", 1.0, d_);
+ writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_);
+ writeEntryIfDifferent<scalar>(os, "perturb", 1e-5, perturb_);
writeEntryIfDifferent<label>(os, "nCellPerEddy", 5, nCellPerEddy_);
writeEntryIfDifferent(os, "writeEddies", false, writeEddies_);
diff --git a/src/functionObjects/field/DESModelRegions/DESModelRegions.C b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
index 360af5136c96772e9940329f47b0d1cd8a5d0e04..bb94a127677f96eb0000dc6c600151abfdb1e180 100644
--- a/src/functionObjects/field/DESModelRegions/DESModelRegions.C
+++ b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
@@ -113,7 +113,7 @@ bool Foam::functionObjects::DESModelRegions::read(const dictionary& dict)
fvMeshFunctionObject::read(dict);
writeFile::read(dict);
- dict.readIfPresent("resultName", resultName_);
+ dict.readIfPresent("result", resultName_);
return true;
}
diff --git a/src/functionObjects/field/ddt2/ddt2.C b/src/functionObjects/field/ddt2/ddt2.C
index 12d6d2b67ade02b633b23d9f22d4e75c509f4532..7aeecd01e90d76ac011206c2bf7c38c42c36716d 100644
--- a/src/functionObjects/field/ddt2/ddt2.C
+++ b/src/functionObjects/field/ddt2/ddt2.C
@@ -27,6 +27,7 @@ License
#include "volFields.H"
#include "dictionary.H"
+#include "wordReListMatcher.H"
#include "steadyStateDdtScheme.H"
#include "addToRunTimeSelectionTable.H"
@@ -77,25 +78,6 @@ bool Foam::functionObjects::ddt2::checkFormatName(const word& str)
}
-void Foam::functionObjects::ddt2::uniqWords(wordReList& lst)
-{
- boolList retain(lst.size());
- wordHashSet uniq;
- forAll(lst, i)
- {
- const wordRe& select = lst[i];
-
- retain[i] =
- (
- select.isPattern()
- || uniq.insert(static_cast<const word&>(select))
- );
- }
-
- inplaceSubset(retain, lst);
-}
-
-
bool Foam::functionObjects::ddt2::accept(const word& fieldName) const
{
// check input vs possible result names
@@ -130,6 +112,7 @@ Foam::functionObjects::ddt2::ddt2
)
:
fvMeshFunctionObject(name, runTime, dict),
+ prevTimeIndex_(-1),
selectFields_(),
resultName_(word::null),
blacklist_(),
@@ -160,10 +143,11 @@ bool Foam::functionObjects::ddt2::read(const dictionary& dict)
return false;
}
- fvMeshFunctionObject::read(dict);
-
- dict.lookup("fields") >> selectFields_;
- uniqWords(selectFields_);
+ selectFields_ = wordReListMatcher::uniq
+ (
+ wordReList(dict.lookup("fields"))
+ );
+ Info<< type() << " fields: " << selectFields_ << nl;
resultName_ = dict.lookupOrDefault<word>
(
@@ -234,12 +218,20 @@ bool Foam::functionObjects::ddt2::execute()
<< "Unprocessed field " << ignored << endl;
}
+ // Update time index
+ prevTimeIndex_ = obr_.time().timeIndex();
+
return true;
}
bool Foam::functionObjects::ddt2::write()
{
+ if (prevTimeIndex_ < obr_.time().timeIndex())
+ {
+ // Ensure written results reflect the current state
+ execute();
+ }
if (results_.size())
{
Log << type() << ' ' << name() << " write:" << endl;
diff --git a/src/functionObjects/field/ddt2/ddt2.H b/src/functionObjects/field/ddt2/ddt2.H
index 4cf62c3addd367d3ddc7720724ddd474cc74db93..bba1492e3e4fb870671465597e812a2df74ff035 100644
--- a/src/functionObjects/field/ddt2/ddt2.H
+++ b/src/functionObjects/field/ddt2/ddt2.H
@@ -101,6 +101,9 @@ class ddt2
{
// Private data
+ //- Time at last execute, ensures write uses up-to-date values
+ label prevTimeIndex_;
+
//- Name of fields to process
wordReList selectFields_;
@@ -124,9 +127,6 @@ class ddt2
//- Check that the word contains the appropriate substitution token(s).
static bool checkFormatName(const word&);
- //- Eliminate duplicate 'word' entries
- static void uniqWords(wordReList&);
-
//- Accept unless field name appears to have already been processed
bool accept(const word& fieldName) const;
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index 999e311f202ce4c9092d4ff5e1e06a453f154aae..d56174a81e4d4a3f4e0a13ef7ad5689f7117bef6 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -52,7 +52,55 @@ namespace functionObjects
Foam::word Foam::functionObjects::externalCoupled::lockName = "OpenFOAM";
-Foam::string Foam::functionObjects::externalCoupled::patchKey = "# Patch: ";
+Foam::string Foam::functionObjects::externalCoupled::patchKey = "// Patch:";
+
+template<>
+const char* Foam::NamedEnum
+<
+ Foam::functionObjects::externalCoupled::stateEnd,
+ 2
+>::names[] =
+{
+ "remove",
+ "done"
+ // The 'IGNORE' enumeration is internal use only and thus has no name
+};
+
+const Foam::NamedEnum
+<
+ Foam::functionObjects::externalCoupled::stateEnd,
+ 2
+> Foam::functionObjects::externalCoupled::stateEndNames_;
+
+
+namespace Foam
+{
+//! \cond fileScope
+//- Write list content with size, bracket, content, bracket one-per-line.
+// This makes for consistent for parsing, regardless of the list length.
+template <class T>
+static void writeList(Ostream& os, const string& header, const UList<T>& L)
+{
+ // Header string
+ os << header.c_str() << nl;
+
+ // Write size and start delimiter
+ os << L.size() << nl
+ << token::BEGIN_LIST;
+
+ // Write contents
+ forAll(L, i)
+ {
+ os << nl << L[i];
+ }
+
+ // Write end delimiter
+ os << nl << token::END_LIST << nl << endl;
+}
+//! \endcond
+
+}
+// namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -91,7 +139,7 @@ Foam::fileName Foam::functionObjects::externalCoupled::lockFile() const
}
-void Foam::functionObjects::externalCoupled::createLockFile() const
+void Foam::functionObjects::externalCoupled::useMaster() const
{
if (!Pstream::master())
{
@@ -107,13 +155,13 @@ void Foam::functionObjects::externalCoupled::createLockFile() const
Log << type() << ": creating lock file" << endl;
OFstream os(fName);
- os << "lock file";
+ os << "status=openfoam\n";
os.flush();
}
}
-void Foam::functionObjects::externalCoupled::removeLockFile() const
+void Foam::functionObjects::externalCoupled::useSlave() const
{
if (!Pstream::master())
{
@@ -122,7 +170,37 @@ void Foam::functionObjects::externalCoupled::removeLockFile() const
Log << type() << ": removing lock file" << endl;
- rm(lockFile());
+ Foam::rm(lockFile());
+}
+
+
+void Foam::functionObjects::externalCoupled::cleanup() const
+{
+ if (!Pstream::master())
+ {
+ return;
+ }
+
+ const fileName lck(lockFile());
+ switch (stateEnd_)
+ {
+ case REMOVE:
+ {
+ Log << type() << ": removing lock file" << endl;
+ Foam::rm(lck);
+ }
+ break;
+ case DONE:
+ {
+ Log << type() << ": lock file status=done" << endl;
+ OFstream os(lck);
+ os << "status=done\n";
+ os.flush();
+ }
+ break;
+ case IGNORE:
+ break;
+ }
}
@@ -192,30 +270,29 @@ void Foam::functionObjects::externalCoupled::removeWriteFiles() const
}
-void Foam::functionObjects::externalCoupled::wait() const
+void Foam::functionObjects::externalCoupled::waitForSlave() const
{
const fileName fName(lockFile());
- label found = 0;
label totalTime = 0;
+ bool found = false;
Log << type() << ": beginning wait for lock file " << fName << nl;
- while (found == 0)
+ while (!found)
{
if (Pstream::master())
{
if (totalTime > timeOut_)
{
FatalErrorInFunction
- << "Wait time exceeded time out time of " << timeOut_
+ << "Wait time exceeded timeout of " << timeOut_
<< " s" << abort(FatalError);
}
IFstream is(fName);
-
if (is.good())
{
- found++;
+ found = true;
Log << type() << ": found lock file " << fName << endl;
}
@@ -229,7 +306,7 @@ void Foam::functionObjects::externalCoupled::wait() const
}
// Prevent other procs from racing ahead
- reduce(found, sumOp<label>());
+ reduce(found, orOp<bool>());
}
}
@@ -384,8 +461,6 @@ void Foam::functionObjects::externalCoupled::writeGeometry
fileName dir(groupDir(commsDir, compositeName(regionNames), groupName));
- Info<< typeName << ": writing geometry to " << dir << endl;
-
autoPtr<OFstream> osPointsPtr;
autoPtr<OFstream> osFacesPtr;
if (Pstream::master())
@@ -393,124 +468,87 @@ void Foam::functionObjects::externalCoupled::writeGeometry
mkDir(dir);
osPointsPtr.reset(new OFstream(dir/"patchPoints"));
osFacesPtr.reset(new OFstream(dir/"patchFaces"));
+
+ osPointsPtr() << "// Group: " << groupName << endl;
+ osFacesPtr() << "// Group: " << groupName << endl;
+
+ Info<< typeName << ": writing geometry to " << dir << endl;
}
+ // Individual region/patch entries
- DynamicList<face> allMeshesFaces;
- DynamicField<point> allMeshesPoints;
+ DynamicList<face> allFaces;
+ DynamicField<point> allPoints;
+ labelList pointToGlobal;
+ labelList uniquePointIDs;
forAll(meshes, meshi)
{
const fvMesh& mesh = meshes[meshi];
- const polyBoundaryMesh& pbm = mesh.boundaryMesh();
const labelList patchIDs
(
- pbm.patchSet(List<wordRe>(1, groupName)).sortedToc()
+ mesh.boundaryMesh().patchSet
+ (
+ List<wordRe>(1, groupName)
+ ).sortedToc()
);
- // Count faces
- label nFaces = 0;
forAll(patchIDs, i)
{
- nFaces += pbm[patchIDs[i]].size();
- }
-
- // Collect faces
- DynamicList<label> allFaceIDs(nFaces);
- forAll(patchIDs, i)
- {
- const polyPatch& p = pbm[patchIDs[i]];
-
- forAll(p, pi)
- {
- allFaceIDs.append(p.start()+pi);
- }
- }
-
- // Construct overall patch
- indirectPrimitivePatch allPatch
- (
- IndirectList<face>(mesh.faces(), allFaceIDs),
- mesh.points()
- );
-
- labelList pointToGlobal;
- labelList uniquePointIDs;
- mesh.globalData().mergePoints
- (
- allPatch.meshPoints(),
- allPatch.meshPointMap(),
- pointToGlobal,
- uniquePointIDs
- );
-
- label proci = Pstream::myProcNo();
+ const polyPatch& p = mesh.boundaryMesh()[patchIDs[i]];
- List<pointField> collectedPoints(Pstream::nProcs());
- collectedPoints[proci] = pointField(mesh.points(), uniquePointIDs);
- Pstream::gatherList(collectedPoints);
+ mesh.globalData().mergePoints
+ (
+ p.meshPoints(),
+ p.meshPointMap(),
+ pointToGlobal,
+ uniquePointIDs
+ );
- List<faceList> collectedFaces(Pstream::nProcs());
- faceList& patchFaces = collectedFaces[proci];
- patchFaces = allPatch.localFaces();
- forAll(patchFaces, facei)
- {
- inplaceRenumber(pointToGlobal, patchFaces[facei]);
- }
- Pstream::gatherList(collectedFaces);
+ label proci = Pstream::myProcNo();
- if (Pstream::master())
- {
- // Append and renumber
- label nPoints = allMeshesPoints.size();
+ List<pointField> collectedPoints(Pstream::nProcs());
+ collectedPoints[proci] = pointField(mesh.points(), uniquePointIDs);
+ Pstream::gatherList(collectedPoints);
- forAll(collectedPoints, proci)
+ List<faceList> collectedFaces(Pstream::nProcs());
+ faceList& patchFaces = collectedFaces[proci];
+ patchFaces = p.localFaces();
+ forAll(patchFaces, facei)
{
- allMeshesPoints.append(collectedPoints[proci]);
-
+ inplaceRenumber(pointToGlobal, patchFaces[facei]);
}
- face newFace;
- forAll(collectedFaces, proci)
+ Pstream::gatherList(collectedFaces);
+
+ if (Pstream::master())
{
- const faceList& procFaces = collectedFaces[proci];
+ allPoints.clear();
+ allFaces.clear();
- forAll(procFaces, facei)
+ for (label proci=0; proci < Pstream::nProcs(); ++proci)
{
- const face& f = procFaces[facei];
-
- newFace.setSize(f.size());
- forAll(f, fp)
- {
- newFace[fp] = f[fp]+nPoints;
- }
- allMeshesFaces.append(newFace);
+ allPoints.append(collectedPoints[proci]);
+ allFaces.append(collectedFaces[proci]);
}
- nPoints += collectedPoints[proci].size();
+ Info<< typeName << ": mesh " << mesh.name()
+ << ", patch " << p.name()
+ << ": writing " << allPoints.size() << " points to "
+ << osPointsPtr().name() << nl
+ << typeName << ": mesh " << mesh.name()
+ << ", patch " << p.name()
+ << ": writing " << allFaces.size() << " faces to "
+ << osFacesPtr().name() << endl;
+
+ // The entry name (region / patch)
+ const string entryHeader =
+ patchKey + ' ' + mesh.name() + ' ' + p.name();
+
+ writeList(osPointsPtr(), entryHeader, allPoints);
+ writeList(osFacesPtr(), entryHeader, allFaces);
}
}
-
- {
- Info<< typeName << ": for mesh " << mesh.name()
- << " writing " << allMeshesPoints.size() << " points to "
- << osPointsPtr().name() << endl;
- Info<< typeName << ": for mesh " << mesh.name()
- << " writing " << allMeshesFaces.size() << " faces to "
- << osFacesPtr().name() << endl;
- }
- }
-
- // Write points
- if (osPointsPtr.valid())
- {
- osPointsPtr() << allMeshesPoints << endl;
- }
-
- // Write faces
- if (osFacesPtr.valid())
- {
- osFacesPtr() << allMeshesFaces << endl;
}
}
@@ -532,7 +570,7 @@ Foam::word Foam::functionObjects::externalCoupled::compositeName
{
// For compatibility with single region cases suppress single
// region name
- return word("");
+ return word::null;
}
else
{
@@ -759,7 +797,7 @@ void Foam::functionObjects::externalCoupled::initialise()
if (initByExternal_)
{
// Wait for initial data to be made available
- wait();
+ waitForSlave();
// Read data passed back from external source
readData();
@@ -780,7 +818,7 @@ Foam::functionObjects::externalCoupled::externalCoupled
:
functionObject(name),
time_(runTime),
- enabled_(true),
+ stateEnd_(REMOVE),
initialised_(false)
{
read(dict);
@@ -792,7 +830,7 @@ Foam::functionObjects::externalCoupled::externalCoupled
if (!initByExternal_)
{
- createLockFile();
+ useMaster();
}
}
@@ -800,7 +838,9 @@ Foam::functionObjects::externalCoupled::externalCoupled
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::externalCoupled::~externalCoupled()
-{}
+{
+ cleanup();
+}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@@ -815,11 +855,12 @@ bool Foam::functionObjects::externalCoupled::execute()
// Write data for external source
writeData();
- // remove lock file, signalling external source to execute
- removeLockFile();
+ // Signal external source to execute (by removing lock file)
+ // - Wait for slave to provide data
+ useSlave();
// Wait for response
- wait();
+ waitForSlave();
// Remove old data files from OpenFOAM
removeWriteFiles();
@@ -827,8 +868,8 @@ bool Foam::functionObjects::externalCoupled::execute()
// Read data passed back from external source
readData();
- // create lock file for external source
- createLockFile();
+ // Signal external source to wait (by creating the lock file)
+ useMaster();
return true;
}
@@ -846,7 +887,9 @@ bool Foam::functionObjects::externalCoupled::end()
// Remove old data files
removeReadFiles();
removeWriteFiles();
- removeLockFile();
+ cleanup();
+
+ stateEnd_ = IGNORE; // Avoid running cleanup() again in destructor
return true;
}
@@ -856,28 +899,24 @@ bool Foam::functionObjects::externalCoupled::read(const dictionary& dict)
{
functionObject::read(dict);
- dict.readIfPresent("enabled", enabled_);
-
- if (!enabled_)
- {
- return true;
- }
+ calcFrequency_ = dict.lookupOrDefault("calcFrequency", 1);
dict.lookup("commsDir") >> commsDir_;
commsDir_.expand();
+ commsDir_.clean();
- waitInterval_ = dict.lookupOrDefault("waitInterval", 1);
- timeOut_ = dict.lookupOrDefault("timeOut", 100*waitInterval_);
- calcFrequency_ = dict.lookupOrDefault("calcFrequency", 1);
+ waitInterval_ = dict.lookupOrDefault("waitInterval", 1);
+ timeOut_ = dict.lookupOrDefault("timeOut", 100*waitInterval_);
initByExternal_ = readBool(dict.lookup("initByExternal"));
+ // initByExternal_ = dict.lookupOrDefault<Switch>("initByExternal", false);
+ stateEnd_ =
+ stateEndNames_[dict.lookupOrDefault<word>("stateEnd", "remove")];
// Get names of all fvMeshes (and derived types)
wordList allRegionNames(time_.lookupClass<fvMesh>().sortedToc());
-
const dictionary& allRegionsDict = dict.subDict("regions");
-
forAllConstIter(dictionary, allRegionsDict, iter)
{
if (!iter().isDict())
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.H b/src/functionObjects/field/externalCoupled/externalCoupled.H
index 0fc912f09ba611ac999da9ad99e62b5bb2c6d134..9cd1c928c1ed9d2f830b92c1943644ae59539677 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.H
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.H
@@ -82,6 +82,7 @@ Usage
log yes;
commsDir "${FOAM_CASE}/comms";
initByExternal yes;
+ stateEnd remove; // (remove | done)
regions
{
@@ -113,6 +114,7 @@ Usage
application.
SourceFiles
+ externalCoupled.C
externalCoupledTemplates.C
\*---------------------------------------------------------------------------*/
@@ -124,6 +126,7 @@ SourceFiles
#include "DynamicList.H"
#include "wordReList.H"
#include "scalarField.H"
+#include "NamedEnum.H"
#include "Switch.H"
#include "UPtrList.H"
@@ -147,14 +150,29 @@ class externalCoupled
:
public functionObject
{
+public:
+
+ // Public data types
+
+ //- Lockfile state on termination
+ enum stateEnd
+ {
+ REMOVE, //!< Remove lock file on end
+ DONE, //!< Lock file contains status=done on end
+ IGNORE //!< Internal use only (for handling cleanup).
+ };
+
+private:
+
+ //- State end names
+ static const NamedEnum<stateEnd, 2> stateEndNames_;
+
+
// Private data
//- Reference to the time database
const Time& time_;
- //- Switch for the execution - defaults to 'yes/on'
- Switch enabled_;
-
//- Path to communications directory
fileName commsDir_;
@@ -170,6 +188,9 @@ class externalCoupled
//- Flag to indicate values are initialised by external application
bool initByExternal_;
+ //- Lockfile state on termination
+ stateEnd stateEnd_;
+
//- Names of (composite) regions
DynamicList<word> regionGroupNames_;
@@ -208,11 +229,15 @@ class externalCoupled
//- Return the file path to the lock file
fileName lockFile() const;
- //- Create lock file
- void createLockFile() const;
- //- Remove lock file
- void removeLockFile() const;
+ //- Create lock file to indicate that OpenFOAM is in charge
+ void useMaster() const;
+
+ //- Remove lock file to indicate that the external program is in charge
+ void useSlave() const;
+
+ //- Remove lock file or status=done in lock.
+ void cleanup() const;
//- Remove files written by OpenFOAM
void removeWriteFiles() const;
@@ -220,8 +245,9 @@ class externalCoupled
//- Remove files written by external code
void removeReadFiles() const;
- //- Wait for response from external source
- void wait() const;
+ //- Wait for indication that the external program has supplied input
+ // (ie, for the lock file to reappear).
+ void waitForSlave() const;
//- Read data for a single region, single field
@@ -290,10 +316,10 @@ public:
//- Runtime type information
TypeName("externalCoupled");
- //- Name of lock file
+ //- Name of lock file (normally 'OpenFOAM.lock')
static word lockName;
- //- Name of patch key, e.g. '# Patch:' when looking for start of patch data
+ //- Name of patch key, e.g. '// Patch:' when looking for start of patch data
static string patchKey;
@@ -335,7 +361,7 @@ public:
// separated by '_'
static word compositeName(const wordList&);
- //- Write geometry for the group/patch
+ //- Write geometry for the group as region/patch
static void writeGeometry
(
const UPtrList<const fvMesh>& meshes,
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C b/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
index 9daa4c49dff01e34e6fd8e7fcdd34c9d32baacd1..90d6fc3b06b2bddf5c72b22fcad276c6a0b66c50 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
@@ -81,8 +81,6 @@ bool Foam::functionObjects::externalCoupled::readData
label nFound = 0;
-
-
forAll(meshes, i)
{
const fvMesh& mesh = meshes[i];
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index 7a27f185272e0a30c783392827006f3726ba3107..cfe7a3e18c2beefe6e6b7192ba7d57b80bc02b85 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -623,7 +623,7 @@ bool Foam::functionObjects::fluxSummary::read(const dictionary& dict)
writeFile::read(dict);
mode_ = modeTypeNames_.read(dict.lookup("mode"));
- phiName_= dict.lookupOrDefault<word>("phiName", "phi");
+ phiName_= dict.lookupOrDefault<word>("phi", "phi");
dict.readIfPresent("scaleFactor", scaleFactor_);
dict.readIfPresent("tolerance", tolerance_);
diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C
index 7f1f12c33d7096dbb30c1d09fb4a8fc62c5d77b4..4f73902c89c293675a9e5862a013ab5b128f4953 100644
--- a/src/functionObjects/field/pressure/pressure.C
+++ b/src/functionObjects/field/pressure/pressure.C
@@ -79,8 +79,8 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::pressure::rhoScale
FatalErrorInFunction
<< type() << " " << name() << ": "
<< "pressure identified as incompressible, but reference "
- << "density is not set. Please set rhoName to rhoInf, and "
- << "set an appropriate value for rhoInf"
+ << "density is not set. Please set 'rho' to 'rhoInf', and "
+ << "set an appropriate value for 'rhoInf'"
<< exit(FatalError);
}
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 2a489fdc78ae8e6d2d245e93647011cd02704551..9b6daeee12c484a59d2d46a8b9b86e9115748915 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -558,7 +558,7 @@ bool Foam::functionObjects::streamLineBase::read(const dictionary& dict)
//Info<< " using interpolation " << interpolationScheme_ << endl;
- cloudName_ = dict.lookupOrDefault<word>("cloudName", type());
+ cloudName_ = dict.lookupOrDefault<word>("cloud", type());
dict.lookup("seedSampleSet") >> seedSet_;
const dictionary& coeffsDict = dict.subDict(seedSet_ + "Coeffs");
diff --git a/src/functionObjects/field/valueAverage/valueAverage.C b/src/functionObjects/field/valueAverage/valueAverage.C
index a5a7100aed61c3f3352784f6ac3ca4842bbf7c17..7b26468a4fb865e7155b189b5bfd3d15feb86558 100644
--- a/src/functionObjects/field/valueAverage/valueAverage.C
+++ b/src/functionObjects/field/valueAverage/valueAverage.C
@@ -70,7 +70,7 @@ Foam::functionObjects::valueAverage::valueAverage
:
regionFunctionObject(name, runTime, dict),
writeFile(obr_, name, typeName, dict),
- functionObjectName_("unknown-functionObjectName"),
+ functionObjectName_("unknown-functionObject"),
fieldNames_(),
window_(-1),
totalTime_(),
@@ -109,7 +109,7 @@ bool Foam::functionObjects::valueAverage::read(const dictionary& dict)
regionFunctionObject::read(dict);
writeFile::read(dict);
- dict.lookup("functionObjectName") >> functionObjectName_;
+ dict.lookup("functionObject") >> functionObjectName_;
dict.lookup("fields") >> fieldNames_;
window_ = dict.lookupOrDefault<scalar>("window", -1);
diff --git a/src/functionObjects/field/zeroGradient/zeroGradient.C b/src/functionObjects/field/zeroGradient/zeroGradient.C
index 9f7a2c257e7cedf3aafd93e7a1103e65fe426f8d..53d41c23f89e0c08f18be6a57f44d2470788a8c8 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradient.C
+++ b/src/functionObjects/field/zeroGradient/zeroGradient.C
@@ -27,6 +27,7 @@ License
#include "volFields.H"
#include "dictionary.H"
+#include "wordReListMatcher.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -76,25 +77,6 @@ bool Foam::functionObjects::zeroGradient::checkFormatName(const word& str)
}
-void Foam::functionObjects::zeroGradient::uniqWords(wordReList& lst)
-{
- boolList retain(lst.size());
- wordHashSet uniq;
- forAll(lst, i)
- {
- const wordRe& select = lst[i];
-
- retain[i] =
- (
- select.isPattern()
- || uniq.insert(static_cast<const word&>(select))
- );
- }
-
- inplaceSubset(retain, lst);
-}
-
-
int Foam::functionObjects::zeroGradient::process(const word& fieldName)
{
int state = 0;
@@ -118,6 +100,7 @@ Foam::functionObjects::zeroGradient::zeroGradient
)
:
fvMeshFunctionObject(name, runTime, dict),
+ prevTimeIndex_(-1),
selectFields_(),
resultName_(string::null),
results_()
@@ -138,8 +121,11 @@ bool Foam::functionObjects::zeroGradient::read(const dictionary& dict)
{
fvMeshFunctionObject::read(dict);
- dict.lookup("fields") >> selectFields_;
- uniqWords(selectFields_);
+ selectFields_ = wordReListMatcher::uniq
+ (
+ wordReList(dict.lookup("fields"))
+ );
+ Info<< type() << " fields: " << selectFields_ << nl;
resultName_ = dict.lookupOrDefault<word>("result", type() + "(@@)");
return checkFormatName(resultName_);
@@ -189,12 +175,20 @@ bool Foam::functionObjects::zeroGradient::execute()
<< "Unprocessed field " << ignored << endl;
}
+ // Update time index
+ prevTimeIndex_ = obr_.time().timeIndex();
+
return true;
}
bool Foam::functionObjects::zeroGradient::write()
{
+ if (prevTimeIndex_ < obr_.time().timeIndex())
+ {
+ // Ensure written results reflect the current state
+ execute();
+ }
if (results_.size())
{
Log << type() << ' ' << name() << " write:" << endl;
diff --git a/src/functionObjects/field/zeroGradient/zeroGradient.H b/src/functionObjects/field/zeroGradient/zeroGradient.H
index 2651761a57e6b30c073a55ffed6afcfeada07a66..e4eb1c75b3dcaf2cf3381d9c8bb2f2678007e6ec 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradient.H
+++ b/src/functionObjects/field/zeroGradient/zeroGradient.H
@@ -95,6 +95,9 @@ class zeroGradient
{
// Private data
+ //- Time at last execute, ensures write uses up-to-date values
+ label prevTimeIndex_;
+
//- Name of fields to process
wordReList selectFields_;
@@ -110,9 +113,6 @@ class zeroGradient
//- Check that the word contains the appropriate substitution token(s).
static bool checkFormatName(const word&);
- //- Eliminate duplicate 'word' entries
- static void uniqWords(wordReList&);
-
//- Accept unless field only has constraint patches
// (ie, empty/zero-gradient/processor).
diff --git a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
index e88d6a7eb74d6f9107c6a67e0152bba9e6ae6f6f..f43b60c172d4d4fb0826f1ef1001ad8a4e6bc166 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
@@ -514,7 +514,7 @@ Foam::functionObjects::fieldVisualisationBase::fieldVisualisationBase
:
parent_(parent),
colours_(colours),
- fieldName_(dict.lookup("fieldName")),
+ fieldName_(dict.lookup("field")),
colourBy_(cbColour),
colourMap_(cmRainbow),
range_()
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
index 044ed7b51ea7ab724d18975ac260cb73935c6c32..a414f269c9ec130feb6e505b2d32cd142ad00850 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
@@ -63,9 +63,9 @@ Foam::functionObjects::runTimePostPro::functionObjectCloud::functionObjectCloud
:
pointData(parent, dict, colours),
fieldVisualisationBase(parent, dict, colours),
- cloudName_(dict.lookup("cloudName")),
+ cloudName_(dict.lookup("cloud")),
functionObject_(dict.lookup("functionObject")),
- colourFieldName_(dict.lookup("colourFieldName")),
+ colourFieldName_(dict.lookup("colourField")),
actor_()
{
actor_ = vtkSmartPointer<vtkActor>::New();
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
index 2a86f645a1a70ae3880fb10859c6c2958d619810..4e7cfb07762a6f5e65eb285af15df6f191444383 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@@ -29,6 +29,7 @@ License
#include "fvmDiv.H"
#include "fvmLaplacian.H"
#include "fvmSup.H"
+#include "CMULES.H"
#include "turbulentTransportModel.H"
#include "turbulentFluidThermoModel.H"
#include "addToRunTimeSelectionTable.H"
@@ -85,7 +86,8 @@ Foam::volScalarField& Foam::functionObjects::scalarTransport::transportedField()
Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
(
const volScalarField& s,
- const surfaceScalarField& phi
+ const surfaceScalarField& phi,
+ const volScalarField& alpha
) const
{
typedef incompressible::turbulenceModel icoModel;
@@ -93,9 +95,11 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
word Dname("D" + s.name());
+ volScalarField phaseMask(pos(alpha - 0.99));
+
if (constantD_)
{
- return tmp<volScalarField>
+ tmp<volScalarField> tD
(
new volScalarField
(
@@ -111,6 +115,18 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
dimensionedScalar(Dname, phi.dimensions()/dimLength, D_)
)
);
+
+ return phaseMask*tD;
+ }
+ else if (nutName_ != "none")
+ {
+ const volScalarField& nutMean =
+ mesh_.lookupObject<volScalarField>(nutName_);
+
+ return tmp<volScalarField>
+ (
+ new volScalarField(Dname, phaseMask*nutMean)
+ );
}
else if (foundObject<icoModel>(turbulenceModel::propertiesName))
{
@@ -119,7 +135,10 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
turbulenceModel::propertiesName
);
- return model.nuEff();
+ return tmp<volScalarField>
+ (
+ new volScalarField(Dname, phaseMask*model.nuEff())
+ );
}
else if (foundObject<cmpModel>(turbulenceModel::propertiesName))
{
@@ -128,7 +147,10 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
turbulenceModel::propertiesName
);
- return model.muEff();
+ return tmp<volScalarField>
+ (
+ new volScalarField(Dname, phaseMask*model.muEff())
+ );
}
else
{
@@ -163,14 +185,22 @@ Foam::functionObjects::scalarTransport::scalarTransport
:
fvMeshFunctionObject(name, runTime, dict),
fieldName_(dict.lookupOrDefault<word>("field", "s")),
- phiName_("phi"),
- rhoName_("rho"),
+ phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+ UPhiName_(dict.lookupOrDefault<word>("UPhi", "none")),
+ rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+ nutName_(dict.lookupOrDefault<word>("nut", "none")),
+ phaseName_(dict.lookupOrDefault<word>("phase", "none")),
+ phasePhiCompressedName_
+ (
+ dict.lookupOrDefault<word>("phasePhiCompressed", "alphaPhiUn")
+ ),
D_(0),
constantD_(false),
nCorr_(0),
resetOnStartUp_(false),
schemesField_("unknown-schemesField"),
- fvOptions_(mesh_)
+ fvOptions_(mesh_),
+ bounded01_(dict.lookupOrDefault<bool>("bounded01", true))
{
read(dict);
@@ -199,6 +229,11 @@ bool Foam::functionObjects::scalarTransport::read(const dictionary& dict)
dict.readIfPresent("phi", phiName_);
dict.readIfPresent("rho", rhoName_);
+ dict.readIfPresent("UPhi", UPhiName_);
+ dict.readIfPresent("nut", nutName_);
+ dict.readIfPresent("phase", phaseName_);
+ dict.readIfPresent("bounded01", bounded01_);
+
schemesField_ = dict.lookupOrDefault("schemesField", fieldName_);
constantD_ = false;
@@ -223,12 +258,93 @@ bool Foam::functionObjects::scalarTransport::execute()
{
Log << type() << " write:" << endl;
- const surfaceScalarField& phi = lookupObject<surfaceScalarField>(phiName_);
+ tmp<surfaceScalarField> tPhi
+ (
+ new surfaceScalarField
+ (
+ IOobject
+ (
+ "phi",
+ mesh_.time().timeName(),
+ mesh_.time(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimensionedScalar("tPhi", dimMass/dimTime, 0.0)
+ )
+ );
+ surfaceScalarField& phi = tPhi.ref();
+
+ const dimensionSet dim
+ (
+ mesh_.lookupObject<surfaceScalarField>(phiName_).dimensions()
+ );
+
+ bool compressible = true;
+ if (dim == dimVolume/dimTime)
+ {
+ compressible = false;
+ phi.dimensions().reset(dimVolume/dimTime);
+ }
+
+ //Obtain phi from phiName or constructed from UPhiName
+ if (phiName_ != "none")
+ {
+ phi = const_cast<surfaceScalarField&>
+ (
+ mesh_.lookupObject<surfaceScalarField>(phiName_)
+ );
+ }
+ else if (UPhiName_ != "none")
+ {
+ const volVectorField& Uphi =
+ mesh_.lookupObject<volVectorField>(UPhiName_);
+
+ if (!compressible)
+ {
+ phi = fvc::interpolate(Uphi) & mesh_.Sf();
+ }
+ else
+ {
+ const volScalarField& rho =
+ mesh_.lookupObject<volScalarField>(rhoName_);
+
+ phi = fvc::interpolate(rho*Uphi) & mesh_.Sf();
+ }
+ }
+
+ tmp<volScalarField> tPhaseMask
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "tPhaseMask",
+ mesh_.time().timeName(),
+ mesh_.time(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimensionedScalar("tPhaseMask", dimless, 1.0)
+ )
+ );
+ volScalarField& phaseMask = tPhaseMask.ref();
+
+ // Set phaseMask if s is transported in a phase
+ if (phaseName_ != "none")
+ {
+ const volScalarField& alpha =
+ mesh_.lookupObject<volScalarField>(phaseName_);
+
+ phaseMask = alpha;
+ }
volScalarField& s = transportedField();
// Calculate the diffusivity
- volScalarField D(this->D(s, phi));
+ volScalarField D(this->D(s, phi, phaseMask));
word divScheme("div(phi," + schemesField_ + ")");
word laplacianScheme("laplacian(" + D.name() + "," + schemesField_ + ")");
@@ -240,12 +356,84 @@ bool Foam::functionObjects::scalarTransport::execute()
relaxCoeff = mesh_.equationRelaxationFactor(schemesField_);
}
- if (phi.dimensions() == dimMass/dimTime)
+ // two phase scalar transport
+ if (phaseName_ != "none")
+ {
+ const volScalarField& alpha =
+ mesh_.lookupObject<volScalarField>(phaseName_);
+
+ const surfaceScalarField& limitedPhiAlpa =
+ mesh_.lookupObject<surfaceScalarField>(phasePhiCompressedName_);
+
+/*
+ surfaceScalarField phic(2.0*mag(phi/mesh_.magSf()));
+
+ const volVectorField gradAlpha(fvc::grad(alpha, "nHat"));
+
+ surfaceVectorField gradAlphaf(fvc::interpolate(gradAlpha));
+
+ dimensionedScalar deltaN
+ (
+ "deltaN", 1e-8/pow(average(mesh_.V()), 1.0/3.0)
+ );
+
+ surfaceVectorField nHatfv(gradAlphaf/(mag(gradAlphaf) + deltaN));
+
+ surfaceScalarField nHat(nHatfv & mesh_.Sf());
+
+ surfaceScalarField phir(phic*nHat);
+
+ surfaceScalarField limitedPhiAlpa
+ (
+ fvc::flux
+ (
+ phi,
+ alpha,
+ "div(phi,s)"
+ )
+ + fvc::flux
+ (
+ -fvc::flux(-phir, (1-alpha), "div(phirb,s)"),
+ alpha,
+ "div(phirb,s)"
+ )
+ );
+*/
+ // Reset D dimensions consistent with limitedPhiAlpa
+ D.dimensions().reset(limitedPhiAlpa.dimensions()/dimLength);
+
+ tmp<surfaceScalarField> tTPhiUD;
+ // Solve
+ for (label i = 0; i <= nCorr_; i++)
+ {
+ fvScalarMatrix sEqn
+ (
+ fvm::ddt(s)
+ + fvm::div(limitedPhiAlpa, s, divScheme)
+ - fvm::laplacian(D, s, laplacianScheme)
+ ==
+ alpha*fvOptions_(s)
+ );
+
+ sEqn.relax(relaxCoeff);
+ fvOptions_.constrain(sEqn);
+ sEqn.solve(mesh_.solverDict(schemesField_));
+
+ tTPhiUD = sEqn.flux();
+ }
+
+ if (bounded01_)
+ {
+ MULES::explicitSolve(s, phi, tTPhiUD.ref(), 1, 0);
+ }
+ }
+ else if (compressible)
{
const volScalarField& rho = lookupObject<volScalarField>(rhoName_);
for (label i = 0; i <= nCorr_; i++)
{
+
fvScalarMatrix sEqn
(
fvm::ddt(rho, s)
@@ -262,7 +450,7 @@ bool Foam::functionObjects::scalarTransport::execute()
sEqn.solve(mesh_.solverDict(schemesField_));
}
}
- else if (phi.dimensions() == dimVolume/dimTime)
+ else if (!compressible)
{
for (label i = 0; i <= nCorr_; i++)
{
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.H b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
index 5cb15d3d39ba83f01c27eef28a383aaf704c307e..b06d6e88284910b9756359c2a6999bd6f92956ff 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.H
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -33,8 +33,12 @@ Description
- To specify the field name set the 'field' entry
- To employ the same numerical schemes as another field set
the 'schemesField' entry,
- - The diffusivity can be set manually using the 'D' entry, or retrieved
- from the turbulence model (if applicable).
+ - The diffusivity can be set manually using the 'D' entry, retrieved
+ from the turbulence model or specified nut
+ - To specify a different flux derived from U enter UPhi velocity field name
+ (the phi used will be calculated based on this UPhi)
+ - To specify a transport quantity within a phase enter phase.
+ - bounded01 bounds the transported scalar within 0 and 1.
Usage
Example of function object specification to solve a scalar transport
@@ -47,6 +51,11 @@ Usage
type scalarTransport;
libs ("libutilityFunctionObjects.so");
+ resetOnStartUp no;
+ region cabin;
+ field H2O;
+
+
fvOptions
{
...
@@ -55,17 +64,67 @@ Usage
}
\endverbatim
+ Example of function object specification to solve a residency time
+ in a two phase flow:
+ equation:
+ \verbatim
+ functions
+ {
+ sTransport
+ {
+ type scalarTransport;
+ libs ("libsolverFunctionObjects.so");
+
+ enabled true;
+ writeControl outputTime;
+ writeInterval 1;
+
+ field s;
+ bounded01 false;
+ phase alpha.water;
+
+ write true;
+
+ fvOptions
+ {
+ unitySource
+ {
+ type scalarSemiImplicitSource;
+ enabled true;
+
+ scalarSemiImplicitSourceCoeffs
+ {
+ selectionMode all;
+ volumeMode specific;
+ injectionRateSuSp
+ {
+ s (1 0);
+ }
+ }
+ }
+ }
+
+ resetOnStartUp false;
+ }
+ }
+ \endverbatim
+
Where the entries comprise:
\table
Property | Description | Required | Default value
type | Type name: scalarTransport | yes |
phi | Name of flux field | no | phi
rho | Name of density field | no | rho
- D | Diffision coefficient | no | auto generated
+ UPhi | Name of U to generate phi | no | none
+ phase | Name of the phase name | no | none
+ nut | Name of the turbulence viscocity | no | none
+ D | Diffusion coefficient | no | auto generated
nCorr | Number of correctors | no | 0
resetOnStartUp | Reset scalar to zero on start-up | no | no
schemesField | Name of field to specify schemes | no | fieldName
fvOptions | List of scalar sources | no |
+ bounded01 | Bounds scalar betwee 0-1 for multiphase | no |true
+ phasePhiCompressed |Compressed flux for VOF | no | alphaPhiUn
\endtable
See also
@@ -106,9 +165,22 @@ class scalarTransport
//- Name of flux field (optional)
word phiName_;
+ //- Name of velocity field from which the flux is obtained if phiName is
+ // not given (optional)
+ word UPhiName_;
+
//- Name of density field (optional)
word rhoName_;
+ //- Name of turbulent viscosity field (optional)
+ word nutName_;
+
+ //- Name of phase field
+ word phaseName_;
+
+ //- Name of phase field compressed flux
+ word phasePhiCompressedName_;
+
//- Diffusion coefficient (optional)
scalar D_;
@@ -127,6 +199,9 @@ class scalarTransport
//- Run-time selectable finite volume options, e.g. sources, constraints
fv::optionList fvOptions_;
+ //- Bound scalar between 0-1 using MULES for multiphase case
+ bool bounded01_;
+
// Private Member Functions
@@ -137,7 +212,8 @@ class scalarTransport
tmp<volScalarField> D
(
const volScalarField& s,
- const surfaceScalarField& phi
+ const surfaceScalarField& phi,
+ const volScalarField& alpha
) const;
//- Disallow default bitwise copy construct
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
index 8f0c5d72afafc0303b731cf7fe28b29a46fa8763..37e19ce07e77ef42f0cbd47f65337fb185962b1a 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
@@ -53,7 +53,7 @@ Foam::functionObjects::runTimeControls::averageCondition::averageCondition
)
:
runTimeCondition(name, obr, dict, state),
- functionObjectName_(dict.lookup("functionObjectName")),
+ functionObjectName_(dict.lookup("functionObject")),
fieldNames_(dict.lookup("fields")),
tolerance_(readScalar(dict.lookup("tolerance"))),
window_(dict.lookupOrDefault<scalar>("window", -1)),
diff --git a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C
index c884876ed5d8af942a9c8c59d5da117ff4872538..740856a5a8d15cb177c417cfcfa2180df5dc8317 100644
--- a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C
+++ b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C
@@ -67,9 +67,9 @@ Foam::functionObjects::thermoCoupleProbes::thermoCoupleProbes
}
// Check if the property exist (resume old calculation)
- // or of it is new
+ // or of it is new.
dictionary probeDict;
- if (getDict(name, probeDict))
+ if (getDict(typeName, probeDict))
{
probeDict.lookup("Tc") >> Ttc_;
}
@@ -125,9 +125,9 @@ void Foam::functionObjects::thermoCoupleProbes::derivatives
muc = this->sample(thermo_.mu()());
Cpc = this->sample(thermo_.Cp()());
- scalarField Re(rhoc*Uc*d_/(muc + ROOTVSMALL));
- scalarField Pr(Cpc*muc/(kappac + ROOTVSMALL));
- //scalarField Nu(2.0 + 0.6*sqrt(Re)*cbrt(Pr));
+ scalarField Re(rhoc*Uc*d_/muc);
+ scalarField Pr(Cpc*muc/kappac);
+ Pr = max(ROOTVSMALL, Pr);
scalarField Nu(2.0 + (0.4*sqrt(Re) + 0.06*pow(Re, 2/3))*pow(Pr, 0.4));
scalarField htc(Nu*kappac/d_);
@@ -172,7 +172,7 @@ bool Foam::functionObjects::thermoCoupleProbes::write()
dictionary probeDict;
probeDict.add("Tc", Ttc_);
- setProperty(name(), probeDict);
+ setProperty(typeName, probeDict);
return true;
}
diff --git a/src/fvOptions/interRegionOption/interRegionOption.C b/src/fvOptions/interRegionOption/interRegionOption.C
index cb848dc4d888d800abbbc6ca60e134f2526d9ec3..545601905589ac45075fc4ecbd3b0efa1880391f 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.C
+++ b/src/fvOptions/interRegionOption/interRegionOption.C
@@ -102,7 +102,7 @@ Foam::fv::interRegionOption::interRegionOption
mesh
),
master_(coeffs_.lookupOrDefault<bool>("master", true)),
- nbrRegionName_(coeffs_.lookup("nbrRegionName")),
+ nbrRegionName_(coeffs_.lookup("nbrRegion")),
meshInterpPtr_()
{
if (active())
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
index 767f0224897946f812938474c9aa211cb623782b..b6c2be4abc6e7963f7a92e7d60a838618a863cf7 100644
--- a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
@@ -106,7 +106,7 @@ Foam::fv::acousticDampingSource::acousticDampingSource
zeroGradientFvPatchField<vector>::typeName
)
),
- URefName_("unknown-URefName"),
+ URefName_("unknown-URef"),
x0_(Zero),
r1_(0),
r2_(0),
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index b0ecd8c43dd30cb0474b19253b4fb3f7deb75256..89de057f5d062c8f8a8f9ede39850f7b0de9ac7d 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -304,9 +304,9 @@ bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict)
{
if (cellSetOption::read(dict))
{
- UName_ = coeffs_.lookupOrDefault<word>("UName", "U");
- TName_ = coeffs_.lookupOrDefault<word>("TName", "T");
- phiName_ = coeffs_.lookupOrDefault<word>("phiName", "phi");
+ UName_ = coeffs_.lookupOrDefault<word>("U", "U");
+ TName_ = coeffs_.lookupOrDefault<word>("T", "T");
+ phiName_ = coeffs_.lookupOrDefault<word>("phi", "phi");
coeffs_.lookup("faceZone") >> faceZoneName_;
coeffs_.lookup("secondaryMassFlowRate") >> secondaryMassFlowRate_;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
index 4190a1deb2be83a21ce312d78fa3fb6054a46ef0..af0894d4f496ffa035a30e3b8dd3e120506aae7a 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -207,10 +207,10 @@ Foam::fv::tabulatedNTUHeatTransfer::tabulatedNTUHeatTransfer
)
:
interRegionHeatTransferModel(name, modelType, dict, mesh),
- UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
- UNbrName_(coeffs_.lookupOrDefault<word>("UNbrName", "U")),
- rhoName_(coeffs_.lookupOrDefault<word>("rhoName", "rho")),
- rhoNbrName_(coeffs_.lookupOrDefault<word>("rhoNbrName", "rho")),
+ UName_(coeffs_.lookupOrDefault<word>("U", "U")),
+ UNbrName_(coeffs_.lookupOrDefault<word>("UNbr", "U")),
+ rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho")),
+ rhoNbrName_(coeffs_.lookupOrDefault<word>("rhoNbr", "rho")),
ntuTable_(),
geometryMode_(gmCalculated),
Ain_(-1),
@@ -275,10 +275,10 @@ bool Foam::fv::tabulatedNTUHeatTransfer::read(const dictionary& dict)
{
if (option::read(dict))
{
- coeffs_.readIfPresent("UName", UName_);
- coeffs_.readIfPresent("UNbrName", UNbrName_);
- coeffs_.readIfPresent("rhoName", rhoName_);
- coeffs_.readIfPresent("rhoNbrName", rhoNbrName_);
+ coeffs_.readIfPresent("U", UName_);
+ coeffs_.readIfPresent("UNbr", UNbrName_);
+ coeffs_.readIfPresent("rho", rhoName_);
+ coeffs_.readIfPresent("rhoNbr", rhoNbrName_);
// Force geometry re-initialisation
Ain_ = -1;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
index fb488418d4f885a49826d02c936231b88d6f679e..4e0e0170ce8494fac1f11594d2f6aaf20164dc23 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
@@ -68,13 +68,13 @@ Description
tabulatedNTUHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName air;
+ nbrRegion air;
master true;
fieldNames (h);
outOfBounds clamp;
fileName "ntuTable";
- nbrModelName airToCooler;
+ nbrModel airToCooler;
semiImplicit no;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index ac31a793f5dd1b6532b84b6f28c85ca752711b65..38e324f3ecaa2e3e303b1df38d16c45bfca5ab7c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -318,16 +318,19 @@ Foam::InjectionModel<CloudType>::InjectionModel
Info<< " injector ID: " << injectorID_ << endl;
}
- if (owner.solution().transient())
+ if (owner.solution().active())
{
- this->coeffDict().lookup("massTotal") >> massTotal_;
- this->coeffDict().lookup("SOI") >> SOI_;
- }
- else
- {
- massFlowRate_.reset(this->coeffDict());
- massTotal_ = massFlowRate_.value(owner.db().time().value());
- this->coeffDict().readIfPresent("SOI", SOI_);
+ if (owner.solution().transient())
+ {
+ this->coeffDict().lookup("massTotal") >> massTotal_;
+ this->coeffDict().lookup("SOI") >> SOI_;
+ }
+ else
+ {
+ massFlowRate_.reset(this->coeffDict());
+ massTotal_ = massFlowRate_.value(owner.db().time().value());
+ this->coeffDict().readIfPresent("SOI", SOI_);
+ }
}
SOI_ = owner.db().time().userTimeToTime(SOI_);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index 41b1555d383f1c7e9c1f7eaeae3a13809420f65e..c1fd0f678e0cb64ecc6c7333ebde0fe4ba3619f0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -40,7 +40,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
)
:
InjectionModel<CloudType>(dict, owner, modelName,typeName),
- patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patchName")),
+ patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
phiName_(this->coeffDict().template lookupOrDefault<word>("phi", "phi")),
rhoName_(this->coeffDict().template lookupOrDefault<word>("rho", "rho")),
duration_(readScalar(this->coeffDict().lookup("duration"))),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 58d67c726bd366f6f22703f96883c9f46e5f3157..13227e34ef4875770e6848976951da7a7fd3b2c9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -38,7 +38,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
)
:
InjectionModel<CloudType>(dict, owner, modelName, typeName),
- patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patchName")),
+ patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
duration_(readScalar(this->coeffDict().lookup("duration"))),
parcelsPerSecond_
(
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
index edff573a0fe5106af218eca9bf1fffc5b977db20..ad6f3e1001c8868601bb81017b04575288c4e116 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
@@ -37,26 +37,17 @@ Foam::InterfaceForce<CloudType>::InterfaceForce
)
:
ParticleForce<CloudType>(owner, mesh, dict, typeName, true),
- alpaName_
- (
- this->coeffs().template lookup("alphaName")
- ),
- C_
- (
- readScalar(this->coeffs().lookup("C"))
- ),
+ alphaName_(this->coeffs().lookup("alpha")),
+ C_(readScalar(this->coeffs().lookup("C"))),
gradInterForceInterpPtr_(nullptr)
{}
template<class CloudType>
-Foam::InterfaceForce<CloudType>::InterfaceForce
-(
- const InterfaceForce& pf
-)
+Foam::InterfaceForce<CloudType>::InterfaceForce(const InterfaceForce& pf)
:
ParticleForce<CloudType>(pf),
- alpaName_(pf.alpaName_),
+ alphaName_(pf.alphaName_),
C_(pf.C_),
gradInterForceInterpPtr_(pf.gradInterForceInterpPtr_)
{}
@@ -84,7 +75,7 @@ void Foam::InterfaceForce<CloudType>::cacheFields(const bool store)
if (!fieldExists)
{
const volScalarField& alpha = this->mesh().template
- lookupObject<volScalarField>(alpaName_);
+ lookupObject<volScalarField>(alphaName_);
volVectorField* gradInterForcePtr =
new volVectorField(fName, fvc::grad(alpha*(1-alpha)));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
index 15810b1ed558689a117bec53576ab05c7e17fc4f..58320e6e08c02afd25c175c6c631c494bf511470 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
@@ -57,13 +57,13 @@ class InterfaceForce
{
// Private data
- //- Name of VOF field
- const word alpaName_;
+ //- Name of phase fraction field
+ const word alphaName_;
//- Model constant
const scalar C_;
- //- gradInterForce interpolator
+ //- Interpolator for gradInterForce
autoPtr<interpolation<vector>> gradInterForceInterpPtr_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
index 9630f242b28d292dff2e60addf237e663f1868b6..e023c1d0ea47ad93f6ae66ec7b4a4b021326931c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
@@ -41,7 +41,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "linearAccelerationName",
+ "linearAcceleration",
"linearAcceleration"
)
),
@@ -50,7 +50,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "angularVelocityName",
+ "angularVelocity",
"angularVelocity"
)
),
@@ -59,7 +59,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "angularAccelerationName",
+ "angularAcceleration",
"angularAcceleration"
)
),
@@ -68,7 +68,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "centreOfRotationName",
+ "centreOfRotation",
"centreOfRotation"
)
),
diff --git a/src/meshTools/coordinateSystems/cartesianCS.H b/src/meshTools/coordinateSystems/cartesianCS.H
index cdfafc52e4b81e3185a900a09f195f07e9705255..d499f790b4700626f68421a78c60a496fed6fe83 100644
--- a/src/meshTools/coordinateSystems/cartesianCS.H
+++ b/src/meshTools/coordinateSystems/cartesianCS.H
@@ -25,7 +25,7 @@ Class
Foam::cartesianCS
Description
- Cylindrical coordinate system
+ Cartesian coordinate system
SourceFiles
cartesianCS.C
diff --git a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
index f24289c49573d6c7f861c487463197a0f4194f1a..69cb1713c10267e95901c9dd5e889a2143cda64d 100644
--- a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
+++ b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
@@ -61,7 +61,7 @@ void surfaceNoise::initialise(const dictionary& dict)
readerPtr_.reset(surfaceReader::New(readerType, inputFileName_).ptr());
// Find the index of the pressure data
- const word pName(dict.lookupOrDefault<word>("pName", "p"));
+ const word pName(dict.lookupOrDefault<word>("p", "p"));
const List<word> fieldNames(readerPtr_->fieldNames(0));
pIndex_ = findIndex(fieldNames, pName);
if (pIndex_ == -1)
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
index 6375c32c863a83208e1d890b0800d549f6a6ad76..abdd47b6b8084a996382b14975cd29a25dae43d4 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
@@ -34,9 +34,9 @@ Description
{
type filmPyrolysisRadiativeCoupledMixed;
Tnbr T;
- kappa fluidThermo;
+ kappaMethod fluidThermo;
+ kappa none;
Qr Qr;
- kappaName none;
filmDeltaDry 0.0;
filmDeltaWet 3e-4;
value $internalField;
@@ -66,7 +66,7 @@ Description
Notes:
- - kappa and \c kappaName are inherited from temperatureCoupledBase.
+ - \c kappaMethod and \c kappa are inherited from temperatureCoupledBase.
- Qr is the radiative flux defined in the radiation model.
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 048bacd25c9c30b9c5be8e5f01d74e85273f80d4..97e4575fc3787b80159902ad6bf16303f819ccd3 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -431,7 +431,7 @@ Foam::regionModels::regionModel::regionModel
outputPropertiesPtr_(nullptr),
primaryPatchIDs_(),
intCoupledPatchIDs_(),
- regionName_(lookup("regionName")),
+ regionName_(lookup("region")),
functions_(*this, subOrEmptyDict("functions"))
{
if (active_)
@@ -479,7 +479,7 @@ Foam::regionModels::regionModel::regionModel
outputPropertiesPtr_(nullptr),
primaryPatchIDs_(),
intCoupledPatchIDs_(),
- regionName_(dict.lookup("regionName")),
+ regionName_(dict.lookup("region")),
functions_(*this, subOrEmptyDict("functions"))
{
if (active_)
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index 70a3a0f2c1824b35519b7d771e8eb778acb9cb7b..34bdfe2f85fb546ac3b8b92dcfe9e6e7892171a0 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -38,8 +38,7 @@ namespace compressible
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@@ -53,8 +52,7 @@ thermalBaffleFvPatchScalarField
{}
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const thermalBaffleFvPatchScalarField& ptf,
const fvPatch& p,
@@ -76,8 +74,7 @@ thermalBaffleFvPatchScalarField
{}
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@@ -97,8 +94,7 @@ thermalBaffleFvPatchScalarField
if (thisMesh.name() == polyMesh::defaultRegion)
{
- const word regionName =
- dict_.lookupOrDefault<word>("regionName", "none");
+ const word regionName = dict_.lookupOrDefault<word>("region", "none");
const word baffleName("3DBaffle" + regionName);
@@ -121,8 +117,7 @@ thermalBaffleFvPatchScalarField
}
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const thermalBaffleFvPatchScalarField& ptf,
const DimensionedField<scalar, volMesh>& iF
@@ -160,10 +155,9 @@ void thermalBaffleFvPatchScalarField::rmap
void thermalBaffleFvPatchScalarField::createPatchMesh()
{
-
const fvMesh& thisMesh = patch().boundaryMesh().mesh();
- word regionName = dict_.lookup("regionName");
+ word regionName = dict_.lookup("region");
List<polyPatch*> regionPatches(3);
List<word> patchNames(regionPatches.size());
@@ -270,9 +264,8 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
const fvMesh& thisMesh = patch().boundaryMesh().mesh();
- if (thisMesh.name() == polyMesh::defaultRegion && owner_)
+ if (owner_ && (thisMesh.name() == polyMesh::defaultRegion))
{
-
os.writeKeyword("extrudeModel");
os << word(dict_.lookup("extrudeModel"))
<< token::END_STATEMENT << nl;
@@ -293,9 +286,8 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
os.writeKeyword(extrudeModel);
os << dict_.subDict(extrudeModel) << nl;
- word regionName = dict_.lookup("regionName");
- os.writeKeyword("regionName") << regionName
- << token::END_STATEMENT << nl;
+ word regionName = dict_.lookup("region");
+ os.writeKeyword("region") << regionName << token::END_STATEMENT << nl;
bool active = readBool(dict_.lookup("active"));
os.writeKeyword("active") << active
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
index 0bb7a092cedd9c3c6874eaf4b375324bf5ca74e6..6c4198c3adcc2072c3c81aaa8c81672411ba0c24 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
@@ -52,8 +52,8 @@ Usage
// Underlaying coupled boundary condition
Tnbr T;
- kappa fluidThermo; // or solidThermo
- KappaName none;
+ kappaMethod fluidThermo; // or solidThermo
+ kappa none;
QrNbr Qr;//or none.Name of Qr field on neighbourregion
Qr none;// or none.Name of Qr field on localregion
value uniform 300;
@@ -122,8 +122,8 @@ Usage
<slavePatchName>
{
type compressible::thermalBaffle;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
value uniform 300;
\endverbatim
@@ -132,16 +132,16 @@ Usage
bottom
{
type compressible::thermalBaffle;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
value uniform 300;
}
top
{
type compressible::thermalBaffle;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
value uniform 300;
}
\endverbatim
diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C
index 225ee132d39513f702b18312e3fb9016f6468635..80694beb77409fdfc84456cddb85178048efbc69 100644
--- a/src/sampling/probes/patchProbes.C
+++ b/src/sampling/probes/patchProbes.C
@@ -263,7 +263,7 @@ bool Foam::patchProbes::read(const dictionary& dict)
{
if (!dict.readIfPresent("patches", patchNames_))
{
- word patchName(dict.lookup("patchName"));
+ word patchName(dict.lookup("patch"));
patchNames_ = wordReList(1, wordRe(patchName));
}
return probes::read(dict);
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index 65ad05cc7474702b8540bd98a2414fb1e9242a1f..4db21f51a3747fc89e6514cdabf561be84d65e4a 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
@@ -170,7 +170,8 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
momentOfInertia_(sDoFRBM.momentOfInertia_),
aRelax_(sDoFRBM.aRelax_),
aDamp_(sDoFRBM.aDamp_),
- report_(sDoFRBM.report_)
+ report_(sDoFRBM.report_),
+ solver_(sDoFRBM.solver_, false)
{}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
index a91f17e23dcba0650fae3c8bcde5830b6db32714..dc1e864eccc4ce81aa3afcb0375723652cc7edb9 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
@@ -52,6 +52,7 @@ SourceFiles
#include "sixDoFRigidBodyMotionConstraint.H"
#include "Tuple2.H"
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
index b7266df9341aebbb9dfd94fdab4827f78ac8c37a..e04a11d4788b79f8d99f12fc5a5ade050ece1dac 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
@@ -25,6 +25,7 @@ License
#include "sixDoFRigidBodyMotion.H"
#include "IOstreams.H"
+#include "sixDoFSolver.H"
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
@@ -112,6 +113,12 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const
os << decrIndent << indent << token::END_BLOCK << nl;
}
+
+ if (!solver_.empty())
+ {
+ os << indent << "solver";
+ solver_->write(os);
+ }
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.C
index 366266e014b866dd63d9d4fae0a110e85bbb35f0..2bae8f06cfcf2f61ffccce1c91020db9ad4e5aef 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.C
@@ -46,7 +46,7 @@ Foam::sixDoFSolvers::CrankNicolson::CrankNicolson
sixDoFRigidBodyMotion& body
)
:
- sixDoFSolver(body),
+ sixDoFSolver(dict, body),
aoc_(dict.lookupOrDefault<scalar>("aoc", 0.5)),
voc_(dict.lookupOrDefault<scalar>("voc", 0.5))
{}
@@ -90,5 +90,4 @@ void Foam::sixDoFSolvers::CrankNicolson::solve
Q() = Qpi.first();
}
-
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H
index f7866128c8fd909c3d72071298abd3e20c5d7760..4d6a2b82599b207739c9eea0b8f636fa7166c215 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H
@@ -98,6 +98,15 @@ public:
sixDoFRigidBodyMotion& body
);
+ //- Construct and return a clone
+ virtual autoPtr<sixDoFSolver> clone() const
+ {
+ return autoPtr<sixDoFSolver>
+ (
+ new CrankNicolson(dict_, body_)
+ );
+ }
+
//- Destructor
virtual ~CrankNicolson();
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
index 5a392b1b47ce831efd7140c869e84a34f9d20554..101b7ff59625dd0ab8e5734c9deb6d2df2738a41 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
@@ -46,7 +46,7 @@ Foam::sixDoFSolvers::Newmark::Newmark
sixDoFRigidBodyMotion& body
)
:
- sixDoFSolver(body),
+ sixDoFSolver(dict, body),
gamma_(dict.lookupOrDefault<scalar>("gamma", 0.5)),
beta_
(
@@ -111,5 +111,4 @@ void Foam::sixDoFSolvers::Newmark::solve
Q() = Qpi.first();
}
-
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H
index d15bc2fcb1fa9d33729e042b630355a7534f5585..2b1241a7196914427cc1ac3953026d87544303d6 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H
@@ -96,6 +96,15 @@ public:
sixDoFRigidBodyMotion& body
);
+ //- Construct and return a clone
+ virtual autoPtr<sixDoFSolver> clone() const
+ {
+ return autoPtr<sixDoFSolver>
+ (
+ new Newmark(dict_, body_)
+ );
+ }
+
//- Destructor
virtual ~Newmark();
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.C
index 48fbba16f688070a2f40eb3f29dbbffd9a30d00f..e50f01021aa05175d15c7f4abbaa2aa4c2b39ce3 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.C
@@ -24,6 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "sixDoFSolver.H"
+#include "IOstreams.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -36,12 +37,22 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::sixDoFSolver::sixDoFSolver(sixDoFRigidBodyMotion& body)
+Foam::sixDoFSolver::sixDoFSolver
+(
+ const dictionary& dict,
+ sixDoFRigidBodyMotion& body
+)
:
- body_(body)
+ body_(body),
+ dict_(dict)
{}
+void Foam::sixDoFSolver::write(Ostream& os) const
+{
+ os << dict_;
+}
+
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::sixDoFSolver::~sixDoFSolver()
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H
index a1e536f755ea4594f537abfa6e9839d472df032a..70589788df9628a03cbd56c908cbc7ea9192f388 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H
@@ -59,6 +59,9 @@ protected:
//- The rigid body
sixDoFRigidBodyMotion& body_;
+ //- Model dictionary
+ dictionary dict_;
+
// Protected member functions
@@ -148,7 +151,10 @@ public:
// Constructors
// Construct for given body
- sixDoFSolver(sixDoFRigidBodyMotion& body);
+ sixDoFSolver(const dictionary& dict, sixDoFRigidBodyMotion& body);
+
+ //- Construct and return a clone
+ virtual autoPtr<sixDoFSolver> clone() const = 0;
//- Destructor
@@ -175,6 +181,10 @@ public:
scalar deltaT,
scalar deltaT0
) = 0;
+
+
+ //- Write
+ void write(Ostream&) const;
};
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C
index d7ae092e1f502bc4a7b7bf85944e95ee3beac66a..41c1fcf581c16f53cbb77e8fbe0883d34d8a8dc0 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C
@@ -46,7 +46,7 @@ Foam::sixDoFSolvers::symplectic::symplectic
sixDoFRigidBodyMotion& body
)
:
- sixDoFSolver(body)
+ sixDoFSolver(dict, body)
{}
@@ -90,5 +90,4 @@ void Foam::sixDoFSolvers::symplectic::solve
pi() += rConstraints() & aDamp()*0.5*deltaT*tau();
}
-
// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H
index af55141a57274cabe7055270d435e5b189fc8167..3e360fddd1cda2a15ace0fa8985ba544e7d5718f 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H
@@ -95,6 +95,15 @@ public:
sixDoFRigidBodyMotion& body
);
+ //- Construct and return a clone
+ virtual autoPtr<sixDoFSolver> clone() const
+ {
+ return autoPtr<sixDoFSolver>
+ (
+ new symplectic(dict_, body_)
+ );
+ }
+
//- Destructor
virtual ~symplectic();
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
index f092944850f4008b29d9968e8ea32286ff37ab4e..9dc88e2315b1438d3315a1550d7c35e7949254bb 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
@@ -37,66 +37,65 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
chemistryReductionMethod<CompType, ThermoType>(dict, chemistry),
searchInitSet_(this->coeffsDict_.subDict("initialSet").size()),
zprime_(0),
- nbCLarge_(3),
- sC_(this->nSpecie_,0),
- sH_(this->nSpecie_,0),
- sO_(this->nSpecie_,0),
- sN_(this->nSpecie_,0),
+ nbCLarge_(this->coeffsDict_.template lookupOrDefault<label>("nbCLarge", 3)),
+ sC_(this->nSpecie_, 0),
+ sH_(this->nSpecie_, 0),
+ sO_(this->nSpecie_, 0),
+ sN_(this->nSpecie_, 0),
CO2Id_(-1),
COId_(-1),
HO2Id_(-1),
H2OId_(-1),
NOId_(-1),
- automaticSIS_(true),
- phiTol_(this->tolerance()),
- NOxThreshold_(1800),
- CO2Name_
+ automaticSIS_
(
- dict.subDict("reduction").lookupOrDefault<word>
+ this->coeffsDict_.template lookupOrDefault<Switch>
(
- "CO2Name","CO2"
+ "automaticSIS",
+ true
)
),
- COName_
+ phiTol_
(
- dict.subDict("reduction").lookupOrDefault<word>
+ this->coeffsDict_.template lookupOrDefault<scalar>
(
- "COName","CO"
+ "phiTol", this->tolerance()
)
),
- HO2Name_
+ NOxThreshold_
(
- dict.subDict("reduction").lookupOrDefault<word>
+ this->coeffsDict_.template lookupOrDefault<scalar>
(
- "HO2Name","HO2"
+ "NOxThreshold",
+ 1800
)
),
- H2OName_
+ CO2Name_(this->coeffsDict_.template lookupOrDefault<word>("CO2", "CO2")),
+ COName_(this->coeffsDict_.template lookupOrDefault<word>("CO", "CO")),
+ HO2Name_(this->coeffsDict_.template lookupOrDefault<word>("HO2", "HO2")),
+ H2OName_(this->coeffsDict_.template lookupOrDefault<word>("H2O", "H2O")),
+ NOName_(this->coeffsDict_.template lookupOrDefault<word>("NO", "NO")),
+ forceFuelInclusion_
(
- dict.subDict("reduction").lookupOrDefault<word>
+ this->coeffsDict_.template lookupOrDefault<Switch>
(
- "H2OName","H2O"
+ "forceFuelInclusion",
+ false
)
- ),
- NOName_
- (
- dict.subDict("reduction").lookupOrDefault<word>
- (
- "NOName","NO"
- )
- ),
- forceFuelInclusion_(false)
+ )
{
- label j=0;
+ label j = 0;
dictionary initSet = this->coeffsDict_.subDict("initialSet");
- for (label i=0; i<chemistry.nSpecie(); i++)
+
+ for (label i = 0; i < chemistry.nSpecie(); i++)
{
if (initSet.found(chemistry.Y()[i].name()))
{
searchInitSet_[j++] = i;
}
}
- if (j<searchInitSet_.size())
+
+ if (j < searchInitSet_.size())
{
FatalErrorInFunction
<< searchInitSet_.size()-j
@@ -105,28 +104,7 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
<< exit(FatalError);
}
- if (this->coeffsDict_.found("automaticSIS"))
- {
- automaticSIS_.readIfPresent("automaticSIS", this->coeffsDict_);
- }
- if (this->coeffsDict_.found("forceFuelInclusion"))
- {
- forceFuelInclusion_.readIfPresent
- (
- "forceFuelInclusion",this->coeffsDict_
- );
- }
-
- if (this->coeffsDict_.found("phiTol"))
- {
- phiTol_ = readScalar(this->coeffsDict_.lookup("phiTol"));
- }
-
- if (this->coeffsDict_.found("NOxThreshold"))
- {
- NOxThreshold_ = readScalar(this->coeffsDict_.lookup("NOxThreshold"));
- }
const List<List<specieElement>>& specieComposition =
chemistry.specieComp();
@@ -134,11 +112,12 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
{
const List<specieElement>& curSpecieComposition =
specieComposition[i];
+
// For all elements in the current species
forAll(curSpecieComposition, j)
{
- const specieElement& curElement =
- curSpecieComposition[j];
+ const specieElement& curElement = curSpecieComposition[j];
+
if (curElement.name() == "C")
{
sC_[i] = curElement.nAtoms();
@@ -157,7 +136,8 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
}
else
{
- Info<< "element not considered"<<endl;
+ Info<< " element " << curElement.name() << " not considered"
+ << endl;
}
}
if (this->chemistry_.Y()[i].name() == CO2Name_)
@@ -216,10 +196,6 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
<< exit(FatalError);
}
- if (this->coeffsDict_.found("nbCLarge"))
- {
- nbCLarge_ = readLabel(fuelDict.lookup("nbCLarge"));
- }
fuelSpeciesID_.setSize(fuelSpecies_.size());
fuelSpeciesProp_.setSize(fuelSpecies_.size());
@@ -287,9 +263,9 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
c1[this->nSpecie_+1] = p;
// Compute the rAB matrix
- RectangularMatrix<scalar> rABNum(this->nSpecie_,this->nSpecie_,0.0);
- scalarField PA(this->nSpecie_,0.0);
- scalarField CA(this->nSpecie_,0.0);
+ RectangularMatrix<scalar> rABNum(this->nSpecie_, this->nSpecie_, 0.0);
+ scalarField PA(this->nSpecie_, 0.0);
+ scalarField CA(this->nSpecie_, 0.0);
// Number of initialized rAB for each lines
Field<label> NbrABInit(this->nSpecie_,0);
@@ -319,8 +295,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// of the species. It stores the species encountered in the reaction but
// use another list to see if this species has already been used
- DynamicList<scalar> wA(R.lhs().size()+R.rhs().size());
- DynamicList<label> wAID(R.lhs().size()+R.rhs().size());
+ DynamicList<scalar> wA(R.lhs().size() + R.rhs().size());
+ DynamicList<label> wAID(R.lhs().size() + R.rhs().size());
forAll(R.lhs(), s) // Compute rAB for all species in the left hand side
{
@@ -344,7 +320,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// Disable for self reference (by definition rAA=0)
deltaBi[ss] = false;
- while(!usedIndex.empty())
+ while (!usedIndex.empty())
{
label curIndex = usedIndex.pop();
if (deltaBi[curIndex])
@@ -352,7 +328,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// Disable to avoid counting it more than once
deltaBi[curIndex] = false;
// Test if this rAB is not initialized
- if (rABPos(ss, curIndex)==-1)
+ if (rABPos(ss, curIndex) == -1)
{
// It starts at rABPos(ss, sj)=0
rABPos(ss, curIndex) = NbrABInit[ss];
@@ -372,7 +348,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
bool found(false);
forAll(wAID, id)
{
- if (ss==wAID[id])
+ if (ss == wAID[id])
{
wA[id] += sl*omegai;
found = true;
@@ -385,7 +361,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
}
}
- forAll(R.rhs(), s) // Compute rAB for all species in the right hand side
+ // Compute rAB for all species in the right hand side
+ forAll(R.rhs(), s)
{
label ss = R.rhs()[s].index;
scalar sl = R.rhs()[s].stoichCoeff; // vAi = v''-v' => here v''
@@ -407,7 +384,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// Disable for self reference (by definition rAA=0)
deltaBi[ss] = false;
- while(!usedIndex.empty())
+ while (!usedIndex.empty())
{
label curIndex = usedIndex.pop();
if (deltaBi[curIndex])
@@ -488,8 +465,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
label nElements = 4; // 4 main elements (C, H, O, N)
// Total number of C, H and O (in this order)
- scalarList Na(nElements,0.0);
- scalarList Nal(nElements,0.0); // for large hydrocarbons
+ scalarList Na(nElements, 0.0);
+ scalarList Nal(nElements, 0.0); // for large hydrocarbons
for (label i=0; i<this->nSpecie_; i++)
{
@@ -502,6 +479,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
{
continue;
}
+
Na[0] += sC_[i]*c[i];
Na[1] += sH_[i]*c[i];
Na[2] += sO_[i]*c[i];
@@ -523,12 +501,12 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// 2Cl + Hl/2
// Equivalence ratio for fuel decomposition = ----------
// Ol(+O2)
- phiLarge = (2*Nal[0]+Nal[1]/2)/Nal[2];
+ phiLarge = (2*Nal[0] + Nal[1]/2)/Nal[2];
}
// Using the rAB matrix (numerator and denominator separated)
// compute the R value according to the search initiating set
- scalarField Rvalue(this->nSpecie_,0.0);
+ scalarField Rvalue(this->nSpecie_, 0.0);
label speciesNumber = 0;
// Set all species to inactive and activate them according
@@ -583,7 +561,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
if (forceFuelInclusion_)
{
- forAll(fuelSpeciesID_,i)
+ forAll(fuelSpeciesID_, i)
{
Q.push(fuelSpeciesID_[i]);
speciesNumber++;
@@ -607,7 +585,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
Rvalue[H2OId_] = 1.0;
if (forceFuelInclusion_)
{
- forAll(fuelSpeciesID_,i)
+ forAll(fuelSpeciesID_, i)
{
Q.push(fuelSpeciesID_[i]);
speciesNumber++;
@@ -617,7 +595,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
}
}
- if (T>NOxThreshold_ && NOId_!=-1)
+ if (T > NOxThreshold_ && NOId_ != -1)
{
Q.push(NOId_);
speciesNumber++;
@@ -641,7 +619,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
while (!Q.empty())
{
label u = Q.pop();
- scalar Den = max(PA[u],CA[u]);
+ scalar Den = max(PA[u], CA[u]);
if (Den!=0.0)
{
for (label v=0; v<NbrABInit[u]; v++)
@@ -709,7 +687,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
this->NsSimp_ = speciesNumber;
scalarField& simplifiedC(this->chemistry_.simplifiedC());
- simplifiedC.setSize(this->NsSimp_+2);
+ simplifiedC.setSize(this->NsSimp_ + 2);
DynamicList<label>& s2c(this->chemistry_.simplifiedToCompleteIndex());
s2c.setSize(this->NsSimp_);
Field<label>& c2s(this->chemistry_.completeToSimplifiedIndex());
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
index fc0f36a9a5a6e711e2c2cd6de4981edb3c4a7645..d42c830febf97890d3cfaa2b3b0edf1a65cd5dba 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
@@ -25,7 +25,7 @@ Class
Foam::chemistryReductionMethods::DAC
Description
- The Dynamic Adaptive Chemistry (DAC) method [1] simplify the chemistry
+ The Dynamic Adaptive Chemistry (DAC) method [1] simplifies the chemistry
using the matrix rAB defined by (DRGEP algorithm [2])
|sum_i=1->Nr vAi wi dBi|
@@ -40,13 +40,14 @@ Description
stoechiometric coefficient of species A in the ith reaction (vAi = v''-v')
, wi is the progress variable of reaction i and dBi equals 1 if reaction i
involves B and O otherwise.
- rAB show the error introduced to the production rates of A when B and all
+
+ rAB shows the error introduced to the production rates of A when B and all
the reactions including it are removed. It is computed as in [3] so that
the algorithm is O(Nr).
- DAC uses a initial set of species that represents the major parts of the
+ DAC uses an initial set of species that represent the major parts of the
combustion mechanism, i.e. H2/O2, fuel decomposition and CO2 production.
- Usualy, it includes the fuel, HO2 and CO. Then it computes the dependance
+ Usually, it includes the fuel, HO2 and CO. Then it computes the dependance
of these set to the other species. This is done by introducing R-value
defined by
@@ -122,6 +123,7 @@ class DAC
word CO2Name_, COName_, HO2Name_, H2OName_, NOName_;
Switch forceFuelInclusion_;
+
public:
//- Runtime type information
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C
index 584ecf2d63ad49c6d84d0a4a02fb9a98084da979..aeaa4758cdeb1fab12f4acc66bfbdaf1522d4a5c 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C
@@ -403,7 +403,7 @@ bool Foam::chemPointISAT<CompType, ThermoType>::inEOA(const scalarField& phiq)
label maxIndex = -1;
for (label i=0; i<completeSpaceSize(); i++)
{
- if(max < propEps[i])
+ if (max < propEps[i])
{
max = propEps[i];
maxIndex = i;
@@ -412,11 +412,11 @@ bool Foam::chemPointISAT<CompType, ThermoType>::inEOA(const scalarField& phiq)
word propName;
if (maxIndex >= completeSpaceSize()-2)
{
- if(maxIndex == completeSpaceSize()-2)
+ if (maxIndex == completeSpaceSize()-2)
{
propName = "T";
}
- else if(maxIndex == completeSpaceSize()-1)
+ else if (maxIndex == completeSpaceSize()-1)
{
propName = "p";
}
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index 440c41e9f90c301bde8a789557f14018fefcbde2..f0c36d21ea2b41bf1dce15e916d98422af1942ee 100644
--- a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -226,7 +226,7 @@ humidityTemperatureCoupledMixedFvPatchScalarField
TnbrName_(dict.lookupOrDefault<word>("Tnbr", "T")),
QrNbrName_(dict.lookupOrDefault<word>("QrNbr", "none")),
QrName_(dict.lookupOrDefault<word>("Qr", "none")),
- specieName_(dict.lookupOrDefault<word>("specieName", "none")),
+ specieName_(dict.lookupOrDefault<word>("specie", "none")),
liquid_(nullptr),
liquidDict_(),
mass_(patch().size(), 0.0),
@@ -749,7 +749,7 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write
os.writeKeyword("mode")<< massModeTypeNames_[mode_]
<< token::END_STATEMENT <<nl;
- writeEntryIfDifferent<word>(os, "specieName", "none", specieName_);
+ writeEntryIfDifferent<word>(os, "specie", "none", specieName_);
os.writeKeyword("carrierMolWeight")<< Mcomp_
<< token::END_STATEMENT <<nl;
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
index 11fc5abcb0cebcb2740d0fce5998cec70a21c15b..9eea39ef7783c8c78f79f5c6a437433d2d127543 100644
--- a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2015 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2015-2016 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,6 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
-
Foam::
compressible::
humidityTemperatureCoupledMixedFvPatchScalarField
@@ -94,8 +93,8 @@ Description
myInterfacePatchName
{
type thermalHumidityCoupledMixed;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
// Modes of operation: inert, condensation, vaporization, condEvap
mode condEvap;
@@ -137,8 +136,8 @@ Description
myInterfacePatchName
{
type thermalInertiaMassTransferCoupledMixed;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
value uniform 260;
}
\endverbatim
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allrun b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
index 4ff5fb63f248b75430ae62a8870917fef189e286..125c236a6c74808003188cbb856c8644d66e7455 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allrun
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
@@ -4,12 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
-
runApplication blockMesh
runApplication boxTurb
-runApplication $application
+runApplication $(getApplication)
runApplication -s enstrophy postProcess -func enstrophy
#------------------------------------------------------------------------------
diff --git a/tutorials/basic/laplacianFoam/flange/Allclean b/tutorials/basic/laplacianFoam/flange/Allclean
index c9b3f9f8d41e9647d312e1aad8b34642fb4b86f3..dc38fab61fdacb0022970913862e87e614c30bb8 100755
--- a/tutorials/basic/laplacianFoam/flange/Allclean
+++ b/tutorials/basic/laplacianFoam/flange/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-rm -rf EnSight Ensight Fieldview > /dev/null 2>&1
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
+rm -rf Fieldview > /dev/null 2>&1
#------------------------------------------------------------------------------
diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun
index ac1e880823e320228d9149db460c0daef0e993f5..59e996ba18f57017cacb2534754c9b3ba3c11d80 100755
--- a/tutorials/basic/laplacianFoam/flange/Allrun
+++ b/tutorials/basic/laplacianFoam/flange/Allrun
@@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
-
runAnsysToFoam()
{
if [ -f log.ansysToFoam ]
@@ -19,7 +16,7 @@ runAnsysToFoam()
}
runAnsysToFoam flange.ans 0.001
-runApplication $application
+runApplication $(getApplication)
runApplication foamToEnsight -noZero
runApplication foamToEnsightParts -noZero
runApplication foamToVTK
diff --git a/tutorials/basic/potentialFoam/cylinder/Allclean b/tutorials/basic/potentialFoam/cylinder/Allclean
index 7db36b267cf5c15df49ee1d0402efdeadcef574b..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allclean
+++ b/tutorials/basic/potentialFoam/cylinder/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-\rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun
index fc215995a524779911dff4992c9d26b24ac5747a..ad39e41c0a3660ad65637c2d83c085ae3986df4d 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allrun
+++ b/tutorials/basic/potentialFoam/cylinder/Allrun
@@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
restore0Dir
runApplication blockMesh
-runApplication $application -withFunctionObjects -writePhi -writep
+runApplication $(getApplication) -withFunctionObjects -writePhi -writep
runApplication streamFunction
#------------------------------------------------------------------------------
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allclean b/tutorials/basic/potentialFoam/pitzDaily/Allclean
index 5734444f4e74e87d3d685ad82df35bcb7e3b300e..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allclean
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun
index 8affee72b0f35fafb4b263e5d4112ee6a3967d5e..2c9adcb14b53b9a3e33da88eb6d239d2422edda9 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allrun
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun
@@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
restore0Dir
runApplication blockMesh
-runApplication $application -writePhi -writep
+runApplication $(getApplication) -writePhi -writep
runApplication streamFunction
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean
index bfa08cad4b3bdce3b6880daed797713330a92724..189dd60ac401acae1a0b835dabe0860cd76d32a6 100755
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean
@@ -3,14 +3,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
cleanCase
+rm -rf 0
rm -rf VTK
-rm -rf 0
-rm -rf constant/polyMesh/sets constant/polyMesh/faces
-rm -rf constant/polyMesh/faces
-rm -rf constant/polyMesh/points
-rm -rf constant/polyMesh/owner
-rm -rf constant/polyMesh/neighbour
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
index 12857916b89ad31196fd6649b513a9ffe0089f79..312f7aa370c487b73497f6464b0f38f8575d1733 100755
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
@@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -12,7 +11,6 @@ runApplication topoSet
runApplication PDRMesh -overwrite
-# Run
runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
index b393b43b53655e47f3265027256c4afd96d330b5..c8dba9d60a05f8599a70746c1949cf96b977e8eb 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
@@ -23,8 +23,8 @@ coupledFaces
coupledFacesSet
{
- wallPatchName baffleWall;
- cyclicMasterPatchName baffleCyclic_half0;
+ wallPatch baffleWall;
+ cyclicMasterPatch baffleCyclic_half0;
}
}
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..61edfb303237d95429c1833e5f77dfbfd671288b
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+rm -rf 0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun
index d79a59a4f59e8ef02bd59f191e78813ec1261ace..fa51ae65e3c2e62df30538111ca04090a28ff9db 100755
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun
@@ -1,7 +1,7 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
-cd ${0%/*} || exit 1
-
+# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
./Allrun.mesh
@@ -15,3 +15,5 @@ runParallel potentialFoam -pName pPotential -initialiseUBCs
\rm -f processor*/0/phi
runParallel XiDyMFoam
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh
index 27f296d69a3a392c3562ff8a138fc2f92fd792cd..59a8b9b93db8b8db05b5dcd21271cbfe54fba2ae 100755
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh
@@ -1,11 +1,9 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
-cd ${0%/*} || exit 1
-
+# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-rm -f log.* constant/polyMesh/*Level
-
runApplication blockMesh
runApplication -s cyclic \
@@ -21,3 +19,5 @@ runApplication -s ami \
runApplication transformPoints -scale '(0.01 0.01 0.01)'
runApplication mergeOrSplitBaffles -split -overwrite
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/blockMeshDict
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/blockMeshDict
diff --git a/tutorials/combustion/chemFoam/gri/Allclean b/tutorials/combustion/chemFoam/gri/Allclean
index a3d5bcf25f51f3320e6b8653909227871c77dee2..6d98f58208e76f0aa4e0aff3d6de550c49b0e268 100755
--- a/tutorials/combustion/chemFoam/gri/Allclean
+++ b/tutorials/combustion/chemFoam/gri/Allclean
@@ -1,12 +1,13 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+rm -rf 0
-rm -rf 0 chemFoam.out constant/reactions constant/thermo \
+rm -rf chemFoam.out constant/reactions constant/thermo \
validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/gri/Allrun b/tutorials/combustion/chemFoam/gri/Allrun
index 7175763e19724e82c8aaadcf9c8416ed2a9b12a3..9f91a1a6ccd1687bb46e465196a6d7615ee700d8 100755
--- a/tutorials/combustion/chemFoam/gri/Allrun
+++ b/tutorials/combustion/chemFoam/gri/Allrun
@@ -4,14 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
runApplication chemkinToFoam \
chemkin/chem.inp chemkin/therm.dat chemkin/transportProperties \
constant/reactions constant/thermo
-runApplication $application
+runApplication $(getApplication)
(cd validation && ./Allrun $*)
diff --git a/tutorials/combustion/chemFoam/gri/validation/Allrun b/tutorials/combustion/chemFoam/gri/validation/Allrun
index 0720352189f10e3469ea28e7dfa1e5060c4fcafc..041628b097f58cf578c6c382a93f8eed8a267627 100755
--- a/tutorials/combustion/chemFoam/gri/validation/Allrun
+++ b/tutorials/combustion/chemFoam/gri/validation/Allrun
@@ -1,5 +1,4 @@
#!/bin/sh
-
cd ${0%/*} || exit 1 # Run from this directory
# Extract Chemkin II data into a friendlier format
@@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 " " $8 }' \
./createGraph
#------------------------------------------------------------------------------
-
-
diff --git a/tutorials/combustion/chemFoam/h2/Allclean b/tutorials/combustion/chemFoam/h2/Allclean
index d511cde495b10a4ec299580f21d9f76a926cd22b..5d4bbd8d8453e850056d9668225ca6bf23b7d194 100755
--- a/tutorials/combustion/chemFoam/h2/Allclean
+++ b/tutorials/combustion/chemFoam/h2/Allclean
@@ -1,12 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+rm -rf 0
-rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
+rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------
-
diff --git a/tutorials/combustion/chemFoam/h2/Allrun b/tutorials/combustion/chemFoam/h2/Allrun
index de26a4017d4750deb022950c5cd98c87da8d6a6a..a90b3d865ce2bdd38cc3bc1255897171006ae8e7 100755
--- a/tutorials/combustion/chemFoam/h2/Allrun
+++ b/tutorials/combustion/chemFoam/h2/Allrun
@@ -4,10 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
-runApplication $application
+runApplication $(getApplication)
(cd validation && ./Allrun $*)
diff --git a/tutorials/combustion/chemFoam/h2/validation/Allrun b/tutorials/combustion/chemFoam/h2/validation/Allrun
index 0720352189f10e3469ea28e7dfa1e5060c4fcafc..041628b097f58cf578c6c382a93f8eed8a267627 100755
--- a/tutorials/combustion/chemFoam/h2/validation/Allrun
+++ b/tutorials/combustion/chemFoam/h2/validation/Allrun
@@ -1,5 +1,4 @@
#!/bin/sh
-
cd ${0%/*} || exit 1 # Run from this directory
# Extract Chemkin II data into a friendlier format
@@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 " " $8 }' \
./createGraph
#------------------------------------------------------------------------------
-
-
diff --git a/tutorials/combustion/chemFoam/ic8h18/Allclean b/tutorials/combustion/chemFoam/ic8h18/Allclean
index d511cde495b10a4ec299580f21d9f76a926cd22b..5d4bbd8d8453e850056d9668225ca6bf23b7d194 100755
--- a/tutorials/combustion/chemFoam/ic8h18/Allclean
+++ b/tutorials/combustion/chemFoam/ic8h18/Allclean
@@ -1,12 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+rm -rf 0
-rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
+rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------
-
diff --git a/tutorials/combustion/chemFoam/ic8h18/Allrun b/tutorials/combustion/chemFoam/ic8h18/Allrun
index de26a4017d4750deb022950c5cd98c87da8d6a6a..a90b3d865ce2bdd38cc3bc1255897171006ae8e7 100755
--- a/tutorials/combustion/chemFoam/ic8h18/Allrun
+++ b/tutorials/combustion/chemFoam/ic8h18/Allrun
@@ -4,10 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
-runApplication $application
+runApplication $(getApplication)
(cd validation && ./Allrun $*)
diff --git a/tutorials/combustion/chemFoam/ic8h18/validation/Allrun b/tutorials/combustion/chemFoam/ic8h18/validation/Allrun
index 0720352189f10e3469ea28e7dfa1e5060c4fcafc..041628b097f58cf578c6c382a93f8eed8a267627 100755
--- a/tutorials/combustion/chemFoam/ic8h18/validation/Allrun
+++ b/tutorials/combustion/chemFoam/ic8h18/validation/Allrun
@@ -1,5 +1,4 @@
#!/bin/sh
-
cd ${0%/*} || exit 1 # Run from this directory
# Extract Chemkin II data into a friendlier format
@@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 " " $8 }' \
./createGraph
#------------------------------------------------------------------------------
-
-
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean
index 84cf4789e86afe2a919245e96d6dbda5ad1bce97..5d4bbd8d8453e850056d9668225ca6bf23b7d194 100755
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean
@@ -1,11 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+rm -rf 0
-rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
+rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun
index 62adab28f3460c97ff3112e605c9fb2d5e5c8dcd..a90b3d865ce2bdd38cc3bc1255897171006ae8e7 100755
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun
@@ -4,10 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=`getApplication`
-
-runApplication $application
+runApplication $(getApplication)
(cd validation && ./Allrun $*)
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/Allrun b/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/Allrun
index 0720352189f10e3469ea28e7dfa1e5060c4fcafc..041628b097f58cf578c6c382a93f8eed8a267627 100755
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/Allrun
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/Allrun
@@ -1,5 +1,4 @@
#!/bin/sh
-
cd ${0%/*} || exit 1 # Run from this directory
# Extract Chemkin II data into a friendlier format
@@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 " " $8 }' \
./createGraph
#------------------------------------------------------------------------------
-
-
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph b/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
index 9019192823ea8167530d83828915c182cfb7986f..d406960eff0e42c544b00cb521d4f53bbedb5d33 100755
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
@@ -21,5 +21,4 @@ gnuplot<<EOF
"chemkinII" with lines title "Chemkin II" lt -1
EOF
-# ----------------------------------------------------------------- end-of-file
-
+# -----------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/nc7h16/Allclean b/tutorials/combustion/chemFoam/nc7h16/Allclean
index d511cde495b10a4ec299580f21d9f76a926cd22b..5d4bbd8d8453e850056d9668225ca6bf23b7d194 100755
--- a/tutorials/combustion/chemFoam/nc7h16/Allclean
+++ b/tutorials/combustion/chemFoam/nc7h16/Allclean
@@ -1,12 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+rm -rf 0
-rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
+rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------
-
diff --git a/tutorials/combustion/chemFoam/nc7h16/Allrun b/tutorials/combustion/chemFoam/nc7h16/Allrun
index de26a4017d4750deb022950c5cd98c87da8d6a6a..a90b3d865ce2bdd38cc3bc1255897171006ae8e7 100755
--- a/tutorials/combustion/chemFoam/nc7h16/Allrun
+++ b/tutorials/combustion/chemFoam/nc7h16/Allrun
@@ -4,10 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
-runApplication $application
+runApplication $(getApplication)
(cd validation && ./Allrun $*)
diff --git a/tutorials/combustion/chemFoam/nc7h16/validation/Allrun b/tutorials/combustion/chemFoam/nc7h16/validation/Allrun
index 0720352189f10e3469ea28e7dfa1e5060c4fcafc..041628b097f58cf578c6c382a93f8eed8a267627 100755
--- a/tutorials/combustion/chemFoam/nc7h16/validation/Allrun
+++ b/tutorials/combustion/chemFoam/nc7h16/validation/Allrun
@@ -1,5 +1,4 @@
#!/bin/sh
-
cd ${0%/*} || exit 1 # Run from this directory
# Extract Chemkin II data into a friendlier format
@@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 " " $8 }' \
./createGraph
#------------------------------------------------------------------------------
-
-
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allclean b/tutorials/combustion/engineFoam/kivaTest/Allclean
index 6904a7f0e6a19fcdbeeb9adb6fff02b5d3e1825b..b1fa019711a5844a72090782a6fc7ee413f96646 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allclean
+++ b/tutorials/combustion/engineFoam/kivaTest/Allclean
@@ -5,11 +5,10 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
mv ./-180 temp180
-cleanCase
-rm -rf 0 > /dev/null 2>&1
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
+cleanCase
+rm -rf 0
mv temp180 ./-180
-#------------------------------------------------------------------------------
\ No newline at end of file
+#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun
index 33555b48098a6740d8bfa64f855d6a6524efdf60..d5434dff00792b057defd27be919037c2fc163d6 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allrun
+++ b/tutorials/combustion/engineFoam/kivaTest/Allrun
@@ -4,11 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
-
runApplication kivaToFoam -file otape17
-
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
index d6badd923f8777ca26aa447704b12f569cd29c96..7f7395413b968e116eca7ced698e67bc3116af51 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
@@ -44,7 +44,7 @@ boundaryField
"region0_to_.*"
{
type compressible::turbulentTemperatureRadCoupledMixed;
- neighbourFieldName T;
+ neighbourField T;
kappaMethod solidThermo;
QrNbr Qr;
Qr none;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean b/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean
index c983aa5c4cf1ecf902607d503651beb7888839e9..3ed713392c5bcec015f5dacfb51ed1e491b94209 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean
@@ -1,10 +1,11 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf constant/panelRegion/polyMesh
rm -f constant/polyMesh/boundary
-
+rm -f validation/*.eps
# -----------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun b/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
index f4139300d2f3bb5b8cafe55ea7e26317d4025ad3..1fb613fedb3c671fbddaa847cdef14fba898b88e 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -23,6 +23,6 @@ runParallel $(getApplication)
paraFoam -touch
paraFoam -touch -region panelRegion
-(cd validation && ./crateGraphs)
+(cd validation && ./createGraphs)
# -----------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
index f30f0b96b7af9832f6dd9756c6facabde4cc03c4..525a4eb95df5e75f86cddecda9f4919122585867 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
@@ -18,7 +18,7 @@ FoamFile
".*"
{
mode lookup;
- emissivity 1.0;
+ emissivity 0.8;
absorptivity 0.0;
}
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
index e4bfa70b9f8326f78c09dc4b7253a154e90c5fea..d9ca794ff1b3d3bb51f5062b5df1bba759a19380 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
@@ -23,7 +23,7 @@ eddyDissipationDiffusionModelCoeffs
{
semiImplicit false;
CEDC 4;
- Cd 6;
+ Cd 4;
}
infinitelyFastChemistryCoeffs
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
index c3723b4087c0c7e4eb76998c68da38af126e9368..68ea708f1fc07d23b81db2bb88705e2597219e55 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
@@ -20,13 +20,7 @@ radiation on;
radiationModel opaqueSolid;
-absorptionEmissionModel multiBandSolidAbsorptionEmission;
-
-multiBandSolidAbsorptionEmissionCoeffs
-{
- absorptivity (0 0);
- emissivity (1 1);
-}
+absorptionEmissionModel none;
transmissivityModel none;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
index 3092ba2020d4995a6195f93c9f68204f451ec534..5faa7ba0c3ea8834da2e93a348437be3a1f16d7b 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
@@ -20,7 +20,7 @@ FoamFile
pyrolysisModel thermo;
- regionName panelRegion;
+ region panelRegion;
noPyrolysisCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
index 262ba8e50e49f00922ddb1a469a7e76fb8a5fd21..4ca47a820be16e2c29d44c05c6a6a6173122cd6e 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
@@ -23,14 +23,14 @@ radiationModel fvDOM;
fvDOMCoeffs
{
- nPhi 4;
+ nPhi 2;
nTheta 4;
- convergence 1e-3;
- maxIter 3;
+ convergence 1e-5;
+ maxIter 5;
}
// Number of flow iterations per radiation iteration
-solverFreq 20;
+solverFreq 15;
absorptionEmissionModel greyMeanAbsorptionEmission;
@@ -44,7 +44,7 @@ constantAbsorptionEmissionCoeffs
greyMeanAbsorptionEmissionCoeffs
{
//lookUpTableFileName "SpeciesTable";
- EhrrCoeff 0.2;
+ EhrrCoeff 0.15;
CO2
{
Tcommon 200; //Common Temp
@@ -64,11 +64,11 @@ greyMeanAbsorptionEmissionCoeffs
hiTcoeffs //coefss for T > Tcommon
(
18.741
- -121.31e3
+ -121.31e3
273.5e6
- -194.05e9
+ -194.05e9
56.31e12
- -5.8169e15
+ -5.8169e15
);
}
@@ -119,10 +119,10 @@ greyMeanAbsorptionEmissionCoeffs
hiTcoeffs
(
6.6334
- -0.0035686
+ -0.0035686
1.6682e-8
2.5611e-10
- -2.6558e-14
+ -2.6558e-14
0
);
}
@@ -145,7 +145,7 @@ greyMeanAbsorptionEmissionCoeffs
);
hiTcoeffs
(
- 0.1
+ 0.01
0
0
0
@@ -173,7 +173,7 @@ greyMeanAbsorptionEmissionCoeffs
);
hiTcoeffs
(
- 0.1
+ 0.01
0
0
0
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
index 86de22e33ce32fc37dd60eb6cdae3b24a812a098..6efe72eb274eb6fd2c0729b00715edca67ba8f20 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
index b32e0fc2fa6a8cfc5094f591a0208fa4bc77aef1..b457a63123a2aa13f77f47a0fb62f15f7cbc0f33 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
@@ -32,8 +32,7 @@ LES
kEqnCoeffs
{
- Ck 0.074;
- Ce 1.048;
+ Ck 0.06;
}
cubeRootVolCoeffs
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
index bc6ad0d11e1cb9ef8845f98fb89805c1d2b36a0e..a3010f4c5504e25bc2e317cc1eabd7eff2b74d60 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
@@ -28,7 +28,7 @@ deltaT 0.001;
writeControl adjustableRunTime;
-writeInterval 10;
+writeInterval 20;
purgeWrite 0;
@@ -44,11 +44,11 @@ timePrecision 6;
graphFormat raw;
-runTimeModifiable yes;
+runTimeModifiable no;
adjustTimeStep yes;
-maxCo 1.2;
+maxCo 2;
maxDi 0.25;
@@ -61,7 +61,7 @@ functions
type surfaceFieldValue;
libs ("libfieldFunctionObjects.so");
writeControl timeStep;
- writeInterval 20;
+ writeInterval 200;
log true;
writeFields no;
regionType patch;
@@ -74,10 +74,10 @@ functions
{
type patchProbes;
libs ("libsampling.so");
- writeControl writeTime;
- writeInterval 20;
+ writeControl timeStep;
+ writeInterval 200;
log true;
- patchName region0_to_panelRegion_wallPanel;
+ patch region0_to_panelRegion_wallPanel;
probeLocations
(
(0.15 0.0 0.01) // HF2
@@ -91,10 +91,10 @@ functions
{
type patchProbes;
libs ("libsampling.so");
- writeControl writeTime;
- writeInterval 20;
+ writeControl timeStep;
+ writeInterval 200;
log true;
- patchName inlet;
+ patch inlet;
probeLocations
(
( 0.0 0.0 0.0 ) // HF1
@@ -154,8 +154,8 @@ functions
{
type probes;
libs ("libsampling.so");
- writeControl writeTime;
- writeInterval 30;
+ writeControl timeStep;
+ writeInterval 200;
probeLocations
(
(-0.1 0.02 0.0) // Lower Gas
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
index c3589f3c8b8caeb36f7893ecccc0953d5bf9c8dc..06045750356a2e2caf8347a3b70adb69bc180d54 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
@@ -48,7 +48,7 @@ divSchemes
laplacianSchemes
{
- default Gauss linear uncorrected;
+ default Gauss linear orthogonal;
}
interpolationSchemes
@@ -58,7 +58,7 @@ interpolationSchemes
snGradSchemes
{
- default uncorrected;
+ default orthogonal;
}
fluxRequired
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
index 790df096e9589750e7257b1a8275527431472e7c..4700d62060d70688c9b6f67d10740f75fe413cb0 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
@@ -77,7 +77,7 @@ solvers
PIMPLE
{
momentumPredictor yes;
- nOuterCorrectors 3;
+ nOuterCorrectors 2;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
}
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
index 4284cbd12a88a2dd38e4befa3793267c77d531b4..3f025efa1b3e3b80fa56b4744977c6d8f71b8606 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
@@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# License
@@ -77,6 +77,8 @@ EXPT="$DATAFILET"
echo $OF
echo $EXPT
+#
+
#createEpsT $OF 2 $EXPT 12 Temperature
#createEpsT $OF 3 $EXPT 10 Temperature
#createEpsT $OF 5 $EXPT 3 Temperature
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
index eb0432c914aea3a9fe5bdd31d10fe0ebbd0e6e25..11f9c8cee2bc4a11e469d3f8bdd62b1854943fe2 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel reactingOneDim;
- regionName pyrolysisRegion;
+ region pyrolysisRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
index 533b5c022e432c29efe6b3e66adeadb50e833015..9b3c6deeae2b1cc0032af3a91a90684d3333a8d3 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,7 +19,7 @@ active true;
surfaceFilmModel thermoSingleLayer;
-regionName filmRegion;
+region filmRegion;
thermoSingleLayerCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean
index ed4bd14d20b71759d38c24948fa5b96b9aba05b3..f8c61931336992636c285da8b21da0c2148281bf 100755
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean
@@ -7,8 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
rm -f 0/ph_rgh
+rm -f 0/polyMesh/cellMap
rm -rf constant/panelRegion/polyMesh
-rm -f 0/polyMesh/cellMap
-rm -f constant/polyMesh/boundary
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun
index c153fe65d5b7b86973eeb27d3ca6bd7ba538fe55..c46299855a1fe7dc288e8fbc4c884440ff63180f 100755
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun
@@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
runApplication blockMesh
runApplication -s cRefine \
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
index 9741bf6aa2a24d99677473eacaa7d0910382d3f9..5de2a6e8162ff56635bb3abcd4df7a2ef110d209 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel reactingOneDim;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
index 0c06604be7219f6adb26289b0579134c6904278a..3dfc5162953ba3597cae2ebba4a241ce533ffbe7 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean b/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean
index be64e41b64f5511c0d92b81cf342e70ce9b6b5a7..b333961d48f9124298c175446d2196d3676d2e5f 100755
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun b/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun
index 9a56766a61c83665993f2e86982e36d3f6dc2ed5..ba88bc10f317372bcd9c32c27fadb6ed300ee4a5 100755
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun
@@ -1,16 +1,12 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
-
runApplication topoSet
-
runApplication extrudeToRegionMesh -overwrite
-
-# Run
runApplication $(getApplication)
paraFoam -touchAll
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
index 4074c3e862c3b603674372d333eeafd50589947b..a099495670d023da0a3f793e0de0533b8203f3a4 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
@@ -21,7 +21,7 @@ FoamFile
pyrolysisModel reactingOneDim;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
index 5d869e9a24ba1cbae88bc26e34362d77584dd5cc..b4ae8c3b340e0e23c6460ffe2ec15c81641000e6 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,5 +19,5 @@ active false;
surfaceFilmModel none;
-regionName none;
+region none;
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/system/blockMeshDict
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun
index 819d8380acbcb8c10c3ea7c02bab696d1acdd785..942f56f2ec95697f5bcb7f25d2559e66d9d71918 100755
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun
@@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -11,7 +10,6 @@ runApplication createPatch -overwrite
cp 0/ph_rgh.orig 0/ph_rgh
-# Run
runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
index d0661cb34022a2e4ab06440101ed024549cbacd7..641f34fa0fd6543f9e450c7260b127e43eb191dd 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel none;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions.twoSteps b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactions.twoSteps
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions.twoSteps
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactions.twoSteps
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
index 0c06604be7219f6adb26289b0579134c6904278a..3dfc5162953ba3597cae2ebba4a241ce533ffbe7 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties.twoSteps b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties.twoSteps
rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun
index aaab3e36d7d5bccd64e59cd7c0f4d5ac53248466..8c42b7a25ef1f2eba1d6c1e537f79c1a4cbc3cf2 100755
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun
@@ -1,11 +1,9 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
runApplication blockMesh
runApplication topoSet
runApplication createPatch -overwrite
@@ -13,8 +11,6 @@ runApplication createPatch -overwrite
cp 0/ph_rgh.orig 0/ph_rgh
runApplication decomposePar -force
-
-# Run
-runParallel $application
+runParallel $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
index d0661cb34022a2e4ab06440101ed024549cbacd7..641f34fa0fd6543f9e450c7260b127e43eb191dd 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel none;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
index 0c06604be7219f6adb26289b0579134c6904278a..e833ca17355621962b672ebd55514061599b3367 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean
index 91996c46bbe6700e19b8f16ec21ed0a0de26fa4d..a5e65c7d81ba11f5fce4451cefd5d25886c31879 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean
@@ -6,6 +6,5 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
cleanSamples
-rm -rf constant/polyMesh/boundary
#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
index 0e21e4a7f618e36bac6b81fe4abdc6dbadb7fb6e..b6716d88fb7ded1749f9a99015171afd16e43228 100755
--- a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean
@@ -4,10 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# Remove 0 directory - recreated from 0.orig
-\rm -rf 0
-
cleanCase
cleanSamples
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean
index cc15617bf67c5c394ba94768696ab52a659c5d2b..14de6e88627c50004596ae2063b3c26b5f77355d 100755
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf 0 > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-
cleanCase
+rm -rf 0
+
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
index 07492af16c318fe77cfd5ce17b8ea6e3741df09d..e7b28d6aa52861d4a38cd519dd01d8ef4dc69209 100755
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun
@@ -9,7 +9,7 @@ runApplication surfaceFeatureExtract
runApplication blockMesh
runApplication snappyHexMesh -overwrite
-\rm -rf 0
+rm -rf 0
runApplication createBaffles -overwrite
runApplication mergeOrSplitBaffles -split -overwrite
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun
index 4f55fd7efaf20c8631ec86210c8629a9a3fe234b..ccdfefe5c1ce337739caa5bddd0affe3cfc4aad0 100755
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun
@@ -1,10 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 system/blockMeshDict.m4 > system/blockMeshDict
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+m4 system/blockMeshDict.m4 > system/blockMeshDict
+
runApplication blockMesh
runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun
index 4f55fd7efaf20c8631ec86210c8629a9a3fe234b..ccdfefe5c1ce337739caa5bddd0affe3cfc4aad0 100755
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun
@@ -1,10 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 system/blockMeshDict.m4 > system/blockMeshDict
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+m4 system/blockMeshDict.m4 > system/blockMeshDict
+
runApplication blockMesh
runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun
index 2e9c3f7fb3a2d22443c91d89debe842a936ff205..52b2a4941d73838617c1741cb20f1d4a5f4acdf5 100755
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun
@@ -1,9 +1,10 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
./makeMesh
-runApplication $application
+runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean
index afc06ff982c0777d9b403f7dd35f319bf094507f..92ec2e3cea000256ad300a5305b206a7669f8c29 100755
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean
@@ -1,5 +1,7 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
@@ -7,3 +9,5 @@ cleanCase
(cd system && rm -f blockMeshDict.caseBlocks blockMeshDict.caseBoundary)
rm -rf resolved modelled pressure.eps
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun
index 78bf41821afa9d0e361e0533b5f9a3d507c6bcd5..0e6804513047c17e3a7bcd78fcb4c8d4332a93cc 100755
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun
@@ -1,9 +1,10 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
-cd ${0%/*} || exit 1
-
+# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
# Run function links the appropriate mesh files and clones the case
run()
{
@@ -45,3 +46,5 @@ plot \
"modelled/postProcessing/probes/0/p" us 1:(\$4-1e5) t "Modelled Plenum" w l
EOF
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean
index ad2d4ecb971ab4f2eaecd1f75de566f6b6fd0709..6b45f82a41b0f9a0739a80a41a680be892e55243 100755
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean
@@ -6,5 +6,4 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
-
#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allrun b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allrun
index 31f6bc34d0fbfcee28a030447f424b33f27ff6e4..8a77ff8076363a01e3fc0e676fcf87e9a5223fd5 100755
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allrun
@@ -6,3 +6,5 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication blockMesh
runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean
index 97591ced3297e7a1efcbd5bbf14a852b542c0703..7b7e1442f81b825413c545d22f7806af23753774 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
# Remove copies of common files
\rm -rf 0 constant
-cleanCase
-
#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean
index 97591ced3297e7a1efcbd5bbf14a852b542c0703..7b7e1442f81b825413c545d22f7806af23753774 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
# Remove copies of common files
\rm -rf 0 constant
-cleanCase
-
#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
index bb18fc3feba924ebddaced6d10f819a199c2870b..ccdfefe5c1ce337739caa5bddd0affe3cfc4aad0 100755
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
@@ -1,14 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 system/blockMeshDict.m4 > system/blockMeshDict
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
+m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean
index d1c82b1a7c0a0599929fc6f535edbaabcd4f6ec9..1deb20913349eeacef2f946da013700e1da32287 100755
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
# Don't need these extra files (from star4ToFoam conversion)
rm -f \
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
index ea06ee44e4a644b27faa316683704cbd2f1ac709..b6716d88fb7ded1749f9a99015171afd16e43228 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
@@ -4,10 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# Remove 0.orig/ copy
-\rm -rf 0
-
cleanCase
cleanSamples
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
index 8c093a9abede574ad55979bb460883b1f08dc352..4a38818ccc6299069bae93f5c8f48764be3b9ae1 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
@@ -4,12 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
restore0Dir
runApplication blockMesh
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
runApplication -s sample postProcess -func sample
#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
index 3d5ec5cbd9fec109f1a3b956843e5297e88a495d..d433a8c02696351d94bc86c06d9f46dfe5e8702a 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
@@ -10,5 +10,4 @@ runParallel dsmcInitialise
runParallel $(getApplication)
runApplication reconstructPar -noLagrangian
-
#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
index 9852503f2cbb2cde23704919366eba86795aa532..194c42b8c6233e8ac32fe9af0a404b0e4c87fec8 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean
@@ -4,11 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
rm -rf 0/lagrangian 0/uniform
rm -f Ar-Ar
rm -f electrostatic
rm -f constant/idList
-rm -rf constant/polyMesh/sets
-cleanCase
#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
index ec56cfe28b5c5e42f3612988c3f892f2e13a9b82..d52fe88c714670d852505bca2f7a2809c2ebdf6c 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean
@@ -4,11 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
rm -rf 0/lagrangian 0/uniform
rm -f O-O
rm -f electrostatic
rm -f constant/idList
-rm -rf constant/polyMesh/sets
-cleanCase
#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
index 21cb83d5ac45c55ab65be79e1f03aa7fab9824f0..7fa5428f73ef770d9a80f24404f72379d39aa6c9 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf constant/polyMesh/sets
-rm -rf processor[0-9]
cleanCase
+rm -rf processor[0-9]
#------------------------------------------------------------------------------
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
index c373ee10797d94fccb059947af2b28817d1cfdd8..66482be7d4b45256508f008b855a253015e35103 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
@@ -1,18 +1,14 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication blockMesh
-
runApplication decomposePar
runParallel mdInitialise
-runParallel $application
+runParallel $(getApplication)
runApplication reconstructPar
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/Allrun b/tutorials/electromagnetics/mhdFoam/hartmann/Allrun
index 332db2c7bfc8ab93a3b02a37b4c33227d769845e..8bf5318684b5cc1c547828577a784fe1666df0cd 100755
--- a/tutorials/electromagnetics/mhdFoam/hartmann/Allrun
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/Allrun
@@ -4,11 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
runApplication -s sample postProcess -func sample
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
index 96d54eb8092de7eb605f4436bcaddd6c9123b17d..ac13b0642744f9c533dae77ee185700c2bf4536a 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
@@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication blockMesh
\cp 0/T.orig 0/T
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
index 96d54eb8092de7eb605f4436bcaddd6c9123b17d..ac13b0642744f9c533dae77ee185700c2bf4536a 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
@@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication blockMesh
\cp 0/T.orig 0/T
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T
similarity index 94%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T
index 6dca98e236ad06a267079706515888c0c05ae08c..6b8b0724098c46fa2556c42f6746f95f66833375 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T
@@ -30,10 +30,10 @@ boundaryField
{
type lumpedMassWallTemperature;
kappaMethod fluidThermo;
- kappaName none;
+ kappa none;
mass 1000;
Cp 4100;
- value uniform 300.0;
+ value uniform 300;
}
fixedWalls
@@ -42,4 +42,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/U
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/U
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/alphat
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/alphat
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/epsilon
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/epsilon
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/k
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/k
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/nut
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/nut
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p_rgh
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p_rgh
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
index 778f3b399ac51ada05bbfd76cc3fe348f020dc3f..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-\cp 0/T.orig 0/T
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
index b18d70e448c13fbaf243f01cff301f0dbb1c7193..c61e8a418c5e877e323463c94419ef50726b9fd8 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
@@ -4,11 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
-
runApplication blockMesh
+
+restore0Dir
+
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allrun b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allrun
index 87eba62518a6664df1a24acaa1aa8918009a0f33..8a77ff8076363a01e3fc0e676fcf87e9a5223fd5 100755
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allrun
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allrun
@@ -4,10 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
-
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
index bb7f5888ae2703ca93602dd921d5a177cf4c32eb..f02ac1a6eb25f412b2cdecb8ec210e1c3aac5244 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
index c751c9789ba1e111a88c5e0319fb1d245f361bf8..07d3f0e272d84b79f309141e6e8795ba528d2336 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
@@ -4,11 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
runApplication -s sample postProcess -latestTime -func sample
( cd validation && ./createGraphs )
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
index 6536b870ee198ae4cd2fe889263f7381accf6831..bac87c7272f72946f8b15c02ad1c2b9a91ee8b70 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
@@ -8,17 +8,17 @@
T
{
- type compressible::thermalBaffle;
- kappaMethod fluidThermo;
- value uniform 300;
+ type compressible::thermalBaffle;
+ kappaMethod fluidThermo;
+ value uniform 300;
- regionName ${baffleRegionName};
- active yes;
+ region ${baffleRegion};
+ active yes;
- # include "3DbaffleSolidThermo"
+ # include "3DbaffleSolidThermo"
- // New fvMesh (region) information
- # include "extrudeModel"
+ // New fvMesh (region) information
+ # include "extrudeModel"
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
index 346318d87f38e5d1bcc50f5d6a182e631b97b284..b3e07455bb7d5407a0e4554a1a1d2e35aec5f204 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
@@ -6,22 +6,22 @@
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-baffleRegionName baffle3DRegion;
+baffleRegion baffle3DRegion;
-masterPatchName baffle3DRegionMaster;
+masterPatch baffle3DRegionMaster;
-slavePatchName baffle3DRegionSlave;
+slavePatch baffle3DRegionSlave;
-oneD false;
+oneD false;
-nLayers 50;
+nLayers 50;
-thickness 0.02;
+thickness 0.02;
-Kappa 0.01;
+Kappa 0.01;
-Cp 15;
+Cp 15;
-rho 80;
+rho 80;
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
index eabb05d8f40e073e52e0c2fb100624a2d98e4e92..eb1e8dba18a620da99b58b90ac1c5165577bd46e 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-rm -rf constant/baffle3DRegion
-rm -rf constant/polyMesh/boundary
rm -rf 0
+rm -rf constant/baffle3DRegion
+
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
index ae95e9ed6178a0e3289da1dcbbc5241fea4d3f1e..1927ad7c820c406be7273f93293e8e45bbe010ab 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
@@ -1,8 +1,8 @@
#!/bin/sh
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
-# Get application name
-application=$(getApplication)
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
@@ -11,4 +11,6 @@ restore0Dir
# Create 1D and 3D baffles
runApplication createBaffles -overwrite
-runApplication $application
+runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun
index ebc19b3d2a4adff39cf7ca06c6c671b012c42337..8a77ff8076363a01e3fc0e676fcf87e9a5223fd5 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun
index ebc19b3d2a4adff39cf7ca06c6c671b012c42337..8a77ff8076363a01e3fc0e676fcf87e9a5223fd5 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean
index 82e538bb437c74bcb9fb9647866fc714de04586c..757a0f3d6cc04adbbee8dcd12dd23f5ca70a7742 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean
@@ -5,19 +5,22 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+
rm -rf comms
rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf constant/cellToRegion
+
rm -rf 0/bottomWater
rm -rf 0/topAir
rm -rf 0/heater
rm -rf 0/leftSolid
rm -rf 0/rightSolid
rm -f 0/cellToRegion
+
rm -rf constant/bottomWater/polyMesh
rm -rf constant/topAir/polyMesh
rm -rf constant/heater/polyMesh
rm -rf constant/leftSolid/polyMesh
rm -rf constant/rightSolid/polyMesh
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun
index b2f87f4120d40a02d84330232dcab13861722129..0a12ee44a701b63e194242ed7667e3511a795362 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun
@@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -15,6 +14,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Decompose
runApplication decomposePar -allRegions
+## Can verify parallel operation of createExternalCoupledPatchGeometry
+# \rm -f log.createExternalCoupledPatchGeometry
+# runParallel createExternalCoupledPatchGeometry \
+# -regions '(topAir heater)' coupleGroup \
+# -commsDir $PWD/comms
+
# Run OpenFOAM
runParallel $(getApplication) &
@@ -24,5 +29,4 @@ runApplication ./externalSolver
# Reconstruct
runApplication reconstructPar -allRegions
-
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre
index d841e3cfe0bede051684a1ef20052e0a18d788a1..481deedc7be6350d0f3f0467f200860a7b8efbd4 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre
@@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -28,6 +27,6 @@ runApplication createExternalCoupledPatchGeometry \
echo
echo "creating files for paraview post-processing"
echo
-paraFoam -touchAll
+paraFoam -touchAll 2>/dev/null
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/thermophysicalProperties
index 190efadd2bb9c229978b72dbbfc963a699e22e27..ad71e36604c14e67f77ad8857de722c932221902 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant/bottomWater";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/externalSolver b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/externalSolver
index 89c5f53cb9faa812c7ba8621394285c4f7491794..201bc166822609975480c46a439c6744dd16ba14 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/externalSolver
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/externalSolver
@@ -20,13 +20,17 @@ fieldName="T"
lockFile="${commsDir}/OpenFOAM.lock"
dataFile="${commsDir}/${regionGroupName}/${patchGroupName}/${fieldName}"
-waitSec=1
-timeOut=10
-nSteps=200 # maximum number of time steps. Note: should be more than
+waitSec=5
+timeOut=100
+nSteps=1000 # maximum number of time steps. Note: should be more than
# number of iterations on the OpenFOAM side
refGrad=0
valueFraction=1
+
+# Remove any old junk
+\rm -f $lockFile 2>/dev/null
+
log()
{
echo "External: $@"
@@ -53,7 +57,7 @@ init()
echo "$refValue2 $refGrad $valueFraction" >> "${dataFile}.in"
done
- # create lock file to pass control to OF
+ # Create lock file to pass control to OpenFOAM
touch ${lockFile}
}
@@ -61,7 +65,6 @@ init()
# create the comms directory
mkdir -p ${commsDir}/${regionGroupName}/${patchGroupName}
-
# tutorial case employs the 'initByExternalOption', so we need to provide
# the initial values
init
@@ -69,11 +72,24 @@ init
totalWait=0
step=0
-while [ $step -lt $nSteps ]; do
- if [ -f $lockFile ]; then
- log "found lock file ${lockFile} - waiting"
+while [ $step -lt $nSteps ]
+do
+ if [ -f $lockFile ]
+ then
+ if grep -q "status=done" ${lockFile}
+ then
+ log "found lock file ${lockFile} with 'status=done' - finished"
+ break
+ elif [ -s $lockFile ]
+ then
+ log "found lock file ${lockFile} containing '$(cat $lockFile)' - waiting"
+ else
+ log "found lock file ${lockFile} - waiting"
+ fi
+
totalWait=$(expr $totalWait + $waitSec)
- if [ $totalWait -gt $timeOut ]; then
+ if [ $totalWait -gt $timeOut ]
+ then
log "timeout"
break
else
@@ -91,7 +107,7 @@ while [ $step -lt $nSteps ]; do
log "updating ${dataFile}.in from ${dataFile}.out"
awk '{if( $1 != "#" ){print $1+1 " 0 1"}}' \
- ${dataFile}.out | tee ${dataFile}.in
+ ${dataFile}.out >| ${dataFile}.in
log "creating lock file ${lockFile}"
touch ${lockFile}
@@ -100,5 +116,7 @@ done
log "done"
+# Remove the lock file too
+\rm -f $lockFile 2>/dev/null
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/blockMeshDict
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict
index adf9935141aea0a6e8c9c6720e8d2bc8b4afa865..3ea8a7089750158ebaa24780080130b5be0c1b6a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict
@@ -14,158 +14,154 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dictionaryReplacement
+U
{
- U
- {
- internalField uniform (0.001 0 0);
+ internalField uniform (0.001 0 0);
- boundaryField
+ boundaryField
+ {
+ minX
{
- minX
- {
- type fixedValue;
- value uniform (0.001 0 0);
- }
+ type fixedValue;
+ value uniform (0.001 0 0);
+ }
- maxX
- {
- type inletOutlet;
- inletValue uniform (0 0 0);
- }
+ maxX
+ {
+ type inletOutlet;
+ inletValue uniform (0 0 0);
+ }
- ".*"
- {
- type fixedValue;
- value uniform (0 0 0);
- }
+ ".*"
+ {
+ type fixedValue;
+ value uniform (0 0 0);
}
}
+}
+
+T
+{
+ internalField uniform 300;
- T
+ boundaryField
{
- internalField uniform 300;
-
- boundaryField
- {
- minX
- {
- type fixedValue;
- value uniform 300;
- }
-
- maxX
- {
- type inletOutlet;
- inletValue uniform 300;
- }
-
- ".*"
- {
- type zeroGradient;
- value uniform 300;
- }
-
- "bottomWater_to_.*"
- {
- type compressible::turbulentTemperatureCoupledBaffleMixed;
- Tnbr T;
- kappaMethod fluidThermo;
- kappa none;
- value uniform 300;
- }
+ minX
+ {
+ type fixedValue;
+ value uniform 300;
+ }
+
+ maxX
+ {
+ type inletOutlet;
+ inletValue uniform 300;
+ }
+
+ ".*"
+ {
+ type zeroGradient;
+ value uniform 300;
+ }
+
+ "bottomWater_to_.*"
+ {
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
+ Tnbr T;
+ kappaMethod fluidThermo;
+ value uniform 300;
}
}
+}
- epsilon
- {
- internalField uniform 0.01;
+epsilon
+{
+ internalField uniform 0.01;
- boundaryField
+ boundaryField
+ {
+ minX
{
- minX
- {
- type fixedValue;
- value uniform 0.01;
- }
+ type fixedValue;
+ value uniform 0.01;
+ }
- maxX
- {
- type inletOutlet;
- inletValue uniform 0.01;
- }
+ maxX
+ {
+ type inletOutlet;
+ inletValue uniform 0.01;
+ }
- ".*"
- {
- type epsilonWallFunction;
- value uniform 0.01;
- }
+ ".*"
+ {
+ type epsilonWallFunction;
+ value uniform 0.01;
}
}
+}
- k
- {
- internalField uniform 0.1;
+k
+{
+ internalField uniform 0.1;
- boundaryField
+ boundaryField
+ {
+ minX
{
- minX
- {
- type inletOutlet;
- inletValue uniform 0.1;
- }
+ type inletOutlet;
+ inletValue uniform 0.1;
+ }
- maxX
- {
- type zeroGradient;
- value uniform 0.1;
- }
+ maxX
+ {
+ type zeroGradient;
+ value uniform 0.1;
+ }
- ".*"
- {
- type kqRWallFunction;
- value uniform 0.1;
- }
+ ".*"
+ {
+ type kqRWallFunction;
+ value uniform 0.1;
}
}
+}
- p_rgh
- {
- internalField uniform 0;
+p_rgh
+{
+ internalField uniform 0;
- boundaryField
+ boundaryField
+ {
+ minX
{
- minX
- {
- type zeroGradient;
- value uniform 0;
- }
+ type zeroGradient;
+ value uniform 0;
+ }
- maxX
- {
- type fixedValue;
- value uniform 0;
- }
+ maxX
+ {
+ type fixedValue;
+ value uniform 0;
+ }
- ".*"
- {
- type fixedFluxPressure;
- value uniform 0;
- }
+ ".*"
+ {
+ type fixedFluxPressure;
+ value uniform 0;
}
}
+}
- p
- {
- internalField uniform 0;
+p
+{
+ internalField uniform 0;
- boundaryField
+ boundaryField
+ {
+ ".*"
{
- ".*"
- {
- type calculated;
- value uniform 0;
- }
+ type calculated;
+ value uniform 0;
}
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/controlDict
index 3ab994b043d498fa58ea9449e2e2d12846d43104..1b47ce52a915d8a1fe07eb3dec3c1f903067b07c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/controlDict
@@ -16,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Library defines new boundary conditions
-libs ("libOpenFOAM.so" "libjobControl.so");
+libs ("libOpenFOAM.so" "libfieldFunctionObjects.so");
application chtMultiRegionFoam;
@@ -26,11 +26,12 @@ startTime 0;
stopAt endTime;
-endTime 1;
+endTime 0.5;
deltaT 0.001;
writeControl adjustableRunTime;
+
writeInterval 0.1;
purgeWrite 0;
@@ -56,40 +57,7 @@ adjustTimeStep yes;
functions
{
- externalCoupled
- {
- // Where to load it from (if not already in solver)
- libs ("libfieldFunctionObjects.so");
-
- type externalCoupled;
-
- // Directory to use for communication
- commsDir "${FOAM_CASE}/comms";
-
- // Does external process start first
- initByExternal true;
-
- // Additional output
- log true;
-
- regions
- {
- // Region name (wildcards allowed)
- "(topAir|heater)"
- {
- // In topAir adjust the minX patch (fixedValue)
-
- // Patch or patchGroup
- coupleGroup
- {
- // Fields to output in commsDir
- writeFields (T);
- // Fields to read from commsDir
- readFields (T);
- }
- }
- }
- }
+ #include "externalCoupled"
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/externalCoupled b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/externalCoupled
new file mode 100644
index 0000000000000000000000000000000000000000..590ee32970db7ee54f0e37cf33a7eb11aac96968
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/externalCoupled
@@ -0,0 +1,43 @@
+// -*- C++ -*-
+
+// control for external coupled simulation
+externalCoupled
+{
+ // Where to load it from (if not already in solver)
+ libs ("libfieldFunctionObjects.so");
+
+ type externalCoupled;
+
+ // Directory to use for communication
+ commsDir "${FOAM_CASE}/comms";
+
+ // Does external process start first
+ initByExternal true;
+
+ // Cleanup behaviour on termination (remove|done)
+ stateEnd done;
+
+ // Additional output
+ log true;
+
+ regions
+ {
+ // Region name (wildcards allowed)
+ "(topAir|heater)"
+ {
+ // In topAir adjust the minX patch (fixedValue)
+
+ // Patch or patchGroup
+ coupleGroup
+ {
+ // Fields to output in commsDir
+ writeFields (T);
+ // Fields to read from commsDir
+ readFields (T);
+ }
+ }
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict
index 5f0519e7e102541cf45068990fb92964d8b5a79c..54a32080ab7b44a7841aed1d40b351212e1d66a0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict
@@ -14,62 +14,56 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dictionaryReplacement
+boundary
{
- boundary
+ minY
{
- minY
+ type patch;
+ inGroups (coupleGroup);
+ }
+ minZ
+ {
+ type patch;
+ }
+ maxZ
+ {
+ type patch;
+ }
+}
+
+T
+{
+ internalField uniform 300;
+
+ boundaryField
+ {
+ ".*"
{
- type patch;
- inGroups (coupleGroup);
+ type zeroGradient;
+ value uniform 300;
}
- minZ
+ "heater_to_.*"
{
- type patch;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
+ Tnbr T;
+ kappaMethod solidThermo;
+ value uniform 300;
}
- maxZ
+
+ heater_to_leftSolid
{
- type patch;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
+ Tnbr T;
+ kappaMethod solidThermo;
+ thicknessLayers (1e-3);
+ kappaLayers (5e-4);
+ value uniform 300;
}
- }
-
- T
- {
- internalField uniform 300;
-
- boundaryField
+ minY
{
- ".*"
- {
- type zeroGradient;
- value uniform 300;
- }
- "heater_to_.*"
- {
- type compressible::turbulentTemperatureCoupledBaffleMixed;
- Tnbr T;
- kappaMethod solidThermo;
- kappa none;
- value uniform 300;
- }
-
- heater_to_leftSolid
- {
- type compressible::turbulentTemperatureCoupledBaffleMixed;
- Tnbr T;
- kappaMethod solidThermo;
- kappa none;
- thicknessLayers (1e-3);
- kappaLayers (5e-4);
- value uniform 300;
- }
-
- minY
- {
- type fixedValue;
- value uniform 500;
- }
+ type fixedValue;
+ value uniform 500;
}
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict
index 917043d203cbe6fdc9bb72185d24960d7f0fef8f..3d47a8640d653cad783f944a3c0886eab67fbcfa 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -14,50 +14,45 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dictionaryReplacement
+boundary
{
- boundary
+ minZ
{
- minZ
+ type patch;
+ }
+ maxZ
+ {
+ type patch;
+ }
+}
+
+T
+{
+ internalField uniform 300;
+
+ boundaryField
+ {
+ ".*"
{
- type patch;
+ type zeroGradient;
+ value uniform 300;
}
- maxZ
+ "leftSolid_to_.*"
{
- type patch;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
+ Tnbr T;
+ kappaMethod solidThermo;
+ value uniform 300;
}
- }
- T
- {
- internalField uniform 300;
-
- boundaryField
+ leftSolid_to_heater
{
- ".*"
- {
- type zeroGradient;
- value uniform 300;
- }
- "leftSolid_to_.*"
- {
- type compressible::turbulentTemperatureCoupledBaffleMixed;
- Tnbr T;
- kappaMethod solidThermo;
- kappa none;
- value uniform 300;
- }
-
- leftSolid_to_heater
- {
- type compressible::turbulentTemperatureCoupledBaffleMixed;
- Tnbr T;
- kappaMethod solidThermo;
- kappa none;
- thicknessLayers (1e-3);
- kappaLayers (5e-4);
- value uniform 300;
- }
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
+ Tnbr T;
+ kappaMethod solidThermo;
+ thicknessLayers (1e-3);
+ kappaLayers (5e-4);
+ value uniform 300;
}
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict
index 77bebe210e7502c311b4062a6a85e4ac902ba161..184cf95c4e8b8fcd75b505e7eb25b5bc48a9f36a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -14,39 +14,35 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dictionaryReplacement
+boundary
{
- boundary
+ minZ
{
- minZ
- {
- type patch;
- }
- maxZ
- {
- type patch;
- }
+ type patch;
}
-
- T
+ maxZ
{
- internalField uniform 300;
+ type patch;
+ }
+}
+
+T
+{
+ internalField uniform 300;
- boundaryField
+ boundaryField
+ {
+ ".*"
+ {
+ type zeroGradient;
+ value uniform 300;
+ }
+ "rightSolid_to_.*"
{
- ".*"
- {
- type zeroGradient;
- value uniform 300;
- }
- "rightSolid_to_.*"
- {
- type compressible::turbulentTemperatureCoupledBaffleMixed;
- Tnbr T;
- kappaMethod solidThermo;
- kappa none;
- value uniform 300;
- }
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
+ Tnbr T;
+ kappaMethod solidThermo;
+ value uniform 300;
}
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict
index 40ce87668ba58c36162a8732b036bbcfbb376531..5bd5490849d6cb75c72f10e5ad41e99a0ae06c59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -14,164 +14,160 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dictionaryReplacement
+boundary
{
- boundary
+ minX
{
+ inGroups (coupleGroup);
+ }
+}
+
+U
+{
+ internalField uniform (0.1 0 0);
+
+ boundaryField
+ {
+ ".*"
+ {
+ type fixedValue;
+ value uniform (0 0 0);
+ }
minX
{
- inGroups (coupleGroup);
+ type fixedValue;
+ value uniform ( 0.1 0 0 );
+ }
+ maxX
+ {
+ type inletOutlet;
+ inletValue uniform ( 0 0 0 );
+ value uniform ( 0.1 0 0 );
}
}
+}
- U
+T
+{
+ internalField uniform 300;
+
+ boundaryField
{
- internalField uniform (0.1 0 0);
-
- boundaryField
- {
- ".*"
- {
- type fixedValue;
- value uniform (0 0 0);
- }
- minX
- {
- type fixedValue;
- value uniform ( 0.1 0 0 );
- }
- maxX
- {
- type inletOutlet;
- inletValue uniform ( 0 0 0 );
- value uniform ( 0.1 0 0 );
- }
+ ".*"
+ {
+ type zeroGradient;
}
- }
- T
- {
- internalField uniform 300;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- }
-
- minX
- {
- type fixedValue;
- value uniform 300;
- }
- maxX
- {
- type inletOutlet;
- inletValue uniform 300;
- value uniform 300;
- }
-
- "topAir_to_.*"
- {
- type compressible::turbulentTemperatureCoupledBaffleMixed;
- Tnbr T;
- kappaMethod fluidThermo;
- kappa none;
- value uniform 300;
- }
+ minX
+ {
+ type fixedValue;
+ value uniform 300;
+ }
+ maxX
+ {
+ type inletOutlet;
+ inletValue uniform 300;
+ value uniform 300;
+ }
+
+ "topAir_to_.*"
+ {
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
+ Tnbr T;
+ kappaMethod fluidThermo;
+ value uniform 300;
}
}
+}
- epsilon
+epsilon
+{
+ internalField uniform 0.01;
+
+ boundaryField
{
- internalField uniform 0.01;
-
- boundaryField
- {
- ".*"
- {
- type epsilonWallFunction;
- value uniform 0.01;
- }
-
- minX
- {
- type fixedValue;
- value uniform 0.01;
- }
- maxX
- {
- type inletOutlet;
- inletValue uniform 0.01;
- value uniform 0.01;
- }
+ ".*"
+ {
+ type epsilonWallFunction;
+ value uniform 0.01;
+ }
+
+ minX
+ {
+ type fixedValue;
+ value uniform 0.01;
+ }
+ maxX
+ {
+ type inletOutlet;
+ inletValue uniform 0.01;
+ value uniform 0.01;
}
}
+}
+
+k
+{
+ internalField uniform 0.1;
- k
+ boundaryField
{
- internalField uniform 0.1;
-
- boundaryField
- {
- ".*"
- {
- type kqRWallFunction;
- value uniform 0.1;
- }
-
- minX
- {
- type fixedValue;
- value uniform 0.1;
- }
- maxX
- {
- type inletOutlet;
- inletValue uniform 0.1;
- value uniform 0.1;
- }
+ ".*"
+ {
+ type kqRWallFunction;
+ value uniform 0.1;
+ }
+
+ minX
+ {
+ type fixedValue;
+ value uniform 0.1;
+ }
+ maxX
+ {
+ type inletOutlet;
+ inletValue uniform 0.1;
+ value uniform 0.1;
}
}
+}
- p_rgh
- {
- internalField uniform 1e5;
+p_rgh
+{
+ internalField uniform 1e5;
- boundaryField
+ boundaryField
+ {
+ ".*"
{
- ".*"
- {
- type fixedFluxPressure;
- value uniform 1e5;
- }
+ type fixedFluxPressure;
+ value uniform 1e5;
+ }
- maxX
- {
- type fixedValue;
- value uniform 1e5;
- }
+ maxX
+ {
+ type fixedValue;
+ value uniform 1e5;
}
}
+}
- p
- {
- internalField uniform 1e5;
+p
+{
+ internalField uniform 1e5;
- boundaryField
+ boundaryField
+ {
+ ".*"
{
- ".*"
- {
- type calculated;
- value uniform 1e5;
- }
+ type calculated;
+ value uniform 1e5;
+ }
- maxX
- {
- type calculated;
- value uniform 1e5;
- }
+ maxX
+ {
+ type calculated;
+ value uniform 1e5;
}
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean
index c90b8ceb13510e20c3817949ed55f7433c8a2ced..77d28a7dac0fd692f035fb0015bc29bd9db4c0b3 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # run from this directory
cleanCase
rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf constant/cellToRegion
rm -rf constant/air/polyMesh
rm -rf constant/solid/polyMesh
@@ -28,6 +28,4 @@ rm -f 0/floor/cellToRegion
rm -f 0/solid/cellToRegion
rm -f 0/cellToRegion
-
-
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun
index 225acd829ffc3db0773edc3ec194daf2b88a455c..c20d1cd3be032c37c84cf7c8287e888798bb0096 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun
@@ -1,11 +1,9 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
-
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
# Setup case
./Allrun.pre
@@ -31,4 +29,4 @@ echo "creating files for paraview post-processing"
echo
paraFoam -touchAll
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre
index 59a0bb8730be7667c71d48164fdeda7da63751fc..a7367af14af6584018741d8bb9216cd1cbd15e35 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre
@@ -1,6 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
-
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -25,5 +24,4 @@ do
changeDictionary -region $i > log.changeDictionary.$i 2>&1
done
-
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/thermophysicalProperties
index a43f53866d1be5ab4767c4642aac85c643e5fff3..ad71e36604c14e67f77ad8857de722c932221902 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant/bottomAir";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
deleted file mode 100644
index 8d9abe2863015681533db60ada4a457c3965fb95..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
+++ /dev/null
@@ -1,74 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: plus |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/bottomWater";
- object T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- minX
- {
- type fixedValue;
- value uniform 300;
- }
- maxX
- {
- type inletOutlet;
- value uniform 300;
- inletValue uniform 300;
- }
- minY
- {
- type zeroGradient;
- value uniform 300;
- }
- minZ
- {
- type zeroGradient;
- value uniform 300;
- }
- maxZ
- {
- type zeroGradient;
- value uniform 300;
- }
- bottomWater_to_rightSolid
- {
- type compressible::turbulentTemperatureCoupledBaffleMixed;
- value uniform 300;
- Tnbr T;
- kappaMethod fluidthermo;
- }
- bottomWater_to_leftSolid
- {
- type compressible::turbulentTemperatureCoupledBaffleMixed;
- value uniform 300;
- Tnbr T;
- kappaMethod fluidthermo;
- }
- bottomWater_to_heater
- {
- type compressible::turbulentTemperatureCoupledBaffleMixed;
- value uniform 300;
- Tnbr T;
- kappaMethod fluidthermo;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
deleted file mode 100644
index ed00b16b5783269cb91b5c2cab5c91688d195123..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
+++ /dev/null
@@ -1,68 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: plus |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/bottomWater";
- object epsilon;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -3 0 0 0 0];
-
-internalField uniform 0.01;
-
-boundaryField
-{
- minX
- {
- type fixedValue;
- value uniform 0.01;
- }
- maxX
- {
- type inletOutlet;
- value uniform 0.01;
- inletValue uniform 0.01;
- }
- minY
- {
- type epsilonWallFunction;
- value uniform 0.01;
- }
- minZ
- {
- type epsilonWallFunction;
- value uniform 0.01;
- }
- maxZ
- {
- type epsilonWallFunction;
- value uniform 0.01;
- }
- bottomWater_to_rightSolid
- {
- type epsilonWallFunction;
- value uniform 0.01;
- }
- bottomWater_to_leftSolid
- {
- type epsilonWallFunction;
- value uniform 0.01;
- }
- bottomWater_to_heater
- {
- type epsilonWallFunction;
- value uniform 0.01;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
deleted file mode 100644
index 5b0870d52a82d516f6658fc0b8fe79d4cf0d6bc7..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
+++ /dev/null
@@ -1,68 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: plus |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/bottomWater";
- object k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -2 0 0 0 0];
-
-internalField uniform 0.1;
-
-boundaryField
-{
- minX
- {
- type inletOutlet;
- value uniform 0.1;
- inletValue uniform 0.1;
- }
- maxX
- {
- type zeroGradient;
- value uniform 0.1;
- }
- minY
- {
- type kqRWallFunction;
- value uniform 0.1;
- }
- minZ
- {
- type kqRWallFunction;
- value uniform 0.1;
- }
- maxZ
- {
- type kqRWallFunction;
- value uniform 0.1;
- }
- bottomWater_to_rightSolid
- {
- type kqRWallFunction;
- value uniform 0.1;
- }
- bottomWater_to_leftSolid
- {
- type kqRWallFunction;
- value uniform 0.1;
- }
- bottomWater_to_heater
- {
- type kqRWallFunction;
- value uniform 0.1;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p
deleted file mode 100644
index 8df1783335fcc375dee2b204a28f48cdccf4ff94..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p
+++ /dev/null
@@ -1,67 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: plus |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/bottomWater";
- object p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- minX
- {
- type calculated;
- value uniform 0;
- }
- maxX
- {
- type calculated;
- value uniform 0;
- }
- minY
- {
- type calculated;
- value uniform 0;
- }
- minZ
- {
- type calculated;
- value uniform 0;
- }
- maxZ
- {
- type calculated;
- value uniform 0;
- }
- bottomWater_to_rightSolid
- {
- type calculated;
- value uniform 0;
- }
- bottomWater_to_leftSolid
- {
- type calculated;
- value uniform 0;
- }
- bottomWater_to_heater
- {
- type calculated;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
index bf5077c90ac3b551ddb0c4741bcc8d464c4d3442..8b0c932d51bf1e3d5fa3801e7a13c54bc84021c4 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
@@ -5,14 +5,16 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+
rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
-rm -rf 0/bottomAir
+rm -rf constant/cellToRegion
+rm -f 0/cellToRegion
+rm -rf 0/bottomWater
rm -rf 0/topAir
rm -rf 0/heater
rm -rf 0/leftSolid
rm -rf 0/rightSolid
-rm -f 0/cellToRegion
+
rm -rf constant/bottomWater/polyMesh
rm -rf constant/topAir/polyMesh
rm -rf constant/heater/polyMesh
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index 8d53d67ebef1f3cfd65e2a371ab58ef1aa20f10e..619f8c0af0ac2ab67801be7dfe8a1416e252bb4a 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index a43f53866d1be5ab4767c4642aac85c643e5fff3..ad71e36604c14e67f77ad8857de722c932221902 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant/bottomAir";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
index f56be82da793799b52135652c4864db7914b1014..230730502d4354ca3a067e8ea9101b44c17c6055 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
@@ -4,19 +4,20 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -f constant/triSurface/*.eMesh > /dev/null 2>&1
-rm -f constant/polyMesh/boundary
-cleanCase
rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf constant/cellToRegion
rm -rf 0/bottomAir
rm -rf 0/topAir
rm -rf 0/heater
rm -rf 0/leftSolid
rm -rf 0/rightSolid
rm -f 0/cellToRegion
+
rm -rf constant/bottomAir/polyMesh
rm -rf constant/topAir/polyMesh
rm -rf constant/heater/polyMesh
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
index c21e4adafc5d07096c4e4ff49e6eaeeda2b22686..e46f721088820fa427c6d6a87de109ea90bc5a30 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
@@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index a43f53866d1be5ab4767c4642aac85c643e5fff3..ad71e36604c14e67f77ad8857de722c932221902 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant/bottomAir";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
index e1f36abd656a66e30f63dee1502802e76b361bea..2cfabccf8b10e2be3001e5e9a295542417ef5b79 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
@@ -55,7 +55,7 @@ boundaryField
// Mode of operation: inert, condensation, vaporization,
// condensationAndEvaporation
mode condensationAndEvaporation;
- specieName H2O;
+ specie H2O;
carrierMolWeight 28.9 ;//Air from thermophysicalProperties
L 0.1;
Tvap 273; //Minimum temperature for evaporation
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean
index 734eec89e40643a4e68fdc0029f15d37f06c5a95..c34834dedb650920f607102c964349c37c94b715 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean
@@ -1,11 +1,13 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
+
rm -rf constant/windshield/polyMesh
rm -rf constant/cabin/polyMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun
index b75fde5c9ae8f36318c4379bf242a02aa14b428f..7704bd9ea5536674fbf75cda78b97da1a051dc20 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun
@@ -24,3 +24,5 @@ runApplication topoSet -region cabin -dict system/topoSetDictRegister
restore0Dir
runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
index c7695aeec0f0984768d5543e006109ca8795ab0b..76ab4c70bd50377c8cacdc7e6c25226acf74faea 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
@@ -47,6 +47,7 @@ laplacianSchemes
laplacian(rhorAUf,p_rgh) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(((rho*nut)+thermo:mu),H2O) Gauss linear corrected;
+ laplacian(DH2O,H2O) Gauss linear corrected;
}
interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean
index b484aeff5263bac9cafa5b0e94af1ee3f5723095..92a631d049e9eecb43b4963fd484a99e6949479a 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allclean
@@ -1,13 +1,14 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
rm -rf constant/exterior/polyMesh
rm -rf constant/ice/polyMesh
rm -rf constant/cabin/polyMesh
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun
index 25d83d176d84630f0032ac93497116d54765d03a..f4d82024cdbfa32827ca307c2aaf9f520d0d6b8b 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun
@@ -7,3 +7,5 @@ cd ${0%/*} || exit 1 # Run from this directory
./Allrun.pre
runApplication $(getApplication)
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel
index ba2fd3c6bb13e449cba1bd26389fe050283b9db3..4ec7e69c221bbfba7f424a3f3d68f44c7a460f39 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun-parallel
@@ -6,17 +6,17 @@ cd ${0%/*} || exit 1 # Run from this directory
./Allrun.pre
-# Set application name
-application=$(getApplication)
-
-# decompose
+# Decompose
runApplication -s cabin decomposePar -region cabin
runApplication -s ice decomposePar -region ice
runApplication -s exterior decomposePar -region exterior
-runParallel $application
+runParallel $(getApplication)
+# Reconstruct
runApplication -s cabin reconstructPar -region cabin
runApplication -s ice reconstructPar -region ice
runApplication -s exterior reconstructPar -region exterior
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre
index 0818ebd1a40260e62abc584c3d06d02b8eeaa0d3..44fa75f381cc58c4e9a53a1bf2e31c3fbce7f83f 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre
@@ -18,3 +18,5 @@ runApplication splitMeshRegions -cellZones -overwrite
# set the initial fields
restore0Dir
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean
index 0cfcbc5894d9c88c090301d2d28d6a4b63ca9efc..5a54eef9a0e647fa7b80e85aca2642079808588c 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean
@@ -1,15 +1,15 @@
#!/bin/sh
-
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+rm -rf 0
foamCleanPolyMesh -region air
foamCleanPolyMesh -region porous
rm -f *.OpenFOAM
-rm -rf 0
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun
index c6e1de86782f222b95c41cdc1f091718e25cdb9d..f4d82024cdbfa32827ca307c2aaf9f520d0d6b8b 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun
@@ -1,10 +1,11 @@
#!/bin/sh
-
cd ${0%/*} || exit 1 # Run from this directory
-./Allrun.pre
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+./Allrun.pre
+
runApplication $(getApplication)
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel
index 9e5b931edcb44dc7ec6ab0c66b863e0c48736d27..2be2e1edda0235c014544dc9384939cc01922958 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel
@@ -1,5 +1,4 @@
#!/bin/sh
-
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
@@ -14,3 +13,5 @@ runParallel $(getApplication)
runApplication -s air reconstructPar -latestTime -region air
runApplication -s porous reconstructPar -latestTime -region porous
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre
index 9780d15756a99cbd58fa55ac1c5c307225c28f93..6d3c8f35440a242ddb97b78d39d6f3e979678a24 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre
@@ -25,3 +25,5 @@ paraFoam -touch -region porous
paraFoam -touch -region air
restore0Dir
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
index 760323fa2a2d6bc1c7dc855f1d5c4bb2b1c618f6..065a7b8ed962eba3753bd9988f9410ee42273d8a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
@@ -23,7 +23,7 @@ airToporous
constantHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName porous;
+ nbrRegion porous;
master false;
nbrModel porousToair;
@@ -40,7 +40,7 @@ porosityBlockage
interRegionExplicitPorositySourceCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName porous;
+ nbrRegion porous;
type DarcyForchheimer;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
index 7d8917bec1e949577037967bca7b92217d51d599..fffed7d171842ffa4ead7151242c0ff1969d1c8b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
@@ -23,7 +23,7 @@ porousToair
constantHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName air;
+ nbrRegion air;
master true;
nbrModel airToporous;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean
index e440375b6a98867ab69afbcf83ec2101e32b09f8..0df7ec62070aabead25912cd37ee92ce69a840d5 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf constant/cellToRegion
rm -rf 0/bottomAir
rm -rf 0/topAir
rm -rf 0/heater
@@ -28,7 +28,6 @@ rm -f constant/bottomAir/subMap
rm -f constant/bottomAir/visibleFaceFaces
rm -f constant/bottomAir/mapDist
-
rm -f constant/topAir/F
rm -f constant/topAir/constructMap*
rm -f constant/topAir/finalAgglom
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
index 8224dffa9cecfa534e484c4a5b499d5a5d6cac21..50db130fe2389cfd5a6a002daa902ceed5c13239 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
@@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -28,8 +27,6 @@ done
runApplication $(getApplication)
-
-
echo
echo "creating files for paraview post-processing"
echo
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
index 919b7d0b75e30b88893e4f236f069c7760c60762..f8131b1da89504f7196bbf0fc05182805ab7d986 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
@@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -36,7 +35,6 @@ runParallel $(getApplication)
runApplication reconstructPar -allRegions
-
echo
echo "creating files for paraview post-processing"
echo
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
index 22b2e59f126117fc69efe40e2c3c9d2709fe41eb..e7adbdd5bc053b05555b54631a9ab384f0c43ee2 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
@@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun b/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
index 021754896d883a41abdb24b4ad7788561d03e14f..52b2a4941d73838617c1741cb20f1d4a5f4acdf5 100755
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
./makeMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean b/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean
index 0280fc46544361e40d3891c2fcf9afbf231c2fcb..3512fe5e6ebf9617c4118087870cc4b589027bec 100755
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean
@@ -1,11 +1,10 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf constant/coarseMesh
-
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun b/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun
index 166a1200d591c5dfdc4a1d24c2b55bf4ab0b33e0..767ff8591ff643fea5b067019b2c2009634b552a 100755
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -13,3 +13,4 @@ runApplication -s fine blockMesh -dict system/blockMeshDict.fine
runApplication $(getApplication)
+# -----------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun-parallel b/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun-parallel
index bd03d75d47d7c35b15bb7aa63dd63783322a4784..2577f9c8669aeadd51a325dcdd922808c5506033 100755
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun-parallel
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun-parallel
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -20,3 +20,5 @@ runParallel $(getApplication)
#runApplication -s fine reconstructPar
#
#runApplication -s coarseMesh reconstructPar -region coarseMesh
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/elbow/Allclean b/tutorials/incompressible/icoFoam/elbow/Allclean
index f2da619e3dc41408d96034326836d3a3784aea8e..400ad856874908800dc2bc9f19a39b55c9637ad9 100755
--- a/tutorials/incompressible/icoFoam/elbow/Allclean
+++ b/tutorials/incompressible/icoFoam/elbow/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
-rm -rf fluentInterface
cleanCase
+rm -rf fluentInterface
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/icoFoam/elbow/Allrun b/tutorials/incompressible/icoFoam/elbow/Allrun
index 6da96f6a7449cf37b120d9bb2a51add9457c65ab..d47748719619575f9d7d05f1d11ae001c8297a1f 100755
--- a/tutorials/incompressible/icoFoam/elbow/Allrun
+++ b/tutorials/incompressible/icoFoam/elbow/Allrun
@@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application directory
-application=$(getApplication)
runApplication fluentMeshToFoam elbow.msh
-runApplication "$application"
+runApplication $(getApplication)
runApplication foamMeshToFluent
runApplication foamDataToFluent
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
index c454c9b3f638cae0f1a9c8cefe4a74b2af56a79e..162255286a9d87f59b4804ca4571d111e6c160d4 100755
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
@@ -4,13 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
./makeMesh
-#runApplication $application
+#runApplication $(getApplication)
runApplication decomposePar
-runParallel $application
+runParallel $(getApplication)
runApplication reconstructPar
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allclean b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allclean
index 4496e60747ea13a6e58942e786fd45d6465ea705..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allclean
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allclean
@@ -5,5 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun
index 25d83d176d84630f0032ac93497116d54765d03a..f4d82024cdbfa32827ca307c2aaf9f520d0d6b8b 100755
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun
@@ -7,3 +7,5 @@ cd ${0%/*} || exit 1 # Run from this directory
./Allrun.pre
runApplication $(getApplication)
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel
index 3f7cab5d82e34e43d25b7b1a4dfbe80e21a7248f..51af1fb48a672f04f66ce275bf17d886679b535a 100755
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
./Allrun.pre
runApplication decomposePar
-
runParallel $(getApplication)
-
runApplication reconstructPar
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre
index 5481027706858322aa3e00db9958e5e1f2df8dd2..c484c19d159ea442346b8edba7f124046dfa09b6 100755
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre
@@ -12,3 +12,5 @@ runApplication topoSet -constant
runApplication createBaffles -overwrite
restore0Dir
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean b/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean
index 496837c14e38ea0b4554af1025abfc9c3a42f380..2334d531d334618050cbef53f358707fab5745ed 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allclean
@@ -4,11 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove surface
-rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
-
cleanCase
+rm -rf 0
+
+# Remove surfaces and features
+rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
+rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
index 3f7cab5d82e34e43d25b7b1a4dfbe80e21a7248f..51af1fb48a672f04f66ce275bf17d886679b535a 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
./Allrun.pre
runApplication decomposePar
-
runParallel $(getApplication)
-
runApplication reconstructPar
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
index 6bb6affbfdcd631db1d908b2da685312c297b07d..fd9adacb88dc892576ce57e5d8dd1ebf2b127e35 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
@@ -29,3 +29,5 @@ runApplication createPatch -overwrite
# - set the initial fields
restore0Dir
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
index d01b222a10e303146c99367a82f47526ffaed6e7..ae51d1251b29abd147072ac8ee9dae5c067c81d1 100755
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
(
@@ -20,3 +20,5 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
rm -rf 0
)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun b/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun
index c34f2384400c2e7055fe566f7c4a8c8221ca8f7f..8d10da5a1f4adbaed4fb15afdb5e474ea5093c05 100755
--- a/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun
@@ -4,17 +4,15 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application directory
-application=$(getApplication)
runApplication blockMesh
#- Run serial
-#runApplication $application
+#runApplication $(getApplication)
#- Run parallel
runApplication decomposePar -cellDist
-runParallel $application
+runParallel $(getApplication)
runApplication reconstructPar
runApplication postChannel
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.orig b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/s
similarity index 71%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.orig
rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/0/s
index 6dca98e236ad06a267079706515888c0c05ae08c..7449c28d8700528f6ed606508a54b6424376ae5e 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.orig
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/s
@@ -10,36 +10,40 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object T;
+ location "0";
+ object s;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 1 0 0 0];
+dimensions [0 0 0 0 0 0 0];
-internalField uniform 300;
+internalField uniform 0;
boundaryField
{
- floor
+ inlet
{
type fixedValue;
- value uniform 300;
+ value $internalField;
}
- ceiling
+ outlet1
{
- type lumpedMassWallTemperature;
- kappaMethod fluidThermo;
- kappaName none;
- mass 1000;
- Cp 4100;
- value uniform 300.0;
+ type inletOutlet;
+ inletValue $internalField;
}
- fixedWalls
+ outlet2
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ }
+
+ defaultFaces
{
type zeroGradient;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict
index 1f8d6cfa5604d84f19229521a5e98fc943a38367..7f5d24e02256c4b4c0c5fd1bd6717ec68262c6e6 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict
@@ -79,6 +79,41 @@ functions
(0.21 0 0.01) // at central block
);
}
+
+ sTransport
+ {
+ type scalarTransport;
+ libs ("libsolverFunctionObjects.so");
+
+ enabled true;
+ writeControl outputTime;
+ writeInterval 1;
+
+ field s;
+
+ write true;
+
+ fvOptions
+ {
+ unitySource
+ {
+ type scalarSemiImplicitSource;
+ enabled true;
+
+ scalarSemiImplicitSourceCoeffs
+ {
+ selectionMode all;
+ volumeMode specific;
+ injectionRateSuSp
+ {
+ s (1 0);
+ }
+ }
+ }
+ }
+
+ resetOnStartUp false;
+ }
}
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes
index dfc6edc63b34801111d75e51bf1f9bd0c130bc06..45b788080090f08a093e1651c119a8e101a25285 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes
@@ -32,6 +32,7 @@ divSchemes
div(phi,k) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;
div(phi,R) Gauss limitedLinear 1;
+ div(phi,s) Gauss limitedLinear 1;
div(R) Gauss linear;
div(phi,nuTilda) Gauss limitedLinear 1;
div((nuEff*dev2(T(grad(U))))) Gauss linear;
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution
index 0a65e170b66c2177faa774f80769647426e8db59..da1a955daf2efa24c82c33a5b59fd5eae187a7d7 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution
@@ -33,7 +33,7 @@ solvers
smoother GaussSeidel;
}
- "(U|k|epsilon)"
+ "(U|k|epsilon|s)"
{
solver smoothSolver;
smoother symGaussSeidel;
@@ -41,7 +41,7 @@ solvers
relTol 0.1;
}
- "(U|k|epsilon)Final"
+ "(U|k|epsilon|s)Final"
{
$U;
tolerance 1e-05;
@@ -65,6 +65,7 @@ relaxationFactors
"U.*" 1;
"k.*" 1;
"epsilon.*" 1;
+ "s.*" 1;
}
}
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun
index 827542cfc5a366343ebbc97cdd52d80cb380ea35..1492c40ae0918bb27154ca93a05c2d8dff3711d9 100755
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun
@@ -1,10 +1,9 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
runApplication blockMesh
@@ -16,4 +15,6 @@ restore0Dir
# Create wall and cyclic baffles and the fields on them
runApplication createBaffles -overwrite
-runApplication $application
+runApplication $(getApplication)
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun
index 05b7969601d4822808359395b71f10ecef3b2b53..a1f6b6bbb67324d9c378d340aac069f6fa2046f2 100755
--- a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun
+++ b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun
@@ -4,23 +4,20 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application directory
-application=$(getApplication)
runApplication blockMesh
runApplication transformPoints -scale '(1.6666 1 1)'
runApplication changeDictionary -instance system -dict system/changeDictionaryDict.X
runApplication mirrorMesh -overwrite
-rm log.mirrorMesh
+rm -f log.mirrorMesh
+rm -f log.changeDictionary
-rm log.changeDictionary
runApplication changeDictionary -instance system -dict system/changeDictionaryDict.Y
-
runApplication mirrorMesh -overwrite
runApplication topoSet
runApplication createPatch -overwrite
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
index e93b8f3939f3be6e114862908bcd4517340a464f..f192cc20f99bf44af6a82cb0a12632f79ee1e891 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
@@ -49,4 +49,5 @@ adjustTimeStep yes;
maxCo 5;
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun b/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
index 2ba4fbfe4201bfc156f4cf3b9891e6edf69d4953..5d8a22acc0b4cdef500fdfb46bae6776c8de6358 100755
--- a/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
@@ -1,20 +1,17 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application directory
-application=$(getApplication)
-
runApplication blockMesh
#- Run serial
-#runApplication $application
+#runApplication $(getApplication)
#- Run parallel
runApplication decomposePar -cellDist
-runParallel $application
+runParallel $(getApplication)
#runApplication reconstructPar -latestTime
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean
index 0f2f7ba75f3eef784515c8f4fc1c3d4650637320..78739484071adc3d0fd4dff44d0810a0582f66d5 100755
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allclean
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-rm -rf postProcessing *.dat validation/*.eps
+rm -rf *.dat validation/*.eps
wclean validation/WatersKing
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun
index d6423dc58b14dbfd5a22251c89075e6d5459246f..e18982c7e64263d06288f0ea98e38138613df75f 100755
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun
@@ -1,4 +1,5 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -17,3 +18,5 @@ runParallel pisoFoam
runApplication reconstructParMesh -constant -mergeTol 1e-6
runApplication reconstructPar
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean
index 32ab17201f0a9095b374dd06a9a707512756fd24..da3e92633310925af6fdd2401853242b6304627b 100755
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean
@@ -4,12 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove surface
-rm -f constant/triSurface/motorBike.obj.gz
-
-rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
+
+# Remove surface
+rm -f constant/triSurface/motorBike.obj.gz
# Reset decomposeParDict
cp system/decomposeParDict.hierarchical system/decomposeParDict
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
index 4251bfa4faa6720fa1b0d7110fbb8f71a17d12b4..3cc5de831dd3605bd0b4cd765a8bb01fa37dad98 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
@@ -58,7 +58,7 @@ functions
fields (p U);
lifeTime 10000;
nSubCycle 5;
- cloudName particleTracks;
+ cloud particleTracks;
seedSampleSet uniform;
uniformCoeffs
{
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
index 8ba9bf34dae55b76848e2029516cc3ccc4d4ea47..d7bc5d2289d4d645463aba5c64e72417123be7f3 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
@@ -57,7 +57,7 @@ postPro1
visible yes;
tubeRadius 0.01;
colourBy field;
- fieldName U;
+ field U;
range (0 20);
opacity 1;
scalarBar
@@ -97,7 +97,7 @@ postPro1
visible yes;
featureEdges no;
colourBy field;
- fieldName U;
+ field U;
range (0 30);
opacity 1;
scalarBar
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
index 83ec2e4018a95f2cfe10187654278a0170a84ba9..47fc1a305d50de34219267894b565b0fba1a532a 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
@@ -32,7 +32,7 @@ streamLines
nSubCycle 5;
// Cloud name to use
- cloudName particleTracks;
+ cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
index fe3da42bf4bbf9c7c14f499dc94cdbda572dc3e2..db65453658e3edd89a9ea29fd51553d50eac62e1 100755
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
@@ -4,12 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication blockMesh
-
runApplication topoSet
-
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean
index 97591ced3297e7a1efcbd5bbf14a852b542c0703..7b7e1442f81b825413c545d22f7806af23753774 100755
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
# Remove copies of common files
\rm -rf 0 constant
-cleanCase
-
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean
index 97591ced3297e7a1efcbd5bbf14a852b542c0703..7b7e1442f81b825413c545d22f7806af23753774 100755
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
# Remove copies of common files
\rm -rf 0 constant
-cleanCase
-
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean
index f7e384215e413bf60b4cf501fcc080f648c3cd9f..4ebf8a1a7ff18db41add5c4532e3005eb2f935fa 100755
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean
@@ -4,11 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
rm *.obj > /dev/null 2>&1
rm -r constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm constant/triSurface/boundaryAndFaceZones.eMesh > /dev/null 2>&1
-rm constant/polyMesh/boundary > /dev/null 2>&1
-
-cleanCase
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
index 343d4f1efe1eae82f0c0a9656f5a52ef72e53f44..33bf5258ce2169182747d6a11df79d20ee65c23d 100755
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
@@ -18,7 +18,7 @@ runApplication -s collapseFaces \
runApplication checkMesh -allTopology -allGeometry -latestTime
-latestTime=`foamListTimes -latestTime`
+latestTime=$(foamListTimes -latestTime)
# Move the mesh into polyMesh
rm -rf constant/polyMesh
diff --git a/tutorials/incompressible/simpleFoam/T3A/Allclean b/tutorials/incompressible/simpleFoam/T3A/Allclean
index bb7f5888ae2703ca93602dd921d5a177cf4c32eb..f02ac1a6eb25f412b2cdecb8ec210e1c3aac5244 100755
--- a/tutorials/incompressible/simpleFoam/T3A/Allclean
+++ b/tutorials/incompressible/simpleFoam/T3A/Allclean
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
diff --git a/tutorials/incompressible/simpleFoam/T3A/Allrun b/tutorials/incompressible/simpleFoam/T3A/Allrun
index aa2f738b3eef4a05cd075ec2501a24af3342211c..666bf88e7e4b4b71f1e544af0b93799b0ac1b21b 100755
--- a/tutorials/incompressible/simpleFoam/T3A/Allrun
+++ b/tutorials/incompressible/simpleFoam/T3A/Allrun
@@ -4,11 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=`getApplication`
-
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
( cd validation && ./createGraphs )
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
index 89647850f5239766639961ac7b9da82a32064f43..c96f61d7ef3da434a039f14cfd7b4cf93718172d 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
@@ -4,8 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
index 021754896d883a41abdb24b4ad7788561d03e14f..52b2a4941d73838617c1741cb20f1d4a5f4acdf5 100755
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
./makeMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allclean b/tutorials/incompressible/simpleFoam/motorBike/Allclean
index 68a1d17d7b95d4325ac62967c787eb8a3e01709c..1dca1e06777e5689add188ca9fe1474f8d53647b 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allclean
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allclean
@@ -1,13 +1,15 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove surface and features
-rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
+cleanCase
+rm -rf 0
-rm -rf 0 > /dev/null 2>&1
+# Remove surface and features
+rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
+rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-cleanCase
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index b2bee4f0109859c2569a5ecfa17beacae8045042..f2d7ed6bb0f4d12f52191115084a78f20adc688b 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -4,14 +4,16 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+decompDict="-decomposeParDict system/decomposeParDict.6"
+
# copy motorbike surface from resources directory
\cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
runApplication surfaceFeatureExtract
runApplication blockMesh
-runApplication decomposePar
-runParallel snappyHexMesh -overwrite
+runApplication decomposePar $decompDict
+runParallel $decompDict snappyHexMesh -overwrite
#- For non-parallel running: - set the initial fields
# restore0Dir
@@ -19,9 +21,9 @@ runParallel snappyHexMesh -overwrite
#- For parallel running: set the initial fields
restore0Dir -processor
-runParallel patchSummary
-runParallel potentialFoam
-runParallel $(getApplication)
+runParallel $decompDict patchSummary
+runParallel $decompDict potentialFoam
+runParallel $decompDict $(getApplication)
runApplication reconstructParMesh -constant
runApplication reconstructPar -latestTime
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
similarity index 95%
rename from tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
rename to tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
index eb9bb3ad5e9eb308ebcceb21be97e305af2ea724..82f0a4e81a972b7b9a398d5c3693750d6c0447cb 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-numberOfSubdomains 6;
+numberOfSubdomains 4;
method hierarchical;
// method ptscotch;
@@ -28,7 +28,7 @@ simpleCoeffs
hierarchicalCoeffs
{
- n (3 2 1);
+ n (2 2 1);
delta 0.001;
order xyz;
}
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index 9578c6e11eeeb966b6bce06d7d3dfe8059d9c968..1e671e71b89ca2004af58765e532a4f1c04bfa1a 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -39,7 +39,7 @@ streamLines
// Cloud name to use
- cloudName particleTracks;
+ cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index 467839631355e5ca224d386c6f1843997344ae97..9e6bfda88cc2304c2447afefa0d45f7761495a76 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -18,7 +18,7 @@ near
writeControl writeTime;
// Calculate every
- executeControl writeTime;
+ executeControl writeTime;
// Fields to be sampled. Per field original name and mapped field to
// create.
@@ -29,10 +29,10 @@ near
);
// Patches/groups to sample (regular expressions)
- patches (motorBikeGroup);
+ patches (motorBikeGroup);
// Distance to sample
- distance 0.001;
+ distance 0.001;
}
// Use UNear to track along wall
@@ -48,7 +48,7 @@ wallBoundedStreamLines
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot;
// Velocity field to use for tracking.
- U UNear;
+ U UNear;
// Interpolation method. Default is cellPoint.
// interpolationScheme pointMVC;
@@ -65,7 +65,7 @@ wallBoundedStreamLines
lifeTime 100;
// Cloud name to use
- cloudName wallBoundedParticleTracks;
+ cloud wallBoundedParticleTracks;
// Seeding method.
seedSampleSet patchSeed; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean b/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean
index 5734444f4e74e87d3d685ad82df35bcb7e3b300e..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
index 17041f20bcccf14cf0daa22df77b39d7610f48d9..0cade47aa82d2fabaddb5e1844db8a6d3b89ce97 100755
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
@@ -4,18 +4,15 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application directory
-application=$(getApplication)
-
runApplication blockMesh
runApplication topoSet
runApplication refineHexMesh c0 -overwrite
restore0Dir
-#runApplication $application
+#runApplication $(getApplication)
runApplication decomposePar -cellDist
-runParallel $application
+runParallel $(getApplication)
runApplication reconstructPar
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 46492576ed5db7966e3fa9fffc61be35711d7a96..498774b1087f2ccdb1f37a8357de7a5d16a41234 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -64,16 +64,16 @@ functions
trackForward true;
// Names of fields to sample. Should contain above velocity field!
- fields (p k U);
+ fields (p k U);
// Steps particles can travel before being removed
lifeTime 10000;
// Number of steps per cell (estimate). Set to 1 to disable subcycling.
- nSubCycle 5;
+ nSubCycle 5;
// Cloud name to use
- cloudName particleTracks;
+ cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/Allclean b/tutorials/incompressible/simpleFoam/rotorDisk/Allclean
index 2204732e4514bf77bc9ed355ca0406b7fe14f919..47d0a0c0c111b14a7dbf60677c826c6f7e501436 100755
--- a/tutorials/incompressible/simpleFoam/rotorDisk/Allclean
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/Allclean
@@ -1,13 +1,16 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove surface and features
+cleanCase
+
+# Remove surface and features
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -f constant/triSurface/rotatingZone.eMesh > /dev/null 2>&1
rm -f constant/triSurface/fixed.eMesh > /dev/null 2>&1
rm -f 0/pointLevel > /dev/null 2>&1
rm -f 0/cellLevel > /dev/null 2>&1
-cleanCase
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
index aae8b75f8001d1185e98aed5bdf34ec320ab0918..abf6e2e700e3eafc368ea14db56dc9fb7f3c6118 100755
--- a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
@@ -4,9 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
# Remove decomposeParDict
rm -f system/decomposeParDict
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
index baa135b1d4b849a9052e86c1900402eeb91e66bb..8039a7526408603e09e1efaf8ccf07c424296248 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -8,6 +8,5 @@ cleanCase
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -f constant/triSurface/buildings.eMesh > /dev/null 2>&1
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
index 753dd9c94293e38a432f9bad986484eda22d7b7b..06dc7a18c55c4ada424c29a13d95eec58b926c8c 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
index e9a4d3ce5542aecda57e2597d867634a1e5e5fbb..c464c2fb190546b12d6ef74e9842d03af35c575a 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
index 7a8b38884665d9944b888ad6f778422dc362055c..7d479f3caa7505c4aaf545433f536689198b6f9c 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
index e9a4d3ce5542aecda57e2597d867634a1e5e5fbb..c464c2fb190546b12d6ef74e9842d03af35c575a 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/Allclean b/tutorials/lagrangian/MPPICFoam/cyclone/Allclean
index 2f40581670efd0cc2f3df08a386ca1392c571fda..e274cef962b7a59a49bd8aa5d45c2fe7ec18b479 100755
--- a/tutorials/lagrangian/MPPICFoam/cyclone/Allclean
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/Allclean
@@ -1,7 +1,11 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
# rm -f constant/triSurface/cyclone.stl.gz > /dev/null 2>&1
-cleanCase
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
index 3a685fa3552ca4d20342ef222bb101ad1fd79100..ef6d5c15f830e3a61cbb4a33d8f5dce7929af12a 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
@@ -72,7 +72,7 @@ subModels
massTotal 40;
SOI 1;
parcelBasisType mass;
- patchName inlet;
+ patch inlet;
duration 4;
parcelsPerSecond 100644;
U0 (-10 0 0);
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
index 7a8b38884665d9944b888ad6f778422dc362055c..7d479f3caa7505c4aaf545433f536689198b6f9c 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
index 67943e71f16dc1ae32b4c4ef755c8ba8d6492b78..aa34863b9b7a8791a035ceadc85e6b099a35a894 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
@@ -80,7 +80,7 @@ subModels
{
type patchInjection;
parcelBasisType fixed;
- patchName lowerInlet;
+ patch lowerInlet;
U0 (18.7939 6.8404 0);
nParticle 1;
parcelsPerSecond 1390885;
@@ -105,7 +105,7 @@ subModels
{
type patchInjection;
parcelBasisType fixed;
- patchName upperInlet;
+ patch upperInlet;
U0 (18.7939 -6.8404 0);
nParticle 1;
parcelsPerSecond 1390885;
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
index e9a4d3ce5542aecda57e2597d867634a1e5e5fbb..c464c2fb190546b12d6ef74e9842d03af35c575a 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
index 1d01582b285cdfc79bbc2c2525074137b0237260..158fb0bf528573eda64b6b9d98b39b30a07e4386 100755
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
@@ -4,14 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
# create mesh
runApplication blockMesh
# create ignition cells cellSet
runApplication topoSet
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
index 85527724bf1755a5b4ddb251062932f53faba38f..47cedce61ea4664897f6d1a65785260159fcd9a4 100755
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
(
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
index 77256434358799e3d17b6b07fc28b59cb7932e6c..4d36bb740b17841a65611ab534a65a124b816623 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
@@ -5,9 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+rm -rf 0
rm -rf constant/wallFilmRegion
-rm -rf 0
rm -f *.obj
#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun
index ebb4bc401cba320a82525297dcb680deab9af7ec..dbc0b12711ce8b61d182d0255c0ddd4d0e6a5fd1 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun
@@ -1,10 +1,11 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
+# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
./Allrun.pre
-application=$(getApplication)
+runApplication $(getApplication)
-runApplication $application
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
index e4d467e68eef7219e9d33d3b22a4b5a4adb8e7c6..1ad7fbb61c727c5cc43766f58d8ecdf9dc4f6996 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
@@ -1,4 +1,7 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+
+# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
restore0Dir
@@ -11,3 +14,5 @@ runApplication extrudeToRegionMesh -overwrite
paraFoam -touch
paraFoam -touch -region wallFilmRegion
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
index af4915a63be30ad2490aefbbf7bfdc4cdd2eb306..13a5320893a59f48b67ef07b3a8f563814e10c50 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
index db95457745278b3ebe1e811db469c43638b94cf8..6ed9b627a7676e3830a2ad8f16a062df52439156 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
@@ -5,10 +5,10 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+rm -rf 0
rm -rf system/wallFilmRegion
rm -rf constant/wallFilmRegion
-rm -rf 0
rm -f *.obj
#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun
index fa03916ababe270f90a56fc23907f0d76069e2dc..dbc0b12711ce8b61d182d0255c0ddd4d0e6a5fd1 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory
./Allrun.pre
-application=$(getApplication)
+runApplication $(getApplication)
-runApplication $application
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
index 7779179a354de3dca77e6bddac5a358a2b348918..a061f0da4c3649cde693c9cf91926e5a3c49743d 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel
@@ -6,13 +6,12 @@ cd ${0%/*} || exit 1 # Run from this directory
./Allrun.pre
-application=$(getApplication)
-
runApplication -s wallFilmRegion decomposePar -region wallFilmRegion
runApplication -s primaryRegion decomposePar
-runParallel $application
+runParallel $(getApplication)
runApplication -s wallFilmRegion reconstructPar -region wallFilmRegion
runApplication -s primaryRegion reconstructPar
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
index 952860d444d7b1d7ae5b84e6b835d29ad20a4f35..a9f16e526ad9ab32479ced026b66027c9a713bc1 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
@@ -33,3 +33,5 @@ find ./0 -maxdepth 1 -type f -exec \
paraFoam -touch
paraFoam -touch -region wallFilmRegion
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
index efb2938c8199c8e69e94a9bcc52003de7b6c075d..7cf97c650497e854bb2d99cc3a2b63d64e1b012e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
@@ -108,7 +108,7 @@ thermoSingleLayerCoeffs
drippingInjectionCoeffs
{
- cloudName reactingCloud1;
+ cloud reactingCloud1;
deltaStable 0;
particlesPerParcel 100.0;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
index 77256434358799e3d17b6b07fc28b59cb7932e6c..4d36bb740b17841a65611ab534a65a124b816623 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
@@ -5,9 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+rm -rf 0
rm -rf constant/wallFilmRegion
-rm -rf 0
rm -f *.obj
#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun
index ebb4bc401cba320a82525297dcb680deab9af7ec..dbc0b12711ce8b61d182d0255c0ddd4d0e6a5fd1 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun
@@ -1,10 +1,11 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
+# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
./Allrun.pre
-application=$(getApplication)
+runApplication $(getApplication)
-runApplication $application
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
index c82f75cd2dda061eb12b224966dc1ba98d153bba..4ff21dad8e0e653a56e5a4447916fd6ac792eb8d 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
@@ -1,4 +1,7 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+
+# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
restore0Dir
@@ -12,3 +15,5 @@ runApplication extrudeToRegionMesh -overwrite
paraFoam -touch
paraFoam -touch -region wallFilmRegion
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
index ef488bebdd83c2d9880de3c8f619b07863e03e3b..f51e31b47edfc84b722dc51a0792f4461a143a49 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel kinematicSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
index 77256434358799e3d17b6b07fc28b59cb7932e6c..4d36bb740b17841a65611ab534a65a124b816623 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
@@ -5,9 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
+rm -rf 0
rm -rf constant/wallFilmRegion
-rm -rf 0
rm -f *.obj
#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun
index ebb4bc401cba320a82525297dcb680deab9af7ec..dbc0b12711ce8b61d182d0255c0ddd4d0e6a5fd1 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun
@@ -1,10 +1,11 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
+# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
./Allrun.pre
-application=$(getApplication)
+runApplication $(getApplication)
-runApplication $application
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
index 9292f83031bdfea5e212528f1373fe8e61042382..00eed56aae61f4d1786a3d9ec2cf9510e8b19478 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
@@ -1,4 +1,7 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+
+# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
restore0Dir
@@ -29,3 +32,5 @@ runApplication createPatch -region wallFilmRegion -overwrite
paraFoam -touch
paraFoam -touch -region wallFilmRegion
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
index 0a3d88057d64fd5b278aa4db514bd1e6a23f59a5..b26b2d3c9aef69340154a48b11df8e40940eca7c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
index 7e7333f78c35c9d0bdc6794e91a776d808b25757..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# Remove 0.orig/ copy and post-processing directories
-\rm -rf 0 postProcessing
-
cleanCase
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
index 731fbd81ed365e17fa79c4bbcfcc9604b24da482..1263b4357db8879f89bdc0efb4009a4afd483f24 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1;
+cloud reactingCloud1;
sampleFrequency 1;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
index df77730bc36a67aea467817e807431c476e580ef..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove old time and post-processing directories
-rm -rf 0 *[1-9]* processor* postProcessing
-
cleanCase
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
index 731fbd81ed365e17fa79c4bbcfcc9604b24da482..1263b4357db8879f89bdc0efb4009a4afd483f24 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1;
+cloud reactingCloud1;
sampleFrequency 1;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 2fa5343300f5be12c15e5330e50c50096eb5f268..d20347dc74d5b99ea5d47ff6ae1245f93970680c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -80,7 +80,7 @@ subModels
SOI 0.01;
massTotal 8;
parcelBasisType mass;
- patchName inletCentral;
+ patch inletCentral;
duration 10000;
parcelsPerSecond 1e5;
U0 (40 0 0);
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean
index 08f70e11b9b6b6c5e9a989f1389eb10e914084a9..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean
@@ -4,11 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove old time and post-processing directories
-rm -rf 0 *[1-9]* processor* postProcessing
-
-# copy 0.orig to 0
-cp -r 0.orig 0
cleanCase
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
index d05adc58c130573b4d278360456f659cbed19b7d..07257081e177989166ae566beee85bc2b8f05c7d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1Tracks;
+cloud reactingCloud1Tracks;
fields
(
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
index 1ff58d619cd61d9d914ada36d10519f9e267d805..e6e16bed97283ecbd750cb1b0ec27d34a4e87322 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
@@ -84,7 +84,7 @@ subModels
type patchInjection;
massFlowRate 0.8e-03;
parcelBasisType mass;
- patchName inletCentral;
+ patch inletCentral;
parcelsPerSecond 100;
duration 1; // NOTE: set to 1 for steady state
U0 (0 40 0);
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
index 6a56bbcf58be1755525b7444b805ad077dc46ed2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# Remove old time, 0.orig/ copy and post-processing directories
-\rm -rf 0 *[1-9]* processor* postProcessing
-
cleanCase
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
index a4698df1e26e7f0f62dc322d80187bd491337d14..6be8a2051632b8004293b797d6d23148bae5e06b 100755
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun
@@ -10,7 +10,7 @@ runApplication blockMesh
runApplication potentialFoam
-# remove incompatible (volumetric) flux field
+# Remove incompatible (volumetric) flux field
\rm -f 0/phi 2>/dev/null
runApplication $(getApplication)
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
index d05adc58c130573b4d278360456f659cbed19b7d..07257081e177989166ae566beee85bc2b8f05c7d 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1Tracks;
+cloud reactingCloud1Tracks;
fields
(
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 1ff58d619cd61d9d914ada36d10519f9e267d805..e6e16bed97283ecbd750cb1b0ec27d34a4e87322 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -84,7 +84,7 @@ subModels
type patchInjection;
massFlowRate 0.8e-03;
parcelBasisType mass;
- patchName inletCentral;
+ patch inletCentral;
parcelsPerSecond 100;
duration 1; // NOTE: set to 1 for steady state
U0 (0 40 0);
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allclean b/tutorials/mesh/foamyHexMesh/blob/Allclean
index 7563c7a99b428cfaf27303919459881e34fe37ec..f4dcb53f51ae231ae70396df6af873ab45157851 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allclean
+++ b/tutorials/mesh/foamyHexMesh/blob/Allclean
@@ -1,12 +1,11 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
-rm -rf 0 > /dev/null 2>&1
+rm -rf 0
rm -rf constant/triSurface/blob.stl.gz > /dev/null 2>&1
@@ -23,5 +22,4 @@ rm -rf constant/backgroundMeshDecomposition/polyMesh/points > /dev/null 2>&1
rm -rf snapToSurface?.obj > /dev/null 2>&1
rm -rf tetsToSnapTo.obj > /dev/null 2>&1
-
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allclean b/tutorials/mesh/foamyHexMesh/flange/Allclean
index 2ceecfe1f9a862f15e8234fea4c5e3727262db6b..75abafd12bbd62c1b60132289e14316722425a5e 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allclean
+++ b/tutorials/mesh/foamyHexMesh/flange/Allclean
@@ -1,15 +1,17 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+rm -rf 0
+
rm -r constant/triSurface/flange.stl.gz > /dev/null 2>&1
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -r constant/ccx constant/ccy constant/ccz > /dev/null 2>&1
rm -r constant/internalDelaunayVertices constant/targetCellSize > /dev/null 2>&1
-rm -r 0 > /dev/null 2>&1
rm -rf constant/backgroundMeshDecomposition/polyMesh/boundary > /dev/null 2>&1
rm -rf constant/backgroundMeshDecomposition/polyMesh/faces > /dev/null 2>&1
@@ -19,6 +21,4 @@ rm -rf constant/backgroundMeshDecomposition/polyMesh/points > /dev/null 2>&1
rm -r *.obj > /dev/null 2>&1
-cleanCase
-
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean b/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean
index d7ffd378fae96d830b553992b41d88dc157f5bfd..afee03547e34f0855ee2be1fe2dfe4d12c52a816 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean
@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
+
rm -rf constant/extendedFeatureEdgeMesh/
rm -f constant/triSurface/*.eMesh*
rm -f constant/triSurface/*.stl
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
index 51b38f7a83a6bb7e3e5a461e25babc932577a278..e2508db192560393817c69c7152b8cc54c6cacea 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre
@@ -16,8 +16,6 @@ intersectSurfaces()
surfaceBooleanFeatures intersection "$@"
}
-# Set application name
-application=$(getApplication)
\rm -rf 0
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
index 6cf13f98ce797f148251f4976260e872d69f3558..392878e5d3ad71ad9bbf04b2191238b8722f805e 100755
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation
@@ -6,9 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory
cp system/controlDict.flow system/controlDict
-# Set application name
-application=$(getApplication)
-
rm -rf 0
runApplication createBaffles -overwrite
@@ -17,7 +14,7 @@ runApplication mergeOrSplitBaffles -split -overwrite
# Get rid of zero faced patches
runApplication createPatch -overwrite
-# Copy fields after meshing to avoind the generation of unnecessary patch fields
+# Copy fields after meshing to avoid the generation of unnecessary patch fields
restore0Dir
# Initialize alpha
@@ -28,7 +25,7 @@ runApplication -s main \
decomposePar -force
# Run
-runParallel $application
+runParallel $(getApplication)
# Reconstruct
runApplication reconstructPar -noFunctionObjects
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
index 66229e46ca5fe8a4f79754ab7ceca7fe88bd9e11..5ef122ebb30cc640437da46d5fee4c0e6d83489e 100755
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean
@@ -1,22 +1,19 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+rm -rf 0
+
rm -r constant/extendedFeatureEdgeMesh constant/internalDelaunayVertices > /dev/null 2>&1
-rm constant/triSurface/*.eMesh > /dev/null 2>&1
-rm constant/triSurface/*_orient* > /dev/null 2>&1
-rm -r constant/polyMesh > /dev/null 2>&1
-rm -r constant/polyMesh > /dev/null 2>&1
+rm -f constant/triSurface/*.eMesh > /dev/null 2>&1
+rm -f constant/triSurface/*_orient* > /dev/null 2>&1
rm -r constant/tetDualMesh > /dev/null 2>&1
rm -r snapToSurface?.obj tetsToSnapTo.obj > /dev/null 2>&1
rm domain coneAndSphere > /dev/null 2>&1
-rm -rf 0/
-
-cleanCase
-
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
index ab8099c64971dbd3141d6156a18bedd38f08b925..894a75c4e03255191b0498997bda71b39cd4df3d 100755
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
@@ -1,15 +1,14 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+rm -rf 0
+
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -rf constant/triSurface/*.eMesh > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
rm -rf MeshedSurface.obj > /dev/null 2>&1
-cleanCase
-
-
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun
index 8653b499f5fd849d23ea523422ff563dc667d28c..cdd750415ca3bfd2f620023ca402fb31bc170efc 100755
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun
@@ -16,5 +16,4 @@ runApplication foamyQuadMesh -overwrite
runApplication extrude2DMesh -overwrite polyMesh2D
runApplication checkMesh -allGeometry -allTopology -constant -noZero
-
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
index 266fee9c0b4af31482c6c6f707c4c4c51f9b9882..56aef09d09bc7fb6ba9811ad4e736e6b713a6781 100755
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
@@ -11,5 +11,4 @@ runApplication decomposePar
runParallel rhoCentralFoam
runApplication reconstructPar
-
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
index 3a0c2229939d24c1c4e2f55609fd85dd6651260e..1048413963ce7226c94aab7512a8aab6485a010a 100755
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
@@ -1,16 +1,13 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -rf constant/triSurface/jaggedBoundary.eMesh > /dev/null 2>&1
-rm -rf constant/polyMesh > /dev/null 2>&1
-
rm -rf MeshedSurface.obj > /dev/null 2>&1
-cleanCase
-
-
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun
index 150693b9fe41dfcd2771350c996a0bccfd1b9885..5434248652eb11560a5d697f51868be49f046dbb 100755
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun
@@ -9,5 +9,4 @@ runApplication foamyQuadMesh -overwrite
runApplication extrude2DMesh -overwrite MeshedSurface
runApplication checkMesh -allGeometry -allTopology -constant -noZero
-
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/square/Allclean b/tutorials/mesh/foamyQuadMesh/square/Allclean
index d8936babb013ad9f884be606f76121024066f516..8da713f31dc2496b7deb2fa033108085ce7e5ac0 100755
--- a/tutorials/mesh/foamyQuadMesh/square/Allclean
+++ b/tutorials/mesh/foamyQuadMesh/square/Allclean
@@ -1,16 +1,13 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -rf constant/triSurface/unit_cube.eMesh > /dev/null 2>&1
-rm -rf constant/polyMesh > /dev/null 2>&1
-
rm -rf MeshedSurface*.obj > /dev/null 2>&1
-cleanCase
-
-
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/foamyQuadMesh/square/Allrun b/tutorials/mesh/foamyQuadMesh/square/Allrun
index 26543eaac4ccfe5c4a5950be41c095b65e5332c4..87a113fc1262e7e5e906c6c7e6ab3456d6b93ab4 100755
--- a/tutorials/mesh/foamyQuadMesh/square/Allrun
+++ b/tutorials/mesh/foamyQuadMesh/square/Allrun
@@ -9,5 +9,4 @@ runApplication foamyQuadMesh -overwrite
runApplication extrude2DMesh -overwrite polyMesh2D
runApplication checkMesh -allGeometry -allTopology -constant -noZero
-
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/parallel/cavity/Allclean b/tutorials/mesh/parallel/cavity/Allclean
index 48fe2ebdabb09a97773012cebda63363e0dd5546..1ddaee91ff1648c391e96c435bdbf076d0f58b87 100755
--- a/tutorials/mesh/parallel/cavity/Allclean
+++ b/tutorials/mesh/parallel/cavity/Allclean
@@ -1,12 +1,13 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
# Restore default dictionaries
cp system/decomposeParDict-2 system/decomposeParDict
cp system/controlDict-startTime system/controlDict
-cleanCase
-rm -f constant/polyMesh/boundary
-rm -f constant/polyMesh/procAddressing
+# -----------------------------------------------------------------------------
diff --git a/tutorials/mesh/parallel/cavity/constant/polyMesh/blockMeshDict b/tutorials/mesh/parallel/cavity/system/blockMeshDict
similarity index 100%
rename from tutorials/mesh/parallel/cavity/constant/polyMesh/blockMeshDict
rename to tutorials/mesh/parallel/cavity/system/blockMeshDict
diff --git a/tutorials/mesh/parallel/filter/Allclean b/tutorials/mesh/parallel/filter/Allclean
index 7e7333f78c35c9d0bdc6794e91a776d808b25757..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/mesh/parallel/filter/Allclean
+++ b/tutorials/mesh/parallel/filter/Allclean
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# Remove 0.orig/ copy and post-processing directories
-\rm -rf 0 postProcessing
-
cleanCase
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/parallel/filter/Allrun b/tutorials/mesh/parallel/filter/Allrun
index 0114f7829d55dc091a0406f0ebead592710c7641..598afe74a52c340d4560f405f629dac43b06000d 100755
--- a/tutorials/mesh/parallel/filter/Allrun
+++ b/tutorials/mesh/parallel/filter/Allrun
@@ -29,5 +29,4 @@ runParallel -s parallel $application
#- Reconstruct all times
runParallel -s 1 redistributePar -reconstruct
-
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/mesh/parallel/filter/constant/particleTrackProperties b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
index 731fbd81ed365e17fa79c4bbcfcc9604b24da482..1263b4357db8879f89bdc0efb4009a4afd483f24 100644
--- a/tutorials/mesh/parallel/filter/constant/particleTrackProperties
+++ b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1;
+cloud reactingCloud1;
sampleFrequency 1;
diff --git a/tutorials/mesh/parallel/filter/constant/polyMesh/blockMeshDict b/tutorials/mesh/parallel/filter/system/blockMeshDict
similarity index 98%
rename from tutorials/mesh/parallel/filter/constant/polyMesh/blockMeshDict
rename to tutorials/mesh/parallel/filter/system/blockMeshDict
index 1e4f2bce943970d713c8343066983319fdda4d97..42f0d62fa9ecbdf47acf3f8a6e57d94cfd3f95a9 100644
--- a/tutorials/mesh/parallel/filter/constant/polyMesh/blockMeshDict
+++ b/tutorials/mesh/parallel/filter/system/blockMeshDict
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant/polyMesh";
+ location "system";
object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/Allclean b/tutorials/mesh/refineMesh/refineFieldDirs/Allclean
index 5734444f4e74e87d3d685ad82df35bcb7e3b300e..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/mesh/refineMesh/refineFieldDirs/Allclean
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
index a607777d034b1e10ee113e92e1acf979a19f96f2..ef1eb8396f6ce56f702b2919eb6300eca4396a44 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
radiusFieldXY.write();
- if(calcDirections)
+ if (calcDirections)
{
vectorIOField radialDirection
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict b/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict
index cf3f3d5bdfcfbcb1cf6586e5345017960d2c5ae7..5ed3bb5e1ba5bd9c8c77772afc95ba05bb47ff6b 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict
@@ -3,7 +3,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant/polyMesh";
+ location "system";
object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean
index 5a47b6aef5f4acf85a40158bae29d53183c0f472..6b45f82a41b0f9a0739a80a41a680be892e55243 100755
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean
@@ -1,8 +1,9 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -f constant/polyMesh/boundary
-
cleanCase
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/polyMesh/blockMeshDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/blockMeshDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/polyMesh/blockMeshDict
rename to tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/blockMeshDict
diff --git a/tutorials/mesh/snappyHexMesh/flange/Allclean b/tutorials/mesh/snappyHexMesh/flange/Allclean
index eba9b7e6d2ace77c244df92f811f7a6314098021..e46b494f7bf07f293ef3fe89824b808255d17441 100755
--- a/tutorials/mesh/snappyHexMesh/flange/Allclean
+++ b/tutorials/mesh/snappyHexMesh/flange/Allclean
@@ -4,15 +4,14 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove surface
-rm -f constant/triSurface/flange.stl.gz
+cleanCase
+rm -rf 0
-rm -rf 0 > /dev/null 2>&1
rm -f ./flange ./*.obj > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/flange.eMesh > /dev/null 2>&1
-rm -f constant/polyMesh/boundary
-cleanCase
+# Remove surface and features
+rm -f constant/triSurface/flange.stl.gz > /dev/null 2>&1
+rm -f constant/triSurface/flange.eMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/snappyHexMesh/flange/Allrun b/tutorials/mesh/snappyHexMesh/flange/Allrun
index 49602feb6e7ad89f00a55e13ce697b4f0316ddd5..cae2427078d9cdba6f22a843765b4aa3fba683c8 100755
--- a/tutorials/mesh/snappyHexMesh/flange/Allrun
+++ b/tutorials/mesh/snappyHexMesh/flange/Allrun
@@ -1,4 +1,6 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -8,3 +10,5 @@ cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
runApplication blockMesh
runApplication surfaceFeatureExtract
runApplication snappyHexMesh -overwrite
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/Allclean b/tutorials/mesh/snappyHexMesh/gap_detection/Allclean
index 8bfe3dc5d7d65031e324d192b3fb1a3f8df9b0b3..6b45f82a41b0f9a0739a80a41a680be892e55243 100755
--- a/tutorials/mesh/snappyHexMesh/gap_detection/Allclean
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/Allclean
@@ -1,7 +1,9 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-\rm -f constant/polyMesh/boundary > /dev/null 2>&1
cleanCase
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/constant/polyMesh/blockMeshDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/blockMeshDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/gap_detection/constant/polyMesh/blockMeshDict
rename to tutorials/mesh/snappyHexMesh/gap_detection/system/blockMeshDict
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
index 9cbb0c1a827e7b2818c31d1b389e118c11e55922..eb6c79aa66377452012b3c76c7b3701ede496beb 100755
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
@@ -9,4 +9,4 @@ cleanCase
rm -f system/blockMeshDict
rm -f 0/alpha.water
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
index b5139052585786476764b1b342c5f887339d82f8..73737743f25f2b20cabb5cec8553b69582d99ecc 100755
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
@@ -4,10 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Set application name
-application=$(getApplication)
-
# create the underlying block mesh
m4 system/pachuka.m4 > system/blockMeshDict
@@ -33,4 +29,4 @@ runParallel $(getApplication)
# Reconstruct case
runApplication reconstructPar
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
index 8372cf2fbdbf665c575f9d6e4a8cb8af8a1ccb7d..2a4fcbf4fb0e2d44f8db0a15a8474649280bd20e 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
@@ -66,7 +66,7 @@ subModels
interface
{
C -10;
- alphaName alpha.water;
+ alpha alpha.water;
}
}
@@ -79,7 +79,7 @@ subModels
SOI 0;
parcelBasisType fixed;//mass;
nParticle 1;
- patchName inlet;
+ patch inlet;
duration 1;
parcelsPerSecond 1e5;
U0 (0 0 0.1);
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean
index 57c93208bcd205e53f0528094047832e8ecc2926..6bb45f9da9b680c3e27b84f32480c955af2cdc87 100755
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf constant/polyMesh/sets > /dev/null 2>&1
+cleanCase
+
rm -rf 0/polyMesh > /dev/null 2>&1
rm system/topoSetDict > /dev/null 2>&1
-cleanCase
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun
index 6ed1c6ba9b493effcfa94a9350a40e6a3bf713f8..d399430e22495622a5d790dc939ef675016fd164 100755
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun
@@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
refineMeshByCellSet()
{
while [ $# -ge 1 ]
@@ -27,6 +24,6 @@ refineMeshByCellSet()
runApplication blockMesh
refineMeshByCellSet 1 2 3
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean
index d1fd91d5d36810bf19137be1017ecb7f7bcba27e..8b8b96fa046507b00e2e1498724d4a5095eb9620 100755
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean
@@ -4,10 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf constant/polyMesh/sets > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
+cleanCase
+rm -rf 0
+
rm system/topoSetDict > /dev/null 2>&1
rm -rf processor[0-9] > /dev/null 2>&1
-cleanCase
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
index e020b8a0fc2df5d4c7d01ee8855d8396fbd2e5ec..39816254dd490965cdb4f2f21302d0f771156ac4 100755
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun
@@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
refineMeshByCellSet()
{
while [ $# -ge 1 ]
@@ -34,7 +31,7 @@ refineMeshByCellSet 1 2 3
#runApplication mapFields ../throttle -sourceTime latestTime
runApplication decomposePar
-runParallel $application
+runParallel $(getApplication)
runApplication reconstructPar
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean
index 57c93208bcd205e53f0528094047832e8ecc2926..6bb45f9da9b680c3e27b84f32480c955af2cdc87 100755
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf constant/polyMesh/sets > /dev/null 2>&1
+cleanCase
+
rm -rf 0/polyMesh > /dev/null 2>&1
rm system/topoSetDict > /dev/null 2>&1
-cleanCase
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun
index 746320a279e3083e129740639f4436d502088579..d399430e22495622a5d790dc939ef675016fd164 100755
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allrun
@@ -4,8 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
refineMeshByCellSet()
{
while [ $# -ge 1 ]
@@ -26,6 +24,6 @@ refineMeshByCellSet()
runApplication blockMesh
refineMeshByCellSet 1 2 3
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allrun
index 603304a5ae32ab7377ac84e7e38028913058ab0f..31527e6ec22d7448f5b07e8185779d8f25750efa 100755
--- a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allrun
@@ -8,6 +8,6 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
index a180eaa28b0e134a40df326d3698eecf2b8a0083..86d9367383102e275fe026983693dbb638b74aa4 100755
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
rm -rf processor*
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
index 912c34cfdb7636863fe4782c6bfc402154698b0d..6cfec647c79d18f2504b7408b94bb8ddbe2e3086 100755
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun
@@ -4,13 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
restore0Dir
runApplication blockMesh
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun
index f5e6c61a9e087c0f799e0c700493698c1df8fcf4..f1273de8e41357a83af0b1253a297acf47413959 100755
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication ./makeMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean
index c89fe3143ec469261888941ae84708ce1b245469..5558bc15964454d9da8be140c14cb8803f2aa115 100755
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean
@@ -2,7 +2,6 @@
cd ${0%/*} || exit 1 # Run from this directory
# Clean time directories only
-
rm -rf *[1-9]*
rm -f log.* 2>/dev/null
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun
index 89647850f5239766639961ac7b9da82a32064f43..c96f61d7ef3da434a039f14cfd7b4cf93718172d 100755
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun
@@ -4,8 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allrun b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allrun
index ebc19b3d2a4adff39cf7ca06c6c671b012c42337..8a77ff8076363a01e3fc0e676fcf87e9a5223fd5 100755
--- a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allrun
+++ b/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean
index e3e304dace9b32b33ff744ce134c16fe06fe085a..a0aed574d064249d38e9e5540f488ea190bd8024 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean
@@ -4,14 +4,13 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove surface
-rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
-
cleanCase
-rm constant/polyMesh/boundary > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
+rm -rf 0
rm system/topoSetDict > /dev/null 2>&1
+# Remove surface and features
+rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
+rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean
index d1295e344e28bdc2c1cd172ed7721348a2eeda0e..c9e8210d7785ce379488320db64f2ce1e004a3df 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean
@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm system/cellSetDict > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
+
+rm system/cellSetDict > /dev/null 2>&1
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean
index 5734444f4e74e87d3d685ad82df35bcb7e3b300e..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allrun b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allrun
index 875319146664ef804b473341ee56b31c2f801c7a..6a9d0d022934b4f22d4e024107b9d9098409ce4a 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allrun
+++ b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allrun
@@ -4,14 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
runApplication blockMesh
runApplication topoSet
runApplication subsetMesh -overwrite c0 -patch floatingObject
restore0Dir
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean
index 83230a683ee7c7ae55f14e972fce04cf9fa1d637..d3b4c4257f3c7936b982bd6a0126c8e29d346331 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean
@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0 > /dev/null 2>&1
+
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1
diff --git a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun
index f35012c3e0727eab2d157091f5ccc9b10705be80..83e66bcf9ca0b7ea6a39bb60a1ffc265e8ad9410 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun
+++ b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun
@@ -4,18 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
-
./Allrun.pre
-# Decompose
runApplication decomposePar -force
-
-# Run
-runParallel $application
-
-# Reconstruct
+runParallel $(getApplication)
runApplication reconstructPar -noFunctionObjects
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun.pre b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun.pre
index 1f8a3f5f9fb48e6782250651c0cb5b192fc52b59..0d993b2ee7d2f2d5e1535ac436220ae73a89bc13 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun.pre
+++ b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allrun.pre
@@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
\rm -rf 0
# Meshing
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allclean b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allclean
index 9a3f86fc055e189be3141a8ee86ce0b0131aa10d..5442dc1333e01662575c442766fce5c37b65a40a 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allclean
@@ -1,17 +1,17 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove surface and features
-\rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
-\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-\rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
-
-rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
-\rm -f constant/polyMesh/boundary
+# Remove surface and features
+\rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
+\rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
+\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
\cp system/controlDict_run system/controlDict
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
index 776643da4d51a8c8abf1bd675f64e018fc865fb7..d22cdd2cc4657de99bc5a60f25cdd222767ff088 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
@@ -16,5 +16,4 @@ runParallel -s reconstruct redistributePar -reconstruct
runParallel -s decompose redistributePar -decompose -latestTime
runParallel -s restart $(getApplication)
-
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun.pre b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun.pre
index 5b7c3d7bc2566143f2f0b27fd8c85f012c440a95..d4a3ff963991b574ceda910717f54f497aa43c45 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun.pre
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun.pre
@@ -29,3 +29,5 @@ runParallel snappyHexMesh -overwrite
restore0Dir -processor
runParallel setFields
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/Allrun
index 603304a5ae32ab7377ac84e7e38028913058ab0f..e827b4c66ab5de7072778c2a80bac0f2db7523bc 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/Allrun
@@ -7,7 +7,8 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
+
runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/Allrun
index 603304a5ae32ab7377ac84e7e38028913058ab0f..e827b4c66ab5de7072778c2a80bac0f2db7523bc 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/Allrun
@@ -7,7 +7,8 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
+
runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/Allrun
index 603304a5ae32ab7377ac84e7e38028913058ab0f..e827b4c66ab5de7072778c2a80bac0f2db7523bc 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/Allrun
@@ -7,7 +7,8 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
+
runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/Allrun
index 603304a5ae32ab7377ac84e7e38028913058ab0f..823b296e60dbaf5092ecb752a3077207902043b3 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/Allrun
@@ -6,8 +6,9 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
+
cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun
index c1f08e0d5a1992512f06dfb64a4de45e49cd36d0..1f23b71a3d600438758d6c85ddb0a1edc9b360c4 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun
@@ -7,6 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
\cp 0/alpha.water.orig 0/alpha.water
+
runApplication setFields
runApplication $(getApplication)
diff --git a/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/Allrun b/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/Allrun
index 9d4261f19ac9aa0bc3f11823a0a7da2197b8726e..0af06e79fb4e1b1d4fa9ba2328de784ba59c5fba 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/Allrun
@@ -6,7 +6,8 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
+
runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun
index f56f378d9f03e5fe5c5b47117c9b465e0f008731..f110e3491b51d6cecaa0ad3e6aa6321cc909fac0 100755
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/Allrun
@@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
-
runApplication blockMesh
for i in 1 2
@@ -18,6 +15,6 @@ do
refineMesh -dict system/refineMeshDict -overwrite
done
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
index e3e304dace9b32b33ff744ce134c16fe06fe085a..0086cd47cb0c88353f0f5d331b776065c012843e 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
@@ -4,14 +4,14 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove surface
-rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
-
cleanCase
-rm constant/polyMesh/boundary > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
+rm -rf 0
+
rm system/topoSetDict > /dev/null 2>&1
+# Remove surfaces and features
+rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
+rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U b/tutorials/multiphase/interFoam/RAS/angledDuct/0/s
similarity index 59%
rename from tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
rename to tutorials/multiphase/interFoam/RAS/angledDuct/0/s
index 24706cea71e2627197e70f79a33b302614bd8d3f..b4484b5189d3019b05475a3f6e48c0d75bc7f57e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0/s
@@ -9,52 +9,44 @@ FoamFile
{
version 2.0;
format ascii;
- class volVectorField;
- location "0/bottomWater";
- object U;
+ class volScalarField;
+ location "0";
+ object s;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [0 0 0 0 0 0 0];
-internalField uniform (0.001 0 0);
+internalField uniform 0;
boundaryField
{
- minX
+ front
{
- type fixedValue;
- value uniform (0.001 0 0);
- }
- maxX
- {
- type inletOutlet;
- value uniform (0.01 0 0);
- inletValue uniform (0 0 0);
+ type zeroGradient;
}
- minY
+ back
{
- type noSlip;
+ type zeroGradient;
}
- minZ
+ walls
{
- type noSlip;
+ type zeroGradient;
}
- maxZ
+ porosityWall
{
- type noSlip;
+ type zeroGradient;
}
- bottomWater_to_rightSolid
+ inlet
{
- type noSlip;
- }
- bottomWater_to_leftSolid
- {
- type noSlip;
+ type fixedValue;
+ value uniform 0;
}
- bottomWater_to_heater
+ outlet
{
- type noSlip;
+ type inletOutlet;
+ inletValue uniform 0;
+ value uniform 0;
}
}
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun b/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun
index 4f55fd7efaf20c8631ec86210c8629a9a3fe234b..ccdfefe5c1ce337739caa5bddd0affe3cfc4aad0 100755
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun
@@ -1,10 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 system/blockMeshDict.m4 > system/blockMeshDict
-
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+m4 system/blockMeshDict.m4 > system/blockMeshDict
+
runApplication blockMesh
runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
index bec53edf74b7e1f519101db05b422190b7f25d65..fc0d088632c957200343e6cade12537ced56aa2a 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
@@ -52,5 +52,46 @@ maxAlphaCo 1;
maxDeltaT 1;
+functions
+{
+ sTransport
+ {
+ type scalarTransport;
+ libs ("libsolverFunctionObjects.so");
+
+ enabled true;
+ writeControl outputTime;
+ writeInterval 1;
+
+ field s;
+
+ write true;
+
+ phase alpha.water;
+ bounded01 false;
+
+ // Adding fvOption source for residence time
+ fvOptions
+ {
+ unitySource
+ {
+ type scalarSemiImplicitSource;
+ enabled true;
+
+ scalarSemiImplicitSourceCoeffs
+ {
+ selectionMode all;
+ volumeMode specific;
+ injectionRateSuSp
+ {
+ s (1 0);
+ }
+ }
+ }
+ }
+
+ resetOnStartUp false;
+ }
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
index 4552b9c4454140847d37beb9bff79e346ee3e626..cdd1c23f7920b726bd0b90348087ee28f48d2a89 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
@@ -31,6 +31,7 @@ divSchemes
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss linear;
div(phi,k) Gauss upwind;
+ div(phi,s) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
}
@@ -50,5 +51,11 @@ snGradSchemes
default corrected;
}
+fluxRequired
+{
+ default no;
+ s;
+}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
index afa7a16e73b05710dc677891476b0b13c4451a5f..791a7d3a0299984f6849ae5233aee972e3d783cb 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
@@ -66,7 +66,7 @@ solvers
relTol 0;
}
- "(U|k|epsilon).*"
+ "(U|k|epsilon|s).*"
{
solver smoothSolver;
smoother symGaussSeidel;
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allrun
index b18d70e448c13fbaf243f01cff301f0dbb1c7193..ed61ac543538db7d3679847d004086dd7fe3952f 100755
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/Allrun
@@ -4,11 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
-
runApplication blockMesh
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allrun b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allrun
index cdc9763e1b2c914ccc2c244c2cb2ef4a2a61913d..4c6866acbc18f0346e8d9badc6d118f3c6b9f7fd 100755
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/Allrun
@@ -4,14 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
-
runApplication blockMesh
runApplication setFields
runApplication createBaffles -overwrite
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh b/tutorials/multiphase/interFoam/RAS/waterChannel/0/s
similarity index 60%
rename from tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh
rename to tutorials/multiphase/interFoam/RAS/waterChannel/0/s
index 51263c8cda5a2d32d3b460a5d04117c94c4f799b..c9d6f4a86d1b7f1550dd95f68cb26c9ab3162a17 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0/s
@@ -10,58 +10,39 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0/bottomWater";
- object p_rgh;
+ object s;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -2 0 0 0 0];
+dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
{
- minX
- {
- type zeroGradient;
- value uniform 0;
- }
- maxX
+ inlet
{
type fixedValue;
value uniform 0;
}
- minY
- {
- type fixedFluxPressure;
- value uniform 0;
- }
- minZ
- {
- type fixedFluxPressure;
- value uniform 0;
- }
- maxZ
- {
- type fixedFluxPressure;
- value uniform 0;
- }
- bottomWater_to_rightSolid
+
+ walls
{
- type fixedFluxPressure;
- value uniform 0;
+ type zeroGradient;
}
- bottomWater_to_leftSolid
+
+ outlet
{
- type fixedFluxPressure;
+ type zeroGradient;
value uniform 0;
}
- bottomWater_to_heater
+
+ atmosphere
{
- type fixedFluxPressure;
+ type inletOutlet;
+ inletValue uniform 0;
value uniform 0;
}
}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean b/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean
index ac0e3978c2574c24fe0ce72e47d4b9a502136d8f..e67e3024e8823c4993864eb0c326a34feafe2e51 100755
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean
@@ -4,7 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+
rm 0/alpha.water.gz 0/alpha.water 2>/dev/null
rm -rf *Flux
-cleanCase
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh b/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh
index c941916ef134723bcd5f545a3f6196db2193858e..f476661eb3ffd3867f9ab40b15f98cac9e19b318 100755
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/Allmesh
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/Allrun b/tutorials/multiphase/interFoam/RAS/waterChannel/Allrun
index e799b7914b250867f4270f8258893c2e20ed1f6f..5a86d49dcb6c907ed66851839049b0cf9feef4f5 100755
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/Allrun
@@ -4,13 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
./Allmesh
cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
index b1aaab2d60695a4d1d29b559b52f5fe7ca5b67f6..fa88ee565ea05a94f8ecc2eaf108cf0ff5248148 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
@@ -29,7 +29,7 @@ deltaT 0.1;
writeControl adjustableRunTime;
-writeInterval 5;
+writeInterval 10;
purgeWrite 0;
@@ -82,6 +82,43 @@ functions
$inletFlux;
name atmosphere;
}
+
+ sTransport
+ {
+ type scalarTransport;
+ libs ("libsolverFunctionObjects.so");
+
+ enabled true;
+ writeControl outputTime;
+ writeInterval 1;
+
+ field s;
+ bounded01 false;
+ phase alpha.water;
+
+ write true;
+
+ fvOptions
+ {
+ unitySource
+ {
+ type scalarSemiImplicitSource;
+ enabled true;
+
+ scalarSemiImplicitSourceCoeffs
+ {
+ selectionMode all;
+ volumeMode specific;
+ injectionRateSuSp
+ {
+ s (1 0);
+ }
+ }
+ }
+ }
+
+ resetOnStartUp false;
+ }
}
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
index ec447a17f3f9fd294aabfff40c561f1fc05dd359..488e0eedb2815af48ab3c7d78371843bd0a76f89 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
@@ -35,6 +35,9 @@ divSchemes
"div\(phi,(k|omega)\)" Gauss upwind;
div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+
+ div(phi,s) Gauss vanLeer;
+ div(phirb,s) Gauss linear;
}
laplacianSchemes
@@ -57,5 +60,11 @@ wallDist
method meshWave;
}
+fluxRequired
+{
+ default no;
+ s;
+}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
index 7ceb810b53068a1d6175a67ca52b951d0a03b016..b18ce1bc586c83917614b79c238b23018ef6b39d 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
@@ -67,7 +67,7 @@ solvers
relTol 0;
}
- "(U|k|omega).*"
+ "(U|k|omega|s).*"
{
solver smoothSolver;
smoother symGaussSeidel;
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean
index 2c5a008802e8e91116267233274623cc5c062969..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean
@@ -1,8 +1,10 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun
index 54d0dfc6794449e5ea4ef562181b8c1bc6b05ae1..e0a3d741250d5d5e5a4c9beb1381e4ca6fbaabc6 100755
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun
@@ -1,4 +1,5 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -6,9 +7,9 @@
restore0Dir
runApplication blockMesh
-
\cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
-
runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
index 4c9e1c26d2a0a0d7949042fbb2b689cd5ed35f57..b52e0c12fd03a792f1d1c15400926fa3143d0460 100755
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun
@@ -4,11 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication blockMesh
\cp 0/alpha.water.orig 0/alpha.water
+
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
index b18d70e448c13fbaf243f01cff301f0dbb1c7193..ed61ac543538db7d3679847d004086dd7fe3952f 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun
@@ -4,11 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name
-application=$(getApplication)
-
runApplication blockMesh
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
index 40baf145bebb4b2d5107a394ebf4f6b3ae8a53d9..d347ad0a845c463a62cdc2362058f4d7ee7d5745 100755
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
@@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication ./makeMesh
\cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean
index 496837c14e38ea0b4554af1025abfc9c3a42f380..af5bf72167e93bbc40554a13d2fe609f4b060fb2 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean
@@ -4,11 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove surface
-rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
-
cleanCase
-
rm -rf 0 > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
+# Remove surface
+rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
index 3f7cab5d82e34e43d25b7b1a4dfbe80e21a7248f..59aa02e75334f55ae5a577dd73802e70d1397ab1 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
@@ -11,3 +11,5 @@ runApplication decomposePar
runParallel $(getApplication)
runApplication reconstructPar
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
index b62fc66a8c6d6aa7de9e3963f4e90fcf1c073583..b9980dd726d164462fc7aeaadf21dddd874aab43 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
@@ -36,3 +36,5 @@ runApplication createPatch -overwrite
# - apply the initial fields
restore0Dir
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
index 42c58bf0eb3cfe23434910e26255304e09315346..05fe1e79a3f91a15ed06385847d37e4424a41eed 100755
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
@@ -4,12 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+rm -rf 0
+
# Remove surface
rm -f constant/triSurface/bullet.stl.gz
-# Remove 0.orig/ copy
-\rm -rf 0
-
-cleanCase
-
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun
index 912c34cfdb7636863fe4782c6bfc402154698b0d..6cfec647c79d18f2504b7408b94bb8ddbe2e3086 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun
@@ -4,13 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
restore0Dir
runApplication blockMesh
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
index a0ed70da03a7a41ab05ca3d71b7a07ed38f31c61..fb2c7cf7a737962f3394292d00843d75376f8677 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun
@@ -4,15 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
restore0Dir
runApplication blockMesh
runApplication setFields
runApplication decomposePar
-runParallel $application
+runParallel $(getApplication)
runApplication reconstructPar
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
index f5e6c61a9e087c0f799e0c700493698c1df8fcf4..f1273de8e41357a83af0b1253a297acf47413959 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication ./makeMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
index f8ec2f0689d93219c4a6b366c4ae5d60ceea0d19..cf76c5c4a6c65fdff4a3308d97e24f34e1789b4b 100755
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun
@@ -4,16 +4,15 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
./makeMesh
restore0Dir
runApplication setFields
-#runApplication $application
+#runApplication $(getApplication)
+
#runApplication decomposePar
-#runParallel $application
+#runParallel $(getApplication)
#runApplication reconstructPar
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
index 912c34cfdb7636863fe4782c6bfc402154698b0d..6cfec647c79d18f2504b7408b94bb8ddbe2e3086 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
@@ -4,13 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
restore0Dir
runApplication blockMesh
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
index a0ed70da03a7a41ab05ca3d71b7a07ed38f31c61..fb2c7cf7a737962f3394292d00843d75376f8677 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
@@ -4,15 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
restore0Dir
runApplication blockMesh
runApplication setFields
runApplication decomposePar
-runParallel $application
+runParallel $(getApplication)
runApplication reconstructPar
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
index f5e6c61a9e087c0f799e0c700493698c1df8fcf4..f1273de8e41357a83af0b1253a297acf47413959 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication ./makeMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean
index a0dbe45d86fea7549fc4e8deedee16c082fd4e3d..5b17237826694a15efc621c2bb2dfb6a91c1d66b 100755
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean
@@ -1,10 +1,11 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
rm -rf poolHeight poolHeight_vs_time
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
index c2b53fdc45a52fddee2928fb01a0c754a5954358..7cdbc56f458c4aa2648d91383024eed3c4c5c2df 100755
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun
@@ -4,12 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
runApplication blockMesh
-runApplication -s 1 topoSet
+runApplication -s 1 topoSet
runApplication subsetMesh -overwrite c0 -patch floatingObject
@@ -20,6 +17,6 @@ runApplication createPatch -overwrite
restore0Dir
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean
index a0dbe45d86fea7549fc4e8deedee16c082fd4e3d..5b17237826694a15efc621c2bb2dfb6a91c1d66b 100755
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean
@@ -1,10 +1,11 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Source tutorial run functions
+# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
rm -rf poolHeight poolHeight_vs_time
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun
index 7f340efedbbafed441e0ddf2615c276424b20172..03b5ca3948231b2a68cbcaa5bbc2a0d72e5d693b 100755
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun
@@ -4,15 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
runApplication blockMesh
runApplication topoSet
runApplication subsetMesh -overwrite c0 -patch floatingObject
restore0Dir
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
index f5e6c61a9e087c0f799e0c700493698c1df8fcf4..f1273de8e41357a83af0b1253a297acf47413959 100755
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication ./makeMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun
index 11dd28b438873c682fb7d5b241d4ac3d611f1238..c056332036ab4e1ae0f90a6f704c5f4c28e184cb 100755
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun
@@ -4,16 +4,14 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=`getApplication`
-
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
if ! isTest $@
then
foamDictionary system/controlDict -entry endTime -set 5
foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 1e5
- runApplication -a $application
+ runApplication -a $(getApplication)
fi
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun
index 11dd28b438873c682fb7d5b241d4ac3d611f1238..c056332036ab4e1ae0f90a6f704c5f4c28e184cb 100755
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun
@@ -4,16 +4,14 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=`getApplication`
-
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
if ! isTest $@
then
foamDictionary system/controlDict -entry endTime -set 5
foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 1e5
- runApplication -a $application
+ runApplication -a $(getApplication)
fi
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
index f5e6c61a9e087c0f799e0c700493698c1df8fcf4..f1273de8e41357a83af0b1253a297acf47413959 100755
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication ./makeMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
index 9f691c93851e250425529116772e1d82b81075f2..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
-
rm -rf 0
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun
index 912c34cfdb7636863fe4782c6bfc402154698b0d..6cfec647c79d18f2504b7408b94bb8ddbe2e3086 100755
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun
@@ -4,13 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Set application name
-application=$(getApplication)
-
restore0Dir
runApplication blockMesh
runApplication setFields
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
index f5e6c61a9e087c0f799e0c700493698c1df8fcf4..f1273de8e41357a83af0b1253a297acf47413959 100755
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=$(getApplication)
-
runApplication ./makeMesh
-runApplication $application
+runApplication $(getApplication)
#------------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/Allclean b/tutorials/preProcessing/createZeroDirectory/cavity/Allclean
index 2c5a008802e8e91116267233274623cc5c062969..61edfb303237d95429c1833e5f77dfbfd671288b 100755
--- a/tutorials/preProcessing/createZeroDirectory/cavity/Allclean
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/Allclean
@@ -1,8 +1,10 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm -rf 0 > /dev/null 2>&1
-
cleanCase
+rm -rf 0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/Allrun b/tutorials/preProcessing/createZeroDirectory/cavity/Allrun
index cdef18649d8d56dcec0d61944fba329e3d0b8b6e..909a10a372f915ddefeb5bb0c95d8527f13e1111 100755
--- a/tutorials/preProcessing/createZeroDirectory/cavity/Allrun
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/Allrun
@@ -1,9 +1,11 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
-
runApplication createZeroDirectory
-
runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean b/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean
index 17464e7020d3cbe606b694c058f2d1c71d24a128..7ba7ddabb3e7e1a730041832e59aa864abfc256b 100755
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean
@@ -1,13 +1,15 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove surface and features
-\rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
-\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-\rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
+cleanCase
+rm -rf 0
-rm -rf 0 > /dev/null 2>&1
+# Remove surface and features
+\rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
+\rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
+\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-cleanCase
+#------------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun b/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun
index 4ca1ac1c2970e1754e8a3816a0fdece054782150..bec223b5deefcf242fd633d7c247c9d903ce2b4a 100755
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -22,4 +22,4 @@ runParallel $(getApplication)
runApplication reconstructParMesh -constant
runApplication reconstructPar -latestTime
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean
index 44f1fb098f5d57d3d502cdda198660a8bc20870c..c0d30ba4bfd0ba95d345685e6b55d77537f4345a 100755
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean
@@ -1,21 +1,20 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase
+rm -rf 0
+
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -f constant/triSurface/*.eMesh > /dev/null 2>&1
-rm -f constant/polyMesh/boundary
-cleanCase
rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
-rm -rf 0
rm -rf constant/bottomAir/polyMesh
rm -rf constant/topAir/polyMesh
rm -rf constant/heater/polyMesh
rm -rf constant/leftSolid/polyMesh
rm -rf constant/rightSolid/polyMesh
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun
index 56e9b1ea90165eedfb9ad600c27f607890c7c7cb..cd9d35d580f72613f6a84dbe5a30bc4d1bd4f1ce 100755
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun
@@ -1,6 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
-
+cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -36,4 +35,4 @@ echo "creating files for paraview post-processing"
echo
paraFoam -touchAll
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun
index c64db75b8e6d2d96d9ffd2fb48aacec15c8543ab..9c5c0bb36eef9868cd2e10bd799961bd051e5a49 100755
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun
@@ -4,10 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=`getApplication`
-
runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
runApplication -s sigma postProcess -func "components(sigma)"
runApplication -s singleGraph postProcess -func singleGraph