From 1c0a5f7988b8253f38c690a364ff9c465314a87b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 9 Jan 2013 17:16:07 +0000
Subject: [PATCH] ENH: Removed hard-coding of field names
---
.../interRegionHeatTransferModel.C | 9 ++++++---
.../interRegionHeatTransferModel.H | 6 ++++++
.../tabulatedHeatTransfer/tabulatedHeatTransfer.C | 4 +++-
.../tabulatedHeatTransfer/tabulatedHeatTransfer.H | 3 +++
.../variableHeatTransfer/variableHeatTransfer.C | 7 ++++---
.../variableHeatTransfer/variableHeatTransfer.H | 4 ++--
6 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
index b47070ed302..7cfde633e1c 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 6303943ee73..dd7104de13f 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 cb76c49b099..cf8ec5a67ea 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 c46f747a14b..4656560eac5 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 9f172aa3505..4445306bddb 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 cfe0aaffaee..8180f63a341 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_;
--
GitLab