diff --git a/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C index b47070ed302fb46e931bd8488fb9a860ea7b3164..7cfde633e1c39fb48e3062cd793475979ab5fc35 100644 --- a/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C +++ b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C @@ -113,7 +113,9 @@ Foam::fv::interRegionHeatTransferModel::interRegionHeatTransferModel ), zeroGradientFvPatchScalarField::typeName ), - semiImplicit_(false) + semiImplicit_(false), + TName_(coeffs_.lookupOrDefault<word>("TName", "T")), + TNbrName_(coeffs_.lookupOrDefault<word>("TNbrName", "T")) { if (active()) { @@ -143,7 +145,7 @@ void Foam::fv::interRegionHeatTransferModel::addSup const volScalarField& h = eqn.psi(); - const volScalarField& T = mesh_.lookupObject<volScalarField>("T"); + const volScalarField& T = mesh_.lookupObject<volScalarField>(TName_); tmp<volScalarField> tTmapped ( @@ -165,7 +167,8 @@ void Foam::fv::interRegionHeatTransferModel::addSup const fvMesh& nbrMesh = mesh_.time().lookupObject<fvMesh>(nbrRegionName_); - const volScalarField& Tnbr = nbrMesh.lookupObject<volScalarField>("T"); + const volScalarField& Tnbr = + nbrMesh.lookupObject<volScalarField>(TNbrName_); interpolate(Tnbr, Tmapped.internalField()); diff --git a/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H index 6303943ee736b2c0fe477f4a9ee072a55f46f996..dd7104de13f4b641b35551fa0a2355dc39b25aa7 100644 --- a/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H +++ b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H @@ -86,6 +86,12 @@ protected: //- Flag to activate semi-implicit coupling bool semiImplicit_; + //- Name of temperature field; default = "T" + word TName_; + + //- Name of neighbour temperature field; default = "T" + word TNbrName_; + // Protected member functions diff --git a/src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C b/src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C index cb76c49b09917cd54031dd91a0c7a40d8a54982e..cf8ec5a67ea63b7c07648dbaa6e364f2e534ec9b 100644 --- a/src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C +++ b/src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C @@ -94,6 +94,7 @@ Foam::fv::tabulatedHeatTransfer::tabulatedHeatTransfer : interRegionHeatTransferModel(name, modelType, dict, mesh), UName_(coeffs_.lookupOrDefault<word>("UName", "U")), + UNbrName_(coeffs_.lookupOrDefault<word>("UNbrName", "U")), hTable_(), AoV_(), startTimeName_(mesh.time().timeName()) @@ -113,7 +114,8 @@ Foam::fv::tabulatedHeatTransfer::calculateHtc() { const fvMesh& nbrMesh = mesh_.time().lookupObject<fvMesh>(nbrRegionName()); - const volVectorField& UNbr = nbrMesh.lookupObject<volVectorField>(UName_); + const volVectorField& UNbr = + nbrMesh.lookupObject<volVectorField>(UNbrName_); const scalarField UMagNbr(mag(UNbr)); diff --git a/src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H b/src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H index c46f747a14b9dd97bd800481e97bf60be538e7ca..4656560eac53f8967a064f4f1d9ea308b155a742 100644 --- a/src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H +++ b/src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H @@ -60,6 +60,9 @@ private: //- Name of velocity field; default = U word UName_; + //- Name of neighbour velocity field; default = U + word UNbrName_; + //- 2D look up table autoPtr<interpolation2DTable<scalar> > hTable_; diff --git a/src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C index 9f172aa35058507bf1897e2a95ad915b6ff368e7..4445306bddb1d4b7bcf0628404ce2575d8c4008c 100644 --- a/src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C +++ b/src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C @@ -55,7 +55,7 @@ Foam::fv::variableHeatTransfer::variableHeatTransfer ) : interRegionHeatTransferModel(name, modelType, dict, mesh), - UName_(coeffs_.lookupOrDefault<word>("UName", "U")), + UNbrName_(coeffs_.lookupOrDefault<word>("UNbrName", "U")), a_(0), b_(0), c_(0), @@ -109,7 +109,8 @@ Foam::fv::variableHeatTransfer::calculateHtc() const fluidThermo& nbrThermo = nbrMesh.lookupObject<fluidThermo>("thermophysicalProperties"); - const volVectorField& UNbr = nbrMesh.lookupObject<volVectorField>(UName_); + const volVectorField& UNbr = + nbrMesh.lookupObject<volVectorField>(UNbrName_); const volScalarField ReNbr(mag(UNbr)*ds_*nbrThermo.rho()/nbrTurb.mut()); @@ -143,7 +144,7 @@ bool Foam::fv::variableHeatTransfer::read(const dictionary& dict) { if (option::read(dict)) { - coeffs_.readIfPresent("UName", UName_); + coeffs_.readIfPresent("UNbrName", UNbrName_); coeffs_.readIfPresent("a", a_); coeffs_.readIfPresent("b", b_); diff --git a/src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H b/src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H index cfe0aaffaee8d5135ca0ecc9948aa207fbbacada..8180f63a3413030d648987d578134bc2ed18be8e 100644 --- a/src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H +++ b/src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H @@ -65,8 +65,8 @@ private: // Private data - //- Name of velocity field; default = U - word UName_; + //- Name of neighbour velocity field; default = U + word UNbrName_; //- Model constants scalar a_;