diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C index 0e11217066..f3c4fd3b6d 100644 --- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C +++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C @@ -46,7 +46,7 @@ temperatureThermoBaffleFvPatchScalarField turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(p, iF), owner_(false), baffle_(), - solidThermoType_("undefined"), + solidThermoType_(new primitiveEntry("thermoType", "undefined")), dict_(dictionary::null) {} @@ -69,7 +69,7 @@ temperatureThermoBaffleFvPatchScalarField ), owner_(ptf.owner_), baffle_(ptf.baffle_), - solidThermoType_(ptf.solidThermoType_), + solidThermoType_(ptf.solidThermoType_().clone()), dict_(ptf.dict_) {} @@ -85,7 +85,7 @@ temperatureThermoBaffleFvPatchScalarField turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(p, iF, dict), owner_(false), baffle_(), - solidThermoType_(), + solidThermoType_(new primitiveEntry("thermoType", "undefined")), dict_(dict) { if (!isA(patch().patch())) @@ -126,7 +126,7 @@ temperatureThermoBaffleFvPatchScalarField Info << "Creating thermal baffle" << nbrMesh << endl; baffle_.reset(baffle::New(thisMesh, dict).ptr()); owner_ = true; - dict.lookup("thermoType") >> solidThermoType_; + solidThermoType_ = dict.lookupEntry("thermoType", false, false).clone(); baffle_->rename(nbrMesh); } } @@ -142,7 +142,7 @@ temperatureThermoBaffleFvPatchScalarField turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(ptf, iF), owner_(ptf.owner_), baffle_(ptf.baffle_), - solidThermoType_(ptf.solidThermoType_), + solidThermoType_(ptf.solidThermoType_().clone()), dict_(ptf.dict_) {} @@ -219,8 +219,7 @@ void temperatureThermoBaffleFvPatchScalarField::write(Ostream& os) const os.writeKeyword(word(thermoModel + "Coeffs")); os << dict_.subDict(thermoModel + "Coeffs") << nl; - os.writeKeyword("thermoType") << solidThermoType_ - << token::END_STATEMENT << nl; + os << solidThermoType_() << nl; os.writeKeyword("mixture"); os << dict_.subDict("mixture") << nl; diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H index 6dd5cbbb4e..32b63ebe39 100644 --- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H +++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H @@ -140,7 +140,7 @@ class temperatureThermoBaffleFvPatchScalarField autoPtr baffle_; //- Solid thermo type - word solidThermoType_; + autoPtr solidThermoType_; //- Dictionary dictionary dict_; diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C index 97faec40cb..144b451bbc 100644 --- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C +++ b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C @@ -318,7 +318,13 @@ const tmp thermoBaffle2D::Cp() const const volScalarField& thermoBaffle2D::kappaRad() const { - return thermo_->kappaRad(); + // ***HGW return thermo_->kappaRad(); + FatalErrorIn + ( + "thermoBaffle2D::kappaRad()" + ) << "not currently supported" + << exit(FatalError); + return volScalarField::null(); } diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files index ca80ac7279..3dc3d0c082 100644 --- a/src/thermophysicalModels/basic/Make/files +++ b/src/thermophysicalModels/basic/Make/files @@ -1,11 +1,11 @@ basicThermo/basicThermo.C fluidThermo/fluidThermo.C -psiThermo/psiThermo/psiThermo.C -psiThermo/hePsiThermo/hePsiThermos.C +psiThermo/psiThermo.C +psiThermo/psiThermos.C -rhoThermo/rhoThermo/rhoThermo.C -rhoThermo/heRhoThermo/heRhoThermos.C +rhoThermo/rhoThermo.C +rhoThermo/rhoThermos.C derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H index 3bd01792ba..2064444ff2 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H +++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H @@ -105,10 +105,22 @@ public: // Selectors + //- Generic lookup for each of the related thermodynamics packages + template + static typename Table::iterator lookupThermo + ( + const dictionary& thermoDict, + Table* tablePtr + ); + //- Generic New for each of the related thermodynamics packages template static autoPtr New(const fvMesh&); + //- Generic New for each of the related thermodynamics packages + template + static autoPtr New(const fvMesh&, const dictionary&); + //- Specialisation of the Generic New for basicThermo static autoPtr New(const fvMesh&); diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C index e59e2b6a26..e22b4f33c7 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C +++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C @@ -27,25 +27,13 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -template -Foam::autoPtr Foam::basicThermo::New +template +typename Table::iterator Foam::basicThermo::lookupThermo ( - const fvMesh& mesh + const dictionary& thermoDict, + Table* tablePtr ) { - IOdictionary thermoDict - ( - IOobject - ( - "thermophysicalProperties", - mesh.time().constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ); - word thermoTypeName; if (thermoDict.isDict("thermoType")) @@ -76,16 +64,13 @@ 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); + typename Table::iterator cstrIter = tablePtr->find(thermoTypeName); // Print error message if package not found in the table - if (cstrIter == Thermo::fvMeshConstructorTablePtr_->end()) + if (cstrIter == tablePtr->end()) { - FatalErrorIn(Thermo::typeName + "::New(const fvMesh&)") + FatalErrorIn(Thermo::typeName + "::New") << "Unknown " << Thermo::typeName << " type " << nl << "thermoType" << thermoTypeDict << nl << nl << "Valid " << Thermo::typeName << " types are:" << nl << nl; @@ -93,7 +78,7 @@ Foam::autoPtr Foam::basicThermo::New // Get the list of all the suitable thermo packages available wordList validThermoTypeNames ( - Thermo::fvMeshConstructorTablePtr_->sortedToc() + tablePtr->sortedToc() ); // Build a table of the thermo packages constituent parts @@ -123,7 +108,7 @@ Foam::autoPtr Foam::basicThermo::New FatalError<< exit(FatalError); } - return autoPtr(cstrIter()(mesh)); + return cstrIter; } else { @@ -131,22 +116,69 @@ Foam::autoPtr Foam::basicThermo::New Info<< "Selecting thermodynamics package " << thermoTypeName << endl; - typename Thermo::fvMeshConstructorTable::iterator cstrIter = - Thermo::fvMeshConstructorTablePtr_->find(thermoTypeName); + typename Table::iterator cstrIter = tablePtr->find(thermoTypeName); - if (cstrIter == Thermo::fvMeshConstructorTablePtr_->end()) + if (cstrIter == tablePtr->end()) { - FatalErrorIn(Thermo::typeName + "::New(const fvMesh&)") + FatalErrorIn(Thermo::typeName + "::New") << "Unknown " << Thermo::typeName << " type " << thermoTypeName << nl << nl << "Valid " << Thermo::typeName << " types are:" << nl - << Thermo::fvMeshConstructorTablePtr_->sortedToc() << nl + << tablePtr->sortedToc() << nl << exit(FatalError); } - return autoPtr(cstrIter()(mesh)); + return cstrIter; } } +template +Foam::autoPtr Foam::basicThermo::New +( + const fvMesh& mesh +) +{ + IOdictionary thermoDict + ( + IOobject + ( + "thermophysicalProperties", + mesh.time().constant(), + mesh, + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + false + ) + ); + + typename Thermo::fvMeshConstructorTable::iterator cstrIter = + lookupThermo + ( + thermoDict, + Thermo::fvMeshConstructorTablePtr_ + ); + + return autoPtr(cstrIter()(mesh)); +} + + +template +Foam::autoPtr Foam::basicThermo::New +( + const fvMesh& mesh, + const dictionary& dict +) +{ + typename Thermo::dictionaryConstructorTable::iterator cstrIter = + lookupThermo + ( + dict, + Thermo::dictionaryConstructorTablePtr_ + ); + + return autoPtr(cstrIter()(mesh, dict)); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H index 21f430269b..7a136ebfb0 100644 --- a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H +++ b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H @@ -37,7 +37,7 @@ Description // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define makeThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\ +#define makeThermoTypedefs(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\ \ typedef \ Transport \ @@ -58,10 +58,8 @@ typedef \ typedef \ Cthermo \ < \ - Mixture \ - < \ - Transport##Type##Thermo##EqnOfState##Specie \ - > \ + BaseThermo, \ + Mixture \ > Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie; \ \ defineTemplateTypeNameAndDebugWithName \ @@ -73,7 +71,22 @@ defineTemplateTypeNameAndDebugWithName \ + ">>" \ ).c_str(), \ 0 \ -); \ +); + + +#define makeThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\ + \ +makeThermoTypedefs \ +( \ + BaseThermo, \ + Cthermo, \ + Mixture, \ + Transport, \ + Type, \ + Thermo, \ + EqnOfState, \ + Specie \ +) \ \ addToRunTimeSelectionTable \ ( \ diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C similarity index 85% rename from src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.C rename to src/thermophysicalModels/basic/psiThermo/hePsiThermo.C index 47570b82a3..06c9b47697 100644 --- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.C +++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C @@ -27,8 +27,8 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::hePsiThermo::calculate() +template +void Foam::hePsiThermo::calculate() { const scalarField& hCells = this->he_.internalField(); const scalarField& pCells = this->p_.internalField(); @@ -101,10 +101,10 @@ void Foam::hePsiThermo::calculate() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::hePsiThermo::hePsiThermo(const fvMesh& mesh) +template +Foam::hePsiThermo::hePsiThermo(const fvMesh& mesh) : - heThermo(mesh) + heThermo(mesh) { calculate(); @@ -115,19 +115,20 @@ Foam::hePsiThermo::hePsiThermo(const fvMesh& mesh) // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::hePsiThermo::~hePsiThermo() +template +Foam::hePsiThermo::~hePsiThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::hePsiThermo::correct() +template +void Foam::hePsiThermo::correct() { if (debug) { - Info<< "entering hePsiThermo::correct()" << endl; + Info<< "entering hePsiThermo::correct()" + << endl; } // force the saving of the old-time values @@ -137,7 +138,8 @@ void Foam::hePsiThermo::correct() if (debug) { - Info<< "exiting hePsiThermo::correct()" << endl; + Info<< "exiting hePsiThermo::correct()" + << endl; } } diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.H b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.H similarity index 91% rename from src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.H rename to src/thermophysicalModels/basic/psiThermo/hePsiThermo.H index d6132ec453..a701a854c2 100644 --- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermo.H +++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.H @@ -25,7 +25,7 @@ Class Foam::hePsiThermo Description - Enthalpy for a mixture based on compressibility + Energy for a mixture based on compressibility SourceFiles hePsiThermo.C @@ -47,10 +47,10 @@ namespace Foam Class hePsiThermo Declaration \*---------------------------------------------------------------------------*/ -template +template class hePsiThermo : - public heThermo + public heThermo { // Private Member Functions @@ -58,7 +58,7 @@ class hePsiThermo void calculate(); //- Construct as copy (not implemented) - hePsiThermo(const hePsiThermo&); + hePsiThermo(const hePsiThermo&); public: diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C b/src/thermophysicalModels/basic/psiThermo/psiThermo.C similarity index 100% rename from src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C rename to src/thermophysicalModels/basic/psiThermo/psiThermo.C diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H b/src/thermophysicalModels/basic/psiThermo/psiThermo.H similarity index 100% rename from src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H rename to src/thermophysicalModels/basic/psiThermo/psiThermo.H diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C b/src/thermophysicalModels/basic/psiThermo/psiThermos.C similarity index 100% rename from src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C rename to src/thermophysicalModels/basic/psiThermo/psiThermos.C diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C similarity index 89% rename from src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.C rename to src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C index d76ba12b1d..0284f76454 100644 --- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.C +++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C @@ -27,8 +27,8 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::heRhoThermo::calculate() +template +void Foam::heRhoThermo::calculate() { const scalarField& hCells = this->he().internalField(); const scalarField& pCells = this->p_.internalField(); @@ -106,10 +106,10 @@ void Foam::heRhoThermo::calculate() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::heRhoThermo::heRhoThermo(const fvMesh& mesh) +template +Foam::heRhoThermo::heRhoThermo(const fvMesh& mesh) : - heThermo(mesh) + heThermo(mesh) { calculate(); } @@ -117,15 +117,15 @@ Foam::heRhoThermo::heRhoThermo(const fvMesh& mesh) // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::heRhoThermo::~heRhoThermo() +template +Foam::heRhoThermo::~heRhoThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::heRhoThermo::correct() +template +void Foam::heRhoThermo::correct() { if (debug) { diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H similarity index 92% rename from src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.H rename to src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H index a2d62a78a2..9722526fc6 100644 --- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermo.H +++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H @@ -25,7 +25,7 @@ Class Foam::heRhoThermo Description - Enthalpy for a mixture based on density + Energy for a mixture based on density SourceFiles heRhoThermo.C @@ -47,10 +47,10 @@ namespace Foam Class heRhoThermo Declaration \*---------------------------------------------------------------------------*/ -template +template class heRhoThermo : - public heThermo + public heThermo { // Private Member Functions @@ -58,7 +58,7 @@ class heRhoThermo void calculate(); //- Construct as copy (not implemented) - heRhoThermo(const heRhoThermo&); + heRhoThermo(const heRhoThermo&); public: diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C similarity index 100% rename from src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C rename to src/thermophysicalModels/basic/rhoThermo/rhoThermo.C diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H similarity index 100% rename from src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H rename to src/thermophysicalModels/basic/rhoThermo/rhoThermo.H diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C similarity index 100% rename from src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C rename to src/thermophysicalModels/basic/rhoThermo/rhoThermos.C diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C index e842b4b27b..7e20960210 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C @@ -58,12 +58,11 @@ Foam::autoPtr Foam::basicChemistryModel::New Info<< "Selecting chemistry type " << chemistryTypeDict << endl; - const int nCmpt = 8; + const int nCmpt = 7; const char* cmptNames[nCmpt] = { "chemistrySolver", - "chemistryModel", - "???ChemistryModel", + "chemistryThermo", "transport", "thermo", "equationOfState", @@ -109,9 +108,8 @@ Foam::autoPtr Foam::basicChemistryModel::New // Construct the name of the chemistry type from the components chemistryTypeName = word(chemistryTypeDict.lookup("chemistrySolver")) + '<' - + word(chemistryTypeDict.lookup("chemistryModel")) + '<' - + ChemistryModel::typeName + ',' - + thermoTypeName + ">>"; + + word(chemistryTypeDict.lookup("chemistryThermo")) + ',' + + thermoTypeName + ">"; typename ChemistryModel::fvMeshConstructorTable::iterator cstrIter = ChemistryModel::fvMeshConstructorTablePtr_->find(chemistryTypeName); @@ -160,8 +158,7 @@ Foam::autoPtr Foam::basicChemistryModel::New FatalError<< exit(FatalError); } - return autoPtr - (cstrIter()(mesh, typeName, chemistryTypeName)); + return autoPtr(cstrIter()(mesh)); } else { @@ -183,8 +180,7 @@ Foam::autoPtr Foam::basicChemistryModel::New << exit(FatalError); } - return autoPtr - (cstrIter()(mesh, typeName, chemistryTypeName)); + return autoPtr(cstrIter()(mesh)); } } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C similarity index 91% rename from src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C rename to src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C index 522afe5161..1b6db173ce 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C @@ -23,26 +23,20 @@ License \*---------------------------------------------------------------------------*/ -#include "ODEChemistryModel.H" -#include "chemistrySolver.H" +#include "chemistryModel.H" #include "reactingMixture.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::ODEChemistryModel::ODEChemistryModel +Foam::chemistryModel::chemistryModel ( - const fvMesh& mesh, - const word& ODEModelName, - const word& thermoTypeName + const fvMesh& mesh ) : - CompType(mesh, thermoTypeName), - + CompType(mesh), ODE(), - Y_(this->thermo().composition().Y()), - reactions_ ( dynamic_cast&>(this->thermo()) @@ -80,7 +74,7 @@ Foam::ODEChemistryModel::ODEChemistryModel ); } - Info<< "ODEChemistryModel: Number of species = " << nSpecie_ + Info<< "chemistryModel: Number of species = " << nSpecie_ << " and reactions = " << nReaction_ << endl; } @@ -88,7 +82,7 @@ Foam::ODEChemistryModel::ODEChemistryModel // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template -Foam::ODEChemistryModel::~ODEChemistryModel() +Foam::chemistryModel::~chemistryModel() {} @@ -96,7 +90,7 @@ Foam::ODEChemistryModel::~ODEChemistryModel() template Foam::tmp -Foam::ODEChemistryModel::omega +Foam::chemistryModel::omega ( const scalarField& c, const scalar T, @@ -138,7 +132,7 @@ Foam::ODEChemistryModel::omega template -Foam::scalar Foam::ODEChemistryModel::omegaI +Foam::scalar Foam::chemistryModel::omegaI ( const label index, const scalarField& c, @@ -160,7 +154,7 @@ Foam::scalar Foam::ODEChemistryModel::omegaI template -void Foam::ODEChemistryModel::updateConcsInReactionI +void Foam::chemistryModel::updateConcsInReactionI ( const label index, const scalar dt, @@ -189,7 +183,7 @@ void Foam::ODEChemistryModel::updateConcsInReactionI template -void Foam::ODEChemistryModel::updateRRInReactionI +void Foam::chemistryModel::updateRRInReactionI ( const label index, const scalar pr, @@ -220,7 +214,7 @@ void Foam::ODEChemistryModel::updateRRInReactionI template -Foam::scalar Foam::ODEChemistryModel::omega +Foam::scalar Foam::chemistryModel::omega ( const Reaction& R, const scalarField& c, @@ -338,7 +332,7 @@ Foam::scalar Foam::ODEChemistryModel::omega template -void Foam::ODEChemistryModel::derivatives +void Foam::chemistryModel::derivatives ( const scalar time, const scalarField &c, @@ -389,7 +383,7 @@ void Foam::ODEChemistryModel::derivatives template -void Foam::ODEChemistryModel::jacobian +void Foam::chemistryModel::jacobian ( const scalar t, const scalarField& c, @@ -532,7 +526,7 @@ void Foam::ODEChemistryModel::jacobian template Foam::tmp -Foam::ODEChemistryModel::tc() const +Foam::chemistryModel::tc() const { scalar pf, cf, pr, cr; label lRef, rRef; @@ -570,6 +564,8 @@ Foam::ODEChemistryModel::tc() const ); scalarField& tc = ttc(); + const scalarField& T = this->thermo().T(); + const scalarField& p = this->thermo().p(); const label nReaction = reactions_.size(); @@ -578,8 +574,8 @@ Foam::ODEChemistryModel::tc() const forAll(rho, celli) { scalar rhoi = rho[celli]; - scalar Ti = this->thermo().T()[celli]; - scalar pi = this->thermo().p()[celli]; + scalar Ti = T[celli]; + scalar pi = p[celli]; scalarField c(nSpecie_); scalar cSum = 0.0; @@ -615,7 +611,7 @@ Foam::ODEChemistryModel::tc() const template Foam::tmp -Foam::ODEChemistryModel::Sh() const +Foam::chemistryModel::Sh() const { tmp tSh ( @@ -657,7 +653,7 @@ Foam::ODEChemistryModel::Sh() const template Foam::tmp -Foam::ODEChemistryModel::dQ() const +Foam::chemistryModel::dQ() const { tmp tdQ ( @@ -689,7 +685,7 @@ Foam::ODEChemistryModel::dQ() const template -Foam::label Foam::ODEChemistryModel::nEqns() const +Foam::label Foam::chemistryModel::nEqns() const { // nEqns = number of species + temperature + pressure return nSpecie_ + 2; @@ -697,7 +693,7 @@ Foam::label Foam::ODEChemistryModel::nEqns() const template -void Foam::ODEChemistryModel::calculate() +void Foam::chemistryModel::calculate() { if (!this->chemistry_) { @@ -718,11 +714,14 @@ void Foam::ODEChemistryModel::calculate() this->thermo().rho() ); + const scalarField& T = this->thermo().T(); + const scalarField& p = this->thermo().p(); + forAll(rho, celli) { const scalar rhoi = rho[celli]; - const scalar Ti = this->thermo().T()[celli]; - const scalar pi = this->thermo().p()[celli]; + const scalar Ti = T[celli]; + const scalar pi = p[celli]; scalarField c(nSpecie_, 0.0); for (label i=0; i::calculate() template -Foam::scalar Foam::ODEChemistryModel::solve +Foam::scalar Foam::chemistryModel::solve ( const scalar t0, const scalar deltaT @@ -773,13 +772,16 @@ Foam::scalar Foam::ODEChemistryModel::solve tmp thc = this->thermo().hc(); const scalarField& hc = thc(); + const scalarField& he = this->thermo().he(); + const scalarField& T = this->thermo().T(); + const scalarField& p = this->thermo().p(); forAll(rho, celli) { const scalar rhoi = rho[celli]; - const scalar hi = this->thermo().he()[celli] + hc[celli]; - const scalar pi = this->thermo().p()[celli]; - scalar Ti = this->thermo().T()[celli]; + const scalar hi = he[celli] + hc[celli]; + const scalar pi = p[celli]; + scalar Ti = T[celli]; scalarField c(nSpecie_, 0.0); scalarField c0(nSpecie_, 0.0); @@ -833,7 +835,7 @@ Foam::scalar Foam::ODEChemistryModel::solve template -Foam::scalar Foam::ODEChemistryModel::solve +Foam::scalar Foam::chemistryModel::solve ( scalarField &c, const scalar T, @@ -844,7 +846,7 @@ Foam::scalar Foam::ODEChemistryModel::solve { notImplemented ( - "ODEChemistryModel::solve" + "chemistryModel::solve" "(" "scalarField&, " "const scalar, " diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H similarity index 91% rename from src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H rename to src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H index da560dae87..b663769d2a 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::ODEChemistryModel + Foam::chemistryModel Description Extends base chemistry model by adding a thermo package, and ODE functions. @@ -30,13 +30,13 @@ Description terms. SourceFiles - ODEChemistryModelI.H - ODEChemistryModel.C + chemistryModelI.H + chemistryModel.C \*---------------------------------------------------------------------------*/ -#ifndef ODEChemistryModel_H -#define ODEChemistryModel_H +#ifndef chemistryModel_H +#define chemistryModel_H #include "Reaction.H" #include "ODE.H" @@ -53,11 +53,11 @@ namespace Foam class fvMesh; /*---------------------------------------------------------------------------*\ - Class ODEChemistryModel Declaration + Class chemistryModel Declaration \*---------------------------------------------------------------------------*/ template -class ODEChemistryModel +class chemistryModel : public CompType, public ODE @@ -65,10 +65,10 @@ class ODEChemistryModel // Private Member Functions //- Disallow copy constructor - ODEChemistryModel(const ODEChemistryModel&); + chemistryModel(const chemistryModel&); //- Disallow default bitwise assignment - void operator=(const ODEChemistryModel&); + void operator=(const chemistryModel&); protected: @@ -104,22 +104,17 @@ protected: public: //- Runtime type information - TypeName("ODEChemistryModel"); + TypeName("chemistryModel"); // Constructors - //- Construct from components - ODEChemistryModel - ( - const fvMesh& mesh, - const word& ODEModelName, - const word& thermoTypeName - ); + //- Construct from mesh + chemistryModel(const fvMesh& mesh); //- Destructor - virtual ~ODEChemistryModel(); + virtual ~chemistryModel(); // Member Functions @@ -263,12 +258,12 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "ODEChemistryModelI.H" +#include "chemistryModelI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ODEChemistryModel.C" +# include "chemistryModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModelI.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModelI.H similarity index 85% rename from src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModelI.H rename to src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModelI.H index 9f06a064a7..d128443fe9 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModelI.H +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModelI.H @@ -30,7 +30,7 @@ License template inline Foam::PtrList >& -Foam::ODEChemistryModel::RR() +Foam::chemistryModel::RR() { return RR_; } @@ -38,7 +38,7 @@ Foam::ODEChemistryModel::RR() template inline const Foam::PtrList >& -Foam::ODEChemistryModel::reactions() const +Foam::chemistryModel::reactions() const { return reactions_; } @@ -46,7 +46,7 @@ Foam::ODEChemistryModel::reactions() const template inline const Foam::PtrList& -Foam::ODEChemistryModel::specieThermo() const +Foam::chemistryModel::specieThermo() const { return specieThermo_; } @@ -54,7 +54,7 @@ Foam::ODEChemistryModel::specieThermo() const template inline Foam::label -Foam::ODEChemistryModel::nSpecie() const +Foam::chemistryModel::nSpecie() const { return nSpecie_; } @@ -62,7 +62,7 @@ Foam::ODEChemistryModel::nSpecie() const template inline Foam::label -Foam::ODEChemistryModel::nReaction() const +Foam::chemistryModel::nReaction() const { return nReaction_; } @@ -70,7 +70,7 @@ Foam::ODEChemistryModel::nReaction() const template inline const Foam::DimensionedField& -Foam::ODEChemistryModel::RR +Foam::chemistryModel::RR ( const label i ) const diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C index 933dd952ba..bc687c1390 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.C @@ -25,7 +25,6 @@ License #include "psiChemistryModel.H" #include "fvMesh.H" -#include "Time.H" /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */ @@ -35,12 +34,12 @@ namespace Foam defineRunTimeSelectionTable(psiChemistryModel, fvMesh); } + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::psiChemistryModel::psiChemistryModel ( - const fvMesh& mesh, - const word& thermoTypeName + const fvMesh& mesh ) : basicChemistryModel(mesh), diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H index 0a269a3ce4..d214a6912a 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H @@ -78,7 +78,7 @@ protected: public: //- Runtime type information - TypeName("psiChemistryModel"); + TypeName("psi"); //- Declare run-time constructor selection tables @@ -87,19 +87,15 @@ public: autoPtr, psiChemistryModel, fvMesh, - ( - const fvMesh& mesh, - const word& compTypeName, - const word& thermoTypeName - ), - (mesh, compTypeName, thermoTypeName) + (const fvMesh& mesh), + (mesh) ); // Constructors //- Construct from mesh - psiChemistryModel(const fvMesh& mesh, const word& thermoTypeName); + psiChemistryModel(const fvMesh& mesh); //- Selector diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C index cc271358cc..b4a973a708 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModels.C @@ -32,7 +32,7 @@ Description #include "makeChemistryModel.H" #include "psiChemistryModel.H" -#include "ODEChemistryModel.H" +#include "chemistryModel.H" #include "thermoPhysicsTypes.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -41,35 +41,35 @@ namespace Foam { makeChemistryModel ( - ODEChemistryModel, + chemistryModel, psiChemistryModel, constGasThermoPhysics ); makeChemistryModel ( - ODEChemistryModel, + chemistryModel, psiChemistryModel, gasThermoPhysics ); makeChemistryModel ( - ODEChemistryModel, + chemistryModel, psiChemistryModel, constIncompressibleGasThermoPhysics ); makeChemistryModel ( - ODEChemistryModel, + chemistryModel, psiChemistryModel, incompressibleGasThermoPhysics ); makeChemistryModel ( - ODEChemistryModel, + chemistryModel, psiChemistryModel, icoPoly8ThermoPhysics ); diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C index f8b033d68a..59c8f270e4 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.C @@ -25,7 +25,6 @@ License #include "rhoChemistryModel.H" #include "fvMesh.H" -#include "Time.H" /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */ @@ -35,12 +34,12 @@ namespace Foam defineRunTimeSelectionTable(rhoChemistryModel, fvMesh); } + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::rhoChemistryModel::rhoChemistryModel ( - const fvMesh& mesh, - const word& thermoTypeName + const fvMesh& mesh ) : basicChemistryModel(mesh), diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H index 1e36ee19e4..94c66733e3 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H @@ -78,7 +78,7 @@ protected: public: //- Runtime type information - TypeName("rhoChemistryModel"); + TypeName("rho"); //- Declare run-time constructor selection tables @@ -88,18 +88,16 @@ public: rhoChemistryModel, fvMesh, ( - const fvMesh& mesh, - const word& compTypeName, - const word& thermoTypeName + const fvMesh& mesh ), - (mesh, compTypeName, thermoTypeName) + (mesh) ); // Constructors //- Construct from mesh - rhoChemistryModel(const fvMesh& mesh, const word& thermoTypeName); + rhoChemistryModel(const fvMesh& mesh); //- Selector diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C index 30488a6856..e5be84743c 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModels.C @@ -32,7 +32,7 @@ Description #include "makeChemistryModel.H" #include "rhoChemistryModel.H" -#include "ODEChemistryModel.H" +#include "chemistryModel.H" #include "thermoPhysicsTypes.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -41,35 +41,35 @@ namespace Foam { makeChemistryModel ( - ODEChemistryModel, + chemistryModel, rhoChemistryModel, constGasThermoPhysics ); makeChemistryModel ( - ODEChemistryModel, + chemistryModel, rhoChemistryModel, gasThermoPhysics ); makeChemistryModel ( - ODEChemistryModel, + chemistryModel, rhoChemistryModel, constIncompressibleGasThermoPhysics ); makeChemistryModel ( - ODEChemistryModel, + chemistryModel, rhoChemistryModel, incompressibleGasThermoPhysics ); makeChemistryModel ( - ODEChemistryModel, + chemistryModel, rhoChemistryModel, icoPoly8ThermoPhysics ); diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C index 983b56d6ae..f0394a1c69 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C @@ -29,15 +29,13 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::EulerImplicit::EulerImplicit +template +Foam::EulerImplicit::EulerImplicit ( - const fvMesh& mesh, - const word& ODEModelName, - const word& thermoType + const fvMesh& mesh ) : - chemistrySolver(mesh, ODEModelName, thermoType), + chemistrySolver(mesh), coeffsDict_(this->subDict("EulerImplicitCoeffs")), cTauChem_(readScalar(coeffsDict_.lookup("cTauChem"))), eqRateLimiter_(coeffsDict_.lookup("equilibriumRateLimiter")) @@ -46,15 +44,15 @@ Foam::EulerImplicit::EulerImplicit // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::EulerImplicit::~EulerImplicit() +template +Foam::EulerImplicit::~EulerImplicit() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -Foam::scalar Foam::EulerImplicit::solve +template +Foam::scalar Foam::EulerImplicit::solve ( scalarField &c, const scalar T, diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H index 7473c036ef..42f192b38f 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H @@ -46,10 +46,10 @@ namespace Foam Class EulerImplicit Declaration \*---------------------------------------------------------------------------*/ -template +template class EulerImplicit : - public chemistrySolver + public chemistrySolver { // Private data @@ -74,13 +74,8 @@ public: // Constructors - //- Construct from components - EulerImplicit - ( - const fvMesh& mesh, - const word& ODEmodelName, - const word& thermoType - ); + //- Construct from mesh + EulerImplicit(const fvMesh& mesh); //- Destructor diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C index 960c7d3010..40459010be 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C @@ -27,23 +27,20 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::chemistrySolver::chemistrySolver +template +Foam::chemistrySolver::chemistrySolver ( - const fvMesh& mesh, - const word& ODEModelName, - const word& thermoType + const fvMesh& mesh ) : - ODEChemistryType(mesh, ODEModelName, thermoType), - name_(ODEModelName) + ChemistryModel(mesh) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::chemistrySolver::~chemistrySolver() +template +Foam::chemistrySolver::~chemistrySolver() {} diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H index dfbb29ecd0..574a808383 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef chemistrySolver_H #define chemistrySolver_H -#include "ODEChemistryModel.H" +#include "chemistryModel.H" #include "IOdictionary.H" #include "scalarField.H" @@ -48,30 +48,18 @@ namespace Foam Class chemistrySolver Declaration \*---------------------------------------------------------------------------*/ -template +template class chemistrySolver : - public ODEChemistryType + public ChemistryModel { -protected: - - // Protected data - - //- Name of the chemistry solver - const word name_; - public: // Constructors //- Construct from components - chemistrySolver - ( - const fvMesh& mesh, - const word& ODEModelName, - const word& thermoType - ); + chemistrySolver(const fvMesh& mesh); //- Destructor diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H index f9ab5839c3..4660dcd17a 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolverTypes.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,7 +28,7 @@ License #include "chemistrySolver.H" -#include "ODEChemistryModel.H" +#include "chemistryModel.H" #include "noChemistrySolver.H" #include "EulerImplicit.H" @@ -37,21 +37,22 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define makeChemistrySolverType(SS, ODEChem, Comp, Thermo) \ +#define makeChemistrySolverType(SS, Comp, Thermo) \ \ - typedef SS > SS##ODEChem##Comp##Thermo; \ + typedef SS > SS##Comp##Thermo; \ \ defineTemplateTypeNameAndDebugWithName \ ( \ - SS##ODEChem##Comp##Thermo, \ - (#SS"<"#ODEChem"<"#Comp"," + Thermo::typeName() + ">>").c_str(), \ + SS##Comp##Thermo, \ + (#SS"<" + word(Comp::typeName_()) \ + + "," + Thermo::typeName() + ">").c_str(), \ 0 \ ); \ \ addToRunTimeSelectionTable \ ( \ Comp, \ - SS##ODEChem##Comp##Thermo, \ + SS##Comp##Thermo, \ fvMesh \ ); @@ -61,7 +62,6 @@ License makeChemistrySolverType \ ( \ noChemistrySolver, \ - ODEChemistryModel, \ CompChemModel, \ Thermo \ ); \ @@ -69,7 +69,6 @@ License makeChemistrySolverType \ ( \ EulerImplicit, \ - ODEChemistryModel, \ CompChemModel, \ Thermo \ ); \ @@ -77,7 +76,6 @@ License makeChemistrySolverType \ ( \ ode, \ - ODEChemistryModel, \ CompChemModel, \ Thermo \ ); \ @@ -85,7 +83,6 @@ License makeChemistrySolverType \ ( \ sequential, \ - ODEChemistryModel, \ CompChemModel, \ Thermo \ ); diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C index a708f92b87..efc8c10735 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.C @@ -28,29 +28,27 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::noChemistrySolver::noChemistrySolver +template +Foam::noChemistrySolver::noChemistrySolver ( - const fvMesh& mesh, - const word& ODEModelName, - const word& thermoType + const fvMesh& mesh ) : - chemistrySolver(mesh, ODEModelName, thermoType) + chemistrySolver(mesh) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::noChemistrySolver::~noChemistrySolver() +template +Foam::noChemistrySolver::~noChemistrySolver() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -Foam::scalar Foam::noChemistrySolver::solve +template +Foam::scalar Foam::noChemistrySolver::solve ( scalarField&, const scalar, diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H index b46f59927e..2a84bac414 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H @@ -47,10 +47,10 @@ namespace Foam Class noChemistrySolver Declaration \*---------------------------------------------------------------------------*/ -template +template class noChemistrySolver : - public chemistrySolver + public chemistrySolver { public: @@ -61,14 +61,8 @@ public: // Constructors - //- Construct from components - noChemistrySolver - ( - const fvMesh& mesh, - const word& ODEModelName, - const word& thermoType - ); + noChemistrySolver(const fvMesh& mesh); //- Destructor diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C index 7e2b44bc83..aff5be67ca 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,19 +24,17 @@ License \*---------------------------------------------------------------------------*/ #include "ode.H" -#include "ODEChemistryModel.H" +#include "chemistryModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::ode::ode +template +Foam::ode::ode ( - const fvMesh& mesh, - const word& ODEModelName, - const word& thermoType + const fvMesh& mesh ) : - chemistrySolver(mesh, ODEModelName, thermoType), + chemistrySolver(mesh), coeffsDict_(this->subDict("odeCoeffs")), solverName_(coeffsDict_.lookup("solver")), odeSolver_(ODESolver::New(solverName_, *this)), @@ -46,15 +44,15 @@ Foam::ode::ode // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::ode::~ode() +template +Foam::ode::~ode() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -Foam::scalar Foam::ode::solve +template +Foam::scalar Foam::ode::solve ( scalarField& c, const scalar T, diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H index 8da878f6ff..0357ff13be 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H @@ -47,10 +47,10 @@ namespace Foam Class ode Declaration \*---------------------------------------------------------------------------*/ -template +template class ode : - public chemistrySolver + public chemistrySolver { // Private data @@ -66,18 +66,13 @@ class ode public: //- Runtime type information - TypeName("ODE"); + TypeName("ode"); // Constructors - //- Construct from components - ode - ( - const fvMesh& mesh, - const word& ODEModeNewlName, - const word& thermoType - ); + //- Construct from mesh + ode(const fvMesh& mesh); //- Destructor diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C index fa773944bd..defef83418 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C @@ -28,15 +28,13 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::sequential::sequential +template +Foam::sequential::sequential ( - const fvMesh& mesh, - const word& ODEModelName, - const word& thermoType + const fvMesh& mesh ) : - chemistrySolver(mesh, ODEModelName, thermoType), + chemistrySolver(mesh), coeffsDict_(this->subDict("sequentialCoeffs")), cTauChem_(readScalar(coeffsDict_.lookup("cTauChem"))), eqRateLimiter_(coeffsDict_.lookup("equilibriumRateLimiter")) @@ -45,15 +43,15 @@ Foam::sequential::sequential // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::sequential::~sequential() +template +Foam::sequential::~sequential() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -Foam::scalar Foam::sequential::solve +template +Foam::scalar Foam::sequential::solve ( scalarField &c, const scalar T, diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H index a8d05e7ffe..b13273590e 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H @@ -48,17 +48,16 @@ namespace Foam Class sequential Declaration \*---------------------------------------------------------------------------*/ -template +template class sequential : - public chemistrySolver + public chemistrySolver { // Private data //- Coefficients dictionary dictionary coeffsDict_; - // Model constants //- Chemistry time scale @@ -76,13 +75,8 @@ public: // Constructors - //- Construct from components - sequential - ( - const fvMesh& mesh, - const word& ODEModelName, - const word& thermoType - ); + //- Construct from mesh + sequential(const fvMesh& mesh); //- Destructor diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C index aaa301f345..f04b3814c2 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C @@ -135,33 +135,39 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const case SOLIDTHERMO: { // Get the coupling information from the mappedPatchBase - const mappedPatchBase& mpp = - refCast - ( - patch_.patch() - ); + // const mappedPatchBase& mpp = + // refCast + // ( + // patch_.patch() + // ); - const polyMesh& nbrMesh = mpp.sampleMesh(); + // const polyMesh& nbrMesh = mpp.sampleMesh(); - const solidThermo& thermo = - nbrMesh.lookupObject - ( - "thermophysicalProperties" - ); + // const solidThermo& thermo = + // nbrMesh.lookupObject + // ( + // "thermophysicalProperties" + // ); // Force recalculation of mapping and schedule - const mapDistribute& distMap = mpp.map(); + // const mapDistribute& distMap = mpp.map(); - const fvPatch& nbrPatch = refCast + // const fvPatch& nbrPatch = refCast + // ( + // nbrMesh + // ).boundary()[mpp.samplePolyPatch().index()]; + + // scalarField emissivity(thermo.emissivity(nbrPatch.index())); + // distMap.distribute(emissivity); + + // return emissivity; + FatalErrorIn ( - nbrMesh - ).boundary()[mpp.samplePolyPatch().index()]; - - scalarField emissivity(thermo.emissivity(nbrPatch.index())); - distMap.distribute(emissivity); - - return emissivity; + "radiationCoupledBase::emissivity(const scalarField&)" + ) << "Solid radiation properties temporarily removed" + << exit(FatalError); + return scalarField(0); } break; @@ -176,8 +182,7 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const FatalErrorIn ( "radiationCoupledBase::emissivity(const scalarField&)" - ) - << "Unimplemented method " << method_ << endl + ) << "Unimplemented method " << method_ << endl << "Please set 'emissivity' to one of " << emissivityMethodTypeNames_.toc() << " and 'emissivityName' to the name of the volScalar" @@ -185,6 +190,7 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const } break; } + return scalarField(0); } diff --git a/src/thermophysicalModels/reactionThermo/Make/files b/src/thermophysicalModels/reactionThermo/Make/files index 79a33db51d..e4e8c49e2b 100644 --- a/src/thermophysicalModels/reactionThermo/Make/files +++ b/src/thermophysicalModels/reactionThermo/Make/files @@ -4,14 +4,14 @@ chemistryReaders/chemistryReader/makeChemistryReaders.C mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C -psiReactionThermo/psiReactionThermo/psiReactionThermo.C -psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C +psiReactionThermo/psiReactionThermo.C +psiReactionThermo/psiReactionThermos.C -psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C -psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C +psiuReactionThermo/psiuReactionThermo.C +psiuReactionThermo/psiuReactionThermos.C -rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C -rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C +rhoReactionThermo/rhoReactionThermo.C +rhoReactionThermo/rhoReactionThermos.C derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C diff --git a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H index 296dbe7a9a..d662b4518f 100644 --- a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H +++ b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H @@ -35,6 +35,7 @@ License \ typedef MixtureThermo \ < \ + CThermo, \ SpecieMixture \ < \ Mixture \ diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.C deleted file mode 100644 index 81fa02f9fe..0000000000 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.C +++ /dev/null @@ -1,147 +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 "hePsiReactionThermo.H" -#include "fvMesh.H" -#include "fixedValueFvPatchFields.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -template -void Foam::hePsiReactionThermo::calculate() -{ - const scalarField& hCells = this->he_.internalField(); - const scalarField& pCells = this->p_.internalField(); - - scalarField& TCells = this->T_.internalField(); - scalarField& psiCells = this->psi_.internalField(); - scalarField& muCells = this->mu_.internalField(); - scalarField& alphaCells = this->alpha_.internalField(); - - forAll(TCells, celli) - { - const typename MixtureType::thermoType& mixture = - this->cellMixture(celli); - - TCells[celli] = mixture.THE - ( - hCells[celli], - pCells[celli], - TCells[celli] - ); - - psiCells[celli] = mixture.psi(pCells[celli], TCells[celli]); - - muCells[celli] = mixture.mu(pCells[celli], TCells[celli]); - alphaCells[celli] = mixture.alphah(pCells[celli], TCells[celli]); - } - - forAll(this->T_.boundaryField(), patchi) - { - fvPatchScalarField& pp = this->p_.boundaryField()[patchi]; - fvPatchScalarField& pT = this->T_.boundaryField()[patchi]; - fvPatchScalarField& ppsi = this->psi_.boundaryField()[patchi]; - - fvPatchScalarField& ph = this->he_.boundaryField()[patchi]; - - fvPatchScalarField& pmu_ = this->mu_.boundaryField()[patchi]; - fvPatchScalarField& palpha_ = this->alpha_.boundaryField()[patchi]; - - if (pT.fixesValue()) - { - forAll(pT, facei) - { - const typename MixtureType::thermoType& mixture = - this->patchFaceMixture(patchi, facei); - - ph[facei] = mixture.HE(pp[facei], pT[facei]); - - ppsi[facei] = mixture.psi(pp[facei], pT[facei]); - pmu_[facei] = mixture.mu(pp[facei], pT[facei]); - palpha_[facei] = mixture.alphah(pp[facei], pT[facei]); - } - } - else - { - forAll(pT, facei) - { - const typename MixtureType::thermoType& mixture = - this->patchFaceMixture(patchi, facei); - - pT[facei] = mixture.THE(ph[facei], pp[facei], pT[facei]); - - ppsi[facei] = mixture.psi(pp[facei], pT[facei]); - pmu_[facei] = mixture.mu(pp[facei], pT[facei]); - palpha_[facei] = mixture.alphah(pp[facei], pT[facei]); - } - } - } -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::hePsiReactionThermo::hePsiReactionThermo(const fvMesh& mesh) -: - heThermo(mesh) -{ - calculate(); - - // Switch on saving old time - this->psi_.oldTime(); -} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::hePsiReactionThermo::~hePsiReactionThermo() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::hePsiReactionThermo::correct() -{ - if (debug) - { - Info<< "entering hePsiReactionThermo::correct()" << endl; - } - - // force the saving of the old-time values - this->psi_.oldTime(); - - calculate(); - - if (debug) - { - Info<< "exiting hePsiReactionThermo::correct()" << endl; - } -} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.H b/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.H deleted file mode 100644 index 1067f0610a..0000000000 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermo.H +++ /dev/null @@ -1,100 +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 . - -Class - Foam::hePsiReactionThermo - -Description - Foam::hePsiReactionThermo - -SourceFiles - hePsiReactionThermo.C - -\*---------------------------------------------------------------------------*/ - -#ifndef hePsiReactionThermo_H -#define hePsiReactionThermo_H - -#include "heThermo.H" -#include "psiReactionThermo.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class hePsiReactionThermo Declaration -\*---------------------------------------------------------------------------*/ - -template -class hePsiReactionThermo -: - public heThermo -{ - // Private Member Functions - - void calculate(); - - //- Construct as copy (not implemented) - hePsiReactionThermo(const hePsiReactionThermo&); - - -public: - - //- Runtime type information - TypeName("hePsiReactionThermo"); - - - // Constructors - - //- Construct from mesh - hePsiReactionThermo(const fvMesh&); - - - //- Destructor - virtual ~hePsiReactionThermo(); - - - // Member functions - - //- Update properties - virtual void correct(); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository -# include "hePsiReactionThermo.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.C similarity index 100% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.C rename to src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.C diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.H b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.H similarity index 100% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.H rename to src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo.H diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C similarity index 92% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C rename to src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C index 2b668ca634..4e65f3a24c 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C +++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C @@ -26,7 +26,7 @@ License #include "makeReactionThermo.H" #include "psiReactionThermo.H" -#include "hePsiReactionThermo.H" +#include "hePsiThermo.H" #include "specie.H" #include "perfectGas.H" @@ -59,7 +59,7 @@ makeReactionThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, homogeneousMixture, constTransport, sensibleEnthalpy, @@ -72,7 +72,7 @@ makeReactionThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, inhomogeneousMixture, constTransport, sensibleEnthalpy, @@ -85,7 +85,7 @@ makeReactionThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, veryInhomogeneousMixture, constTransport, sensibleEnthalpy, @@ -101,7 +101,7 @@ makeReactionThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, homogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -114,7 +114,7 @@ makeReactionThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, inhomogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -127,7 +127,7 @@ makeReactionThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, veryInhomogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -143,7 +143,7 @@ makeReactionThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, homogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -156,7 +156,7 @@ makeReactionThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, inhomogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -169,7 +169,7 @@ makeReactionThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, veryInhomogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -185,7 +185,7 @@ makeReactionMixtureThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, multiComponentMixture, constGasThermoPhysics ); @@ -194,7 +194,7 @@ makeReactionMixtureThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, multiComponentMixture, gasThermoPhysics ); @@ -206,7 +206,7 @@ makeReactionMixtureThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, reactingMixture, constGasThermoPhysics ); @@ -215,7 +215,7 @@ makeReactionMixtureThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, reactingMixture, gasThermoPhysics ); @@ -224,7 +224,7 @@ makeReactionMixtureThermo ( psiThermo, psiReactionThermo, - hePsiReactionThermo, + hePsiThermo, singleStepReactingMixture, gasThermoPhysics ); diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C similarity index 89% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.C rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C index b0705c3261..8a2daccfe6 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.C +++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C @@ -23,14 +23,14 @@ License \*---------------------------------------------------------------------------*/ -#include "heheuReactionThermo.H" +#include "heheuPsiThermo.H" #include "fvMesh.H" #include "fixedValueFvPatchFields.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::heheuReactionThermo::calculate() +template +void Foam::heheuPsiThermo::calculate() { const scalarField& hCells = this->he_.internalField(); const scalarField& heuCells = this->heu_.internalField(); @@ -118,8 +118,11 @@ void Foam::heheuReactionThermo::calculate() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::heheuReactionThermo::heheuReactionThermo(const fvMesh& mesh) +template +Foam::heheuPsiThermo::heheuPsiThermo +( + const fvMesh& mesh +) : heThermo(mesh), Tu_ @@ -188,19 +191,20 @@ Foam::heheuReactionThermo::heheuReactionThermo(const fvMesh& mesh) // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::heheuReactionThermo::~heheuReactionThermo() +template +Foam::heheuPsiThermo::~heheuPsiThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::heheuReactionThermo::correct() +template +void Foam::heheuPsiThermo::correct() { if (debug) { - Info<< "entering heheuReactionThermo::correct()" << endl; + Info<< "entering heheuPsiThermo::correct()" + << endl; } // force the saving of the old-time values @@ -210,14 +214,15 @@ void Foam::heheuReactionThermo::correct() if (debug) { - Info<< "exiting heheuReactionThermo::correct()" << endl; + Info<< "exiting heheuPsiThermo::correct()" + << endl; } } -template +template Foam::tmp -Foam::heheuReactionThermo::heu +Foam::heheuPsiThermo::heu ( const scalarField& p, const scalarField& Tu, @@ -236,9 +241,9 @@ Foam::heheuReactionThermo::heu } -template +template Foam::tmp -Foam::heheuReactionThermo::heu +Foam::heheuPsiThermo::heu ( const scalarField& p, const scalarField& Tu, @@ -258,9 +263,9 @@ Foam::heheuReactionThermo::heu } -template +template Foam::tmp -Foam::heheuReactionThermo::Tb() const +Foam::heheuPsiThermo::Tb() const { tmp tTb ( @@ -314,9 +319,9 @@ Foam::heheuReactionThermo::Tb() const } -template +template Foam::tmp -Foam::heheuReactionThermo::psiu() const +Foam::heheuPsiThermo::psiu() const { tmp tpsiu ( @@ -365,9 +370,9 @@ Foam::heheuReactionThermo::psiu() const } -template +template Foam::tmp -Foam::heheuReactionThermo::psib() const +Foam::heheuPsiThermo::psib() const { tmp tpsib ( @@ -417,9 +422,9 @@ Foam::heheuReactionThermo::psib() const } -template +template Foam::tmp -Foam::heheuReactionThermo::muu() const +Foam::heheuPsiThermo::muu() const { tmp tmuu ( @@ -472,9 +477,9 @@ Foam::heheuReactionThermo::muu() const } -template +template Foam::tmp -Foam::heheuReactionThermo::mub() const +Foam::heheuPsiThermo::mub() const { tmp tmub ( diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.H b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H similarity index 90% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.H rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H index 93e6cc7041..2a9645df0e 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermo.H +++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H @@ -36,7 +36,6 @@ SourceFiles #define heheuReactionThermo_H #include "heThermo.H" -#include "psiuReactionThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,13 +43,13 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class heheuReactionThermo Declaration + Class heheuPsiThermo Declaration \*---------------------------------------------------------------------------*/ -template -class heheuReactionThermo +template +class heheuPsiThermo : - public heThermo + public heThermo { // Private Member Functions @@ -63,23 +62,26 @@ class heheuReactionThermo void calculate(); //- Construct as copy (not implemented) - heheuReactionThermo(const heheuReactionThermo&); + heheuPsiThermo + ( + const heheuPsiThermo& + ); public: //- Runtime type information - TypeName("heheuReactionThermo"); + TypeName("heheuPsiThermo"); // Constructors //- Construct from mesh - heheuReactionThermo(const fvMesh&); + heheuPsiThermo(const fvMesh&); //- Destructor - virtual ~heheuReactionThermo(); + virtual ~heheuPsiThermo(); // Member functions @@ -155,7 +157,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * #ifdef NoRepository -# include "heheuReactionThermo.C" +# include "heheuPsiThermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C similarity index 100% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.C diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.H b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.H similarity index 100% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.H rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermo.H diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C similarity index 93% rename from src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C rename to src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C index f5c65f483d..517a74c79b 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C +++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "psiuReactionThermo.H" -#include "heheuReactionThermo.H" +#include "heheuPsiThermo.H" #include "makeReactionThermo.H" #include "addToRunTimeSelectionTable.H" @@ -56,7 +56,7 @@ makeReactionThermo ( psiThermo, psiuReactionThermo, - heheuReactionThermo, + heheuPsiThermo, homogeneousMixture, constTransport, absoluteEnthalpy, @@ -69,7 +69,7 @@ makeReactionThermo ( psiThermo, psiuReactionThermo, - heheuReactionThermo, + heheuPsiThermo, inhomogeneousMixture, constTransport, absoluteEnthalpy, @@ -82,7 +82,7 @@ makeReactionThermo ( psiThermo, psiuReactionThermo, - heheuReactionThermo, + heheuPsiThermo, veryInhomogeneousMixture, constTransport, absoluteEnthalpy, @@ -95,7 +95,7 @@ makeReactionThermo ( psiThermo, psiuReactionThermo, - heheuReactionThermo, + heheuPsiThermo, homogeneousMixture, sutherlandTransport, absoluteEnthalpy, @@ -108,7 +108,7 @@ makeReactionThermo ( psiThermo, psiuReactionThermo, - heheuReactionThermo, + heheuPsiThermo, inhomogeneousMixture, sutherlandTransport, absoluteEnthalpy, @@ -121,7 +121,7 @@ makeReactionThermo ( psiThermo, psiuReactionThermo, - heheuReactionThermo, + heheuPsiThermo, veryInhomogeneousMixture, sutherlandTransport, absoluteEnthalpy, @@ -134,7 +134,7 @@ makeReactionThermo ( psiThermo, psiuReactionThermo, - heheuReactionThermo, + heheuPsiThermo, egrMixture, constTransport, absoluteEnthalpy, @@ -147,7 +147,7 @@ makeReactionThermo ( psiThermo, psiuReactionThermo, - heheuReactionThermo, + heheuPsiThermo, egrMixture, sutherlandTransport, absoluteEnthalpy, diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.C deleted file mode 100644 index b27fd9c958..0000000000 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.C +++ /dev/null @@ -1,145 +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 "heRhoReactionThermo.H" -#include "fvMesh.H" -#include "fixedValueFvPatchFields.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -template -void Foam::heRhoReactionThermo::calculate() -{ - const scalarField& hCells = this->he_.internalField(); - const scalarField& pCells = this->p_.internalField(); - - scalarField& TCells = this->T_.internalField(); - scalarField& psiCells = this->psi_.internalField(); - scalarField& rhoCells = this->rho_.internalField(); - scalarField& muCells = this->mu_.internalField(); - scalarField& alphaCells = this->alpha_.internalField(); - - forAll(TCells, celli) - { - const typename MixtureType::thermoType& mixture = - this->cellMixture(celli); - - TCells[celli] = mixture.THE - ( - hCells[celli], - pCells[celli], - TCells[celli] - ); - psiCells[celli] = mixture.psi(pCells[celli], TCells[celli]); - rhoCells[celli] = mixture.rho(pCells[celli], TCells[celli]); - - muCells[celli] = mixture.mu(pCells[celli], TCells[celli]); - alphaCells[celli] = mixture.alphah(pCells[celli], TCells[celli]); - } - - forAll(this->T_.boundaryField(), patchi) - { - fvPatchScalarField& pp = this->p_.boundaryField()[patchi]; - fvPatchScalarField& pT = this->T_.boundaryField()[patchi]; - fvPatchScalarField& ppsi = this->psi_.boundaryField()[patchi]; - fvPatchScalarField& prho = this->rho_.boundaryField()[patchi]; - - fvPatchScalarField& ph = this->he_.boundaryField()[patchi]; - - fvPatchScalarField& pmu_ = this->mu_.boundaryField()[patchi]; - fvPatchScalarField& palpha_ = this->alpha_.boundaryField()[patchi]; - - if (pT.fixesValue()) - { - forAll(pT, facei) - { - const typename MixtureType::thermoType& mixture = - this->patchFaceMixture(patchi, facei); - - ph[facei] = mixture.HE(pp[facei], pT[facei]); - - ppsi[facei] = mixture.psi(pp[facei], pT[facei]); - prho[facei] = mixture.rho(pp[facei], pT[facei]); - pmu_[facei] = mixture.mu(pp[facei], pT[facei]); - palpha_[facei] = mixture.alphah(pp[facei], pT[facei]); - } - } - else - { - forAll(pT, facei) - { - const typename MixtureType::thermoType& mixture = - this->patchFaceMixture(patchi, facei); - - pT[facei] = mixture.THE(ph[facei], pp[facei], pT[facei]); - - ppsi[facei] = mixture.psi(pp[facei], pT[facei]); - prho[facei] = mixture.rho(pp[facei], pT[facei]); - pmu_[facei] = mixture.mu(pp[facei], pT[facei]); - palpha_[facei] = mixture.alphah(pp[facei], pT[facei]); - } - } - } -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::heRhoReactionThermo::heRhoReactionThermo(const fvMesh& mesh) -: - heThermo(mesh) -{ - calculate(); -} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::heRhoReactionThermo::~heRhoReactionThermo() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::heRhoReactionThermo::correct() -{ - if (debug) - { - Info<< "entering heRhoReactionThermo::correct()" << endl; - } - - calculate(); - - if (debug) - { - Info<< "exiting heRhoReactionThermo::correct()" << endl; - } -} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.H b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.H deleted file mode 100644 index ab7ef09117..0000000000 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermo.H +++ /dev/null @@ -1,100 +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 . - -Class - Foam::heRhoReactionThermo - -Description - Foam::heRhoReactionThermo - -SourceFiles - heRhoReactionThermo.C - -\*---------------------------------------------------------------------------*/ - -#ifndef heRhoReactionThermo_H -#define heRhoReactionThermo_H - -#include "heThermo.H" -#include "rhoReactionThermo.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class heRhoReactionThermo Declaration -\*---------------------------------------------------------------------------*/ - -template -class heRhoReactionThermo -: - public heThermo -{ - // Private Member Functions - - void calculate(); - - //- Construct as copy (not implemented) - heRhoReactionThermo(const heRhoReactionThermo&); - - -public: - - //- Runtime type information - TypeName("heRhoReactionThermo"); - - - // Constructors - - //- Construct from mesh - heRhoReactionThermo(const fvMesh&); - - - //- Destructor - virtual ~heRhoReactionThermo(); - - - // Member functions - - //- Update properties - virtual void correct(); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository -# include "heRhoReactionThermo.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.C similarity index 100% rename from src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C rename to src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.C diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.H b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.H similarity index 100% rename from src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.H rename to src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo.H diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C similarity index 90% rename from src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C rename to src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C index 4514f9586a..6dbf589bce 100644 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C +++ b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C @@ -26,7 +26,7 @@ License #include "makeReactionThermo.H" #include "rhoReactionThermo.H" -#include "heRhoReactionThermo.H" +#include "heRhoThermo.H" #include "specie.H" #include "perfectGas.H" @@ -59,7 +59,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, homogeneousMixture, constTransport, sensibleEnthalpy, @@ -72,7 +72,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, inhomogeneousMixture, constTransport, sensibleEnthalpy, @@ -85,7 +85,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, veryInhomogeneousMixture, constTransport, sensibleEnthalpy, @@ -98,7 +98,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, homogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -111,7 +111,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, inhomogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -124,7 +124,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, veryInhomogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -138,7 +138,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, homogeneousMixture, constTransport, sensibleEnthalpy, @@ -151,7 +151,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, inhomogeneousMixture, constTransport, sensibleEnthalpy, @@ -164,7 +164,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, veryInhomogeneousMixture, constTransport, sensibleEnthalpy, @@ -177,7 +177,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, homogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -190,7 +190,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, inhomogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -203,7 +203,7 @@ makeReactionThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, veryInhomogeneousMixture, sutherlandTransport, sensibleEnthalpy, @@ -219,7 +219,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, multiComponentMixture, constGasThermoPhysics ); @@ -228,7 +228,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, multiComponentMixture, gasThermoPhysics ); @@ -237,7 +237,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, multiComponentMixture, constIncompressibleGasThermoPhysics ); @@ -246,7 +246,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, multiComponentMixture, incompressibleGasThermoPhysics ); @@ -255,7 +255,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, multiComponentMixture, icoPoly8ThermoPhysics ); @@ -267,7 +267,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, reactingMixture, constGasThermoPhysics ); @@ -276,7 +276,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, reactingMixture, gasThermoPhysics ); @@ -285,7 +285,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, reactingMixture, constIncompressibleGasThermoPhysics ); @@ -294,7 +294,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, reactingMixture, incompressibleGasThermoPhysics ); @@ -303,7 +303,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, reactingMixture, icoPoly8ThermoPhysics ); @@ -312,7 +312,7 @@ makeReactionMixtureThermo ( rhoThermo, rhoReactionThermo, - heRhoReactionThermo, + heRhoThermo, singleStepReactingMixture, gasThermoPhysics ); diff --git a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C index 23ad0e62a0..63b3fd0dd3 100644 --- a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C +++ b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C @@ -32,14 +32,12 @@ template Foam::ODESolidChemistryModel:: ODESolidChemistryModel ( - const fvMesh& mesh, - const word& compTypeName, - const word& solidThermoName + const fvMesh& mesh ) : - CompType(mesh, solidThermoName), + CompType(mesh), ODE(), - Ys_(this->solid().composition().Y()), + Ys_(this->solidThermo().composition().Y()), pyrolisisGases_ ( mesh.lookupObject @@ -47,12 +45,17 @@ ODESolidChemistryModel ), reactions_ ( - dynamic_cast& >(this->solid()) + dynamic_cast& > + ( + this->solidThermo() + ) ), solidThermo_ ( dynamic_cast& > - (this->solid()).solidData() + ( + this->solidThermo() + ).solidData() ), gasThermo_(pyrolisisGases_.size()), nGases_(pyrolisisGases_.size()), @@ -149,7 +152,7 @@ ODESolidChemistryModel // Calculate inital values of Ysi0 = rho*delta*Yi Ys0_[fieldI].internalField() = - this->solid().rho() + this->solidThermo().rho() *max(Ys_[fieldI], scalar(0.001))*mesh.V(); } } @@ -566,7 +569,7 @@ void Foam::ODESolidChemistryModel::calculate() IOobject::NO_WRITE, false ), - this->solid().rho() + this->solidThermo().rho() ); forAll(RRs_, i) @@ -587,8 +590,8 @@ void Foam::ODESolidChemistryModel::calculate() if (reactingCells_[celli]) { scalar rhoi = rho[celli]; - scalar Ti = this->solid().T()[celli]; - scalar pi = this->solid().p()[celli]; + scalar Ti = this->solidThermo().T()[celli]; + scalar pi = this->solidThermo().p()[celli]; scalarField c(nSpecie_, 0.0); for (label i=0; i::solve IOobject::NO_WRITE, false ), - this->solid().rho() + this->solidThermo().rho() ); forAll(RRs_, i) @@ -658,8 +661,8 @@ Foam::ODESolidChemistryModel::solve cellCounter_ = celli; scalar rhoi = rho[celli]; - scalar Ti = this->solid().T()[celli]; - scalar pi = this->solid().p()[celli]; + scalar Ti = this->solidThermo().T()[celli]; + scalar pi = this->solidThermo().p()[celli]; scalarField c(nSpecie_, 0.0); scalarField c0(nSpecie_, 0.0); diff --git a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.H index df48750381..796d055388 100644 --- a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.H +++ b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.H @@ -138,13 +138,8 @@ public: // Constructors - //- Construct from components - ODESolidChemistryModel - ( - const fvMesh& mesh, - const word& compTypeName, - const word& SolidThermoName - ); + //- Construct from mesh + ODESolidChemistryModel(const fvMesh& mesh); //- Destructor diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C index b42d2e7fe6..fc5a7ced8c 100644 --- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C +++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C @@ -39,12 +39,11 @@ namespace Foam Foam::solidChemistryModel::solidChemistryModel ( - const fvMesh& mesh, - const word& solidThermoTypeName + const fvMesh& mesh ) : basicChemistryModel(mesh), - solidThermo_(solidReactionThermo::New(mesh)) //, thermoTypeName)) + solidThermo_(solidReactionThermo::New(mesh)) {} diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H index d9580162ef..bc5be73b72 100644 --- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H +++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H @@ -88,23 +88,15 @@ public: autoPtr, solidChemistryModel, fvMesh, - ( - const fvMesh& mesh, - const word& compTypeName, - const word& solidThermoTypeName - ), - (mesh, compTypeName, solidThermoTypeName) + (const fvMesh& mesh), + (mesh) ); // Constructors - //- Construct from mesh and thermo type name - solidChemistryModel - ( - const fvMesh& mesh, - const word& solidThermoTypeName - ); + //- Construct from mesh + solidChemistryModel(const fvMesh& mesh); //- Selector @@ -118,10 +110,10 @@ public: // Member Functions //- Return access to the solid thermo package - inline solidReactionThermo& solid(); + inline solidReactionThermo& solidThermo(); //- Return const access to the solid thermo package - inline const solidReactionThermo& solid() const; + inline const solidReactionThermo& solidThermo() const; //- Return total gases mass source term [kg/m3/s] virtual tmp > RRg() const = 0; diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H index 736a61076c..240f9c7118 100644 --- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H +++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,14 +25,14 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -inline Foam::solidReactionThermo& Foam::solidChemistryModel::solid() +inline Foam::solidReactionThermo& Foam::solidChemistryModel::solidThermo() { return solidThermo_(); } inline const Foam::solidReactionThermo& -Foam::solidChemistryModel::solid() const +Foam::solidChemistryModel::solidThermo() const { return solidThermo_(); } diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C index 0049237777..761e2ae22d 100644 --- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C +++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelNew.C @@ -104,8 +104,7 @@ Foam::autoPtr Foam::solidChemistryModel::New } } - return autoPtr - (cstrIter()(mesh, ODEModelName, thermoTypeName)); + return autoPtr(cstrIter()(mesh)); } diff --git a/src/thermophysicalModels/solidSpecie/Make/files b/src/thermophysicalModels/solidSpecie/Make/files index a444269f11..0e8165b9ad 100644 --- a/src/thermophysicalModels/solidSpecie/Make/files +++ b/src/thermophysicalModels/solidSpecie/Make/files @@ -1,4 +1,4 @@ reaction/Reactions/solidReaction/solidReaction.C -reaction/reactions/makeSolidReactionThermoReactions.C +reaction/reactions/makeSolidReactions.C LIB = $(FOAM_LIBBIN)/libsolidSpecie diff --git a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H index 15b0a1c6ea..c1269e8000 100644 --- a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H +++ b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H @@ -39,7 +39,6 @@ Description #include "constIsoSolidTransport.H" #include "constAnIsoSolidTransport.H" #include "exponentialSolidTransport.H" -#include "constSolidRad.H" #include "sensibleEnthalpy.H" #include "thermo.H" @@ -50,16 +49,13 @@ namespace Foam typedef constIsoSolidTransport < - constSolidRad + species::thermo < - species::thermo + hConstThermo < - hConstThermo - < - rhoConst - >, - sensibleEnthalpy - > + rhoConst + >, + sensibleEnthalpy > > hConstSolidThermoPhysics; @@ -67,16 +63,13 @@ namespace Foam typedef exponentialSolidTransport < - constSolidRad + species::thermo < - species::thermo + hExponentialThermo < - hExponentialThermo - < - rhoConst - >, - sensibleEnthalpy - > + rhoConst + >, + sensibleEnthalpy > > hExponentialSolidThermoPhysics; diff --git a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H b/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H deleted file mode 100644 index b9d19591b3..0000000000 --- a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.H +++ /dev/null @@ -1,171 +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 . - -Class - Foam::constSolidRad - -Description - Constant radiative properties - -SourceFiles - constSolidRadI.H - constSolidRad.C - -\*---------------------------------------------------------------------------*/ - -#ifndef constSolidRad_H -#define constSolidRad_H - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -template class constSolidRad; - -template -inline constSolidRad operator* -( - const scalar, - const constSolidRad& -); - -template -Ostream& operator<< -( - Ostream&, - const constSolidRad& -); - -/*---------------------------------------------------------------------------*\ - Class constSolidRad Declaration -\*---------------------------------------------------------------------------*/ - -template -class constSolidRad -: - public Thermo -{ - // Private data - - //- Absorption coefficient - scalar kappaRad_; - - //- Scattering coefficient - scalar sigmaS_; - - //- Emissivity coefficient - scalar emissivity_; - - - //- Construct from components - inline constSolidRad - ( - const Thermo& t, - const scalar kappaRad, - const scalar sigmaS, - const scalar emissivity - ); - - -public: - - // Constructors - - //- Construct from Istream - constSolidRad(const dictionary&); - - //- Construct as named copy - inline constSolidRad(const word& name, const constSolidRad&); - - //- Construct and return a clone - inline autoPtr clone() const; - - // Selector from Istream - inline static autoPtr New(Istream& is); - - - // 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; - - //- Return scattering [1/m] - inline scalar sigmaS(scalar T) const; - - //- Return emissivity[] - inline scalar emissivity(scalar T) const; - - //- Write to Ostream - void write(Ostream& os) const; - - - // Member operators - - inline constSolidRad& operator=(const constSolidRad&); - inline void operator+=(const constSolidRad&); - inline void operator-=(const constSolidRad&); - - - // Friend operators - - friend constSolidRad operator* - ( - const scalar, - const constSolidRad& - ); - - - // Ostream Operator - - friend Ostream& operator<< - ( - Ostream&, - const constSolidRad& - ); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "constSolidRadI.H" - -#ifdef NoRepository -# include "constSolidRad.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRadI.H b/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRadI.H deleted file mode 100644 index 2e7ce65cc1..0000000000 --- a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRadI.H +++ /dev/null @@ -1,179 +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 "constSolidRad.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -template -inline Foam::constSolidRad::constSolidRad -( - const thermo& t, - const scalar kappaRad, - const scalar sigmaS, - const scalar emissivity -) -: - thermo(t), - kappaRad_(kappaRad), - sigmaS_(sigmaS), - emissivity_(emissivity) -{} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - - -template -inline Foam::constSolidRad::constSolidRad -( - const word& name, - const constSolidRad& pg -) -: - thermo(name, pg), - kappaRad_(pg.kappaRad_), - sigmaS_(pg.sigmaS_), - emissivity_(pg.emissivity_) -{} - - -template -inline Foam::autoPtr > -Foam::constSolidRad::clone() const -{ - return autoPtr >(new constSolidRad(*this)); -} - - -template -inline Foam::autoPtr > -Foam::constSolidRad::New(Istream& is) -{ - return autoPtr >(new constSolidRad(is)); -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -inline Foam::scalar Foam::constSolidRad::kappaRad(scalar) const -{ - return kappaRad_; -} - - -template -inline Foam::scalar Foam::constSolidRad::sigmaS(scalar) const -{ - return sigmaS_; -} - - -template -inline Foam::scalar Foam::constSolidRad::emissivity(scalar) const -{ - return emissivity_; -} - - -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template -inline Foam::constSolidRad& -Foam::constSolidRad::operator=(const constSolidRad& ct) -{ - thermo::operator=(ct); - - kappaRad_ = ct.kappaRad_; - sigmaS_ = ct.sigmaS_; - emissivity_ = ct.emissivity_; - - return *this; -} - - -template -inline void Foam::constSolidRad::operator+= -( - const constSolidRad& ct -) -{ - scalar molr1 = this->nMoles(); - - thermo::operator+=(ct); - - molr1 /= this->nMoles(); - scalar molr2 = ct.nMoles()/this->nMoles(); - - kappaRad_ = molr1*kappaRad_ + molr2*ct.kappaRad_; - sigmaS_ = molr1*sigmaS_ + molr2*ct.sigmaS_; - emissivity_ = molr1*emissivity_ + molr2*ct.emissivity_; -} - - -template -inline void Foam::constSolidRad::operator-= -( - const constSolidRad& ct -) -{ - scalar molr1 = this->nMoles(); - - thermo::operator-=(ct); - - molr1 /= this->nMoles(); - scalar molr2 = ct.nMoles()/this->nMoles(); - - kappaRad_ = molr1*kappaRad_ - molr2*ct.kappaRad_; - sigmaS_ = molr1*sigmaS_ - molr2*ct.sigmaS_; - emissivity_ = molr1*emissivity_ - molr2*ct.emissivity_; -} - -// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // - -template -inline Foam::constSolidRad Foam::operator* -( - const scalar s, - const constSolidRad& ct -) -{ - return constSolidRad - ( - s*static_cast(ct), - ct.kappaRad_, - ct.sigmaS_, - ct.emissivity_ - ); -} - - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermo.H b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H similarity index 97% rename from src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermo.H rename to src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H index 3d9a9a738f..45bd04abe2 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermo.H +++ b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H @@ -22,10 +22,10 @@ License along with OpenFOAM. If not, see . InClass - Foam::makeSolidReactionThermo + Foam::makeSolidReaction Description - Macros for instantiating reactions on given solid thermo packages + Macros for instantiating reactions for solid \*---------------------------------------------------------------------------*/ @@ -79,5 +79,4 @@ namespace Foam #endif - // ************************************************************************* // diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermoReactions.C b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactions.C similarity index 97% rename from src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermoReactions.C rename to src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactions.C index d0e19b443b..6962ad16f6 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactionThermoReactions.C +++ b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReactions.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "makeSolidReactionThermo.H" +#include "makeSolidReaction.H" #include "solidArrheniusReactionRate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/solidThermo/Make/files b/src/thermophysicalModels/solidThermo/Make/files index 9a6e5dab61..8ed7c05dfd 100644 --- a/src/thermophysicalModels/solidThermo/Make/files +++ b/src/thermophysicalModels/solidThermo/Make/files @@ -1,10 +1,8 @@ solidThermo/solidThermo.C -solidThermo/solidThermoNew.C +solidThermo/solidThermos.C mixtures/basicSolidMixture/basicSolidMixture.C - solidReactionThermo/solidReactionThermo.C -solidReactionThermo/solidReactionThermoNew.C -heSolidThermo/heSolidThermos.C +solidReactionThermo/solidReactionThermos.C LIB = $(FOAM_LIBBIN)/libsolidThermo diff --git a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H index 93fb35276b..897832cbd1 100644 --- a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H +++ b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixture.H @@ -191,21 +191,9 @@ public: //- Density virtual scalar rho(scalar p, scalar T, label celli) const = 0; - //- Absorption coefficient - virtual scalar kappaRad(scalar p, scalar T, label celli) const = 0; - - //- Scatter coefficient - virtual scalar sigmaS(scalar p, scalar T, label celli) const = 0; - //- Thermal conductivity virtual scalar kappa(scalar p, scalar T, label celli) const = 0; - //- Emissivity coefficient - virtual scalar emissivity - ( - scalar p, scalar T, label celli - ) const = 0; - //- Specific heat capacity virtual scalar Cp(scalar p, scalar T, label celli) const = 0; }; @@ -217,7 +205,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "basicSolidMixtureI.H" +#include "basicSolidMixtureI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C index 49618c7441..666fd8a66c 100644 --- a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C +++ b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C @@ -29,7 +29,6 @@ Description #include "basicMixture.H" #include "makeBasicMixture.H" - #include "rhoConst.H" #include "hConstThermo.H" @@ -39,8 +38,6 @@ Description #include "constAnIsoSolidTransport.H" #include "exponentialSolidTransport.H" -#include "constSolidRad.H" - #include "sensibleInternalEnergy.H" #include "sensibleEnthalpy.H" #include "thermo.H" diff --git a/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C b/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C index 261bc66123..e15ac919ca 100644 --- a/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C +++ b/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C @@ -316,36 +316,6 @@ Foam::scalar Foam::multiComponentSolidMixture::rho } -template -Foam::scalar Foam::multiComponentSolidMixture::kappaRad -( - scalar p, scalar T, label celli -) const -{ - scalar tmp = 0.0; - forAll(solidData_, i) - { - tmp += solidData_[i].kappaRad(T)*X(i, celli, p, T); - } - return tmp; -} - - -template -Foam::scalar Foam::multiComponentSolidMixture::sigmaS -( - scalar p, scalar T, label celli -) const -{ - scalar tmp = 0.0; - forAll(solidData_, i) - { - tmp += solidData_[i].sigmaS(T)*X(i, celli, p, T); - } - return tmp; -} - - template Foam::scalar Foam::multiComponentSolidMixture::kappa ( @@ -361,21 +331,6 @@ Foam::scalar Foam::multiComponentSolidMixture::kappa } -template -Foam::scalar Foam::multiComponentSolidMixture::emissivity -( - scalar p, scalar T, label celli -) const -{ - scalar tmp = 0.0; - forAll(solidData_, i) - { - tmp += solidData_[i].emissivity(T)*X(i, celli, p, T); - } - return tmp; -} - - template Foam::scalar Foam::multiComponentSolidMixture::Cp ( diff --git a/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H b/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H index 4b772f4233..acdf0391b5 100644 --- a/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H +++ b/src/thermophysicalModels/solidThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H @@ -208,21 +208,11 @@ public: //- Density virtual scalar rho(scalar p, scalar T, label celli) const; - //- Absorption coefficient - virtual scalar kappaRad(scalar p, scalar T, label celli) const; - - //- Scatter coefficient - virtual scalar sigmaS(scalar p, scalar T, label celli) const; - //- Thermal conductivity virtual scalar kappa(scalar p, scalar T, label celli) const; - //- Emissivity coefficient - virtual scalar emissivity(scalar p, scalar T, label celli) const; - //- Specific heat capacity virtual scalar Cp(scalar p, scalar T, label celli) const; - }; diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C index b0f985f2f3..77184b166b 100644 --- a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C +++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermo.C @@ -54,6 +54,27 @@ Foam::solidReactionThermo::solidReactionThermo {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +Foam::autoPtr Foam::solidReactionThermo::New +( + const fvMesh& mesh +) +{ + return basicThermo::New(mesh); +} + + +Foam::autoPtr Foam::solidReactionThermo::New +( + const fvMesh& mesh, + const dictionary& dict +) +{ + return basicThermo::New(mesh, dict); +} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::solidReactionThermo::~solidReactionThermo() diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C deleted file mode 100644 index 38d044c9f1..0000000000 --- a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermoNew.C +++ /dev/null @@ -1,107 +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 "solidReactionThermo.H" -#include "fvMesh.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -Foam::autoPtr Foam::solidReactionThermo::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("solidReactionThermo::New(const fvMesh&)") - << "Unknown solidReactionThermo type " - << modelType << nl << nl - << "Valid solidReactionThermo types:" << nl - << fvMeshConstructorTablePtr_->sortedToc() << nl - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh)); -} - - -Foam::autoPtr Foam::solidReactionThermo::New -( - const fvMesh& mesh, - const dictionary& dict -) -{ - if (debug) - { - Info<< "solidReactionThermo::New(const fvMesh&, const dictionary&): " - << "constructing solidReactionThermo" - << endl; - } - - const word thermoType = dict.lookup("thermoType"); - - dictionaryConstructorTable::iterator cstrIter = - dictionaryConstructorTablePtr_->find(thermoType); - - if (cstrIter == dictionaryConstructorTablePtr_->end()) - { - FatalErrorIn - ( - "solidReactionThermo::New(const fvMesh&, const dictionary&)" - ) << "Unknown solidReactionThermo type " << thermoType - << endl << endl - << "Valid solidReactionThermo types are :" << endl - << dictionaryConstructorTablePtr_->toc() - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh, dict)); -} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C similarity index 53% rename from src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.C rename to src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C index 8348899c45..cbfa81b30e 100644 --- a/src/thermophysicalModels/solidSpecie/radiation/const/constSolidRad.C +++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C @@ -23,52 +23,40 @@ License \*---------------------------------------------------------------------------*/ -#include "constSolidRad.H" -#include "IOstreams.H" +#include "makeSolidThermo.H" +#include "solidReactionThermo.H" +#include "heSolidThermo.H" + +#include "specie.H" +#include "rhoConst.H" +#include "hConstThermo.H" +#include "hExponentialThermo.H" +#include "constIsoSolidTransport.H" +#include "constAnIsoSolidTransport.H" +#include "exponentialSolidTransport.H" +#include "reactingSolidMixture.H" +#include "sensibleEnthalpy.H" +#include "thermo.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // +/* * * * * * * * * * * * * * * * * Enthalpy-based * * * * * * * * * * * * * */ -template -constSolidRad::constSolidRad(const dictionary& dict) -: - thermo(dict), - kappaRad_(readScalar(dict.subDict("radiation").lookup("kappaRad"))), - sigmaS_(readScalar(dict.subDict("radiation").lookup("sigmaS"))), - emissivity_(readScalar(dict.subDict("radiation").lookup("emissivity"))) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::constSolidRad::constSolidRad::write(Ostream& os) const -{ - thermo::write(os); - - dictionary dict("radiation"); - dict.add("kappaRad", kappaRad_); - dict.add("sigmaS", sigmaS_); - dict.add("emissivity", emissivity_); - os << indent << dict.dictName() << dict; -} - - -// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // - -template -Ostream& operator<<(Ostream& os, const constSolidRad& pg) -{ - os << static_cast(pg); - os << tab << pg.kappaRad_ << tab << pg.sigmaS_ << tab << pg.emissivity_; - - os.check("Ostream& operator<<(Ostream& os, const constSolidRad& st)"); - return os; -} +makeSolidThermo +( + solidReactionThermo, + heSolidThermo, + reactingSolidMixture, + constIsoSolidTransport, + sensibleEnthalpy, + hConstThermo, + rhoConst, + specie +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C similarity index 53% rename from src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C rename to src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C index 3ce0c43e14..55f9bc1999 100644 --- a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C @@ -230,192 +230,6 @@ Foam::heSolidThermo::Kappa() const } -template -Foam::tmp -Foam::heSolidThermo::kappaRad() const -{ - const fvMesh& mesh = this->T_.mesh(); - - tmp tkappaRad - ( - new volScalarField - ( - IOobject - ( - "kappaRad", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh, - inv(dimLength) - ) - ); - - volScalarField& kappaRad = tkappaRad(); - scalarField& kappaRadCells = kappaRad.internalField(); - const scalarField& TCells = this->T_.internalField(); - const scalarField& pCells = this->p_.internalField(); - - forAll(kappaRadCells, celli) - { - kappaRadCells[celli] = - this->cellVolMixture - ( - pCells[celli], - TCells[celli], - celli - ).kappaRad(TCells[celli]); - } - - forAll(kappaRad.boundaryField(), patchi) - { - scalarField& kappaRadp = kappaRad.boundaryField()[patchi]; - const scalarField& pT = this->T_.boundaryField()[patchi]; - const scalarField& pp = this->p_.boundaryField()[patchi]; - - forAll(kappaRadp, facei) - { - kappaRadp[facei] = - this->patchFaceVolMixture - ( - pp[facei], - pT[facei], - patchi, - facei - ).kappaRad(pT[facei]); - } - } - - return tkappaRad; -} - - -template -Foam::tmp -Foam::heSolidThermo::sigmaS() const -{ - const fvMesh& mesh = this->T_.mesh(); - - tmp tsigmaS - ( - new volScalarField - ( - IOobject - ( - "sigmaS", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh, - inv(dimLength) - ) - ); - - volScalarField& sigmaS = tsigmaS(); - scalarField& sigmaSCells = sigmaS.internalField(); - const scalarField& TCells = this->T_.internalField(); - const scalarField& pCells = this->p_.internalField(); - - forAll(sigmaSCells, celli) - { - sigmaSCells[celli] = - this->cellVolMixture - ( - pCells[celli], - TCells[celli], - celli - ).sigmaS(TCells[celli]); - } - - forAll(sigmaS.boundaryField(), patchi) - { - scalarField& sigmaSp = sigmaS.boundaryField()[patchi]; - const scalarField& pT = this->T_.boundaryField()[patchi]; - const scalarField& pp = this->p_.boundaryField()[patchi]; - - forAll(sigmaSp, facei) - { - sigmaSp[facei] = - this->patchFaceVolMixture - ( - pp[facei], - pT[facei], - patchi, - facei - ).sigmaS(pT[facei]); - } - } - - return tsigmaS; -} - - -template -Foam::tmp -Foam::heSolidThermo::emissivity() const -{ - const fvMesh& mesh = this->T_.mesh(); - - tmp temissivity - ( - new volScalarField - ( - IOobject - ( - "emissivity", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh, - inv(dimLength) - ) - ); - - volScalarField& emissivity = temissivity(); - scalarField& emissivityCells = emissivity.internalField(); - const scalarField& TCells = this->T_.internalField(); - const scalarField& pCells = this->p_.internalField(); - - forAll(emissivityCells, celli) - { - emissivityCells[celli] = - this->cellVolMixture - ( - pCells[celli], - TCells[celli], - celli - ).emissivity(TCells[celli]); - } - - forAll(emissivity.boundaryField(), patchi) - { - scalarField& emissivityp = emissivity.boundaryField()[patchi]; - const scalarField& pT = this->T_.boundaryField()[patchi]; - const scalarField& pp = this->p_.boundaryField()[patchi]; - - forAll(emissivityp, facei) - { - emissivityp[facei] = - this->patchFaceVolMixture - ( - pp[facei], - pT[facei], - patchi, - facei - ).emissivity(pT[facei]); - } - } - - return temissivity; -} - - template Foam::tmp Foam::heSolidThermo::Kappa @@ -445,89 +259,4 @@ Foam::heSolidThermo::Kappa } -template -Foam::tmp -Foam::heSolidThermo::kappaRad -( - const label patchi -) const -{ - const scalarField& Tp = this->T_.boundaryField()[patchi]; - tmp tKappaRad(new scalarField(Tp.size())); - scalarField& KappapRadp = tKappaRad(); - const scalarField& pp = this->p_.boundaryField()[patchi]; - - forAll(Tp, facei) - { - KappapRadp[facei] = - this->patchFaceVolMixture - ( - pp[facei], - Tp[facei], - patchi, - facei - ).kappaRad(Tp[facei]); - } - - return tKappaRad; -} - - -template -Foam::tmp -Foam::heSolidThermo::sigmaS -( - const label patchi -) const -{ - const scalarField& Tp = this->T_.boundaryField()[patchi]; - tmp tsigmaS(new scalarField(Tp.size())); - scalarField& sigmaSp = tsigmaS(); - const scalarField& pp = this->p_.boundaryField()[patchi]; - - - forAll(Tp, facei) - { - sigmaSp[facei] = - this->patchFaceVolMixture - ( - pp[facei], - Tp[facei], - patchi, - facei - ).sigmaS(Tp[facei]); - } - - return tsigmaS; -} - - -template -Foam::tmp -Foam::heSolidThermo::emissivity -( - const label patchi -) const -{ - const scalarField& Tp = this->T_.boundaryField()[patchi]; - tmp temissivity(new scalarField(Tp.size())); - scalarField& emissivity = temissivity(); - const scalarField& pp = this->p_.boundaryField()[patchi]; - - forAll(Tp, facei) - { - emissivity[facei] = - this->patchFaceVolMixture - ( - pp[facei], - Tp[facei], - patchi, - facei - ).emissivity(Tp[facei]); - } - - return temissivity; -} - - // ************************************************************************* // diff --git a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H similarity index 81% rename from src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H rename to src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H index f5c5a405be..ee1f9aa010 100644 --- a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermo.H +++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H @@ -25,7 +25,7 @@ Class Foam::heSolidThermo Description - Enthalpy, internal energy based for a solid mixture. + Energy for a solid mixture SourceFiles heSolidThermo.C @@ -51,7 +51,6 @@ class heSolidThermo : public heThermo { - // Private Member Functions //- Calculate the thermo variables @@ -91,29 +90,11 @@ public: //- Anisotropic thermal conductivity [W/m/K] virtual tmp Kappa() const; - //- Absorption coefficient [1/m] - virtual tmp kappaRad() const; - - //- Scatter coefficient - virtual tmp sigmaS() const; - - //- Emissivity coefficient [1/m] - virtual tmp emissivity() const; - // Per patch calculation //- Anisotropic thermal conductivity [W/m/K] virtual tmp Kappa(const label patchI) const; - - //- Absorption coefficient [1/m] - virtual tmp kappaRad(const label patchI) const; - - //- Scatter coefficient - virtual tmp sigmaS(const label patchI) const; - - //- Emissivity coefficient [1/m] - virtual tmp emissivity(const label patchI) const; }; diff --git a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H index 3f44c6b825..2f16507b20 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H +++ b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H @@ -32,79 +32,42 @@ Description #ifndef makeSolidThermo_H #define makesolidThermo_H -#include "addToRunTimeSelectionTable.H" -#include "basicThermo.H" +#include "makeThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define makeSolidThermo(BaseThermo,Cthermo,Mixture,Transport,Radiation,Type,Thermo,EqnOfState,Specie)\ +#define makeSolidThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\ \ -typedef \ - Transport \ - < \ - Radiation \ - < \ - species::thermo \ - < \ - Thermo \ - < \ - EqnOfState \ - < \ - Specie \ - > \ - >, \ - Type \ - > \ - > \ - > 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 \ +makeThermoTypedefs \ ( \ - Cthermo##Mixture##Transport##Radiation##Type##Thermo \ - ##EqnOfState##Specie, \ - ( \ - #Cthermo"<"#Mixture"<" \ - + Transport##Radiation##Type##Thermo##EqnOfState##Specie::typeName() \ - + ">>" \ - ).c_str(), \ - 0 \ -); \ + BaseThermo, \ + Cthermo, \ + Mixture, \ + Transport, \ + Type, \ + Thermo, \ + EqnOfState, \ + Specie \ +) \ \ addToRunTimeSelectionTable \ ( \ basicThermo, \ - Cthermo##Mixture##Transport##Radiation##Type##Thermo \ - ##EqnOfState##Specie, \ + Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \ fvMesh \ ); \ \ addToRunTimeSelectionTable \ ( \ BaseThermo, \ - Cthermo##Mixture##Transport##Radiation##Type##Thermo \ - ##EqnOfState##Specie, \ + Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \ fvMesh \ ); \ \ addToRunTimeSelectionTable \ ( \ BaseThermo, \ - Cthermo##Mixture##Transport##Radiation##Type##Thermo \ - ##EqnOfState##Specie, \ + Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \ dictionary \ ); diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C index c5ebf5731c..faf4ea6155 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C @@ -81,6 +81,27 @@ Foam::solidThermo::solidThermo {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +Foam::autoPtr Foam::solidThermo::New +( + const fvMesh& mesh +) +{ + return basicThermo::New(mesh); +} + + +Foam::autoPtr Foam::solidThermo::New +( + const fvMesh& mesh, + const dictionary& dict +) +{ + return basicThermo::New(mesh, dict); +} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::solidThermo::~solidThermo() diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H index bc30f74370..a7fbf5c067 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H @@ -127,49 +127,20 @@ public: //- Thermal conductivity [W/m/K] virtual tmp Kappa() const = 0; - //- Absorption coefficient [1/m] - virtual tmp kappaRad() const = 0; - - //- Scatter coefficient - virtual tmp sigmaS() const = 0; - - //- Emissivity coefficient [1/m] - virtual tmp emissivity() const = 0; - // Per patch calculation - //- Anisotropic thermal conductivity [W/m/K] virtual tmp Kappa ( const label patchI ) const = 0; - //- Absorption coefficient [1/m] - virtual tmp kappaRad - ( - const label patchI - ) const = 0; - - //- Scatter coefficient - virtual tmp sigmaS - ( - const label patchI - ) const = 0; - - //- Emissivity coefficient [1/m] - virtual tmp emissivity - ( - const label patchI - ) const = 0; - // I-O //- Read thermophysicalProperties dictionary virtual bool read(); - }; diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C deleted file mode 100644 index 28871b9f75..0000000000 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C +++ /dev/null @@ -1,111 +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 "solidThermo.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -Foam::autoPtr Foam::solidThermo::New -( - const fvMesh& mesh -) -{ - if (debug) - { - Info<< "solidThermo::New(const fvMesh&): " - << "constructing solidThermo" - << endl; - } - - const word thermoType - ( - IOdictionary - ( - IOobject - ( - "thermophysicalProperties", - mesh.time().constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ).lookup("thermoType") - ); - - fvMeshConstructorTable::iterator cstrIter = - fvMeshConstructorTablePtr_->find(thermoType); - - if (cstrIter == fvMeshConstructorTablePtr_->end()) - { - FatalErrorIn - ( - "solidThermo::New(const fvMesh&)" - ) << "Unknown solidThermo type " << thermoType - << endl << endl - << "Valid solidThermo types are :" << endl - << fvMeshConstructorTablePtr_->toc() - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh)); -} - - -Foam::autoPtr Foam::solidThermo::New -( - const fvMesh& mesh, - const dictionary& dict -) -{ - if (debug) - { - Info<< "solidThermo::New(const fvMesh&, const dictionary&): " - << "constructing solidThermo" - << endl; - } - - const word thermoType = dict.lookup("thermoType"); - - dictionaryConstructorTable::iterator cstrIter = - dictionaryConstructorTablePtr_->find(thermoType); - - if (cstrIter == dictionaryConstructorTablePtr_->end()) - { - FatalErrorIn - ( - "solidThermo::New(const fvMesh&, const dictionary&)" - ) << "Unknown solidThermo type " << thermoType - << endl << endl - << "Valid solidThermo types are :" << endl - << dictionaryConstructorTablePtr_->toc() - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh, dict)); -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C similarity index 88% rename from src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C rename to src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C index 860626e7c7..5c7408eaa4 100644 --- a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C @@ -23,8 +23,9 @@ License \*---------------------------------------------------------------------------*/ - #include "makeSolidThermo.H" +#include "solidThermo.H" +#include "heSolidThermo.H" #include "specie.H" #include "rhoConst.H" @@ -33,7 +34,6 @@ License #include "constIsoSolidTransport.H" #include "constAnIsoSolidTransport.H" #include "exponentialSolidTransport.H" -#include "constSolidRad.H" #include "pureSolidMixture.H" #include "multiComponentSolidMixture.H" #include "reactingSolidMixture.H" @@ -41,11 +41,6 @@ License #include "sensibleInternalEnergy.H" #include "thermo.H" -#include "heThermo.H" - -#include "solidThermo.H" -#include "solidReactionThermo.H" -#include "heSolidThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -60,7 +55,6 @@ makeSolidThermo heSolidThermo, pureSolidMixture, constIsoSolidTransport, - constSolidRad, sensibleEnthalpy, hConstThermo, rhoConst, @@ -73,7 +67,6 @@ makeSolidThermo heSolidThermo, pureSolidMixture, constAnIsoSolidTransport, - constSolidRad, sensibleEnthalpy, hConstThermo, rhoConst, @@ -86,7 +79,6 @@ makeSolidThermo heSolidThermo, pureSolidMixture, exponentialSolidTransport, - constSolidRad, sensibleEnthalpy, hExponentialThermo, rhoConst, @@ -99,20 +91,6 @@ makeSolidThermo heSolidThermo, multiComponentSolidMixture, constIsoSolidTransport, - constSolidRad, - sensibleEnthalpy, - hConstThermo, - rhoConst, - specie -); - -makeSolidThermo -( - solidReactionThermo, - heSolidThermo, - reactingSolidMixture, - constIsoSolidTransport, - constSolidRad, sensibleEnthalpy, hConstThermo, rhoConst, diff --git a/src/thermophysicalModels/specie/Make/files b/src/thermophysicalModels/specie/Make/files index 739c9f91fd..adb0310042 100644 --- a/src/thermophysicalModels/specie/Make/files +++ b/src/thermophysicalModels/specie/Make/files @@ -1,11 +1,6 @@ -atomicWeights = atomicWeights -specie = specie -equationOfState = equationOfState -reactions = reaction/reactions - -$(atomicWeights)/atomicWeights.C -$(specie)/specie.C -$(reactions)/makeReactionThermoReactions.C -$(reactions)/makeLangmuirHinshelwoodReactions.C +atomicWeights/atomicWeights.C +specie/specie.C +reaction/reactions/makeReactions.C +reaction/reactions/makeLangmuirHinshelwoodReactions.C LIB = $(FOAM_LIBBIN)/libspecie diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C similarity index 100% rename from src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C rename to src/thermophysicalModels/specie/reaction/reactions/makeReactions.C diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties index 301c1d7986..f2bfd9fb9b 100644 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type heheuReactionThermo; + type heheuPsiThermo; mixture inhomogeneousMixture; transport sutherland; thermo janaf; diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties index 9c8539a6ab..83a5890120 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type heheuReactionThermo; + type heheuPsiThermo; mixture homogeneousMixture; transport sutherland; thermo janaf; diff --git a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties index 65f5b0ac6d..0bd6848bf9 100644 --- a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties +++ b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver ode; + chemistryThermo psi; } chemistry on; diff --git a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties index d6cb3dd45f..c979a11fd0 100644 --- a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties index b0ebc946d4..b08455efb4 100644 --- a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties +++ b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver ode; + chemistryThermo psi; } chemistry on; diff --git a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties index d6cb3dd45f..c979a11fd0 100644 --- a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties index 07d0e5d36e..0f13184b2f 100644 --- a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties +++ b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver ode; + chemistryThermo psi; } chemistry on; diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties index d6cb3dd45f..c979a11fd0 100644 --- a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties index 277f2632be..50aebd8dce 100644 --- a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties +++ b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver ode; + chemistryThermo psi; } chemistry on; diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties index d6cb3dd45f..c979a11fd0 100644 --- a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties +++ b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties index 4946ebff2a..12d72f931e 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type heheuReactionThermo; + type heheuPsiThermo; mixture inhomogeneousMixture; transport sutherland; thermo janaf; diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties index 57e0ddc7b1..043db29f3a 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture reactingSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} solidComponents ( diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties index 446c37a397..e75fc0cc63 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture singleStepReactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties index 4610e63a5a..5e88ec565c 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture singleStepReactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties index 103c36caab..62fbf8fb24 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver noChemistrySolver; + chemistryThermo psi; } chemistry off; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties index 4610e63a5a..5e88ec565c 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture singleStepReactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties index 068c1b3f46..3ce48f2eab 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver ode; + chemistryThermo psi; } chemistry on; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties index 4eca14a981..ae01272133 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion index 0659d6b690..e23ffe9bfe 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion @@ -110,7 +110,16 @@ dictionaryReplacement // Solid thermo - thermoType heSolidThermo>,sensibleEnthalpy>>>>; + thermoType + { + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; + } mixture diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties index 884f3f652c..e0ffc47007 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties index 884f3f652c..e0ffc47007 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties index 884f3f652c..e0ffc47007 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties index d4f02fb677..fa55ef00d4 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties index d4f02fb677..fa55ef00d4 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties index d4f02fb677..fa55ef00d4 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties index d4f02fb677..fa55ef00d4 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties index d4f02fb677..fa55ef00d4 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties index d4f02fb677..fa55ef00d4 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties index d4f02fb677..fa55ef00d4 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties index d4f02fb677..fa55ef00d4 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties index d4f02fb677..fa55ef00d4 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties index 99794189d6..0d206ea7f5 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties @@ -1,4 +1,4 @@ -/*--------------------------------*- C++ -*----------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------* \ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties index 99794189d6..e9a94009e5 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties index 99794189d6..e9a94009e5 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo>,sensibleEnthalpy>>>>; +thermoType +{ + type heSolidThermo; + mixture pureSolidMixture; + transport constIso; + thermo hConst; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties index 2f8eb06d2b..254f5c4633 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver noChemistrySolver; + chemistryThermo rho; } chemistry on; // off; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties index bd526695b9..8b36a40f5d 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type heRhoReactionThermo; + type heRhoThermo; mixture reactingMixture; transport polynomial; thermo hPolynomial; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties index 275a88b8d6..0fbd9de5dc 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver noChemistrySolver; + chemistryThermo rho; } chemistry off; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties index 4f5a6b1347..9b63bc18b3 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type heRhoReactionThermo; + type heRhoThermo; mixture reactingMixture; transport polynomial; thermo hPolynomial; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties index aed335d273..e0706fc235 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver ode; + chemistryThermo psi; } chemistry on; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties index 99a7d5707c..9fc96ae257 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties index c0ecd63722..8fbc88a1b3 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver noChemistrySolver; + chemistryThermo psi; } chemistry off; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties index 380bc6551b..0a37bdeb40 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties index c0ecd63722..8fbc88a1b3 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver noChemistrySolver; + chemistryThermo psi; } chemistry off; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties index 380bc6551b..0a37bdeb40 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties index c0ecd63722..8fbc88a1b3 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver noChemistrySolver; + chemistryThermo psi; } chemistry off; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties index 380bc6551b..0a37bdeb40 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties index c0ecd63722..8fbc88a1b3 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver noChemistrySolver; + chemistryThermo psi; } chemistry off; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties index 380bc6551b..0a37bdeb40 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties index 40cf4f3f12..5aa51f0290 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver ode; + chemistryThermo rho; } chemistry off; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties index 594121c7ff..a703f9908a 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type heRhoReactionThermo; + type heRhoThermo; mixture reactingMixture; transport polynomial; thermo hPolynomial; diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties index 40cf4f3f12..5aa51f0290 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver ode; + chemistryThermo rho; } chemistry off; diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties index 07b94deeb7..8e324f5244 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type heRhoReactionThermo; + type heRhoThermo; mixture reactingMixture; transport polynomial; thermo hPolynomial; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties index 40cf4f3f12..5aa51f0290 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver ode; + chemistryThermo rho; } chemistry off; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties index 6eb02e10a9..d12affc2f3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type heRhoReactionThermo; + type heRhoThermo; mixture reactingMixture; transport polynomial; thermo hPolynomial; diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties index fcf49a0f81..deb5491013 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties @@ -17,8 +17,8 @@ FoamFile chemistryType { - chemistryModel ODEChemistryModel; chemistrySolver ode; + chemistryThermo psi; } chemistry off; diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties index 2684e0053e..b0ac29548b 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { - type hePsiReactionThermo; + type hePsiThermo; mixture reactingMixture; transport sutherland; thermo janaf;