diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C index fe7e858b9a..a9cf8c16fb 100644 --- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C +++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C @@ -275,7 +275,7 @@ autoPtr 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 c38079a72f..41abbbaa5f 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 bab62d5a68..f15cdcdb96 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 128a393226..ac0595bf48 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 162f17a1a5..6aac568b03 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 149f244209..f9a2861683 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& 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("U", "U")), phiName_(dict.lookupOrDefault("phi", "phi")), psiName_(dict.lookupOrDefault("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& 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(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 e6e8516b6e..6e553c9872 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 4c53ea8f95..602607a443 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& iF ) : - fixedValueFvPatchField(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(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(p, iF, dict), + inletOutletFvPatchScalarField(p, iF), + intensity_(readScalar(dict.lookup("intensity"))), UName_(dict.lookupOrDefault("U", "U")), - intensity_(readScalar(dict.lookup("intensity"))) + phiName_(dict.lookupOrDefault("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(ptf), + inletOutletFvPatchScalarField(ptf), + intensity_(ptf.intensity_), UName_(ptf.UName_), - intensity_(ptf.intensity_) + phiName_(ptf.phiName_) {} @@ -106,9 +120,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField const DimensionedField& iF ) : - fixedValueFvPatchField(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& Up = + const fvPatchVectorField& Up = patch().lookupPatchField(UName_); - operator==(1.5*sqr(intensity_)*magSqr(Up)); + const fvsPatchScalarField& phip = + patch().lookupPatchField(phiName_); - fixedValueFvPatchField::updateCoeffs(); + this->refValue() = 1.5*sqr(intensity_)*magSqr(Up); + this->valueFraction() = 1.0 - pos(phip); + + inletOutletFvPatchScalarField::updateCoeffs(); } @@ -136,9 +155,10 @@ void Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::write Ostream& os ) const { - fvPatchField::write(os); - writeEntryIfDifferent(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 a8614eae6c..91e9d97602 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 43c423e42f..e45f72ee56 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 2ff4ecfd5e..5d9d9f8115 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 cba4bc59eb..9b7a58a119 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 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 > patchTransformSign_; diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C index 6d5da79c92..6333e8e65c 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::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 7cea2cb14d..c3a2c91c7b 100644 --- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C +++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C @@ -143,14 +143,14 @@ Foam::tmp 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::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 6296caa2ea..446872ae59 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& iF ) : - fixedValueFvPatchField(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(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(p, iF, dict), - mixingLength_(readScalar(dict.lookup("mixingLength"))) -{} + inletOutletFvPatchScalarField(p, iF), + mixingLength_(readScalar(dict.lookup("mixingLength"))), + phiName_(dict.lookupOrDefault("phi", "phi")), + kName_(dict.lookupOrDefault("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(ptf), - mixingLength_(ptf.mixingLength_) + inletOutletFvPatchScalarField(ptf), + mixingLength_(ptf.mixingLength_), + phiName_(ptf.phiName_), + kName_(ptf.kName_) {} turbulentMixingLengthDissipationRateInletFvPatchScalarField:: @@ -92,8 +110,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField const DimensionedField& iF ) : - fixedValueFvPatchField(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& kp = - patch().lookupPatchField("k"); + const fvPatchScalarField& kp = + patch().lookupPatchField(kName_); - operator==(Cmu75*kp*sqrt(kp)/mixingLength_); + const fvsPatchScalarField& phip = + patch().lookupPatchField(phiName_); - fixedValueFvPatchField::updateCoeffs(); + this->refValue() = Cmu75*kp*sqrt(kp)/mixingLength_; + this->valueFraction() = 1.0 - pos(phip); + + inletOutletFvPatchScalarField::updateCoeffs(); } @@ -128,9 +152,11 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::write Ostream& os ) const { - fvPatchField::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 9f8e7776c7..8464174b53 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 86d2448632..6c8f507b84 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& iF ) : - fixedValueFvPatchField(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(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(p, iF, dict), + inletOutletFvPatchScalarField(p, iF), mixingLength_(readScalar(dict.lookup("mixingLength"))), + phiName_(dict.lookupOrDefault("phi", "phi")), kName_(dict.lookupOrDefault("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(ptf), + inletOutletFvPatchScalarField(ptf), mixingLength_(ptf.mixingLength_), + phiName_(ptf.phiName_), kName_(ptf.kName_) {} @@ -95,8 +110,9 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField const DimensionedField& iF ) : - fixedValueFvPatchField(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("Cmu", 0.09); - const scalar Cmu25 = pow025(Cmu); + const scalar Cmu25 = pow(Cmu, 0.25); - const fvPatchField& kp = + const fvPatchScalarField& kp = patch().lookupPatchField(kName_); - operator==(sqrt(kp)/(Cmu25*mixingLength_)); + const fvsPatchScalarField& phip = + patch().lookupPatchField(phiName_); - fixedValueFvPatchField::updateCoeffs(); + this->refValue() = sqrt(kp)/(Cmu25*mixingLength_); + this->valueFraction() = 1.0 - pos(phip); + + inletOutletFvPatchScalarField::updateCoeffs(); } @@ -132,9 +152,10 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::write Ostream& os ) const { - fvPatchField::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 317239a75d..fb3b0683e8 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 f0d66d95f7..c4596acbf5 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& iF ) : - fixedValueFvPatchField(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(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(p, iF, dict), - mixingLength_(readScalar(dict.lookup("mixingLength"))) -{} + inletOutletFvPatchScalarField(p, iF), + mixingLength_(readScalar(dict.lookup("mixingLength"))), + phiName_(dict.lookupOrDefault("phi", "phi")), + kName_(dict.lookupOrDefault("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(ptf), - mixingLength_(ptf.mixingLength_) + inletOutletFvPatchScalarField(ptf), + mixingLength_(ptf.mixingLength_), + phiName_(ptf.phiName_), + kName_(ptf.kName_) {} turbulentMixingLengthDissipationRateInletFvPatchScalarField:: @@ -92,8 +110,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField const DimensionedField& iF ) : - fixedValueFvPatchField(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& kp = - patch().lookupPatchField("k"); + const fvPatchScalarField& kp = + patch().lookupPatchField(kName_); - operator==(Cmu75*kp*sqrt(kp)/mixingLength_); + const fvsPatchScalarField& phip = + patch().lookupPatchField(phiName_); - fixedValueFvPatchField::updateCoeffs(); + this->refValue() = Cmu75*kp*sqrt(kp)/mixingLength_; + this->valueFraction() = 1.0 - pos(phip); + + inletOutletFvPatchScalarField::updateCoeffs(); } @@ -128,9 +152,11 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::write Ostream& os ) const { - fvPatchField::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 88ad01d85d..c6b4b00742 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 d12b1ebd0d..63970dff2f 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& iF ) : - fixedValueFvPatchField(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(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(p, iF, dict), + inletOutletFvPatchScalarField(p, iF), mixingLength_(readScalar(dict.lookup("mixingLength"))), + phiName_(dict.lookupOrDefault("phi", "phi")), kName_(dict.lookupOrDefault("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(ptf), + inletOutletFvPatchScalarField(ptf), mixingLength_(ptf.mixingLength_), + phiName_(ptf.phiName_), kName_(ptf.kName_) {} @@ -96,8 +110,9 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField const DimensionedField& iF ) : - fixedValueFvPatchField(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("Cmu", 0.09); - const scalar Cmu25 = pow025(Cmu); + const scalar Cmu25 = pow(Cmu, 0.25); - const fvPatchField& kp = + const fvPatchScalarField& kp = patch().lookupPatchField(kName_); - operator==(sqrt(kp)/(Cmu25*mixingLength_)); + const fvsPatchScalarField& phip = + patch().lookupPatchField(phiName_); - fixedValueFvPatchField::updateCoeffs(); + this->refValue() = sqrt(kp)/(Cmu25*mixingLength_); + this->valueFraction() = 1.0 - pos(phip); + + inletOutletFvPatchScalarField::updateCoeffs(); } @@ -133,9 +152,10 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::write Ostream& os ) const { - fvPatchField::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 7f706ed19b..80bb14aaf3 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 689c6e4602..57acb8784a 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 6052702ca5..fccafa51db 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 5b47895a3e..8610d61ac4 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 6052702ca5..fccafa51db 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 535f85cc63..99eed3629e 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 0e973e2395..3c7aa260c8 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 d6827ca176..be24780cea 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 d6827ca176..be24780cea 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 fafe891ce1..8e1ea9515e 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 fafe891ce1..8e1ea9515e 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 c3275fc215..c2f1fe31ef 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 ccd74fc281..6eff2a638e 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 849ce844b9..1604f5d3be 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 a19902c4dc..b2f95ceb34 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 e53a523c9d..1aaedd5a48 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 e53a523c9d..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 e53a523c9d..1aaedd5a48 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 e53a523c9d..1aaedd5a48 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 e53a523c9d..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 e1d400d82b..ed718393ce 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 8f6ced4ac3..1aaedd5a48 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 514d91a827..e63167424c 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 514d91a827..62dc14beeb 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 5d8115cd17..287b30088f 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 6549b7e085..ed8cab434c 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 b93c39fe50..93b49f58dd 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 d2eb7c6972..dc1e1a9083 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 39c3316dea..6a12535722 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 edb201c071..d6843fa1a3 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 9b200b05ed..8515059f1f 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 9b200b05ed..8515059f1f 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 176b1467df..66b12fe52a 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 07e539d558..66b12fe52a 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 d2eb7c6972..dc1e1a9083 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 d2eb7c6972..dc1e1a9083 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 d2eb7c6972..dc1e1a9083 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 d2eb7c6972..dc1e1a9083 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 c488f3ff6b..dc1e1a9083 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 949f6cf72e..3c54915612 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 9b0188ab67..f6300907a4 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 b9c79fbbcd..bd9779edd7 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 f7736c90ba..f17d20b352 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 8c6dbf212b..ef6e9b0fff 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 f2bcb9edbf..b3e78cc832 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 96bfa3696f..d80e0baf3d 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 96bfa3696f..d80e0baf3d 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 96bfa3696f..d80e0baf3d 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 96bfa3696f..d80e0baf3d 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 96bfa3696f..d80e0baf3d 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 96bfa3696f..d80e0baf3d 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 fafe891ce1..8e1ea9515e 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 fafe891ce1..8e1ea9515e 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 fafe891ce1..8e1ea9515e 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 fafe891ce1..8e1ea9515e 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 fafe891ce1..8e1ea9515e 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 fafe891ce1..8e1ea9515e 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 2b4cb4c48f..f6d7be5548 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 2345498056..3ca193e296 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 75da3e4ad2..11efc0c69b 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 4f858ff338..ff7cf481fd 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 7aab762312..520e39c3b1 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 53455aa74c..3ca193e296 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 2345498056..3ca193e296 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 2345498056..3ca193e296 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 2f7a3bde44..eec5f2c081 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 7cbedb1fd6..e862181fc5 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 7cbedb1fd6..e862181fc5 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 7cbedb1fd6..e862181fc5 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 7cbedb1fd6..e862181fc5 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 dc0992866b..b258455b2c 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 532011e6d6..b8e735a5bc 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 a0812a1cba..52945c1aa8 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 8f71f61571..667b00c894 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