diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
index fe7e858b9a93b75a434d85e612e4cbe6eccfda5f..a9cf8c16fbc09c58798ddb35c4248ddc1d017a22 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
@@ -275,7 +275,7 @@ autoPtr<fvMesh> createMesh
mesh.cellZones()
);
}
- mesh.addZones(pz, fz, cz);
+ mesh.addZones(pz, fz, cz);
}
@@ -399,7 +399,7 @@ void printMeshData(const polyMesh& mesh)
label nProcFaces = 0;
const labelList& nei = patchNeiProcNo[procI];
-
+
forAll(patchNeiProcNo[procI], i)
{
Info<< " Number of faces shared with processor "
diff --git a/etc/settings.csh b/etc/settings.csh
index c38079a72f35864e0495095c32fff5a5c300a2cf..41abbbaa5f46ef6140e72bbc7ecd51caae59c2ec 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -107,7 +107,7 @@ case ThirdParty:
breaksw
case Gcc45:
case Gcc45++0x:
- set gcc_version=gcc-4.5.0
+ set gcc_version=gcc-4.5.2
set gmp_version=gmp-5.0.1
set mpfr_version=mpfr-2.4.2
set mpc_version=mpc-0.8.1
@@ -229,7 +229,7 @@ endif
# ~~~~~~~~~~~~~~
set boost_version=boost_1_42_0
-set cgal_version=CGAL-3.5.1
+set cgal_version=CGAL-3.7
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
diff --git a/etc/settings.sh b/etc/settings.sh
index bab62d5a68fa4e673d21e7a408d07bfe5ad4a447..f15cdcdb965e44be7eecac6f442796155ed694e2 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -127,7 +127,7 @@ OpenFOAM | ThirdParty)
mpfr_version=mpfr-2.4.2
;;
Gcc45 | Gcc45++0x)
- gcc_version=gcc-4.5.0
+ gcc_version=gcc-4.5.2
gmp_version=gmp-5.0.1
mpfr_version=mpfr-2.4.2
mpc_version=mpc-0.8.1
@@ -248,7 +248,7 @@ fi
# ~~~~~~~~~~~~~~
boost_version=boost_1_42_0
-cgal_version=CGAL-3.5.1
+cgal_version=CGAL-3.7
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 128a3932268d7f6d0f77ebde9993682687004b7c..ac0595bf4885a2371ea3327afe6ba1a93823b799 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -702,7 +702,7 @@ void Foam::cyclicPolyPatch::transformPosition(pointField& l) const
{
if (!parallel())
{
- Foam::transform(forwardT(), l);
+ l = Foam::transform(forwardT(), l);
}
else if (separated())
{
diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMeshI.H b/src/edgeMesh/featureEdgeMesh/featureEdgeMeshI.H
index 162f17a1a5a94d1c875294a06b31cdd89909eabf..6aac568b03cffc3dd8ffd2ca4bf3c634ed14a1b7 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMeshI.H
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMeshI.H
@@ -33,49 +33,49 @@ inline Foam::label Foam::featureEdgeMesh::convexStart() const
inline Foam::label Foam::featureEdgeMesh::concaveStart() const
{
- return concaveStart_;
+ return concaveStart_;
}
inline Foam::label Foam::featureEdgeMesh::mixedStart() const
{
- return mixedStart_;
+ return mixedStart_;
}
inline Foam::label Foam::featureEdgeMesh::nonFeatureStart() const
{
- return nonFeatureStart_;
+ return nonFeatureStart_;
}
inline Foam::label Foam::featureEdgeMesh::externalStart() const
{
- return externalStart_;
+ return externalStart_;
}
inline Foam::label Foam::featureEdgeMesh::internalStart() const
{
- return internalStart_;
+ return internalStart_;
}
inline Foam::label Foam::featureEdgeMesh::flatStart() const
{
- return flatStart_;
+ return flatStart_;
}
inline Foam::label Foam::featureEdgeMesh::openStart() const
{
- return openStart_;
+ return openStart_;
}
inline Foam::label Foam::featureEdgeMesh::multipleStart() const
{
- return multipleStart_;
+ return multipleStart_;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 149f24420985f51efeeef7002f37677e6dd382ed..f9a2861683e6e61d40f13c86569403ee8f0c7a0e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,7 +38,7 @@ inletOutletTotalTemperatureFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- mixedFvPatchScalarField(p, iF),
+ inletOutletFvPatchScalarField(p, iF),
UName_("U"),
phiName_("phi"),
psiName_("psi"),
@@ -60,7 +60,7 @@ inletOutletTotalTemperatureFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
- mixedFvPatchScalarField(ptf, p, iF, mapper),
+ inletOutletFvPatchScalarField(ptf, p, iF, mapper),
UName_(ptf.UName_),
phiName_(ptf.phiName_),
psiName_(ptf.psiName_),
@@ -77,7 +77,7 @@ inletOutletTotalTemperatureFvPatchScalarField
const dictionary& dict
)
:
- mixedFvPatchScalarField(p, iF),
+ inletOutletFvPatchScalarField(p, iF),
UName_(dict.lookupOrDefault<word>("U", "U")),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
psiName_(dict.lookupOrDefault<word>("psi", "psi")),
@@ -108,7 +108,7 @@ inletOutletTotalTemperatureFvPatchScalarField
const inletOutletTotalTemperatureFvPatchScalarField& tppsf
)
:
- mixedFvPatchScalarField(tppsf),
+ inletOutletFvPatchScalarField(tppsf),
UName_(tppsf.UName_),
phiName_(tppsf.phiName_),
psiName_(tppsf.psiName_),
@@ -124,7 +124,7 @@ inletOutletTotalTemperatureFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- mixedFvPatchScalarField(tppsf, iF),
+ inletOutletFvPatchScalarField(tppsf, iF),
UName_(tppsf.UName_),
phiName_(tppsf.phiName_),
psiName_(tppsf.psiName_),
@@ -140,7 +140,7 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::autoMap
const fvPatchFieldMapper& m
)
{
- mixedFvPatchScalarField::autoMap(m);
+ inletOutletFvPatchScalarField::autoMap(m);
T0_.autoMap(m);
}
@@ -151,7 +151,7 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::rmap
const labelList& addr
)
{
- mixedFvPatchScalarField::rmap(ptf, addr);
+ inletOutletFvPatchScalarField::rmap(ptf, addr);
const inletOutletTotalTemperatureFvPatchScalarField& tiptf =
refCast<const inletOutletTotalTemperatureFvPatchScalarField>(ptf);
@@ -182,7 +182,7 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::updateCoeffs()
T0_/(1.0 + 0.5*psip*gM1ByG*(1.0 - pos(phip))*magSqr(Up));
this->valueFraction() = 1.0 - pos(phip);
- mixedFvPatchScalarField::updateCoeffs();
+ inletOutletFvPatchScalarField::updateCoeffs();
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.H
index e6e8516b6e0ce1d17edffd352ed54127afbf92aa..6e553c9872232e023b84e226cd6fc4c69b2c8b2b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ SourceFiles
#ifndef inletOutletTotalTemperatureFvPatchScalarField_H
#define inletOutletTotalTemperatureFvPatchScalarField_H
-#include "mixedFvPatchFields.H"
+#include "inletOutletFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -48,7 +48,7 @@ namespace Foam
class inletOutletTotalTemperatureFvPatchScalarField
:
- public mixedFvPatchScalarField
+ public inletOutletFvPatchScalarField
{
// Private data
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index 4c53ea8f95a428e88af94e6ef8e8450bdb0541c3..602607a44393d5fcb61b0db76d20073d9d2d4f07 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,10 +38,15 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchField<scalar>(p, iF),
- UName_("U"),
- intensity_(0.05)
-{}
+ inletOutletFvPatchScalarField(p, iF),
+ intensity_(0.0),
+ UName_("undefined-U"),
+ phiName_("undefined-phi")
+{
+ this->refValue() = 0.0;
+ this->refGrad() = 0.0;
+ this->valueFraction() = 0.0;
+}
Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
turbulentIntensityKineticEnergyInletFvPatchScalarField
@@ -52,9 +57,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
+ inletOutletFvPatchScalarField(ptf, p, iF, mapper),
+ intensity_(ptf.intensity_),
UName_(ptf.UName_),
- intensity_(ptf.intensity_)
+ phiName_(ptf.phiName_)
{}
Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
@@ -65,9 +71,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchField<scalar>(p, iF, dict),
+ inletOutletFvPatchScalarField(p, iF),
+ intensity_(readScalar(dict.lookup("intensity"))),
UName_(dict.lookupOrDefault<word>("U", "U")),
- intensity_(readScalar(dict.lookup("intensity")))
+ phiName_(dict.lookupOrDefault<word>("phi", "phi"))
{
if (intensity_ < 0 || intensity_ > 1)
{
@@ -85,6 +92,12 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
<< " in file " << this->dimensionedInternalField().objectPath()
<< exit(FatalError);
}
+
+ fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+
+ this->refValue() = 0.0;
+ this->refGrad() = 0.0;
+ this->valueFraction() = 0.0;
}
Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
@@ -93,9 +106,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
const turbulentIntensityKineticEnergyInletFvPatchScalarField& ptf
)
:
- fixedValueFvPatchField<scalar>(ptf),
+ inletOutletFvPatchScalarField(ptf),
+ intensity_(ptf.intensity_),
UName_(ptf.UName_),
- intensity_(ptf.intensity_)
+ phiName_(ptf.phiName_)
{}
@@ -106,9 +120,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchField<scalar>(ptf, iF),
+ inletOutletFvPatchScalarField(ptf, iF),
+ intensity_(ptf.intensity_),
UName_(ptf.UName_),
- intensity_(ptf.intensity_)
+ phiName_(ptf.phiName_)
{}
@@ -122,12 +137,16 @@ updateCoeffs()
return;
}
- const fvPatchField<vector>& Up =
+ const fvPatchVectorField& Up =
patch().lookupPatchField<volVectorField, vector>(UName_);
- operator==(1.5*sqr(intensity_)*magSqr(Up));
+ const fvsPatchScalarField& phip =
+ patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+
+ this->refValue() = 1.5*sqr(intensity_)*magSqr(Up);
+ this->valueFraction() = 1.0 - pos(phip);
- fixedValueFvPatchField<scalar>::updateCoeffs();
+ inletOutletFvPatchScalarField::updateCoeffs();
}
@@ -136,9 +155,10 @@ void Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchField<scalar>::write(os);
- writeEntryIfDifferent<word>(os, "U", "U", UName_);
+ fvPatchScalarField::write(os);
os.writeKeyword("intensity") << intensity_ << token::END_STATEMENT << nl;
+ os.writeKeyword("U") << UName_ << token::END_STATEMENT << nl;
+ os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.H
index a8614eae6c67a1c2943d7e6311a7ef21d44ec7fb..91e9d9760282202ff351b0e91d435b2d0f5c4a7c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,7 +33,6 @@ Description
inlet
{
type turbulentIntensityKineticEnergyInlet;
- U U; // Name of U field (optional)
intensity 0.05; // 5% turbulence
value uniform 1; // placeholder
}
@@ -47,7 +46,7 @@ SourceFiles
#ifndef turbulentIntensityKineticEnergyInletFvPatchScalarField_H
#define turbulentIntensityKineticEnergyInletFvPatchScalarField_H
-#include "fixedValueFvPatchFields.H"
+#include "inletOutletFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,16 +59,20 @@ namespace Foam
class turbulentIntensityKineticEnergyInletFvPatchScalarField
:
- public fixedValueFvPatchScalarField
+ public inletOutletFvPatchScalarField
{
// Private data
- //- Name of belocity field
- word UName_;
-
//- Turbulent intensity as fraction of mean velocity
scalar intensity_;
+ //- Name of the velocity field
+ word UName_;
+
+ //- Name of the flux field
+ word phiName_;
+
+
public:
//- Runtime type information
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index 43c423e42fa6c6fe4ad913c540c27cca59cc471d..e45f72ee567f8beba0fcd664d195d3fffae34305 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -255,7 +255,7 @@ public:
{
if (++nTrackingRescues_ % size() == 0)
{
- Info<< " " << nTrackingRescues_
+ Pout<< " " << nTrackingRescues_
<< " tracking rescues " << endl;
}
}
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.H b/src/lagrangian/basic/InteractionLists/InteractionLists.H
index 2ff4ecfd5ef76b94cd072689b3c21a4ed8f7e3cf..5d9d9f811514d3bd63437e46fe38a4a586ea6d43 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ Description
cells are potentially in range of each other.
Builds referred interaction list, specifying which cells are
- required to provideinteractions across coupled patched (cyclic or
+ required to provide interactions across coupled patched (cyclic or
processor). Generates referred cells, and refers particles to the
correct processor, applying the appropriate transform.
diff --git a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H
index cba4bc59eb76cd2101c93fedc358c4c00c2e3509..9b7a58a1191e625370b1f8bc90c1b8ded0d43f88 100644
--- a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H
+++ b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -83,7 +83,7 @@ class globalIndexAndTransform
List<vectorTensorTransform> transformPermutations_;
//- Mapping from patch index to which transform it matches (or
- // -1 for none) (.first()) and what sign to us for it,
+ // -1 for none) (.first()) and what sign to use for it,
// i.e. +/- 1 (.second()).
List<Pair<label> > patchTransformSign_;
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
index 6d5da79c92784e086b42bf31b01085934c53ece9..6333e8e65cdd530266c18551dd03ac1b36806a64 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
@@ -124,7 +124,7 @@ void Foam::ConstantRateDevolatilisation<CloudType>::calculate
const scalar A0 = volatileData_[i].second();
// Mass transferred from particle to carrier gas phase
- dMassDV = min(dt*A0*massVolatile0, massVolatile);
+ dMassDV[id] = min(dt*A0*massVolatile0, massVolatile);
}
canCombust = done;
diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
index 7cea2cb14da5abd795f811e1157c268f740ee0ec..c3a2c91c7b81cbe9c0df16de15cfe9f45d984b59 100644
--- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
@@ -143,14 +143,14 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::radiation::radiationModel::Sh
) const
{
volScalarField& h = thermo.h();
- const volScalarField cp(thermo.Cp());
+ const volScalarField Cp(thermo.Cp());
const volScalarField T3(pow3(T_));
return
(
Ru()
- - fvm::Sp(4.0*Rp()*T3/cp, h)
- - Rp()*T3*(T_ - 4.0*h/cp)
+ - fvm::Sp(4.0*Rp()*T3/Cp, h)
+ - Rp()*T3*(T_ - 4.0*h/Cp)
);
}
@@ -161,14 +161,14 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::radiation::radiationModel::Shs
) const
{
volScalarField& hs = thermo.hs();
- const volScalarField cp(thermo.Cp());
+ const volScalarField Cp(thermo.Cp());
const volScalarField T3(pow3(T_));
return
(
Ru()
- - fvm::Sp(4.0*Rp()*T3/cp, hs)
- - Rp()*T3*(T_ - 4.0*hs/cp)
+ - fvm::Sp(4.0*Rp()*T3/Cp, hs)
+ - Rp()*T3*(T_ - 4.0*hs/Cp)
);
}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index 6296caa2eac78cba650d562606d86e7f7d7c794d..446872ae59e33306734a043124013e40d31ca099 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -46,9 +46,15 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchField<scalar>(p, iF),
- mixingLength_(0.001)
-{}
+ inletOutletFvPatchScalarField(p, iF),
+ mixingLength_(0.0),
+ phiName_("undefined-phi"),
+ kName_("undefined-k")
+{
+ this->refValue() = 0.0;
+ this->refGrad() = 0.0;
+ this->valueFraction() = 0.0;
+}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
turbulentMixingLengthDissipationRateInletFvPatchScalarField
@@ -59,8 +65,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
- mixingLength_(ptf.mixingLength_)
+ inletOutletFvPatchScalarField(ptf, p, iF, mapper),
+ mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
+ kName_(ptf.kName_)
{}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
@@ -71,9 +79,17 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchField<scalar>(p, iF, dict),
- mixingLength_(readScalar(dict.lookup("mixingLength")))
-{}
+ inletOutletFvPatchScalarField(p, iF),
+ mixingLength_(readScalar(dict.lookup("mixingLength"))),
+ phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+ kName_(dict.lookupOrDefault<word>("k", "k"))
+{
+ fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+
+ this->refValue() = 0.0;
+ this->refGrad() = 0.0;
+ this->valueFraction() = 0.0;
+}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
turbulentMixingLengthDissipationRateInletFvPatchScalarField
@@ -81,8 +97,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf
)
:
- fixedValueFvPatchField<scalar>(ptf),
- mixingLength_(ptf.mixingLength_)
+ inletOutletFvPatchScalarField(ptf),
+ mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
+ kName_(ptf.kName_)
{}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
@@ -92,8 +110,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchField<scalar>(ptf, iF),
- mixingLength_(ptf.mixingLength_)
+ inletOutletFvPatchScalarField(ptf, iF),
+ mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
+ kName_(ptf.kName_)
{}
@@ -114,12 +134,16 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
const scalar Cmu75 = pow(Cmu, 0.75);
- const fvPatchField<scalar>& kp =
- patch().lookupPatchField<volScalarField, scalar>("k");
+ const fvPatchScalarField& kp =
+ patch().lookupPatchField<volScalarField, scalar>(kName_);
+
+ const fvsPatchScalarField& phip =
+ patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
- operator==(Cmu75*kp*sqrt(kp)/mixingLength_);
+ this->refValue() = Cmu75*kp*sqrt(kp)/mixingLength_;
+ this->valueFraction() = 1.0 - pos(phip);
- fixedValueFvPatchField<scalar>::updateCoeffs();
+ inletOutletFvPatchScalarField::updateCoeffs();
}
@@ -128,9 +152,11 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchField<scalar>::write(os);
+ fvPatchScalarField::write(os);
os.writeKeyword("mixingLength")
<< mixingLength_ << token::END_STATEMENT << nl;
+ os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
+ os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
index 9f8e7776c7cce51f4e4fc2781380b2ee5d2c7299..8464174b53613388f94e7831369cd66a55621c8d 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,9 +32,9 @@ Description
@verbatim
inlet
{
- type compressible::turbulentMixingLengthDissipationRateInlet;
+ type compressible::turbulentMixingLengthDissipationRateInlet;
mixingLength 0.005; // 5 mm
- value uniform 200; // placeholder
+ value uniform 200; // placeholder
}
@endverbatim
@@ -46,7 +46,7 @@ SourceFiles
#ifndef compressibleturbulentMixingLengthDissipationRateInletFvPatchField_H
#define compressibleturbulentMixingLengthDissipationRateInletFvPatchField_H
-#include "fixedValueFvPatchFields.H"
+#include "inletOutletFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -61,13 +61,20 @@ namespace compressible
class turbulentMixingLengthDissipationRateInletFvPatchScalarField
:
- public fixedValueFvPatchScalarField
+ public inletOutletFvPatchScalarField
{
// Private data
//- turbulent length scale
scalar mixingLength_;
+ //- Name of the flux field
+ word phiName_;
+
+ //- Name of the turbulent kinetic energy field
+ word kName_;
+
+
public:
//- Runtime type information
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 86d2448632b8a3c4b4b10d75e339309293ba35a0..6c8f507b84f5fbbcd4dfeaa8a0ffeca6e2577c58 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -26,6 +26,7 @@ License
#include "turbulentMixingLengthFrequencyInletFvPatchScalarField.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
+#include "surfaceFields.H"
#include "volFields.H"
#include "RASModel.H"
@@ -45,10 +46,15 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchField<scalar>(p, iF),
+ inletOutletFvPatchScalarField(p, iF),
mixingLength_(0.0),
- kName_("k")
-{}
+ phiName_("undefined-phi"),
+ kName_("undefined-k")
+{
+ this->refValue() = 0.0;
+ this->refGrad() = 0.0;
+ this->valueFraction() = 0.0;
+}
turbulentMixingLengthFrequencyInletFvPatchScalarField::
turbulentMixingLengthFrequencyInletFvPatchScalarField
@@ -59,8 +65,9 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
+ inletOutletFvPatchScalarField(ptf, p, iF, mapper),
mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
kName_(ptf.kName_)
{}
@@ -72,10 +79,17 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchField<scalar>(p, iF, dict),
+ inletOutletFvPatchScalarField(p, iF),
mixingLength_(readScalar(dict.lookup("mixingLength"))),
+ phiName_(dict.lookupOrDefault<word>("phi", "phi")),
kName_(dict.lookupOrDefault<word>("k", "k"))
-{}
+{
+ fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+
+ this->refValue() = 0.0;
+ this->refGrad() = 0.0;
+ this->valueFraction() = 0.0;
+}
turbulentMixingLengthFrequencyInletFvPatchScalarField::
turbulentMixingLengthFrequencyInletFvPatchScalarField
@@ -83,8 +97,9 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf
)
:
- fixedValueFvPatchField<scalar>(ptf),
+ inletOutletFvPatchScalarField(ptf),
mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
kName_(ptf.kName_)
{}
@@ -95,8 +110,9 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchField<scalar>(ptf, iF),
+ inletOutletFvPatchScalarField(ptf, iF),
mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
kName_(ptf.kName_)
{}
@@ -116,14 +132,18 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
const scalar Cmu =
rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
- const scalar Cmu25 = pow025(Cmu);
+ const scalar Cmu25 = pow(Cmu, 0.25);
- const fvPatchField<scalar>& kp =
+ const fvPatchScalarField& kp =
patch().lookupPatchField<volScalarField, scalar>(kName_);
- operator==(sqrt(kp)/(Cmu25*mixingLength_));
+ const fvsPatchScalarField& phip =
+ patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+
+ this->refValue() = sqrt(kp)/(Cmu25*mixingLength_);
+ this->valueFraction() = 1.0 - pos(phip);
- fixedValueFvPatchField<scalar>::updateCoeffs();
+ inletOutletFvPatchScalarField::updateCoeffs();
}
@@ -132,9 +152,10 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchField<scalar>::write(os);
+ fvPatchScalarField::write(os);
os.writeKeyword("mixingLength")
<< mixingLength_ << token::END_STATEMENT << nl;
+ os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
index 317239a75d974fbc2b5119fe581088153d4b71c6..fb3b0683e8bf8259154e38bfa66af01187f8abd5 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -46,7 +46,7 @@ SourceFiles
#ifndef compressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
#define compressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
-#include "fixedValueFvPatchFields.H"
+#include "inletOutletFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -61,13 +61,16 @@ namespace compressible
class turbulentMixingLengthFrequencyInletFvPatchScalarField
:
- public fixedValueFvPatchScalarField
+ public inletOutletFvPatchScalarField
{
// Private data
//- Turbulent length scale
scalar mixingLength_;
+ //- Name of the flux field
+ word phiName_;
+
//- Name of the turbulent kinetic energy field
word kName_;
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index f0d66d95f772c5ab9c94c95611db397b15be1bc0..c4596acbf51bc93b5930edf4eea982c39ab6cf04 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -46,9 +46,15 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchField<scalar>(p, iF),
- mixingLength_(0.001)
-{}
+ inletOutletFvPatchScalarField(p, iF),
+ mixingLength_(0.0),
+ phiName_("undefined-phi"),
+ kName_("undefined-k")
+{
+ this->refValue() = 0.0;
+ this->refGrad() = 0.0;
+ this->valueFraction() = 0.0;
+}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
turbulentMixingLengthDissipationRateInletFvPatchScalarField
@@ -59,8 +65,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
- mixingLength_(ptf.mixingLength_)
+ inletOutletFvPatchScalarField(ptf, p, iF, mapper),
+ mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
+ kName_(ptf.kName_)
{}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
@@ -71,9 +79,17 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchField<scalar>(p, iF, dict),
- mixingLength_(readScalar(dict.lookup("mixingLength")))
-{}
+ inletOutletFvPatchScalarField(p, iF),
+ mixingLength_(readScalar(dict.lookup("mixingLength"))),
+ phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+ kName_(dict.lookupOrDefault<word>("k", "k"))
+{
+ fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+
+ this->refValue() = 0.0;
+ this->refGrad() = 0.0;
+ this->valueFraction() = 0.0;
+}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
turbulentMixingLengthDissipationRateInletFvPatchScalarField
@@ -81,8 +97,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf
)
:
- fixedValueFvPatchField<scalar>(ptf),
- mixingLength_(ptf.mixingLength_)
+ inletOutletFvPatchScalarField(ptf),
+ mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
+ kName_(ptf.kName_)
{}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
@@ -92,8 +110,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchField<scalar>(ptf, iF),
- mixingLength_(ptf.mixingLength_)
+ inletOutletFvPatchScalarField(ptf, iF),
+ mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
+ kName_(ptf.kName_)
{}
@@ -114,12 +134,16 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
const scalar Cmu75 = pow(Cmu, 0.75);
- const fvPatchField<scalar>& kp =
- patch().lookupPatchField<volScalarField, scalar>("k");
+ const fvPatchScalarField& kp =
+ patch().lookupPatchField<volScalarField, scalar>(kName_);
+
+ const fvsPatchScalarField& phip =
+ patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
- operator==(Cmu75*kp*sqrt(kp)/mixingLength_);
+ this->refValue() = Cmu75*kp*sqrt(kp)/mixingLength_;
+ this->valueFraction() = 1.0 - pos(phip);
- fixedValueFvPatchField<scalar>::updateCoeffs();
+ inletOutletFvPatchScalarField::updateCoeffs();
}
@@ -128,9 +152,11 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchField<scalar>::write(os);
+ fvPatchScalarField::write(os);
os.writeKeyword("mixingLength")
<< mixingLength_ << token::END_STATEMENT << nl;
+ os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
+ os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
index 88ad01d85df3c42500a584b116b65c64a5755bed..c6b4b00742aa93a75ef9b50d8d0cb6a12f338250 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -46,7 +46,7 @@ SourceFiles
#ifndef incompressibleturbulentMixingLengthDissipationRateInlet_H
#define incompressibleturbulentMixingLengthDissipationRateInlet_H
-#include "fixedValueFvPatchFields.H"
+#include "inletOutletFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -61,13 +61,20 @@ namespace incompressible
class turbulentMixingLengthDissipationRateInletFvPatchScalarField
:
- public fixedValueFvPatchScalarField
+ public inletOutletFvPatchScalarField
{
// Private data
//- turbulent length scale
scalar mixingLength_;
+ //- Name of the flux field
+ word phiName_;
+
+ //- Name of the turbulent kinetic energy field
+ word kName_;
+
+
public:
//- Runtime type information
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index d12b1ebd0d3f1142fe6f3e9e0cbe0fde8a191f44..63970dff2fa0ac73b247a3aaf4d1acbbecfd2c33 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -46,10 +46,15 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchField<scalar>(p, iF),
+ inletOutletFvPatchScalarField(p, iF),
mixingLength_(0.0),
+ phiName_("undefined-phi"),
kName_("undefined-k")
-{}
+{
+ this->refValue() = 0.0;
+ this->refGrad() = 0.0;
+ this->valueFraction() = 0.0;
+}
turbulentMixingLengthFrequencyInletFvPatchScalarField::
turbulentMixingLengthFrequencyInletFvPatchScalarField
@@ -60,8 +65,9 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
+ inletOutletFvPatchScalarField(ptf, p, iF, mapper),
mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
kName_(ptf.kName_)
{}
@@ -73,10 +79,17 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchField<scalar>(p, iF, dict),
+ inletOutletFvPatchScalarField(p, iF),
mixingLength_(readScalar(dict.lookup("mixingLength"))),
+ phiName_(dict.lookupOrDefault<word>("phi", "phi")),
kName_(dict.lookupOrDefault<word>("k", "k"))
-{}
+{
+ fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+
+ this->refValue() = 0.0;
+ this->refGrad() = 0.0;
+ this->valueFraction() = 0.0;
+}
turbulentMixingLengthFrequencyInletFvPatchScalarField::
turbulentMixingLengthFrequencyInletFvPatchScalarField
@@ -84,8 +97,9 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf
)
:
- fixedValueFvPatchField<scalar>(ptf),
+ inletOutletFvPatchScalarField(ptf),
mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
kName_(ptf.kName_)
{}
@@ -96,8 +110,9 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchField<scalar>(ptf, iF),
+ inletOutletFvPatchScalarField(ptf, iF),
mixingLength_(ptf.mixingLength_),
+ phiName_(ptf.phiName_),
kName_(ptf.kName_)
{}
@@ -117,14 +132,18 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
const scalar Cmu =
rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
- const scalar Cmu25 = pow025(Cmu);
+ const scalar Cmu25 = pow(Cmu, 0.25);
- const fvPatchField<scalar>& kp =
+ const fvPatchScalarField& kp =
patch().lookupPatchField<volScalarField, scalar>(kName_);
- operator==(sqrt(kp)/(Cmu25*mixingLength_));
+ const fvsPatchScalarField& phip =
+ patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+
+ this->refValue() = sqrt(kp)/(Cmu25*mixingLength_);
+ this->valueFraction() = 1.0 - pos(phip);
- fixedValueFvPatchField<scalar>::updateCoeffs();
+ inletOutletFvPatchScalarField::updateCoeffs();
}
@@ -133,9 +152,10 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchField<scalar>::write(os);
+ fvPatchScalarField::write(os);
os.writeKeyword("mixingLength")
<< mixingLength_ << token::END_STATEMENT << nl;
+ os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
index 7f706ed19bbb30b9be9b19d629a93f6a2c1c5c75..80bb14aaf382c2dd877aaa74a5393067e108d627 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -46,7 +46,7 @@ SourceFiles
#ifndef incompressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
#define incompressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
-#include "fixedValueFvPatchFields.H"
+#include "inletOutletFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -61,13 +61,16 @@ namespace incompressible
class turbulentMixingLengthFrequencyInletFvPatchScalarField
:
- public fixedValueFvPatchScalarField
+ public inletOutletFvPatchScalarField
{
// Private data
//- Turbulent length scale
scalar mixingLength_;
+ //- Name of the flux field
+ word phiName_;
+
//- Name of the turbulent kinetic energy field
word kName_;
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
index 689c6e4602becdcb0648b0663ec89bb60f084fc2..57acb8784a7409af80da2875275131924664f504 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
@@ -33,12 +33,14 @@ boundaryField
upperWall
{
type alphaSgsJayatillekeWallFunction;
+ hs h;
value uniform 0;
}
lowerWall
{
type alphaSgsJayatillekeWallFunction;
+ hs h;
value uniform 0;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
index 6052702ca559efd9cc18322dd34748d104033dff..fccafa51dbd422b4dcd24888af0598b495574c9c 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
@@ -44,7 +44,7 @@ divSchemes
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
div((U+((Su*Xi)*grad(b)))) Gauss linear;
- div((muEff*dev2(grad(U).T()))) Gauss linear;
+ div((muEff*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
index 5b47895a3e7145e758f48464ff7f954d593bb1c8..8610d61ac46d401ae051cf08440470bb1ae8c185 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
@@ -32,11 +32,13 @@ boundaryField
upperWall
{
type alphaSgsJayatillekeWallFunction;
+ hs h;
value uniform 0;
}
lowerWall
{
type alphaSgsJayatillekeWallFunction;
+ hs h;
value uniform 0;
}
frontAndBack_half0
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
index 6052702ca559efd9cc18322dd34748d104033dff..fccafa51dbd422b4dcd24888af0598b495574c9c 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
@@ -44,7 +44,7 @@ divSchemes
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
div((U+((Su*Xi)*grad(b)))) Gauss linear;
- div((muEff*dev2(grad(U).T()))) Gauss linear;
+ div((muEff*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict
index 535f85cc634630f9bceb43dae557f11aca15f310..99eed3629ec964960a56948d38baad5247a82735 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict
@@ -37,9 +37,5 @@ manualCoeffs
dataFile "cellDecomposition";
}
-metisCoeffs
-{
-}
-
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
index 0e973e239567423cb6b10b59c12658dbe2bee845..3c7aa260c8f6735e7bc5e1f6f62a0b8638dacb14 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
index d6827ca176df8789191e783502037bbbf3c5e72d..be24780cea72e4c83b066bc0ccc7adba0c0827b3 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
index d6827ca176df8789191e783502037bbbf3c5e72d..be24780cea72e4c83b066bc0ccc7adba0c0827b3 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
index fafe891ce1ac8e17ca07489001d9c00669dce7ef..8e1ea9515ed7b349458b044ffa81d1da046aa1af 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
index fafe891ce1ac8e17ca07489001d9c00669dce7ef..8e1ea9515ed7b349458b044ffa81d1da046aa1af 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict
index c3275fc215747bf08169a18ac40a604f705373a2..c2f1fe31ef674a0d95ec8efb2c4cdd1f11204d0d 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict
@@ -33,15 +33,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights
- (
- 1
- 3
- );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict
index ccd74fc281e3c3df9cda49a36f647db5e0a27a80..6eff2a638e99234b93831b58006dccc36419ee69 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict
@@ -33,15 +33,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights
- (
- 1
- 3
- );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
index 849ce844b9775b39b54ce351ee1a19863fd4d132..1604f5d3be810a95ede918f696e75f400c3fdfe1 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
@@ -33,17 +33,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
index a19902c4dc89acf627cc2e4fbf121e5200186072..b2f95ceb34cb665c3f6c04018a251e26be6db7fa 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
@@ -37,9 +37,5 @@ manualCoeffs
dataFile "cellDecomposition";
}
-metisCoeffs
-{
-}
-
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/decomposeParDict
index e53a523c9d58e8314f6eeea8b310d284b54f6cd0..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
@@ -76,7 +62,7 @@ manualCoeffs
//// Is the case distributed
//distributed yes;
//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots
+//roots
//(
// "/tmp"
// "/tmp"
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
index e53a523c9d58e8314f6eeea8b310d284b54f6cd0..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
@@ -76,7 +62,7 @@ manualCoeffs
//// Is the case distributed
//distributed yes;
//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots
+//roots
//(
// "/tmp"
// "/tmp"
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
index e53a523c9d58e8314f6eeea8b310d284b54f6cd0..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
@@ -76,7 +62,7 @@ manualCoeffs
//// Is the case distributed
//distributed yes;
//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots
+//roots
//(
// "/tmp"
// "/tmp"
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
index e53a523c9d58e8314f6eeea8b310d284b54f6cd0..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
@@ -76,7 +62,7 @@ manualCoeffs
//// Is the case distributed
//distributed yes;
//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots
+//roots
//(
// "/tmp"
// "/tmp"
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
index e53a523c9d58e8314f6eeea8b310d284b54f6cd0..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
@@ -76,7 +62,7 @@ manualCoeffs
//// Is the case distributed
//distributed yes;
//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots
+//roots
//(
// "/tmp"
// "/tmp"
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
index e1d400d82b2249587265598a9ba6775c5c79b4f2..ed718393ce1e239ee26b8beac30064afdd4bfedc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
// method scotch;
method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
@@ -76,7 +62,7 @@ manualCoeffs
//// Is the case distributed
//distributed yes;
//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots
+//roots
//(
// "/tmp"
// "/tmp"
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/decomposeParDict
index 8f6ced4ac38fc5f058b8c4370ed4002c036d61f6..1aaedd5a48c4d36a6a74b659431807617a4362fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/decomposeParDict
@@ -25,7 +25,6 @@ numberOfSubdomains 4;
method scotch;
// method hierarchical;
// method simple;
-// method metis;
// method manual;
simpleCoeffs
@@ -41,19 +40,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
scotchCoeffs
{
//processorWeights
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict
index 514d91a827e0afd733b83eddc541b9914f58404f..e63167424c0947668ae03762c59717fbe7d35e09 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict
@@ -37,9 +37,5 @@ manualCoeffs
dataFile "cellDecomposition";
}
-metisCoeffs
-{
-}
-
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict
index 514d91a827e0afd733b83eddc541b9914f58404f..62dc14beeb551ca7ffbfb61ed724db592cdfe2ef 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict
@@ -37,9 +37,4 @@ manualCoeffs
dataFile "cellDecomposition";
}
-metisCoeffs
-{
-}
-
-
// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/decomposeParDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/decomposeParDict
index 5d8115cd178e4036de81fe37520c0300a475134b..287b30088f9d9968d7b668c092e895c8091219b6 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/decomposeParDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/decomposeParDict
@@ -32,10 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
index 6549b7e085218c80a2b1373fcb9da7b825f6f0ff..ed8cab434cbb7138e3d08fa09a41a3e2694ba564 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
@@ -18,7 +18,6 @@ FoamFile
numberOfSubdomains 6;
method hierarchical;
-// method metis;
// method ptscotch;
simpleCoeffs
@@ -39,11 +38,5 @@ manualCoeffs
dataFile "cellDecomposition";
}
-metisCoeffs
-{
- //n (5 1 1);
- //cellWeightsFile "constant/cellWeightsFile";
-}
-
// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
index b93c39fe508be16e067454357a8a0044a0406996..93b49f58dd8e35cdce6c80e5ba8286816139c7b8 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
@@ -32,10 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
index d2eb7c697228fb56ee6b94f9421bfbb6473ecb5c..dc1e1a9083358187c43366403bbbb8c8046c655d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict
index 39c3316dea74553d259b3410eb33060a6a571236..6a12535722904d8695212deaa29c7b31f554314c 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict
@@ -38,9 +38,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
index edb201c0711da98d308dcb203376ecb53d44ebfd..d6843fa1a30154751055ed1eef5108a5db62caa1 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+application porousExplicitSourceReactingParcelFoam;
+
startFoam latestTime;
startTime 0;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/system/decomposeParDict
index 9b200b05ed914ac3cc09df2ab15bf4f74c8a3290..8515059f1f8cc7357680fe5de035b6dab02e0f47 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/system/wallFilmRegion/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/system/wallFilmRegion/decomposeParDict
index 9b200b05ed914ac3cc09df2ab15bf4f74c8a3290..8515059f1f8cc7357680fe5de035b6dab02e0f47 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/system/wallFilmRegion/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/system/wallFilmRegion/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/decomposeParDict
index 176b1467df245f1883bc80052ba98e87e5ff934a..66b12fe52a12e18b54532358a7b20ece6c3df32c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/decomposeParDict
@@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 4;
-method metis;
+method scotch;
simpleCoeffs
{
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/decomposeParDict
index 07e539d558a0e47abe5204046ffd4a63a993b84e..66b12fe52a12e18b54532358a7b20ece6c3df32c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/decomposeParDict
index d2eb7c697228fb56ee6b94f9421bfbb6473ecb5c..dc1e1a9083358187c43366403bbbb8c8046c655d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/wallFilmRegion.org/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/wallFilmRegion.org/decomposeParDict
index d2eb7c697228fb56ee6b94f9421bfbb6473ecb5c..dc1e1a9083358187c43366403bbbb8c8046c655d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/wallFilmRegion.org/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/wallFilmRegion.org/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/decomposeParDict
index d2eb7c697228fb56ee6b94f9421bfbb6473ecb5c..dc1e1a9083358187c43366403bbbb8c8046c655d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict
index d2eb7c697228fb56ee6b94f9421bfbb6473ecb5c..dc1e1a9083358187c43366403bbbb8c8046c655d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict
index c488f3ff6b301938f6a66b7355cc8d6f8c3fb0c6..dc1e1a9083358187c43366403bbbb8c8046c655d 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- //processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/controlDict
index 949f6cf72ecd8bd1b664e9771e017e5e4fca3d7e..3c54915612085e7c52ce3c0a07626e67871820dd 100644
--- a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+application steadyReactingParcelFoam;
+
startFoam latestTime;
startTime 0;
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
index 9b0188ab672029cdba129dd712126f16c87adc96..f6300907a4ac659fb1a2114c1c6759d134bc7600 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
@@ -34,9 +34,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{}
-
manualCoeffs
{
dataFile "decompositionData";
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
index b9c79fbbcde53d39d6f6ecf6aef0e13f4c0e408f..bd9779edd7ef21d7f14c519fd3bb79e87af39966 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/decomposeParDict
index f7736c90ba5663b81d8e95d89d1b307849ff9551..f17d20b352d2a8b48214de0a4dc308ad23d77586 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/decomposeParDict
@@ -32,10 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/decomposeParDict
index 8c6dbf212b60067f32e3b360dfc5890bad975f19..ef6e9b0fff26e9949280e52efbfb43af2ffcfdd9 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/decomposeParDict
@@ -32,10 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/decomposeParDict
index f2bcb9edbf951f0c66ea17539e8cd9a42706dc05..b3e78cc832a7b986bbdef587e62cbaba88dfc5f6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/decomposeParDict
index 96bfa3696fb848e7183fcda0897da39e0b189cb7..d80e0baf3d436b0b49864910808bc0a2c3e08a28 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/decomposeParDict
index 96bfa3696fb848e7183fcda0897da39e0b189cb7..d80e0baf3d436b0b49864910808bc0a2c3e08a28 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/decomposeParDict
index 96bfa3696fb848e7183fcda0897da39e0b189cb7..d80e0baf3d436b0b49864910808bc0a2c3e08a28 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/decomposeParDict
index 96bfa3696fb848e7183fcda0897da39e0b189cb7..d80e0baf3d436b0b49864910808bc0a2c3e08a28 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/decomposeParDict
index 96bfa3696fb848e7183fcda0897da39e0b189cb7..d80e0baf3d436b0b49864910808bc0a2c3e08a28 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/decomposeParDict
index 96bfa3696fb848e7183fcda0897da39e0b189cb7..d80e0baf3d436b0b49864910808bc0a2c3e08a28 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict
index fafe891ce1ac8e17ca07489001d9c00669dce7ef..8e1ea9515ed7b349458b044ffa81d1da046aa1af 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict
index fafe891ce1ac8e17ca07489001d9c00669dce7ef..8e1ea9515ed7b349458b044ffa81d1da046aa1af 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
index fafe891ce1ac8e17ca07489001d9c00669dce7ef..8e1ea9515ed7b349458b044ffa81d1da046aa1af 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
index fafe891ce1ac8e17ca07489001d9c00669dce7ef..8e1ea9515ed7b349458b044ffa81d1da046aa1af 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
index fafe891ce1ac8e17ca07489001d9c00669dce7ef..8e1ea9515ed7b349458b044ffa81d1da046aa1af 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
index fafe891ce1ac8e17ca07489001d9c00669dce7ef..8e1ea9515ed7b349458b044ffa81d1da046aa1af 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
@@ -32,11 +32,6 @@ hierarchicalCoeffs
order xyz;
}
-metisCoeffs
-{
- processorWeights ( 1 1 1 1 );
-}
-
manualCoeffs
{
dataFile "";
diff --git a/wmake/rules/SiCortex64Gcc/c++ b/wmake/rules/SiCortex64Gcc/c++
index 2b4cb4c48ff1e507835d36e59311147425f57451..f6d7be55483ca64bae79af0c0479a564c0f2cc57 100644
--- a/wmake/rules/SiCortex64Gcc/c++
+++ b/wmake/rules/SiCortex64Gcc/c++
@@ -7,7 +7,7 @@ CC = g++ -mabi=64
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = -G0 $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/SunOS64Gcc/c++ b/wmake/rules/SunOS64Gcc/c++
index 234549805637e57294af751a838d0cd2b23732cd..3ca193e296dc3a739a5eac704b9c442fcb1d1fcb 100644
--- a/wmake/rules/SunOS64Gcc/c++
+++ b/wmake/rules/SunOS64Gcc/c++
@@ -6,7 +6,7 @@ CC = g++ -m64
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++
index 75da3e4ad2ff0bac5116f6987f9113b7ac2dfc53..11efc0c69bd0235c4b8251f6d8efa2f9b2c533de 100644
--- a/wmake/rules/linux64Clang/c++
+++ b/wmake/rules/linux64Clang/c++
@@ -6,7 +6,7 @@ CC = clang++ -m64
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linux64Gcc++0x/c++ b/wmake/rules/linux64Gcc++0x/c++
index 4f858ff338c4d4f3e09d279d7168d9a368f05902..ff7cf481fdca99a4c2c276f3dc3c9e54a4bf9c32 100644
--- a/wmake/rules/linux64Gcc++0x/c++
+++ b/wmake/rules/linux64Gcc++0x/c++
@@ -6,7 +6,7 @@ CC = g++ -m64 -std=c++0x
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++
index 7aab76231291ec4fc5ea024e8cc6f774554df91a..520e39c3b1aa0860a94e5cc9c8cf5d6d926d08a4 100644
--- a/wmake/rules/linux64Gcc/c++
+++ b/wmake/rules/linux64Gcc/c++
@@ -6,7 +6,7 @@ CC = g++ -m64
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linux64Gcc43/c++ b/wmake/rules/linux64Gcc43/c++
index 53455aa74c4568402195441ad552e3c11e2bd50c..3ca193e296dc3a739a5eac704b9c442fcb1d1fcb 100644
--- a/wmake/rules/linux64Gcc43/c++
+++ b/wmake/rules/linux64Gcc43/c++
@@ -6,7 +6,7 @@ CC = g++ -m64
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-40
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linux64Gcc44/c++ b/wmake/rules/linux64Gcc44/c++
index 234549805637e57294af751a838d0cd2b23732cd..3ca193e296dc3a739a5eac704b9c442fcb1d1fcb 100644
--- a/wmake/rules/linux64Gcc44/c++
+++ b/wmake/rules/linux64Gcc44/c++
@@ -6,7 +6,7 @@ CC = g++ -m64
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linux64Gcc45/c++ b/wmake/rules/linux64Gcc45/c++
index 234549805637e57294af751a838d0cd2b23732cd..3ca193e296dc3a739a5eac704b9c442fcb1d1fcb 100644
--- a/wmake/rules/linux64Gcc45/c++
+++ b/wmake/rules/linux64Gcc45/c++
@@ -6,7 +6,7 @@ CC = g++ -m64
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++
index 2f7a3bde441a8c169bbd0f11da1ae949c2e5f6df..eec5f2c0811fad195094b9bca3c448c2efc12570 100644
--- a/wmake/rules/linuxClang/c++
+++ b/wmake/rules/linuxClang/c++
@@ -6,7 +6,7 @@ CC = clang++ -m32
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++
index 7cbedb1fd633665b049cb650aa75b6fdcd6b2e96..e862181fc5c293e1dc6b46f06acad3b72522eb41 100644
--- a/wmake/rules/linuxGcc/c++
+++ b/wmake/rules/linuxGcc/c++
@@ -6,7 +6,7 @@ CC = g++ -m32
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linuxGcc43/c++ b/wmake/rules/linuxGcc43/c++
index 7cbedb1fd633665b049cb650aa75b6fdcd6b2e96..e862181fc5c293e1dc6b46f06acad3b72522eb41 100644
--- a/wmake/rules/linuxGcc43/c++
+++ b/wmake/rules/linuxGcc43/c++
@@ -6,7 +6,7 @@ CC = g++ -m32
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linuxGcc44/c++ b/wmake/rules/linuxGcc44/c++
index 7cbedb1fd633665b049cb650aa75b6fdcd6b2e96..e862181fc5c293e1dc6b46f06acad3b72522eb41 100644
--- a/wmake/rules/linuxGcc44/c++
+++ b/wmake/rules/linuxGcc44/c++
@@ -6,7 +6,7 @@ CC = g++ -m32
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linuxGcc45/c++ b/wmake/rules/linuxGcc45/c++
index 7cbedb1fd633665b049cb650aa75b6fdcd6b2e96..e862181fc5c293e1dc6b46f06acad3b72522eb41 100644
--- a/wmake/rules/linuxGcc45/c++
+++ b/wmake/rules/linuxGcc45/c++
@@ -6,7 +6,7 @@ CC = g++ -m32
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++
index dc0992866b54c8045b898687b7b208fcf1c0924c..b258455b2c82dcdc22955c761d6513fe9ab3f3bf 100644
--- a/wmake/rules/linuxIA64Gcc/c++
+++ b/wmake/rules/linuxIA64Gcc/c++
@@ -6,7 +6,7 @@ CC = g++
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++
index 532011e6d6fb495b557648ab1a546fb5af4015f4..b8e735a5bcd9e530005765564337c37292562aeb 100644
--- a/wmake/rules/linuxPPC64Gcc/c++
+++ b/wmake/rules/linuxPPC64Gcc/c++
@@ -6,7 +6,7 @@ CC = g++ -m64 -mcpu=power5+
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
diff --git a/wmake/rules/linuxmingw32/c++ b/wmake/rules/linuxmingw32/c++
index a0812a1cbaf3df9b0d59942231b570459bd418e5..52945c1aa8b497c75b891fab453886eb8e478c60 100644
--- a/wmake/rules/linuxmingw32/c++
+++ b/wmake/rules/linuxmingw32/c++
@@ -6,7 +6,7 @@ CC = mingw32-g++
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS)
diff --git a/wmake/rules/solarisGcc/c++ b/wmake/rules/solarisGcc/c++
index 8f71f615718075a91aee20eb82c37f09d22cc86e..667b00c89457e69eaffda05da2e9954175e846d9 100644
--- a/wmake/rules/solarisGcc/c++
+++ b/wmake/rules/solarisGcc/c++
@@ -6,7 +6,7 @@ CC = g++
include $(RULES)/c++$(WM_COMPILE_OPTION)
-ptFLAGS = -DNoRepository -ftemplate-depth-60
+ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC