From 16c351dc42077dbf2ffdf7a0e89bed873b37d368 Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 28 Sep 2012 16:59:39 +0100 Subject: [PATCH 1/6] BUG: Changing lsolid for lsolidSpecie --- src/regionModels/pyrolysisModels/Make/options | 3 +-- src/regionModels/thermoBaffleModels/Make/options | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/regionModels/pyrolysisModels/Make/options b/src/regionModels/pyrolysisModels/Make/options index 6f12d7c8ee..eac63d03a0 100644 --- a/src/regionModels/pyrolysisModels/Make/options +++ b/src/regionModels/pyrolysisModels/Make/options @@ -19,8 +19,7 @@ LIB_LIBS = \ -lmeshTools \ -lchemistryModel \ -lspecie \ - -lspecie \ - -lsolid \ + -lsolidSpecie \ -lfluidThermophysicalModels \ -lsolidChemistryModel \ -lcompressibleTurbulenceModel \ diff --git a/src/regionModels/thermoBaffleModels/Make/options b/src/regionModels/thermoBaffleModels/Make/options index 88c8955f91..8d14c45c93 100644 --- a/src/regionModels/thermoBaffleModels/Make/options +++ b/src/regionModels/thermoBaffleModels/Make/options @@ -17,4 +17,4 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lOpenFOAM \ - -lsolid + -lsolidSpecie From ee630870e0f7796744bc4d833f24a7ab9575dab4 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 28 Sep 2012 17:21:07 +0100 Subject: [PATCH 2/6] Thermodynamics: Removed addition thermodynamics package selector --- .../psiChemistryModel/psiChemistryModel.C | 2 +- .../rhoChemistryModel/rhoChemistryModel.C | 2 +- .../reactionThermo/Make/files | 2 - .../psiReactionThermo/psiReactionThermo.H | 7 - .../psiReactionThermo/psiReactionThermoNew.C | 148 ------------------ .../rhoReactionThermo/rhoReactionThermo.H | 7 - .../rhoReactionThermo/rhoReactionThermoNew.C | 148 ------------------ 7 files changed, 2 insertions(+), 314 deletions(-) delete mode 100644 src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C delete mode 100644 src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C index dbe787a669..ce0579eca2 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C @@ -44,7 +44,7 @@ Foam::psiChemistryModel::psiChemistryModel ) : basicChemistryModel(mesh), - thermo_(psiReactionThermo::NewType(mesh, thermoTypeName)) + thermo_(psiReactionThermo::New(mesh)) {} diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C index 3dec7efefe..1bdad2d06c 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C @@ -44,7 +44,7 @@ Foam::rhoChemistryModel::rhoChemistryModel ) : basicChemistryModel(mesh), - thermo_(rhoReactionThermo::NewType(mesh, thermoTypeName)) + thermo_(rhoReactionThermo::New(mesh)) {} diff --git a/src/thermophysicalModels/reactionThermo/Make/files b/src/thermophysicalModels/reactionThermo/Make/files index fa58c87312..79a33db51d 100644 --- a/src/thermophysicalModels/reactionThermo/Make/files +++ b/src/thermophysicalModels/reactionThermo/Make/files @@ -5,14 +5,12 @@ chemistryReaders/chemistryReader/makeChemistryReaders.C mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C psiReactionThermo/psiReactionThermo/psiReactionThermo.C -psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C -rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.H b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.H index ddffaa9e09..8add518a8b 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.H +++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.H @@ -82,13 +82,6 @@ public: //- Standard selection based on fvMesh static autoPtr New(const fvMesh&); - //- Select and check that package contains 'thermoType' - static autoPtr NewType - ( - const fvMesh&, - const word& thermoType - ); - //- Destructor virtual ~psiReactionThermo(); diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C deleted file mode 100644 index 1e0c8c8aa8..0000000000 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C +++ /dev/null @@ -1,148 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "psiReactionThermo.H" -#include "fvMesh.H" - -/* -Foam::autoPtr Foam::psiReactionThermo::New -( - const fvMesh& mesh -) -{ - // get model name, but do not register the dictionary - // otherwise it is registered in the database twice - const word modelType - ( - IOdictionary - ( - IOobject - ( - "thermophysicalProperties", - mesh.time().constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ).lookup("thermoType") - ); - - Info<< "Selecting thermodynamics package " << modelType << endl; - - fvMeshConstructorTable::iterator cstrIter = - fvMeshConstructorTablePtr_->find(modelType); - - if (cstrIter == fvMeshConstructorTablePtr_->end()) - { - FatalErrorIn("psiReactionThermo::New(const fvMesh&)") - << "Unknown psiReactionThermo type " - << modelType << nl << nl - << "Valid psiReactionThermo types are:" << nl - << fvMeshConstructorTablePtr_->sortedToc() << nl - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh)); -} -*/ - -Foam::autoPtr Foam::psiReactionThermo::NewType -( - const fvMesh& mesh, - const word& thermoType -) -{ - // get model name, but do not register the dictionary - // otherwise it is registered in the database twice - const word modelType - ( - IOdictionary - ( - IOobject - ( - "thermophysicalProperties", - mesh.time().constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ).lookup("thermoType") - ); - - - if (modelType.find(thermoType) == string::npos) - { - wordList allModels = fvMeshConstructorTablePtr_->sortedToc(); - DynamicList validModels; - forAll(allModels, i) - { - if (allModels[i].find(thermoType) != string::npos) - { - validModels.append(allModels[i]); - } - } - - FatalErrorIn - ( - "autoPtr psiReactionThermo::NewType" - "(" - "const fvMesh&, " - "const word&" - ")" - ) << "Inconsistent thermo package selected:" << nl << nl - << modelType << nl << nl << "Please select a " - << "thermo package based on " << thermoType - << ". Valid options include:" << nl << validModels << nl - << exit(FatalError); - } - - Info<< "Selecting thermodynamics package " << modelType << endl; - - fvMeshConstructorTable::iterator cstrIter = - fvMeshConstructorTablePtr_->find(modelType); - - if (cstrIter == fvMeshConstructorTablePtr_->end()) - { - FatalErrorIn - ( - "autoPtr psiReactionThermo::NewType" - "(" - "const fvMesh&, " - "const word&" - ")" - ) << "Unknown psiReactionThermo type " - << modelType << nl << nl - << "Valid psiReactionThermo types are:" << nl - << fvMeshConstructorTablePtr_->sortedToc() << nl - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh)); -} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.H b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.H index ddfc0bce11..227d6382da 100644 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.H +++ b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.H @@ -82,13 +82,6 @@ public: //- Standard selection based on fvMesh static autoPtr New(const fvMesh&); - //- Select and check that package contains 'thermoType' - static autoPtr NewType - ( - const fvMesh&, - const word& thermoType - ); - //- Destructor virtual ~rhoReactionThermo(); diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C deleted file mode 100644 index 8530d2cd3b..0000000000 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C +++ /dev/null @@ -1,148 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "rhoReactionThermo.H" -#include "fvMesh.H" - -/* -Foam::autoPtr Foam::rhoReactionThermo::New -( - const fvMesh& mesh -) -{ - // get model name, but do not register the dictionary - // otherwise it is registered in the database twice - const word modelType - ( - IOdictionary - ( - IOobject - ( - "thermophysicalProperties", - mesh.time().constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ).lookup("thermoType") - ); - - Info<< "Selecting thermodynamics package " << modelType << endl; - - fvMeshConstructorTable::iterator cstrIter = - fvMeshConstructorTablePtr_->find(modelType); - - if (cstrIter == fvMeshConstructorTablePtr_->end()) - { - FatalErrorIn("rhoReactionThermo::New(const fvMesh&)") - << "Unknown rhoReactionThermo type " - << modelType << nl << nl - << "Valid rhoReactionThermo types:" << nl - << fvMeshConstructorTablePtr_->sortedToc() << nl - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh)); -} -*/ - - -Foam::autoPtr Foam::rhoReactionThermo::NewType -( - const fvMesh& mesh, - const word& thermoType -) -{ - // get model name, but do not register the dictionary - // otherwise it is registered in the database twice - const word modelType - ( - IOdictionary - ( - IOobject - ( - "thermophysicalProperties", - mesh.time().constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ).lookup("thermoType") - ); - - if (modelType.find(thermoType) == string::npos) - { - wordList allModels = fvMeshConstructorTablePtr_->sortedToc(); - DynamicList validModels; - forAll(allModels, i) - { - if (allModels[i].find(thermoType) != string::npos) - { - validModels.append(allModels[i]); - } - } - - FatalErrorIn - ( - "autoPtr rhoReactionThermo::NewType" - "(" - "const fvMesh&, " - "const word&" - ")" - ) << "Inconsistent thermo package selected:" << nl << nl - << modelType << nl << nl << "Please select a " - << "thermo package based on " << thermoType - << ". Valid options include:" << nl << validModels << nl - << exit(FatalError); - } - - Info<< "Selecting thermodynamics package " << modelType << endl; - - fvMeshConstructorTable::iterator cstrIter = - fvMeshConstructorTablePtr_->find(modelType); - - if (cstrIter == fvMeshConstructorTablePtr_->end()) - { - FatalErrorIn - ( - "autoPtr rhoReactionThermo::NewType" - "(" - "const fvMesh&, " - "const word&" - ")" - ) << "Unknown rhoReactionThermo type " - << modelType << nl << nl - << "Valid rhoReactionThermo types:" << nl - << fvMeshConstructorTablePtr_->sortedToc() << nl - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh)); -} - - -// ************************************************************************* // From 713d109922fad4571382d0f89ee3a14b84ff0f94 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 28 Sep 2012 17:21:27 +0100 Subject: [PATCH 3/6] Thermodynamics: minor reformat --- .../solidThermo/solidReactionThermo/solidReactionThermoNew.C | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C index 4104b66131..6ef34f0e76 100644 --- a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C +++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C @@ -72,7 +72,8 @@ Foam::autoPtr Foam::solidReactionThermo::New Foam::autoPtr Foam::solidReactionThermo::New ( - const fvMesh& mesh, const dictionary& dict + const fvMesh& mesh, + const dictionary& dict ) { if (debug) From 149a584cfe68cc8d0d867a49b07a01323458097d Mon Sep 17 00:00:00 2001 From: Henry Date: Sun, 30 Sep 2012 21:26:12 +0100 Subject: [PATCH 4/6] Solid thermodynamic: rationalize and update selection mechanism for consistency with fluid thermo --- .../basicChemistryModelTemplates.C | 191 ++++++++++++++++++ .../makeSolidChemistryModel.H | 61 ++++++ .../solidChemistryModels.C | 2 +- .../makeSolidChemistrySolverType.H | 5 - .../radiation/const/constSolidRad.H | 28 ++- .../transport/const/constIsoSolidTransport.H | 28 ++- .../exponential/exponentialSolidTransport.H | 28 ++- .../solidThermo/heSolidThermo/heSolidThermo.C | 53 +++-- .../solidThermo/heSolidThermo/heSolidThermo.H | 6 +- .../basicSolidMixture/basicSolidMixture.H | 1 - .../multiComponentSolidMixture.H | 3 - .../pureSolidMixture/pureSolidMixture.H | 4 - .../reactingSolidMixture.H | 2 - .../solidThermo/solidThermo/makeSolidThermo.H | 110 +++------- .../solidThermo/solidThermo/solidThermo.C | 2 +- .../solidThermo/solidThermo/solidThermo.H | 3 +- .../solidThermo/solidThermo/solidThermoNew.C | 8 +- .../leftSolid/thermophysicalProperties | 2 +- .../rightSolid/thermophysicalProperties | 2 +- .../leftSolid/thermophysicalProperties | 2 +- .../rightSolid/thermophysicalProperties | 2 +- .../leftSolid/thermophysicalProperties | 2 +- .../rightSolid/thermophysicalProperties | 2 +- .../leftSolid/thermophysicalProperties | 2 +- .../rightSolid/thermophysicalProperties | 2 +- .../leftSolid/thermophysicalProperties | 2 +- .../rightSolid/thermophysicalProperties | 2 +- 27 files changed, 380 insertions(+), 175 deletions(-) create mode 100644 src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C create mode 100644 src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C new file mode 100644 index 0000000000..e842b4b27b --- /dev/null +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C @@ -0,0 +1,191 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "basicChemistryModel.H" +#include "basicThermo.H" + +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +template +Foam::autoPtr Foam::basicChemistryModel::New +( + const fvMesh& mesh +) +{ + IOdictionary chemistryDict + ( + IOobject + ( + "chemistryProperties", + mesh.time().constant(), + mesh, + IOobject::MUST_READ, + IOobject::NO_WRITE, + false + ) + ); + + word chemistryTypeName; + + if (chemistryDict.isDict("chemistryType")) + { + const dictionary& chemistryTypeDict + ( + chemistryDict.subDict("chemistryType") + ); + + Info<< "Selecting chemistry type " << chemistryTypeDict << endl; + + const int nCmpt = 8; + const char* cmptNames[nCmpt] = + { + "chemistrySolver", + "chemistryModel", + "???ChemistryModel", + "transport", + "thermo", + "equationOfState", + "specie", + "energy" + }; + + IOdictionary thermoDict + ( + IOobject + ( + "thermophysicalProperties", + mesh.time().constant(), + mesh, + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + false + ) + ); + + word thermoTypeName; + + if (thermoDict.isDict("thermoType")) + { + const dictionary& thermoTypeDict(thermoDict.subDict("thermoType")); + thermoTypeName = + word(thermoTypeDict.lookup("transport")) + '<' + + word(thermoTypeDict.lookup("thermo")) + '<' + + word(thermoTypeDict.lookup("equationOfState")) + '<' + + word(thermoTypeDict.lookup("specie")) + ">>," + + word(thermoTypeDict.lookup("energy")) + ">"; + } + else + { + FatalIOErrorIn + ( + (ChemistryModel::typeName + "::New(const mesh&)").c_str(), + thermoDict + ) << "thermoType is in the old format and must be upgraded" + << exit(FatalIOError); + } + + // Construct the name of the chemistry type from the components + chemistryTypeName = + word(chemistryTypeDict.lookup("chemistrySolver")) + '<' + + word(chemistryTypeDict.lookup("chemistryModel")) + '<' + + ChemistryModel::typeName + ',' + + thermoTypeName + ">>"; + + typename ChemistryModel::fvMeshConstructorTable::iterator cstrIter = + ChemistryModel::fvMeshConstructorTablePtr_->find(chemistryTypeName); + + if (cstrIter == ChemistryModel::fvMeshConstructorTablePtr_->end()) + { + FatalErrorIn(ChemistryModel::typeName + "::New(const mesh&)") + << "Unknown " << ChemistryModel::typeName << " type " << nl + << "chemistryType" << chemistryTypeDict << nl << nl + << "Valid " << ChemistryModel ::typeName << " types are:" + << nl << nl; + + // Get the list of all the suitable chemistry packages available + wordList validChemistryTypeNames + ( + ChemistryModel::fvMeshConstructorTablePtr_->sortedToc() + ); + + // Build a table of the thermo packages constituent parts + // Note: row-0 contains the names of constituent parts + List validChemistryTypeNameCmpts + ( + validChemistryTypeNames.size() + 1 + ); + + validChemistryTypeNameCmpts[0].setSize(nCmpt); + forAll(validChemistryTypeNameCmpts[0], j) + { + validChemistryTypeNameCmpts[0][j] = cmptNames[j]; + } + + // Split the thermo package names into their constituent parts + forAll(validChemistryTypeNames, i) + { + validChemistryTypeNameCmpts[i+1] = basicThermo::splitThermoName + ( + validChemistryTypeNames[i], + nCmpt + ); + } + + // Print the table of available packages + // in terms of their constituent parts + printTable(validChemistryTypeNameCmpts, FatalError); + + FatalError<< exit(FatalError); + } + + return autoPtr + (cstrIter()(mesh, typeName, chemistryTypeName)); + } + else + { + chemistryTypeName = + word(chemistryDict.lookup("chemistryType")); + + Info<< "Selecting chemistry type " << chemistryTypeName << endl; + + typename ChemistryModel::fvMeshConstructorTable::iterator cstrIter = + ChemistryModel::fvMeshConstructorTablePtr_->find(chemistryTypeName); + + if (cstrIter == ChemistryModel::fvMeshConstructorTablePtr_->end()) + { + FatalErrorIn(ChemistryModel::typeName + "::New(const mesh&)") + << "Unknown " << ChemistryModel::typeName << " type " + << chemistryTypeName << nl << nl + << "Valid ChemistryModel types are:" << nl + << ChemistryModel::fvMeshConstructorTablePtr_->sortedToc() << nl + << exit(FatalError); + } + + return autoPtr + (cstrIter()(mesh, typeName, chemistryTypeName)); + } +} + +// ************************************************************************* // diff --git a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H new file mode 100644 index 0000000000..95fa907441 --- /dev/null +++ b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H @@ -0,0 +1,61 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Description + Macros for instantiating solid chemistry models + +\*---------------------------------------------------------------------------*/ + +#ifndef makeSolidChemistryModel_H +#define makeSolidChemistryModel_H + +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#define makeSolidChemistryModel(SS, Comp, SThermo, GThermo) \ + \ + typedef SS SS##Comp##SThermo##GThermo; \ + \ + defineTemplateTypeNameAndDebugWithName \ + ( \ + SS##Comp##SThermo##GThermo, \ + #SS"<"#Comp","#SThermo","#GThermo">", \ + 0 \ + ); + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModels.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModels.C index bad1a77bbe..104fa11a7d 100644 --- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModels.C +++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModels.C @@ -30,7 +30,7 @@ Description \*---------------------------------------------------------------------------*/ -#include "makeChemistryModel.H" +#include "makeSolidChemistryModel.H" #include "ODESolidChemistryModel.H" #include "solidChemistryModel.H" diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H index 39e49524e4..f528bc50a5 100644 --- a/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H +++ b/src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H @@ -41,11 +41,6 @@ namespace Foam #define makeSolidChemistrySolverType(SS, ODEChem, Comp, SThermo, GThermo) \ \ - typedef ODESolidChemistryModel \ - ODESolidChemistryModel##Comp##SThermo##GThermo; \ - \ - makeChemistrySolver(ODESolidChemistryModel##Comp##SThermo##GThermo) \ - \ typedef SS > \ SS##ODEChem##Comp##SThermo##GThermo; \ \ diff --git a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H b/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H index 60977f6e83..b9d19591b3 100644 --- a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H +++ b/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H @@ -41,30 +41,30 @@ SourceFiles namespace Foam { -template class constSolidRad; +template class constSolidRad; -template -inline constSolidRad operator* +template +inline constSolidRad operator* ( const scalar, - const constSolidRad& + const constSolidRad& ); -template +template Ostream& operator<< ( Ostream&, - const constSolidRad& + const constSolidRad& ); /*---------------------------------------------------------------------------*\ Class constSolidRad Declaration \*---------------------------------------------------------------------------*/ -template +template class constSolidRad : - public thermo + public Thermo { // Private data @@ -81,7 +81,7 @@ class constSolidRad //- Construct from components inline constSolidRad ( - const thermo& t, + const Thermo& t, const scalar kappaRad, const scalar sigmaS, const scalar emissivity @@ -107,6 +107,12 @@ public: // Member functions + //- Return the instantiated type name + static word typeName() + { + return "const<" + Thermo::typeName() + '>'; + } + //- Return absorption coefficient [1/m] inline scalar kappaRad(scalar T) const; @@ -129,7 +135,7 @@ public: // Friend operators - friend constSolidRad operator* + friend constSolidRad operator* ( const scalar, const constSolidRad& @@ -138,7 +144,7 @@ public: // Ostream Operator - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, const constSolidRad& diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H index b32ae358ee..126589f00b 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H +++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H @@ -45,20 +45,20 @@ SourceFiles namespace Foam { -template class constIsoSolidTransport; +template class constIsoSolidTransport; -template -inline constIsoSolidTransport operator* +template +inline constIsoSolidTransport operator* ( const scalar, - const constIsoSolidTransport& + const constIsoSolidTransport& ); -template +template Ostream& operator<< ( Ostream&, - const constIsoSolidTransport& + const constIsoSolidTransport& ); @@ -66,10 +66,10 @@ Ostream& operator<< Class constIsoSolidTransport Declaration \*---------------------------------------------------------------------------*/ -template +template class constIsoSolidTransport : - public thermo + public Thermo { // Private data @@ -80,7 +80,7 @@ class constIsoSolidTransport // Private Member Functions //- Construct from components - inline constIsoSolidTransport(const thermo& t, const scalar kappa); + inline constIsoSolidTransport(const Thermo& t, const scalar kappa); public: @@ -100,6 +100,12 @@ public: // Member functions + //- Return the instantiated type name + static word typeName() + { + return "constIso<" + Thermo::typeName() + '>'; + } + //- Isotropic thermal conductivity [W/mK] inline scalar kappa(const scalar T) const; @@ -122,7 +128,7 @@ public: // Friend operators - friend constIsoSolidTransport operator* + friend constIsoSolidTransport operator* ( const scalar, const constIsoSolidTransport& @@ -131,7 +137,7 @@ public: // Ostream Operator - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, const constIsoSolidTransport& diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H index 1ace8a3c45..1531b25f03 100644 --- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H +++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H @@ -42,20 +42,20 @@ SourceFiles namespace Foam { -template class exponentialSolidTransport; +template class exponentialSolidTransport; -template -inline exponentialSolidTransport operator* +template +inline exponentialSolidTransport operator* ( const scalar, - const exponentialSolidTransport& + const exponentialSolidTransport& ); -template +template Ostream& operator<< ( Ostream&, - const exponentialSolidTransport& + const exponentialSolidTransport& ); @@ -63,10 +63,10 @@ Ostream& operator<< Class exponentialSolidTransport Declaration \*---------------------------------------------------------------------------*/ -template +template class exponentialSolidTransport : - public thermo + public Thermo { // Private data @@ -85,7 +85,7 @@ class exponentialSolidTransport //- Construct from components inline exponentialSolidTransport ( - const thermo& t, + const Thermo& t, const scalar kappa0, const scalar n0, const scalar Tref @@ -110,6 +110,12 @@ public: // Member functions + //- Return the instantiated type name + static word typeName() + { + return "exponential<" + Thermo::typeName() + '>'; + } + //- Thermal conductivity [W/mK] inline scalar kappa(const scalar T) const; @@ -132,7 +138,7 @@ public: // Friend operators - friend exponentialSolidTransport operator* + friend exponentialSolidTransport operator* ( const scalar, const exponentialSolidTransport& @@ -140,7 +146,7 @@ public: // Ostream Operator - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, const exponentialSolidTransport& diff --git a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C index c59f6419a9..3ce0c43e14 100644 --- a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C +++ b/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C @@ -28,10 +28,9 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::heSolidThermo::calculate() +template +void Foam::heSolidThermo::calculate() { - scalarField& TCells = this->T_.internalField(); const scalarField& hCells = this->he_.internalField(); @@ -123,8 +122,8 @@ void Foam::heSolidThermo::calculate() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::heSolidThermo:: +template +Foam::heSolidThermo:: heSolidThermo(const fvMesh& mesh) : heThermo(mesh) @@ -133,8 +132,8 @@ heSolidThermo(const fvMesh& mesh) } -template -Foam::heSolidThermo:: +template +Foam::heSolidThermo:: heSolidThermo(const fvMesh& mesh, const dictionary& dict) : heThermo(mesh, dict) @@ -145,15 +144,15 @@ heSolidThermo(const fvMesh& mesh, const dictionary& dict) // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::heSolidThermo::~heSolidThermo() +template +Foam::heSolidThermo::~heSolidThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::heSolidThermo::correct() +template +void Foam::heSolidThermo::correct() { if (debug) { @@ -169,9 +168,9 @@ void Foam::heSolidThermo::correct() } -template +template Foam::tmp -Foam::heSolidThermo::Kappa() const +Foam::heSolidThermo::Kappa() const { const fvMesh& mesh = this->T_.mesh(); @@ -231,9 +230,9 @@ Foam::heSolidThermo::Kappa() const } -template +template Foam::tmp -Foam::heSolidThermo::kappaRad() const +Foam::heSolidThermo::kappaRad() const { const fvMesh& mesh = this->T_.mesh(); @@ -293,9 +292,9 @@ Foam::heSolidThermo::kappaRad() const } -template +template Foam::tmp -Foam::heSolidThermo::sigmaS() const +Foam::heSolidThermo::sigmaS() const { const fvMesh& mesh = this->T_.mesh(); @@ -355,9 +354,9 @@ Foam::heSolidThermo::sigmaS() const } -template +template Foam::tmp -Foam::heSolidThermo::emissivity() const +Foam::heSolidThermo::emissivity() const { const fvMesh& mesh = this->T_.mesh(); @@ -417,9 +416,9 @@ Foam::heSolidThermo::emissivity() const } -template +template Foam::tmp -Foam::heSolidThermo::Kappa +Foam::heSolidThermo::Kappa ( const label patchi ) const @@ -446,9 +445,9 @@ Foam::heSolidThermo::Kappa } -template +template Foam::tmp -Foam::heSolidThermo::kappaRad +Foam::heSolidThermo::kappaRad ( const label patchi ) const @@ -474,9 +473,9 @@ Foam::heSolidThermo::kappaRad } -template +template Foam::tmp -Foam::heSolidThermo::sigmaS +Foam::heSolidThermo::sigmaS ( const label patchi ) const @@ -503,9 +502,9 @@ Foam::heSolidThermo::sigmaS } -template +template Foam::tmp -Foam::heSolidThermo::emissivity +Foam::heSolidThermo::emissivity ( const label patchi ) const diff --git a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H b/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H index 3a154f7fee..f5c5a405be 100644 --- a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H +++ b/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H @@ -36,8 +36,6 @@ SourceFiles #define heSolidThermo_H #include "heThermo.H" -#include "solidThermo.H" -#include "coordinateSystem.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -48,7 +46,7 @@ namespace Foam Class heSolidThermo Declaration \*---------------------------------------------------------------------------*/ -template +template class heSolidThermo : public heThermo @@ -60,7 +58,7 @@ class heSolidThermo void calculate(); //- Construct as copy (not implemented) - heSolidThermo(const heSolidThermo&); + heSolidThermo(const heSolidThermo&); public: diff --git a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H index d5cce4600a..93fb35276b 100644 --- a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H +++ b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H @@ -208,7 +208,6 @@ public: //- Specific heat capacity virtual scalar Cp(scalar p, scalar T, label celli) const = 0; - }; diff --git a/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H b/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H index 494b839ce6..4b772f4233 100644 --- a/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H +++ b/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H @@ -82,9 +82,6 @@ public: //- The type of thermodynamics this mixture is instantiated for typedef ThermoType thermoType; - //- Runtime type information - TypeName("multiComponentSolidMixture"); - // Constructors diff --git a/src/thermophysicalModels/solidThermo/mixtures/pureSolidMixture/pureSolidMixture.H b/src/thermophysicalModels/solidThermo/mixtures/pureSolidMixture/pureSolidMixture.H index f2dae829cd..2605843a6a 100644 --- a/src/thermophysicalModels/solidThermo/mixtures/pureSolidMixture/pureSolidMixture.H +++ b/src/thermophysicalModels/solidThermo/mixtures/pureSolidMixture/pureSolidMixture.H @@ -65,10 +65,6 @@ public: typedef ThermoType thermoType; - //- Runtime type information - TypeName("pureSolidMixture"); - - // Constructors //- Construct from dictionary and mesh diff --git a/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H b/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H index a252517591..66443f4324 100644 --- a/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H +++ b/src/thermophysicalModels/solidThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H @@ -67,8 +67,6 @@ public: //- The type of thermo package this mixture is instantiated for typedef ThermoSolidType thermoType; - //- Runtime type information - TypeName("reactingSolidMixture"); // Constructors diff --git a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H index 12dde56bd1..3f44c6b825 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H +++ b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H @@ -39,59 +39,7 @@ Description #define makeSolidThermo(BaseThermo,Cthermo,Mixture,Transport,Radiation,Type,Thermo,EqnOfState,Specie)\ \ -typedef Cthermo \ -< \ - Mixture \ - < \ - Transport \ - < \ - Radiation \ - < \ - species::thermo \ - < \ - Thermo \ - < \ - EqnOfState \ - < \ - Specie \ - > \ - >, \ - Type \ - > \ - > \ - > \ - >, \ - BaseThermo \ -> Cthermo##Mixture##Transport##Radiation##Type##Thermo \ - ##EqnOfState##Specie##BaseThermo; \ - \ -defineTemplateTypeNameAndDebugWithName \ -( \ - Cthermo##Mixture##Transport##Radiation##Type##Thermo \ - ##EqnOfState##Specie##BaseThermo, \ - #Cthermo \ - "<" \ - #Mixture \ - "<" \ - #Transport \ - "<" \ - #Radiation \ - "<" \ - #Thermo \ - "<" \ - #EqnOfState \ - "<" \ - #Specie \ - ">" \ - ">," \ - #Type \ - ">>>>", \ - 0 \ -); \ - \ - \ -typedef Mixture \ -< \ +typedef \ Transport \ < \ Radiation \ @@ -108,41 +56,39 @@ typedef Mixture \ Type \ > \ > \ - > \ -> Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie; \ + > Transport##Radiation##Type##Thermo##EqnOfState##Specie; \ \ +typedef \ + Mixture \ + < \ + Transport##Radiation##Type##Thermo##EqnOfState##Specie \ + > Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie; \ + \ +typedef \ + Cthermo \ + < \ + BaseThermo, \ + Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie \ + > Cthermo##Mixture##Transport##Radiation##Type##Thermo \ + ##EqnOfState##Specie; \ \ defineTemplateTypeNameAndDebugWithName \ ( \ - Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie, \ - #Mixture \ - "<" \ - #Transport \ - "<" \ - #Radiation \ - "<" \ - #Thermo \ - "<" \ - #EqnOfState \ - ">," \ - #Type \ - ">>>", \ - 0 \ -); \ - \ -addToRunTimeSelectionTable \ -( \ - BaseThermo, \ Cthermo##Mixture##Transport##Radiation##Type##Thermo \ - ##EqnOfState##Specie##BaseThermo, \ - mesh \ + ##EqnOfState##Specie, \ + ( \ + #Cthermo"<"#Mixture"<" \ + + Transport##Radiation##Type##Thermo##EqnOfState##Specie::typeName() \ + + ">>" \ + ).c_str(), \ + 0 \ ); \ \ addToRunTimeSelectionTable \ ( \ basicThermo, \ Cthermo##Mixture##Transport##Radiation##Type##Thermo \ - ##EqnOfState##Specie##BaseThermo, \ + ##EqnOfState##Specie, \ fvMesh \ ); \ \ @@ -150,7 +96,15 @@ addToRunTimeSelectionTable \ ( \ BaseThermo, \ Cthermo##Mixture##Transport##Radiation##Type##Thermo \ - ##EqnOfState##Specie##BaseThermo, \ + ##EqnOfState##Specie, \ + fvMesh \ +); \ + \ +addToRunTimeSelectionTable \ +( \ + BaseThermo, \ + Cthermo##Mixture##Transport##Radiation##Type##Thermo \ + ##EqnOfState##Specie, \ dictionary \ ); diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C index e5bb9fa274..c5ebf5731c 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C @@ -32,7 +32,7 @@ License namespace Foam { defineTypeNameAndDebug(solidThermo, 0); - defineRunTimeSelectionTable(solidThermo, mesh); + defineRunTimeSelectionTable(solidThermo, fvMesh); defineRunTimeSelectionTable(solidThermo, dictionary); } diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H index 075907903a..bc30f74370 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H @@ -77,12 +77,11 @@ public: ( autoPtr, solidThermo, - mesh, + fvMesh, (const fvMesh& mesh), (mesh) ); - // Declare run-time constructor selection tables declareRunTimeSelectionTable ( diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C index 1fbb1afca2..28871b9f75 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C @@ -55,10 +55,10 @@ Foam::autoPtr Foam::solidThermo::New ).lookup("thermoType") ); - meshConstructorTable::iterator cstrIter = - meshConstructorTablePtr_->find(thermoType); + fvMeshConstructorTable::iterator cstrIter = + fvMeshConstructorTablePtr_->find(thermoType); - if (cstrIter == meshConstructorTablePtr_->end()) + if (cstrIter == fvMeshConstructorTablePtr_->end()) { FatalErrorIn ( @@ -66,7 +66,7 @@ Foam::autoPtr Foam::solidThermo::New ) << "Unknown solidThermo type " << thermoType << endl << endl << "Valid solidThermo types are :" << endl - << meshConstructorTablePtr_->toc() + << fvMeshConstructorTablePtr_->toc() << exit(FatalError); } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties index 13a2e81f03..884f3f652c 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties index 13a2e81f03..884f3f652c 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties index a4c501e063..d4f02fb677 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties index a4c501e063..d4f02fb677 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties index a4c501e063..d4f02fb677 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties index a4c501e063..d4f02fb677 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties index a4c501e063..d4f02fb677 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties index a4c501e063..d4f02fb677 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties index 9ac37aef59..99794189d6 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties index 9ac37aef59..99794189d6 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { From 9bf80af379c70d8f62274075ed9463c7c087302b Mon Sep 17 00:00:00 2001 From: Henry Date: Sun, 30 Sep 2012 21:27:18 +0100 Subject: [PATCH 5/6] Thermodynamics: Update selection mechanism for reaction and chemistry thermodynamics --- .../basic/basicThermo/basicThermo.C | 19 +- .../basic/basicThermo/basicThermoTemplates.C | 2 + .../basic/fluidThermo/makeThermo.H | 63 +- .../chemistryModel/Make/files | 2 - .../basicChemistryModel/basicChemistryModel.H | 11 + .../chemistryModel/makeChemistryModel.H | 14 +- .../psiChemistryModel/psiChemistryModel.C | 11 + .../psiChemistryModel/psiChemistryModelNew.C | 129 -- .../rhoChemistryModel/rhoChemistryModel.C | 11 + .../rhoChemistryModel/rhoChemistryModelNew.C | 129 -- .../chemistrySolver/chemistrySolver.H | 35 - .../makeChemistrySolverTypes.H | 23 +- .../reactionThermo/makeReactionThermo.H | 159 +-- .../icoPolynomial/icoPolynomial.H | 7 + .../incompressiblePerfectGas.H | 9 + .../equationOfState/perfectGas/perfectGas.H | 7 + .../equationOfState/rhoConst/rhoConst.H | 7 + .../reaction/reactions/makeChemkinReactions.C | 92 -- .../absoluteEnthalpy/absoluteEnthalpy.H | 6 + .../specie/thermo/eConst/eConstThermo.H | 7 + .../specie/thermo/hConst/hConstThermo.H | 59 +- .../thermo/hExponential/hExponentialThermo.H | 28 +- .../thermo/hPolynomial/hPolynomialThermo.H | 7 + .../specie/thermo/janaf/janafThermo.H | 6 + .../sensibleEnthalpy/sensibleEnthalpy.H | 6 + .../sensibleInternalEnergy.H | 6 + .../specie/thermo/thermo/thermo.H | 8 + .../specie/transport/const/constTransport.H | 6 + .../polynomial/polynomialTransport.H | 6 + .../sutherland/sutherlandTransport.H | 6 + .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../chemFoam/gri/constant/chemistryProperties | 8 +- .../gri/constant/thermophysicalProperties | 11 +- .../chemFoam/h2/constant/chemistryProperties | 8 +- .../h2/constant/thermophysicalProperties | 11 +- .../ic8h18/constant/chemistryProperties | 8 +- .../ic8h18/constant/thermophysicalProperties | 11 +- .../nc7h16/constant/chemistryProperties | 8 +- .../nc7h16/constant/thermophysicalProperties | 11 +- .../constant/thermophysicalProperties | 4 +- .../panelRegion/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 14 +- .../constant/thermophysicalProperties | 11 +- .../constant/chemistryProperties | 8 +- .../constant/thermophysicalProperties | 11 +- .../constant/chemistryProperties | 8 +- .../constant/thermophysicalProperties | 11 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../cavity/constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../prism/constant/thermophysicalProperties | 4 +- .../hotRoom/constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../system/changeDictionaryDict.baffleRegion | 2 +- .../hotRoom/constant/thermophysicalProperties | 6 +- .../constant/thermophysicalProperties | 4 +- .../constant/thermophysicalProperties | 4 +- .../bottomAir/thermophysicalProperties | 4 +- .../constant/heater/thermophysicalProperties | 2 +- .../constant/topAir/thermophysicalProperties | 4 +- .../bottomWater/thermophysicalProperties | 4 +- .../constant/heater/thermophysicalProperties | 2 +- .../constant/topAir/thermophysicalProperties | 4 +- .../bottomAir/thermophysicalProperties | 4 +- .../constant/heater/thermophysicalProperties | 2 +- .../constant/topAir/thermophysicalProperties | 4 +- .../bottomAir/thermophysicalProperties | 4 +- .../constant/heater/thermophysicalProperties | 2 +- .../constant/topAir/thermophysicalProperties | 4 +- .../bottomAir/thermophysicalProperties | 4 +- .../constant/heater/thermophysicalProperties | 2 +- .../constant/topAir/thermophysicalProperties | 4 +- .../constant/chemistryProperties | 8 +- .../constant/thermophysicalProperties | 11 +- .../constant/chemistryProperties | 8 +- .../constant/thermophysicalProperties | 11 +- .../constant/chemistryProperties | 8 +- .../constant/polyMesh/boundary | 2 + .../constant/thermophysicalProperties | 11 +- .../cylinder/constant/chemistryProperties | 8 +- .../cylinder/constant/polyMesh/boundary | 1125 ++++++++++++++++- .../constant/thermophysicalProperties | 13 +- .../hotBoxes/constant/chemistryProperties | 8 +- .../hotBoxes/constant/polyMesh/boundary | 4 +- .../constant/thermophysicalProperties | 13 +- .../rivuletPanel/constant/chemistryProperties | 8 +- .../rivuletPanel/constant/polyMesh/boundary | 2 +- .../constant/thermophysicalProperties | 13 +- .../splashPanel/constant/chemistryProperties | 8 +- .../splashPanel/constant/polyMesh/boundary | 213 +++- .../constant/thermophysicalProperties | 13 +- .../filter/constant/chemistryProperties | 8 +- .../filter/constant/thermophysicalProperties | 12 +- .../parcelInBox/constant/chemistryProperties | 8 +- .../constant/thermophysicalProperties | 12 +- .../constant/chemistryProperties | 8 +- .../constant/thermophysicalProperties | 12 +- .../aachenBomb/constant/chemistryProperties | 8 +- .../constant/thermophysicalProperties | 12 +- 115 files changed, 2007 insertions(+), 744 deletions(-) delete mode 100644 src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C delete mode 100644 src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C delete mode 100644 src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C index d938fb77a2..f1ac31e459 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 99fe8cacc2..e59e2b6a26 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C +++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C @@ -76,6 +76,8 @@ Foam::autoPtr 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 0219106012..21f430269b 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 f78853a7ea..ef8c6d84c8 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 da54d4c916..67704bb9df 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 + static autoPtr 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 404f758b1b..c0ae64edf4 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 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 ce0579eca2..933dd952ba 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::New +( + const fvMesh& mesh +) +{ + return basicChemistryModel::New(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 795b48fbb8..0000000000 --- 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 . - -\*---------------------------------------------------------------------------*/ - -#include "psiChemistryModel.H" - -// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // - -Foam::autoPtr 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 - (cstrIter()(mesh, typeName, thermoTypeName)); -} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C index 1bdad2d06c..f8b033d68a 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::New +( + const fvMesh& mesh +) +{ + return basicChemistryModel::New(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 ceb73d07d7..0000000000 --- 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 . - -\*---------------------------------------------------------------------------*/ - -#include "rhoChemistryModel.H" - -// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // - -Foam::autoPtr 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 - (cstrIter()(mesh, typeName, thermoTypeName)); -} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H index f8348150b0..dfbb29ecd0 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, \ - "chemistrySolver<"#ODEChem">", \ - 0 \ - ); - - -#define makeChemistrySolverType(SS, ODEChem, Comp, Thermo) \ - \ - typedef SS > 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 2523e9cefa..f9ab5839c3 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H @@ -37,12 +37,27 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#define makeChemistrySolverType(SS, ODEChem, Comp, Thermo) \ + \ + typedef SS > SS##ODEChem##Comp##Thermo; \ + \ + defineTemplateTypeNameAndDebugWithName \ + ( \ + SS##ODEChem##Comp##Thermo, \ + (#SS"<"#ODEChem"<"#Comp"," + Thermo::typeName() + ">>").c_str(), \ + 0 \ + ); \ + \ + addToRunTimeSelectionTable \ + ( \ + Comp, \ + SS##ODEChem##Comp##Thermo, \ + fvMesh \ + ); + + #define makeChemistrySolverTypes(CompChemModel,Thermo) \ \ - typedef ODEChemistryModel CompChemModel##Thermo; \ - \ - makeChemistrySolver(CompChemModel##Thermo); \ - \ makeChemistrySolverType \ ( \ noChemistrySolver, \ diff --git a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H index 37221d1090..3b88008e04 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 30feeb88b8..0665f89e80 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 fd4e2d6d36..7ff3f054e3 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 4b02137b25..c2421db5d8 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 5eccbbc233..ac7d62b891 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 67ef382fac..0000000000 --- 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 . - -\*---------------------------------------------------------------------------*/ - -#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 d374a81d0b..98bf51e03f 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 378a39c059..7e0781cc40 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 14068fbaef..f3bf052209 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 hConstThermo; +template class hConstThermo; -template -inline hConstThermo operator+ +template +inline hConstThermo operator+ ( - const hConstThermo&, - const hConstThermo& + const hConstThermo&, + const hConstThermo& ); -template -inline hConstThermo operator- +template +inline hConstThermo operator- ( - const hConstThermo&, - const hConstThermo& + const hConstThermo&, + const hConstThermo& ); -template -inline hConstThermo operator* +template +inline hConstThermo operator* ( const scalar, - const hConstThermo& + const hConstThermo& ); -template -inline hConstThermo operator== +template +inline hConstThermo operator== ( - const hConstThermo&, - const hConstThermo& + const hConstThermo&, + const hConstThermo& ); -template +template Ostream& operator<< ( Ostream&, - const hConstThermo& + const hConstThermo& ); @@ -86,10 +86,10 @@ Ostream& operator<< Class hConstThermo Declaration \*---------------------------------------------------------------------------*/ -template +template 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+ + friend hConstThermo operator+ ( const hConstThermo&, const hConstThermo& ); - friend hConstThermo operator- + friend hConstThermo operator- ( const hConstThermo&, const hConstThermo& ); - friend hConstThermo operator* + friend hConstThermo operator* ( const scalar, const hConstThermo& ); - friend hConstThermo operator== + friend hConstThermo operator== ( const hConstThermo&, const hConstThermo& @@ -195,7 +202,7 @@ public: // IOstream Operators - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, const hConstThermo& diff --git a/src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermo.H b/src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermo.H index 956f6d8846..a54dfafcda 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 hExponentialThermo; +template class hExponentialThermo; -template -inline hExponentialThermo operator* +template +inline hExponentialThermo operator* ( const scalar, - const hExponentialThermo& + const hExponentialThermo& ); -template +template Ostream& operator<< ( Ostream&, - const hExponentialThermo& + const hExponentialThermo& ); @@ -68,10 +68,10 @@ Ostream& operator<< Class hExponentialThermo Declaration \*---------------------------------------------------------------------------*/ -template +template 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* + friend hExponentialThermo operator* ( const scalar, const hExponentialThermo& @@ -162,7 +168,7 @@ public: // Ostream Operator - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, const hExponentialThermo& diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H index 1465c94f2a..a0b557f215 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 9407336600..3fa4f8dd08 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 e09e2a61f9..07cf5a2765 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 ddc48a2df0..7adf3e34d7 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 07c84553e6..bacceb36bc 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 >::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 33ebaa3909..c1e3120000 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 eeb223aa29..85ec167256 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 5e91c15b76..f8ac0722dd 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 c7426d104e..301c1d7986 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 d265c0bc1a..9c8539a6ab 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 6adffc7f81..65f5b0ac6d 100644 --- a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties +++ b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties @@ -15,14 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 3c5e475229..d6cb3dd45f 100644 --- a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 5f797c7bdb..b0ebc946d4 100644 --- a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties +++ b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties @@ -15,14 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 3c5e475229..d6cb3dd45f 100644 --- a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 b635af7f79..07d0e5d36e 100644 --- a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties +++ b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties @@ -15,14 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 3c5e475229..d6cb3dd45f 100644 --- a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 46ee84b7ba..277f2632be 100644 --- a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties +++ b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties @@ -15,14 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 3c5e475229..d6cb3dd45f 100644 --- a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 29f628b4dc..4946ebff2a 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 9c79a06e63..57e0ddc7b1 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>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; solidComponents ( diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties index 633ba62491..446c37a397 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>; +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 7e40fa1835..4610e63a5a 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 e4a61879bf..103c36caab 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties @@ -15,14 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 7e40fa1835..4610e63a5a 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 0f6c7dd5c4..068c1b3f46 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 397c9bec8d..4eca14a981 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 cecce6e7b2..f7ae5e91df 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 9a4df2030a..311e40d8fa 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 aad77235ff..f26f216f96 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 dde7c242fa..20369bc4ac 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 2ac6e58ee4..dff8b1620d 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 dde7c242fa..20369bc4ac 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 49716e9507..54be80fadb 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 9723272741..7182386e00 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 9ee57766cf..6671abebe7 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 9723272741..7182386e00 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 9723272741..7182386e00 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 317544a7bf..82e3c59f87 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 0cd2cebd8e..920fff435c 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 6a961a3b73..8658d3da81 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 aad77235ff..f26f216f96 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 cd10ed5923..7d0bc7caf3 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 43831f935b..341cdb94d5 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 43831f935b..341cdb94d5 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 0085820454..ab678e4d88 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 0a1f8cd359..5ba8a553e1 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 0a1f8cd359..5ba8a553e1 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 0bc5e4dbf4..0659d6b690 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>,sensibleEnthalpy>>>>; + thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties index 55b5c40c20..4c4cce2da7 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties @@ -15,14 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// thermoType hePsiThermo>,sensibleEnthalpy>>>; +// thermoType hePsiThermo>,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 1433c8c53e..7964a240ae 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 1433c8c53e..7964a240ae 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 67d6054e23..c293c032a3 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 13a2e81f03..884f3f652c 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties index b1783beb14..213e77a87b 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 50d01b91d1..828c78d208 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 a4c501e063..d4f02fb677 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties index b1783beb14..213e77a87b 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 67d6054e23..c293c032a3 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 a4c501e063..d4f02fb677 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties index b1783beb14..213e77a87b 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 67d6054e23..c293c032a3 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 a4c501e063..d4f02fb677 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties index b1783beb14..213e77a87b 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 67d6054e23..c293c032a3 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 9ac37aef59..99794189d6 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType heSolidThermo>,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties index b1783beb14..213e77a87b 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 e12334b534..2f8eb06d2b 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -rhoChemistryModel ODEChemistryModel; +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 e7748f52bc..bd526695b9 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoReactionThermo>; +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 604aa21213..275a88b8d6 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -rhoChemistryModel ODEChemistryModel; +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 5d715a7857..4f5a6b1347 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoReactionThermo>; +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 84e12dae0f..aed335d273 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 b130d7bc0a..d06b4eac6e 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 1c62457dd6..99a7d5707c 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 99de98f9ef..c0ecd63722 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 d88a228043..f23b09abae 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 +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 5938ce87a3..380bc6551b 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 99de98f9ef..c0ecd63722 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 695e9795ca..6e737bbc0b 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 + offsets nonuniform List 6144 ( (-0 -0 -0) @@ -6191,7 +6191,7 @@ FoamFile sampleRegion wallFilmRegion; samplePatch region0_to_wallFilmRegion_floorFaces; offsetMode nonuniform; - offsets nonuniform List + offsets nonuniform List 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 5938ce87a3..380bc6551b 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 99de98f9ef..c0ecd63722 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 006c08790d..7b4f359759 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 43200 ( (-6.938893904e-18 -0 -0) diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties index 5938ce87a3..380bc6551b 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 99de98f9ef..c0ecd63722 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 662f5080b6..17a5ed74a7 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 +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 5938ce87a3..380bc6551b 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 3a03cc5845..40cf4f3f12 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -rhoChemistryModel ODEChemistryModel; +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 63ca7f7968..594121c7ff 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties @@ -15,7 +15,17 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoReactionThermo>; +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 3a03cc5845..40cf4f3f12 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -rhoChemistryModel ODEChemistryModel; +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 d09b3f95f8..07b94deeb7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties @@ -15,7 +15,17 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoReactionThermo>; +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 3a03cc5845..40cf4f3f12 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -rhoChemistryModel ODEChemistryModel; +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 0c56a0b62d..6eb02e10a9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties @@ -15,7 +15,17 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoReactionThermo>; +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 1aee9c1bcf..fcf49a0f81 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties @@ -15,12 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -psiChemistryModel ODEChemistryModel; +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 655c9f51d1..2684e0053e 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiReactionThermo>; +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 From 27528e6ac4b3cb4a011b5db8a281d8fd16747d78 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 1 Oct 2012 09:58:13 +0100 Subject: [PATCH 6/6] Corrected line length --- .../reactionThermo/makeReactionThermo.H | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H index 3b88008e04..296dbe7a9a 100644 --- a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H +++ b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H @@ -98,7 +98,14 @@ typedef \ > \ > Transport##Type##Thermo##EqnOfState##Specie; \ \ -makeReactionMixtureThermo(BaseThermo,CThermo,MixtureThermo,Mixture,Transport##Type##Thermo##EqnOfState##Specie) +makeReactionMixtureThermo \ +( \ + BaseThermo, \ + CThermo, \ + MixtureThermo, \ + Mixture, \ + Transport##Type##Thermo##EqnOfState##Specie \ +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //