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:
andy
2012-10-01 11:40:22 +01:00
parent fd677b9f14 27528e6ac4
commit 340bbed2e0
150 changed files with 2400 additions and 1237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/regionModels/pyrolysisModels/Make/options
View File

@ -19,8 +19,7 @@ LIB_LIBS = \
-lmeshTools \
-lchemistryModel \
-lspecie \
-lspecie \
-lsolid \
-lsolidSpecie \
-lfluidThermophysicalModels \
-lsolidChemistryModel \
-lcompressibleTurbulenceModel \

2
src/regionModels/thermoBaffleModels/Make/options
View File

@ -17,4 +17,4 @@ LIB_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lOpenFOAM \
-lsolid
-lsolidSpecie

19
src/thermophysicalModels/basic/basicThermo/basicThermo.C
View File

@ -266,15 +266,28 @@ Foam::wordList Foam::basicThermo::splitThermoName
{
wordList cmpts(nCmpt);
string::size_type beg=0, end=0;
string::size_type beg=0, end=0, endb=0, endc=0;
int i = 0;
while
(
(end = thermoName.find('<', beg)) != string::npos
|| (end = thermoName.find(',', beg)) != string::npos
(endb = thermoName.find('<', beg)) != string::npos
|| (endc = thermoName.find(',', beg)) != string::npos
)
{
if (endb == string::npos)
{
end = endc;
}
else if ((endc = thermoName.find(',', beg)) != string::npos)
{
end = min(endb, endc);
}
else
{
end = endb;
}
if (beg < end)
{
cmpts[i] = thermoName.substr(beg, end-beg);

2
src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
View File

@ -76,6 +76,8 @@ Foam::autoPtr<Thermo> Foam::basicThermo::New
+ word(thermoTypeDict.lookup("specie")) + ">>,"
+ word(thermoTypeDict.lookup("energy")) + ">>>";
Info<< thermoTypeName << endl;
// Lookup the thermo package
typename Thermo::fvMeshConstructorTable::iterator cstrIter =
Thermo::fvMeshConstructorTablePtr_->find(thermoTypeName);

63
src/thermophysicalModels/basic/fluidThermo/makeThermo.H
View File

@ -39,51 +39,45 @@ Description
#define makeThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
\
typedef Cthermo \
< \
Mixture \
typedef \
Transport \
< \
Transport \
species::thermo \
< \
species::thermo \
Thermo \
< \
Thermo \
EqnOfState \
< \
EqnOfState \
< \
Specie \
> \
>, \
Type \
> \
Specie \
> \
>, \
Type \
> \
> \
> Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie; \
> Transport##Type##Thermo##EqnOfState##Specie; \
\
typedef \
Cthermo \
< \
Mixture \
< \
Transport##Type##Thermo##EqnOfState##Specie \
> \
> Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie; \
\
defineTemplateTypeNameAndDebugWithName \
( \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
#Cthermo \
"<" \
#Mixture \
"<" \
#Transport \
"<" \
#Thermo \
"<" \
#EqnOfState \
"<" \
#Specie \
">" \
">," \
#Type \
">>>", \
( \
#Cthermo"<"#Mixture"<" \
+ Transport##Type##Thermo##EqnOfState##Specie::typeName() \
+ ">>" \
).c_str(), \
0 \
); \
\
addToRunTimeSelectionTable \
( \
BaseThermo, \
basicThermo, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
); \
@ -93,6 +87,13 @@ addToRunTimeSelectionTable \
fluidThermo, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
BaseThermo, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
);

2
src/thermophysicalModels/chemistryModel/Make/files
View File

@ -1,11 +1,9 @@
chemistryModel/basicChemistryModel/basicChemistryModel.C
chemistryModel/psiChemistryModel/psiChemistryModel.C
chemistryModel/psiChemistryModel/psiChemistryModelNew.C
chemistryModel/psiChemistryModel/psiChemistryModels.C
chemistryModel/rhoChemistryModel/rhoChemistryModel.C
chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C
chemistryModel/rhoChemistryModel/rhoChemistryModels.C
chemistrySolver/chemistrySolver/makeChemistrySolvers.C

11
src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
View File

@ -107,6 +107,13 @@ public:
basicChemistryModel(const fvMesh& mesh);
// Selectors
//- Generic New for each of the related chemistry model
template<class Thermo>
static autoPtr<Thermo> New(const fvMesh&);
//- Destructor
virtual ~basicChemistryModel();
@ -162,6 +169,10 @@ public:
#include "basicChemistryModelI.H"
#ifdef NoRepository
# include "basicChemistryModelTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif

191
src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C Normal file
View File

@ -0,0 +1,191 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "basicChemistryModel.H"
#include "basicThermo.H"
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
template<class ChemistryModel>
Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
(
const fvMesh& mesh
)
{
IOdictionary chemistryDict
(
IOobject
(
"chemistryProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
)
);
word chemistryTypeName;
if (chemistryDict.isDict("chemistryType"))
{
const dictionary& chemistryTypeDict
(
chemistryDict.subDict("chemistryType")
);
Info<< "Selecting chemistry type " << chemistryTypeDict << endl;
const int nCmpt = 8;
const char* cmptNames[nCmpt] =
{
"chemistrySolver",
"chemistryModel",
"???ChemistryModel",
"transport",
"thermo",
"equationOfState",
"specie",
"energy"
};
IOdictionary thermoDict
(
IOobject
(
"thermophysicalProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
);
word thermoTypeName;
if (thermoDict.isDict("thermoType"))
{
const dictionary& thermoTypeDict(thermoDict.subDict("thermoType"));
thermoTypeName =
word(thermoTypeDict.lookup("transport")) + '<'
+ word(thermoTypeDict.lookup("thermo")) + '<'
+ word(thermoTypeDict.lookup("equationOfState")) + '<'
+ word(thermoTypeDict.lookup("specie")) + ">>,"
+ word(thermoTypeDict.lookup("energy")) + ">";
}
else
{
FatalIOErrorIn
(
(ChemistryModel::typeName + "::New(const mesh&)").c_str(),
thermoDict
) << "thermoType is in the old format and must be upgraded"
<< exit(FatalIOError);
}
// Construct the name of the chemistry type from the components
chemistryTypeName =
word(chemistryTypeDict.lookup("chemistrySolver")) + '<'
+ word(chemistryTypeDict.lookup("chemistryModel")) + '<'
+ ChemistryModel::typeName + ','
+ thermoTypeName + ">>";
typename ChemistryModel::fvMeshConstructorTable::iterator cstrIter =
ChemistryModel::fvMeshConstructorTablePtr_->find(chemistryTypeName);
if (cstrIter == ChemistryModel::fvMeshConstructorTablePtr_->end())
{
FatalErrorIn(ChemistryModel::typeName + "::New(const mesh&)")
<< "Unknown " << ChemistryModel::typeName << " type " << nl
<< "chemistryType" << chemistryTypeDict << nl << nl
<< "Valid " << ChemistryModel ::typeName << " types are:"
<< nl << nl;
// Get the list of all the suitable chemistry packages available
wordList validChemistryTypeNames
(
ChemistryModel::fvMeshConstructorTablePtr_->sortedToc()
);
// Build a table of the thermo packages constituent parts
// Note: row-0 contains the names of constituent parts
List<wordList> validChemistryTypeNameCmpts
(
validChemistryTypeNames.size() + 1
);
validChemistryTypeNameCmpts[0].setSize(nCmpt);
forAll(validChemistryTypeNameCmpts[0], j)
{
validChemistryTypeNameCmpts[0][j] = cmptNames[j];
}
// Split the thermo package names into their constituent parts
forAll(validChemistryTypeNames, i)
{
validChemistryTypeNameCmpts[i+1] = basicThermo::splitThermoName
(
validChemistryTypeNames[i],
nCmpt
);
}
// Print the table of available packages
// in terms of their constituent parts
printTable(validChemistryTypeNameCmpts, FatalError);
FatalError<< exit(FatalError);
}
return autoPtr<ChemistryModel>
(cstrIter()(mesh, typeName, chemistryTypeName));
}
else
{
chemistryTypeName =
word(chemistryDict.lookup("chemistryType"));
Info<< "Selecting chemistry type " << chemistryTypeName << endl;
typename ChemistryModel::fvMeshConstructorTable::iterator cstrIter =
ChemistryModel::fvMeshConstructorTablePtr_->find(chemistryTypeName);
if (cstrIter == ChemistryModel::fvMeshConstructorTablePtr_->end())
{
FatalErrorIn(ChemistryModel::typeName + "::New(const mesh&)")
<< "Unknown " << ChemistryModel::typeName << " type "
<< chemistryTypeName << nl << nl
<< "Valid ChemistryModel types are:" << nl
<< ChemistryModel::fvMeshConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
return autoPtr<ChemistryModel>
(cstrIter()(mesh, typeName, chemistryTypeName));
}
}
// ************************************************************************* //

14
src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H
View File

@ -46,19 +46,7 @@ namespace Foam
defineTemplateTypeNameAndDebugWithName \
( \
SS##Comp##Thermo, \
#SS"<"#Comp","#Thermo">", \
0 \
);
#define makeSolidChemistryModel(SS, Comp, SThermo, GThermo) \
\
typedef SS<Comp, SThermo, GThermo> SS##Comp##SThermo##GThermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
SS##Comp##SThermo##GThermo, \
#SS"<"#Comp","#SThermo","#GThermo">", \
(#SS"<"#Comp"," + Thermo::typeName() + ">").c_str(), \
0 \
);

13
src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
View File

@ -44,10 +44,21 @@ Foam::psiChemistryModel::psiChemistryModel
)
:
basicChemistryModel(mesh),
thermo_(psiReactionThermo::NewType(mesh, thermoTypeName))
thermo_(psiReactionThermo::New(mesh))
{}
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::psiChemistryModel> Foam::psiChemistryModel::New
(
const fvMesh& mesh
)
{
return basicChemistryModel::New<psiChemistryModel>(mesh);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::psiChemistryModel::~psiChemistryModel()

129
src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C
View File

@ -1,129 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "psiChemistryModel.H"
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::psiChemistryModel> Foam::psiChemistryModel::New
(
const fvMesh& mesh
)
{
IOdictionary chemistryPropertiesDict
(
IOobject
(
"chemistryProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
)
);
const word solver(chemistryPropertiesDict.lookup("chemistrySolver"));
wordList models = fvMeshConstructorTablePtr_->sortedToc();
wordHashSet validModels;
forAll(models, i)
{
label delim = models[i].find('<');
validModels.insert(models[i](0, delim));
}
wordHashSet::iterator solverIter = validModels.find(solver);
if (solverIter == validModels.end())
{
FatalErrorIn("psiChemistryModel::New(const fvMesh&)")
<< "Valid chemistrySolver types are:" << validModels
<< exit(FatalError);
}
const word userModel(chemistryPropertiesDict.lookup("psiChemistryModel"));
// construct chemistry model type name by inserting first template argument
const label tempOpen = userModel.find('<');
const label tempClose = userModel.find('>');
const word className = userModel(0, tempOpen);
const word thermoTypeName =
userModel(tempOpen + 1, tempClose - tempOpen - 1);
const word modelType =
solver + '<' + className + '<' + typeName + ',' + thermoTypeName + ">>";
if (debug)
{
Info<< "Selecting psiChemistryModel " << modelType << endl;
}
else
{
Info<< "Selecting psiChemistryModel " << userModel << endl;
}
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(modelType);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
if (debug)
{
FatalErrorIn("psiChemistryModel::New(const mesh&)")
<< "Unknown psiChemistryModel type "
<< modelType << nl << nl
<< "Valid psiChemistryModel types are:" << nl
<< fvMeshConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
else
{
wordList allModels(fvMeshConstructorTablePtr_->sortedToc());
wordHashSet models;
forAll(allModels, i)
{
const label tempOpen = allModels[i].find('<');
const label tempClose = allModels[i].rfind('>');
word modelName =
allModels[i](tempOpen + 1, tempClose - tempOpen - 1);
modelName = modelName.replace(typeName + ',', "");
models.insert(modelName);
}
FatalErrorIn("psiChemistryModel::New(const mesh&)")
<< "Unknown psiChemistryModel type " << userModel
<< nl << nl << "Valid psiChemistryModel types are:"
<< models << exit(FatalError);
}
}
return autoPtr<psiChemistryModel>
(cstrIter()(mesh, typeName, thermoTypeName));
}
// ************************************************************************* //

13
src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
View File

@ -44,10 +44,21 @@ Foam::rhoChemistryModel::rhoChemistryModel
)
:
basicChemistryModel(mesh),
thermo_(rhoReactionThermo::NewType(mesh, thermoTypeName))
thermo_(rhoReactionThermo::New(mesh))
{}
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::rhoChemistryModel> Foam::rhoChemistryModel::New
(
const fvMesh& mesh
)
{
return basicChemistryModel::New<rhoChemistryModel>(mesh);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::rhoChemistryModel::~rhoChemistryModel()

129
src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C
View File

@ -1,129 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "rhoChemistryModel.H"
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::rhoChemistryModel> Foam::rhoChemistryModel::New
(
const fvMesh& mesh
)
{
IOdictionary chemistryPropertiesDict
(
IOobject
(
"chemistryProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
)
);
const word solver(chemistryPropertiesDict.lookup("chemistrySolver"));
wordList models = fvMeshConstructorTablePtr_->sortedToc();
wordHashSet validModels;
forAll(models, i)
{
label delim = models[i].find('<');
validModels.insert(models[i](0, delim));
}
wordHashSet::iterator solverIter = validModels.find(solver);
if (solverIter == validModels.end())
{
FatalErrorIn("rhoChemistryModel::New(const fvMesh&)")
<< "Valid chemistrySolver types are:" << validModels
<< exit(FatalError);
}
const word userModel(chemistryPropertiesDict.lookup("rhoChemistryModel"));
// construct chemistry model type name by inserting first template argument
const label tempOpen = userModel.find('<');
const label tempClose = userModel.find('>');
const word className = userModel(0, tempOpen);
const word thermoTypeName =
userModel(tempOpen + 1, tempClose - tempOpen - 1);
const word modelType =
solver + '<' + className + '<' + typeName + ',' + thermoTypeName + ">>";
if (debug)
{
Info<< "Selecting rhoChemistryModel " << modelType << endl;
}
else
{
Info<< "Selecting rhoChemistryModel " << userModel << endl;
}
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(modelType);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
if (debug)
{
FatalErrorIn("rhoChemistryModel::New(const mesh&)")
<< "Unknown rhoChemistryModel type "
<< modelType << nl << nl
<< "Valid rhoChemistryModel types are:" << nl
<< fvMeshConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
else
{
wordList allModels(fvMeshConstructorTablePtr_->sortedToc());
wordHashSet models;
forAll(allModels, i)
{
const label tempOpen = allModels[i].find('<');
const label tempClose = allModels[i].rfind('>');
word modelName =
allModels[i](tempOpen + 1, tempClose - tempOpen - 1);
modelName = modelName.replace(typeName + ',', "");
models.insert(modelName);
}
FatalErrorIn("rhoChemistryModel::New(const mesh&)")
<< "Unknown rhoChemistryModel type " << userModel
<< nl << nl << "Valid rhoChemistryModel types are:"
<< models << exit(FatalError);
}
}
return autoPtr<rhoChemistryModel>
(cstrIter()(mesh, typeName, thermoTypeName));
}
// ************************************************************************* //

35
src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
View File

@ -63,10 +63,6 @@ protected:
public:
//- Runtime type information
TypeName("chemistrySolver");
// Constructors
//- Construct from components
@ -100,37 +96,6 @@ public:
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeChemistrySolver(ODEChem) \
\
defineTemplateTypeNameAndDebugWithName \
( \
chemistrySolver<ODEChem>, \
"chemistrySolver<"#ODEChem">", \
0 \
);
#define makeChemistrySolverType(SS, ODEChem, Comp, Thermo) \
\
typedef SS<ODEChem<Comp, Thermo> > SS##ODEChem##Comp##Thermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
SS##ODEChem##Comp##Thermo, \
#SS"<"#ODEChem"<"#Comp","#Thermo">>", \
0 \
); \
\
addToRunTimeSelectionTable \
( \
Comp, \
SS##ODEChem##Comp##Thermo, \
fvMesh \
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository

23
src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
View File

@ -37,12 +37,27 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeChemistrySolverType(SS, ODEChem, Comp, Thermo) \
\
typedef SS<ODEChem<Comp, Thermo> > SS##ODEChem##Comp##Thermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
SS##ODEChem##Comp##Thermo, \
(#SS"<"#ODEChem"<"#Comp"," + Thermo::typeName() + ">>").c_str(), \
0 \
); \
\
addToRunTimeSelectionTable \
( \
Comp, \
SS##ODEChem##Comp##Thermo, \
fvMesh \
);
#define makeChemistrySolverTypes(CompChemModel,Thermo) \
\
typedef ODEChemistryModel<CompChemModel, Thermo> CompChemModel##Thermo; \
\
makeChemistrySolver(CompChemModel##Thermo); \
\
makeChemistrySolverType \
( \
noChemistrySolver, \

2
src/thermophysicalModels/reactionThermo/Make/files
View File

@ -5,14 +5,12 @@ chemistryReaders/chemistryReader/makeChemistryReaders.C
mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
psiReactionThermo/psiReactionThermo/psiReactionThermo.C
psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C
psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C
psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C
psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C
rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C
rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C
rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C
derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C

166
src/thermophysicalModels/reactionThermo/makeReactionThermo.H
View File

@ -31,100 +31,80 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeReactionThermo(BaseThermo,CThermo,MixtureThermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie) \
\
typedef MixtureThermo \
< \
SpecieMixture \
< \
Mixture \
< \
Transport \
< \
species::thermo \
< \
Thermo \
< \
EqnOfState \
< \
Specie \
> \
>, \
Type \
> \
> \
> \
> \
> MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie; \
\
defineTemplateTypeNameAndDebugWithName \
( \
MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
#MixtureThermo \
"<" \
#Mixture \
"<" \
#Transport \
"<" \
#Thermo \
"<" \
#EqnOfState \
"<" \
#Specie \
">" \
">," \
#Type \
">>>", \
0 \
); \
\
addToRunTimeSelectionTable \
( \
BaseThermo, \
MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
CThermo, \
MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
)
#define makeReactionMixtureThermo(BaseThermo,CThermo,MixtureThermo,Mixture,ThermoPhys) \
\
typedef MixtureThermo \
< \
SpecieMixture \
< \
Mixture \
< \
ThermoPhys \
> \
> \
> MixtureThermo##Mixture##ThermoPhys; \
\
defineTemplateTypeNameAndDebugWithName \
( \
MixtureThermo##Mixture##ThermoPhys, \
#MixtureThermo"<"#Mixture"<"#ThermoPhys">>", \
0 \
); \
\
addToRunTimeSelectionTable \
( \
BaseThermo, \
MixtureThermo##Mixture##ThermoPhys, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
CThermo, \
MixtureThermo##Mixture##ThermoPhys, \
fvMesh \
\
typedef MixtureThermo \
< \
SpecieMixture \
< \
Mixture \
< \
ThermoPhys \
> \
> \
> MixtureThermo##Mixture##ThermoPhys; \
\
defineTemplateTypeNameAndDebugWithName \
( \
MixtureThermo##Mixture##ThermoPhys, \
(#MixtureThermo"<"#Mixture"<" + ThermoPhys::typeName() + ">>").c_str(), \
0 \
); \
\
addToRunTimeSelectionTable \
( \
basicThermo, \
MixtureThermo##Mixture##ThermoPhys, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
fluidThermo, \
MixtureThermo##Mixture##ThermoPhys, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
BaseThermo, \
MixtureThermo##Mixture##ThermoPhys, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
CThermo, \
MixtureThermo##Mixture##ThermoPhys, \
fvMesh \
);
#define makeReactionThermo(BaseThermo,CThermo,MixtureThermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie) \
\
typedef \
Transport \
< \
species::thermo \
< \
Thermo \
< \
EqnOfState \
< \
Specie \
> \
>, \
Type \
> \
> Transport##Type##Thermo##EqnOfState##Specie; \
\
makeReactionMixtureThermo \
( \
BaseThermo, \
CThermo, \
MixtureThermo, \
Mixture, \
Transport##Type##Thermo##EqnOfState##Specie \
);

7
src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.H
View File

@ -82,13 +82,6 @@ public:
//- Standard selection based on fvMesh
static autoPtr<psiReactionThermo> New(const fvMesh&);
//- Select and check that package contains 'thermoType'
static autoPtr<psiReactionThermo> NewType
(
const fvMesh&,
const word& thermoType
);
//- Destructor
virtual ~psiReactionThermo();

148
src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C
View File

@ -1,148 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "psiReactionThermo.H"
#include "fvMesh.H"
/*
Foam::autoPtr<Foam::psiReactionThermo> Foam::psiReactionThermo::New
(
const fvMesh& mesh
)
{
// get model name, but do not register the dictionary
// otherwise it is registered in the database twice
const word modelType
(
IOdictionary
(
IOobject
(
"thermophysicalProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
).lookup("thermoType")
);
Info<< "Selecting thermodynamics package " << modelType << endl;
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(modelType);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
FatalErrorIn("psiReactionThermo::New(const fvMesh&)")
<< "Unknown psiReactionThermo type "
<< modelType << nl << nl
<< "Valid psiReactionThermo types are:" << nl
<< fvMeshConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
return autoPtr<psiReactionThermo>(cstrIter()(mesh));
}
*/
Foam::autoPtr<Foam::psiReactionThermo> Foam::psiReactionThermo::NewType
(
const fvMesh& mesh,
const word& thermoType
)
{
// get model name, but do not register the dictionary
// otherwise it is registered in the database twice
const word modelType
(
IOdictionary
(
IOobject
(
"thermophysicalProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
).lookup("thermoType")
);
if (modelType.find(thermoType) == string::npos)
{
wordList allModels = fvMeshConstructorTablePtr_->sortedToc();
DynamicList<word> validModels;
forAll(allModels, i)
{
if (allModels[i].find(thermoType) != string::npos)
{
validModels.append(allModels[i]);
}
}
FatalErrorIn
(
"autoPtr<psiReactionThermo> psiReactionThermo::NewType"
"("
"const fvMesh&, "
"const word&"
")"
) << "Inconsistent thermo package selected:" << nl << nl
<< modelType << nl << nl << "Please select a "
<< "thermo package based on " << thermoType
<< ". Valid options include:" << nl << validModels << nl
<< exit(FatalError);
}
Info<< "Selecting thermodynamics package " << modelType << endl;
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(modelType);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
FatalErrorIn
(
"autoPtr<psiReactionThermo> psiReactionThermo::NewType"
"("
"const fvMesh&, "
"const word&"
")"
) << "Unknown psiReactionThermo type "
<< modelType << nl << nl
<< "Valid psiReactionThermo types are:" << nl
<< fvMeshConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
return autoPtr<psiReactionThermo>(cstrIter()(mesh));
}
// ************************************************************************* //

7
src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.H
View File

@ -82,13 +82,6 @@ public:
//- Standard selection based on fvMesh
static autoPtr<rhoReactionThermo> New(const fvMesh&);
//- Select and check that package contains 'thermoType'
static autoPtr<rhoReactionThermo> NewType
(
const fvMesh&,
const word& thermoType
);
//- Destructor
virtual ~rhoReactionThermo();

148
src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C
View File

@ -1,148 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "rhoReactionThermo.H"
#include "fvMesh.H"
/*
Foam::autoPtr<Foam::rhoReactionThermo> Foam::rhoReactionThermo::New
(
const fvMesh& mesh
)
{
// get model name, but do not register the dictionary
// otherwise it is registered in the database twice
const word modelType
(
IOdictionary
(
IOobject
(
"thermophysicalProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
).lookup("thermoType")
);
Info<< "Selecting thermodynamics package " << modelType << endl;
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(modelType);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
FatalErrorIn("rhoReactionThermo::New(const fvMesh&)")
<< "Unknown rhoReactionThermo type "
<< modelType << nl << nl
<< "Valid rhoReactionThermo types:" << nl
<< fvMeshConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
return autoPtr<rhoReactionThermo>(cstrIter()(mesh));
}
*/
Foam::autoPtr<Foam::rhoReactionThermo> Foam::rhoReactionThermo::NewType
(
const fvMesh& mesh,
const word& thermoType
)
{
// get model name, but do not register the dictionary
// otherwise it is registered in the database twice
const word modelType
(
IOdictionary
(
IOobject
(
"thermophysicalProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
).lookup("thermoType")
);
if (modelType.find(thermoType) == string::npos)
{
wordList allModels = fvMeshConstructorTablePtr_->sortedToc();
DynamicList<word> validModels;
forAll(allModels, i)
{
if (allModels[i].find(thermoType) != string::npos)
{
validModels.append(allModels[i]);
}
}
FatalErrorIn
(
"autoPtr<rhoReactionThermo> rhoReactionThermo::NewType"
"("
"const fvMesh&, "
"const word&"
")"
) << "Inconsistent thermo package selected:" << nl << nl
<< modelType << nl << nl << "Please select a "
<< "thermo package based on " << thermoType
<< ". Valid options include:" << nl << validModels << nl
<< exit(FatalError);
}
Info<< "Selecting thermodynamics package " << modelType << endl;
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(modelType);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
FatalErrorIn
(
"autoPtr<rhoReactionThermo> rhoReactionThermo::NewType"
"("
"const fvMesh&, "
"const word&"
")"
) << "Unknown rhoReactionThermo type "
<< modelType << nl << nl
<< "Valid rhoReactionThermo types:" << nl
<< fvMeshConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
return autoPtr<rhoReactionThermo>(cstrIter()(mesh));
}
// ************************************************************************* //

61
src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H Normal file
View File

@ -0,0 +1,61 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Description
Macros for instantiating solid chemistry models
\*---------------------------------------------------------------------------*/
#ifndef makeSolidChemistryModel_H
#define makeSolidChemistryModel_H
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeSolidChemistryModel(SS, Comp, SThermo, GThermo) \
\
typedef SS<Comp, SThermo, GThermo> SS##Comp##SThermo##GThermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
SS##Comp##SThermo##GThermo, \
#SS"<"#Comp","#SThermo","#GThermo">", \
0 \
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

2
src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModels.C
View File

@ -30,7 +30,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "makeChemistryModel.H"
#include "makeSolidChemistryModel.H"
#include "ODESolidChemistryModel.H"
#include "solidChemistryModel.H"

5
src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
View File

@ -41,11 +41,6 @@ namespace Foam
#define makeSolidChemistrySolverType(SS, ODEChem, Comp, SThermo, GThermo) \
\
typedef ODESolidChemistryModel<Comp, SThermo, GThermo> \
ODESolidChemistryModel##Comp##SThermo##GThermo; \
\
makeChemistrySolver(ODESolidChemistryModel##Comp##SThermo##GThermo) \
\
typedef SS<ODEChem<Comp, SThermo, GThermo> > \
SS##ODEChem##Comp##SThermo##GThermo; \
\

28
src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H
View File

@ -41,30 +41,30 @@ SourceFiles
namespace Foam
{
template<class thermo> class constSolidRad;
template<class Thermo> class constSolidRad;
template<class thermo>
inline constSolidRad<thermo> operator*
template<class Thermo>
inline constSolidRad<Thermo> operator*
(
const scalar,
const constSolidRad<thermo>&
const constSolidRad<Thermo>&
);
template<class thermo>
template<class Thermo>
Ostream& operator<<
(
Ostream&,
const constSolidRad<thermo>&
const constSolidRad<Thermo>&
);
/*---------------------------------------------------------------------------*\
Class constSolidRad Declaration
\*---------------------------------------------------------------------------*/
template<class thermo>
template<class Thermo>
class constSolidRad
:
public thermo
public Thermo
{
// Private data
@ -81,7 +81,7 @@ class constSolidRad
//- Construct from components
inline constSolidRad
(
const thermo& t,
const Thermo& t,
const scalar kappaRad,
const scalar sigmaS,
const scalar emissivity
@ -107,6 +107,12 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return "const<" + Thermo::typeName() + '>';
}
//- Return absorption coefficient [1/m]
inline scalar kappaRad(scalar T) const;
@ -129,7 +135,7 @@ public:
// Friend operators
friend constSolidRad operator* <thermo>
friend constSolidRad operator* <Thermo>
(
const scalar,
const constSolidRad&
@ -138,7 +144,7 @@ public:
// Ostream Operator
friend Ostream& operator<< <thermo>
friend Ostream& operator<< <Thermo>
(
Ostream&,
const constSolidRad&

28
src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
View File

@ -45,20 +45,20 @@ SourceFiles
namespace Foam
{
template<class thermo> class constIsoSolidTransport;
template<class Thermo> class constIsoSolidTransport;
template<class thermo>
inline constIsoSolidTransport<thermo> operator*
template<class Thermo>
inline constIsoSolidTransport<Thermo> operator*
(
const scalar,
const constIsoSolidTransport<thermo>&
const constIsoSolidTransport<Thermo>&
);
template<class thermo>
template<class Thermo>
Ostream& operator<<
(
Ostream&,
const constIsoSolidTransport<thermo>&
const constIsoSolidTransport<Thermo>&
);
@ -66,10 +66,10 @@ Ostream& operator<<
Class constIsoSolidTransport Declaration
\*---------------------------------------------------------------------------*/
template<class thermo>
template<class Thermo>
class constIsoSolidTransport
:
public thermo
public Thermo
{
// Private data
@ -80,7 +80,7 @@ class constIsoSolidTransport
// Private Member Functions
//- Construct from components
inline constIsoSolidTransport(const thermo& t, const scalar kappa);
inline constIsoSolidTransport(const Thermo& t, const scalar kappa);
public:
@ -100,6 +100,12 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return "constIso<" + Thermo::typeName() + '>';
}
//- Isotropic thermal conductivity [W/mK]
inline scalar kappa(const scalar T) const;
@ -122,7 +128,7 @@ public:
// Friend operators
friend constIsoSolidTransport operator* <thermo>
friend constIsoSolidTransport operator* <Thermo>
(
const scalar,
const constIsoSolidTransport&
@ -131,7 +137,7 @@ public:
// Ostream Operator
friend Ostream& operator<< <thermo>
friend Ostream& operator<< <Thermo>
(
Ostream&,
const constIsoSolidTransport&

28
src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
View File

@ -42,20 +42,20 @@ SourceFiles
namespace Foam
{
template<class thermo> class exponentialSolidTransport;
template<class Thermo> class exponentialSolidTransport;
template<class thermo>
inline exponentialSolidTransport<thermo> operator*
template<class Thermo>
inline exponentialSolidTransport<Thermo> operator*
(
const scalar,
const exponentialSolidTransport<thermo>&
const exponentialSolidTransport<Thermo>&
);
template<class thermo>
template<class Thermo>
Ostream& operator<<
(
Ostream&,
const exponentialSolidTransport<thermo>&
const exponentialSolidTransport<Thermo>&
);
@ -63,10 +63,10 @@ Ostream& operator<<
Class exponentialSolidTransport Declaration
\*---------------------------------------------------------------------------*/
template<class thermo>
template<class Thermo>
class exponentialSolidTransport
:
public thermo
public Thermo
{
// Private data
@ -85,7 +85,7 @@ class exponentialSolidTransport
//- Construct from components
inline exponentialSolidTransport
(
const thermo& t,
const Thermo& t,
const scalar kappa0,
const scalar n0,
const scalar Tref
@ -110,6 +110,12 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return "exponential<" + Thermo::typeName() + '>';
}
//- Thermal conductivity [W/mK]
inline scalar kappa(const scalar T) const;
@ -132,7 +138,7 @@ public:
// Friend operators
friend exponentialSolidTransport operator* <thermo>
friend exponentialSolidTransport operator* <Thermo>
(
const scalar,
const exponentialSolidTransport&
@ -140,7 +146,7 @@ public:
// Ostream Operator
friend Ostream& operator<< <thermo>
friend Ostream& operator<< <Thermo>
(
Ostream&,
const exponentialSolidTransport&

53
src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C
View File

@ -28,10 +28,9 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class MixtureType, class BasicSolidThermo>
void Foam::heSolidThermo<MixtureType, BasicSolidThermo>::calculate()
template<class BasicSolidThermo, class MixtureType>
void Foam::heSolidThermo<BasicSolidThermo, MixtureType>::calculate()
{
scalarField& TCells = this->T_.internalField();
const scalarField& hCells = this->he_.internalField();
@ -123,8 +122,8 @@ void Foam::heSolidThermo<MixtureType, BasicSolidThermo>::calculate()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class MixtureType, class BasicSolidThermo>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::
template<class BasicSolidThermo, class MixtureType>
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::
heSolidThermo(const fvMesh& mesh)
:
heThermo<BasicSolidThermo, MixtureType>(mesh)
@ -133,8 +132,8 @@ heSolidThermo(const fvMesh& mesh)
}
template<class MixtureType, class BasicSolidThermo>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::
template<class BasicSolidThermo, class MixtureType>
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::
heSolidThermo(const fvMesh& mesh, const dictionary& dict)
:
heThermo<BasicSolidThermo, MixtureType>(mesh, dict)
@ -145,15 +144,15 @@ heSolidThermo(const fvMesh& mesh, const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class MixtureType, class BasicSolidThermo>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::~heSolidThermo()
template<class BasicSolidThermo, class MixtureType>
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::~heSolidThermo()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class MixtureType, class BasicSolidThermo>
void Foam::heSolidThermo<MixtureType, BasicSolidThermo>::correct()
template<class BasicSolidThermo, class MixtureType>
void Foam::heSolidThermo<BasicSolidThermo, MixtureType>::correct()
{
if (debug)
{
@ -169,9 +168,9 @@ void Foam::heSolidThermo<MixtureType, BasicSolidThermo>::correct()
}
template<class MixtureType, class BasicSolidThermo>
template<class BasicSolidThermo, class MixtureType>
Foam::tmp<Foam::volVectorField>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::Kappa() const
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::Kappa() const
{
const fvMesh& mesh = this->T_.mesh();
@ -231,9 +230,9 @@ Foam::heSolidThermo<MixtureType, BasicSolidThermo>::Kappa() const
}
template<class MixtureType, class BasicSolidThermo>
template<class BasicSolidThermo, class MixtureType>
Foam::tmp<Foam::volScalarField>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::kappaRad() const
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::kappaRad() const
{
const fvMesh& mesh = this->T_.mesh();
@ -293,9 +292,9 @@ Foam::heSolidThermo<MixtureType, BasicSolidThermo>::kappaRad() const
}
template<class MixtureType, class BasicSolidThermo>
template<class BasicSolidThermo, class MixtureType>
Foam::tmp<Foam::volScalarField>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::sigmaS() const
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::sigmaS() const
{
const fvMesh& mesh = this->T_.mesh();
@ -355,9 +354,9 @@ Foam::heSolidThermo<MixtureType, BasicSolidThermo>::sigmaS() const
}
template<class MixtureType, class BasicSolidThermo>
template<class BasicSolidThermo, class MixtureType>
Foam::tmp<Foam::volScalarField>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::emissivity() const
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::emissivity() const
{
const fvMesh& mesh = this->T_.mesh();
@ -417,9 +416,9 @@ Foam::heSolidThermo<MixtureType, BasicSolidThermo>::emissivity() const
}
template<class MixtureType, class BasicSolidThermo>
template<class BasicSolidThermo, class MixtureType>
Foam::tmp<Foam::vectorField>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::Kappa
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::Kappa
(
const label patchi
) const
@ -446,9 +445,9 @@ Foam::heSolidThermo<MixtureType, BasicSolidThermo>::Kappa
}
template<class MixtureType, class BasicSolidThermo>
template<class BasicSolidThermo, class MixtureType>
Foam::tmp<Foam::scalarField>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::kappaRad
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::kappaRad
(
const label patchi
) const
@ -474,9 +473,9 @@ Foam::heSolidThermo<MixtureType, BasicSolidThermo>::kappaRad
}
template<class MixtureType, class BasicSolidThermo>
template<class BasicSolidThermo, class MixtureType>
Foam::tmp<Foam::scalarField>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::sigmaS
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::sigmaS
(
const label patchi
) const
@ -503,9 +502,9 @@ Foam::heSolidThermo<MixtureType, BasicSolidThermo>::sigmaS
}
template<class MixtureType, class BasicSolidThermo>
template<class BasicSolidThermo, class MixtureType>
Foam::tmp<Foam::scalarField>
Foam::heSolidThermo<MixtureType, BasicSolidThermo>::emissivity
Foam::heSolidThermo<BasicSolidThermo, MixtureType>::emissivity
(
const label patchi
) const

6
src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H
View File

@ -36,8 +36,6 @@ SourceFiles
#define heSolidThermo_H
#include "heThermo.H"
#include "solidThermo.H"
#include "coordinateSystem.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -48,7 +46,7 @@ namespace Foam
Class heSolidThermo Declaration
\*---------------------------------------------------------------------------*/
template<class MixtureType, class BasicSolidThermo>
template<class BasicSolidThermo, class MixtureType>
class heSolidThermo
:
public heThermo<BasicSolidThermo, MixtureType>
@ -60,7 +58,7 @@ class heSolidThermo
void calculate();
//- Construct as copy (not implemented)
heSolidThermo(const heSolidThermo<MixtureType, BasicSolidThermo>&);
heSolidThermo(const heSolidThermo<BasicSolidThermo, MixtureType>&);
public:

1
src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H
View File

@ -208,7 +208,6 @@ public:
//- Specific heat capacity
virtual scalar Cp(scalar p, scalar T, label celli) const = 0;
};

3
src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
View File

@ -82,9 +82,6 @@ public:
//- The type of thermodynamics this mixture is instantiated for
typedef ThermoType thermoType;
//- Runtime type information
TypeName("multiComponentSolidMixture");
// Constructors

4
src/thermophysicalModels/solidThermo/mixtures/pureSolidMixture/pureSolidMixture.H
View File

@ -65,10 +65,6 @@ public:
typedef ThermoType thermoType;
//- Runtime type information
TypeName("pureSolidMixture");
// Constructors
//- Construct from dictionary and mesh

2
src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H
View File

@ -67,8 +67,6 @@ public:
//- The type of thermo package this mixture is instantiated for
typedef ThermoSolidType thermoType;
//- Runtime type information
TypeName("reactingSolidMixture");
// Constructors

3
src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C
View File

@ -72,7 +72,8 @@ Foam::autoPtr<Foam::solidReactionThermo> Foam::solidReactionThermo::New
Foam::autoPtr<Foam::solidReactionThermo> Foam::solidReactionThermo::New
(
const fvMesh& mesh, const dictionary& dict
const fvMesh& mesh,
const dictionary& dict
)
{
if (debug)

110
src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
View File

@ -39,59 +39,7 @@ Description
#define makeSolidThermo(BaseThermo,Cthermo,Mixture,Transport,Radiation,Type,Thermo,EqnOfState,Specie)\
\
typedef Cthermo \
< \
Mixture \
< \
Transport \
< \
Radiation \
< \
species::thermo \
< \
Thermo \
< \
EqnOfState \
< \
Specie \
> \
>, \
Type \
> \
> \
> \
>, \
BaseThermo \
> Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie##BaseThermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie##BaseThermo, \
#Cthermo \
"<" \
#Mixture \
"<" \
#Transport \
"<" \
#Radiation \
"<" \
#Thermo \
"<" \
#EqnOfState \
"<" \
#Specie \
">" \
">," \
#Type \
">>>>", \
0 \
); \
\
\
typedef Mixture \
< \
typedef \
Transport \
< \
Radiation \
@ -108,41 +56,39 @@ typedef Mixture \
Type \
> \
> \
> \
> Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie; \
> Transport##Radiation##Type##Thermo##EqnOfState##Specie; \
\
typedef \
Mixture \
< \
Transport##Radiation##Type##Thermo##EqnOfState##Specie \
> Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie; \
\
typedef \
Cthermo \
< \
BaseThermo, \
Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie \
> Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie; \
\
defineTemplateTypeNameAndDebugWithName \
( \
Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie, \
#Mixture \
"<" \
#Transport \
"<" \
#Radiation \
"<" \
#Thermo \
"<" \
#EqnOfState \
">," \
#Type \
">>>", \
0 \
); \
\
addToRunTimeSelectionTable \
( \
BaseThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie##BaseThermo, \
mesh \
##EqnOfState##Specie, \
( \
#Cthermo"<"#Mixture"<" \
+ Transport##Radiation##Type##Thermo##EqnOfState##Specie::typeName() \
+ ">>" \
).c_str(), \
0 \
); \
\
addToRunTimeSelectionTable \
( \
basicThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie##BaseThermo, \
##EqnOfState##Specie, \
fvMesh \
); \
\
@ -150,7 +96,15 @@ addToRunTimeSelectionTable \
( \
BaseThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie##BaseThermo, \
##EqnOfState##Specie, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
BaseThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie, \
dictionary \
);

2
src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C
View File

@ -32,7 +32,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(solidThermo, 0);
defineRunTimeSelectionTable(solidThermo, mesh);
defineRunTimeSelectionTable(solidThermo, fvMesh);
defineRunTimeSelectionTable(solidThermo, dictionary);
}

3
src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
View File

@ -77,12 +77,11 @@ public:
(
autoPtr,
solidThermo,
mesh,
fvMesh,
(const fvMesh& mesh),
(mesh)
);
// Declare run-time constructor selection tables
declareRunTimeSelectionTable
(

8
src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C
View File

@ -55,10 +55,10 @@ Foam::autoPtr<Foam::solidThermo> Foam::solidThermo::New
).lookup("thermoType")
);
meshConstructorTable::iterator cstrIter =
meshConstructorTablePtr_->find(thermoType);
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(thermoType);
if (cstrIter == meshConstructorTablePtr_->end())
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
FatalErrorIn
(
@ -66,7 +66,7 @@ Foam::autoPtr<Foam::solidThermo> Foam::solidThermo::New
) << "Unknown solidThermo type " << thermoType
<< endl << endl
<< "Valid solidThermo types are :" << endl
<< meshConstructorTablePtr_->toc()
<< fvMeshConstructorTablePtr_->toc()
<< exit(FatalError);
}

7
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
View File

@ -137,6 +137,13 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return "icoPolynomial<" + word(Specie::typeName_()) + '>';
}
// Fundamental properties
//- Is the equation of state is incompressible i.e. rho != f(p)

9
src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
View File

@ -135,6 +135,15 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return
"incompressiblePerfectGas<"
+ word(Specie::typeName_()) + '>';
}
// Fundamental properties
//- Is the equation of state is incompressible i.e. rho != f(p)

7
src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
View File

@ -121,6 +121,13 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return "perfectGas<" + word(Specie::typeName_()) + '>';
}
// Fundamental properties
//- Is the equation of state is incompressible i.e. rho != f(p)

7
src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
View File

@ -123,6 +123,13 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return "rhoConst<" + word(Specie::typeName_()) + '>';
}
// Fundamental properties
//- Is the equation of state is incompressible i.e. rho != f(p)

92
src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
View File

@ -1,92 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "reactionTypes.H"
#include "makeReaction.H"
#include "ArrheniusReactionRate.H"
#include "infiniteReactionRate.H"
#include "LandauTellerReactionRate.H"
#include "thirdBodyArrheniusReactionRate.H"
#include "ChemicallyActivatedReactionRate.H"
#include "JanevReactionRate.H"
#include "powerSeriesReactionRate.H"
#include "FallOffReactionRate.H"
#include "LindemannFallOffFunction.H"
#include "SRIFallOffFunction.H"
#include "TroeFallOffFunction.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTemplateTypeNameAndDebug(gasReaction, 0);
defineTemplateRunTimeSelectionTable(gasReaction, Istream);
defineTemplateRunTimeSelectionTable(gasReaction, dictionary);
// * * * * * * * * * * * * * Make CHEMKIN reactions * * * * * * * * * * * * //
makeIRNReactions(gasThermoPhysics, ArrheniusReactionRate)
makeIRNReactions(gasThermoPhysics, infiniteReactionRate)
makeIRNReactions(gasThermoPhysics, LandauTellerReactionRate)
makeIRNReactions(gasThermoPhysics, thirdBodyArrheniusReactionRate)
makeIRReactions(gasThermoPhysics, JanevReactionRate)
makeIRReactions(gasThermoPhysics, powerSeriesReactionRate)
makePressureDependentReactions
(
gasThermoPhysics,
ArrheniusReactionRate,
LindemannFallOffFunction
)
makePressureDependentReactions
(
gasThermoPhysics,
ArrheniusReactionRate,
TroeFallOffFunction
)
makePressureDependentReactions
(
gasThermoPhysics,
ArrheniusReactionRate,
SRIFallOffFunction
)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //

6
src/thermophysicalModels/specie/thermo/absoluteEnthalpy/absoluteEnthalpy.H
View File

@ -57,6 +57,12 @@ public:
// Member Functions
//- Return the instantiated type name
static word typeName()
{
return "absoluteEnthalpy";
}
// Fundamental properties
static word name()

7
src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
View File

@ -135,9 +135,16 @@ public:
// Member Functions
//- Return the instantiated type name
static word typeName()
{
return "eConst<" + EquationOfState::typeName() + '>';
}
//- Limit the temperature to be in the range Tlow_ to Thigh_
inline scalar limit(const scalar T) const;
// Fundamental properties
//- Heat capacity at constant pressure [J/(kmol K)]

59
src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
View File

@ -44,41 +44,41 @@ namespace Foam
// Forward declaration of friend functions and operators
template<class equationOfState> class hConstThermo;
template<class EquationOfState> class hConstThermo;
template<class equationOfState>
inline hConstThermo<equationOfState> operator+
template<class EquationOfState>
inline hConstThermo<EquationOfState> operator+
(
const hConstThermo<equationOfState>&,
const hConstThermo<equationOfState>&
const hConstThermo<EquationOfState>&,
const hConstThermo<EquationOfState>&
);
template<class equationOfState>
inline hConstThermo<equationOfState> operator-
template<class EquationOfState>
inline hConstThermo<EquationOfState> operator-
(
const hConstThermo<equationOfState>&,
const hConstThermo<equationOfState>&
const hConstThermo<EquationOfState>&,
const hConstThermo<EquationOfState>&
);
template<class equationOfState>
inline hConstThermo<equationOfState> operator*
template<class EquationOfState>
inline hConstThermo<EquationOfState> operator*
(
const scalar,
const hConstThermo<equationOfState>&
const hConstThermo<EquationOfState>&
);
template<class equationOfState>
inline hConstThermo<equationOfState> operator==
template<class EquationOfState>
inline hConstThermo<EquationOfState> operator==
(
const hConstThermo<equationOfState>&,
const hConstThermo<equationOfState>&
const hConstThermo<EquationOfState>&,
const hConstThermo<EquationOfState>&
);
template<class equationOfState>
template<class EquationOfState>
Ostream& operator<<
(
Ostream&,
const hConstThermo<equationOfState>&
const hConstThermo<EquationOfState>&
);
@ -86,10 +86,10 @@ Ostream& operator<<
Class hConstThermo Declaration
\*---------------------------------------------------------------------------*/
template<class equationOfState>
template<class EquationOfState>
class hConstThermo
:
public equationOfState
public EquationOfState
{
// Private data
@ -102,7 +102,7 @@ class hConstThermo
//- Construct from components
inline hConstThermo
(
const equationOfState& st,
const EquationOfState& st,
const scalar cp,
const scalar hf
);
@ -133,9 +133,16 @@ public:
// Member Functions
//- Return the instantiated type name
static word typeName()
{
return "hConst<" + EquationOfState::typeName() + '>';
}
//- Limit the temperature to be in the range Tlow_ to Thigh_
inline scalar limit(const scalar T) const;
// Fundamental properties
//- Heat capacity at constant pressure [J/(kmol K)]
@ -168,25 +175,25 @@ public:
// Friend operators
friend hConstThermo operator+ <equationOfState>
friend hConstThermo operator+ <EquationOfState>
(
const hConstThermo&,
const hConstThermo&
);
friend hConstThermo operator- <equationOfState>
friend hConstThermo operator- <EquationOfState>
(
const hConstThermo&,
const hConstThermo&
);
friend hConstThermo operator* <equationOfState>
friend hConstThermo operator* <EquationOfState>
(
const scalar,
const hConstThermo&
);
friend hConstThermo operator== <equationOfState>
friend hConstThermo operator== <EquationOfState>
(
const hConstThermo&,
const hConstThermo&
@ -195,7 +202,7 @@ public:
// IOstream Operators
friend Ostream& operator<< <equationOfState>
friend Ostream& operator<< <EquationOfState>
(
Ostream&,
const hConstThermo&

28
src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermo.H
View File

@ -46,21 +46,21 @@ SourceFiles
namespace Foam
{
template<class equationOfState> class hExponentialThermo;
template<class EquationOfState> class hExponentialThermo;
template<class equationOfState>
inline hExponentialThermo<equationOfState> operator*
template<class EquationOfState>
inline hExponentialThermo<EquationOfState> operator*
(
const scalar,
const hExponentialThermo<equationOfState>&
const hExponentialThermo<EquationOfState>&
);
template<class equationOfState>
template<class EquationOfState>
Ostream& operator<<
(
Ostream&,
const hExponentialThermo<equationOfState>&
const hExponentialThermo<EquationOfState>&
);
@ -68,10 +68,10 @@ Ostream& operator<<
Class hExponentialThermo Declaration
\*---------------------------------------------------------------------------*/
template<class equationOfState>
template<class EquationOfState>
class hExponentialThermo
:
public equationOfState
public EquationOfState
{
// Private data
@ -98,7 +98,7 @@ public:
//- Construct from components
inline hExponentialThermo
(
const equationOfState& st,
const EquationOfState& st,
const scalar c0,
const scalar n0,
const scalar Tref,
@ -118,6 +118,12 @@ public:
// Member Functions
//- Return the instantiated type name
static word typeName()
{
return "hExponential<" + EquationOfState::typeName() + '>';
}
//- Limit the temperature to be in the range Tlow_ to Thigh_
inline scalar limit(const scalar T) const;
@ -153,7 +159,7 @@ public:
// Friend operators
friend hExponentialThermo operator* <equationOfState>
friend hExponentialThermo operator* <EquationOfState>
(
const scalar,
const hExponentialThermo&
@ -162,7 +168,7 @@ public:
// Ostream Operator
friend Ostream& operator<< <equationOfState>
friend Ostream& operator<< <EquationOfState>
(
Ostream&,
const hExponentialThermo&

7
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
View File

@ -151,9 +151,16 @@ public:
// Member Functions
//- Return the instantiated type name
static word typeName()
{
return "hPolynomial<" + EquationOfState::typeName() + '>';
}
//- Limit the temperature to be in the range Tlow_ to Thigh_
inline scalar limit(const scalar) const;
// Fundamental properties
//- Heat capacity at constant pressure [J/(kmol K)]

6
src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
View File

@ -150,6 +150,12 @@ public:
// Member Functions
//- Return the instantiated type name
static word typeName()
{
return "janaf<" + EquationOfState::typeName() + '>';
}
//- Limit the temperature to be in the range Tlow_ to Thigh_
inline scalar limit(const scalar T) const;

6
src/thermophysicalModels/specie/thermo/sensibleEnthalpy/sensibleEnthalpy.H
View File

@ -57,6 +57,12 @@ public:
// Member Functions
//- Return the instantiated type name
static word typeName()
{
return "sensibleEnthalpy";
}
// Fundamental properties
static word name()

6
src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
View File

@ -57,6 +57,12 @@ public:
// Member Functions
//- Return the instantiated type name
static word typeName()
{
return "sensibleInternalEnergy";
}
// Fundamental properties
static word name()

8
src/thermophysicalModels/specie/thermo/thermo/thermo.H
View File

@ -139,6 +139,14 @@ public:
// Member Functions
//- Return the instantiated type name
static word typeName()
{
return
Thermo::typeName() + ','
+ Type<thermo<Thermo, Type> >::typeName();
}
// Fundamental properties
// (These functions must be provided in derived types)

6
src/thermophysicalModels/specie/transport/const/constTransport.H
View File

@ -137,6 +137,12 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return "const<" + Thermo::typeName() + '>';
}
//- Dynamic viscosity [kg/ms]
inline scalar mu(const scalar p, const scalar T) const;

6
src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
View File

@ -142,6 +142,12 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return "polynomial<" + Thermo::typeName() + '>';
}
//- Dynamic viscosity [kg/ms]
inline scalar mu(const scalar p, const scalar T) const;

6
src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
View File

@ -156,6 +156,12 @@ public:
// Member functions
//- Return the instantiated type name
static word typeName()
{
return "sutherland<" + Thermo::typeName() + '>';
}
//- Dynamic viscosity [kg/ms]
inline scalar mu(const scalar p, const scalar T) const;

4
tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type heheuReactionThermo;
mixture inhomogeneousMixture;
transport sutherlandTransport;
thermo janafThermo;
transport sutherland;
thermo janaf;
equationOfState perfectGas;
specie specie;
energy absoluteEnthalpy;

4
tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type heheuReactionThermo;
mixture homogeneousMixture;
transport sutherlandTransport;
thermo janafThermo;
transport sutherland;
thermo janaf;
equationOfState perfectGas;
specie specie;
energy absoluteEnthalpy;

8
tutorials/combustion/chemFoam/gri/constant/chemistryProperties
View File

@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
}
chemistry on;
initialChemicalTimeStep 1e-10;
chemistrySolver ode;
odeCoeffs
{
solver SIBS;

11
tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
View File

@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
thermoType
{
type hePsiReactionThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";

8
tutorials/combustion/chemFoam/h2/constant/chemistryProperties
View File

@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
}
chemistry on;
initialChemicalTimeStep 1e-10;
chemistrySolver ode;
odeCoeffs
{
solver SIBS;

11
tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
View File

@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
thermoType
{
type hePsiReactionThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";

8
tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
View File

@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
}
chemistry on;
initialChemicalTimeStep 1e-10;
chemistrySolver ode;
odeCoeffs
{
solver SIBS;

11
tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
View File

@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
thermoType
{
type hePsiReactionThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";

8
tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
View File

@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
}
chemistry on;
initialChemicalTimeStep 1e-10;
chemistrySolver ode;
odeCoeffs
{
solver SIBS;

11
tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
View File

@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
thermoType
{
type hePsiReactionThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";

4
tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type heheuReactionThermo;
mixture inhomogeneousMixture;
transport sutherlandTransport;
thermo janafThermo;
transport sutherland;
thermo janaf;
equationOfState perfectGas;
specie specie;
energy absoluteEnthalpy;

2
tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<reactingSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<reactingSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
solidComponents
(

14
tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
View File

@ -1,11 +1,10 @@
/*---------------------------------------------------------------------------*\
/*--------------------------------*- 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;
@ -16,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiReactionThermo<singleStepReactingMixture<gasThermoPhysics>>;
thermoType
{
type hePsiReactionThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;
}
inertSpecie N2;

11
tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
View File

@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiReactionThermo<singleStepReactingMixture<gasThermoPhysics>>;
thermoType
{
type hePsiReactionThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;
}
inertSpecie N2;

8
tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
View File

@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver noChemistrySolver;
}
chemistry off;
turbulentReaction off;
chemistrySolver noChemistrySolver;
initialChemicalTimeStep 1e-07;

11
tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
View File

@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiReactionThermo<singleStepReactingMixture<gasThermoPhysics>>;
thermoType
{
type hePsiReactionThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;
}
inertSpecie N2;

8
tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
View File

@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
}
chemistry on;
chemistrySolver ode;
initialChemicalTimeStep 1e-07;
sequentialCoeffs

11
tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
View File

@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
thermoType
{
type hePsiReactionThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;
}
inertSpecie N2;

4
tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport sutherlandTransport;
thermo hConstThermo;
transport sutherland;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport sutherlandTransport;
thermo janafThermo;
transport sutherland;
thermo janaf;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

4
tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport sutherlandTransport;
thermo hConstThermo;
transport sutherland;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

4
tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

4
tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport sutherlandTransport;
thermo hConstThermo;
transport sutherland;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

4
tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport sutherlandTransport;
thermo hConstThermo;
transport sutherland;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

4
tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport sutherlandTransport;
thermo hConstThermo;
transport sutherland;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

4
tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
transport sutherlandTransport;
thermo hConstThermo;
transport sutherland;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport sutherlandTransport;
thermo hConstThermo;
transport sutherland;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;

4
tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

4
tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

4
tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

2
tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
View File

@ -110,7 +110,7 @@ dictionaryReplacement
// Solid thermo
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture

6
tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
View File

@ -15,14 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
// thermoType hePsiThermo<pureMixture<const<hConst<perfectGas<specie>>,sensibleEnthalpy>>>;
thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;

4
tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

4
tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

4
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
View File

@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
transport const;
thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

Some files were not shown because too many files have changed in this diff Show More