zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: adjust thermalPorousZone to match documentation

Browse Source 
eg, dictionary entry:

        thermalModel
        {
            type        none; // fixedTemperature;
            // fixedTemperature coefficients
            T           350;
        }

A missing thermalModel is treated as 'none'
This commit is contained in:
Mark Olesen
2011-03-31 13:53:48 +02:00
parent 5c3c1b2db1
commit 3177e81566
12 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -445,6 +445,13 @@ void Foam::porousZone::writeDict(Ostream& os, bool subDict) const
dictPtr->write(os); dictPtr->write(os);
} }
// thermalModel
if (const dictionary* dictPtr = dict_.subDictPtr("thermalModel"))
{
os << indent << "thermalModel";
dictPtr->write(os);
}
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }

6
src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -51,8 +51,8 @@ namespace porousMedia
Foam::porousMedia::fixedTemperature::fixedTemperature(const porousZone& pZone) Foam::porousMedia::fixedTemperature::fixedTemperature(const porousZone& pZone)
: :
thermalModel(pZone, typeName), thermalModel(pZone),
T_(readScalar(coeffDict_.lookup("T"))) T_(readScalar(thermalCoeffs_.lookup("T")))
{} {}

5
src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,7 +33,6 @@ Description
#define fixedTemperature_H #define fixedTemperature_H
#include "thermalModel.H" #include "thermalModel.H"
#include "autoPtr.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -81,7 +80,7 @@ public:
//- Add the thermal source to the enthalpy equation //- Add the thermal source to the enthalpy equation
virtual void addEnthalpySource virtual void addEnthalpySource
( (
const basicThermo& thermo, const basicThermo&,
const volScalarField& rho, const volScalarField& rho,
fvScalarMatrix& hEqn fvScalarMatrix& hEqn
) const; ) const;

5
src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,7 +33,6 @@ Description
#define noThermalModel_H #define noThermalModel_H
#include "thermalModel.H" #include "thermalModel.H"
#include "autoPtr.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -73,7 +72,7 @@ public:
//- Add the thermal source to the enthalpy equation //- Add the thermal source to the enthalpy equation
virtual void addEnthalpySource virtual void addEnthalpySource
( (
const basicThermo& thermo, const basicThermo&,
const volScalarField& rho, const volScalarField& rho,
fvScalarMatrix& hEqn fvScalarMatrix& hEqn
) const; ) const;

8
src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -42,18 +42,18 @@ namespace porousMedia
Foam::porousMedia::thermalModel::thermalModel(const porousZone& pZone) Foam::porousMedia::thermalModel::thermalModel(const porousZone& pZone)
: :
pZone_(pZone), pZone_(pZone),
coeffDict_(dictionary::null) thermalCoeffs_(pZone.dict().subDictPtr("thermalModel"))
{} {}
Foam::porousMedia::thermalModel::thermalModel Foam::porousMedia::thermalModel::thermalModel
( (
const porousZone& pZone, const porousZone& pZone,
const word& modelType const dictionary& thermalCoeffs
) )
: :
pZone_(pZone), pZone_(pZone),
coeffDict_(pZone_.dict().subDict(modelType + "Coeffs")) thermalCoeffs_(thermalCoeffs)
{} {}

14
src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -63,8 +63,8 @@ protected:
//- Reference to the porous zone //- Reference to the porous zone
const porousZone& pZone_; const porousZone& pZone_;
//- Sub-model coefficients dictionary //- Thermal model coefficients dictionary
const dictionary coeffDict_; const dictionary thermalCoeffs_;
public: public:
@ -87,11 +87,11 @@ public:
// Constructors // Constructors
//- Construct null from porous zone //- Construct from porous zone, coefficients from "thermalModel" entry
thermalModel(const porousZone&); thermalModel(const porousZone&);
//- Construct from porous zone and model type name //- Construct from porous zone and thermal model coefficients
thermalModel(const porousZone&, const word& modelType); thermalModel(const porousZone&, const dictionary& thermalCoeffs);
//- Destructor //- Destructor
@ -107,7 +107,7 @@ public:
//- Add the thermal source to the enthalpy equation //- Add the thermal source to the enthalpy equation
virtual void addEnthalpySource virtual void addEnthalpySource
( (
const basicThermo& thermo, const basicThermo&,
const volScalarField& rho, const volScalarField& rho,
fvScalarMatrix& hEqn fvScalarMatrix& hEqn
) const = 0; ) const = 0;

10
src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,7 +33,13 @@ Foam::porousMedia::thermalModel::New
const porousZone& pZone const porousZone& pZone
) )
{ {
const word modelType(pZone.dict().lookup("thermalModel")); // a missing thermalModel is the same as type "none"
word modelType("none");
if (const dictionary* dictPtr = pZone.dict().subDictPtr("thermalModel"))
{
dictPtr->lookup("type") >> modelType;
}
Info<< "Selecting thermalModel " << modelType << endl; Info<< "Selecting thermalModel " << modelType << endl;

7
src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -51,7 +51,10 @@ void Foam::thermalPorousZone::addEnthalpySource
fvScalarMatrix& hEqn fvScalarMatrix& hEqn
) const ) const
{ {
model_->addEnthalpySource(thermo, rho, hEqn); if (model_.valid())
{
model_->addEnthalpySource(thermo, rho, hEqn);
}
} }

4
src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -127,7 +127,7 @@ public:
//- Add the thermal source to the enthalpy equation //- Add the thermal source to the enthalpy equation
void addEnthalpySource void addEnthalpySource
( (
const basicThermo& thermo, const basicThermo&,
const volScalarField& rho, const volScalarField& rho,
fvScalarMatrix& hEqn fvScalarMatrix& hEqn
) const; ) const;

2
src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

7
src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,7 +32,8 @@ Description
thermalPorousZone. thermalPorousZone.
The input file \c constant/thermalPorousZone is implemented as The input file \c constant/thermalPorousZone is implemented as
IOPtrList\<thermalPorousZone\> and contains the following type of data: IOPtrList\<thermalPorousZone\> (but written as a dictionary)
and contains the following type of data:
\verbatim \verbatim
1 1
@ -94,7 +95,7 @@ public:
//- Add the thermal source to the enthalpy equation //- Add the thermal source to the enthalpy equation
void addEnthalpySource void addEnthalpySource
( (
const basicThermo& thermo, const basicThermo&,
const volScalarField& rho, const volScalarField& rho,
fvScalarMatrix& hEqn fvScalarMatrix& hEqn
) const; ) const;

9
tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porousZones
View File

@ -31,11 +31,12 @@ FoamFile
f f [0 -1 0 0 0 0 0] (0 0 0); f f [0 -1 0 0 0 0 0] (0 0 0);
} }
thermalModel none; // fixedTemperature; thermalModel
fixedTemperatureCoeffs
{ {
T 350; type none; // fixedTemperature;
// fixedTemperature coefficients
T 350;
} }
} }
) )