From 5e62f6e1919d0072e300a5c98d36943d928a41c8 Mon Sep 17 00:00:00 2001 From: Dominik Christ Date: Wed, 5 Aug 2015 12:34:57 +0100 Subject: [PATCH] Changes for passing test-loop --- ...allHeatFluxTemperatureFvPatchScalarField.C | 36 +-- ...allHeatFluxTemperatureFvPatchScalarField.H | 8 +- ...ixedTemperatureCoupledFvPatchScalarField.C | 30 +-- ...ixedTemperatureCoupledFvPatchScalarField.H | 8 +- .../fluid/createFluidFields.H | 8 +- .../chtMultiRegionFoam/fluid/pEqn.H | 2 +- .../fluid/setRegionFluidFields.H | 2 +- .../solid/createSolidFields.H | 6 +- .../solid/setRegionSolidFields.H | 2 +- .../solid/solidRegionDiffNo.C | 10 +- .../solid/solidRegionDiffNo.H | 2 +- .../solid/solidRegionDiffusionNo.H | 2 +- .../chtMultiRegionFoam/solid/solveSolid.H | 2 +- ...allHeatFluxTemperatureFvPatchScalarField.C | 18 +- ...allHeatFluxTemperatureFvPatchScalarField.H | 4 +- .../fluid/createFluidFields.H | 8 +- .../chtMultiRegionSimpleFoam/fluid/pEqn.H | 2 +- .../fluid/setRegionFluidFields.H | 2 +- .../solid/createSolidFields.H | 8 +- .../solid/setRegionSolidFields.H | 2 +- .../solid/solveSolid.H | 2 +- etc/bashrc.mingw | 2 +- .../gaussDivScheme/vectorGaussDivScheme.H | 4 +- ...mperatureCoupledBaffleFvPatchScalarField.C | 46 ++-- ...mperatureCoupledBaffleFvPatchScalarField.H | 16 +- ...tureCoupledBaffleMixedFvPatchScalarField.C | 48 ++-- ...tureCoupledBaffleMixedFvPatchScalarField.H | 12 +- .../multiRegionHeater/Allrun | 15 +- .../system/bottomAir/changeDictionaryDict | 6 +- .../system/heater/changeDictionaryDict | 10 +- .../multiRegionHeater/system/heater/fvSchemes | 2 +- .../system/leftSolid/changeDictionaryDict | 8 +- .../system/rightSolid/changeDictionaryDict | 8 +- .../system/topAir/changeDictionaryDict | 6 +- .../constant/polyMesh/boundary | 240 ++++++++++++++++-- .../system/bottomAir/changeDictionaryDict | 6 +- .../system/heater/changeDictionaryDict | 10 +- .../system/heater/fvSchemes | 2 +- .../system/leftSolid/changeDictionaryDict | 8 +- .../system/leftSolid/fvSchemes | 2 +- .../system/rightSolid/changeDictionaryDict | 8 +- .../system/rightSolid/fvSchemes | 2 +- .../system/topAir/changeDictionaryDict | 6 +- .../multiRegionHeater/Allrun | 2 +- .../system/bottomAir/changeDictionaryDict | 2 +- .../system/heater/changeDictionaryDict | 4 +- .../multiRegionHeater/system/heater/fvSchemes | 2 +- .../system/leftSolid/changeDictionaryDict | 4 +- .../system/rightSolid/changeDictionaryDict | 4 +- .../system/topAir/changeDictionaryDict | 2 +- .../0_org/U | 1 + .../system/controlDict | 17 -- .../system/controlDict | 10 - .../system/controlDict | 10 - .../system/controlDict | 10 - .../system/controlDict | 15 -- 56 files changed, 434 insertions(+), 280 deletions(-) diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C index a0eada6d9..1859bbc9d 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C @@ -39,7 +39,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(p, iF), q_(p.size(), 0.0), - KName_("undefined-K") + KappaName_("undefined-Kappa") {} @@ -54,7 +54,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(ptf, p, iF, mapper), q_(ptf.q_, mapper), - KName_(ptf.KName_) + KappaName_(ptf.KappaName_) {} @@ -68,7 +68,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(p, iF, dict), q_("q", dict, p.size()), - KName_(dict.lookup("K")) + KappaName_(dict.lookup("Kappa")) {} @@ -80,7 +80,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(tppsf), q_(tppsf.q_), - KName_(tppsf.KName_) + KappaName_(tppsf.KappaName_) {} @@ -93,7 +93,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(tppsf, iF), q_(tppsf.q_), - KName_(tppsf.KName_) + KappaName_(tppsf.KappaName_) {} @@ -125,33 +125,33 @@ void Foam::solidWallHeatFluxTemperatureFvPatchScalarField::rmap Foam::tmp -Foam::solidWallHeatFluxTemperatureFvPatchScalarField::K() const +Foam::solidWallHeatFluxTemperatureFvPatchScalarField::Kappa() const { const fvMesh& mesh = patch().boundaryMesh().mesh(); - if (mesh.objectRegistry::foundObject(KName_)) + if (mesh.objectRegistry::foundObject(KappaName_)) { - return lookupPatchField(KName_); + return lookupPatchField(KappaName_); } - else if (mesh.objectRegistry::foundObject(KName_)) + else if (mesh.objectRegistry::foundObject(KappaName_)) { - const symmTensorField& KWall = - lookupPatchField(KName_); + const symmTensorField& KappaWall = + lookupPatchField(KappaName_); vectorField n = patch().nf(); - return n & KWall & n; + return n & KappaWall & n; } else { FatalErrorIn ( - "solidWallHeatFluxTemperatureFvPatchScalarField::K()" + "solidWallHeatFluxTemperatureFvPatchScalarField::Kappa()" " const" - ) << "Did not find field " << KName_ + ) << "Did not find field " << KappaName_ << " on mesh " << mesh.name() << " patch " << patch().name() << endl - << "Please set 'K' to a valid volScalarField" + << "Please set 'Kappa' to a valid volScalarField" << " or a valid volSymmTensorField." << exit(FatalError); return scalarField(0); @@ -166,13 +166,13 @@ void Foam::solidWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs() return; } - gradient() = q_/K(); + gradient() = q_/Kappa(); fixedGradientFvPatchScalarField::updateCoeffs(); if (debug) { - scalar Q = gSum(K()*patch().magSf()*snGrad()); + scalar Q = gSum(Kappa()*patch().magSf()*snGrad()); Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' @@ -194,7 +194,7 @@ void Foam::solidWallHeatFluxTemperatureFvPatchScalarField::write { fixedGradientFvPatchScalarField::write(os); q_.writeEntry("q", os); - os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl; + os.writeKeyword("Kappa") << KappaName_ << token::END_STATEMENT << nl; this->writeEntry("value", os); } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H index 49828f1bc..4616955ac 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H @@ -31,7 +31,7 @@ Description myWallPatch { type solidWallHeatFluxTemperature; - K K; // Name of K field + Kappa Kappa; // Name of Kappa field q uniform 1000; // Heat flux / [W/m2] value uniform 300.0; // Initial temperature / [K] gradient uniform 0.0; // Initial gradient / [K/m] @@ -67,7 +67,7 @@ class solidWallHeatFluxTemperatureFvPatchScalarField scalarField q_; //- Name of thermal conductivity field - word KName_; + word KappaName_; public: @@ -143,8 +143,8 @@ public: // Helper - //- Get K field on this patch - tmp K() const; + //- Get Kappa field on this patch + tmp Kappa() const; // Evaluation functions diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C index ecf586cdd..697236713 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C @@ -41,7 +41,7 @@ solidWallMixedTemperatureCoupledFvPatchScalarField : mixedFvPatchScalarField(p, iF), neighbourFieldName_("undefined-neighbourFieldName"), - KName_("undefined-K") + KappaName_("undefined-Kappa") { this->refValue() = 0.0; this->refGrad() = 0.0; @@ -60,7 +60,7 @@ solidWallMixedTemperatureCoupledFvPatchScalarField : mixedFvPatchScalarField(ptf, p, iF, mapper), neighbourFieldName_(ptf.neighbourFieldName_), - KName_(ptf.KName_) + KappaName_(ptf.KappaName_) {} @@ -74,7 +74,7 @@ solidWallMixedTemperatureCoupledFvPatchScalarField : mixedFvPatchScalarField(p, iF), neighbourFieldName_(dict.lookup("neighbourFieldName")), - KName_(dict.lookup("K")) + KappaName_(dict.lookup("Kappa")) { if (!isA(this->patch().patch())) { @@ -123,16 +123,16 @@ solidWallMixedTemperatureCoupledFvPatchScalarField : mixedFvPatchScalarField(wtcsf, iF), neighbourFieldName_(wtcsf.neighbourFieldName_), - KName_(wtcsf.KName_) + KappaName_(wtcsf.KappaName_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // const Foam::fvPatchScalarField& -Foam::solidWallMixedTemperatureCoupledFvPatchScalarField::K() const +Foam::solidWallMixedTemperatureCoupledFvPatchScalarField::Kappa() const { - return this->lookupPatchField(KName_); + return this->lookupPatchField(KappaName_); } @@ -181,8 +181,8 @@ void Foam::solidWallMixedTemperatureCoupledFvPatchScalarField::updateCoeffs() nbrIntFld ); - // Swap to obtain full local values of neighbour K*delta - scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs(); + // Swap to obtain full local values of neighbour Kappa*delta + scalarField nbrKappaDelta = nbrField.Kappa()*nbrPatch.deltaCoeffs(); mapDistribute::distribute ( static_cast(Pstream::defaultCommsType()), @@ -190,14 +190,14 @@ void Foam::solidWallMixedTemperatureCoupledFvPatchScalarField::updateCoeffs() distMap.constructSize(), distMap.subMap(), // what to send distMap.constructMap(), // what to receive - nbrKDelta + nbrKappaDelta ); - tmp myKDelta = K()*patch().deltaCoeffs(); + tmp myKappaDelta = Kappa()*patch().deltaCoeffs(); // Both sides agree on - // - temperature : (myKDelta*fld + nbrKDelta*nbrFld)/(myKDelta+nbrKDelta) + // - temperature : (myKappaDelta*fld + nbrKappaDelta*nbrFld)/(myKappaDelta+nbrKappaDelta) // - gradient : (temperature-fld)*delta // We've got a degree of freedom in how to implement this in a mixed bc. // (what gradient, what fixedValue and mixing coefficient) @@ -209,21 +209,21 @@ void Foam::solidWallMixedTemperatureCoupledFvPatchScalarField::updateCoeffs() // same on both sides. This leads to the choice of // - refGradient = zero gradient // - refValue = neighbour value - // - mixFraction = nbrKDelta / (nbrKDelta + myKDelta()) + // - mixFraction = nbrKappaDelta / (nbrKappaDelta + myKappaDelta()) this->refValue() = nbrIntFld; this->refGrad() = 0.0; - this->valueFraction() = nbrKDelta / (nbrKDelta + myKDelta()); + this->valueFraction() = nbrKappaDelta / (nbrKappaDelta + myKappaDelta()); mixedFvPatchScalarField::updateCoeffs(); if (debug) { - scalar Q = gSum(K()*patch().magSf()*snGrad()); + scalar Q = gSum(Kappa()*patch().magSf()*snGrad()); Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' @@ -249,7 +249,7 @@ void Foam::solidWallMixedTemperatureCoupledFvPatchScalarField::write mixedFvPatchScalarField::write(os); os.writeKeyword("neighbourFieldName")<< neighbourFieldName_ << token::END_STATEMENT << nl; - os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl; + os.writeKeyword("Kappa") << KappaName_ << token::END_STATEMENT << nl; } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.H index 9d03d41a9..714f88013 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.H @@ -34,7 +34,7 @@ Description { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } @@ -72,7 +72,7 @@ class solidWallMixedTemperatureCoupledFvPatchScalarField const word neighbourFieldName_; //- Name of thermal conductivity field - const word KName_; + const word KappaName_; public: @@ -142,8 +142,8 @@ public: // Member functions - //- Get corresponding K field - const fvPatchScalarField& K() const; + //- Get corresponding Kappa field + const fvPatchScalarField& Kappa() const; //- Update the coefficients associated with the patch field virtual void updateCoeffs(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index 1826a7721..c2aebcf0d 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -1,7 +1,7 @@ // Initialise fluid field pointer lists PtrList thermoFluid(fluidRegions.size()); PtrList rhoFluid(fluidRegions.size()); - PtrList KFluid(fluidRegions.size()); + PtrList KappaFluid(fluidRegions.size()); PtrList UFluid(fluidRegions.size()); PtrList phiFluid(fluidRegions.size()); PtrList gFluid(fluidRegions.size()); @@ -41,15 +41,15 @@ ) ); - Info<< " Adding to KFluid\n" << endl; - KFluid.set + Info<< " Adding to KappaFluid\n" << endl; + KappaFluid.set ( i, new volScalarField ( IOobject ( - "K", + "Kappa", runTime.timeName(), fluidRegions[i], IOobject::NO_READ, diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H index 389e155b6..0f7aa5923 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H @@ -71,5 +71,5 @@ } // Update thermal conductivity - K = thermoFluid[i].Cp()*turb.alphaEff(); + Kappa = thermoFluid[i].Cp()*turb.alphaEff(); } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H index 50a301148..49bffaa4d 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H @@ -2,7 +2,7 @@ basicPsiThermo& thermo = thermoFluid[i]; volScalarField& rho = rhoFluid[i]; - volScalarField& K = KFluid[i]; + volScalarField& Kappa = KappaFluid[i]; volVectorField& U = UFluid[i]; surfaceScalarField& phi = phiFluid[i]; const dimensionedVector& g = gFluid[i]; diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H index 6c1fd5489..8fd846da6 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H @@ -2,7 +2,7 @@ PtrList rhos(solidRegions.size()); PtrList cps(solidRegions.size()); PtrList rhosCps(solidRegions.size()); - PtrList Ks(solidRegions.size()); + PtrList Kappas(solidRegions.size()); PtrList Ts(solidRegions.size()); // Populate solid field pointer lists @@ -53,8 +53,8 @@ new volScalarField("rhosCps", rhos[i]*cps[i]) ); - Info<< " Adding to Ks\n" << endl; - Ks.set + Info<< " Adding to Kappas\n" << endl; + Kappas.set ( i, new volScalarField diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H index f9e80e3d7..2bd0ee7a2 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H @@ -2,5 +2,5 @@ volScalarField& rho = rhos[i]; volScalarField& cp = cps[i]; - volScalarField& K = Ks[i]; + volScalarField& Kappa = Kappas[i]; volScalarField& T = Ts[i]; diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C index 398d111f4..7482d4fa2 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C @@ -31,7 +31,7 @@ Foam::scalar Foam::solidRegionDiffNo const fvMesh& mesh, const Time& runTime, const volScalarField& Cprho, - const volScalarField& K + const volScalarField& Kappa ) { scalar DiNum = 0.0; @@ -40,14 +40,14 @@ Foam::scalar Foam::solidRegionDiffNo //- Can have fluid domains with 0 cells so do not test. if (mesh.nInternalFaces()) { - surfaceScalarField KrhoCpbyDelta = + surfaceScalarField KappaRhoCpbyDelta = mesh.surfaceInterpolation::deltaCoeffs() - * fvc::interpolate(K) + * fvc::interpolate(Kappa) / fvc::interpolate(Cprho); - DiNum = max(KrhoCpbyDelta.internalField())*runTime.deltaT().value(); + DiNum = max(KappaRhoCpbyDelta.internalField())*runTime.deltaT().value(); - meanDiNum = (average(KrhoCpbyDelta)).value()*runTime.deltaT().value(); + meanDiNum = (average(KappaRhoCpbyDelta)).value()*runTime.deltaT().value(); } Info<< "Region: " << mesh.name() << " Diffusion Number mean: " << meanDiNum diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H index 515912a92..e322afe16 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H @@ -39,7 +39,7 @@ namespace Foam const fvMesh& mesh, const Time& runTime, const volScalarField& Cprho, - const volScalarField& K + const volScalarField& Kappa ); } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H index c2e5668a6..9923808b1 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H @@ -9,7 +9,7 @@ solidRegions[regionI], runTime, rhosCps[regionI], - Ks[regionI] + Kappas[regionI] ), DiNum ); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H index ce8b1d0f4..4304405a9 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H @@ -4,7 +4,7 @@ tmp TEqn ( fvm::ddt(rho*cp, T) - - fvm::laplacian(K, T) + - fvm::laplacian(Kappa, T) ); TEqn().relax(); TEqn().solve(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C index a52472602..f124fb91a 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C @@ -39,7 +39,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(p, iF), q_(p.size(), 0.0), - KName_("undefined-K") + KappaName_("undefined-Kappa") {} @@ -54,7 +54,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(ptf, p, iF, mapper), q_(ptf.q_, mapper), - KName_(ptf.KName_) + KappaName_(ptf.KappaName_) {} @@ -68,7 +68,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(p, iF, dict), q_("q", dict, p.size()), - KName_(dict.lookup("K")) + KappaName_(dict.lookup("Kappa")) {} @@ -80,7 +80,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(tppsf), q_(tppsf.q_), - KName_(tppsf.KName_) + KappaName_(tppsf.KappaName_) {} @@ -93,7 +93,7 @@ solidWallHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(tppsf, iF), q_(tppsf.q_), - KName_(tppsf.KName_) + KappaName_(tppsf.KappaName_) {} @@ -131,12 +131,12 @@ void Foam::solidWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs() return; } - const scalarField& Kw = lookupPatchField + const scalarField& Kappaw = lookupPatchField ( - KName_ + KappaName_ ); - gradient() = q_/Kw; + gradient() = q_/Kappaw; fixedGradientFvPatchScalarField::updateCoeffs(); } @@ -149,7 +149,7 @@ void Foam::solidWallHeatFluxTemperatureFvPatchScalarField::write { fixedGradientFvPatchScalarField::write(os); q_.writeEntry("q", os); - os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl; + os.writeKeyword("Kappa") << KappaName_ << token::END_STATEMENT << nl; this->writeEntry("value", os); } diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H index 65eb16f72..658377ddc 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H @@ -31,7 +31,7 @@ Description myWallPatch { type solidWallHeatFluxTemperature; - K K; // Name of K field + Kappa Kappa; // Name of Kappa field q uniform 1000; // Heat flux / [W/m2] value 300.0; // Initial temperature / [K] } @@ -66,7 +66,7 @@ class solidWallHeatFluxTemperatureFvPatchScalarField scalarField q_; //- Name of thermal conductivity field - word KName_; + word KappaName_; public: diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidFields.H index 2d2ccf9a5..4365345c7 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidFields.H @@ -1,7 +1,7 @@ // Initialise fluid field pointer lists PtrList thermoFluid(fluidRegions.size()); PtrList rhoFluid(fluidRegions.size()); - PtrList KFluid(fluidRegions.size()); + PtrList KappaFluid(fluidRegions.size()); PtrList UFluid(fluidRegions.size()); PtrList phiFluid(fluidRegions.size()); PtrList gFluid(fluidRegions.size()); @@ -45,15 +45,15 @@ ) ); - Info<< " Adding to KFluid\n" << endl; - KFluid.set + Info<< " Adding to KappaFluid\n" << endl; + KappaFluid.set ( i, new volScalarField ( IOobject ( - "K", + "Kappa", runTime.timeName(), fluidRegions[i], IOobject::NO_READ, diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/pEqn.H index 6b6fe6ef5..33ee0756b 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/pEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/pEqn.H @@ -70,5 +70,5 @@ << max(rho).value() << endl; // Update thermal conductivity - K = thermo.Cp()*turb.alphaEff(); + Kappa = thermo.Cp()*turb.alphaEff(); } diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H index 8491056ea..656fb42e5 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H @@ -2,7 +2,7 @@ basicPsiThermo& thermo = thermoFluid[i]; volScalarField& rho = rhoFluid[i]; - volScalarField& K = KFluid[i]; + volScalarField& Kappa = KappaFluid[i]; volVectorField& U = UFluid[i]; surfaceScalarField& phi = phiFluid[i]; const dimensionedVector& g = gFluid[i]; diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/createSolidFields.H index 3361a89ad..8fd846da6 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/createSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/createSolidFields.H @@ -2,7 +2,7 @@ PtrList rhos(solidRegions.size()); PtrList cps(solidRegions.size()); PtrList rhosCps(solidRegions.size()); - PtrList Ks(solidRegions.size()); + PtrList Kappas(solidRegions.size()); PtrList Ts(solidRegions.size()); // Populate solid field pointer lists @@ -53,15 +53,15 @@ new volScalarField("rhosCps", rhos[i]*cps[i]) ); - Info<< " Adding to Ks\n" << endl; - Ks.set + Info<< " Adding to Kappas\n" << endl; + Kappas.set ( i, new volScalarField ( IOobject ( - "K", + "Kappa", runTime.timeName(), solidRegions[i], IOobject::MUST_READ, diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H index f9e80e3d7..2bd0ee7a2 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H @@ -2,5 +2,5 @@ volScalarField& rho = rhos[i]; volScalarField& cp = cps[i]; - volScalarField& K = Ks[i]; + volScalarField& Kappa = Kappas[i]; volScalarField& T = Ts[i]; diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/solveSolid.H index 7cf2cc140..c06d2b883 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/solveSolid.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/solveSolid.H @@ -3,7 +3,7 @@ { fvScalarMatrix tEqn ( - -fvm::laplacian(K, T) + -fvm::laplacian(Kappa, T) ); tEqn.relax(); eqnResidual = tEqn.solve().initialResidual(); diff --git a/etc/bashrc.mingw b/etc/bashrc.mingw index d94a20e92..7f92794cd 100644 --- a/etc/bashrc.mingw +++ b/etc/bashrc.mingw @@ -71,7 +71,7 @@ add_to_path() { # {{{ DEFINE PROCESS FUNCTIONS setup_foam_env() { - : ${WM_OSTYPE:=POSIX}; export WM_OSTYPE + : ${WM_OSTYPE:=MSWindows}; export WM_OSTYPE export export FLEX_DIR=$(echo $WD\.. | sed 's/\\/\//g' | sed 's/\(.*\):/\/\1/') FOAM_ETC_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) export FOAM_INST_DIR=$(readlink -f $FOAM_ETC_DIR/../..) diff --git a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/vectorGaussDivScheme.H b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/vectorGaussDivScheme.H index 305edf262..1d1a9e9ea 100644 --- a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/vectorGaussDivScheme.H +++ b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/vectorGaussDivScheme.H @@ -50,13 +50,13 @@ namespace fv // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -template<> inline +template<> tmp > gaussDivScheme::fvmUDiv ( const GeometricField& ) const; -template<> inline +template<> tmp > gaussDivScheme::fvmUDiv ( const surfaceScalarField& flux, diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C index 2eb2c1eac..059dacffe 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C @@ -112,7 +112,7 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField : fixedValueFvPatchScalarField(p, iF), neighbourFieldName_("undefined-neighbourFieldName"), - KName_("undefined-K") + KappaName_("undefined-Kappa") {} @@ -127,7 +127,7 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField : fixedValueFvPatchScalarField(ptf, p, iF, mapper), neighbourFieldName_(ptf.neighbourFieldName_), - KName_(ptf.KName_) + KappaName_(ptf.KappaName_) {} @@ -141,7 +141,7 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField : fixedValueFvPatchScalarField(p, iF, dict), neighbourFieldName_(dict.lookup("neighbourFieldName")), - KName_(dict.lookup("K")) + KappaName_(dict.lookup("Kappa")) { if (!isA(this->patch().patch())) { @@ -173,18 +173,18 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField : fixedValueFvPatchScalarField(wtcsf, iF), neighbourFieldName_(wtcsf.neighbourFieldName_), - KName_(wtcsf.KName_) + KappaName_(wtcsf.KappaName_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // Foam::tmp -Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const +Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::Kappa() const { const fvMesh& mesh = patch().boundaryMesh().mesh(); - if (KName_ == "none") + if (KappaName_ == "none") { const compressible::RASModel& model = db().lookupObject("RASProperties"); @@ -198,28 +198,28 @@ Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const talpha().boundaryField()[patch().index()] *thermo.Cp()().boundaryField()[patch().index()]; } - else if (mesh.objectRegistry::foundObject(KName_)) + else if (mesh.objectRegistry::foundObject(KappaName_)) { - return lookupPatchField(KName_); + return lookupPatchField(KappaName_); } - else if (mesh.objectRegistry::foundObject(KName_)) + else if (mesh.objectRegistry::foundObject(KappaName_)) { - const symmTensorField& KWall = - lookupPatchField(KName_); + const symmTensorField& KappaWall = + lookupPatchField(KappaName_); vectorField n = patch().nf(); - return n & KWall & n; + return n & KappaWall & n; } else { FatalErrorIn ( - "turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const" - ) << "Did not find field " << KName_ + "turbulentTemperatureCoupledBaffleFvPatchScalarField::Kappa() const" + ) << "Did not find field " << KappaName_ << " on mesh " << mesh.name() << " patch " << patch().name() << endl - << "Please set 'K' to 'none', a valid volScalarField" + << "Please set 'Kappa' to 'none', a valid volScalarField" << " or a valid volSymmTensorField." << exit(FatalError); return scalarField(0); @@ -282,8 +282,8 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs() nbrIntFld ); - // Swap to obtain full local values of neighbour K*delta - scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs(); + // Swap to obtain full local values of neighbour Kappa*delta + scalarField nbrKappaDelta = nbrField.Kappa()*nbrPatch.deltaCoeffs(); mapDistribute::distribute ( static_cast(Pstream::defaultCommsType()), @@ -291,16 +291,16 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs() distMap.constructSize(), distMap.subMap(), // what to send distMap.constructMap(), // what to receive - nbrKDelta + nbrKappaDelta ); - tmp myKDelta = K()*patch().deltaCoeffs(); + tmp myKappaDelta = Kappa()*patch().deltaCoeffs(); // Calculate common wall temperature. Reuse *this to store common value. scalarField Twall ( - (myKDelta()*intFld() + nbrKDelta*nbrIntFld) - / (myKDelta() + nbrKDelta) + (myKappaDelta()*intFld() + nbrKappaDelta*nbrIntFld) + / (myKappaDelta() + nbrKappaDelta) ); // Assign to me fvPatchScalarField::operator=(Twall); @@ -326,7 +326,7 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs() // (*this-intFld()) // * patch().deltaCoeffs(); - scalar Q = gSum(K()*patch().magSf()*snGrad()); + scalar Q = gSum(Kappa()*patch().magSf()*snGrad()); Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' @@ -354,7 +354,7 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::write fixedValueFvPatchScalarField::write(os); os.writeKeyword("neighbourFieldName")<< neighbourFieldName_ << token::END_STATEMENT << nl; - os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl; + os.writeKeyword("Kappa") << KappaName_ << token::END_STATEMENT << nl; } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H index b06a0a2ab..a10c36a4d 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H @@ -28,23 +28,23 @@ Description Harmonic fixed value boundary condition for temperature, to be used for heat-transfer on back-to-back baffles. - If my temperature is T1, heat conductivity K1 and neighbour is T2,K2 + If my temperature is T1, heat conductivity Kappa1 and neighbour is T2,Kappa2 - both sides get fixedValue (K1/dx1*T1 + K2/dx2*T2)/(K1/dx1+K2/dx2) + both sides get fixedValue (Kappa1/dx1*T1 + Kappa2/dx2*T2)/(Kappa1/dx1+Kappa2/dx2) Example usage: myInterfacePatchName { type compressible::turbulentTemperatureCoupledBaffle; neighbourFieldName T; - K K; // or none + Kappa Kappa; // or none value uniform 300; } Needs to be on underlying directMapped(Wall)FvPatch. - Note: if K is "none" looks up RASModel and basicThermo, otherwise expects - the solver to calculate a 'K' field. + Note: if Kappa is "none" looks up RASModel and basicThermo, otherwise expects + the solver to calculate a 'Kappa' field. Note: runs in parallel with arbitrary decomposition. Uses directMapped functionality to calculate exchange. @@ -84,7 +84,7 @@ class turbulentTemperatureCoupledBaffleFvPatchScalarField const word neighbourFieldName_; //- Name of thermal conductivity field - const word KName_; + const word KappaName_; // Private Member Functions @@ -161,8 +161,8 @@ public: // Member functions - //- Get corresponding K field - tmp K() const; + //- Get corresponding Kappa field + tmp Kappa() const; //- Update the coefficients associated with the patch field virtual void updateCoeffs(); diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C index f3f0114a8..209e8329a 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C @@ -53,7 +53,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField : mixedFvPatchScalarField(p, iF), neighbourFieldName_("undefined-neighbourFieldName"), - KName_("undefined-K") + KappaName_("undefined-Kappa") { this->refValue() = 0.0; this->refGrad() = 0.0; @@ -72,7 +72,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField : mixedFvPatchScalarField(ptf, p, iF, mapper), neighbourFieldName_(ptf.neighbourFieldName_), - KName_(ptf.KName_) + KappaName_(ptf.KappaName_) {} @@ -86,7 +86,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField : mixedFvPatchScalarField(p, iF), neighbourFieldName_(dict.lookup("neighbourFieldName")), - KName_(dict.lookup("K")) + KappaName_(dict.lookup("Kappa")) { if (!isA(this->patch().patch())) { @@ -135,18 +135,18 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField : mixedFvPatchScalarField(wtcsf, iF), neighbourFieldName_(wtcsf.neighbourFieldName_), - KName_(wtcsf.KName_) + KappaName_(wtcsf.KappaName_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // tmp -turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::K() const +turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::Kappa() const { const fvMesh& mesh = patch().boundaryMesh().mesh(); - if (KName_ == "none") + if (KappaName_ == "none") { const compressible::RASModel& model = db().lookupObject("RASProperties"); @@ -160,29 +160,29 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::K() const talpha().boundaryField()[patch().index()] *thermo.Cp()().boundaryField()[patch().index()]; } - else if (mesh.objectRegistry::foundObject(KName_)) + else if (mesh.objectRegistry::foundObject(KappaName_)) { - return lookupPatchField(KName_); + return lookupPatchField(KappaName_); } - else if (mesh.objectRegistry::foundObject(KName_)) + else if (mesh.objectRegistry::foundObject(KappaName_)) { - const symmTensorField& KWall = - lookupPatchField(KName_); + const symmTensorField& KappaWall = + lookupPatchField(KappaName_); vectorField n = patch().nf(); - return n & KWall & n; + return n & KappaWall & n; } else { FatalErrorIn ( - "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::K()" + "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::Kappa()" " const" - ) << "Did not find field " << KName_ + ) << "Did not find field " << KappaName_ << " on mesh " << mesh.name() << " patch " << patch().name() << endl - << "Please set 'K' to 'none', a valid volScalarField" + << "Please set 'Kappa' to 'none', a valid volScalarField" << " or a valid volSymmTensorField." << exit(FatalError); return scalarField(0); @@ -241,8 +241,8 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs() nbrIntFld ); - // Swap to obtain full local values of neighbour K*delta - scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs(); + // Swap to obtain full local values of neighbour Kappa*delta + scalarField nbrKappaDelta = nbrField.Kappa()*nbrPatch.deltaCoeffs(); mapDistribute::distribute ( static_cast(Pstream::defaultCommsType()), @@ -250,14 +250,14 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs() distMap.constructSize(), distMap.subMap(), // what to send distMap.constructMap(), // what to receive - nbrKDelta + nbrKappaDelta ); - tmp myKDelta = K()*patch().deltaCoeffs(); + tmp myKappaDelta = Kappa()*patch().deltaCoeffs(); // Both sides agree on - // - temperature : (myKDelta*fld + nbrKDelta*nbrFld)/(myKDelta+nbrKDelta) + // - temperature : (myKappaDelta*fld + nbrKappaDelta*nbrFld)/(myKappaDelta+nbrKappaDelta) // - gradient : (temperature-fld)*delta // We've got a degree of freedom in how to implement this in a mixed bc. // (what gradient, what fixedValue and mixing coefficient) @@ -269,21 +269,21 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs() // same on both sides. This leads to the choice of // - refGradient = zero gradient // - refValue = neighbour value - // - mixFraction = nbrKDelta / (nbrKDelta + myKDelta()) + // - mixFraction = nbrKappaDelta / (nbrKappaDelta + myKappaDelta()) this->refValue() = nbrIntFld; this->refGrad() = 0.0; - this->valueFraction() = nbrKDelta / (nbrKDelta + myKDelta()); + this->valueFraction() = nbrKappaDelta / (nbrKappaDelta + myKappaDelta()); mixedFvPatchScalarField::updateCoeffs(); if (debug) { - scalar Q = gSum(K()*patch().magSf()*snGrad()); + scalar Q = gSum(Kappa()*patch().magSf()*snGrad()); Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' @@ -309,7 +309,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write mixedFvPatchScalarField::write(os); os.writeKeyword("neighbourFieldName")<< neighbourFieldName_ << token::END_STATEMENT << nl; - os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl; + os.writeKeyword("Kappa") << KappaName_ << token::END_STATEMENT << nl; } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H index 3b5aa8e69..82328a131 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H @@ -38,14 +38,14 @@ Description { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K K; // or none + Kappa Kappa; // or none value uniform 300; } Needs to be on underlying directMapped(Wall)FvPatch. - Note: if K is "none" looks up RASModel and basicThermo, otherwise expects - the solver to calculate a 'K' field. + Note: if Kappa is "none" looks up RASModel and basicThermo, otherwise expects + the solver to calculate a 'Kappa' field. Note: runs in parallel with arbitrary decomposition. Uses directMapped functionality to calculate exchange. @@ -87,7 +87,7 @@ class turbulentTemperatureCoupledBaffleMixedFvPatchScalarField const word neighbourFieldName_; //- Name of thermal conductivity field - const word KName_; + const word KappaName_; public: @@ -162,8 +162,8 @@ public: // Member functions - //- Get corresponding K field - tmp K() const; + //- Get corresponding Kappa field + tmp Kappa() const; //- Update the coefficients associated with the patch field virtual void updateCoeffs(); diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun index 4fb2878e2..5b3777e02 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -94,11 +94,16 @@ cp 0/* 0.001/heater/ cp 0/* 0.001/leftSolid/ cp 0/* 0.001/rightSolid/ cp 0/* 0.001/topAir/ -changeDictionary -region bottomAir -changeDictionary -region topAir -changeDictionary -region heater -changeDictionary -region leftSolid -changeDictionary -region rightSolid +runApplication changeDictionary -region bottomAir +mv log.changeDictionary log.changeDictionary_bottomAir +runApplication changeDictionary -region topAir +mv log.changeDictionary log.changeDictionary_topAir +runApplication changeDictionary -region heater +mv log.changeDictionary log.changeDictionary_heater +runApplication changeDictionary -region leftSolid +mv log.changeDictionary log.changeDictionary_leftSolid +runApplication changeDictionary -region rightSolid +mv log.changeDictionary log.changeDictionary_rightSolid runApplicationAndReportOnError chtMultiRegionFoam diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict index 947f0aacf..5a69600bb 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict @@ -65,7 +65,7 @@ dictionaryReplacement neighbourRegionName leftSolid; neighbourPatchName leftSolid_to_bottomAir; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } @@ -75,7 +75,7 @@ dictionaryReplacement neighbourRegionName heater; neighbourPatchName heater_to_bottomAir; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } bottomAir_to_rightSolid @@ -84,7 +84,7 @@ dictionaryReplacement neighbourRegionName rightSolid; neighbourPatchName rightSolid_to_bottomAir; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict index 81132e52d..74c25907f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict @@ -43,7 +43,7 @@ dictionaryReplacement neighbourRegionName bottomAir; neighbourPatchName bottomAir_to_heater; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } @@ -53,7 +53,7 @@ dictionaryReplacement neighbourRegionName leftSolid; neighbourPatchName leftSolid_to_heater; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } heater_to_rightSolid @@ -62,7 +62,7 @@ dictionaryReplacement neighbourRegionName rightSolid; neighbourPatchName rightSolid_to_heater; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } heater_to_topAir @@ -71,7 +71,7 @@ dictionaryReplacement neighbourRegionName topAir; neighbourPatchName topAir_to_heater; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } } @@ -114,7 +114,7 @@ dictionaryReplacement } } - K + Kappa { internalField uniform 80; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes index 0698fa0a9..c45fbbe2f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes @@ -32,7 +32,7 @@ divSchemes laplacianSchemes { default none; - laplacian(K,T) Gauss linear limited 0.333; + laplacian(Kappa,T) Gauss linear limited 0.333; } interpolationSchemes diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict index 314553a4b..54d9df722 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict @@ -40,7 +40,7 @@ dictionaryReplacement neighbourRegionName bottomAir; neighbourPatchName bottomAir_to_leftSolid; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } @@ -50,7 +50,7 @@ dictionaryReplacement neighbourRegionName heater; neighbourPatchName heater_to_leftSolid; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } leftSolid_to_topAir @@ -59,7 +59,7 @@ dictionaryReplacement neighbourRegionName topAir; neighbourPatchName topAir_to_leftSolid; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } } @@ -98,7 +98,7 @@ dictionaryReplacement } } - K + Kappa { internalField uniform 80; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict index 07283afc3..189d5bc20 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict @@ -40,7 +40,7 @@ dictionaryReplacement neighbourRegionName heater; neighbourPatchName heater_to_rightSolid; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } rightSolid_to_bottomAir @@ -49,7 +49,7 @@ dictionaryReplacement neighbourRegionName bottomAir; neighbourPatchName bottomAir_to_rightSolid; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } rightSolid_to_topAir @@ -58,7 +58,7 @@ dictionaryReplacement neighbourRegionName topAir; neighbourPatchName topAir_to_rightSolid; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } } @@ -97,7 +97,7 @@ dictionaryReplacement } } - K + Kappa { internalField uniform 80; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict index 7b5bb93e7..49427948e 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict @@ -66,7 +66,7 @@ dictionaryReplacement neighbourRegionName leftSolid; neighbourPatchName leftSolid_to_topAir; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } @@ -76,7 +76,7 @@ dictionaryReplacement neighbourRegionName heater; neighbourPatchName heater_to_topAir; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } topAir_to_rightSolid @@ -85,7 +85,7 @@ dictionaryReplacement neighbourRegionName rightSolid; neighbourPatchName rightSolid_to_topAir; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary index ea81e4dc1..b9f955fe8 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary @@ -1,9 +1,9 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.2 | +| \\ / O peration | Version: 3.1 | | \\ / A nd | Web: http://www.foam-extend.org | -| \\/ M anipulation | | +| \\/ M anipulation | For copyright notice see file Copyright | \*---------------------------------------------------------------------------*/ FoamFile { @@ -15,43 +15,253 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -6 +41 ( maxY { type wall; - nFaces 300; - startFace 8300; + nFaces 1200; + startFace 41630; } minX { type patch; - nFaces 100; - startFace 8600; + nFaces 250; + startFace 42830; } maxX { type patch; - nFaces 100; - startFace 8700; + nFaces 250; + startFace 43080; } minY { type wall; - nFaces 300; - startFace 8800; + nFaces 1200; + startFace 43330; } minZ { type wall; - nFaces 300; - startFace 9100; + nFaces 750; + startFace 44530; } maxZ { type wall; - nFaces 300; - startFace 9400; + nFaces 750; + startFace 45280; + } + bottomAir_minX + { + type wall; + nFaces 0; + startFace 46030; + } + bottomAir_maxX + { + type wall; + nFaces 0; + startFace 46030; + } + bottomAir_minY + { + type wall; + nFaces 0; + startFace 46030; + } + bottomAir_minZ + { + type wall; + nFaces 0; + startFace 46030; + } + bottomAir_maxZ + { + type wall; + nFaces 0; + startFace 46030; + } + bottomAir_bottomAir_to_rightSolid + { + type wall; + nFaces 0; + startFace 46030; + } + bottomAir_bottomAir_to_leftSolid + { + type wall; + nFaces 0; + startFace 46030; + } + bottomAir_bottomAir_to_heater + { + type wall; + nFaces 0; + startFace 46030; + } + topAir_maxY + { + type wall; + nFaces 0; + startFace 46030; + } + topAir_minX + { + type wall; + nFaces 0; + startFace 46030; + } + topAir_maxX + { + type wall; + nFaces 0; + startFace 46030; + } + topAir_minZ + { + type wall; + nFaces 0; + startFace 46030; + } + topAir_maxZ + { + type wall; + nFaces 0; + startFace 46030; + } + topAir_topAir_to_rightSolid + { + type wall; + nFaces 0; + startFace 46030; + } + topAir_topAir_to_heater + { + type wall; + nFaces 0; + startFace 46030; + } + topAir_topAir_to_leftSolid + { + type wall; + nFaces 0; + startFace 46030; + } + leftSolid_minX + { + type wall; + nFaces 0; + startFace 46030; + } + leftSolid_minZ + { + type wall; + nFaces 0; + startFace 46030; + } + leftSolid_maxZ + { + type wall; + nFaces 0; + startFace 46030; + } + leftSolid_leftSolid_to_bottomAir + { + type wall; + nFaces 0; + startFace 46030; + } + leftSolid_leftSolid_to_heater + { + type wall; + nFaces 0; + startFace 46030; + } + leftSolid_leftSolid_to_topAir + { + type wall; + nFaces 0; + startFace 46030; + } + rightSolid_maxX + { + type wall; + nFaces 0; + startFace 46030; + } + rightSolid_minZ + { + type wall; + nFaces 0; + startFace 46030; + } + rightSolid_maxZ + { + type wall; + nFaces 0; + startFace 46030; + } + rightSolid_rightSolid_to_bottomAir + { + type wall; + nFaces 0; + startFace 46030; + } + rightSolid_rightSolid_to_topAir + { + type wall; + nFaces 0; + startFace 46030; + } + rightSolid_rightSolid_to_heater + { + type wall; + nFaces 0; + startFace 46030; + } + heater_minY + { + type wall; + nFaces 0; + startFace 46030; + } + heater_minZ + { + type wall; + nFaces 0; + startFace 46030; + } + heater_maxZ + { + type wall; + nFaces 0; + startFace 46030; + } + heater_heater_to_topAir + { + type wall; + nFaces 0; + startFace 46030; + } + heater_heater_to_rightSolid + { + type wall; + nFaces 0; + startFace 46030; + } + heater_heater_to_leftSolid + { + type wall; + nFaces 0; + startFace 46030; + } + heater_heater_to_bottomAir + { + type wall; + nFaces 0; + startFace 46030; } ) diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict index 7c23c87b2..afd07dde1 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict @@ -102,21 +102,21 @@ dictionaryReplacement { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } bottomAir_to_heater { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } bottomAir_to_rightSolid { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict index d112d2bdb..4f6ec95cb 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict @@ -43,7 +43,7 @@ dictionaryReplacement { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } @@ -51,21 +51,21 @@ dictionaryReplacement { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } heater_to_rightSolid { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } heater_to_topAir { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } } @@ -115,7 +115,7 @@ dictionaryReplacement } } - K + Kappa { internalField uniform 80; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes index 0698fa0a9..c45fbbe2f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes @@ -32,7 +32,7 @@ divSchemes laplacianSchemes { default none; - laplacian(K,T) Gauss linear limited 0.333; + laplacian(Kappa,T) Gauss linear limited 0.333; } interpolationSchemes diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict index 556a1dfc1..ae47d3fb7 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict @@ -41,7 +41,7 @@ dictionaryReplacement { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } @@ -49,14 +49,14 @@ dictionaryReplacement { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } leftSolid_to_topAir { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } } @@ -101,7 +101,7 @@ dictionaryReplacement } } - K + Kappa { internalField uniform 80; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes index 0698fa0a9..c45fbbe2f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes @@ -32,7 +32,7 @@ divSchemes laplacianSchemes { default none; - laplacian(K,T) Gauss linear limited 0.333; + laplacian(Kappa,T) Gauss linear limited 0.333; } interpolationSchemes diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict index 57849dec6..899636c1f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict @@ -41,21 +41,21 @@ dictionaryReplacement { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } rightSolid_to_bottomAir { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } rightSolid_to_topAir { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } } @@ -100,7 +100,7 @@ dictionaryReplacement } } - K + Kappa { internalField uniform 80; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes index 0698fa0a9..c45fbbe2f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes @@ -32,7 +32,7 @@ divSchemes laplacianSchemes { default none; - laplacian(K,T) Gauss linear limited 0.333; + laplacian(Kappa,T) Gauss linear limited 0.333; } interpolationSchemes diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict index c76f287e9..afdedcbf3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict @@ -103,7 +103,7 @@ dictionaryReplacement { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } @@ -111,14 +111,14 @@ dictionaryReplacement { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } topAir_to_rightSolid { type solidWallMixedTemperatureCoupled; neighbourFieldName T; - K K; + Kappa Kappa; value $internalField; } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun index bb2152e8b..58a131c60 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun @@ -24,7 +24,7 @@ done # remove solid fields from fluid regions (important for post-processing) for i in bottomAir topAir do - rm -f 0*/$i/{cp,K,rho} + rm -f 0*/$i/{cp,Kappa,rho} done for i in bottomAir topAir heater leftSolid rightSolid diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict index b2ca54ebb..fc12d2aa5 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict @@ -57,7 +57,7 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffle; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict index 489b309ef..9321eccfd 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict @@ -47,7 +47,7 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffle; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } minY @@ -72,7 +72,7 @@ dictionaryReplacement } } - K + Kappa { internalField uniform 80; diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes index 8e39b579c..57b67d2f5 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes @@ -32,7 +32,7 @@ divSchemes laplacianSchemes { default none; - laplacian(K,T) Gauss linear limited 0.333; + laplacian(Kappa,T) Gauss linear limited 0.333; } interpolationSchemes diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict index 4546c2441..afc84ec1e 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict @@ -43,7 +43,7 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffle; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } } @@ -63,7 +63,7 @@ dictionaryReplacement } } - K + Kappa { internalField uniform 80; diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict index 980f81a1f..48d111191 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict @@ -43,7 +43,7 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffle; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } } @@ -63,7 +63,7 @@ dictionaryReplacement } } - K + Kappa { internalField uniform 80; diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict index 3bee6bacc..a3229aa91 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict @@ -68,7 +68,7 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffle; neighbourFieldName T; - K K; + Kappa Kappa; value uniform 300; } } diff --git a/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/0_org/U b/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/0_org/U index 85d19dad6..c4025c3cf 100644 --- a/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/0_org/U +++ b/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/0_org/U @@ -31,6 +31,7 @@ boundaryField setDeadCellValue yes; deadCellValue (0 0 0); + value uniform (0 0 0); } inlet diff --git a/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/controlDict b/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/controlDict index 61cd83548..4f257f382 100644 --- a/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/controlDict +++ b/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/controlDict @@ -44,23 +44,6 @@ timePrecision 6; runTimeModifiable yes; -libs -( - "libfoam.so" - "libincompressibleTransportModels.so" - "libcompressibleTurbulenceModel.so" - "libincompressibleRASModels.so" - // "libimmersedBoundary.so" - // "libimmersedBoundaryTurbulence.so" - - "libtriSurface.so" - "libmeshTools.so" - "libsampling.so" - "libsurfMesh.so" - "libimmersedBoundary.so" - "libimmersedBoundaryTurbulence.so" -); - functions ( forces diff --git a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/controlDict b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/controlDict index a97981e33..105ca3497 100644 --- a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/controlDict +++ b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/controlDict @@ -46,16 +46,6 @@ timePrecision 6; runTimeModifiable yes; -libs -( - "libfoam.so" - "libtriSurface.so" - "libmeshTools.so" - "libsampling.so" - "libsurfMesh.so" - "libimmersedBoundary.so" -); - functions ( forces diff --git a/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/controlDict b/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/controlDict index 3d0a8488f..1d0401ca3 100644 --- a/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/controlDict +++ b/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/controlDict @@ -50,16 +50,6 @@ adjustTimeStep no; maxCo 0.2; -// libs -// ( -// "libfoam.so" -// "libtriSurface.so" -// "libmeshTools.so" -// "libsampling.so" -// "libsurfMesh.so" -// "libimmersedBoundary.so" -// ); - functions ( forces diff --git a/tutorials/immersedBoundary/cylinderInChannelPotential/system/controlDict b/tutorials/immersedBoundary/cylinderInChannelPotential/system/controlDict index adb23cba8..3df6fcb18 100644 --- a/tutorials/immersedBoundary/cylinderInChannelPotential/system/controlDict +++ b/tutorials/immersedBoundary/cylinderInChannelPotential/system/controlDict @@ -48,16 +48,6 @@ adjustTimeStep no; maxCo 0.2; -libs -( - "libfoam.so" - "libtriSurface.so" - "libmeshTools.so" - "libsampling.so" - "libsurfMesh.so" - "libimmersedBoundary.so" -); - // functions // ( // immersedBoundaryForce diff --git a/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/controlDict b/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/controlDict index 65603e106..786842475 100644 --- a/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/controlDict +++ b/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/controlDict @@ -44,21 +44,6 @@ timePrecision 6; runTimeModifiable yes; -libs -( - "libfoam.so" - "libincompressibleTransportModels.so" - "libcompressibleTurbulenceModel.so" - "libincompressibleRASModels.so" - - "libtriSurface.so" - "libmeshTools.so" - "libsampling.so" - "libsurfMesh.so" - "libimmersedBoundary.so" - "libimmersedBoundaryTurbulence.so" -); - functions ( forces