diff --git a/etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.C b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C
similarity index 80%
rename from etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.C
rename to etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C
index d5fdb11a0be2625738d2bce91df3b67efdd1a7bc..0ac2687861f65ed8fe777391c4179fd344081a4e 100644
--- a/etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,12 +23,14 @@ License
\*---------------------------------------------------------------------------*/
-#include "codedBasicSourceTemplate.H"
+#include "codedFvOptionTemplate.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "surfaceFields.H"
#include "unitConversion.H"
+#include "fvMatrix.H"
+
//{{{ begin codeInclude
${codeInclude}
//}}} end codeInclude
@@ -39,6 +41,8 @@ ${codeInclude}
namespace Foam
{
+namespace fv
+{
// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
//{{{ begin localCode
@@ -73,25 +77,25 @@ extern "C"
//makeRemovablePatchTypeField
//(
// fvPatch${FieldType},
-// ${typeName}CodedBasic${SourceType}
+// ${typeName}FvOption${SourceType}
//);
-defineTypeNameAndDebug(${typeName}CodedBasic${SourceType}, 0);
+defineTypeNameAndDebug(${typeName}FvOption${SourceType}, 0);
addRemovableToRunTimeSelectionTable
(
- basicSource,
- ${typeName}CodedBasic${SourceType},
+ option,
+ ${typeName}FvOption${SourceType},
dictionary
);
-const char* const ${typeName}CodedBasic${SourceType}::SHA1sum =
+const char* const ${typeName}FvOption${SourceType}::SHA1sum =
"${SHA1sum}";
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-${typeName}CodedBasic${SourceType}::
-${typeName}CodedBasic${SourceType}
+${typeName}FvOption${SourceType}::
+${typeName}FvOption${SourceType}
(
const word& name,
const word& modelType,
@@ -99,7 +103,7 @@ ${typeName}CodedBasic${SourceType}
const fvMesh& mesh
)
:
- basicSource(name, modelType, dict, mesh)
+ option(name, modelType, dict, mesh)
{
if (${verbose:-false})
{
@@ -111,8 +115,8 @@ ${typeName}CodedBasic${SourceType}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-${typeName}CodedBasic${SourceType}::
-~${typeName}CodedBasic${SourceType}()
+${typeName}FvOption${SourceType}::
+~${typeName}FvOption${SourceType}()
{
if (${verbose:-false})
{
@@ -123,14 +127,14 @@ ${typeName}CodedBasic${SourceType}::
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void ${typeName}CodedBasic${SourceType}::correct
+void ${typeName}FvOption${SourceType}::correct
(
GeometricField<${TemplateType}, fvPatchField, volMesh>& fld
)
{
if (${verbose:-false})
{
- Info<<"${typeName}CodedBasic${SourceType}::correct()\n";
+ Info<<"${typeName}FvOption${SourceType}::correct()\n";
}
//{{{ begin code
@@ -139,7 +143,7 @@ void ${typeName}CodedBasic${SourceType}::correct
}
-void ${typeName}CodedBasic${SourceType}::addSup
+void ${typeName}FvOption${SourceType}::addSup
(
fvMatrix<${TemplateType}>& eqn,
const label fieldI
@@ -147,7 +151,7 @@ void ${typeName}CodedBasic${SourceType}::addSup
{
if (${verbose:-false})
{
- Info<<"${typeName}CodedBasic${SourceType}::addSup()\n";
+ Info<<"${typeName}FvOption${SourceType}::addSup()\n";
}
//{{{ begin code
@@ -156,7 +160,7 @@ void ${typeName}CodedBasic${SourceType}::addSup
}
-void ${typeName}CodedBasic${SourceType}::setValue
+void ${typeName}FvOption${SourceType}::setValue
(
fvMatrix<${TemplateType}>& eqn,
const label fieldI
@@ -164,7 +168,7 @@ void ${typeName}CodedBasic${SourceType}::setValue
{
if (${verbose:-false})
{
- Info<<"${typeName}CodedBasic${SourceType}::setValue()\n";
+ Info<<"${typeName}FvOption${SourceType}::setValue()\n";
}
//{{{ begin code
@@ -177,4 +181,5 @@ void ${typeName}CodedBasic${SourceType}::setValue
} // End namespace Foam
+} // End namespace fv
// ************************************************************************* //
diff --git a/etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.H b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
similarity index 57%
rename from etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.H
rename to etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
index 7f80510507e6e8bec0ae185bb7932309880905e8..15f1d1d520b03c2dca32119f5f93461afb17800c 100644
--- a/etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.H
+++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,32 +22,106 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Description
- Template for use with dynamic code generation of a basicSource
-
- - without state
+ Template for use with dynamic code generation of a source.
+ The hook functions take the following arguments:
+
+ codeCorrect
+ (
+ GeometricField<Type, fvPatchField, volMesh>& fld
+ )
+
+ codeAddSup
+ (
+ fvMatrix<Type}>& eqn,
+ const label fieldI
+ )
+
+ setValue
+ (
+ fvMatrix<Type}>& eqn,
+ const label fieldI
+ )
+
+ where :
+ fld is the field in fieldNames
+ eqn is the fvMatrix
+
+ energySource
+ {
+ type scalarCodedSource;
+
+ active true;
+ selectionMode all;
+
+ scalarCodedSourceCoeffs
+ {
+ fieldNames (h);
+ redirectType sourceTime;
+
+ codeInclude
+ #{
+
+ #};
+
+ codeCorrect
+ #{
+ Pout<< "**codeCorrect**" << endl;
+ #};
+
+ codeAddSup
+ #{
+ const Time& time = mesh().time();
+ const scalarField& V = mesh_.V();
+ scalarField& heSource = eqn.source();
+ heSource -= 0.1*sqr(time.value())*V;
+ #};
+
+ codeSetValue
+ #{
+ Pout<< "**codeSetValue**" << endl;
+ #};
+
+ // Dummy entry. Make dependent on above to trigger recompilation
+ code
+ #{
+ $codeInclude
+ $codeCorrect
+ $codeAddSup
+ $codeSetValue
+ #};
+ }
+
+ sourceTimeCoeffs
+ {
+ // Dummy entry
+ }
+ }
SourceFiles
- codedBasicSourceTemplate.C
+ codedFvOptionTemplate.C
\*---------------------------------------------------------------------------*/
-#ifndef codedBasicSourceTemplate_H
-#define codedBasicSourceTemplate_H
+#ifndef codedFvOptionTemplate_H
+#define codedFvOptionTemplate_H
-#include "basicSource.H"
+#include "fvOption.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
+namespace fv
+{
+
/*---------------------------------------------------------------------------*\
- A templated CodedBasicSource
+ A templated CodedFvOption
\*---------------------------------------------------------------------------*/
-class ${typeName}CodedBasic${SourceType}
+class ${typeName}FvOption${SourceType}
:
- public basicSource
+ public option
{
public:
@@ -61,7 +135,7 @@ public:
// Constructors
//- Construct from patch and internal field
- ${typeName}CodedBasic${SourceType}
+ ${typeName}FvOption${SourceType}
(
const word& name,
const word& modelType,
@@ -70,7 +144,7 @@ public:
);
//- Destructor
- virtual ~${typeName}CodedBasic${SourceType}();
+ virtual ~${typeName}FvOption${SourceType}();
// Member functions
@@ -101,6 +175,8 @@ public:
} // End namespace Foam
+} // End namespace fv
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index bd27dc874d9ca12b334c36d0ad4661e0efa886c1..ef835546edc8b5b4aba9ca1fb90a6aad0cd797ad 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -80,7 +80,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
:
mixedFvPatchScalarField(p, iF),
temperatureCoupledBase(patch(), dict),
- TnbrName_(dict.lookup("neighbourFieldName"))
+ TnbrName_(dict.lookup("Tnbr"))
{
if (!isA<mappedPatchBase>(this->patch().patch()))
{
@@ -237,7 +237,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write
) const
{
mixedFvPatchScalarField::write(os);
- os.writeKeyword("TnbrName")<< TnbrName_
+ os.writeKeyword("Tnbr")<< TnbrName_
<< token::END_STATEMENT << nl;
temperatureCoupledBase::write(os);
}
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
index 60e61d9d0f02c2ac85fee2faca8c488c86057fb3..0484337b9a8d09e2c8f52a80562f0d70a2d34e12 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -40,10 +40,10 @@ Description
myInterfacePatchName
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
- kappa lookup;
- kappaName kappa;
- value uniform 300;
+ Tnbr T;
+ kappa lookup;
+ kappaName kappa;
+ value uniform 300;
}
Needs to be on underlying mapped(Wall)FvPatch.
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
index 1c9bd5ebf3f1f5b032f8834605537261c5660eba..3d4b80085a1eab3b82b9d5df1fb0603cbd97e4cb 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -34,7 +34,7 @@ Description
myInterfacePatchName
{
type compressible::turbulentTemperatureRadCoupledMixed;
- TNbr T; // name of T field on neighbour region
+ Tnbr T; // name of T field on neighbour region
kappa lookup;
KappaName kappa;
QrNbr Qr; // or none. Name of Qr field on neighbour region
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index 67aee46ff314c7d2040712a8bf1d6292e01ae4e9..0f3e91dd5e3ac819f8a3497cc981d1be132e30ef 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -56,7 +56,7 @@ dictionaryReplacement
"bottomAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa fluidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
index c92d4511d033e9e22c54e7ab6ba9977eccc5a66d..3c883e6ee28e541f5b7c24d1ab983c1d023a9f6c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -46,7 +46,7 @@ dictionaryReplacement
"heater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa solidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 8c75b7e4bddf6063c0b7ee7aecf77fbbeeb1d536..987aeb8b43d500d7035a236014457b716e40a6c9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -42,7 +42,7 @@ dictionaryReplacement
"leftSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
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 9c9b20e5ed859499ab26e59d59fe085b7c1a9f3d..ba99b13705c6d415e7828d3138d85bebb00b4f68 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -42,7 +42,7 @@ dictionaryReplacement
"rightSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
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 118c410a839fda2b79747de2d2fb0e915ae333ff..fef7666e767c70a2c9cf4ab6e41a149436b03e25 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -67,7 +67,7 @@ dictionaryReplacement
"topAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa fluidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..68bdec8486a426e552301e27ed1fcc62821a3b74
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/polyMesh/boundary
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+6
+(
+ maxY
+ {
+ type wall;
+ nFaces 300;
+ startFace 8300;
+ }
+ minX
+ {
+ type patch;
+ nFaces 100;
+ startFace 8600;
+ }
+ maxX
+ {
+ type patch;
+ nFaces 100;
+ startFace 8700;
+ }
+ minY
+ {
+ type wall;
+ nFaces 300;
+ startFace 8800;
+ }
+ minZ
+ {
+ type wall;
+ nFaces 300;
+ startFace 9100;
+ }
+ maxZ
+ {
+ type wall;
+ nFaces 300;
+ startFace 9400;
+ }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict
index f403d950dc8ef39a68ca43bd8f938851f5f0f33a..dad0abea12aae563ee7a9e358193eb364b55bc3b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict
@@ -69,7 +69,7 @@ dictionaryReplacement
"bottomWater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa fluidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict
index 1a443947174e344775c6288c8af9f73c81e572dd..94194e9fb45777797c9b5032b2f3c50728134324 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict
@@ -47,7 +47,7 @@ dictionaryReplacement
"heater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa solidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict
index fa798f65a5b34d9d8b6f5fb0e0c1767aafb1f500..490a05d4adbb11bf21986f590ac4a0118afbf306 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict
@@ -42,7 +42,7 @@ dictionaryReplacement
"leftSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
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 546b3321383cfff4dc7be0c5792ca8427b14a35a..8993bff833ade11efec6ec23785842cb894ae0e5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/changeDictionaryDict
@@ -42,10 +42,10 @@ dictionaryReplacement
"rightSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
- kappa solidThermo;
- kappaName none;
- value uniform 300;
+ Tnbr T;
+ 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 8bb4a2ed547a7ed5f7548ff789ab4e0148c7f5ad..1eb0bd9f864296069dbbdadc3d45b5b7aa484089 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict
@@ -68,7 +68,7 @@ dictionaryReplacement
"topAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa fluidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index 3ccca13960c4e159c7194b420960f347b5671c57..caff66645869eb06a81ac753439365f77d5b7fd0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -56,7 +56,7 @@ dictionaryReplacement
"bottomAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa fluidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
index c92d4511d033e9e22c54e7ab6ba9977eccc5a66d..3c883e6ee28e541f5b7c24d1ab983c1d023a9f6c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -46,7 +46,7 @@ dictionaryReplacement
"heater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa solidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
index 8c75b7e4bddf6063c0b7ee7aecf77fbbeeb1d536..987aeb8b43d500d7035a236014457b716e40a6c9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -42,7 +42,7 @@ dictionaryReplacement
"leftSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
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 9c9b20e5ed859499ab26e59d59fe085b7c1a9f3d..ba99b13705c6d415e7828d3138d85bebb00b4f68 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -42,7 +42,7 @@ dictionaryReplacement
"rightSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
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 118c410a839fda2b79747de2d2fb0e915ae333ff..fef7666e767c70a2c9cf4ab6e41a149436b03e25 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -67,7 +67,7 @@ dictionaryReplacement
"topAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa fluidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..73459cea0720d03956f9bd6cfb7f59f4d60a5d64
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+6
+(
+ maxY
+ {
+ type wall;
+ nFaces 300;
+ startFace 8300;
+ }
+ minX
+ {
+ type patch;
+ nFaces 100;
+ startFace 8600;
+ }
+ maxX
+ {
+ type patch;
+ nFaces 100;
+ startFace 8700;
+ }
+ minY
+ {
+ type wall;
+ nFaces 300;
+ startFace 8800;
+ }
+ minZ
+ {
+ type wall;
+ nFaces 300;
+ startFace 9100;
+ }
+ maxZ
+ {
+ type wall;
+ nFaces 300;
+ startFace 9400;
+ }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index 67aee46ff314c7d2040712a8bf1d6292e01ae4e9..0f3e91dd5e3ac819f8a3497cc981d1be132e30ef 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -56,7 +56,7 @@ dictionaryReplacement
"bottomAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa fluidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
index c92d4511d033e9e22c54e7ab6ba9977eccc5a66d..3c883e6ee28e541f5b7c24d1ab983c1d023a9f6c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -46,7 +46,7 @@ dictionaryReplacement
"heater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa solidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 8c75b7e4bddf6063c0b7ee7aecf77fbbeeb1d536..987aeb8b43d500d7035a236014457b716e40a6c9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -42,7 +42,7 @@ dictionaryReplacement
"leftSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa solidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index 9c9b20e5ed859499ab26e59d59fe085b7c1a9f3d..ba99b13705c6d415e7828d3138d85bebb00b4f68 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -42,7 +42,7 @@ dictionaryReplacement
"rightSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa solidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 118c410a839fda2b79747de2d2fb0e915ae333ff..fef7666e767c70a2c9cf4ab6e41a149436b03e25 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -67,7 +67,7 @@ dictionaryReplacement
"topAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa fluidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..73459cea0720d03956f9bd6cfb7f59f4d60a5d64
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/polyMesh/boundary
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+6
+(
+ maxY
+ {
+ type wall;
+ nFaces 300;
+ startFace 8300;
+ }
+ minX
+ {
+ type patch;
+ nFaces 100;
+ startFace 8600;
+ }
+ maxX
+ {
+ type patch;
+ nFaces 100;
+ startFace 8700;
+ }
+ minY
+ {
+ type wall;
+ nFaces 300;
+ startFace 8800;
+ }
+ minZ
+ {
+ type wall;
+ nFaces 300;
+ startFace 9100;
+ }
+ maxZ
+ {
+ type wall;
+ nFaces 300;
+ startFace 9400;
+ }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
index 024770648cad728b831dbff97512347dbb7693a1..b9adae7e6f6cdc3e50641fc02a8523ae87cf1e98 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
@@ -69,7 +69,7 @@ dictionaryReplacement
"heater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa solidThermo;
kappaName none;
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
index b3ef4c896eb0db12d78f9d716f6e4b33b0ce4e16..cf0d33b686baf0873c6c3968ba6cf7c7124d402b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
@@ -65,7 +65,7 @@ dictionaryReplacement
"leftSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
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 741624e3d1980d9f1f49cea5b39813661c48dbb5..746ee5a8816aef56597082b050d1349b772398c3 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
@@ -65,7 +65,7 @@ dictionaryReplacement
"rightSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
- neighbourFieldName T;
+ Tnbr T;
kappa solidThermo;
kappaName none;
value uniform 300;