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

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2012-02-01 15:16:03 +00:00
parent 68093ce564 0ea366d2b2
commit 6743e1625c
7 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -513,6 +513,14 @@ public:
};
template<class Cmpt>
class outerProduct<Vector2D<Cmpt>, Vector2D<Cmpt> >
{
public:
typedef Tensor2D<Cmpt> type;
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

37
src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C
View File

@ -46,7 +46,8 @@ temperatureThermoBaffleFvPatchScalarField
turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(p, iF),
owner_(false),
baffle_(),
solidThermoType_("undefined")
solidThermoType_("undefined"),
dict_(dictionary::null)
{}
@ -68,7 +69,8 @@ temperatureThermoBaffleFvPatchScalarField
),
owner_(ptf.owner_),
baffle_(ptf.baffle_),
solidThermoType_(ptf.solidThermoType_)
solidThermoType_(ptf.solidThermoType_),
dict_(ptf.dict_)
{}
@ -83,7 +85,8 @@ temperatureThermoBaffleFvPatchScalarField
turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(p, iF, dict),
owner_(false),
baffle_(),
solidThermoType_()
solidThermoType_(),
dict_(dict)
{
if (!isA<mappedPatchBase>(patch().patch()))
{
@ -133,7 +136,8 @@ temperatureThermoBaffleFvPatchScalarField
turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(ptf, iF),
owner_(ptf.owner_),
baffle_(ptf.baffle_),
solidThermoType_(ptf.solidThermoType_)
solidThermoType_(ptf.solidThermoType_),
dict_(ptf.dict_)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@ -188,30 +192,33 @@ void temperatureThermoBaffleFvPatchScalarField::write(Ostream& os) const
if (thisMesh.name() == polyMesh::defaultRegion && owner_)
{
os.writeKeyword("thermoBaffleModel") << baffle_->modelName()
word thermoModel = dict_.lookup("thermoBaffleModel");
os.writeKeyword("thermoBaffleModel")
<< thermoModel
<< token::END_STATEMENT << nl;
os.writeKeyword("regionName") << baffle_->regionMesh().name()
word regionName = dict_.lookup("regionName");
os.writeKeyword("regionName") << regionName
<< token::END_STATEMENT << nl;
os.writeKeyword("infoOutput") << baffle_->infoOutput()
bool infoOutput = readBool(dict_.lookup("infoOutput"));
os.writeKeyword("infoOutput") << infoOutput
<< token::END_STATEMENT << nl;
os.writeKeyword("active") << baffle_->active()
bool active = readBool(dict_.lookup("active"));
os.writeKeyword("active") << active
<< token::END_STATEMENT << nl;
os.writeKeyword(word(baffle_->modelName() + "coeffs"));
os << baffle_->coeffs() << nl;
os.writeKeyword(word(thermoModel + "Coeffs"));
os << dict_.subDict(thermoModel + "Coeffs") << nl;
os.writeKeyword("thermoType") << solidThermoType_
<< token::END_STATEMENT << nl;
os.writeKeyword(word(solidThermoType_ + "Coeffs")) << nl;
os.writeKeyword(word(solidThermoType_ + "Coeffs"));
os << indent << '{' << nl
<< indent << baffle_->thermo() << nl
<< indent << '}' << nl;
os << dict_.subDict(solidThermoType_ + "Coeffs") << nl;
}
}

3
src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
View File

@ -112,6 +112,9 @@ class temperatureThermoBaffleFvPatchScalarField
//- Solid thermo type
word solidThermoType_;
//- Dictionary
dictionary dict_;
public: