diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C index 58de0b6f77..e6c26f52cb 100644 --- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C +++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C @@ -36,14 +36,14 @@ Description #include "IFstream.H" #include "OSspecific.H" -#include "specieThermo.H" +#include "thermo.H" #include "absoluteEnthalpy.H" #include "janafThermo.H" #include "perfectGas.H" using namespace Foam; -typedef specieThermo, absoluteEnthalpy> thermo; +typedef species::thermo, absoluteEnthalpy> thermo; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C index dde7e8678a..57f7aad308 100644 --- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C +++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C @@ -35,7 +35,7 @@ Description #include "OSspecific.H" #include "IOmanip.H" -#include "specieThermo.H" +#include "thermo.H" #include "absoluteEnthalpy.H" #include "janafThermo.H" #include "perfectGas.H" @@ -43,7 +43,7 @@ Description using namespace Foam; -typedef specieThermo, absoluteEnthalpy> thermo; +typedef species::thermo, absoluteEnthalpy> thermo; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Main program: diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C index 8cf2371898..3a11369da7 100644 --- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C +++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C @@ -38,14 +38,14 @@ Description #include "OSspecific.H" #include "IOmanip.H" -#include "specieThermo.H" +#include "thermo.H" #include "absoluteEnthalpy.H" #include "janafThermo.H" #include "perfectGas.H" using namespace Foam; -typedef specieThermo, absoluteEnthalpy> thermo; +typedef species::thermo, absoluteEnthalpy> thermo; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C index 728897c88a..0b00e865ca 100644 --- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C +++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C @@ -35,7 +35,7 @@ Description #include "IFstream.H" #include "OSspecific.H" -#include "specieThermo.H" +#include "thermo.H" #include "absoluteEnthalpy.H" #include "janafThermo.H" #include "perfectGas.H" @@ -43,7 +43,7 @@ Description using namespace Foam; -typedef specieThermo, absoluteEnthalpy> thermo; +typedef species::thermo, absoluteEnthalpy> thermo; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/etc/controlDict b/etc/controlDict index caf1e22933..f9998bcdd7 100644 --- a/etc/controlDict +++ b/etc/controlDict @@ -510,30 +510,30 @@ DebugSwitches gradientUnburntEnthalpy 0; granularPressureModel 0; hCombustionThermo 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; + hMixtureThermo>>>> 0; + hMixtureThermo>>>> 0; + hMixtureThermo>>>> 0; + hMixtureThermo>>>> 0; + hMixtureThermo>>>> 0; hMixtureThermo 0; - hMixtureThermo>>>> 0; - hMixtureThermo>>>> 0; - hThermo>>>> 0; - hThermo>>>> 0; - hThermo>>>> 0; + hMixtureThermo>>>> 0; + hMixtureThermo>>>> 0; + hThermo>>>> 0; + hThermo>>>> 0; + hThermo>>>> 0; harmonic 0; heatTransferModel 0; hexCellLooper 0; hexRef8 0; hhuCombustionThermo 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; - hhuMixtureThermo>>>> 0; + hhuMixtureThermo>>>> 0; + hhuMixtureThermo>>>> 0; + hhuMixtureThermo>>>> 0; + hhuMixtureThermo>>>> 0; + hhuMixtureThermo>>>> 0; + hhuMixtureThermo>>>> 0; + hhuMixtureThermo>>>> 0; + hhuMixtureThermo>>>> 0; hierarchical 0; hollowConeInjector 0; iC3H8O 0; @@ -711,9 +711,9 @@ DebugSwitches processor 0; processorLduInterface 0; processorLduInterfaceField 0; - pureMixture>>> 0; - pureMixture>>> 0; - pureMixture>>> 0; + pureMixture>>> 0; + pureMixture>>> 0; + pureMixture>>> 0; quadratic 0; quadraticFit 0; quadraticLinearFit 0; diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H index 386680807e..7ad5ded31e 100644 --- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H +++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H @@ -58,7 +58,7 @@ Description ,sensibleEnthalpy> > > diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files index d4ae65f2c1..f49b474762 100644 --- a/src/thermophysicalModels/basic/Make/files +++ b/src/thermophysicalModels/basic/Make/files @@ -2,7 +2,10 @@ mixtures/basicMixture/basicMixture.C mixtures/basicMixture/basicMixtures.C basicThermo/basicThermo.C +basicThermo/basicThermoNew.C + fluidThermo/fluidThermo.C +fluidThermo/fluidThermoNew.C psiThermo/psiThermo/psiThermo.C psiThermo/psiThermo/psiThermoNew.C diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H index 1d614b4d18..079ffd7d34 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H +++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H @@ -29,6 +29,7 @@ Description SourceFiles basicThermo.C + basicThermoNew.C \*---------------------------------------------------------------------------*/ @@ -101,6 +102,10 @@ public: basicThermo(const fvMesh&, const dictionary&); + //- Selector + static autoPtr New(const fvMesh&); + + //- Destructor virtual ~basicThermo(); diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoNew.C b/src/thermophysicalModels/basic/basicThermo/basicThermoNew.C new file mode 100644 index 0000000000..e7dda0d9d5 --- /dev/null +++ b/src/thermophysicalModels/basic/basicThermo/basicThermoNew.C @@ -0,0 +1,71 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "basicThermo.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +Foam::autoPtr Foam::basicThermo::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("basicThermo::New(const fvMesh&)") + << "Unknown basicThermo type " << modelType << nl << nl + << "Valid basicThermo types are:" << nl + << fvMeshConstructorTablePtr_->sortedToc() << nl + << exit(FatalError); + } + + return autoPtr(cstrIter()(mesh)); +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H index 8e3ba8f2dc..7f33cdfdd3 100644 --- a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H +++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H @@ -29,6 +29,7 @@ Description SourceFiles fluidThermo.C + fluidThermoNew.C \*---------------------------------------------------------------------------*/ @@ -76,6 +77,10 @@ public: fluidThermo(const fvMesh&, const dictionary&); + //- Selector + static autoPtr New(const fvMesh&); + + //- Destructor virtual ~fluidThermo(); diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermoNew.C b/src/thermophysicalModels/basic/fluidThermo/fluidThermoNew.C new file mode 100644 index 0000000000..d6977a542a --- /dev/null +++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermoNew.C @@ -0,0 +1,71 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "fluidThermo.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +Foam::autoPtr Foam::fluidThermo::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("fluidThermo::New(const fvMesh&)") + << "Unknown fluidThermo type " << modelType << nl << nl + << "Valid fluidThermo types are:" << nl + << fvMeshConstructorTablePtr_->sortedToc() << nl + << exit(FatalError); + } + + return autoPtr(cstrIter()(mesh)); +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H index 41ab0bdf66..abdd0a81bc 100644 --- a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H +++ b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H @@ -44,7 +44,7 @@ typedef Cthermo \ < \ Transport \ < \ - specieThermo \ + species::thermo \ < \ Thermo \ < \ @@ -64,13 +64,13 @@ defineTemplateTypeNameAndDebugWithName \ #Mixture \ "<" \ #Transport \ - "," \ #Type \ - ">>>>", \ + ">>>", \ 0 \ ); \ \ @@ -93,7 +93,7 @@ addToRunTimeSelectionTable \ \ typedef polynomialTransport \ < \ - specieThermo \ + species::thermo \ < \ hPolynomialThermo \ < \ diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C index af89aec73a..a35994147f 100644 --- a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C +++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C @@ -41,7 +41,7 @@ Description #include "janafThermo.H" #include "sensibleInternalEnergy.H" #include "sensibleEnthalpy.H" -#include "specieThermo.H" +#include "thermo.H" #include "constTransport.H" #include "sutherlandTransport.H" diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H b/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H index 54bda34f2b..91fa87ea8d 100644 --- a/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H +++ b/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H @@ -39,19 +39,19 @@ Description #define makeBasicMixture(Mixture,Transport,Type,Thermo,EqnOfState) \ \ typedef \ - Mixture, Type> > > \ + Mixture, Type> > > \ Mixture##Transport##Type##Thermo##EqnOfState; \ \ defineTemplateTypeNameAndDebugWithName \ (Mixture##Transport##Type##Thermo##EqnOfState, \ - #Mixture"<"#Transport","#Type">>>", 0) + #Mixture"<"#Transport"<"#Thermo"<"#EqnOfState">,"#Type">>", 0) #define makeBasicPolyMixture(Mixture,Order,Type) \ \ typedef polynomialTransport \ < \ - specieThermo \ + species::thermo \ < \ hPolynomialThermo \ < \ diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C index b5a48fc315..c997caab4b 100644 --- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C +++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C @@ -33,7 +33,7 @@ License #include "janafThermo.H" #include "sensibleEnthalpy.H" #include "sensibleInternalEnergy.H" -#include "specieThermo.H" +#include "thermo.H" #include "constTransport.H" #include "sutherlandTransport.H" diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermoNew.C b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermoNew.C index 674cac054b..879ff13360 100644 --- a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermoNew.C +++ b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermoNew.C @@ -61,10 +61,10 @@ Foam::autoPtr Foam::psiThermo::New thermoTypeName = type + '<' + mixture + '<' - + transport + "," - + energy + ">>>>"; + + energy + ">>>"; } else { diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C index b39ad010d4..d33dadce50 100644 --- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C +++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C @@ -34,7 +34,7 @@ License #include "janafThermo.H" #include "sensibleEnthalpy.H" #include "sensibleInternalEnergy.H" -#include "specieThermo.H" +#include "thermo.H" #include "constTransport.H" #include "sutherlandTransport.H" diff --git a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H index 9f2de27639..c0f38eb8f0 100644 --- a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H +++ b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H @@ -41,7 +41,7 @@ typedef MixtureThermo \ < \ Transport \ < \ - specieThermo \ + species::thermo \ < \ Thermo \ < \ @@ -62,13 +62,13 @@ defineTemplateTypeNameAndDebugWithName \ #Mixture \ "<" \ #Transport \ - "," \ #Type \ - ">>>>", \ + ">>>", \ 0 \ ); \ \ diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C index 3583588e00..e307aedf5a 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C @@ -71,20 +71,20 @@ Foam::multiComponentMixture::multiComponentMixture ( const dictionary& thermoDict, const wordList& specieNames, - const HashPtrTable& specieThermoData, + const HashPtrTable& thermoData, const fvMesh& mesh ) : basicMultiComponentMixture(thermoDict, specieNames, mesh), speciesData_(species_.size()), - mixture_("mixture", *specieThermoData[specieNames[0]]) + mixture_("mixture", *thermoData[specieNames[0]]) { forAll(species_, i) { speciesData_.set ( i, - new ThermoType(*specieThermoData[species_[i]]) + new ThermoType(*thermoData[species_[i]]) ); } diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H index 50164015b0..4017a5fd13 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H +++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H @@ -87,7 +87,7 @@ public: ( const dictionary&, const wordList& specieNames, - const HashPtrTable& specieThermoData, + const HashPtrTable& thermoData, const fvMesh& ); diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C index 159a1e8ef0..96bc651bb0 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C +++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C @@ -33,7 +33,7 @@ License #include "hConstThermo.H" #include "janafThermo.H" #include "sensibleEnthalpy.H" -#include "specieThermo.H" +#include "thermo.H" #include "constTransport.H" #include "sutherlandTransport.H" diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C index bf42991d9c..f915f5a6d4 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C +++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C @@ -34,7 +34,7 @@ License #include "hConstThermo.H" #include "janafThermo.H" #include "absoluteEnthalpy.H" -#include "specieThermo.H" +#include "thermo.H" #include "constTransport.H" #include "sutherlandTransport.H" diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C index 38e50afd57..b31ed3e253 100644 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C +++ b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C @@ -34,7 +34,7 @@ License #include "hConstThermo.H" #include "janafThermo.H" #include "sensibleEnthalpy.H" -#include "specieThermo.H" +#include "thermo.H" #include "constTransport.H" #include "sutherlandTransport.H" diff --git a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H index 9f15c3fe0f..7c5090a99a 100644 --- a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H +++ b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H @@ -44,7 +44,7 @@ Description #include "constSolidRad.H" #include "sensibleEnthalpy.H" -#include "specieThermo.H" +#include "thermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,7 +55,7 @@ namespace Foam < constSolidRad < - specieThermo + species::thermo < hConstThermo < @@ -72,7 +72,7 @@ namespace Foam < constSolidRad < - specieThermo + species::thermo < hExponentialThermo < diff --git a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C b/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C index 6d7ffa538f..0b7e68e328 100644 --- a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C +++ b/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C @@ -43,7 +43,7 @@ License #include "sensibleEnthalpy.H" #include "sensibleInternalEnergy.H" -#include "specieThermo.H" +#include "thermo.H" #include "heThermo.H" diff --git a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C index 67c91ab806..49618c7441 100644 --- a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C +++ b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C @@ -43,7 +43,7 @@ Description #include "sensibleInternalEnergy.H" #include "sensibleEnthalpy.H" -#include "specieThermo.H" +#include "thermo.H" #include "pureSolidMixture.H" #include "multiComponentSolidMixture.H" diff --git a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H index 6ff422db11..ca08fb88e8 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H +++ b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H @@ -49,7 +49,7 @@ typedef Cthermo \ < \ Radiation \ < \ - specieThermo \ + species::thermo \ < \ Thermo \ < \ @@ -73,14 +73,13 @@ defineTemplateTypeNameAndDebugWithName \ #Transport \ "<" \ #Radiation \ - "," \ #Type \ - ">>>>" \ - ">", \ + ">>>>", \ 0 \ ); \ \ @@ -91,7 +90,7 @@ typedef Mixture \ < \ Radiation \ < \ - specieThermo \ + species::thermo \ < \ Thermo \ < \ @@ -113,13 +112,13 @@ defineTemplateTypeNameAndDebugWithName \ #Transport \ "<" \ #Radiation \ - "," \ #Type \ - ">>>>", \ + ">>>", \ 0 \ ); \ \ @@ -131,7 +130,7 @@ addToRunTimeSelectionTable \ ); \ addToRunTimeSelectionTable \ ( \ - basicThermo, \ + basicThermo, \ Cthermo##Mixture##Transport##Radiation##Type##Thermo##Rho##BaseThermo, \ fvMesh \ ); \ diff --git a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H index 53224e8f6f..d4cefcc05f 100644 --- a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H +++ b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H @@ -37,7 +37,7 @@ Description #include "hConstThermo.H" #include "janafThermo.H" #include "sensibleEnthalpy.H" -#include "specieThermo.H" +#include "thermo.H" #include "sutherlandTransport.H" #include "constTransport.H" @@ -52,7 +52,7 @@ namespace Foam typedef constTransport < - specieThermo + species::thermo < hConstThermo < @@ -65,7 +65,7 @@ namespace Foam typedef sutherlandTransport < - specieThermo + species::thermo < janafThermo < @@ -78,7 +78,7 @@ namespace Foam typedef constTransport < - specieThermo + species::thermo < hConstThermo < @@ -91,7 +91,7 @@ namespace Foam typedef sutherlandTransport < - specieThermo + species::thermo < janafThermo < @@ -104,7 +104,7 @@ namespace Foam typedef polynomialTransport < - specieThermo + species::thermo < hPolynomialThermo < diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H index a5ed960fa5..be1a76cf00 100644 --- a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H +++ b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H @@ -38,7 +38,7 @@ Description #include "ReversibleReaction.H" #include "NonEquilibriumReversibleReaction.H" -#include "specieThermo.H" +#include "thermo.H" #include "sutherlandTransport.H" #include "janafThermo.H" diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H index 0e3501a4b7..378a39c059 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H @@ -37,7 +37,7 @@ SourceFiles #ifndef eConstThermo_H #define eConstThermo_H -#include "specieThermo.H" +#include "thermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C b/src/thermophysicalModels/specie/thermo/thermo/thermo.C similarity index 78% rename from src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C rename to src/thermophysicalModels/specie/thermo/thermo/thermo.C index 87718f7b2f..400c2d4a88 100644 --- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C +++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.C @@ -23,31 +23,31 @@ License \*---------------------------------------------------------------------------*/ -#include "specieThermo.H" +#include "thermo.H" #include "IOstreams.H" /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */ template class Type> -const Foam::scalar Foam::specieThermo::tol_ = 1.0e-4; +const Foam::scalar Foam::species::thermo::tol_ = 1.0e-4; template class Type> -const int Foam::specieThermo::maxIter_ = 100; +const int Foam::species::thermo::maxIter_ = 100; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template class Type> -Foam::specieThermo::specieThermo(Istream& is) +Foam::species::thermo::thermo(Istream& is) : Thermo(is) { - is.check("specieThermo::specieThermo(Istream&)"); + is.check("thermo::thermo(Istream&)"); } template class Type> -Foam::specieThermo::specieThermo(const dictionary& dict) +Foam::species::thermo::thermo(const dictionary& dict) : Thermo(dict) {} @@ -56,7 +56,7 @@ Foam::specieThermo::specieThermo(const dictionary& dict) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template class Type> -void Foam::specieThermo::write(Ostream& os) const +void Foam::species::thermo::write(Ostream& os) const { Thermo::write(os); } @@ -65,14 +65,14 @@ void Foam::specieThermo::write(Ostream& os) const // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // template class Type> -Foam::Ostream& Foam::operator<< +Foam::Ostream& Foam::species::operator<< ( - Ostream& os, const specieThermo& st + Ostream& os, const thermo& st ) { os << static_cast(st); - os.check("Ostream& operator<<(Ostream&, const specieThermo&)"); + os.check("Ostream& operator<<(Ostream&, const thermo&)"); return os; } diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H similarity index 84% rename from src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H rename to src/thermophysicalModels/specie/thermo/thermo/thermo.H index 6d5e1fd86a..07c84553e6 100644 --- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H +++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::specieThermo + Foam::thermo Description Basic thermodynamics type based on the use of fitting functions for @@ -30,68 +30,70 @@ Description properties are derived from these primitive functions. SourceFiles - specieThermoI.H - specieThermo.C + thermoI.H + thermo.C \*---------------------------------------------------------------------------*/ -#ifndef specieThermo_H -#define specieThermo_H +#ifndef thermo_H +#define thermo_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { +namespace species +{ // Forward declaration of friend functions and operators -template class Type> class specieThermo; +template class Type> class thermo; template class Type> -inline specieThermo operator+ +inline thermo operator+ ( - const specieThermo&, - const specieThermo& + const thermo&, + const thermo& ); template class Type> -inline specieThermo operator- +inline thermo operator- ( - const specieThermo&, - const specieThermo& + const thermo&, + const thermo& ); template class Type> -inline specieThermo operator* +inline thermo operator* ( const scalar, - const specieThermo& + const thermo& ); template class Type> -inline specieThermo operator== +inline thermo operator== ( - const specieThermo&, - const specieThermo& + const thermo&, + const thermo& ); template class Type> Ostream& operator<< ( Ostream&, - const specieThermo& + const thermo& ); /*---------------------------------------------------------------------------*\ - Class specieThermo Declaration + Class thermo Declaration \*---------------------------------------------------------------------------*/ template class Type> -class specieThermo +class thermo : public Thermo, - public Type > + public Type > { // Private data @@ -112,9 +114,9 @@ class specieThermo scalar f, scalar p, scalar T0, - scalar (specieThermo::*F)(const scalar, const scalar) const, - scalar (specieThermo::*dFdT)(const scalar, const scalar) const, - scalar (specieThermo::*limit)(const scalar) const + scalar (thermo::*F)(const scalar, const scalar) const, + scalar (thermo::*dFdT)(const scalar, const scalar) const, + scalar (thermo::*limit)(const scalar) const ) const; @@ -123,16 +125,16 @@ public: // Constructors //- construct from components - inline specieThermo(const Thermo& sp); + inline thermo(const Thermo& sp); //- Construct from Istream - specieThermo(Istream&); + thermo(Istream&); //- Construct from dictionary - specieThermo(const dictionary& dict); + thermo(const dictionary& dict); //- Construct as named copy - inline specieThermo(const word& name, const specieThermo&); + inline thermo(const word& name, const thermo&); // Member Functions @@ -330,36 +332,36 @@ public: // Member operators - inline void operator+=(const specieThermo&); - inline void operator-=(const specieThermo&); + inline void operator+=(const thermo&); + inline void operator-=(const thermo&); inline void operator*=(const scalar); // Friend operators - friend specieThermo operator+ + friend thermo operator+ ( - const specieThermo&, - const specieThermo& + const thermo&, + const thermo& ); - friend specieThermo operator- + friend thermo operator- ( - const specieThermo&, - const specieThermo& + const thermo&, + const thermo& ); - friend specieThermo operator* + friend thermo operator* ( const scalar s, - const specieThermo& + const thermo& ); - friend specieThermo operator== + friend thermo operator== ( - const specieThermo&, - const specieThermo& + const thermo&, + const thermo& ); @@ -368,21 +370,22 @@ public: friend Ostream& operator<< ( Ostream&, - const specieThermo& + const thermo& ); }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace species } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "specieThermoI.H" +#include "thermoI.H" #ifdef NoRepository -# include "specieThermo.C" +# include "thermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H similarity index 62% rename from src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H rename to src/thermophysicalModels/specie/thermo/thermo/thermoI.H index c18ea8aa27..b8642e960b 100644 --- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H +++ b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H @@ -23,12 +23,12 @@ License \*---------------------------------------------------------------------------*/ -#include "specieThermo.H" +#include "thermo.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template class Type> -inline Foam::specieThermo::specieThermo +inline Foam::species::thermo::thermo ( const Thermo& sp ) @@ -38,15 +38,15 @@ inline Foam::specieThermo::specieThermo template class Type> -inline Foam::scalar Foam::specieThermo::T +inline Foam::scalar Foam::species::thermo::T ( scalar f, scalar p, scalar T0, - scalar (specieThermo::*F)(const scalar, const scalar) const, - scalar (specieThermo::*dFdT)(const scalar, const scalar) + scalar (thermo::*F)(const scalar, const scalar) const, + scalar (thermo::*dFdT)(const scalar, const scalar) const, - scalar (specieThermo::*limit)(const scalar) const + scalar (thermo::*limit)(const scalar) const ) const { scalar Test = T0; @@ -65,12 +65,12 @@ inline Foam::scalar Foam::specieThermo::T { FatalErrorIn ( - "specieThermo::T(scalar f, scalar T0, " - "scalar (specieThermo::*F)" + "thermo::T(scalar f, scalar T0, " + "scalar (thermo::*F)" "(const scalar) const, " - "scalar (specieThermo::*dFdT)" + "scalar (thermo::*dFdT)" "(const scalar) const, " - "scalar (specieThermo::*limit)" + "scalar (thermo::*limit)" "(const scalar) const" ") const" ) << "Maximum number of iterations exceeded" @@ -86,10 +86,10 @@ inline Foam::scalar Foam::specieThermo::T // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template class Type> -inline Foam::specieThermo::specieThermo +inline Foam::species::thermo::thermo ( const word& name, - const specieThermo& st + const thermo& st ) : Thermo(name, st) @@ -100,23 +100,23 @@ inline Foam::specieThermo::specieThermo template class Type> inline Foam::word -Foam::specieThermo::heName() +Foam::species::thermo::heName() { - return Type >::name(); + return Type >::name(); } template class Type> inline Foam::scalar -Foam::specieThermo::he(const scalar p, const scalar T) const +Foam::species::thermo::he(const scalar p, const scalar T) const { - return Type >::he(*this, p, T); + return Type >::he(*this, p, T); } template class Type> inline Foam::scalar -Foam::specieThermo::cv(const scalar p, const scalar T) const +Foam::species::thermo::cv(const scalar p, const scalar T) const { return this->cp(p, T) - this->cpMcv(p, T); } @@ -124,15 +124,15 @@ Foam::specieThermo::cv(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::cpv(const scalar p, const scalar T) const +Foam::species::thermo::cpv(const scalar p, const scalar T) const { - return Type >::cpv(*this, p, T); + return Type >::cpv(*this, p, T); } template class Type> inline Foam::scalar -Foam::specieThermo::gamma(const scalar p, const scalar T) const +Foam::species::thermo::gamma(const scalar p, const scalar T) const { scalar cp = this->cp(p, T); return cp/(cp - this->cpMcv(p, T)); @@ -141,15 +141,19 @@ Foam::specieThermo::gamma(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::cpBycpv(const scalar p, const scalar T) const +Foam::species::thermo::cpBycpv +( + const scalar p, + const scalar T +) const { - return Type >::cpBycpv(*this, p, T); + return Type >::cpBycpv(*this, p, T); } template class Type> inline Foam::scalar -Foam::specieThermo::es(const scalar p, const scalar T) const +Foam::species::thermo::es(const scalar p, const scalar T) const { return this->hs(p, T) - p*this->W()/this->rho(p, T); } @@ -157,7 +161,7 @@ Foam::specieThermo::es(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::ea(const scalar p, const scalar T) const +Foam::species::thermo::ea(const scalar p, const scalar T) const { return this->ha(p, T) - p*this->W()/this->rho(p, T); } @@ -165,7 +169,7 @@ Foam::specieThermo::ea(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::g(const scalar p, const scalar T) const +Foam::species::thermo::g(const scalar p, const scalar T) const { return this->ha(p, T) - T*this->s(p, T); } @@ -173,7 +177,7 @@ Foam::specieThermo::g(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::a(const scalar p, const scalar T) const +Foam::species::thermo::a(const scalar p, const scalar T) const { return this->ea(p, T) - T*this->s(p, T); } @@ -181,7 +185,7 @@ Foam::specieThermo::a(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::Cpv(const scalar p, const scalar T) const +Foam::species::thermo::Cpv(const scalar p, const scalar T) const { return this->cpv(p, T)/this->W(); } @@ -189,7 +193,7 @@ Foam::specieThermo::Cpv(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::Cp(const scalar p, const scalar T) const +Foam::species::thermo::Cp(const scalar p, const scalar T) const { return this->cp(p, T)/this->W(); } @@ -197,7 +201,7 @@ Foam::specieThermo::Cp(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::Cv(const scalar p, const scalar T) const +Foam::species::thermo::Cv(const scalar p, const scalar T) const { return this->cv(p, T)/this->W(); } @@ -205,15 +209,15 @@ Foam::specieThermo::Cv(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::HE(const scalar p, const scalar T) const +Foam::species::thermo::HE(const scalar p, const scalar T) const { - return Type >::HE(*this, p, T); + return Type >::HE(*this, p, T); } template class Type> inline Foam::scalar -Foam::specieThermo::H(const scalar p, const scalar T) const +Foam::species::thermo::H(const scalar p, const scalar T) const { return this->h(p, T)/this->W(); } @@ -221,7 +225,7 @@ Foam::specieThermo::H(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::Hs(const scalar p, const scalar T) const +Foam::species::thermo::Hs(const scalar p, const scalar T) const { return this->hs(p, T)/this->W(); } @@ -229,7 +233,7 @@ Foam::specieThermo::Hs(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::Hc() const +Foam::species::thermo::Hc() const { return this->hc()/this->W(); } @@ -237,7 +241,7 @@ Foam::specieThermo::Hc() const template class Type> inline Foam::scalar -Foam::specieThermo::Ha(const scalar p, const scalar T) const +Foam::species::thermo::Ha(const scalar p, const scalar T) const { return this->ha(p, T)/this->W(); } @@ -245,7 +249,7 @@ Foam::specieThermo::Ha(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::S(const scalar p, const scalar T) const +Foam::species::thermo::S(const scalar p, const scalar T) const { return this->s(p, T)/this->W(); } @@ -253,7 +257,7 @@ Foam::specieThermo::S(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::E(const scalar p, const scalar T) const +Foam::species::thermo::E(const scalar p, const scalar T) const { return this->e(p, T)/this->W(); } @@ -261,14 +265,14 @@ Foam::specieThermo::E(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::Es(const scalar p, const scalar T) const +Foam::species::thermo::Es(const scalar p, const scalar T) const { return this->es(p, T)/this->W(); } template class Type> inline Foam::scalar -Foam::specieThermo::Ea(const scalar p, const scalar T) const +Foam::species::thermo::Ea(const scalar p, const scalar T) const { return this->ea(p, T)/this->W(); } @@ -276,7 +280,7 @@ Foam::specieThermo::Ea(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::G(const scalar p, const scalar T) const +Foam::species::thermo::G(const scalar p, const scalar T) const { return this->g(p, T)/this->W(); } @@ -284,7 +288,7 @@ Foam::specieThermo::G(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::A(const scalar p, const scalar T) const +Foam::species::thermo::A(const scalar p, const scalar T) const { return this->a(p, T)/this->W(); } @@ -292,7 +296,7 @@ Foam::specieThermo::A(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::K(const scalar p, const scalar T) const +Foam::species::thermo::K(const scalar p, const scalar T) const { scalar arg = -this->nMoles()*this->g(p, T)/(this->RR*T); @@ -309,7 +313,7 @@ Foam::specieThermo::K(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::Kp(const scalar p, const scalar T) const +Foam::species::thermo::Kp(const scalar p, const scalar T) const { return K(p, T); } @@ -317,7 +321,7 @@ Foam::specieThermo::Kp(const scalar p, const scalar T) const template class Type> inline Foam::scalar -Foam::specieThermo::Kc(const scalar p, const scalar T) const +Foam::species::thermo::Kc(const scalar p, const scalar T) const { if (equal(this->nMoles(), SMALL)) { @@ -331,7 +335,7 @@ Foam::specieThermo::Kc(const scalar p, const scalar T) const template class Type> -inline Foam::scalar Foam::specieThermo::Kx +inline Foam::scalar Foam::species::thermo::Kx ( const scalar p, const scalar T @@ -349,7 +353,7 @@ inline Foam::scalar Foam::specieThermo::Kx template class Type> -inline Foam::scalar Foam::specieThermo::Kn +inline Foam::scalar Foam::species::thermo::Kn ( const scalar p, const scalar T, @@ -368,19 +372,19 @@ inline Foam::scalar Foam::specieThermo::Kn template class Type> -inline Foam::scalar Foam::specieThermo::THE +inline Foam::scalar Foam::species::thermo::THE ( const scalar he, const scalar p, const scalar T0 ) const { - return Type >::THE(*this, he, p, T0); + return Type >::THE(*this, he, p, T0); } template class Type> -inline Foam::scalar Foam::specieThermo::THs +inline Foam::scalar Foam::species::thermo::THs ( const scalar hs, const scalar p, @@ -392,15 +396,15 @@ inline Foam::scalar Foam::specieThermo::THs hs, p, T0, - &specieThermo::Hs, - &specieThermo::Cp, - &specieThermo::limit + &thermo::Hs, + &thermo::Cp, + &thermo::limit ); } template class Type> -inline Foam::scalar Foam::specieThermo::THa +inline Foam::scalar Foam::species::thermo::THa ( const scalar ht, const scalar p, @@ -412,15 +416,15 @@ inline Foam::scalar Foam::specieThermo::THa ht, p, T0, - &specieThermo::Ha, - &specieThermo::Cp, - &specieThermo::limit + &thermo::Ha, + &thermo::Cp, + &thermo::limit ); } template class Type> -inline Foam::scalar Foam::specieThermo::TEs +inline Foam::scalar Foam::species::thermo::TEs ( const scalar es, const scalar p, @@ -432,15 +436,15 @@ inline Foam::scalar Foam::specieThermo::TEs es, p, T0, - &specieThermo::Es, - &specieThermo::Cv, - &specieThermo::limit + &thermo::Es, + &thermo::Cv, + &thermo::limit ); } template class Type> -inline Foam::scalar Foam::specieThermo::TEa +inline Foam::scalar Foam::species::thermo::TEa ( const scalar e, const scalar p, @@ -452,9 +456,9 @@ inline Foam::scalar Foam::specieThermo::TEa ea, p, T0, - &specieThermo::Ea, - &specieThermo::Cv, - &specieThermo::limit + &thermo::Ea, + &thermo::Cv, + &thermo::limit ); } @@ -462,9 +466,9 @@ inline Foam::scalar Foam::specieThermo::TEa // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // template class Type> -inline void Foam::specieThermo::operator+= +inline void Foam::species::thermo::operator+= ( - const specieThermo& st + const thermo& st ) { Thermo::operator+=(st); @@ -472,9 +476,9 @@ inline void Foam::specieThermo::operator+= template class Type> -inline void Foam::specieThermo::operator-= +inline void Foam::species::thermo::operator-= ( - const specieThermo& st + const thermo& st ) { Thermo::operator-=(st); @@ -482,7 +486,7 @@ inline void Foam::specieThermo::operator-= template class Type> -inline void Foam::specieThermo::operator*=(const scalar s) +inline void Foam::species::thermo::operator*=(const scalar s) { Thermo::operator*=(s); } @@ -491,13 +495,13 @@ inline void Foam::specieThermo::operator*=(const scalar s) // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // template class Type> -inline Foam::specieThermo Foam::operator+ +inline Foam::species::thermo Foam::species::operator+ ( - const specieThermo& st1, - const specieThermo& st2 + const thermo& st1, + const thermo& st2 ) { - return specieThermo + return thermo ( static_cast(st1) + static_cast(st2) ); @@ -505,13 +509,13 @@ inline Foam::specieThermo Foam::operator+ template class Type> -inline Foam::specieThermo Foam::operator- +inline Foam::species::thermo Foam::species::operator- ( - const specieThermo& st1, - const specieThermo& st2 + const thermo& st1, + const thermo& st2 ) { - return specieThermo + return thermo ( static_cast(st1) - static_cast(st2) ); @@ -519,13 +523,13 @@ inline Foam::specieThermo Foam::operator- template class Type> -inline Foam::specieThermo Foam::operator* +inline Foam::species::thermo Foam::species::operator* ( const scalar s, - const specieThermo& st + const thermo& st ) { - return specieThermo + return thermo ( s*static_cast(st) ); @@ -533,10 +537,10 @@ inline Foam::specieThermo Foam::operator* template class Type> -inline Foam::specieThermo Foam::operator== +inline Foam::species::thermo Foam::species::operator== ( - const specieThermo& st1, - const specieThermo& st2 + const thermo& st1, + const thermo& st2 ) { return st2 - st1; diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties index 54e0f6603c..d7a6a98dfe 100644 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heheuReactionThermo,absoluteEnthalpy>>>>; +thermoType heheuReactionThermo,absoluteEnthalpy>>>; stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.5776; diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties index 0d6480a485..b622e094b3 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heheuReactionThermo,absoluteEnthalpy>>>>; +thermoType heheuReactionThermo,absoluteEnthalpy>>>; stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675; diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties index 531e298a20..361194ecf7 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heheuReactionThermo,absoluteEnthalpy>>>>; +thermoType heheuReactionThermo,absoluteEnthalpy>>>; stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336; diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties index a70c4ca65c..abe95b22c9 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo,sensibleEnthalpy>>>>>; +thermoType heSolidThermo,sensibleEnthalpy>>>>; solidComponents ( diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties index 3d2695dfcd..97dd3d9c55 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; mixture { diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties index 89b923d01f..133d8db277 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; mixture { diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties index c61c83d6bd..ab2183b98c 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; // Note: these are the properties for a "normalised" inviscid gas // for which the speed of sound is 1 m/s at a temperature of 1K diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties index a228ce4a4f..491dee4349 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; mixture { diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties index 7518beeead..20c4bf562a 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; mixture { diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties index a228ce4a4f..491dee4349 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; mixture { diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties index b2540e3d91..fbeb00f80a 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleEnthalpy>>>>; +thermoType hePsiThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties index fa673b9a4d..ac8b4bff37 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleEnthalpy>>>>; +thermoType hePsiThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties index 58aeb4d4fd..30f563b195 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleEnthalpy>>>>; +thermoType hePsiThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties index fa673b9a4d..ac8b4bff37 100644 --- a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleEnthalpy>>>>; +thermoType hePsiThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties index fa673b9a4d..ac8b4bff37 100644 --- a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleEnthalpy>>>>; +thermoType hePsiThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties index a95c522360..58880fac6e 100644 --- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleEnthalpy>>>>; +thermoType hePsiThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties index abc41fb6ce..3b8fb8c661 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleInternalEnergy>>>>; +thermoType heRhoThermo,sensibleInternalEnergy>>>; mixture { diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties index 1523354896..48d08d0263 100644 --- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; mixture { diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties index c61c83d6bd..ab2183b98c 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; // Note: these are the properties for a "normalised" inviscid gas // for which the speed of sound is 1 m/s at a temperature of 1K diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties index f409900f93..4aeb09471a 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; mixture { diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties index e2a0824661..7a1082d216 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; mixture { diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties index e2a0824661..7a1082d216 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleInternalEnergy>>>>; +thermoType hePsiThermo,sensibleInternalEnergy>>>; mixture { diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties index 410aa5f42a..dcbf833e28 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties @@ -15,8 +15,8 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; -//thermoType heRhoThermo,sensibleInternalEnergy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; +//thermoType heRhoThermo,sensibleInternalEnergy>>>; pRef 100000; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties index 75386e7394..8e834a9acd 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleEnthalpy>>>>; +thermoType hePsiThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties index 75386e7394..8e834a9acd 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleEnthalpy>>>>; +thermoType hePsiThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion index 5657d6092f..eb9d296c12 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion @@ -110,7 +110,7 @@ dictionaryReplacement // Solid thermo - thermoType heSolidThermo,sensibleEnthalpy>>>>>; + thermoType heSolidThermo,sensibleEnthalpy>>>>; mixture diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties index d823a33411..345a7b7573 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// thermoType hePsiThermo,sensibleEnthalpy>>>>; +// thermoType hePsiThermo,sensibleEnthalpy>>>; thermoType { diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties index 521cf3b421..b61f3fe303 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleEnthalpy>>>>; +thermoType hePsiThermo,sensibleEnthalpy>>>; pRef 100000; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties index 521cf3b421..b61f3fe303 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo,sensibleEnthalpy>>>>; +thermoType hePsiThermo,sensibleEnthalpy>>>; pRef 100000; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties index 75cf8a4016..0eaa169eb1 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties index cdcb5bdf49..700acaa920 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo,sensibleEnthalpy>>>>>; +thermoType heSolidThermo,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties deleted file mode 120000 index dc4d3a18ee..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties +++ /dev/null @@ -1 +0,0 @@ -../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties new file mode 100644 index 0000000000..700acaa920 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -0,0 +1,120 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType heSolidThermo,sensibleEnthalpy>>>>; + +mixture +{ + specie + { + nMoles 1; + molWeight 12; + } + + transport + { + kappa 80; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 450; + } + + equationOfState + { + rho 8000; + } +} + +solidComponents +( + pmma char +); + +pmmaCoeffs +{ + specie + { + nMoles 1; + molWeight 100; + } + + transport + { + kappa 0.152; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.1; + } + + thermodynamics + { + Hf 0; + Cp 1462; + } + + equationOfState + { + rho 1114.0; + } +} + +charCoeffs +{ + specie + { + nMoles 1; + molWeight 50; + } + transport + { + kappa 0.4; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 611.0; + } + + equationOfState + { + rho 11.5; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties deleted file mode 120000 index dc4d3a18ee..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties +++ /dev/null @@ -1 +0,0 @@ -../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties new file mode 100644 index 0000000000..700acaa920 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -0,0 +1,120 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType heSolidThermo,sensibleEnthalpy>>>>; + +mixture +{ + specie + { + nMoles 1; + molWeight 12; + } + + transport + { + kappa 80; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 450; + } + + equationOfState + { + rho 8000; + } +} + +solidComponents +( + pmma char +); + +pmmaCoeffs +{ + specie + { + nMoles 1; + molWeight 100; + } + + transport + { + kappa 0.152; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.1; + } + + thermodynamics + { + Hf 0; + Cp 1462; + } + + equationOfState + { + rho 1114.0; + } +} + +charCoeffs +{ + specie + { + nMoles 1; + molWeight 50; + } + transport + { + kappa 0.4; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 611.0; + } + + equationOfState + { + rho 11.5; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties index 18f002136a..27d3b23a53 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties index 3bbae32113..cb1219452b 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties index 15b8d00f3d..aea71ab435 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo,sensibleEnthalpy>>>>>; +thermoType heSolidThermo,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties deleted file mode 120000 index dc4d3a18ee..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties +++ /dev/null @@ -1 +0,0 @@ -../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties new file mode 100644 index 0000000000..aea71ab435 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties @@ -0,0 +1,121 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType heSolidThermo,sensibleEnthalpy>>>>; + +mixture +{ + specie + { + nMoles 1; + molWeight 12; + } + + transport + { + kappa 80; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 450; + } + + equationOfState + { + rho 8000; + } +} + +solidComponents +( + pmma char +); + +pmmaCoeffs +{ + specie + { + nMoles 1; + molWeight 100; + } + + transport + { + kappa 0.152; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.1; + } + + thermodynamics + { + Hf 0; + Cp 1462; + } + + equationOfState + { + rho 1114.0; + } +} + +charCoeffs +{ + specie + { + nMoles 1; + molWeight 50; + } + + transport + { + kappa 0.4; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 611.0; + } + + equationOfState + { + rho 11.5; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties deleted file mode 120000 index dc4d3a18ee..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties +++ /dev/null @@ -1 +0,0 @@ -../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties new file mode 100644 index 0000000000..aea71ab435 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties @@ -0,0 +1,121 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType heSolidThermo,sensibleEnthalpy>>>>; + +mixture +{ + specie + { + nMoles 1; + molWeight 12; + } + + transport + { + kappa 80; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 450; + } + + equationOfState + { + rho 8000; + } +} + +solidComponents +( + pmma char +); + +pmmaCoeffs +{ + specie + { + nMoles 1; + molWeight 100; + } + + transport + { + kappa 0.152; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.1; + } + + thermodynamics + { + Hf 0; + Cp 1462; + } + + equationOfState + { + rho 1114.0; + } +} + +charCoeffs +{ + specie + { + nMoles 1; + molWeight 50; + } + + transport + { + kappa 0.4; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 611.0; + } + + equationOfState + { + rho 11.5; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties index 18f002136a..27d3b23a53 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties index 75cf8a4016..0eaa169eb1 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties index 15b8d00f3d..aea71ab435 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo,sensibleEnthalpy>>>>>; +thermoType heSolidThermo,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties deleted file mode 120000 index dc4d3a18ee..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties +++ /dev/null @@ -1 +0,0 @@ -../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties new file mode 100644 index 0000000000..aea71ab435 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -0,0 +1,121 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType heSolidThermo,sensibleEnthalpy>>>>; + +mixture +{ + specie + { + nMoles 1; + molWeight 12; + } + + transport + { + kappa 80; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 450; + } + + equationOfState + { + rho 8000; + } +} + +solidComponents +( + pmma char +); + +pmmaCoeffs +{ + specie + { + nMoles 1; + molWeight 100; + } + + transport + { + kappa 0.152; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.1; + } + + thermodynamics + { + Hf 0; + Cp 1462; + } + + equationOfState + { + rho 1114.0; + } +} + +charCoeffs +{ + specie + { + nMoles 1; + molWeight 50; + } + + transport + { + kappa 0.4; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 611.0; + } + + equationOfState + { + rho 11.5; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties deleted file mode 120000 index dc4d3a18ee..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties +++ /dev/null @@ -1 +0,0 @@ -../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties new file mode 100644 index 0000000000..aea71ab435 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -0,0 +1,121 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType heSolidThermo,sensibleEnthalpy>>>>; + +mixture +{ + specie + { + nMoles 1; + molWeight 12; + } + + transport + { + kappa 80; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 450; + } + + equationOfState + { + rho 8000; + } +} + +solidComponents +( + pmma char +); + +pmmaCoeffs +{ + specie + { + nMoles 1; + molWeight 100; + } + + transport + { + kappa 0.152; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.1; + } + + thermodynamics + { + Hf 0; + Cp 1462; + } + + equationOfState + { + rho 1114.0; + } +} + +charCoeffs +{ + specie + { + nMoles 1; + molWeight 50; + } + + transport + { + kappa 0.4; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 611.0; + } + + equationOfState + { + rho 11.5; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties index 18f002136a..27d3b23a53 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties index 75cf8a4016..0eaa169eb1 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties index 15b8d00f3d..aea71ab435 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo,sensibleEnthalpy>>>>>; +thermoType heSolidThermo,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties deleted file mode 120000 index dc4d3a18ee..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties +++ /dev/null @@ -1 +0,0 @@ -../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties new file mode 100644 index 0000000000..aea71ab435 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -0,0 +1,121 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType heSolidThermo,sensibleEnthalpy>>>>; + +mixture +{ + specie + { + nMoles 1; + molWeight 12; + } + + transport + { + kappa 80; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 450; + } + + equationOfState + { + rho 8000; + } +} + +solidComponents +( + pmma char +); + +pmmaCoeffs +{ + specie + { + nMoles 1; + molWeight 100; + } + + transport + { + kappa 0.152; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.1; + } + + thermodynamics + { + Hf 0; + Cp 1462; + } + + equationOfState + { + rho 1114.0; + } +} + +charCoeffs +{ + specie + { + nMoles 1; + molWeight 50; + } + + transport + { + kappa 0.4; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 611.0; + } + + equationOfState + { + rho 11.5; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties deleted file mode 120000 index dc4d3a18ee..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties +++ /dev/null @@ -1 +0,0 @@ -../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties new file mode 100644 index 0000000000..aea71ab435 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -0,0 +1,121 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType heSolidThermo,sensibleEnthalpy>>>>; + +mixture +{ + specie + { + nMoles 1; + molWeight 12; + } + + transport + { + kappa 80; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 450; + } + + equationOfState + { + rho 8000; + } +} + +solidComponents +( + pmma char +); + +pmmaCoeffs +{ + specie + { + nMoles 1; + molWeight 100; + } + + transport + { + kappa 0.152; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.1; + } + + thermodynamics + { + Hf 0; + Cp 1462; + } + + equationOfState + { + rho 1114.0; + } +} + +charCoeffs +{ + specie + { + nMoles 1; + molWeight 50; + } + + transport + { + kappa 0.4; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 611.0; + } + + equationOfState + { + rho 11.5; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties index 18f002136a..27d3b23a53 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties index 75cf8a4016..0eaa169eb1 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties index 5008ddbceb..fa34c319f5 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heSolidThermo,sensibleEnthalpy>>>>>; +thermoType heSolidThermo,sensibleEnthalpy>>>>; mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties deleted file mode 120000 index dc4d3a18ee..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties +++ /dev/null @@ -1 +0,0 @@ -../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties new file mode 100644 index 0000000000..fa34c319f5 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties @@ -0,0 +1,121 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType heSolidThermo,sensibleEnthalpy>>>>; + +mixture +{ + specie + { + nMoles 1; + molWeight 12; + } + + transport + { + kappa 80; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.5; + } + + thermodynamics + { + Hf 0; + Cp 450; + } + + equationOfState + { + rho 8000; + } +} + +solidComponents +( + pmma char +); + +pmmaCoeffs +{ + specie + { + nMoles 1; + molWeight 100; + } + + transport + { + kappa 0.152; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.1; + } + + thermodynamics + { + Hf 0; + Cp 1462; + } + + equationOfState + { + rho 1114.0; + } +} + +charCoeffs +{ + specie + { + nMoles 1; + molWeight 50; + } + + transport + { + kappa 0.4; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 611.0; + } + + equationOfState + { + rho 11.5; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties deleted file mode 120000 index dc4d3a18ee..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties +++ /dev/null @@ -1 +0,0 @@ -../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties new file mode 100644 index 0000000000..fa34c319f5 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties @@ -0,0 +1,121 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType heSolidThermo,sensibleEnthalpy>>>>; + +mixture +{ + specie + { + nMoles 1; + molWeight 12; + } + + transport + { + kappa 80; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.5; + } + + thermodynamics + { + Hf 0; + Cp 450; + } + + equationOfState + { + rho 8000; + } +} + +solidComponents +( + pmma char +); + +pmmaCoeffs +{ + specie + { + nMoles 1; + molWeight 100; + } + + transport + { + kappa 0.152; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.1; + } + + thermodynamics + { + Hf 0; + Cp 1462; + } + + equationOfState + { + rho 1114.0; + } +} + +charCoeffs +{ + specie + { + nMoles 1; + molWeight 50; + } + + transport + { + kappa 0.4; + } + + radiation + { + sigmaS 0.0; + kappaRad 0.0; + emissivity 0.0; + } + + thermodynamics + { + Hf 0; + Cp 611.0; + } + + equationOfState + { + rho 11.5; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties index 18f002136a..27d3b23a53 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo,sensibleEnthalpy>>>>; +thermoType heRhoThermo,sensibleEnthalpy>>>; mixture {