diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousSolid/setPorousRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousSolid/setPorousRegionSolidFields.H index 102ba89a09..bbbd079ef2 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousSolid/setPorousRegionSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousSolid/setPorousRegionSolidFields.H @@ -9,8 +9,8 @@ tmp tcp = thermo.Cp(); const volScalarField& cp = tcp(); - tmp tkappa = thermo.K(); - //tmp tkappa = thermo.directionalK()*betav; + tmp tkappa = thermo.kappa(); + //tmp tkappa = thermo.directionalKappa()*betav; const volScalarField& kappa = tkappa(); //const volSymmTensorField& K = tK(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H index 7ff98e6211..73269420c0 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H @@ -7,7 +7,7 @@ tmp tcp = thermo.Cp(); const volScalarField& cp = tcp(); - tmp tkappa = thermo.K(); + tmp tkappa = thermo.kappa(); //tmp tkappa = thermo.directionalkappa(); const volScalarField& kappa = tkappa(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/porousSolid/setPorousRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/porousSolid/setPorousRegionSolidFields.H index f4c7081e9b..6f4834000d 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/porousSolid/setPorousRegionSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/porousSolid/setPorousRegionSolidFields.H @@ -9,8 +9,8 @@ tmp tcp = thermo.Cp(); const volScalarField& cp = tcp(); - tmp tkappa = thermo.K(); - //tmp tkappa = thermo.directionalK()*betav; + tmp tkappa = thermo.kappa(); + //tmp tkappa = thermo.directionalKappa()*betav; const volScalarField& kappa = tkappa(); //const volSymmTensorField& K = tK(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H index 8cf6f1c38c..47bd9dad9a 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H @@ -7,9 +7,9 @@ tmp tcp = thermo.Cp(); const volScalarField& cp = tcp(); - tmp tkappa = thermo.K(); + tmp tkappa = thermo.kappa(); const volScalarField& kappa = tkappa(); - //tmp tkappa = thermo.directionalK(); + //tmp tkappa = thermo.directionalKappa(); //const volSymmTensorField& kappa = tkappa(); volScalarField& T = thermo.T(); diff --git a/applications/utilities/postProcessing/wall/solidWallHeatFlux/solidWallHeatFlux.C b/applications/utilities/postProcessing/wall/solidWallHeatFlux/solidWallHeatFlux.C index f728a626b1..281107856e 100644 --- a/applications/utilities/postProcessing/wall/solidWallHeatFlux/solidWallHeatFlux.C +++ b/applications/utilities/postProcessing/wall/solidWallHeatFlux/solidWallHeatFlux.C @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) forAll(wallHeatFlux.boundaryField(), patchi) { wallHeatFlux.boundaryField()[patchi] = - thermo().K(patchi) + thermo().kappa(patchi) *T.boundaryField()[patchi].snGrad(); if (isA(mesh.boundary()[patchi])) diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C index dd779a7d4e..99b19f0ad8 100644 --- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C +++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C @@ -151,15 +151,15 @@ const tmp noPyrolysis::Cp() const } -const volScalarField& noPyrolysis::kappa() const +const volScalarField& noPyrolysis::kappaRad() const { - return (solidThermo_->kappa()); + return (solidThermo_->kappaRad()); } -const volScalarField& noPyrolysis::K() const +const volScalarField& noPyrolysis::kappa() const { - return (solidThermo_->K()); + return (solidThermo_->kappa()); } diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H index 7a32de6a99..0be1645fa6 100644 --- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H +++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H @@ -124,10 +124,10 @@ public: virtual const tmp Cp() const; //- Return the region absorptivity [1/m] - virtual const volScalarField& kappa() const; + virtual const volScalarField& kappaRad() const; //- Return the region thermal conductivity [W/m/k] - virtual const volScalarField& K() const; + virtual const volScalarField& kappa() const; //- Return the total gas mass flux to primary region [kg/m2/s] virtual const surfaceScalarField& phiGas() const; diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H index 90ca858763..42305f06bb 100644 --- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H +++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H @@ -218,10 +218,10 @@ public: virtual const tmp Cp() const = 0; //- Return the region absorptivity [1/m] - virtual const volScalarField& kappa() const = 0; + virtual const volScalarField& kappaRad() const = 0; //- Return the region thermal conductivity [W/m/k] - virtual const volScalarField& K() const = 0; + virtual const volScalarField& kappa() const = 0; //- Return the total gas mass flux to primary region [kg/m2/s] virtual const surfaceScalarField& phiGas() const = 0; diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C index 5086053344..eb99d40067 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C @@ -126,7 +126,7 @@ void reactingOneDim::updateQr() const label cellI = cells[k]; const point& Cf1 = regionMesh().cellCentres()[cellI]; const scalar delta = mag(Cf1 - Cf0); - kappaInt += kappa_[cellI]*delta; + kappaInt += kappaRad_[cellI]*delta; Qr_[cellI] = Qr0*exp(-kappaInt); Cf0 = Cf1; } @@ -294,7 +294,7 @@ void reactingOneDim::solveEnergy() fvScalarMatrix TEqn ( fvm::ddt(rhoCp, T_) - - fvm::laplacian(K_, T_) + - fvm::laplacian(kappa_, T_) == chemistrySh_ + fvc::div(phiQr) @@ -347,8 +347,8 @@ reactingOneDim::reactingOneDim(const word& modelType, const fvMesh& mesh) pyrolysisModel(modelType, mesh), solidChemistry_(solidChemistryModel::New(regionMesh())), solidThermo_(solidChemistry_->solidThermo()), + kappaRad_(solidThermo_.kappaRad()), kappa_(solidThermo_.kappa()), - K_(solidThermo_.K()), rho_(solidThermo_.rho()), Ys_(solidThermo_.composition().Y()), T_(solidThermo_.T()), @@ -449,8 +449,8 @@ reactingOneDim::reactingOneDim pyrolysisModel(modelType, mesh, dict), solidChemistry_(solidChemistryModel::New(regionMesh())), solidThermo_(solidChemistry_->solidThermo()), + kappaRad_(solidThermo_.kappaRad()), kappa_(solidThermo_.kappa()), - K_(solidThermo_.K()), rho_(solidThermo_.rho()), Ys_(solidThermo_.composition().Y()), T_(solidThermo_.T()), @@ -584,7 +584,7 @@ scalar reactingOneDim::solidRegionDiffNo() const surfaceScalarField KrhoCpbyDelta ( regionMesh().surfaceInterpolation::deltaCoeffs() - * fvc::interpolate(K_) + * fvc::interpolate(kappa_) / fvc::interpolate(Cp()*rho_) ); @@ -619,15 +619,15 @@ const tmp reactingOneDim::Cp() const } -const volScalarField& reactingOneDim::kappa() const +const volScalarField& reactingOneDim::kappaRad() const { - return kappa_; + return kappaRad_; } -const volScalarField& reactingOneDim::K() const +const volScalarField& reactingOneDim::kappa() const { - return K_; + return kappa_; } diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H index ed1bd9fa0d..8cfcc7ce74 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H @@ -84,10 +84,10 @@ protected: // Reference to solid thermo properties //- Absorption coefficient [1/m] - const volScalarField& kappa_; + const volScalarField& kappaRad_; //- Thermal conductivity [W/m/K] - const volScalarField& K_; + const volScalarField& kappa_; //- Density [kg/m3] volScalarField& rho_; @@ -230,10 +230,10 @@ public: virtual const tmp Cp() const; //- Return the region absorptivity [1/m] - virtual const volScalarField& kappa() const; + virtual const volScalarField& kappaRad() const; //- Return the region thermal conductivity [W/m/k] - virtual const volScalarField& K() const; + virtual const volScalarField& kappa() const; //- Return the total gas mass flux to primary region [kg/m2/s] virtual const surfaceScalarField& phiGas() const; diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H index 83e3162c57..980fc85935 100644 --- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H +++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H @@ -35,7 +35,7 @@ Description // Coupled BC. neighbourFieldName T; - K basicThermo; + kappa basicThermo; KName none; @@ -57,10 +57,10 @@ Description //- thermo properties rho rho [1 -3 0 0 0 0 0] 80; Cp Cp [0 2 -2 -1 0 0 0] 15; - K K [1 1 -3 -1 0 0 0] 0.01; + kappa kappa [1 1 -3 -1 0 0 0] 0.01; //- radiative properties - kappa kappa [0 -1 0 0 0 0 0] 0; + kappaRad kappaRad [0 -1 0 0 0 0 0] 0; sigmaS sigmaS [0 -1 0 0 0 0 0] 0; emissivity emissivity [0 0 0 0 0 0 0] 1; diff --git a/src/regionModels/thermoBaffleModels/noThermo/noThermo.C b/src/regionModels/thermoBaffleModels/noThermo/noThermo.C index 0d78e27cbc..28214923b8 100644 --- a/src/regionModels/thermoBaffleModels/noThermo/noThermo.C +++ b/src/regionModels/thermoBaffleModels/noThermo/noThermo.C @@ -95,9 +95,9 @@ const tmp noThermo::Cp() const ); } -const volScalarField& noThermo::kappa() const +const volScalarField& noThermo::kappaRad() const { - FatalErrorIn("const volScalarField& noThermo::kappa() const") + FatalErrorIn("const volScalarField& noThermo::kappaRad() const") << "kappa field not available for " << type() << abort(FatalError); return volScalarField::null(); } @@ -111,9 +111,9 @@ const volScalarField& noThermo::rho() const } -const volScalarField& noThermo::K() const +const volScalarField& noThermo::kappa() const { - FatalErrorIn("const volScalarField& noThermo::K() const") + FatalErrorIn("const volScalarField& noThermo::kappa() const") << "K field not available for " << type() << abort(FatalError); return volScalarField::null(); } diff --git a/src/regionModels/thermoBaffleModels/noThermo/noThermo.H b/src/regionModels/thermoBaffleModels/noThermo/noThermo.H index 053519162e..f816e0fac3 100644 --- a/src/regionModels/thermoBaffleModels/noThermo/noThermo.H +++ b/src/regionModels/thermoBaffleModels/noThermo/noThermo.H @@ -105,7 +105,7 @@ public: virtual const tmp Cp() const; //- Return solid absortivity [1/m] - virtual const volScalarField& kappa() const; + virtual const volScalarField& kappaRad() const; //- Return the film mean temperature [K] virtual const volScalarField& T() const; @@ -114,7 +114,7 @@ public: virtual const volScalarField& rho() const; //- Return thermal conductivity [W/m/K] - virtual const volScalarField& K() const; + virtual const volScalarField& kappa() const; // Evolution diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C index d251bc64e0..9f5a19b3ae 100644 --- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C +++ b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C @@ -96,7 +96,7 @@ void thermoBaffle2D::solveEnergy() volScalarField& Q = tQ(); volScalarField rhoCp("rhoCp", thermo_->rho()*thermo_->Cp()()); - volScalarField K("K", thermo_->K()); + volScalarField kappa("kappa", thermo_->kappa()); //If region is one-dimension variable thickness @@ -119,7 +119,7 @@ void thermoBaffle2D::solveEnergy() rhoCp[cellId] *= delta_.value()/thickness_[localFaceI]; - K[cellId] *= delta_.value()/thickness_[localFaceI]; + kappa[cellId] *= delta_.value()/thickness_[localFaceI]; } } } @@ -131,7 +131,7 @@ void thermoBaffle2D::solveEnergy() fvScalarMatrix TEqn ( fvm::ddt(rhoCp, T_) - - fvm::laplacian(K, T_) + - fvm::laplacian(kappa, T_) == Q ); @@ -316,9 +316,9 @@ const tmp thermoBaffle2D::Cp() const } -const volScalarField& thermoBaffle2D::kappa() const +const volScalarField& thermoBaffle2D::kappaRad() const { - return thermo_->kappa(); + return thermo_->kappaRad(); } @@ -328,9 +328,9 @@ const volScalarField& thermoBaffle2D::rho() const } -const volScalarField& thermoBaffle2D::K() const +const volScalarField& thermoBaffle2D::kappa() const { - return thermo_->K(); + return thermo_->kappa(); } @@ -362,7 +362,7 @@ void thermoBaffle2D::info() const ( mag(regionMesh().Sf().boundaryField()[patchI]) * pT.snGrad() - * thermo_->K(patchI) + * thermo_->kappa(patchI) ) << endl; } } diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H index bf915ec1a2..ac7fdc1cc5 100644 --- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H +++ b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H @@ -155,7 +155,7 @@ public: virtual const tmp Cp() const; //- Return solid absortivity [1/m] - virtual const volScalarField& kappa() const; + virtual const volScalarField& kappaRad() const; //- Return the film mean temperature [K] virtual const volScalarField& T() const; @@ -164,7 +164,7 @@ public: virtual const volScalarField& rho() const; //- Return thermal conductivity [W/m/K] - virtual const volScalarField& K() const; + virtual const volScalarField& kappa() const; // Helper functions diff --git a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H index ee076ec523..a5a6cfef7c 100644 --- a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H +++ b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H @@ -211,10 +211,10 @@ public: virtual const tmp Cp() const = 0; //- Return the region absorptivity [1/m] - virtual const volScalarField& kappa() const = 0; + virtual const volScalarField& kappaRad() const = 0; //- Return the region thermal conductivity [W/m/k] - virtual const volScalarField& K() const = 0; + virtual const volScalarField& kappa() const = 0; // Evolution diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C index 5e62a55eee..58108d1fbf 100644 --- a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C +++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C @@ -78,11 +78,11 @@ Foam::basicSolidThermo::basicSolidThermo(const fvMesh& mesh) mesh, dimMass/dimVolume ), - kappa_ + kappaRad_ ( IOobject ( - "kappa", + "kappaRad", mesh.time().timeName(), mesh, IOobject::NO_READ, @@ -165,11 +165,11 @@ Foam::basicSolidThermo::basicSolidThermo mesh, dimMass/dimVolume ), - kappa_ + kappaRad_ ( IOobject ( - "kappa", + "kappaRad", mesh.time().timeName(), mesh, IOobject::NO_READ, @@ -239,9 +239,9 @@ Foam::volScalarField& Foam::basicSolidThermo::rho() } -const Foam::volScalarField& Foam::basicSolidThermo::kappa() const +const Foam::volScalarField& Foam::basicSolidThermo::kappaRad() const { - return kappa_; + return kappaRad_; } diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H index 3def4a0ee5..2f4d2a1f99 100644 --- a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H +++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H @@ -73,7 +73,7 @@ protected: volScalarField rho_; //- Absorption coefficient [1/m] - volScalarField kappa_; + volScalarField kappaRad_; //- Scatter coeffcient [1/m] volScalarField sigmaS_; @@ -157,7 +157,7 @@ public: virtual volScalarField& rho(); //- Absorption coefficient [1/m] - virtual const volScalarField& kappa() const; + virtual const volScalarField& kappaRad() const; //- Emissivity coefficient virtual const volScalarField& sigmaS() const; @@ -169,10 +169,10 @@ public: // Derived thermal properties //- Thermal conductivity [W/m/K] - virtual tmp K() const = 0; + virtual tmp kappa() const = 0; //- Thermal conductivity [W/m/K] - virtual tmp directionalK() const = 0; + virtual tmp directionalKappa() const = 0; //- Specific heat capacity [J/kg/K] virtual tmp Cp() const = 0; @@ -187,10 +187,10 @@ public: // Per patch calculation //- Thermal conductivity [W//m/K] - virtual tmp K(const label patchI) const = 0; + virtual tmp kappa(const label patchI) const = 0; //- Thermal conductivity [W//m/K] - virtual tmp directionalK(const label) const = 0; + virtual tmp directionalKappa(const label) const = 0; //- Specific heat capacity [J/kg/K)] virtual tmp Cp(const label patchI) const = 0; diff --git a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C index ee20901aac..65ce650bc7 100644 --- a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C +++ b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C @@ -46,36 +46,36 @@ Foam::constSolidThermo::constSolidThermo : basicSolidThermo(mesh, dict), dict_(dict.subDict(typeName + "Coeffs")), - constK_(dimensionedScalar(dict_.lookup("K"))), - K_ + constKappa_(dimensionedScalar(dict_.lookup("kappa"))), + kappa_ ( IOobject ( - "K", + "kappa", mesh.time().timeName(), mesh, IOobject::NO_READ, IOobject::NO_WRITE ), mesh, - constK_ + constKappa_ ), constRho_(dimensionedScalar(dict_.lookup("rho"))), constCp_(dimensionedScalar(dict_.lookup("Cp"))), constHf_(dimensionedScalar(dict_.lookup("Hf"))), constEmissivity_(dimensionedScalar(dict_.lookup("emissivity"))), - constKappa_(dimensionedScalar(dict_.lookup("kappa"))), + constKappaRad_(dimensionedScalar(dict_.lookup("kappaRad"))), constSigmaS_(dimensionedScalar(dict_.lookup("sigmaS"))) { read(); - K_ = constK_; + kappa_ = constKappa_; rho_ = constRho_; emissivity_ = constEmissivity_; - kappa_ = constKappa_; + kappaRad_ = constKappaRad_; sigmaS_ = constSigmaS_; } @@ -85,36 +85,36 @@ Foam::constSolidThermo::constSolidThermo(const fvMesh& mesh) : basicSolidThermo(mesh), dict_(subDict(typeName + "Coeffs")), - constK_(dimensionedScalar(dict_.lookup("K"))), - K_ + constKappa_(dimensionedScalar(dict_.lookup("kappa"))), + kappa_ ( IOobject ( - "K", + "kappa", mesh.time().timeName(), mesh, IOobject::NO_READ, IOobject::NO_WRITE ), mesh, - constK_ + constKappa_ ), constRho_(dimensionedScalar(dict_.lookup("rho"))), constCp_(dimensionedScalar(dict_.lookup("Cp"))), constHf_(dimensionedScalar(dict_.lookup("Hf"))), constEmissivity_(dimensionedScalar(dict_.lookup("emissivity"))), - constKappa_(dimensionedScalar(dict_.lookup("kappa"))), + constKappaRad_(dimensionedScalar(dict_.lookup("kappaRad"))), constSigmaS_(dimensionedScalar(dict_.lookup("sigmaS"))) { read(); - K_ = constK_; + kappa_ = constKappa_; rho_ = constRho_; emissivity_ = constEmissivity_; - kappa_ = constKappa_; + kappaRad_ = constKappaRad_; sigmaS_ = constSigmaS_; } @@ -132,26 +132,26 @@ void Foam::constSolidThermo::correct() {} -Foam::tmp Foam::constSolidThermo::K() const +Foam::tmp Foam::constSolidThermo::kappa() const { - return K_; + return kappa_; } -Foam::tmp Foam::constSolidThermo::directionalK() const +Foam::tmp Foam::constSolidThermo::directionalKappa() const { dimensionedSymmTensor t ( - constK_.name(), - constK_.dimensions(), + constKappa_.name(), + constKappa_.dimensions(), symmTensor ( - constK_.value(), + constKappa_.value(), 0.0, 0.0, - constK_.value(), + constKappa_.value(), 0.0, - constK_.value() + constKappa_.value() ) ); return tmp @@ -160,7 +160,7 @@ Foam::tmp Foam::constSolidThermo::directionalK() const ( IOobject ( - "K", + "kappa", mesh_.time().timeName(), mesh_, IOobject::NO_READ, @@ -215,28 +215,28 @@ Foam::tmp Foam::constSolidThermo::Hf() const } -Foam::tmp Foam::constSolidThermo::K +Foam::tmp Foam::constSolidThermo::kappa ( const label patchI ) const { - return (K_.boundaryField()[patchI]); + return (kappa_.boundaryField()[patchI]); } -Foam::tmp Foam::constSolidThermo::directionalK +Foam::tmp Foam::constSolidThermo::directionalKappa ( const label patchI ) const { symmTensor t ( - constK_.value(), + constKappa_.value(), 0.0, 0.0, - constK_.value(), + constKappa_.value(), 0.0, - constK_.value() + constKappa_.value() ); return tmp ( @@ -291,19 +291,19 @@ bool Foam::constSolidThermo::read(const dictionary& dict) { constRho_ = dimensionedScalar(dict.lookup("rho")); constCp_ = dimensionedScalar(dict.lookup("Cp")); - constK_ = dimensionedScalar(dict.lookup("K")); + constKappa_ = dimensionedScalar(dict.lookup("kappa")); constHf_ = dimensionedScalar(dict.lookup("Hf")); constEmissivity_ = dimensionedScalar(dict.lookup("emissivity")); - constKappa_ = dimensionedScalar(dict_.lookup("kappa")); + constKappaRad_ = dimensionedScalar(dict_.lookup("kappaRad")); constSigmaS_ = dimensionedScalar(dict_.lookup("sigmaS")); Info<< "Constructed constSolidThermo with" << nl << " rho : " << constRho_ << nl << " Cp : " << constCp_ << nl - << " K : " << constK_ << nl + << " kappa : " << constKappa_ << nl << " Hf : " << constHf_ << nl << " emissivity : " << constEmissivity_ << nl - << " kappa : " << constKappa_ << nl + << " kappaRad : " << constKappaRad_ << nl << " sigmaS : " << constSigmaS_ << nl << endl; @@ -316,9 +316,9 @@ bool Foam::constSolidThermo::writeData(Ostream& os) const bool ok = basicSolidThermo::writeData(os); os.writeKeyword("rho") << constRho_ << token::END_STATEMENT << nl; os.writeKeyword("Cp") << constCp_ << token::END_STATEMENT << nl; - os.writeKeyword("K") << constK_ << token::END_STATEMENT << nl; - os.writeKeyword("Hf") << constHf_ << token::END_STATEMENT << nl; os.writeKeyword("kappa") << constKappa_ << token::END_STATEMENT << nl; + os.writeKeyword("Hf") << constHf_ << token::END_STATEMENT << nl; + os.writeKeyword("kappaRad") << constKappaRad_ << token::END_STATEMENT << nl; os.writeKeyword("sigmaS") << constSigmaS_ << token::END_STATEMENT << nl; os.writeKeyword("emissivity") << constEmissivity_ << token::END_STATEMENT << nl; diff --git a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H index 75a5068552..c5a7bd6a92 100644 --- a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H +++ b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H @@ -58,10 +58,10 @@ private: dictionary dict_; //- Constant thermal conductivity [W/(m.K)] - dimensionedScalar constK_; + dimensionedScalar constKappa_; //- Thermal conductivity field[W/(m.K)] - volScalarField K_; + volScalarField kappa_; //- Density [kg/m3] dimensionedScalar constRho_; @@ -76,7 +76,7 @@ private: dimensionedScalar constEmissivity_; //- Absorptivity [1/m] - dimensionedScalar constKappa_; + dimensionedScalar constKappaRad_; //- Scatter [1/m] dimensionedScalar constSigmaS_; @@ -110,10 +110,10 @@ public: // Derived thermal properties //- Thermal conductivity [W/m/K] - virtual tmp K() const; + virtual tmp kappa() const; //- Thermal conductivity [W/m/K] - virtual tmp directionalK() const; + virtual tmp directionalKappa() const; //- Specific heat capacity [J/(kg.K)] virtual tmp Cp() const; @@ -125,10 +125,10 @@ public: // Per patch calculation //- Thermal conductivity [W//m/K] - virtual tmp K(const label patchI) const; + virtual tmp kappa(const label patchI) const; //- Thermal conductivity [W//m/K] - virtual tmpdirectionalK(const label) const; + virtual tmpdirectionalKappa(const label) const; //- Specific heat capacity [J/kg/K)] virtual tmp Cp(const label patchI) const; diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C index e2185e45f5..e4a9ea2fa7 100644 --- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C +++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C @@ -59,11 +59,11 @@ Foam::directionalKSolidThermo::directionalKSolidThermo ) : interpolatedSolidThermo(mesh, typeName + "Coeffs", dict), - directionalK_ + directionalKappa_ ( IOobject ( - "K", + "kappa", mesh_.time().timeName(), mesh_, IOobject::NO_READ, @@ -93,11 +93,11 @@ Foam::directionalKSolidThermo::directionalKSolidThermo Foam::directionalKSolidThermo::directionalKSolidThermo(const fvMesh& mesh) : interpolatedSolidThermo(mesh, typeName + "Coeffs"), - directionalK_ + directionalKappa_ ( IOobject ( - "K", + "kappa", mesh_.time().timeName(), mesh_, IOobject::NO_READ, @@ -134,7 +134,8 @@ Foam::directionalKSolidThermo::~directionalKSolidThermo() void Foam::directionalKSolidThermo::init() { - KValues_ = Field(subDict(typeName + "Coeffs").lookup("KValues")); + kappaValues_ = + Field(subDict(typeName + "Coeffs").lookup("kappaValues")); // Determine transforms for cell centres forAll(mesh_.C(), cellI) @@ -362,51 +363,51 @@ void Foam::directionalKSolidThermo::correct() Foam::tmp -Foam::directionalKSolidThermo::directionalK() const +Foam::directionalKSolidThermo::directionalKappa() const { - return directionalK_; + return directionalKappa_; } void Foam::directionalKSolidThermo::calculate() { // Correct directionalK - Field localK + Field localKappa ( interpolateXY ( T_.internalField(), TValues_, - KValues_ + kappaValues_ ) ); // Transform into global coordinate system transformField ( - directionalK_.internalField(), + directionalKappa_.internalField(), ccTransforms_.internalField(), - localK + localKappa ); - forAll(directionalK_.boundaryField(), patchI) + forAll(directionalKappa_.boundaryField(), patchI) { - directionalK_.boundaryField()[patchI] == this->directionalK(patchI)(); + directionalKappa_.boundaryField()[patchI] == this->directionalKappa(patchI)(); } } -Foam::tmp Foam::directionalKSolidThermo::directionalK +Foam::tmp Foam::directionalKSolidThermo::directionalKappa ( const label patchI ) const { const fvPatchScalarField& patchT = T_.boundaryField()[patchI]; - Field localK(interpolateXY(patchT, TValues_, KValues_)); + Field localKappa(interpolateXY(patchT, TValues_, kappaValues_)); - tmp tglobalK(new symmTensorField(localK.size())); - transformField(tglobalK(), ccTransforms_.boundaryField()[patchI], localK); + tmp tglobalK(new symmTensorField(localKappa.size())); + transformField(tglobalK(), ccTransforms_.boundaryField()[patchI], localKappa); return tglobalK; } @@ -421,7 +422,7 @@ bool Foam::directionalKSolidThermo::read() bool Foam::directionalKSolidThermo::read(const dictionary& dict) { coordSys_ = coordinateSystem(dict, mesh_); - KValues_ = Field(subDict(typeName + "Coeffs").lookup("KValues")); + kappaValues_ = Field(subDict(typeName + "Coeffs").lookup("kappaValues")); return true; } @@ -429,7 +430,8 @@ bool Foam::directionalKSolidThermo::read(const dictionary& dict) bool Foam::directionalKSolidThermo::writeData(Ostream& os) const { bool ok = interpolatedSolidThermo::writeData(os); - os.writeKeyword("KValues") << KValues_ << token::END_STATEMENT << nl; + os.writeKeyword("kappaValues") + << kappaValues_ << token::END_STATEMENT << nl; return ok && os.good(); } diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H index c5c8ad9cc8..ae3a48adb3 100644 --- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H +++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H @@ -54,10 +54,10 @@ class directionalKSolidThermo // Private data //- Thermal conductivity [W/(m.K)] - volSymmTensorField directionalK_; + volSymmTensorField directionalKappa_; //- Thermal conductivity vector - Field KValues_; + Field kappaValues_; //- Coordinate system used for the directional properties coordinateSystem coordSys_; @@ -117,26 +117,26 @@ public: //- Access functions //- Thermal conductivity [W/m/K] - virtual tmp K() const + virtual tmp kappa() const { - notImplemented("directionalKSolidThermo::K() const"); + notImplemented("directionalKSolidThermo::kappa() const"); return tmp(NULL); } //- Thermal conductivity [W/m/K] - virtual tmp directionalK() const; + virtual tmp directionalKappa() const; // Per patch calculation //- Thermal conductivity [W//m/K] - virtual tmp K(const label patchI) const + virtual tmp kappa(const label patchI) const { - notImplemented("directionalKSolidThermo::K(const label) const"); + notImplemented("directionalKSolidThermo::kappa(const label) const"); return tmp(NULL); } //- Thermal conductivity [W//m/K] - virtual tmp directionalK(const label) const; + virtual tmp directionalKappa(const label) const; // I-O diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C index 65b95738dc..79224cbabf 100644 --- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C +++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C @@ -39,8 +39,8 @@ Foam::interpolateSolid::interpolateSolid(const dictionary& dict) << " cp : " << cpValues_ << nl << " Hf : " << HfValues_ << nl << " emissivity : " << emissivityValues_ << nl - << " kappa : " << kappaValues_ << nl - << " sigmaS : " << sigmaSValues_ << nl + << " kappaRad : " << kappaRadValues_ << nl + << " sigmaS : " << sigmaSValues_ << nl << endl; @@ -88,7 +88,7 @@ bool Foam::interpolateSolid::writeData(Ostream& os) const os.writeKeyword("HfValues") << HfValues_ << token::END_STATEMENT << nl; os.writeKeyword("emissivityValues") << emissivityValues_ << token::END_STATEMENT << nl; - os.writeKeyword("kappaValues") << kappaValues_ + os.writeKeyword("kappaRadValues") << kappaRadValues_ << token::END_STATEMENT << nl; os.writeKeyword("sigmaSValues") << sigmaSValues_ << token::END_STATEMENT << nl; @@ -103,7 +103,7 @@ bool Foam::interpolateSolid::read(const dictionary& dict) TValues_ = Field(dict.lookup("TValues")); rhoValues_ = Field(dict.lookup("rhoValues")); cpValues_ = Field(dict.lookup("cpValues")); - kappaValues_ = Field(dict.lookup("kappaValues")); + kappaRadValues_ = Field(dict.lookup("kappaRadValues")); sigmaSValues_ = Field(dict.lookup("sigmaSValues")); HfValues_ = Field(dict.lookup("HfValues")); emissivityValues_ = Field(dict.lookup("emissivityValues")); diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H index 269f982a09..81c2644b31 100644 --- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H +++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H @@ -63,7 +63,7 @@ protected: Field emissivityValues_; - Field kappaValues_; + Field kappaRadValues_; Field sigmaSValues_; diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C index def8dc6160..2d3790c989 100644 --- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C +++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C @@ -69,7 +69,7 @@ Foam::tmp Foam::interpolatedSolidThermo::emissivity } -Foam::tmp Foam::interpolatedSolidThermo::kappa +Foam::tmp Foam::interpolatedSolidThermo::kappaRad ( const label patchI ) const @@ -82,7 +82,7 @@ Foam::tmp Foam::interpolatedSolidThermo::kappa ( T_.boundaryField()[patchI], TValues_, - kappaValues_ + kappaRadValues_ ) ) ); @@ -178,16 +178,16 @@ void Foam::interpolatedSolidThermo::calculate() // Correct absorptivity - kappa_.internalField() = interpolateXY + kappaRad_.internalField() = interpolateXY ( T_.internalField(), TValues_, - kappaValues_ + kappaRadValues_ ); - forAll(kappa_.boundaryField(), patchI) + forAll(kappaRad_.boundaryField(), patchI) { - kappa_.boundaryField()[patchI] == this->kappa(patchI)(); + kappaRad_.boundaryField()[patchI] == this->kappaRad(patchI)(); } diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H index 23e112db5a..e35b124c3e 100644 --- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H +++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H @@ -69,7 +69,7 @@ private: tmp sigmaS(const label) const; //- Absorption coefficient [1/m] - tmp kappa(const label) const; + tmp kappaRad(const label) const; //- Emissivity [] tmp emissivity(const label) const; diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C index 1b15c88946..8a673ccf4b 100644 --- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C +++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C @@ -57,11 +57,11 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo ) : interpolatedSolidThermo(mesh, typeName + "Coeffs", dict), - K_ + kappa_ ( IOobject ( - "K", + "kappa", mesh.time().timeName(), mesh, IOobject::NO_READ, @@ -70,7 +70,10 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo mesh, dimEnergy/dimTime/(dimLength*dimTemperature) ), - KValues_ (Field(subDict(typeName + "Coeffs").lookup("KValues"))) + kappaValues_ + ( + Field(subDict(typeName + "Coeffs").lookup("kappaValues")) + ) { correct(); } @@ -79,11 +82,11 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo Foam::isotropicKSolidThermo::isotropicKSolidThermo(const fvMesh& mesh) : interpolatedSolidThermo(mesh, typeName + "Coeffs"), - K_ + kappa_ ( IOobject ( - "K", + "kappa", mesh.time().timeName(), mesh, IOobject::NO_READ, @@ -92,7 +95,10 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo(const fvMesh& mesh) mesh, dimEnergy/dimTime/(dimLength*dimTemperature) ), - KValues_ (Field(subDict(typeName + "Coeffs").lookup("KValues"))) + kappaValues_ + ( + Field(subDict(typeName + "Coeffs").lookup("kappaValues")) + ) { correct(); } @@ -101,20 +107,20 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo(const fvMesh& mesh) void Foam::isotropicKSolidThermo::correct() { // Correct K - K_.internalField() = interpolateXY + kappa_.internalField() = interpolateXY ( T_.internalField(), TValues_, - KValues_ + kappaValues_ ); - forAll(K_.boundaryField(), patchI) + forAll(kappa_.boundaryField(), patchI) { - K_.boundaryField()[patchI] == interpolateXY + kappa_.boundaryField()[patchI] == interpolateXY ( T_.boundaryField()[patchI], TValues_, - KValues_ + kappaValues_ ); } @@ -122,31 +128,31 @@ void Foam::isotropicKSolidThermo::correct() } -Foam::tmp Foam::isotropicKSolidThermo::K() const +Foam::tmp Foam::isotropicKSolidThermo::kappa() const { - return K_; + return kappa_; } -Foam::tmp Foam::isotropicKSolidThermo::K +Foam::tmp Foam::isotropicKSolidThermo::kappa ( const label patchI ) const { - return K_.boundaryField()[patchI]; + return kappa_.boundaryField()[patchI]; } bool Foam::isotropicKSolidThermo::read() { - KValues_ = Field(subDict(typeName + "Coeffs").lookup("KValues")); + kappaValues_ = Field(subDict(typeName + "Coeffs").lookup("kappaValues")); return true; } bool Foam::isotropicKSolidThermo::writeData(Ostream& os) const { - os.writeKeyword("KValues") << KValues_ << token::END_STATEMENT << nl; + os.writeKeyword("kappaValues") << kappaValues_ << token::END_STATEMENT << nl; bool ok = interpolatedSolidThermo::writeData(os); return ok && os.good(); diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H index d6acac3e91..8daff60560 100644 --- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H +++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H @@ -53,10 +53,10 @@ class isotropicKSolidThermo // Private data //- Thermal conductivity [W/(m.K)] - volScalarField K_; + volScalarField kappa_; //- Thermal conductivity vector - Field KValues_; + Field kappaValues_; public: @@ -87,26 +87,26 @@ public: // Access functions //- Constant access to K - virtual tmp K() const; + virtual tmp kappa() const; //- Thermal conductivity [W/m/K] - virtual tmp directionalK() const + virtual tmp directionalKappa() const { - notImplemented("directionalKSolidThermo::directionalK() const"); + notImplemented("directionalKSolidThermo::directionalKappa() const"); return tmp(NULL); } // Per patch calculation //- Thermal conductivity [W//m/K] - virtual tmp K(const label patchI) const; + virtual tmp kappa(const label patchI) const; //- Thermal conductivity [W//m/K] - virtual tmp directionalK(const label) const + virtual tmp directionalKappa(const label) const { notImplemented ( - "directionalKSolidThermo::directionalK(const label) const" + "directionalKSolidThermo::directionalKappa(const label) const" ); return tmp(NULL); } diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/basicSolidMixture/basicSolidMixture.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/basicSolidMixture/basicSolidMixture.H index 631f4da7de..14f8b7be12 100644 --- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/basicSolidMixture/basicSolidMixture.H +++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/basicSolidMixture/basicSolidMixture.H @@ -114,13 +114,13 @@ public: virtual scalar rho(scalar T, label celli) const = 0; //- Absorption coefficient - virtual scalar kappa(scalar T, label celli) const = 0; + virtual scalar kappaRad(scalar T, label celli) const = 0; //- Scatter coefficient virtual scalar sigmaS(scalar T, label celli) const = 0; //- Thermal conductivity - virtual scalar K(scalar T, label celli) const = 0; + virtual scalar kappa(scalar T, label celli) const = 0; //- Emissivity coefficient virtual scalar emissivity(scalar T, label celli) const = 0; diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C index 79304dbdbb..e76b7d83fd 100644 --- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C +++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C @@ -159,7 +159,7 @@ Foam::scalar Foam::multiComponentSolidMixture::h template -Foam::scalar Foam::multiComponentSolidMixture::kappa +Foam::scalar Foam::multiComponentSolidMixture::kappaRad ( scalar T, label celli ) const @@ -167,7 +167,7 @@ Foam::scalar Foam::multiComponentSolidMixture::kappa scalar tmp = 0.0; forAll(solidData_, i) { - tmp += solidData_[i].kappa(T)*X(i, celli, T); + tmp += solidData_[i].kappaRad(T)*X(i, celli, T); } return tmp; } @@ -189,7 +189,7 @@ Foam::scalar Foam::multiComponentSolidMixture::sigmaS template -Foam::scalar Foam::multiComponentSolidMixture::K +Foam::scalar Foam::multiComponentSolidMixture::kappa ( scalar T, label celli ) const @@ -197,7 +197,7 @@ Foam::scalar Foam::multiComponentSolidMixture::K scalar tmp = 0.0; forAll(solidData_, i) { - tmp += solidData_[i].K(T)*X(i, celli, T); + tmp += solidData_[i].kappa(T)*X(i, celli, T); } return tmp; } diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H index 3a633da5cd..75b908bb9d 100644 --- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H +++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H @@ -99,13 +99,13 @@ public: virtual scalar rho(scalar T, label celli) const; //- Absorption coefficient - virtual scalar kappa(scalar T, label celli) const; + virtual scalar kappaRad(scalar T, label celli) const; //- Scatter coefficient virtual scalar sigmaS(scalar T, label celli) const; //- Thermal conductivity - virtual scalar K(scalar T, label celli) const; + virtual scalar kappa(scalar T, label celli) const; //- Emissivity coefficient virtual scalar emissivity(scalar T, label celli) const; diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C index 0f78d32337..1239bb16ee 100644 --- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C +++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C @@ -34,8 +34,8 @@ void Foam::solidMixtureThermo::calculate() { scalarField& rhoCells = rho_.internalField(); - scalarField& KCells = K_.internalField(); scalarField& kappaCells = kappa_.internalField(); + scalarField& kappaRadCells = kappaRad_.internalField(); scalarField& sigmaSCells = sigmaS_.internalField(); scalarField& emissivityCells = emissivity_.internalField(); @@ -44,9 +44,9 @@ void Foam::solidMixtureThermo::calculate() forAll(iT, celli) { rhoCells[celli] = MixtureType::rho(iT[celli], celli); - kappaCells[celli] = MixtureType::kappa(iT[celli], celli); + kappaRadCells[celli] = MixtureType::kappaRad(iT[celli], celli); sigmaSCells[celli] = MixtureType::sigmaS(iT[celli], celli); - KCells[celli] = MixtureType::K(iT[celli], celli); + kappaCells[celli] = MixtureType::kappa(iT[celli], celli); emissivityCells[celli] = MixtureType::emissivity(iT[celli], celli); } @@ -55,8 +55,8 @@ void Foam::solidMixtureThermo::calculate() forAll(bT, patchI) { rho_.boundaryField()[patchI] == this->rho(patchI)(); - K_.boundaryField()[patchI] == this->K(patchI)(); kappa_.boundaryField()[patchI] == this->kappa(patchI)(); + kappaRad_.boundaryField()[patchI] == this->kappaRad(patchI)(); sigmaS_.boundaryField()[patchI] == this->sigmaS(patchI)(); emissivity_.boundaryField()[patchI] == this->emissivity(patchI)(); } @@ -109,25 +109,25 @@ Foam::tmp Foam::solidMixtureThermo::sigmaS template -Foam::tmp Foam::solidMixtureThermo::kappa +Foam::tmp Foam::solidMixtureThermo::kappaRad ( const label patchI ) const { const scalarField& patchT = T_.boundaryField()[patchI]; - const polyPatch& pp = mesh_.boundaryMesh()[patchI]; + const polyPatch& pp = mesh_.boundaryMesh()[patchI]; const labelUList& cells = pp.faceCells(); - tmp tKappa(new scalarField(patchT.size())); - scalarField& kappa = tKappa(); + tmp tKappaRad(new scalarField(patchT.size())); + scalarField& kappaRad = tKappaRad(); forAll(patchT, celli) { - kappa[celli] = - MixtureType::kappa(patchT[celli], cells[celli]); + kappaRad[celli] = + MixtureType::kappaRad(patchT[celli], cells[celli]); } - return tKappa; + return tKappaRad; } @@ -163,11 +163,11 @@ Foam::solidMixtureThermo::solidMixtureThermo : basicSolidThermo(mesh), MixtureType(*this, mesh), - K_ + kappa_ ( IOobject ( - "K", + "kappa", mesh.time().timeName(), mesh, IOobject::NO_READ, @@ -190,11 +190,11 @@ Foam::solidMixtureThermo::solidMixtureThermo : basicSolidThermo(mesh, dict), MixtureType(*this, mesh), - K_ + kappa_ ( IOobject ( - "K", + "kappa", mesh.time().timeName(), mesh, IOobject::NO_READ, @@ -225,9 +225,9 @@ void Foam::solidMixtureThermo::correct() template -Foam::tmp Foam::solidMixtureThermo::K() const +Foam::tmp Foam::solidMixtureThermo::kappa() const { - return K_; + return kappa_; } @@ -352,7 +352,7 @@ Foam::solidMixtureThermo::Hf() const template -Foam::tmp Foam::solidMixtureThermo::K +Foam::tmp Foam::solidMixtureThermo::kappa ( const label patchI ) const @@ -361,15 +361,15 @@ Foam::tmp Foam::solidMixtureThermo::K const polyPatch& pp = mesh_.boundaryMesh()[patchI]; const labelUList& cells = pp.faceCells(); - tmp tK(new scalarField(patchT.size())); - scalarField& K = tK(); + tmp tkappa(new scalarField(patchT.size())); + scalarField& kappa = tkappa(); forAll(patchT, celli) { - K[celli] = MixtureType::K(patchT[celli], cells[celli]); + kappa[celli] = MixtureType::kappa(patchT[celli], cells[celli]); } - return tK; + return tkappa; } diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H index 100d371b99..488563ff02 100644 --- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H +++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H @@ -57,7 +57,7 @@ protected: // Protected data //- Thermal conductivity [W/m/K] - volScalarField K_; + volScalarField kappa_; private: @@ -74,7 +74,7 @@ private: tmp sigmaS(const label patchI) const; - tmp kappa(const label patchI) const; + tmp kappaRad(const label patchI) const; tmp emissivity(const label patchI) const; @@ -118,12 +118,12 @@ public: // Derived thermal properties //- Thermal conductivity [W/m/K] - virtual tmp K() const; + virtual tmp kappa() const; //- Thermal conductivity [W/m/K] - virtual tmp directionalK() const + virtual tmp directionalKappa() const { - notImplemented("solidMixtureThermo::directionalK() const"); + notImplemented("solidMixtureThermo::directionalKappa() const"); return tmp(NULL); } @@ -140,14 +140,14 @@ public: // Per patch calculation //- Thermal conductivity [W/(m.K)] - virtual tmp K(const label patchI) const; + virtual tmp kappa(const label patchI) const; //- Thermal conductivity [W/(m.K)] - virtual tmp directionalK(const label) const + virtual tmp directionalKappa(const label) const { notImplemented ( - "solidMixtureThermo::directionalK(const label) const" + "solidMixtureThermo::directionalKappa(const label) const" ); return tmp(NULL); } diff --git a/src/thermophysicalModels/solid/radiation/const/constSolidRad.C b/src/thermophysicalModels/solid/radiation/const/constSolidRad.C index 93fda8663e..9a1ecdc89f 100644 --- a/src/thermophysicalModels/solid/radiation/const/constSolidRad.C +++ b/src/thermophysicalModels/solid/radiation/const/constSolidRad.C @@ -37,7 +37,7 @@ template constSolidRad::constSolidRad(const dictionary& dict) : thermo(dict), - kappa_(readScalar(dict.subDict("radiation").lookup("kappa"))), + kappaRad_(readScalar(dict.subDict("radiation").lookup("kappaRad"))), sigmaS_(readScalar(dict.subDict("radiation").lookup("sigmaS"))), emissivity_(readScalar(dict.subDict("radiation").lookup("emissivity"))) {} @@ -49,7 +49,7 @@ template Ostream& operator<<(Ostream& os, const constSolidRad& pg) { os << static_cast(pg); - os << tab << pg.kappa_ << tab << pg.sigmaS_ << tab << pg.emissivity_; + os << tab << pg.kappaRad_ << tab << pg.sigmaS_ << tab << pg.emissivity_; os.check("Ostream& operator<<(Ostream& os, const constSolidRad& st)"); return os; diff --git a/src/thermophysicalModels/solid/radiation/const/constSolidRad.H b/src/thermophysicalModels/solid/radiation/const/constSolidRad.H index 6919763077..0e65de99c9 100644 --- a/src/thermophysicalModels/solid/radiation/const/constSolidRad.H +++ b/src/thermophysicalModels/solid/radiation/const/constSolidRad.H @@ -62,7 +62,7 @@ class constSolidRad // Private data //- Absorption coefficient - scalar kappa_; + scalar kappaRad_; //- Scattering coefficient scalar sigmaS_; @@ -75,7 +75,7 @@ class constSolidRad inline constSolidRad ( const thermo& t, - const scalar kappa, + const scalar kappaRad, const scalar sigmaS, const scalar emissivity ); @@ -101,7 +101,7 @@ public: // Member functions //- Return absorption coefficient [1/m] - inline scalar kappa(scalar T) const; + inline scalar kappaRad(scalar T) const; //- Return scattering [1/m] inline scalar sigmaS(scalar T) const; diff --git a/src/thermophysicalModels/solid/radiation/const/constSolidRadI.H b/src/thermophysicalModels/solid/radiation/const/constSolidRadI.H index 667fae827a..d60dce0834 100644 --- a/src/thermophysicalModels/solid/radiation/const/constSolidRadI.H +++ b/src/thermophysicalModels/solid/radiation/const/constSolidRadI.H @@ -36,13 +36,13 @@ template inline constSolidRad::constSolidRad ( const thermo& t, - const scalar kappa, + const scalar kappaRad, const scalar sigmaS, const scalar emissivity ) : thermo(t), - kappa_(kappa), + kappaRad_(kappaRad), sigmaS_(sigmaS), emissivity_(emissivity) {} @@ -59,7 +59,7 @@ inline constSolidRad::constSolidRad ) : thermo(name, pg), - kappa_(pg.kappa_), + kappaRad_(pg.kappaRad_), sigmaS_(pg.sigmaS_), emissivity_(pg.emissivity_) {} @@ -82,9 +82,9 @@ inline autoPtr > constSolidRad::New(Istream& is) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -inline scalar constSolidRad::kappa(scalar) const +inline scalar constSolidRad::kappaRad(scalar) const { - return kappa_; + return kappaRad_; } diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransport.C b/src/thermophysicalModels/solid/transport/const/constSolidTransport.C index 1995333659..dd34e20522 100644 --- a/src/thermophysicalModels/solid/transport/const/constSolidTransport.C +++ b/src/thermophysicalModels/solid/transport/const/constSolidTransport.C @@ -32,7 +32,7 @@ template Foam::constSolidTransport::constSolidTransport(const dictionary& dict) : thermo(dict), - K_(readScalar(dict.subDict("transport").lookup("K"))) + kappa_(readScalar(dict.subDict("transport").lookup("kappa"))) {} @@ -46,7 +46,7 @@ Foam::Ostream& Foam::operator<< ) { operator<<(os, static_cast(ct)); - os << tab << ct.K_; + os << tab << ct.kappa_; os.check("Ostream& operator<<(Ostream& os,const constSolidTransport& ct)"); diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransport.H b/src/thermophysicalModels/solid/transport/const/constSolidTransport.H index c86e82be6f..fb8b40e5c3 100644 --- a/src/thermophysicalModels/solid/transport/const/constSolidTransport.H +++ b/src/thermophysicalModels/solid/transport/const/constSolidTransport.H @@ -65,7 +65,7 @@ class constSolidTransport // Private data //- Constant thermal conductivity. - scalar K_; + scalar kappa_; // Private Member Functions @@ -74,7 +74,7 @@ class constSolidTransport inline constSolidTransport ( const thermo& t, - const scalar k + const scalar kappa ); @@ -93,7 +93,7 @@ public: // Member functions //- Thermal conductivity [W/mK] - inline scalar K(const scalar T) const; + inline scalar kappa(const scalar T) const; // Ostream Operator diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H b/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H index a500b37567..a2b538e505 100644 --- a/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H +++ b/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H @@ -29,11 +29,11 @@ template inline Foam::constSolidTransport::constSolidTransport ( const thermo& t, - const scalar k + const scalar kappa ) : thermo(t), - K_(k) + kappa_(kappa) {} @@ -45,16 +45,16 @@ inline Foam::constSolidTransport::constSolidTransport ) : thermo(name, ct), - K_(ct.K_) + kappa_(ct.kappa_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -inline Foam::scalar Foam::constSolidTransport::K(const scalar T) const +inline Foam::scalar Foam::constSolidTransport::kappa(const scalar T) const { - return K_; + return kappa_; } diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C index 233f94e2ff..8aea92bf06 100644 --- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C +++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C @@ -35,12 +35,12 @@ Foam::exponentialSolidTransport::exponentialSolidTransport ) : thermo(dict), - K0_(0.0), + kappa0_(0.0), n0_(0.0), Tref_(0.0) { const dictionary& subDict = dict.subDict("transport"); - K0_ = readScalar(subDict.lookup("K0")); + kappa0_ = readScalar(subDict.lookup("kappa0")); n0_ = readScalar(subDict.lookup("n0")); Tref_ = readScalar(subDict.lookup("Tref")); } @@ -55,7 +55,7 @@ Foam::Ostream& Foam::operator<< ) { operator<<(os, static_cast(et)); - os << tab << et.K0_ << tab << et.n0_ << tab << et.Tref_; + os << tab << et.kappa0_ << tab << et.n0_ << tab << et.Tref_; os.check ( diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H index d699bce99a..5e29f4f729 100644 --- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H +++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H @@ -64,7 +64,7 @@ class exponentialSolidTransport // Private data //- Constant thermal coefficient. - scalar K0_; + scalar kappa0_; //- Exponent coefficient scalar n0_; @@ -79,7 +79,7 @@ class exponentialSolidTransport inline exponentialSolidTransport ( const thermo& t, - const scalar K0, + const scalar kappa0, const scalar n0, const scalar Tref ); @@ -104,7 +104,7 @@ public: // Member functions //- Thermal conductivity [W/mK] - inline scalar K(const scalar T) const; + inline scalar kappa(const scalar T) const; // Ostream Operator diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H index b47a0faca0..e46eec9165 100644 --- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H +++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H @@ -29,13 +29,13 @@ template inline Foam::exponentialSolidTransport::exponentialSolidTransport ( const thermo& t, - const scalar K0, + const scalar kappa0, const scalar n0, const scalar Tref ) : thermo(t), - K0_(K0), + kappa0_(kappa0), n0_(n0), Tref_(Tref) {} @@ -49,7 +49,7 @@ inline Foam::exponentialSolidTransport::exponentialSolidTransport ) : thermo(name, ct), - K0_(ct.K0_), + kappa0_(ct.kappa0_), n0_(ct.n0_), Tref_(ct.Tref_) {} @@ -58,12 +58,12 @@ inline Foam::exponentialSolidTransport::exponentialSolidTransport // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -inline Foam::scalar Foam::exponentialSolidTransport::K +inline Foam::scalar Foam::exponentialSolidTransport::kappa ( const scalar T ) const { - return (K0_*pow(T/Tref_, n0_)); + return (kappa0_*pow(T/Tref_, n0_)); } diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C index b52baebd36..0a82b2424a 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C @@ -86,7 +86,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField ) : mixedFvPatchScalarField(ptf, p, iF, mapper), - temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()), + temperatureCoupledBase(patch(), ptf.KMethod(), ptf.kappaName()), oldMode_(unknown), q_(ptf.q_, mapper), h_(ptf.h_, mapper), @@ -181,7 +181,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField ) : mixedFvPatchScalarField(tppsf, iF), - temperatureCoupledBase(patch(), tppsf.KMethod(), tppsf.KName()), + temperatureCoupledBase(patch(), tppsf.KMethod(), tppsf.kappaName()), oldMode_(tppsf.oldMode_), q_(tppsf.q_), h_(tppsf.h_), @@ -199,7 +199,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs() } scalarField q(size(), 0.0); - scalarField KDelta(K(*this)*patch().deltaCoeffs()); + scalarField KDelta(kappa(*this)*patch().deltaCoeffs()); if (oldMode_ == fixedHeatFlux) { @@ -223,7 +223,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs() { if (q[i] > 0) //in { - this->refGrad()[i] = q[i]/K(*this)()[i]; + this->refGrad()[i] = q[i]/kappa(*this)()[i]; this->refValue()[i] = 0.0; this->valueFraction()[i] = 0.0; } @@ -239,7 +239,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs() if (debug) { - scalar Q = gSum(K(*this)*patch().magSf()*snGrad()); + scalar Q = gSum(kappa(*this)*patch().magSf()*snGrad()); Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H index 53a466ac0b..9b461334cb 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H @@ -34,12 +34,12 @@ Description myWallPatch { type externalWallHeatFluxTemperature; - K solidThermo; // solidThermo or lookup + kappa solidThermo; // solidThermo or lookup q uniform 1000; // Heat flux / [W/m2] Ta uniform 300.0; // Tambient temperature /[K] h uniform 10.0; // Heat transfer coeff /[W/Km2] value uniform 300.0; // Initial temperature / [K] - KName none; + kappaName none; } Note: diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C index c3562426e3..0258ff87f5 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C @@ -58,12 +58,12 @@ Foam::temperatureCoupledBase::temperatureCoupledBase ( const fvPatch& patch, const word& calculationType, - const word& KName + const word& kappaName ) : patch_(patch), method_(KMethodTypeNames_[calculationType]), - KName_(KName) + kappaName_(kappaName) {} @@ -74,14 +74,14 @@ Foam::temperatureCoupledBase::temperatureCoupledBase ) : patch_(patch), - method_(KMethodTypeNames_.read(dict.lookup("K"))), - KName_(dict.lookup("KName")) + method_(KMethodTypeNames_.read(dict.lookup("kappa"))), + kappaName_(dict.lookup("kappaName")) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::temperatureCoupledBase::K +Foam::tmp Foam::temperatureCoupledBase::kappa ( const scalarField& Tp ) const @@ -111,7 +111,7 @@ Foam::tmp Foam::temperatureCoupledBase::K ( "solidThermophysicalProperties" ); - return thermo.K(patch_.index()); + return thermo.kappa(patch_.index()); } break; @@ -124,23 +124,23 @@ Foam::tmp Foam::temperatureCoupledBase::K ( "solidThermophysicalProperties" ); - return n & thermo.directionalK(patch_.index()) & n; + return n & thermo.directionalKappa(patch_.index()) & n; } break; case LOOKUP: { - if (mesh.objectRegistry::foundObject(KName_)) + if (mesh.objectRegistry::foundObject(kappaName_)) { - return patch_.lookupPatchField(KName_); + return patch_.lookupPatchField(kappaName_); } else if ( - mesh.objectRegistry::foundObject(KName_) + mesh.objectRegistry::foundObject(kappaName_) ) { const symmTensorField& KWall = - patch_.lookupPatchField(KName_); + patch_.lookupPatchField(kappaName_); const vectorField n(patch_.nf()); @@ -149,12 +149,12 @@ Foam::tmp Foam::temperatureCoupledBase::K else { FatalErrorIn("temperatureCoupledBase::K() const") - << "Did not find field " << KName_ + << "Did not find field " << kappaName_ << " on mesh " << mesh.name() << " patch " << patch_.name() << endl - << "Please set 'K' to one of " << KMethodTypeNames_.toc() - << " and 'KName' to the name of the volScalar" - << " or volSymmTensor field (if K=lookup)" + << "Please set 'kappa' to one of " << KMethodTypeNames_.toc() + << " and 'kappaName' to the name of the volScalar" + << " or volSymmTensor field (if kappa=lookup)" << exit(FatalError); return scalarField(0); @@ -163,11 +163,11 @@ Foam::tmp Foam::temperatureCoupledBase::K default: { - FatalErrorIn("temperatureCoupledBase::K() const") + FatalErrorIn("temperatureCoupledBase::kappa() const") << "Unimplemented method " << method_ << endl - << "Please set 'K' to one of " << KMethodTypeNames_.toc() - << " and 'KName' to the name of the volScalar" - << " or volSymmTensor field (if K=lookup)" + << "Please set 'kappa' to one of " << KMethodTypeNames_.toc() + << " and 'kappaName' to the name of the volScalar" + << " or volSymmTensor field (if kappa=lookup)" << exit(FatalError); } break; @@ -178,9 +178,9 @@ Foam::tmp Foam::temperatureCoupledBase::K void Foam::temperatureCoupledBase::write(Ostream& os) const { - os.writeKeyword("K") << KMethodTypeNames_[method_] + os.writeKeyword("kappa") << KMethodTypeNames_[method_] << token::END_STATEMENT << nl; - os.writeKeyword("KName") << KName_ << token::END_STATEMENT << nl; + os.writeKeyword("kappaName") << kappaName_ << token::END_STATEMENT << nl; } diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H index 2a78d6b2e5..8c3ec69615 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H @@ -27,13 +27,14 @@ Class Description Common functions for use in temperature coupled boundaries. For now only - K() : heat conduction at patch. Gets supplied how to lookup/calculate K: + kappa() : heat conduction at patch. Gets supplied how to lookup/calculate + kappa: - 'lookup' : lookup volScalarField (or volSymmTensorField) with name - 'basicThermo' : use basicThermo and default compressible::turbulenceModel - to calculate K - - 'solidThermo' : use basicSolidThermo K() - - 'directionalSolidThermo' directionalK() + to calculate kappa + - 'solidThermo' : use basicSolidThermo kappa() + - 'directionalSolidThermo' directionalKappa() SourceFiles temperatureCoupledBase.C @@ -59,7 +60,7 @@ namespace Foam class temperatureCoupledBase { public: - //- Type of supplied K + //- Type of supplied Kappa enum KMethodType { BASICTHERMO, @@ -81,7 +82,7 @@ private: const KMethodType method_; //- Name of thermal conductivity field (if looked up from database) - const word KName_; + const word kappaName_; public: @@ -113,13 +114,13 @@ public: } //- Name of thermal conductivity field - const word& KName() const + const word& kappaName() const { - return KName_; + return kappaName_; } //- Given patch temperature calculate corresponding K field - tmp K(const scalarField& Tp) const; + tmp kappa(const scalarField& Tp) const; //- Write void write(Ostream&) const; diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C index 9d1af41670..d9e3e6d40b 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C @@ -292,7 +292,7 @@ void temperatureThermoBaffle1DFvPatchScalarField::updateCoeffs() // Create fields for solid properties forAll(KDeltaw, i) { - KDeltaw[i] = solid_().K((Tp[i] + nbrTp[i])/2.0)/thickness_[i]; + KDeltaw[i] = solid_().kappa((Tp[i] + nbrTp[i])/2.0)/thickness_[i]; } const scalarField q diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H index 8ee1b01b9c..66bba6dded 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H @@ -114,9 +114,9 @@ class temperatureThermoBaffle1DFvPatchScalarField } - scalar K(const scalar T) const + scalar kappa(const scalar T) const { - return solidPtr_().K(T); + return solidPtr_().kappa(T); } }; diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C index d71cf18862..29757f1ea6 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C @@ -93,7 +93,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField ) : fixedGradientFvPatchScalarField(ptf, p, iF, mapper), - temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()), + temperatureCoupledBase(patch(), ptf.KMethod(), ptf.kappaName()), heatSource_(ptf.heatSource_), q_(ptf.q_, mapper) {} @@ -124,7 +124,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField ) : fixedGradientFvPatchScalarField(thftpsf), - temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.KName()), + temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.kappaName()), heatSource_(thftpsf.heatSource_), q_(thftpsf.q_) {} @@ -138,7 +138,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField ) : fixedGradientFvPatchScalarField(thftpsf, iF), - temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.KName()), + temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.kappaName()), heatSource_(thftpsf.heatSource_), q_(thftpsf.q_) {} @@ -188,12 +188,12 @@ void turbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs() case hsPower: { const scalar Ap = gSum(patch().magSf()); - gradient() = q_/(Ap*K(Tp)); + gradient() = q_/(Ap*kappa(Tp)); break; } case hsFlux: { - gradient() = q_/K(Tp); + gradient() = q_/kappa(Tp); break; } default: diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H index 7d63f14373..78f40e5a9d 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H @@ -36,7 +36,7 @@ Description type compressible::turbulentHeatFluxTemperature; heatSource flux; // power [W]; flux [W/m2] q uniform 10; // heat power or flux - K basicThermo; // calculate K by alphaEff*thermo.Cp + kappa basicThermo; // calculate kappa=alphaEff*thermo.Cp value uniform 300; // initial temperature value } diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C index a61959a976..850cc79f6e 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C @@ -68,7 +68,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField ) : mixedFvPatchScalarField(ptf, p, iF, mapper), - temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()), + temperatureCoupledBase(patch(), ptf.KMethod(), ptf.kappaName()), neighbourFieldName_(ptf.neighbourFieldName_) {} @@ -131,7 +131,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField ) : mixedFvPatchScalarField(wtcsf, iF), - temperatureCoupledBase(patch(), wtcsf.KMethod(), wtcsf.KName()), + temperatureCoupledBase(patch(), wtcsf.KMethod(), wtcsf.kappaName()), neighbourFieldName_(wtcsf.neighbourFieldName_) {} @@ -186,11 +186,11 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs() scalarField nbrIntFld(nbrField.patchInternalField()); distMap.distribute(nbrIntFld); - // Swap to obtain full local values of neighbour K*delta - scalarField nbrKDelta(nbrField.K(nbrField)*nbrPatch.deltaCoeffs()); + // Swap to obtain full local values of neighbour kappa*delta + scalarField nbrKDelta(nbrField.kappa(nbrField)*nbrPatch.deltaCoeffs()); distMap.distribute(nbrKDelta); - tmp myKDelta = K(*this)*patch().deltaCoeffs(); + tmp myKDelta = kappa(*this)*patch().deltaCoeffs(); // Both sides agree on @@ -219,7 +219,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs() if (debug) { - scalar Q = gSum(K(*this)*patch().magSf()*snGrad()); + scalar Q = gSum(kappa(*this)*patch().magSf()*snGrad()); Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H index c36830577d..d4164998ec 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H @@ -41,18 +41,20 @@ Description { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K lookup; - KName K; + kappa lookup; + kappaName kappa; value uniform 300; } Needs to be on underlying mapped(Wall)FvPatch. - Note: K : heat conduction at patch. Gets supplied how to lookup/calculate K: + Note: kappa : heat conduction at patch. Gets supplied how to lookup/calculate + kappa: - 'lookup' : lookup volScalarField (or volSymmTensorField) with name - - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K - - 'solidThermo' : use basicSolidThermo K() - - 'directionalSolidThermo' directionalK() + - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate + kappa + - 'solidThermo' : use basicSolidThermo kappa() + - 'directionalSolidThermo' directionalKappa() Note: runs in parallel with arbitrary decomposition. Uses mapped functionality to calculate exchange. diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C index 16f81bbeec..beec3b069c 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C @@ -67,7 +67,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField ) : mixedFvPatchScalarField(psf, p, iF, mapper), - temperatureCoupledBase(patch(), psf.KMethod(), psf.KName()), + temperatureCoupledBase(patch(), psf.KMethod(), psf.kappaName()), TnbrName_(psf.TnbrName_), QrNbrName_(psf.QrNbrName_), QrName_(psf.QrName_) @@ -134,7 +134,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField ) : mixedFvPatchScalarField(psf, iF), - temperatureCoupledBase(patch(), psf.KMethod(), psf.KName()), + temperatureCoupledBase(patch(), psf.KMethod(), psf.kappaName()), TnbrName_(psf.TnbrName_), QrNbrName_(psf.QrNbrName_), QrName_(psf.QrName_) @@ -182,11 +182,11 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs() // Swap to obtain full local values of neighbour K*delta - scalarField KDeltaNbr(nbrField.K(nbrField)*nbrPatch.deltaCoeffs()); + scalarField KDeltaNbr(nbrField.kappa(nbrField)*nbrPatch.deltaCoeffs()); distMap.distribute(KDeltaNbr); - scalarField KDelta(K(*this)*patch().deltaCoeffs()); + scalarField KDelta(kappa(*this)*patch().deltaCoeffs()); scalarField Qr(Tp.size(), 0.0); if (QrName_ != "none") diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H index 8f8b47c946..99f93ee8dd 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H @@ -35,8 +35,8 @@ Description { type compressible::turbulentTemperatureRadCoupledMixed; TNbr T; // name of T field on neighbour region - K lookup; - KName K; + kappa lookup; + KappaName kappa; QrNbr Qr; // or none. Name of Qr field on neighbour region Qr Qr; // or none. Name of Qr field on local region value uniform 300; @@ -44,12 +44,13 @@ Description Needs to be on underlying mapped(Wall)FvPatch. - Note: K : heat conduction at patch. Gets supplied how to lookup/calculate - K: + Note: kappa : heat conduction at patch. Gets supplied how to + lookup/calculate + kappa: - 'lookup' : lookup volScalarField (or volSymmTensorField) with name - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K - - 'solidThermo' : use basicSolidThermo K() - - 'directionalSolidThermo' directionalK() + - 'solidThermo' : use basicSolidThermo kappa() + - 'directionalSolidThermo' directionalKappa() Note: runs in parallel with arbitrary decomposition. Uses mapped functionality to calculate exchange. diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T index 5899c6d9a2..5e07713cdc 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T @@ -50,10 +50,10 @@ boundaryField { type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; - K basicThermo; + kappa basicThermo; QrNbr none; Qr Qr; - KName none; + kappaName none; value $internalField; } } diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T index a4187e29d7..900fa3ae76 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T @@ -41,8 +41,8 @@ boundaryField { type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; QrNbr Qr; Qr none; value uniform 298.15; diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/solidThermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/solidThermophysicalProperties index 1174ecfa25..7ed5edbfcb 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/solidThermophysicalProperties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/solidThermophysicalProperties @@ -26,12 +26,12 @@ vCoeffs { transport { - K 0.135; + kappa 0.135; } radiation { sigmaS 0.0; - kappa 0.0; //opaque + kappaRad 0.0; //opaque emissivity 0.17; } thermodynamics @@ -49,12 +49,12 @@ charCoeffs { transport { - K 0.4; + kappa 0.4; } radiation { sigmaS 0.0; - kappa 0.0; + kappaRad 0.0; emissivity 0.85; } thermodynamics diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict index 6391270926..767b28e659 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict @@ -24,8 +24,8 @@ dictionaryReplacement { type compressible::temperatureThermoBaffle; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict index a535343ee2..2546875331 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict @@ -94,12 +94,12 @@ dictionaryReplacement Qs uniform 100; // heat flux [W/m2] transport { - K 1.0; + kappa 1.0; } radiation { sigmaS 0; - kappa 0; + kappaRad 0; emissivity 0; } thermodynamics diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle index 6b4a777a53..194fa15adb 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle @@ -94,12 +94,12 @@ dictionaryReplacement Qs uniform 300; // heat flux [W/m2] transport { - K 1.0; + kappa 1.0; } radiation { sigmaS 0; - kappa 0; + kappaRad 0; emissivity 0; } thermodynamics diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion index 8c6c66145c..cada1b31ba 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion @@ -95,7 +95,7 @@ dictionaryReplacement // Coupled BC. neighbourFieldName T; - K basicThermo; + kappa basicThermo; KName none; @@ -117,10 +117,10 @@ dictionaryReplacement //- thermo properties rho rho [1 -3 0 0 0 0 0] 80; Cp Cp [0 2 -2 -1 0 0 0] 15; - K K [1 1 -3 -1 0 0 0] 0.01; + kappa kappa [1 1 -3 -1 0 0 0] 0.01; //- radiative properties - kappa kappa [0 -1 0 0 0 0 0] 0; + kappaRad kappaRad [0 -1 0 0 0 0 0] 0; sigmaS sigmaS [0 -1 0 0 0 0 0] 0; emissivity emissivity [0 0 0 0 0 0 0] 1; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun index b9137a48fa..3df6482952 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -37,7 +37,7 @@ do done # Run -#runParallel `getApplication` 4 +runParallel `getApplication` 4 # Reconstruct #for i in bottomAir topAir heater leftSolid rightSolid diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties index ec1061eb2d..36e744bd34 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties @@ -23,10 +23,10 @@ constSolidThermoCoeffs //- thermo properties rho rho [1 -3 0 0 0 0 0] 8000; Cp Cp [0 2 -2 -1 0 0 0] 450; - K K [1 1 -3 -1 0 0 0] 80; + kappa kappa [1 1 -3 -1 0 0 0] 80; //- radiation properties - kappa kappa [0 -1 0 0 0 0 0] 0; + kappaRad kappaRad [0 -1 0 0 0 0 0] 0; sigmaS sigmaS [0 -1 0 0 0 0 0] 0; emissivity emissivity [0 0 0 0 0 0 0] 0; @@ -41,11 +41,11 @@ isotropicKSolidThermoCoeffs TValues (100 1000); rhoValues (1000 1700); cpValues (1700 1700); - KValues (80 40); + kappaValues (80 40); //- radiation properties emissivityValues (1 1); - kappaValues (0 0); + kappaRadValues (0 0); sigmaSValues (0 0); //- chemical properties @@ -63,7 +63,7 @@ directionalKSolidThermoCoeffs TValues (100 1000); rhoValues (1000 1700); cpValues (1700 1700); - KValues ((10 10 10) (40 40 40)); + kappaValues ((10 10 10) (40 40 40)); coordinateSystem { @@ -81,7 +81,7 @@ directionalKSolidThermoCoeffs //- radiation properties emissivityValues (1 1); - kappaValues (1 1); + kappaRadValues (1 1); sigmaSValues (1 1); } @@ -94,14 +94,15 @@ pmmaCoeffs { transport { - K0 0.152; + + kappa0 0.152; n0 1.3; Tref 300; //K0*pow(T/Tref_, n0)) } radiation { sigmaS 0.0; - kappa 0.0; + kappaRad 0.0; emissivity 0.1; } thermodynamics @@ -121,7 +122,7 @@ charCoeffs { transport { - K0 0.4; + kappa0 0.4; n0 1.3; Tref 300; //K0*pow(T/Tref_, n0)) } @@ -129,7 +130,7 @@ charCoeffs radiation { sigmaS 0.0; - kappa 0.0; + kappaRad 0.0; emissivity 0.0; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict index af17b665a6..a736e341f6 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict @@ -57,8 +57,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K basicThermo; - KName none; + kappa basicThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict index ce32ac9f54..1222482e8f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict @@ -47,8 +47,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } minY diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict index 5425a5ec5a..c70f5391f6 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict @@ -43,8 +43,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict index 2bc26681f0..913adcf784 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict @@ -43,8 +43,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict index a64cb4027e..787c1147d8 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict @@ -68,8 +68,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K basicThermo; - KName none; + kappa basicThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict index 77d4692740..4c53b4cb8a 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict @@ -70,8 +70,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K basicThermo; - KName none; + kappa basicThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save index 1336cf0324..35bf28b902 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save @@ -57,8 +57,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K basicThermo; - KName none; + kappa basicThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict index 654df1e3df..1a44394717 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict @@ -48,8 +48,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } minY diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict index e4af521f71..fa798f65a5 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict @@ -43,8 +43,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/changeDictionaryDict index 16504fb92a..546b332138 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/changeDictionaryDict @@ -43,8 +43,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict index 3e91079163..e4f2256b3c 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict @@ -69,8 +69,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K basicThermo; - KName none; + kappa basicThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties index 54ca602eee..7aab5490fa 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties @@ -25,10 +25,10 @@ constSolidThermoCoeffs //- thermo properties rho rho [1 -3 0 0 0 0 0] 8000; Cp Cp [0 2 -2 -1 0 0 0] 450; - K K [1 1 -3 -1 0 0 0] 80; + kappa kappa [1 1 -3 -1 0 0 0] 80; //- radiation properties - kappa kappa [0 -1 0 0 0 0 0] 0; + kappaRad kappaRad [0 -1 0 0 0 0 0] 0; sigmaS sigmaS [0 -1 0 0 0 0 0] 0; emissivity emissivity [0 0 0 0 0 0 0] 1; @@ -43,11 +43,11 @@ isotropicKSolidThermoCoeffs TValues (100 1000); rhoValues (1000 1700); cpValues (1700 1700); - KValues (80 40); + kappaValues (80 40); //- radiation properties emissivityValues (1 1); - kappaValues (0 0); + kappaRadValues (0 0); sigmaSValues (0 0); //- chemical properties @@ -65,7 +65,7 @@ directionalKSolidThermoCoeffs TValues (100 1000); rhoValues (1700 1700); cpValues (1700 1700); - KValues ((10 10 10) (40 40 40)); + kappaValues ((10 10 10) (40 40 40)); coordinateSystem { @@ -83,7 +83,7 @@ directionalKSolidThermoCoeffs //- radiation properties emissivityValues (1 1); - kappaValues (1 1); + kappaRadValues (1 1); sigmaSValues (1 1); } @@ -96,14 +96,14 @@ pmmaCoeffs { transport { - K0 0.152; + kappa0 0.152; n0 1.3; Tref 300; //K0*pow(T/Tref_, n0)) } radiation { sigmaS 0.0; - kappa 0.0; + kappaRad 0.0; emissivity 0.1; } thermodynamics @@ -123,14 +123,14 @@ charCoeffs { transport { - K0 0.4; + kappa0 0.4; n0 1.3; Tref 300; //K0*pow(T/Tref_, n0)) } radiation { sigmaS 0.0; - kappa 0.0; + kappaRad 0.0; emissivity 0.0; } thermodynamics diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict index 77d580fe51..a13bf04501 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict @@ -57,8 +57,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K basicThermo; - KName none; + kappa basicThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict index ce32ac9f54..1222482e8f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict @@ -47,8 +47,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } minY diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict index 5425a5ec5a..c70f5391f6 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict @@ -43,8 +43,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict index 2bc26681f0..913adcf784 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict @@ -43,8 +43,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict index a64cb4027e..787c1147d8 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict @@ -68,8 +68,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K basicThermo; - KName none; + kappa basicThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties index b345dace24..b5e64d9029 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties @@ -25,10 +25,10 @@ constSolidThermoCoeffs //- thermo properties rho rho [1 -3 0 0 0 0 0] 8000; Cp Cp [0 2 -2 -1 0 0 0] 450; - K K [1 1 -3 -1 0 0 0] 80; + kappa kappa [1 1 -3 -1 0 0 0] 80; //- radiation properties - kappa kappa [0 -1 0 0 0 0 0] 0; + kappaRad kappaRad [0 -1 0 0 0 0 0] 0; sigmaS sigmaS [0 -1 0 0 0 0 0] 0; emissivity emissivity [0 0 0 0 0 0 0] 1; @@ -43,11 +43,11 @@ isotropicKSolidThermoCoeffs TValues (100 1000); rhoValues (1000 1700); cpValues (1700 1700); - KValues (80 40); + kappaValues (80 40); //- radiation properties emissivityValues (1 1); - kappaValues (0 0); + kappaRadValues (0 0); sigmaSValues (0 0); //- chemical properties @@ -65,7 +65,7 @@ directionalKSolidThermoCoeffs TValues (100 1000); rhoValues (1700 1700); cpValues (1700 1700); - KValues ((10 10 10) (40 40 40)); + kappaValues ((10 10 10) (40 40 40)); coordinateSystem { @@ -83,8 +83,8 @@ directionalKSolidThermoCoeffs //- radiation properties emissivityValues (1 1); - kappaValues (1 1); - sigmaSValues (1 1); + kappaRadValues (1 1); + sigmaSValues (1 1); } solidComponents @@ -96,7 +96,7 @@ pmmaCoeffs { transport { - K0 0.152; + kappa0 0.152; n0 1.3; Tref 300; //K0*pow(T/Tref_, n0)) } @@ -104,7 +104,7 @@ pmmaCoeffs radiation { sigmaS 0.0; - kappa 0.0; + kappaRad 0.0; emissivity 0.1; } @@ -126,7 +126,7 @@ charCoeffs { transport { - K0 0.4; + kappa0 0.4; n0 1.3; Tref 300; //K0*pow(T/Tref_, n0)) } @@ -134,7 +134,7 @@ charCoeffs radiation { sigmaS 0.0; - kappa 0.0; + kappaRad 0.0; emissivity 0.0; } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties index 004cda2c14..642d9523b5 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties @@ -25,10 +25,10 @@ constSolidThermoCoeffs //- thermo properties rho rho [1 -3 0 0 0 0 0] 8000; Cp Cp [0 2 -2 -1 0 0 0] 450; - K K [1 1 -3 -1 0 0 0] 80; + kappa kappa [1 1 -3 -1 0 0 0] 80; //- radiation properties - kappa kappa [0 -1 0 0 0 0 0] 0; + kappaRad kappaRad [0 -1 0 0 0 0 0] 0; sigmaS sigmaS [0 -1 0 0 0 0 0] 0; emissivity emissivity [0 0 0 0 0 0 0] 0.5; @@ -43,11 +43,11 @@ isotropicKSolidThermoCoeffs TValues (100 1000); rhoValues (1000 1700); cpValues (1700 1700); - KValues (80 40); + kappaValues (80 40); //- radiation properties emissivityValues (1 1); - kappaValues (0 0); + kappaRadValues (0 0); sigmaSValues (0 0); //- chemical properties @@ -65,7 +65,7 @@ directionalKSolidThermoCoeffs TValues (100 1000); rhoValues (1700 1700); cpValues (1700 1700); - KValues ((10 10 10) (40 40 40)); + kappaValues ((10 10 10) (40 40 40)); coordinateSystem { @@ -83,8 +83,8 @@ directionalKSolidThermoCoeffs //- radiation properties emissivityValues (1 1); - kappaValues (1 1); - sigmaSValues (1 1); + kappaRadValues (1 1); + sigmaSValues (1 1); } solidComponents @@ -96,7 +96,7 @@ pmmaCoeffs { transport { - K0 0.152; + kappa0 0.152; n0 1.3; Tref 300; //K0*pow(T/Tref_, n0)) } @@ -104,7 +104,7 @@ pmmaCoeffs radiation { sigmaS 0.0; - kappa 0.0; + kappaRad 0.0; emissivity 0.1; } @@ -126,7 +126,7 @@ charCoeffs { transport { - K0 0.4; + kappa0 0.4; n0 1.3; Tref 300; //K0*pow(T/Tref_, n0)) } @@ -134,7 +134,7 @@ charCoeffs radiation { sigmaS 0.0; - kappa 0.0; + kappaRad 0.0; emissivity 0.0; } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict index f08a1ebff8..fb0130ea25 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict @@ -55,10 +55,10 @@ dictionaryReplacement { type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; - K basicThermo; + kappa basicThermo; QrNbr none; Qr Qr; - KName none; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict index 476c666667..1a680f09a2 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict @@ -48,10 +48,10 @@ dictionaryReplacement { type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; - K solidThermo; + kappa solidThermo; QrNbr Qr; Qr none; - KName none; + kappaName none; value uniform 300; } @@ -59,10 +59,10 @@ dictionaryReplacement { type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; - K solidThermo; + kappa solidThermo; QrNbr Qr; Qr none; - KName none; + kappaName none; value uniform 300; } @@ -70,8 +70,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } minY diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict index 078796b0d9..59116a041a 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict @@ -44,10 +44,10 @@ dictionaryReplacement { type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; - K solidThermo; + kappa solidThermo; QrNbr Qr; Qr none; - KName none; + kappaName none; value uniform 300; } @@ -55,10 +55,10 @@ dictionaryReplacement { type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; - K solidThermo; + kappa solidThermo; QrNbr Qr; Qr none; - KName none; + kappaName none; value uniform 300; } @@ -66,8 +66,8 @@ dictionaryReplacement { type compressible::turbulentTemperatureCoupledBaffleMixed; neighbourFieldName T; - K solidThermo; - KName none; + kappa solidThermo; + kappaName none; value uniform 300; } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict index 605119e269..e10d24fbeb 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict @@ -44,10 +44,10 @@ dictionaryReplacement { type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; - K solidThermo; + kappa solidThermo; QrNbr Qr; Qr none; - KName none; + kappaName none; value uniform 300; } @@ -55,10 +55,10 @@ dictionaryReplacement { type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; - K solidThermo; + kappa solidThermo; QrNbr Qr; Qr none; - KName none; + kappaName none; value uniform 300; } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict index 4c78380972..369915887e 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict @@ -66,10 +66,10 @@ dictionaryReplacement { type compressible::turbulentTemperatureRadCoupledMixed; Tnbr T; - K basicThermo; + kappa basicThermo; QrNbr none; Qr Qr; - KName none; + kappaName none; value uniform 300; } }