diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index d938fb77a25e973ebe87a3aeb071195546217b05..f1ac31e4593d968bde59175420cf1e82e93a2b92 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -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);
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
index 99fe8cacc25048209c61b3535c5565d2877f308b..e59e2b6a268369c93a09c1e134e9effd43efae5f 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
@@ -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);
diff --git a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
index 0219106012d42dd050a8ababbc6d19b34da96274..21f430269be0761637ccf25af58158e8ef39f3fb 100644
--- a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
+++ b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
@@ -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 \
);
diff --git a/src/thermophysicalModels/chemistryModel/Make/files b/src/thermophysicalModels/chemistryModel/Make/files
index f78853a7ea1f5b3767f609512f81f7c4c812a94e..ef8c6d84c8daadc915281410fce1a2d4a44feeb0 100644
--- a/src/thermophysicalModels/chemistryModel/Make/files
+++ b/src/thermophysicalModels/chemistryModel/Make/files
@@ -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
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
index da54d4c91665ec5d871b5e753f8a84951e128907..67704bb9df1b32bebb5e38357590260e4b6c5098 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
@@ -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
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H
index 404f758b1b1c675e2a76ac05a700ea59fc61baf1..c0ae64edf456f1b9c998724ad3e259dd53bdf417 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/makeChemistryModel.H
@@ -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 \
);
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
index ce0579eca20e24c4a295c287e26d076aa4ed71c3..933dd952ba96c6730fdb71271b6b3cab21296687 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C
@@ -48,6 +48,17 @@ Foam::psiChemistryModel::psiChemistryModel
{}
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::psiChemistryModel> Foam::psiChemistryModel::New
+(
+ const fvMesh& mesh
+)
+{
+ return basicChemistryModel::New<psiChemistryModel>(mesh);
+}
+
+
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::psiChemistryModel::~psiChemistryModel()
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C
deleted file mode 100644
index 795b48fbb8f137145c956621e7179872798ddc09..0000000000000000000000000000000000000000
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C
+++ /dev/null
@@ -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));
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
index 1bdad2d06ca96dd6ab9123b66e4fd2fc91395108..f8b033d68a07744214e0bbb3fa7e11e176bbbd2b 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C
@@ -48,6 +48,17 @@ Foam::rhoChemistryModel::rhoChemistryModel
{}
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::rhoChemistryModel> Foam::rhoChemistryModel::New
+(
+ const fvMesh& mesh
+)
+{
+ return basicChemistryModel::New<rhoChemistryModel>(mesh);
+}
+
+
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::rhoChemistryModel::~rhoChemistryModel()
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C
deleted file mode 100644
index ceb73d07d779a19a40f3e317687a7482c6279749..0000000000000000000000000000000000000000
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C
+++ /dev/null
@@ -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));
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
index f8348150b0d86b60e9a5ca9fd50bcbfb0edb4da6..dfbb29ecd0e252dc20e2c530febe31bebd3964f0 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
@@ -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
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
index 2523e9cefa7710040f821b8057d674d4ecf5c53f..f9ab5839c36086dacb5dd4606c5bb93f3c0efded 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H
@@ -37,11 +37,26 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makeChemistrySolverTypes(CompChemModel,Thermo) \
+#define makeChemistrySolverType(SS, ODEChem, Comp, Thermo) \
\
- typedef ODEChemistryModel<CompChemModel, Thermo> CompChemModel##Thermo; \
+ typedef SS<ODEChem<Comp, Thermo> > SS##ODEChem##Comp##Thermo; \
\
- makeChemistrySolver(CompChemModel##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) \
\
makeChemistrySolverType \
( \
diff --git a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
index 37221d10909903ee742322c65479f2c92aec29d8..3b88008e04c5532008b1a33b48c5b96a194d1ca7 100644
--- a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
@@ -31,103 +31,76 @@ 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)
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index 30feeb88b8de19570b67ca7b76ee812e480be9bf..0665f89e8019e577f4ae9fd8eedf56bde36a2d51 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -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)
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
index fd4e2d6d3688e4d446fae65406e6a00af68d10ff..7ff3f054e3adfc9a42567bfbf2835eca07fd1121 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
@@ -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)
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
index 4b02137b257eb70e9c82142323bd8502095eb490..c2421db5d84bb2be04f74548579188a110819418 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
@@ -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)
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
index 5eccbbc233bb953216f9de316a4e52b87c1f7e27..ac7d62b891a10895d5cae0c67a4f13952752222b 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
@@ -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)
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
deleted file mode 100644
index 67ef382fac635d5b1b67f6bc889ae4a72b9c953e..0000000000000000000000000000000000000000
--- a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
+++ /dev/null
@@ -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
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermo/absoluteEnthalpy/absoluteEnthalpy.H b/src/thermophysicalModels/specie/thermo/absoluteEnthalpy/absoluteEnthalpy.H
index d374a81d0bd35006408e62cf29b6b034d180047e..98bf51e03f0668ce2b327a5f00f36ada3b925852 100644
--- a/src/thermophysicalModels/specie/thermo/absoluteEnthalpy/absoluteEnthalpy.H
+++ b/src/thermophysicalModels/specie/thermo/absoluteEnthalpy/absoluteEnthalpy.H
@@ -57,6 +57,12 @@ public:
// Member Functions
+ //- Return the instantiated type name
+ static word typeName()
+ {
+ return "absoluteEnthalpy";
+ }
+
// Fundamental properties
static word name()
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
index 378a39c059302236dc4124d5db69732079173a9b..7e0781cc401b978e07c6001c3a857fd550cf2f47 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
@@ -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)]
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
index 14068fbaef6fc3a8519d20dd5c2f867df9583e4b..f3bf0522093d61319dce6b1bdc32d137c8f8e7c8 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
@@ -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&
diff --git a/src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermo.H b/src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermo.H
index 956f6d8846801c683bc8e3bd9001b473171ae5b1..a54dfafcdafad73118e07afa627fab35fc0fd89b 100644
--- a/src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermo.H
@@ -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&
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
index 1465c94f2a7e24045e44f1237703e700e8a625d6..a0b557f215a9b35bff15b48a7a1ad3f902e312d3 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
@@ -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)]
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
index 9407336600cccf63ada4a81c0ede9ae37a50dd35..3fa4f8dd08e8fa5387bed0a6d7c1096bbcc882e9 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
@@ -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;
diff --git a/src/thermophysicalModels/specie/thermo/sensibleEnthalpy/sensibleEnthalpy.H b/src/thermophysicalModels/specie/thermo/sensibleEnthalpy/sensibleEnthalpy.H
index e09e2a61f9e04468f1bfe4433601baff04cfb9f4..07cf5a27654907cb9a4394e209e283fcd3937449 100644
--- a/src/thermophysicalModels/specie/thermo/sensibleEnthalpy/sensibleEnthalpy.H
+++ b/src/thermophysicalModels/specie/thermo/sensibleEnthalpy/sensibleEnthalpy.H
@@ -57,6 +57,12 @@ public:
// Member Functions
+ //- Return the instantiated type name
+ static word typeName()
+ {
+ return "sensibleEnthalpy";
+ }
+
// Fundamental properties
static word name()
diff --git a/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H b/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
index ddc48a2df07ab18c76de153e5a392f0790f192d4..7adf3e34d70aedbe5867a37571b97916f1bfe03b 100644
--- a/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
+++ b/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
@@ -57,6 +57,12 @@ public:
// Member Functions
+ //- Return the instantiated type name
+ static word typeName()
+ {
+ return "sensibleInternalEnergy";
+ }
+
// Fundamental properties
static word name()
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
index 07c84553e6bb5e3de874baf9eb6a3a7cb88898cb..bacceb36bc1b5a368c6124f48c6332e3bc095de9 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermo.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
@@ -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)
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H
index 33ebaa390906aa604e2003532f494d3f595a7182..c1e3120000c6a541fec680e8da07e744fddd1276 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.H
@@ -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;
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
index eeb223aa2959cd31012ac8c11bfdaf49d857c235..85ec167256d409b75362344730b16dd6026dcdf3 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
@@ -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;
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
index 5e91c15b76315f108f85e0271865f6c0cef2cff0..f8ac0722dd6178efda9d62653d2c218c1b68c1fd 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
@@ -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;
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
index c7426d104eb10bcc25ec7208dd6d20f3a3efa1fd..301c1d79867fa3a5f809bfa50664f60a812ede01 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heheuReactionThermo;
mixture inhomogeneousMixture;
- transport sutherlandTransport;
- thermo janafThermo;
+ transport sutherland;
+ thermo janaf;
equationOfState perfectGas;
specie specie;
energy absoluteEnthalpy;
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
index d265c0bc1aab07c1915ff3851751128868b13cc4..9c8539a6ab967e9a30bab742609fdc211cd1f518 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heheuReactionThermo;
mixture homogeneousMixture;
- transport sutherlandTransport;
- thermo janafThermo;
+ transport sutherland;
+ thermo janaf;
equationOfState perfectGas;
specie specie;
energy absoluteEnthalpy;
diff --git a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
index 6adffc7f8150b3da751db86a6ab9d30fe9807660..65f5b0ac6da987f2e4d52bd135275e80d5585a3a 100644
--- a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver ode;
+}
chemistry on;
initialChemicalTimeStep 1e-10;
-chemistrySolver ode;
-
odeCoeffs
{
solver SIBS;
diff --git a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
index 3c5e475229c466cab0685e5f2cafbb2db6d61340..d6cb3dd45f2f38644cca244a5afb752f3b41e1b6 100644
--- a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
@@ -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";
diff --git a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
index 5f797c7bdb2a60c5bed0f6a214791d87a6c10870..b0ebc946d44e6effe9605e767a7fc29f23f5bef4 100644
--- a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver ode;
+}
chemistry on;
initialChemicalTimeStep 1e-10;
-chemistrySolver ode;
-
odeCoeffs
{
solver SIBS;
diff --git a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
index 3c5e475229c466cab0685e5f2cafbb2db6d61340..d6cb3dd45f2f38644cca244a5afb752f3b41e1b6 100644
--- a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
@@ -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";
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
index b635af7f793e4483d3e75396b408602ff4f751c2..07d0e5d36e190fa1b2998afa5a12d810a29df4a4 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver ode;
+}
chemistry on;
initialChemicalTimeStep 1e-10;
-chemistrySolver ode;
-
odeCoeffs
{
solver SIBS;
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
index 3c5e475229c466cab0685e5f2cafbb2db6d61340..d6cb3dd45f2f38644cca244a5afb752f3b41e1b6 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
@@ -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";
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
index 46ee84b7ba882efe057a41cd1020a35943a03ea7..277f2632bebabe3616a24666c8186a7d0ce6257c 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver ode;
+}
chemistry on;
initialChemicalTimeStep 1e-10;
-chemistrySolver ode;
-
odeCoeffs
{
solver SIBS;
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
index 3c5e475229c466cab0685e5f2cafbb2db6d61340..d6cb3dd45f2f38644cca244a5afb752f3b41e1b6 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
@@ -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";
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
index 29f628b4dc0561baea5052058bb159397effb6b3..4946ebff2a9b47c0259b6b83ec1cdc37704aab63 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heheuReactionThermo;
mixture inhomogeneousMixture;
- transport sutherlandTransport;
- thermo janafThermo;
+ transport sutherland;
+ thermo janaf;
equationOfState perfectGas;
specie specie;
energy absoluteEnthalpy;
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
index 9c79a06e636944ac919b1b45e715f5c9b9e69219..57e0ddc7b1cbe8c60b16d82936dd4e5594b62c39 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<reactingSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType heSolidThermo<reactingSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
solidComponents
(
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
index 633ba624918cfa81d5455766a29ffea902a96fc7..446c37a397748ded8db786ea13efbe391e50043f 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
@@ -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;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
index 7e40fa183563461ec91f2a06d2d057f8de0dae24..4610e63a5a4e7cc06c42bf096e21e1546e53c583 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
@@ -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;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
index e4a61879bf13f34a1566c79054cc840de44b2b32..103c36caab0e59ab3e00842450f5e7455054ade3 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
@@ -15,14 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver noChemistrySolver;
+}
chemistry off;
turbulentReaction off;
-chemistrySolver noChemistrySolver;
-
initialChemicalTimeStep 1e-07;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
index 7e40fa183563461ec91f2a06d2d057f8de0dae24..4610e63a5a4e7cc06c42bf096e21e1546e53c583 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
@@ -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;
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
index 0f6c7dd5c48c26fd351b02f07b454f12bc554161..068c1b3f46567fd9e3a3baa722e17911b4f3a8da 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver ode;
+}
chemistry on;
-chemistrySolver ode;
-
initialChemicalTimeStep 1e-07;
sequentialCoeffs
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
index 397c9bec8d6a88f86828a13a536430f55d9defe8..4eca14a981a6bdc5444457f2387292c43d0c9d71 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
@@ -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;
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index cecce6e7b2f4c9d1f1c937ab04dc62e4f060a281..f7ae5e91df06cfd8ac6725f49eee4d7555f3927b 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport sutherlandTransport;
- thermo hConstThermo;
+ transport sutherland;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index 9a4df2030a53f18a33086ccf17022641c8be63b1..311e40d8fad1219ea560b2fac992002bcdd16c4a 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport sutherlandTransport;
- thermo janafThermo;
+ transport sutherland;
+ thermo janaf;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
index aad77235ffddb9961796412605175a55ee612162..f26f216f96c2c1eb62de590f7102a5d2fb2f5ee1 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
index dde7c242fa2906988cc67c66d4d1860599c42801..20369bc4ace16d2e37827eee0a3f0ac1fcd32df1 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
index 2ac6e58ee4039ff954e6666206d0dcc3fa0f1696..dff8b1620d09827e6fa7c37878a8833ed2efa090 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
index dde7c242fa2906988cc67c66d4d1860599c42801..20369bc4ace16d2e37827eee0a3f0ac1fcd32df1 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
index 49716e950761806076d06238982cb43c0e41fdbe..54be80fadb3e11f53f37c4b817c128cd04689031 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
index 9723272741a111a6c7c4e28e2499da94cf88832e..7182386e00502f8cb0d253537c5c692477dd9dac 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport sutherlandTransport;
- thermo hConstThermo;
+ transport sutherland;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
index 9ee57766cf21842aaa50f4c5e2d18446e533e95d..6671abebe738670f5d97f832e66d7c5b3a9f61d8 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
index 9723272741a111a6c7c4e28e2499da94cf88832e..7182386e00502f8cb0d253537c5c692477dd9dac 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport sutherlandTransport;
- thermo hConstThermo;
+ transport sutherland;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
index 9723272741a111a6c7c4e28e2499da94cf88832e..7182386e00502f8cb0d253537c5c692477dd9dac 100644
--- a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport sutherlandTransport;
- thermo hConstThermo;
+ transport sutherland;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
index 317544a7bf791285662fbf3553033e55a6d1c620..82e3c59f878a0b5b0fbd045d9c6db10aecedb3cd 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport sutherlandTransport;
- thermo hConstThermo;
+ transport sutherland;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
index 0cd2cebd8e07f3f272ebf41c47d58e52feda884f..920fff435c7b6e2c8b72b0af9f9e5e27324dbb6b 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport sutherlandTransport;
- thermo hConstThermo;
+ transport sutherland;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
index 6a961a3b73759beefab108d27c22a55defc61a59..8658d3da81e595130cb07795cb6ab0a7f1080517 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport sutherlandTransport;
- thermo hConstThermo;
+ transport sutherland;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
index aad77235ffddb9961796412605175a55ee612162..f26f216f96c2c1eb62de590f7102a5d2fb2f5ee1 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
index cd10ed592389a91cb6ca6a1c2b900546adeb2aad..7d0bc7caf334ae029ade3ff06d531f32cb4b7c9e 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
index 43831f935b46c1371553ac39640ec6f6f0648b45..341cdb94d5c7486f116f7cfecf75ffedfb603cfd 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
index 43831f935b46c1371553ac39640ec6f6f0648b45..341cdb94d5c7486f116f7cfecf75ffedfb603cfd 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleInternalEnergy;
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
index 0085820454bfb6ce305efd93bad9fb4e24e6d5ba..ab678e4d8862b1080531600e7fc902e2144afbc4 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index 0a1f8cd359cf4d1d8619bd3b648a11d0c3845f6b..5ba8a553e166d823df34a7093c9c7523fce744f0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
index 0a1f8cd359cf4d1d8619bd3b648a11d0c3845f6b..5ba8a553e166d823df34a7093c9c7523fce744f0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
index 0bc5e4dbf49af631c281e5befe2ebde2e0c56a0e..0659d6b6907889a8866cbe6f67a80c6012e4ab1a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
@@ -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
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
index 55b5c40c20748696f649cc1b578ef545f987b60a..4c4cce2da77acfd5f526551b39ace115ed1f1917 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -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;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
index 1433c8c53e545720c899b81d6b6328b31f133b60..7964a240aea24312d6d4b1a1e7957de22fe8e85b 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
index 1433c8c53e545720c899b81d6b6328b31f133b60..7964a240aea24312d6d4b1a1e7957de22fe8e85b 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type hePsiThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index 67d6054e2339889701b93ed265a29db7a5804808..c293c032a338e174fa07a88f393f1fbb643c5e6b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index 13a2e81f0323aa37a88e464c59697295491cfd49..884f3f652ce41f222b21f496955a0ffa61f353a1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index b1783beb1495fbb67fdbcac1f18e463d6e34a2aa..213e77a87bbca2706a2912d3ea2cbc1a0f49d37b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
index 50d01b91d1fb7650fdcd03ea3449550c611ef05e..828c78d2084416702bd61ec950547004da8d3a45 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
@@ -18,8 +18,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
index a4c501e063375d48d345734fcaa19fa76c392233..d4f02fb677b980d29f19916dfbf82b87cc1ab541 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties
index b1783beb1495fbb67fdbcac1f18e463d6e34a2aa..213e77a87bbca2706a2912d3ea2cbc1a0f49d37b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index 67d6054e2339889701b93ed265a29db7a5804808..c293c032a338e174fa07a88f393f1fbb643c5e6b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
index a4c501e063375d48d345734fcaa19fa76c392233..d4f02fb677b980d29f19916dfbf82b87cc1ab541 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
index b1783beb1495fbb67fdbcac1f18e463d6e34a2aa..213e77a87bbca2706a2912d3ea2cbc1a0f49d37b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index 67d6054e2339889701b93ed265a29db7a5804808..c293c032a338e174fa07a88f393f1fbb643c5e6b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index a4c501e063375d48d345734fcaa19fa76c392233..d4f02fb677b980d29f19916dfbf82b87cc1ab541 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index b1783beb1495fbb67fdbcac1f18e463d6e34a2aa..213e77a87bbca2706a2912d3ea2cbc1a0f49d37b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
index 67d6054e2339889701b93ed265a29db7a5804808..c293c032a338e174fa07a88f393f1fbb643c5e6b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
index 9ac37aef591965dd33d269568646b12155deb3cc..99794189d6f77e304072978457009ba69e70a862 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
+thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
index b1783beb1495fbb67fdbcac1f18e463d6e34a2aa..213e77a87bbca2706a2912d3ea2cbc1a0f49d37b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
@@ -19,8 +19,8 @@ thermoType
{
type heRhoThermo;
mixture pureMixture;
- transport constTransport;
- thermo hConstThermo;
+ transport const;
+ thermo hConst;
equationOfState perfectGas;
specie specie;
energy sensibleEnthalpy;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties
index e12334b534558ede56eb81900c69417041ea9ab0..2f8eb06d2bf736419b0bf36d97979f35d94db0f0 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-rhoChemistryModel ODEChemistryModel<icoPoly8ThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver noChemistrySolver;
+}
chemistry on; // off;
-chemistrySolver noChemistrySolver;
-
chemCalcFreq 1;
initialChemicalTimeStep 1e-8; // NOT USED
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties
index e7748f52bcd51b3a1947a7302d4d2513dbf6ce7a..bd526695b97ce02296bba5d920516baedad214c9 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties
@@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
+thermoType
+{
+ type heRhoReactionThermo;
+ mixture reactingMixture;
+ transport polynomial;
+ thermo hPolynomial;
+ energy sensibleEnthalpy;
+ equationOfState icoPolynomial;
+ specie specie;
+}
inertSpecie N2;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties
index 604aa21213007c25373a5298de7ffe235a8ad187..275a88b8d6b70607302ad823d36c68eb691c3938 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-rhoChemistryModel ODEChemistryModel<icoPoly8ThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver noChemistrySolver;
+}
chemistry off;
-chemistrySolver noChemistrySolver;
-
initialChemicalTimeStep 1e-07; // NOT USED
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 5d715a78573e5dde934c1fc94bf0c24e9ee2caa3..4f5a6b1347fc672450c1f9758b1200746607ffde 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
+thermoType
+{
+ type heRhoReactionThermo;
+ mixture reactingMixture;
+ transport polynomial;
+ thermo hPolynomial;
+ energy sensibleEnthalpy;
+ equationOfState icoPolynomial;
+ specie specie;
+}
chemistryReader foamChemistryReader;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
index 84e12dae0fae2995daf2c06a5a15f491a17b43ea..aed335d2733625680dd72d25d29d12397715e8a7 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver ode;
+}
chemistry on;
-chemistrySolver ode;
-
initialChemicalTimeStep 1e-07;
sequentialCoeffs
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary
index b130d7bc0aa5e48e9a785745d71564a71ac9a626..d06b4eac6efc0e6dcad2a7b06f2ca67cd015947a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary
@@ -38,12 +38,14 @@ FoamFile
symmetry
{
type symmetryPlane;
+ inGroups 1(symmetryPlane);
nFaces 100;
startFace 5045;
}
frontAndBack
{
type empty;
+ inGroups 1(empty);
nFaces 5000;
startFace 5145;
}
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index 1c62457dd61532b09090a3316ea9b82487696f4c..99a7d5707c4c5b74706e45d7f739adda19fe86b4 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
+thermoType
+{
+ type hePsiReactionThermo;
+ mixture reactingMixture;
+ transport sutherland;
+ thermo janaf;
+ energy sensibleEnthalpy;
+ equationOfState perfectGas;
+ specie specie;
+}
chemistryReader foamChemistryReader;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
index 99de98f9efb150252c8623e79a6fbb75cd25e294..c0ecd637220a44086c43645df0407edc86b084a7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver noChemistrySolver;
+}
chemistry off;
-chemistrySolver noChemistrySolver;
-
initialChemicalTimeStep 1e-07;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary
index d88a2280430faf98201f39db01e6b5c4327c8b29..f23b09abae820982db934e41bb4da34b53e7b443 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary
@@ -17,23 +17,1132 @@ FoamFile
3
(
- filmWalls
- {
- type wall;
- nFaces 1100;
- startFace 62790;
- }
sides
{
type patch;
nFaces 1320;
- startFace 63890;
+ startFace 62790;
}
frontAndBack
{
type wall;
nFaces 4000;
- startFace 65210;
+ startFace 64110;
+ }
+ region0_to_wallFilmRegion_wallFilmFaces
+ {
+ type mappedWall;
+ nFaces 1100;
+ startFace 68110;
+ sampleMode nearestPatchFace;
+ sampleRegion wallFilmRegion;
+ samplePatch region0_to_wallFilmRegion_wallFilmFaces;
+ offsetMode nonuniform;
+ offsets nonuniform List<vector>
+1100
+(
+(-1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -2.775557562e-17)
+(-0 -0 2.775557562e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -2.775557562e-17)
+(-1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 -5.551115123e-17)
+(-1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(1.110223025e-16 -0 -0)
+(-0 -0 -1.387778781e-17)
+(-0 -0 -0)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -1.110223025e-16)
+(-1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 -2.775557562e-17)
+(-2.220446049e-16 -0 2.775557562e-17)
+(-1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 -0)
+(-0 -0 -2.775557562e-17)
+(1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 -5.551115123e-17)
+(-1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -0)
+(2.220446049e-16 -0 -1.387778781e-17)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -1.110223025e-16)
+(-0 -0 -0)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(1.110223025e-16 -0 -2.775557562e-17)
+(1.110223025e-16 -0 1.387778781e-17)
+(-0 -0 -0)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -2.775557562e-17)
+(4.440892099e-16 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 1.110223025e-16)
+(-0 -0 -0)
+(-0 -0 5.551115123e-17)
+(1.110223025e-16 -0 5.551115123e-17)
+(1.110223025e-16 -0 5.551115123e-17)
+(-0 -0 2.775557562e-17)
+(1.110223025e-16 -0 -0)
+(-0 -0 -1.387778781e-17)
+(1.110223025e-16 -0 -2.775557562e-17)
+(3.330669074e-16 -0 -0)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -0)
+(-0 -0 -1.387778781e-17)
+(1.110223025e-16 -0 -0)
+(3.330669074e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -1.110223025e-16)
+(-2.220446049e-16 -0 -0)
+(1.110223025e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -2.775557562e-17)
+(-2.220446049e-16 -0 2.775557562e-17)
+(-1.110223025e-16 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -2.775557562e-17)
+(-1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 -5.551115123e-17)
+(-1.110223025e-16 -0 -0)
+(-0 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -0)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -1.387778781e-17)
+(-0 -0 -0)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -1.110223025e-16)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-3.330669074e-16 -0 5.551115123e-17)
+(-1.110223025e-16 -0 -2.775557562e-17)
+(-0 -0 1.387778781e-17)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 -2.775557562e-17)
+(1.110223025e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 1.110223025e-16)
+(-0 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-2.220446049e-16 -0 1.110223025e-16)
+(-2.220446049e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 1.387778781e-17)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(-0 -0 -2.775557562e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 1.110223025e-16)
+(-0 -0 -0)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -0 -1.110223025e-16)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 1.110223025e-16)
+(-2.220446049e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(-0 -0 1.387778781e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(4.440892099e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 1.387778781e-17)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -2.775557562e-17)
+(4.440892099e-16 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 1.110223025e-16)
+(-4.440892099e-16 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-4.440892099e-16 -0 1.110223025e-16)
+(-6.661338148e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(-6.661338148e-16 -0 1.110223025e-16)
+(-2.220446049e-16 -0 4.163336342e-17)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 1.387778781e-17)
+(-6.661338148e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -0)
+(-0 -0 -1.110223025e-16)
+(-2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(-6.661338148e-16 -0 1.110223025e-16)
+(-2.220446049e-16 -0 4.163336342e-17)
+(-2.220446049e-16 -0 -0)
+(-0 -0 1.387778781e-17)
+(-6.661338148e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-6.661338148e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(-0 -0 1.387778781e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -2.775557562e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 1.110223025e-16)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(-6.661338148e-16 -0 1.110223025e-16)
+(-4.440892099e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(-4.440892099e-16 -0 -0)
+(-6.661338148e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-4.440892099e-16 -0 1.110223025e-16)
+(-6.661338148e-16 -0 4.163336342e-17)
+(2.220446049e-16 -0 -0)
+(-0 -0 1.387778781e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 5.551115123e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -0 -1.110223025e-16)
+(-2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(-6.661338148e-16 -0 1.110223025e-16)
+(-4.440892099e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(2.220446049e-16 -0 1.387778781e-17)
+(-6.661338148e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 -0)
+(-0 -0 -5.551115123e-17)
+(-6.661338148e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(-0 -0 1.387778781e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -2.775557562e-17)
+(-0 -0 5.551115123e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 1.110223025e-16)
+(-4.440892099e-16 -0 5.551115123e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(-6.661338148e-16 -0 1.110223025e-16)
+(-6.661338148e-16 -0 4.163336342e-17)
+(-4.440892099e-16 -0 -0)
+(-4.440892099e-16 -0 -0)
+(-6.661338148e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 5.551115123e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 5.551115123e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-4.440892099e-16 -0 1.110223025e-16)
+(-6.661338148e-16 -0 4.163336342e-17)
+(2.220446049e-16 -0 -0)
+(-0 -0 1.387778781e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(-4.440892099e-16 -0 -0)
+(4.440892099e-16 -0 -0)
+(4.440892099e-16 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-0 -0 -0)
+(4.440892099e-16 -0 -0)
+(4.440892099e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(-4.440892099e-16 -0 -1.110223025e-16)
+(-2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-4.440892099e-16 -0 1.110223025e-16)
+(-6.661338148e-16 -0 4.163336342e-17)
+(-2.220446049e-16 -0 -0)
+(-0 -0 1.387778781e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 -0)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 1.387778781e-17)
+(-0 -0 -0)
+(-4.440892099e-16 -0 -0)
+(2.220446049e-16 -0 -2.775557562e-17)
+(4.440892099e-16 -0 5.551115123e-17)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 1.110223025e-16)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(1.110223025e-16 -0 2.775557562e-17)
+(-0 -0 -0)
+(2.220446049e-16 -0 -1.387778781e-17)
+(2.220446049e-16 -0 -2.775557562e-17)
+(-0 -0 -0)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -1.387778781e-17)
+(-0 -0 -0)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(3.330669074e-16 -0 -1.110223025e-16)
+(1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -2.775557562e-17)
+(1.110223025e-16 -0 2.775557562e-17)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -0)
+(2.220446049e-16 -0 -2.775557562e-17)
+(1.110223025e-16 -0 -0)
+(2.220446049e-16 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -0)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -1.387778781e-17)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -1.110223025e-16)
+(1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 -5.551115123e-17)
+(3.330669074e-16 -0 5.551115123e-17)
+(1.110223025e-16 -0 -2.775557562e-17)
+(1.110223025e-16 -0 1.387778781e-17)
+(-1.110223025e-16 -0 -0)
+(-0 -0 -0)
+(1.110223025e-16 -0 -2.775557562e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(1.110223025e-16 -0 -5.551115123e-17)
+(-1.110223025e-16 -0 1.110223025e-16)
+(1.110223025e-16 -0 -0)
+(-0 -0 5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 2.775557562e-17)
+(2.220446049e-16 -0 -0)
+(1.110223025e-16 -0 -1.387778781e-17)
+(-0 -0 -2.775557562e-17)
+(-0 -0 -0)
+(1.110223025e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-1.110223025e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-1.110223025e-16 -0 -5.551115123e-17)
+(-1.110223025e-16 -0 -0)
+(-0 -0 -0)
+(1.110223025e-16 -0 -0)
+(-0 -0 -1.387778781e-17)
+(-1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -1.110223025e-16)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 -2.775557562e-17)
+(1.110223025e-16 -0 2.775557562e-17)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -0)
+(-0 -0 -2.775557562e-17)
+(-1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -0)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -1.387778781e-17)
+(-0 -0 -0)
+(-0 -0 -1.110223025e-16)
+(-1.110223025e-16 -0 5.551115123e-17)
+(-1.110223025e-16 -0 -1.110223025e-16)
+(1.110223025e-16 -0 -0)
+(-1.110223025e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -2.775557562e-17)
+(-0 -0 2.775557562e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(2.220446049e-16 -0 -2.775557562e-17)
+(1.110223025e-16 -0 -0)
+(1.110223025e-16 -0 -5.551115123e-17)
+(1.110223025e-16 -0 -0)
+(4.440892099e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 1.110223025e-16)
+(2.220446049e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(6.661338148e-16 -0 -0)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(4.440892099e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(4.440892099e-16 -0 1.110223025e-16)
+(6.661338148e-16 -0 4.163336342e-17)
+(2.220446049e-16 -0 -0)
+(-0 -0 1.387778781e-17)
+(4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(-4.440892099e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(2.220446049e-16 -0 -1.110223025e-16)
+(6.661338148e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 1.110223025e-16)
+(2.220446049e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(4.440892099e-16 -0 1.387778781e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(6.661338148e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(4.440892099e-16 -0 -0)
+(-0 -0 -5.551115123e-17)
+(6.661338148e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(4.440892099e-16 -0 1.387778781e-17)
+(4.440892099e-16 -0 -0)
+(-0 -0 -0)
+(2.220446049e-16 -0 -2.775557562e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 1.110223025e-16)
+(4.440892099e-16 -0 5.551115123e-17)
+(4.440892099e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -0)
+(6.661338148e-16 -0 1.110223025e-16)
+(6.661338148e-16 -0 4.163336342e-17)
+(2.220446049e-16 -0 -0)
+(-0 -0 -0)
+(6.661338148e-16 -0 -5.551115123e-17)
+(4.440892099e-16 -0 -5.551115123e-17)
+(4.440892099e-16 -0 5.551115123e-17)
+(4.440892099e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 1.110223025e-16)
+(4.440892099e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(-2.220446049e-16 -0 1.387778781e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-0 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -1.110223025e-16)
+(2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -0)
+(6.661338148e-16 -0 1.110223025e-16)
+(6.661338148e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(-0 -0 1.387778781e-17)
+(6.661338148e-16 -0 -5.551115123e-17)
+(4.440892099e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -0)
+(-0 -0 -5.551115123e-17)
+(6.661338148e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(4.440892099e-16 -0 1.387778781e-17)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 -2.775557562e-17)
+(-0 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 1.110223025e-16)
+(-0 -0 5.551115123e-17)
+(4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(6.661338148e-16 -0 1.110223025e-16)
+(2.220446049e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(6.661338148e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(4.440892099e-16 -0 -5.551115123e-17)
+(4.440892099e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(4.440892099e-16 -0 1.110223025e-16)
+(2.220446049e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(-0 -0 1.387778781e-17)
+(4.440892099e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(4.440892099e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(-0 -0 -1.110223025e-16)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 -0)
+(2.220446049e-16 -0 1.110223025e-16)
+(2.220446049e-16 -0 4.163336342e-17)
+(2.220446049e-16 -0 -0)
+(-2.220446049e-16 -0 1.387778781e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(4.440892099e-16 -0 -0)
+(-6.661338148e-16 -0 -5.551115123e-17)
+(4.440892099e-16 -0 5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(4.440892099e-16 -0 1.387778781e-17)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -0)
+(-0 -0 -2.775557562e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(4.440892099e-16 -0 -5.551115123e-17)
+(-6.661338148e-16 -0 1.110223025e-16)
+(-0 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(6.661338148e-16 -0 1.110223025e-16)
+(4.440892099e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(6.661338148e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-4.440892099e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 5.551115123e-17)
+(2.220446049e-16 -0 1.387778781e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -2.775557562e-17)
+(-4.440892099e-16 -0 5.551115123e-17)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(-4.440892099e-16 -0 1.110223025e-16)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(2.220446049e-16 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -0 -1.110223025e-16)
+(-0 -0 5.551115123e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(2.220446049e-16 -0 1.110223025e-16)
+(4.440892099e-16 -0 4.163336342e-17)
+(-0 -0 -0)
+(-2.220446049e-16 -0 1.387778781e-17)
+(2.220446049e-16 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -0)
+(-2.220446049e-16 -0 -5.551115123e-17)
+(2.220446049e-16 -0 5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 1.387778781e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -0 -2.775557562e-17)
+(-0 -0 5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-2.220446049e-16 -0 1.110223025e-16)
+(-0 1.110223025e-16 -5.551115123e-17)
+(-0 5.551115123e-17 5.551115123e-17)
+(-0 -5.551115123e-17 -0)
+(-0 -1.110223025e-16 1.110223025e-16)
+(-0 5.551115123e-17 1.110223025e-16)
+(-2.775557562e-17 -1.110223025e-16 5.551115123e-17)
+(-2.775557562e-17 5.551115123e-17 -0)
+(1.387778781e-17 1.665334537e-16 1.110223025e-16)
+(-0 -0 -0)
+(-0 -1.110223025e-16 -0)
+(-5.551115123e-17 -5.551115123e-17 5.551115123e-17)
+(5.551115123e-17 5.551115123e-17 -0)
+(-0 -1.110223025e-16 5.551115123e-17)
+(-0 -1.110223025e-16 5.551115123e-17)
+(-2.775557562e-17 5.551115123e-17 -0)
+(-2.775557562e-17 -5.551115123e-17 -0)
+(-0 -0 -0)
+(-0 -1.665334537e-16 5.551115123e-17)
+(-1.387778781e-17 -1.110223025e-16 1.110223025e-16)
+(3.469446952e-18 -1.110223025e-16 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(-5.551115123e-17 5.551115123e-17 5.551115123e-17)
+(-0 -5.551115123e-17 -0)
+(-0 -0 5.551115123e-17)
+(-2.775557562e-17 -5.551115123e-17 -0)
+(-2.775557562e-17 -5.551115123e-17 5.551115123e-17)
+(-2.775557562e-17 -1.110223025e-16 5.551115123e-17)
+(-2.775557562e-17 -5.551115123e-17 5.551115123e-17)
+(-0 -5.551115123e-17 -0)
+(-6.938893904e-18 -1.110223025e-16 1.110223025e-16)
+(-0 -0 -0)
+(-5.551115123e-17 5.551115123e-17 -0)
+(5.551115123e-17 -5.551115123e-17 -2.775557562e-17)
+(-0 -0 5.551115123e-17)
+(-2.775557562e-17 -0 5.551115123e-17)
+(-2.775557562e-17 -1.110223025e-16 2.775557562e-17)
+(-2.775557562e-17 -1.110223025e-16 2.775557562e-17)
+(-1.387778781e-17 -0 -0)
+(-0 -5.551115123e-17 -0)
+(-6.938893904e-18 -1.110223025e-16 5.551115123e-17)
+(-1.110223025e-16 -1.110223025e-16 1.387778781e-17)
+(-0 5.551115123e-17 -1.387778781e-17)
+(5.551115123e-17 -0 -1.387778781e-17)
+(2.775557562e-17 -0 -0)
+(-5.551115123e-17 -1.665334537e-16 1.387778781e-17)
+(-2.775557562e-17 -0 -1.387778781e-17)
+(-2.775557562e-17 -1.665334537e-16 4.163336342e-17)
+(-0 -5.551115123e-17 -1.387778781e-17)
+(-6.938893904e-18 -5.551115123e-17 -0)
+(-3.469446952e-18 -1.110223025e-16 2.775557562e-17)
+(-0 -5.551115123e-17 -0)
+(-0 5.551115123e-17 -0)
+(-5.551115123e-17 5.551115123e-17 -0)
+(-0 -0 -0)
+(5.551115123e-17 -0 -0)
+(-0 5.551115123e-17 -0)
+(-0 -0 -0)
+(-1.387778781e-17 5.551115123e-17 -0)
+(6.938893904e-18 -0 -0)
+(-0 -5.551115123e-17 -0)
+(-5.551115123e-17 -1.110223025e-16 -0)
+(-1.110223025e-16 -0 -0)
+(-0 -0 -0)
+(-0 -5.551115123e-17 -1.387778781e-17)
+(-2.775557562e-17 -5.551115123e-17 -0)
+(-8.326672685e-17 -1.665334537e-16 -2.775557562e-17)
+(-2.775557562e-17 5.551115123e-17 -1.387778781e-17)
+(2.775557562e-17 -1.110223025e-16 1.387778781e-17)
+(-6.938893904e-18 -0 -1.387778781e-17)
+(-3.469446952e-18 5.551115123e-17 -2.775557562e-17)
+(-0 -0 -0)
+(-5.551115123e-17 5.551115123e-17 -2.775557562e-17)
+(5.551115123e-17 -5.551115123e-17 2.775557562e-17)
+(-0 -0 -5.551115123e-17)
+(-2.775557562e-17 -0 -8.326672685e-17)
+(-2.775557562e-17 -1.110223025e-16 -5.551115123e-17)
+(-2.775557562e-17 -1.110223025e-16 -0)
+(-1.387778781e-17 -0 -0)
+(-0 -5.551115123e-17 -2.775557562e-17)
+(-6.938893904e-18 -1.110223025e-16 -8.326672685e-17)
+(-5.551115123e-17 -5.551115123e-17 -0)
+(-5.551115123e-17 5.551115123e-17 -5.551115123e-17)
+(-0 -1.110223025e-16 -5.551115123e-17)
+(-0 -0 -1.110223025e-16)
+(2.775557562e-17 -0 -0)
+(-0 -0 -0)
+(-0 -1.110223025e-16 -5.551115123e-17)
+(-0 5.551115123e-17 5.551115123e-17)
+(-0 -1.665334537e-16 -0)
+(-3.469446952e-18 -5.551115123e-17 -0)
+(-0 1.110223025e-16 5.551115123e-17)
+(-0 5.551115123e-17 -0)
+(-0 -5.551115123e-17 -5.551115123e-17)
+(-5.551115123e-17 -1.110223025e-16 -5.551115123e-17)
+(-0 5.551115123e-17 -0)
+(-2.775557562e-17 -5.551115123e-17 -5.551115123e-17)
+(-2.775557562e-17 5.551115123e-17 -0)
+(1.387778781e-17 1.665334537e-16 -1.110223025e-16)
+(-0 -0 5.551115123e-17)
+(-0 -1.110223025e-16 5.551115123e-17)
+(-5.551115123e-17 -5.551115123e-17 5.551115123e-17)
+(5.551115123e-17 5.551115123e-17 5.551115123e-17)
+(-0 -1.110223025e-16 -0)
+(2.775557562e-17 -1.110223025e-16 -1.110223025e-16)
+(-0 -5.551115123e-17 -5.551115123e-17)
+(-2.775557562e-17 -5.551115123e-17 5.551115123e-17)
+(-0 -0 -0)
+(-2.775557562e-17 -1.665334537e-16 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -1.110223025e-16 -0)
+(-1.110223025e-16 -0 -0)
+(-0 -0 -0)
+(-0 1.387778781e-17 5.551115123e-17)
+(-0 -2.775557562e-17 -0)
+(-1.110223025e-16 -5.551115123e-17 1.110223025e-16)
+(5.551115123e-17 2.775557562e-17 1.110223025e-16)
+(-1.110223025e-16 -1.110223025e-16 1.110223025e-16)
+(-5.551115123e-17 -0 5.551115123e-17)
+(5.551115123e-17 -1.110223025e-16 1.110223025e-16)
+(5.551115123e-17 -5.551115123e-17 -0)
+(1.110223025e-16 3.469446952e-18 -5.551115123e-17)
+(-5.551115123e-17 -1.387778781e-17 1.110223025e-16)
+(-0 1.387778781e-17 -0)
+(-1.110223025e-16 -0 -0)
+(-0 -0 -0)
+(-1.110223025e-16 -0 -0)
+(-1.110223025e-16 -5.551115123e-17 5.551115123e-17)
+(-1.110223025e-16 -0 5.551115123e-17)
+(-0 -5.551115123e-17 5.551115123e-17)
+(-5.551115123e-17 -5.551115123e-17 1.665334537e-16)
+(-1.665334537e-16 -3.469446952e-18 1.110223025e-16)
+(5.551115123e-17 -6.938893904e-18 -0)
+(-5.551115123e-17 -2.775557562e-17 5.551115123e-17)
+(-0 -2.775557562e-17 5.551115123e-17)
+(-0 -0 -0)
+(-1.665334537e-16 -8.326672685e-17 -0)
+(-0 -2.775557562e-17 5.551115123e-17)
+(-0 5.551115123e-17 -0)
+(-0 -5.551115123e-17 5.551115123e-17)
+(-0 1.110223025e-16 -5.551115123e-17)
+(-1.665334537e-16 -3.469446952e-18 5.551115123e-17)
+(5.551115123e-17 -6.938893904e-18 -0)
+(-5.551115123e-17 -2.775557562e-17 2.775557562e-17)
+(-0 -2.775557562e-17 2.775557562e-17)
+(5.551115123e-17 -0 -0)
+(-1.665334537e-16 -2.775557562e-17 5.551115123e-17)
+(-0 -2.775557562e-17 5.551115123e-17)
+(-5.551115123e-17 -0 -0)
+(-0 -5.551115123e-17 -2.775557562e-17)
+(-0 1.110223025e-16 -0)
+(-1.110223025e-16 -3.469446952e-18 2.775557562e-17)
+(-0 -0 -0)
+(-5.551115123e-17 1.387778781e-17 1.387778781e-17)
+(-1.110223025e-16 -0 4.163336342e-17)
+(5.551115123e-17 2.775557562e-17 -1.387778781e-17)
+(-1.665334537e-16 -5.551115123e-17 1.387778781e-17)
+(-1.110223025e-16 -8.326672685e-17 -0)
+(-0 -5.551115123e-17 1.387778781e-17)
+(-0 -5.551115123e-17 1.387778781e-17)
+(-0 5.551115123e-17 -0)
+(-5.551115123e-17 -0 -0)
+(1.110223025e-16 6.938893904e-18 -0)
+(-5.551115123e-17 -1.387778781e-17 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -5.551115123e-17 -0)
+(-1.110223025e-16 -5.551115123e-17 -0)
+(1.110223025e-16 -5.551115123e-17 -0)
+(5.551115123e-17 -5.551115123e-17 -0)
+(-5.551115123e-17 -5.551115123e-17 -0)
+(-1.110223025e-16 -3.469446952e-18 -2.775557562e-17)
+(-0 -0 -1.387778781e-17)
+(-5.551115123e-17 1.387778781e-17 1.387778781e-17)
+(-1.110223025e-16 2.775557562e-17 -1.387778781e-17)
+(5.551115123e-17 2.775557562e-17 1.387778781e-17)
+(-5.551115123e-17 2.775557562e-17 -0)
+(-0 -2.775557562e-17 -1.387778781e-17)
+(-5.551115123e-17 -0 -1.387778781e-17)
+(5.551115123e-17 -1.110223025e-16 -1.387778781e-17)
+(1.110223025e-16 5.551115123e-17 1.387778781e-17)
+(-1.665334537e-16 -3.469446952e-18 -8.326672685e-17)
+(5.551115123e-17 -6.938893904e-18 -2.775557562e-17)
+(-5.551115123e-17 -2.775557562e-17 -2.775557562e-17)
+(-0 -2.775557562e-17 -0)
+(5.551115123e-17 -0 -2.775557562e-17)
+(-1.665334537e-16 -2.775557562e-17 -8.326672685e-17)
+(-0 -2.775557562e-17 -5.551115123e-17)
+(-5.551115123e-17 -0 -2.775557562e-17)
+(-0 -5.551115123e-17 -5.551115123e-17)
+(-0 1.110223025e-16 -0)
+(-1.110223025e-16 -0 -0)
+(-5.551115123e-17 -6.938893904e-18 -0)
+(-0 -1.387778781e-17 -0)
+(-0 -0 -5.551115123e-17)
+(1.110223025e-16 2.775557562e-17 -0)
+(-5.551115123e-17 -2.775557562e-17 -0)
+(-0 -8.326672685e-17 -1.110223025e-16)
+(-0 -5.551115123e-17 -1.110223025e-16)
+(-0 -5.551115123e-17 -5.551115123e-17)
+(-5.551115123e-17 -0 -0)
+(-0 -3.469446952e-18 5.551115123e-17)
+(-0 -0 5.551115123e-17)
+(-0 1.387778781e-17 1.110223025e-16)
+(-0 -2.775557562e-17 -0)
+(-1.110223025e-16 -5.551115123e-17 -1.110223025e-16)
+(-0 2.775557562e-17 -0)
+(-1.110223025e-16 -1.110223025e-16 -5.551115123e-17)
+(-5.551115123e-17 -0 -5.551115123e-17)
+(5.551115123e-17 -1.110223025e-16 -5.551115123e-17)
+(5.551115123e-17 -5.551115123e-17 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(-1.110223025e-16 -1.387778781e-17 -5.551115123e-17)
+(-1.110223025e-16 -0 -0)
+(-0 -0 1.665334537e-16)
+(-1.110223025e-16 -2.775557562e-17 -5.551115123e-17)
+(-1.110223025e-16 -1.110223025e-16 -1.110223025e-16)
+(-1.110223025e-16 -0 -5.551115123e-17)
+(-0 -1.110223025e-16 -0)
+(-0 -5.551115123e-17 5.551115123e-17)
+(1.110223025e-16 -1.110223025e-16 5.551115123e-17)
+(5.551115123e-17 -0 -5.551115123e-17)
+(-0 -5.551115123e-17 -0)
+(2.775557562e-17 -0 -5.551115123e-17)
+(-0 -1.110223025e-16 -5.551115123e-17)
+(2.775557562e-17 -5.551115123e-17 -1.110223025e-16)
+(-0 -1.110223025e-16 -0)
+(2.775557562e-17 -2.220446049e-16 -0)
+(-0 -0 -0)
+(-0 1.110223025e-16 -0)
+(-0 1.110223025e-16 -0)
+(-0 -5.551115123e-17 -0)
+(-0 -5.551115123e-17 -0)
+(2.775557562e-17 -0 -5.551115123e-17)
+(-2.775557562e-17 -1.110223025e-16 -0)
+(2.775557562e-17 -5.551115123e-17 5.551115123e-17)
+(-0 -0 -0)
+(-0 -5.551115123e-17 -0)
+(-6.938893904e-18 5.551115123e-17 -1.110223025e-16)
+(3.469446952e-18 1.110223025e-16 5.551115123e-17)
+(5.551115123e-17 -5.551115123e-17 5.551115123e-17)
+(5.551115123e-17 5.551115123e-17 5.551115123e-17)
+(-0 -0 1.110223025e-16)
+(8.326672685e-17 -1.665334537e-16 5.551115123e-17)
+(2.775557562e-17 -5.551115123e-17 -0)
+(-2.775557562e-17 5.551115123e-17 -0)
+(-0 -0 5.551115123e-17)
+(2.775557562e-17 -5.551115123e-17 -0)
+(-0 1.110223025e-16 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(5.551115123e-17 5.551115123e-17 5.551115123e-17)
+(1.110223025e-16 -1.110223025e-16 2.775557562e-17)
+(8.326672685e-17 -1.665334537e-16 5.551115123e-17)
+(2.775557562e-17 -1.665334537e-16 -2.775557562e-17)
+(-2.775557562e-17 1.110223025e-16 -2.775557562e-17)
+(-0 -0 -0)
+(4.163336342e-17 -1.110223025e-16 2.775557562e-17)
+(-0 5.551115123e-17 2.775557562e-17)
+(-0 -0 -0)
+(-0 1.110223025e-16 -1.387778781e-17)
+(1.110223025e-16 5.551115123e-17 -0)
+(-0 -0 -0)
+(2.775557562e-17 -0 1.387778781e-17)
+(-2.775557562e-17 -5.551115123e-17 -0)
+(2.775557562e-17 -1.110223025e-16 1.387778781e-17)
+(-0 5.551115123e-17 1.387778781e-17)
+(-0 5.551115123e-17 -1.387778781e-17)
+(6.938893904e-18 -5.551115123e-17 1.387778781e-17)
+(3.469446952e-18 -1.110223025e-16 2.775557562e-17)
+(5.551115123e-17 -0 -0)
+(-0 5.551115123e-17 -0)
+(5.551115123e-17 5.551115123e-17 -0)
+(-0 -0 -0)
+(5.551115123e-17 -0 -0)
+(-0 -5.551115123e-17 -0)
+(-0 -0 -0)
+(1.387778781e-17 -5.551115123e-17 -0)
+(-6.938893904e-18 -0 -0)
+(3.469446952e-18 -5.551115123e-17 -0)
+(1.110223025e-16 -5.551115123e-17 -1.387778781e-17)
+(-5.551115123e-17 1.110223025e-16 -1.387778781e-17)
+(-5.551115123e-17 5.551115123e-17 1.387778781e-17)
+(5.551115123e-17 -1.110223025e-16 -1.387778781e-17)
+(-0 -0 1.387778781e-17)
+(-2.775557562e-17 1.110223025e-16 2.775557562e-17)
+(-0 -1.110223025e-16 -2.775557562e-17)
+(1.387778781e-17 -0 -0)
+(6.938893904e-18 -1.110223025e-16 -1.387778781e-17)
+(-3.469446952e-18 -5.551115123e-17 -1.387778781e-17)
+(-0 -0 -0)
+(5.551115123e-17 5.551115123e-17 -2.775557562e-17)
+(1.110223025e-16 -1.110223025e-16 -2.775557562e-17)
+(8.326672685e-17 -1.665334537e-16 -5.551115123e-17)
+(2.775557562e-17 -1.665334537e-16 2.775557562e-17)
+(-2.775557562e-17 1.110223025e-16 2.775557562e-17)
+(-0 -0 -0)
+(4.163336342e-17 -1.110223025e-16 -2.775557562e-17)
+(-0 5.551115123e-17 -0)
+(-0 -0 2.775557562e-17)
+(-5.551115123e-17 5.551115123e-17 5.551115123e-17)
+(5.551115123e-17 -0 -5.551115123e-17)
+(5.551115123e-17 -5.551115123e-17 -5.551115123e-17)
+(8.326672685e-17 -1.665334537e-16 -0)
+(8.326672685e-17 -1.665334537e-16 -0)
+(-0 -0 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(2.775557562e-17 -5.551115123e-17 -5.551115123e-17)
+(-0 -5.551115123e-17 -5.551115123e-17)
+(-0 -5.551115123e-17 -5.551115123e-17)
+(1.110223025e-16 -1.110223025e-16 -1.665334537e-16)
+(5.551115123e-17 -0 -0)
+(-0 -5.551115123e-17 -5.551115123e-17)
+(2.775557562e-17 -0 5.551115123e-17)
+(-0 -1.110223025e-16 -0)
+(2.775557562e-17 -5.551115123e-17 -0)
+(-0 -1.110223025e-16 -0)
+(2.775557562e-17 -2.220446049e-16 -0)
+(-0 -0 -5.551115123e-17)
+(-0 1.110223025e-16 -5.551115123e-17)
+(-0 1.110223025e-16 -0)
+(-0 -5.551115123e-17 -5.551115123e-17)
+(-0 -5.551115123e-17 -0)
+(5.551115123e-17 -0 5.551115123e-17)
+(-0 -5.551115123e-17 -5.551115123e-17)
+(2.775557562e-17 -1.110223025e-16 -0)
+(-0 -0 -0)
+(-1.387778781e-17 -0 -0)
+(-0 -0 -0)
+(-0 1.110223025e-16 -0)
+(-1.110223025e-16 -0 -0)
+(-0 -0 -0)
+(1.665334537e-16 -0 5.551115123e-17)
+(-0 -0 -0)
+(5.551115123e-17 -2.775557562e-17 -5.551115123e-17)
+(1.110223025e-16 -2.775557562e-17 -5.551115123e-17)
+(-0 5.551115123e-17 -5.551115123e-17)
+(1.110223025e-16 -0 -5.551115123e-17)
+(5.551115123e-17 5.551115123e-17 5.551115123e-17)
+(5.551115123e-17 -5.551115123e-17 -5.551115123e-17)
+(1.110223025e-16 -3.469446952e-18 5.551115123e-17)
+(-5.551115123e-17 6.938893904e-18 -1.110223025e-16)
+(1.665334537e-16 -2.775557562e-17 1.110223025e-16)
+(-5.551115123e-17 -2.775557562e-17 -0)
+(1.110223025e-16 -5.551115123e-17 1.110223025e-16)
+(-5.551115123e-17 -0 -0)
+(-0 -0 -5.551115123e-17)
+(5.551115123e-17 -0 1.110223025e-16)
+(-5.551115123e-17 5.551115123e-17 -0)
+(-0 -5.551115123e-17 -0)
+(-1.110223025e-16 -0 -0)
+(-5.551115123e-17 -6.938893904e-18 -0)
+(-5.551115123e-17 -0 -5.551115123e-17)
+(1.110223025e-16 2.775557562e-17 5.551115123e-17)
+(-0 -0 -0)
+(-0 2.775557562e-17 -0)
+(1.665334537e-16 -2.775557562e-17 5.551115123e-17)
+(1.110223025e-16 -0 5.551115123e-17)
+(-0 -0 -0)
+(-0 -5.551115123e-17 5.551115123e-17)
+(-1.110223025e-16 -0 -0)
+(-5.551115123e-17 -6.938893904e-18 2.775557562e-17)
+(-5.551115123e-17 -0 -2.775557562e-17)
+(1.110223025e-16 2.775557562e-17 -0)
+(5.551115123e-17 -0 -0)
+(-0 -2.775557562e-17 -2.775557562e-17)
+(1.665334537e-16 -2.775557562e-17 5.551115123e-17)
+(1.110223025e-16 -0 -0)
+(-0 -5.551115123e-17 8.326672685e-17)
+(-0 -5.551115123e-17 -0)
+(-0 -3.469446952e-18 2.775557562e-17)
+(-0 -6.938893904e-18 -0)
+(-0 -0 -1.387778781e-17)
+(-5.551115123e-17 -2.775557562e-17 1.387778781e-17)
+(1.110223025e-16 -2.775557562e-17 1.387778781e-17)
+(5.551115123e-17 -2.775557562e-17 -0)
+(-0 -0 1.387778781e-17)
+(-0 -0 -0)
+(-0 -1.110223025e-16 -0)
+(5.551115123e-17 -0 -1.387778781e-17)
+(5.551115123e-17 -0 -0)
+(5.551115123e-17 6.938893904e-18 -0)
+(-5.551115123e-17 -1.387778781e-17 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 5.551115123e-17 -0)
+(-5.551115123e-17 2.775557562e-17 -0)
+(5.551115123e-17 -5.551115123e-17 -0)
+(-5.551115123e-17 5.551115123e-17 -0)
+(5.551115123e-17 -5.551115123e-17 -0)
+(5.551115123e-17 -0 -1.387778781e-17)
+(-0 -6.938893904e-18 -0)
+(5.551115123e-17 -1.387778781e-17 -1.387778781e-17)
+(1.665334537e-16 -0 -2.775557562e-17)
+(1.110223025e-16 -2.775557562e-17 -1.387778781e-17)
+(-0 -0 1.387778781e-17)
+(-0 2.775557562e-17 -1.387778781e-17)
+(-0 -5.551115123e-17 1.387778781e-17)
+(5.551115123e-17 -0 -1.387778781e-17)
+(1.665334537e-16 -1.110223025e-16 -1.387778781e-17)
+(-1.110223025e-16 -0 2.775557562e-17)
+(-5.551115123e-17 -6.938893904e-18 -2.775557562e-17)
+(-5.551115123e-17 -0 2.775557562e-17)
+(1.110223025e-16 2.775557562e-17 -0)
+(5.551115123e-17 -0 -0)
+(-0 -2.775557562e-17 2.775557562e-17)
+(1.665334537e-16 -2.775557562e-17 -5.551115123e-17)
+(1.110223025e-16 -0 -0)
+(-0 -5.551115123e-17 -0)
+(-0 -5.551115123e-17 -0)
+(-5.551115123e-17 -3.469446952e-18 -5.551115123e-17)
+(-5.551115123e-17 -0 -5.551115123e-17)
+(-0 -1.387778781e-17 -0)
+(1.110223025e-16 -0 -5.551115123e-17)
+(1.110223025e-16 -2.775557562e-17 -5.551115123e-17)
+(5.551115123e-17 -2.775557562e-17 -0)
+(1.665334537e-16 -0 -0)
+(5.551115123e-17 5.551115123e-17 -0)
+(-5.551115123e-17 -5.551115123e-17 -5.551115123e-17)
+(-5.551115123e-17 -0 5.551115123e-17)
+(-0 3.469446952e-18 -5.551115123e-17)
+(-0 -0 -5.551115123e-17)
+(1.665334537e-16 -0 -5.551115123e-17)
+(-0 -0 -0)
+(5.551115123e-17 -2.775557562e-17 -0)
+(-0 -2.775557562e-17 -0)
+(-0 5.551115123e-17 5.551115123e-17)
+(1.110223025e-16 -0 -5.551115123e-17)
+(5.551115123e-17 5.551115123e-17 -0)
+(5.551115123e-17 -5.551115123e-17 -5.551115123e-17)
+(-0 -0 -0)
+(-0 -0 -0)
+(1.110223025e-16 -1.387778781e-17 -5.551115123e-17)
+(-5.551115123e-17 -2.775557562e-17 -0)
+(1.665334537e-16 -2.775557562e-17 -1.110223025e-16)
+(-5.551115123e-17 2.775557562e-17 -5.551115123e-17)
+(-0 5.551115123e-17 5.551115123e-17)
+(5.551115123e-17 -0 5.551115123e-17)
+(-5.551115123e-17 5.551115123e-17 -5.551115123e-17)
+(1.110223025e-16 -5.551115123e-17 -1.110223025e-16)
+)
+;
}
)
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
index 5938ce87a3f02fbf34401cd5623e3ac699d484fb..380bc6551bfa738cdb4365bbb4b4337931f33e72 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
@@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
+thermoType
+{
+ type hePsiReactionThermo;
+ mixture reactingMixture;
+ transport sutherland;
+ thermo janaf;
+ energy sensibleEnthalpy;
+ equationOfState perfectGas;
+ specie specie;
+}
chemistryReader foamChemistryReader;
@@ -25,7 +34,6 @@ foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
inertSpecie N2;
-
liquids
{
H2O
@@ -34,7 +42,6 @@ liquids
}
}
-
solids
{
// none
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
index 99de98f9efb150252c8623e79a6fbb75cd25e294..c0ecd637220a44086c43645df0407edc86b084a7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver noChemistrySolver;
+}
chemistry off;
-chemistrySolver noChemistrySolver;
-
initialChemicalTimeStep 1e-07;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/polyMesh/boundary
index 695e9795ca31495da4f3a315b0513a24b18974ad..6e737bbc0b8c3c2cbc96a440eeac677ae4f38b10 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/polyMesh/boundary
@@ -32,7 +32,7 @@ FoamFile
sampleRegion wallFilmRegion;
samplePatch region0_to_wallFilmRegion_cubeFaces;
offsetMode nonuniform;
- offsets nonuniform List<vector>
+ offsets nonuniform List<vector>
6144
(
(-0 -0 -0)
@@ -6191,7 +6191,7 @@ FoamFile
sampleRegion wallFilmRegion;
samplePatch region0_to_wallFilmRegion_floorFaces;
offsetMode nonuniform;
- offsets nonuniform List<vector>
+ offsets nonuniform List<vector>
6400
(
(8.67361738e-19 -1.734723476e-18 -0)
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
index 5938ce87a3f02fbf34401cd5623e3ac699d484fb..380bc6551bfa738cdb4365bbb4b4337931f33e72 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
@@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
+thermoType
+{
+ type hePsiReactionThermo;
+ mixture reactingMixture;
+ transport sutherland;
+ thermo janaf;
+ energy sensibleEnthalpy;
+ equationOfState perfectGas;
+ specie specie;
+}
chemistryReader foamChemistryReader;
@@ -25,7 +34,6 @@ foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
inertSpecie N2;
-
liquids
{
H2O
@@ -34,7 +42,6 @@ liquids
}
}
-
solids
{
// none
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
index 99de98f9efb150252c8623e79a6fbb75cd25e294..c0ecd637220a44086c43645df0407edc86b084a7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver noChemistrySolver;
+}
chemistry off;
-chemistrySolver noChemistrySolver;
-
initialChemicalTimeStep 1e-07;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary
index 006c08790de09bc7373ab9e4d38299bb010aacff..7b4f359759cf9c371a5cbb8f122f0562a7800a09 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary
@@ -44,7 +44,7 @@ FoamFile
sampleRegion wallFilmRegion;
samplePatch region0_to_wallFilmRegion_wallFilmFaces;
offsetMode nonuniform;
- offsets
+ offsets nonuniform List<vector>
43200
(
(-6.938893904e-18 -0 -0)
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
index 5938ce87a3f02fbf34401cd5623e3ac699d484fb..380bc6551bfa738cdb4365bbb4b4337931f33e72 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
@@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
+thermoType
+{
+ type hePsiReactionThermo;
+ mixture reactingMixture;
+ transport sutherland;
+ thermo janaf;
+ energy sensibleEnthalpy;
+ equationOfState perfectGas;
+ specie specie;
+}
chemistryReader foamChemistryReader;
@@ -25,7 +34,6 @@ foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
inertSpecie N2;
-
liquids
{
H2O
@@ -34,7 +42,6 @@ liquids
}
}
-
solids
{
// none
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
index 99de98f9efb150252c8623e79a6fbb75cd25e294..c0ecd637220a44086c43645df0407edc86b084a7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver noChemistrySolver;
+}
chemistry off;
-chemistrySolver noChemistrySolver;
-
initialChemicalTimeStep 1e-07;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/polyMesh/boundary
index 662f5080b67dab26ea58066a4f5baebc31451908..17a5ed74a77a3385356948749287b55169fafd65 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/polyMesh/boundary
@@ -23,11 +23,220 @@ FoamFile
nFaces 1400;
startFace 11200;
}
- filmWalls
+ region0_to_wallFilmRegion_wallFilmFaces
{
- type wall;
+ type mappedWall;
nFaces 200;
startFace 12600;
+ sampleMode nearestPatchFace;
+ sampleRegion wallFilmRegion;
+ samplePatch region0_to_wallFilmRegion_wallFilmFaces;
+ offsetMode nonuniform;
+ offsets nonuniform List<vector>
+200
+(
+(4.33680869e-19 4.33680869e-19 -0)
+(-8.67361738e-19 -8.67361738e-19 -0)
+(-4.33680869e-19 -0 -0)
+(-0 3.469446952e-18 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(4.33680869e-19 -0 -0)
+(-0 6.938893904e-18 -0)
+(-0 -0 -0)
+(8.67361738e-19 4.33680869e-19 -0)
+(-8.67361738e-19 -8.67361738e-19 -0)
+(-0 1.734723476e-18 -0)
+(-0 3.469446952e-18 -0)
+(-0 -3.469446952e-18 -0)
+(8.67361738e-19 1.387778781e-17 -0)
+(-8.67361738e-19 -0 -0)
+(-8.67361738e-19 -6.938893904e-18 -0)
+(-0 -6.938893904e-18 -0)
+(-8.67361738e-19 -0 -0)
+(-0 -4.33680869e-19 -0)
+(-1.734723476e-18 -1.734723476e-18 -0)
+(-1.734723476e-18 1.734723476e-18 -0)
+(-3.469446952e-18 -0 -0)
+(-3.469446952e-18 -0 -0)
+(-1.734723476e-18 3.469446952e-18 -0)
+(-0 -0 -0)
+(-1.734723476e-18 -0 -0)
+(-1.734723476e-18 -0 -0)
+(-0 -0 -0)
+(-3.469446952e-18 -8.67361738e-19 -0)
+(-3.469446952e-18 -1.734723476e-18 -0)
+(-0 3.469446952e-18 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 3.469446952e-18 -0)
+(3.469446952e-18 -0 -0)
+(3.469446952e-18 6.938893904e-18 -0)
+(3.469446952e-18 -6.938893904e-18 -0)
+(3.469446952e-18 6.938893904e-18 -0)
+(-3.469446952e-18 -8.67361738e-19 -0)
+(-3.469446952e-18 -1.734723476e-18 -0)
+(-3.469446952e-18 3.469446952e-18 -0)
+(-3.469446952e-18 -0 -0)
+(-3.469446952e-18 -0 -0)
+(-3.469446952e-18 3.469446952e-18 -0)
+(-0 -0 -0)
+(-3.469446952e-18 6.938893904e-18 -0)
+(-3.469446952e-18 -6.938893904e-18 -0)
+(-0 6.938893904e-18 -0)
+(-0 -0 -0)
+(-1.387778781e-17 -1.734723476e-18 -0)
+(-6.938893904e-18 -0 -0)
+(3.469446952e-18 -0 -0)
+(3.469446952e-18 -0 -0)
+(-3.469446952e-18 -3.469446952e-18 -0)
+(-0 -6.938893904e-18 -0)
+(-1.040834086e-17 -0 -0)
+(-1.040834086e-17 -6.938893904e-18 -0)
+(-0 6.938893904e-18 -0)
+(-0 -0 -0)
+(-6.938893904e-18 -1.734723476e-18 -0)
+(-0 -0 -0)
+(-6.938893904e-18 -3.469446952e-18 -0)
+(-6.938893904e-18 -6.938893904e-18 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -6.938893904e-18 -0)
+(-6.938893904e-18 -0 -0)
+(-0 -0 -0)
+(-0 -4.33680869e-19 -0)
+(6.938893904e-18 -0 -0)
+(-0 -1.734723476e-18 -0)
+(6.938893904e-18 -3.469446952e-18 -0)
+(6.938893904e-18 6.938893904e-18 -0)
+(-6.938893904e-18 6.938893904e-18 -0)
+(-6.938893904e-18 -0 -0)
+(-6.938893904e-18 -0 -0)
+(-6.938893904e-18 -6.938893904e-18 -0)
+(-6.938893904e-18 -0 -0)
+(-6.938893904e-18 -0 -0)
+(6.938893904e-18 -0 -0)
+(-6.938893904e-18 -1.734723476e-18 -0)
+(-6.938893904e-18 -3.469446952e-18 -0)
+(-6.938893904e-18 6.938893904e-18 -0)
+(-6.938893904e-18 6.938893904e-18 -0)
+(-6.938893904e-18 6.938893904e-18 -0)
+(-6.938893904e-18 -6.938893904e-18 -0)
+(-6.938893904e-18 -6.938893904e-18 -0)
+(-6.938893904e-18 -0 -0)
+(-0 -0 -0)
+(-0 -1.734723476e-18 -0)
+(-0 -0 -0)
+(-1.387778781e-17 -3.469446952e-18 -0)
+(-1.387778781e-17 -6.938893904e-18 -0)
+(-1.387778781e-17 -0 -0)
+(-0 -0 -0)
+(-0 -6.938893904e-18 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(6.938893904e-18 -0 -0)
+(6.938893904e-18 -1.734723476e-18 -0)
+(-0 -3.469446952e-18 -0)
+(-0 6.938893904e-18 -0)
+(1.387778781e-17 6.938893904e-18 -0)
+(-0 6.938893904e-18 -0)
+(-0 -6.938893904e-18 -0)
+(-0 -6.938893904e-18 -0)
+(-0 -0 -0)
+(1.387778781e-17 -0 -0)
+(6.938893904e-18 -8.67361738e-19 -0)
+(-0 -1.734723476e-18 -0)
+(1.387778781e-17 -0 -0)
+(6.938893904e-18 -0 -0)
+(6.938893904e-18 -3.469446952e-18 -0)
+(-0 6.938893904e-18 -0)
+(-1.387778781e-17 -6.938893904e-18 -0)
+(-1.387778781e-17 -6.938893904e-18 -0)
+(-0 6.938893904e-18 -0)
+(-6.938893904e-18 -0 -0)
+(-2.081668171e-17 -1.734723476e-18 -0)
+(-0 -0 -0)
+(-1.387778781e-17 -3.469446952e-18 -0)
+(-1.387778781e-17 -6.938893904e-18 -0)
+(-1.387778781e-17 -0 -0)
+(-0 -0 -0)
+(-0 -6.938893904e-18 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-1.387778781e-17 -1.734723476e-18 -0)
+(-0 -0 -0)
+(-1.387778781e-17 -3.469446952e-18 -0)
+(-1.387778781e-17 -6.938893904e-18 -0)
+(-2.775557562e-17 -0 -0)
+(-1.387778781e-17 -0 -0)
+(-1.387778781e-17 -6.938893904e-18 -0)
+(-1.387778781e-17 -0 -0)
+(-1.387778781e-17 -0 -0)
+(-1.387778781e-17 -8.67361738e-19 -0)
+(-1.387778781e-17 -1.734723476e-18 -0)
+(-1.387778781e-17 -1.734723476e-18 -0)
+(-1.387778781e-17 -3.469446952e-18 -0)
+(-0 -0 -0)
+(-0 -3.469446952e-18 -0)
+(-1.387778781e-17 -1.387778781e-17 -0)
+(-0 6.938893904e-18 -0)
+(-0 1.387778781e-17 -0)
+(-1.387778781e-17 -1.387778781e-17 -0)
+(-1.387778781e-17 -0 -0)
+(-1.387778781e-17 -1.734723476e-18 -0)
+(1.387778781e-17 -0 -0)
+(-0 -3.469446952e-18 -0)
+(-1.387778781e-17 -6.938893904e-18 -0)
+(-2.775557562e-17 -0 -0)
+(-0 -0 -0)
+(-0 -6.938893904e-18 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(1.387778781e-17 -0 -0)
+(-1.387778781e-17 -1.734723476e-18 -0)
+(1.387778781e-17 -0 -0)
+(-4.163336342e-17 -3.469446952e-18 -0)
+(-4.163336342e-17 -6.938893904e-18 -0)
+(-2.775557562e-17 -0 -0)
+(-0 -0 -0)
+(-0 -6.938893904e-18 -0)
+(-0 -0 -0)
+(-0 -0 -0)
+(-1.387778781e-17 -8.67361738e-19 -0)
+(1.387778781e-17 -1.734723476e-18 -0)
+(-1.387778781e-17 -1.734723476e-18 -0)
+(-0 -3.469446952e-18 -0)
+(-0 -0 -0)
+(-1.387778781e-17 -3.469446952e-18 -0)
+(-1.387778781e-17 -1.387778781e-17 -0)
+(1.387778781e-17 6.938893904e-18 -0)
+(1.387778781e-17 6.938893904e-18 -0)
+(-1.387778781e-17 -1.387778781e-17 -0)
+(-0 -0 -0)
+(-0 -1.734723476e-18 -0)
+(-0 -0 -0)
+(-4.163336342e-17 -3.469446952e-18 -0)
+(-4.163336342e-17 -6.938893904e-18 -0)
+(-2.775557562e-17 -0 -0)
+(1.387778781e-17 -0 -0)
+(-1.387778781e-17 -6.938893904e-18 -0)
+(-1.387778781e-17 -0 -0)
+(1.387778781e-17 -0 -0)
+(-2.775557562e-17 -0 -0)
+(-2.775557562e-17 -1.734723476e-18 -0)
+(-0 -0 -0)
+(-1.387778781e-17 -3.469446952e-18 -0)
+(-1.387778781e-17 -6.938893904e-18 -0)
+(-1.387778781e-17 -0 -0)
+(1.387778781e-17 -0 -0)
+(-0 -6.938893904e-18 -0)
+(-0 -0 -0)
+(1.387778781e-17 -0 -0)
+)
+;
}
)
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
index 5938ce87a3f02fbf34401cd5623e3ac699d484fb..380bc6551bfa738cdb4365bbb4b4337931f33e72 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
@@ -15,7 +15,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
+thermoType
+{
+ type hePsiReactionThermo;
+ mixture reactingMixture;
+ transport sutherland;
+ thermo janaf;
+ energy sensibleEnthalpy;
+ equationOfState perfectGas;
+ specie specie;
+}
chemistryReader foamChemistryReader;
@@ -25,7 +34,6 @@ foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";
inertSpecie N2;
-
liquids
{
H2O
@@ -34,7 +42,6 @@ liquids
}
}
-
solids
{
// none
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
index 3a03cc5845ac1b7be43cf79acc98ccb38f0b80d5..40cf4f3f121a3e8bd1fb408ee5ee8d5ff6540b46 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-rhoChemistryModel ODEChemistryModel<icoPoly8ThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver ode;
+}
chemistry off;
-chemistrySolver ode;
-
initialChemicalTimeStep 1e-07;
sequentialCoeffs
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
index 63ca7f7968ef40c725b7fdf141cefd490a0ca864..594121c7ff44f2f10392585fe44e968ebb7d2a85 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
@@ -15,7 +15,17 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
+thermoType
+{
+ type heRhoReactionThermo;
+ mixture reactingMixture;
+ transport polynomial;
+ thermo hPolynomial;
+ energy sensibleEnthalpy;
+ equationOfState icoPolynomial;
+ specie specie;
+}
+
dpdt no;
chemistryReader foamChemistryReader;
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
index 3a03cc5845ac1b7be43cf79acc98ccb38f0b80d5..40cf4f3f121a3e8bd1fb408ee5ee8d5ff6540b46 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-rhoChemistryModel ODEChemistryModel<icoPoly8ThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver ode;
+}
chemistry off;
-chemistrySolver ode;
-
initialChemicalTimeStep 1e-07;
sequentialCoeffs
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
index d09b3f95f8a6f45a92997be548f0a1eb7569d1b8..07b94deeb7a4b1e94b50a761fd07896413345fbf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
@@ -15,7 +15,17 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
+thermoType
+{
+ type heRhoReactionThermo;
+ mixture reactingMixture;
+ transport polynomial;
+ thermo hPolynomial;
+ energy sensibleEnthalpy;
+ equationOfState icoPolynomial;
+ specie specie;
+}
+
dpdt no;
chemistryReader foamChemistryReader;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
index 3a03cc5845ac1b7be43cf79acc98ccb38f0b80d5..40cf4f3f121a3e8bd1fb408ee5ee8d5ff6540b46 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-rhoChemistryModel ODEChemistryModel<icoPoly8ThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver ode;
+}
chemistry off;
-chemistrySolver ode;
-
initialChemicalTimeStep 1e-07;
sequentialCoeffs
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 0c56a0b62dbb9de4f6d422e57336eaf92f284584..6eb02e10a9594067e129c3b17a707b6fede60783 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -15,7 +15,17 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
+thermoType
+{
+ type heRhoReactionThermo;
+ mixture reactingMixture;
+ transport polynomial;
+ thermo hPolynomial;
+ energy sensibleEnthalpy;
+ equationOfState icoPolynomial;
+ specie specie;
+}
+
dpdt no;
chemistryReader foamChemistryReader;
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
index 1aee9c1bcf9f80e7204474eafb8c6d5f788c8722..fcf49a0f814ccc3f47ef7fe2eb9d212c4045ab21 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
@@ -15,12 +15,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+chemistryType
+{
+ chemistryModel ODEChemistryModel;
+ chemistrySolver ode;
+}
chemistry off;
-chemistrySolver ode;
-
initialChemicalTimeStep 1e-07;
odeCoeffs
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
index 655c9f51d14161377e26b1438b929f7132a0bb47..2684e0053e0657aafc3a247bca3ca6e25b657ab1 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
@@ -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";
@@ -23,7 +32,6 @@ CHEMKINThermoFile "~OpenFOAM/thermoData/therm.dat";
inertSpecie N2;
-
liquids
{
C7H16