From 708743752a6a10f468775f74195f2613857a69ad Mon Sep 17 00:00:00 2001 From: sergio Date: Thu, 1 Nov 2012 17:46:37 +0000 Subject: [PATCH] Solving problem with sampledSurfaces Removing specieSolid specialization Updating tutorials using solidThermo and solid reactions --- src/regionModels/pyrolysisModels/Make/options | 3 +- .../thermoBaffleModels/Make/options | 1 - .../sampledSurfaces/sampledSurfaces.C | 22 +-- .../sampledSurfaces/sampledSurfaces.H | 2 +- .../sampledSurfacesTemplates.C | 23 ++- .../reactionThermo/Make/options | 3 +- .../multiComponentMixture.C | 27 +--- .../solidChemistryModel/Make/options | 3 +- .../ODESolidChemistryModel.C | 4 - .../solidSpecie/Make/files | 1 - .../include/solidThermoPhysicsTypes.H | 6 +- .../solidSpecie/solidSpecie/solidSpecie.C | 65 -------- .../solidSpecie/solidSpecie/solidSpecie.H | 148 ------------------ .../solidSpecie/solidSpecie/solidSpecieI.H | 148 ------------------ .../solidReactionThermos.C | 6 +- .../solidThermo/solidThermo/solidThermos.C | 8 +- .../reaction/Reactions/Reaction/Reaction.C | 4 +- .../reaction/Reactions/Reaction/ReactionI.H | 55 +------ ...peratureThermoBaffle1DFvPatchScalarField.C | 4 +- ...peratureThermoBaffle1DFvPatchScalarField.H | 8 - .../les/oppositeBurningPanels/0/panelRegion/T | 2 +- .../0/panelRegion/{v => wood} | 2 +- .../constant/panelRegion/reactions | 4 +- .../constant/panelRegion/thermo.solid | 8 +- .../panelRegion/thermophysicalProperties | 2 +- .../constant/radiationProperties | 6 +- .../oppositeBurningPanels/system/controlDict | 6 +- .../system/changeDictionaryDict.baffleRegion | 2 +- .../multiRegionHeater/0/char | 30 ---- .../multiRegionHeater/0/pmma | 30 ---- .../multiRegionHeater/Allrun | 5 - .../constant/heater/thermophysicalProperties | 59 +------ .../leftSolid/thermophysicalProperties | 108 +------------ .../rightSolid/thermophysicalProperties | 107 +------------ .../multiRegionLiquidHeater/Allrun | 5 - .../constant/heater/thermophysicalProperties | 58 +------ .../leftSolid/thermophysicalProperties | 110 +------------ .../rightSolid/thermophysicalProperties | 110 +------------ .../snappyMultiRegionHeater/0/Ychar | 30 ---- .../snappyMultiRegionHeater/0/Ypmma | 30 ---- .../snappyMultiRegionHeater/Allrun | 5 - .../constant/heater/thermophysicalProperties | 58 +------ .../leftSolid/thermophysicalProperties | 110 +------------ .../rightSolid/thermophysicalProperties | 110 +------------ .../multiRegionHeater/0/Ychar | 30 ---- .../multiRegionHeater/0/Ypmma | 30 ---- .../multiRegionHeater/Allclean | 2 +- .../multiRegionHeater/Allrun | 6 - .../constant/heater/thermophysicalProperties | 58 +------ .../leftSolid/thermophysicalProperties | 110 +------------ .../rightSolid/thermophysicalProperties | 110 +------------ .../multiRegionHeaterRadiation/0/Ychar | 30 ---- .../multiRegionHeaterRadiation/0/Ypmma | 30 ---- .../multiRegionHeaterRadiation/Allrun | 6 - .../constant/heater/thermophysicalProperties | 58 +------ .../leftSolid/thermophysicalProperties | 110 +------------ .../rightSolid/thermophysicalProperties | 110 +------------ 57 files changed, 95 insertions(+), 2133 deletions(-) delete mode 100644 src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecie.C delete mode 100644 src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecie.H delete mode 100644 src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecieI.H rename tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/{v => wood} (98%) delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/char delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pmma mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Ychar delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Ypmma mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties delete mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Ychar delete mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Ypmma mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties delete mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Ychar delete mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Ypmma mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties diff --git a/src/regionModels/pyrolysisModels/Make/options b/src/regionModels/pyrolysisModels/Make/options index e80fe3d1a2..ff86d012ac 100644 --- a/src/regionModels/pyrolysisModels/Make/options +++ b/src/regionModels/pyrolysisModels/Make/options @@ -3,7 +3,6 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solid/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \ @@ -21,9 +20,9 @@ LIB_LIBS = \ -lmeshTools \ -lchemistryModel \ -lspecie \ - -lsolidSpecie \ -lfluidThermophysicalModels \ -lsolidChemistryModel \ + -lsolidThermo \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ -lcompressibleLESModels \ diff --git a/src/regionModels/thermoBaffleModels/Make/options b/src/regionModels/thermoBaffleModels/Make/options index a36d8a5bb7..2c0e2cf57c 100644 --- a/src/regionModels/thermoBaffleModels/Make/options +++ b/src/regionModels/thermoBaffleModels/Make/options @@ -17,5 +17,4 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lOpenFOAM \ - -lsolidSpecie \ -lradiationModels diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C index bb814f2628..6287722ae5 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C @@ -164,17 +164,19 @@ void Foam::sampledSurfaces::write() writeGeometry(); } - sampleAndWrite(mesh_); - sampleAndWrite(mesh_); - sampleAndWrite(mesh_); - sampleAndWrite(mesh_); - sampleAndWrite(mesh_); + const IOobjectList objects(mesh_, mesh_.time().timeName()); - sampleAndWrite(mesh_); - sampleAndWrite(mesh_); - sampleAndWrite(mesh_); - sampleAndWrite(mesh_); - sampleAndWrite(mesh_); + sampleAndWrite(objects); + sampleAndWrite(objects); + sampleAndWrite(objects); + sampleAndWrite(objects); + sampleAndWrite(objects); + + sampleAndWrite(objects); + sampleAndWrite(objects); + sampleAndWrite(objects); + sampleAndWrite(objects); + sampleAndWrite(objects); } } diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H index 15e34a7983..f16a2ceabf 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H @@ -160,7 +160,7 @@ class sampledSurfaces //- Sample and write all sampled fields template - void sampleAndWrite(const fvMesh&); + void sampleAndWrite(const IOobjectList&); //- Disallow default bitwise copy construct and assignment sampledSurfaces(const sampledSurfaces&); diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C index f85f0e155d..5693f76458 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C @@ -166,13 +166,18 @@ void Foam::sampledSurfaces::sampleAndWrite template -void Foam::sampledSurfaces::sampleAndWrite(const fvMesh& mesh) +void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& allObjects) { forAll (fieldSelection_, fieldI) { const wordRe field = fieldSelection_[fieldI]; + IOobject* fieldIOPtr = allObjects.lookup(field); - if (mesh.thisDb().foundObject(field)) + if + ( + fieldIOPtr != NULL + && fieldIOPtr->headerClassName() == GeoField::typeName + ) { if (Pstream::master() && verbose_) { @@ -181,10 +186,18 @@ void Foam::sampledSurfaces::sampleAndWrite(const fvMesh& mesh) if (loadFromFiles_) { - const GeoField& geoField = - mesh.thisDb().lookupObject(field); + const GeoField geoField + ( + IOobject + ( + field, + mesh_.time().timeName(), + mesh_, + IOobject::MUST_READ + ), + mesh_ + ); - const_cast(geoField).readOpt() = IOobject::MUST_READ; sampleAndWrite(geoField); } else diff --git a/src/thermophysicalModels/reactionThermo/Make/options b/src/thermophysicalModels/reactionThermo/Make/options index 559f714bc0..1758b4921e 100644 --- a/src/thermophysicalModels/reactionThermo/Make/options +++ b/src/thermophysicalModels/reactionThermo/Make/options @@ -2,7 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude + -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -10,4 +10,5 @@ LIB_LIBS = \ -lfiniteVolume \ -lfluidThermophysicalModels \ -lspecie \ + -lsolidSpecie \ -lmeshTools diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C index 71022b1360..dbdc804d8b 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C @@ -165,20 +165,12 @@ const ThermoType& Foam::multiComponentMixture::cellVolMixture } mixtureVol_ = - Y_[0][celli] - / speciesData_[0].rho(p, T) - / rhoInv - / speciesData_[0].W() - * speciesData_[0]; + Y_[0][celli]/speciesData_[0].rho(p, T)/rhoInv*speciesData_[0]; for (label n=1; n ( "thermophysicalProperties" -<<<<<<< HEAD ).subDict(pyrolisisGases_[gasI]); -======= - ).subDict(pyrolisisGases_[gasI] + "Coeffs"); ->>>>>>> 6389bd9649619832d64fcbf6a12a0ec6b8aab09a gasThermo_.set ( diff --git a/src/thermophysicalModels/solidSpecie/Make/files b/src/thermophysicalModels/solidSpecie/Make/files index 1d1c93d3af..403c148358 100644 --- a/src/thermophysicalModels/solidSpecie/Make/files +++ b/src/thermophysicalModels/solidSpecie/Make/files @@ -1,4 +1,3 @@ -solidSpecie/solidSpecie.C reaction/reactions/makeSolidReactions.C LIB = $(FOAM_LIBBIN)/libsolidSpecie diff --git a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H index 03c9832a7b..c1269e8000 100644 --- a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H +++ b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H @@ -32,7 +32,7 @@ Description #ifndef solidThermoPhysicsTypes_H #define solidThermoPhysicsTypes_H -#include "solidSpecie.H" +#include "specie.H" #include "rhoConst.H" #include "hConstThermo.H" #include "hExponentialThermo.H" @@ -53,7 +53,7 @@ namespace Foam < hConstThermo < - rhoConst + rhoConst >, sensibleEnthalpy > @@ -67,7 +67,7 @@ namespace Foam < hExponentialThermo < - rhoConst + rhoConst >, sensibleEnthalpy > diff --git a/src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecie.C b/src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecie.C deleted file mode 100644 index bc7c7eb00c..0000000000 --- a/src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecie.C +++ /dev/null @@ -1,65 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "solidSpecie.H" -#include "IOstreams.H" - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::solidSpecie::solidSpecie(const dictionary& dict) -: - specie - ( - dict.dictName(), - readScalar(dict.subDict("solidSpecie").lookup("nMoles")), - scalar(1.0) - ) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -void Foam::solidSpecie::write(Ostream& os) const -{ - dictionary dict("solidSpecie"); - dict.add("nMoles", nMoles()); - os << indent << dict.dictName() << dict; -} - - -// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // - -Foam::Ostream& Foam::operator<<(Ostream& os, const solidSpecie& st) -{ - os << st.name() << tab - << st.nMoles(); - - os.check("Ostream& operator<<(Ostream& os, const solidSpecie& st)"); - return os; -} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecie.H b/src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecie.H deleted file mode 100644 index 6f53ab6f21..0000000000 --- a/src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecie.H +++ /dev/null @@ -1,148 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::solidSpecie - -Description - Base class of the solid thermophysical property types. - -SourceFiles - solidSpecieI.H - solidSpecie.C - -\*---------------------------------------------------------------------------*/ - -#ifndef solidSpecie_H -#define solidSpecie_H - -#include "word.H" -#include "scalar.H" -#include "dictionary.H" -#include "specie.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -class Istream; -class Ostream; - -/*---------------------------------------------------------------------------*\ - Class solidSpecie Declaration -\*---------------------------------------------------------------------------*/ - -class solidSpecie -: - public specie -{ - - // Private Member Functions - - //- Construct from components without name - inline solidSpecie(const scalar nMoles, const scalar molWeight); - - -public: - - //- Runtime type information - ClassName("solidSpecie"); - - - // Constructors - - //- Construct from components with name - inline solidSpecie - ( - const word& name, - const scalar nMoles, - const scalar molWeight - ); - - //- Construct as copy - inline solidSpecie(const solidSpecie&); - - //- Construct as named copy - inline solidSpecie(const word& name, const solidSpecie&); - - //- Construct from dictionary - solidSpecie(const dictionary& dict); - - - // Member Functions - - - // I-O - - //- Write to Ostream - void write(Ostream& os) const; - - - // Member operators - - inline void operator=(const solidSpecie&); - - inline void operator+=(const solidSpecie&); - inline void operator-=(const solidSpecie&); - - inline void operator*=(const scalar); - - - // Friend operators - - inline friend solidSpecie operator+ - ( - const solidSpecie&, const solidSpecie& - ); - inline friend solidSpecie operator- - ( - const solidSpecie&, const solidSpecie& - ); - - inline friend solidSpecie operator*(const scalar, const solidSpecie&); - - inline friend solidSpecie operator== - ( - const solidSpecie&, const solidSpecie& - ); - - // Ostream Operator - - friend Ostream& operator<<(Ostream&, const solidSpecie&); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "solidSpecieI.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecieI.H b/src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecieI.H deleted file mode 100644 index b56b25a7d1..0000000000 --- a/src/thermophysicalModels/solidSpecie/solidSpecie/solidSpecieI.H +++ /dev/null @@ -1,148 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "solidSpecie.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -inline solidSpecie::solidSpecie -( - const word& name, - const scalar nMoles, - const scalar molWeight -) -: - specie(name, nMoles, scalar(1)) -{} - - -inline solidSpecie::solidSpecie -( - const scalar nMoles, const scalar molWeight -) -: - specie(nMoles, molWeight) -{} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -inline solidSpecie::solidSpecie(const solidSpecie& st) -: - specie(st.name(), st.nMoles(), scalar(1)) -{} - - -inline solidSpecie::solidSpecie(const word& name, const solidSpecie& st) -: - specie(name, st.nMoles(), scalar(1)) -{} - - -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -inline void solidSpecie::operator=(const solidSpecie& st) -{ - specie::operator=(st); -} - - -inline void solidSpecie::operator+=(const solidSpecie& st) -{ - specie::operator+=(st); -} - - -inline void solidSpecie::operator-=(const solidSpecie& st) -{ - specie::operator-=(st); -} - - -inline void solidSpecie::operator*=(const scalar s) -{ - specie::operator*=(s); -} - - -// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // - -inline solidSpecie operator+(const solidSpecie& st1, const solidSpecie& st2) -{ - - scalar sumNmoles = max(st1.nMoles() + st2.nMoles(), SMALL); - - return solidSpecie - ( - sumNmoles, - st1.nMoles()/sumNmoles*st1.W() - + st2.nMoles()/sumNmoles*st2.W() - ); -} - - -inline solidSpecie operator-(const solidSpecie& st1, const solidSpecie& st2) -{ - scalar diffNmoles = st1.nMoles() - st2.nMoles(); - if (mag(diffNmoles) < SMALL) - { - diffNmoles = SMALL; - } - - return solidSpecie - ( - diffNmoles, - st1.nMoles()/diffNmoles*st1.W() - - st2.nMoles()/diffNmoles*st2.W() - ); -} - - -inline solidSpecie operator*(const scalar s, const solidSpecie& st) -{ - return solidSpecie - ( - s*st.nMoles(), - st.W() - ); -} - - -inline solidSpecie operator==(const solidSpecie& st1, const solidSpecie& st2) -{ - return st2 - st1; -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C index fcd0f7def6..e3a95e079c 100644 --- a/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C +++ b/src/thermophysicalModels/solidThermo/solidReactionThermo/solidReactionThermos.C @@ -27,7 +27,7 @@ License #include "solidReactionThermo.H" #include "heSolidThermo.H" -#include "solidSpecie.H" +#include "specie.H" #include "rhoConst.H" #include "hConstThermo.H" #include "hExponentialThermo.H" @@ -58,7 +58,7 @@ makeReactingSolidThermo sensibleEnthalpy, hConstThermo, rhoConst, - solidSpecie + specie ); @@ -71,7 +71,7 @@ makeReactingSolidThermo sensibleEnthalpy, hConstThermo, rhoConst, - solidSpecie + specie ); diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C index 2461ed3b39..6814431fec 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C @@ -27,7 +27,7 @@ License #include "solidThermo.H" #include "heSolidThermo.H" -#include "solidSpecie.H" +#include "specie.H" #include "rhoConst.H" #include "hConstThermo.H" #include "hExponentialThermo.H" @@ -56,7 +56,7 @@ makeSolidThermo sensibleEnthalpy, hConstThermo, rhoConst, - solidSpecie + specie ); makeSolidThermo @@ -68,7 +68,7 @@ makeSolidThermo sensibleEnthalpy, hConstThermo, rhoConst, - solidSpecie + specie ); makeSolidThermo @@ -80,7 +80,7 @@ makeSolidThermo sensibleEnthalpy, hExponentialThermo, rhoConst, - solidSpecie + specie ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C index 1bba6b02a1..8f2c39c37e 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C @@ -75,7 +75,7 @@ Foam::string Foam::Reaction::reactionStr() const { reaction << glhs()[i].stoichCoeff; } - reaction << species_[glhs()[i].index]; + reaction << gasSpecies()[glhs()[i].index]; if (mag(glhs()[i].exponent - glhs()[i].stoichCoeff) > SMALL) { reaction << "^" << glhs()[i].exponent; @@ -113,7 +113,7 @@ Foam::string Foam::Reaction::reactionStr() const { reaction << grhs()[i].stoichCoeff; } - reaction << species_[grhs()[i].index]; + reaction << gasSpecies()[grhs()[i].index]; if (mag(grhs()[i].exponent - grhs()[i].stoichCoeff) > SMALL) { reaction << "^" << grhs()[i].exponent; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H index ce16df4607..7e380b4c80 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H @@ -67,60 +67,9 @@ Reaction::rhs() const template inline Ostream& operator<<(Ostream& os, const Reaction& r) { - //os.writeKeyword("reaction") - // << r.reactionStr()<< token::END_STATEMENT <::specieCoeffs& sc = r.lhs_[i]; - - if (sc.stoichCoeff != 1) - { - os << sc.stoichCoeff; - } - - os << r.species_[sc.index]; - - if (sc.exponent != sc.stoichCoeff) - { - os << '^' << sc.exponent; - } - - if (i < r.lhs_.size() - 1) - { - os << " + "; - } - } - - os << " = "; - - forAll(r.rhs_, i) - { - const typename Reaction::specieCoeffs& sc = r.rhs_[i]; - - if (sc.stoichCoeff != 1) - { - os << sc.stoichCoeff; - } - - os << r.species_[sc.index]; - - if (sc.exponent != sc.stoichCoeff) - { - os << '^' << sc.exponent; - } - - if (i < r.rhs_.size() - 1) - { - os << " + "; - } - } - - os << endl << " "; - - return os; + return os; } diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C index e33fa644c2..5d39d5e40f 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C @@ -269,11 +269,11 @@ void temperatureThermoBaffle1DFvPatchScalarField::updateCoeffs() tmp tKDeltaw(new scalarField(patch().size())); scalarField KDeltaw = tKDeltaw(); - // Create fields for solid properties + // Create fields for solid properties (p paramater not used) forAll(KDeltaw, i) { KDeltaw[i] = - solidPtr_().kappa((Tp[i] + nbrTw[i])/2.0)/thickness_[i]; + solidPtr_().kappa(0.0, (Tp[i] + nbrTw[i])/2.0)/thickness_[i]; } const scalarField q diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H index 524fb9c95a..8708bd125c 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H @@ -74,14 +74,6 @@ class temperatureThermoBaffle1DFvPatchScalarField autoPtr solidPtr_; - // Private Member Functions - - scalar kappa(const scalar T) const - { - return solidPtr_().kappa(T); - } - - public: //- Runtime type information diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T index 206213b373..900fa3ae76 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T @@ -17,7 +17,7 @@ FoamFile dimensions [0 0 0 1 0 0 0]; -internalField uniform 500;//298.15; +internalField uniform 298.15; boundaryField { diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/v b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/wood similarity index 98% rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/v rename to tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/wood index b17370ba93..4b30182d37 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/v +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/wood @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object v; + object wood; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/reactions b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/reactions index ea48245682..ee8b4281db 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/reactions +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/reactions @@ -1,6 +1,6 @@ species ( - v + wood char ); @@ -14,7 +14,7 @@ reactions charReaction { type irreversibleArrheniusSolidReaction; - reaction "v^4.86 = char + gas"; + reaction "wood^4.86 = char + gas"; A 7.83e10; Ta 15274.57; Tcrit 400; diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid index baa3f82aa9..a4b2c48134 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid @@ -15,11 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -v +wood { - solidSpecie + specie { nMoles 1; + molWeight 100; } transport { @@ -38,9 +39,10 @@ v char { - solidSpecie + specie { nMoles 1; + molWeight 50; } transport { diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties index 459529ddfa..a4d89de8c3 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties @@ -21,7 +21,7 @@ thermoType transport constIso; thermo hConst; equationOfState rhoConst; - specie solidSpecie; + specie specie; energy sensibleEnthalpy; } diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties index f9b2dc1f9a..89ee652071 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties @@ -16,6 +16,8 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +radiation on; + radiationModel fvDOM; fvDOMCoeffs @@ -50,7 +52,7 @@ greyMeanAbsorptionEmissionCoeffs Tcommon 300; //Common Temp invTemp true; //Is the polynomio using inverse temperature. Tlow 200; //Low Temp - Thigh 2000; //High Temp + Thigh 2500; //High Temp loTcoeffs //coefss for T < Tcommon ( @@ -78,7 +80,7 @@ greyMeanAbsorptionEmissionCoeffs Tcommon 300; invTemp true; Tlow 200; - Thigh 2000; + Thigh 2500; loTcoeffs ( diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict index fb42599578..3efab07aeb 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict @@ -16,19 +16,19 @@ FoamFile application fireFoam; -startFrom latestTime; +startFrom startTime; startTime 0; stopAt endTime; -endTime 15; +endTime 5; deltaT 0.03; writeControl adjustableRunTime; -writeInterval 1 +writeInterval 1; purgeWrite 0; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion index d31d4d8771..19685510bf 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion @@ -111,7 +111,7 @@ dictionaryReplacement thermoType { type heSolidThermo; - mixture pureSolidMixture; + mixture pureMixture; transport constIso; thermo hConst; equationOfState rhoConst; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/char b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/char deleted file mode 100644 index 95625c5217..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/char +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- 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 volScalarField; - object Tchar; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.5; - -boundaryField -{ - ".*" - { - type calculated; - value uniform 0.5; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pmma b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pmma deleted file mode 100644 index c2a485aeac..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pmma +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- 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 volScalarField; - object Ypmma; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.5; - -boundaryField -{ - ".*" - { - type calculated; - value uniform 0.5; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun index 64b8a22a12..e86330c489 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -15,11 +15,6 @@ do rm -f 0*/$i/{mut,alphat,epsilon,k,U,p_rgh} done -# remove solid fields from fluid regions (important for post-processing) -for i in bottomAir topAir -do - rm -f 0*/$i/{Ychar,Ypmma} -done for i in bottomAir topAir heater leftSolid rightSolid do diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties index 29e44f6039..edb01db8b8 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties @@ -21,15 +21,16 @@ thermoType transport constIso; thermo hConst; equationOfState rhoConst; - specie solidSpecie; + specie specie; energy sensibleEnthalpy; } mixture { - solidSpecie + specie { nMoles 1; + molWeight 50; } transport @@ -49,58 +50,4 @@ mixture } } -species -( - pmma char -); - -pmma -{ - solidSpecie - { - nMoles 1; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -char -{ - solidSpecie - { - nMoles 1; - } - - transport - { - kappa 0.4; - } - - thermodynamics - { - Hf 0; - Cp 611.0; - } - - equationOfState - { - rho 11.5; - } -} - - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties deleted file mode 100644 index bf9ac2617e..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties +++ /dev/null @@ -1,107 +0,0 @@ -/*--------------------------------*- 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 -{ - type heSolidThermo; - mixture pureMixture; - transport constIso; - thermo hConst; - equationOfState rhoConst; - specie solidSpecie; - energy sensibleEnthalpy; -} - -mixture -{ - solidSpecie - { - nMoles 1; - } - - transport - { - kappa 80; - } - - thermodynamics - { - Hf 0; - Cp 450; - } - - equationOfState - { - rho 8000; - } -} - -species -( - pmma char -); - -pmma -{ - solidSpecie - { - nMoles 1; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -char -{ - solidSpecie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - thermodynamics - { - Hf 0; - Cp 611.0; - } - - equationOfState - { - rho 11.5; - } -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties new file mode 120000 index 0000000000..dc4d3a18ee --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -0,0 +1 @@ +../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 deleted file mode 100644 index 081c7de2ab..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties +++ /dev/null @@ -1,106 +0,0 @@ -/*--------------------------------*- 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 -{ - type heSolidThermo; - mixture pureMixture; - transport constIso; - thermo hConst; - equationOfState rhoConst; - specie solidSpecie; - energy sensibleEnthalpy; -} - -mixture -{ - solidSpecie - { - nMoles 1; - } - - transport - { - kappa 80; - } - - thermodynamics - { - Hf 0; - Cp 450; - } - - equationOfState - { - rho 8000; - } -} - -species -( - pmma char -); - -pmma -{ - solidSpecie - { - nMoles 1; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -char -{ - solidSpecie - { - nMoles 1; - molWeight 50; - } - transport - { - kappa 0.4; - } - - 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 new file mode 120000 index 0000000000..dc4d3a18ee --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -0,0 +1 @@ +../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/Allrun index a1ef0bd9d6..b609b24a30 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/Allrun @@ -15,11 +15,6 @@ do rm -f 0*/$i/{mut,alphat,epsilon,k,U,p_rgh} done -## remove solid fields from fluid regions (important for post-processing) -for i in bottomWater topAir -do - rm -f 0*/$i/{Ypmma,Ychar} -done for i in bottomWater topAir heater leftSolid rightSolid do diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties index 4a7184c0ae..df146b74f3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { type heSolidThermo; - mixture pureSolidMixture; + mixture pureMixture; transport constIso; thermo hConst; equationOfState rhoConst; @@ -50,60 +50,4 @@ mixture } } -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - thermodynamics - { - Hf 0; - Cp 611.0; - } - - equationOfState - { - rho 11.5; - } -} - - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties deleted file mode 100644 index 4a7184c0ae..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties +++ /dev/null @@ -1,109 +0,0 @@ -/*--------------------------------*- 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 -{ - type heSolidThermo; - mixture pureSolidMixture; - transport constIso; - thermo hConst; - equationOfState rhoConst; - specie specie; - energy sensibleEnthalpy; -} - -mixture -{ - specie - { - nMoles 1; - molWeight 12; - } - - transport - { - kappa 80; - } - - thermodynamics - { - Hf 0; - Cp 450; - } - - equationOfState - { - rho 8000; - } -} - -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - thermodynamics - { - Hf 0; - Cp 611.0; - } - - equationOfState - { - rho 11.5; - } -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties new file mode 120000 index 0000000000..dc4d3a18ee --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties @@ -0,0 +1 @@ +../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 deleted file mode 100644 index 4a7184c0ae..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties +++ /dev/null @@ -1,109 +0,0 @@ -/*--------------------------------*- 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 -{ - type heSolidThermo; - mixture pureSolidMixture; - transport constIso; - thermo hConst; - equationOfState rhoConst; - specie specie; - energy sensibleEnthalpy; -} - -mixture -{ - specie - { - nMoles 1; - molWeight 12; - } - - transport - { - kappa 80; - } - - thermodynamics - { - Hf 0; - Cp 450; - } - - equationOfState - { - rho 8000; - } -} - -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - 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 new file mode 120000 index 0000000000..dc4d3a18ee --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties @@ -0,0 +1 @@ +../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Ychar b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Ychar deleted file mode 100644 index 0d9e45f046..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Ychar +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- 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 volScalarField; - object Ychar; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.5; - -boundaryField -{ - ".*" - { - type calculated; - value uniform 0.5; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Ypmma b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Ypmma deleted file mode 100644 index c2a485aeac..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/Ypmma +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- 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 volScalarField; - object Ypmma; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.5; - -boundaryField -{ - ".*" - { - type calculated; - value uniform 0.5; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun index 91f74227ac..59dcb70a89 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun @@ -19,11 +19,6 @@ do rm -f 0*/$i/{mut,alphat,epsilon,k,U,p_rgh} done -# No solid fields to remove from fluid regions (important for post-processing) -for i in bottomAir topAir -do - rm -f 0*/$i/{Ypmma, Ychar} -done for i in bottomAir topAir heater leftSolid rightSolid do diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties index 4a7184c0ae..df146b74f3 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { type heSolidThermo; - mixture pureSolidMixture; + mixture pureMixture; transport constIso; thermo hConst; equationOfState rhoConst; @@ -50,60 +50,4 @@ mixture } } -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - thermodynamics - { - Hf 0; - Cp 611.0; - } - - equationOfState - { - rho 11.5; - } -} - - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties deleted file mode 100644 index 4a7184c0ae..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties +++ /dev/null @@ -1,109 +0,0 @@ -/*--------------------------------*- 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 -{ - type heSolidThermo; - mixture pureSolidMixture; - transport constIso; - thermo hConst; - equationOfState rhoConst; - specie specie; - energy sensibleEnthalpy; -} - -mixture -{ - specie - { - nMoles 1; - molWeight 12; - } - - transport - { - kappa 80; - } - - thermodynamics - { - Hf 0; - Cp 450; - } - - equationOfState - { - rho 8000; - } -} - -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - thermodynamics - { - Hf 0; - Cp 611.0; - } - - equationOfState - { - rho 11.5; - } -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties new file mode 120000 index 0000000000..dc4d3a18ee --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -0,0 +1 @@ +../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 deleted file mode 100644 index 4a7184c0ae..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties +++ /dev/null @@ -1,109 +0,0 @@ -/*--------------------------------*- 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 -{ - type heSolidThermo; - mixture pureSolidMixture; - transport constIso; - thermo hConst; - equationOfState rhoConst; - specie specie; - energy sensibleEnthalpy; -} - -mixture -{ - specie - { - nMoles 1; - molWeight 12; - } - - transport - { - kappa 80; - } - - thermodynamics - { - Hf 0; - Cp 450; - } - - equationOfState - { - rho 8000; - } -} - -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - 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 new file mode 120000 index 0000000000..dc4d3a18ee --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -0,0 +1 @@ +../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Ychar b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Ychar deleted file mode 100644 index 0d9e45f046..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Ychar +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- 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 volScalarField; - object Ychar; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.5; - -boundaryField -{ - ".*" - { - type calculated; - value uniform 0.5; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Ypmma b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Ypmma deleted file mode 100644 index c2a485aeac..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/Ypmma +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- 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 volScalarField; - object Ypmma; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.5; - -boundaryField -{ - ".*" - { - type calculated; - value uniform 0.5; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allclean index 0ff2d80fa2..98a5d09794 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allclean +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allclean @@ -18,6 +18,6 @@ rm -rf constant/topAir/polyMesh rm -rf constant/heater/polyMesh rm -rf constant/leftSolid/polyMesh rm -rf constant/rightSolid/polyMesh -rm -rf topAir_maxX topAir_minX +rm -rf postProcessing # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun index 4f27179ebc..a0cd6737ac 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun @@ -15,12 +15,6 @@ do rm -f 0*/$i/{mut,alphat,epsilon,k,U,p_rgh} done -## remove solid fields from fluid regions (important for post-processing) -for i in bottomAir topAir -do - rm -f 0*/$i/{Ypmma,Ychar} -done - for i in bottomAir topAir heater leftSolid rightSolid do changeDictionary -region $i > log.changeDictionary.$i 2>&1 diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties index 4a7184c0ae..df146b74f3 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { type heSolidThermo; - mixture pureSolidMixture; + mixture pureMixture; transport constIso; thermo hConst; equationOfState rhoConst; @@ -50,60 +50,4 @@ mixture } } -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - thermodynamics - { - Hf 0; - Cp 611.0; - } - - equationOfState - { - rho 11.5; - } -} - - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties deleted file mode 100644 index 4a7184c0ae..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties +++ /dev/null @@ -1,109 +0,0 @@ -/*--------------------------------*- 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 -{ - type heSolidThermo; - mixture pureSolidMixture; - transport constIso; - thermo hConst; - equationOfState rhoConst; - specie specie; - energy sensibleEnthalpy; -} - -mixture -{ - specie - { - nMoles 1; - molWeight 12; - } - - transport - { - kappa 80; - } - - thermodynamics - { - Hf 0; - Cp 450; - } - - equationOfState - { - rho 8000; - } -} - -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - thermodynamics - { - Hf 0; - Cp 611.0; - } - - equationOfState - { - rho 11.5; - } -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties new file mode 120000 index 0000000000..dc4d3a18ee --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties @@ -0,0 +1 @@ +../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 deleted file mode 100644 index 4a7184c0ae..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties +++ /dev/null @@ -1,109 +0,0 @@ -/*--------------------------------*- 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 -{ - type heSolidThermo; - mixture pureSolidMixture; - transport constIso; - thermo hConst; - equationOfState rhoConst; - specie specie; - energy sensibleEnthalpy; -} - -mixture -{ - specie - { - nMoles 1; - molWeight 12; - } - - transport - { - kappa 80; - } - - thermodynamics - { - Hf 0; - Cp 450; - } - - equationOfState - { - rho 8000; - } -} - -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - 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 new file mode 120000 index 0000000000..dc4d3a18ee --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties @@ -0,0 +1 @@ +../heater/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Ychar b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Ychar deleted file mode 100644 index 0d9e45f046..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Ychar +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- 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 volScalarField; - object Ychar; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.5; - -boundaryField -{ - ".*" - { - type calculated; - value uniform 0.5; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Ypmma b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Ypmma deleted file mode 100644 index c2a485aeac..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Ypmma +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- 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 volScalarField; - object Ypmma; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.5; - -boundaryField -{ - ".*" - { - type calculated; - value uniform 0.5; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun index 40b3687d50..61fd0e371b 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun @@ -15,12 +15,6 @@ do rm -f 0*/$i/{rho,mut,alphat,epsilon,k,U,p_rgh,Qr,G,IDefault} done -## remove solid fields from fluid regions (important for post-processing) -for i in bottomAir topAir -do - rm -f 0*/$i/{Ypmma,Ychar} -done - for i in bottomAir topAir heater leftSolid rightSolid do changeDictionary -region $i > log.changeDictionary.$i 2>&1 diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties index a4db76eba2..894a9f39be 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile thermoType { type heSolidThermo; - mixture pureSolidMixture; + mixture pureMixture; transport constIso; thermo hConst; equationOfState rhoConst; @@ -50,60 +50,4 @@ mixture } } -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - thermodynamics - { - Hf 0; - Cp 611.0; - } - - equationOfState - { - rho 11.5; - } -} - - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties deleted file mode 100644 index 4a7184c0ae..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties +++ /dev/null @@ -1,109 +0,0 @@ -/*--------------------------------*- 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 -{ - type heSolidThermo; - mixture pureSolidMixture; - transport constIso; - thermo hConst; - equationOfState rhoConst; - specie specie; - energy sensibleEnthalpy; -} - -mixture -{ - specie - { - nMoles 1; - molWeight 12; - } - - transport - { - kappa 80; - } - - thermodynamics - { - Hf 0; - Cp 450; - } - - equationOfState - { - rho 8000; - } -} - -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - thermodynamics - { - Hf 0; - Cp 611.0; - } - - equationOfState - { - rho 11.5; - } -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties new file mode 120000 index 0000000000..dc4d3a18ee --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties @@ -0,0 +1 @@ +../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 deleted file mode 100644 index 4a7184c0ae..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties +++ /dev/null @@ -1,109 +0,0 @@ -/*--------------------------------*- 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 -{ - type heSolidThermo; - mixture pureSolidMixture; - transport constIso; - thermo hConst; - equationOfState rhoConst; - specie specie; - energy sensibleEnthalpy; -} - -mixture -{ - specie - { - nMoles 1; - molWeight 12; - } - - transport - { - kappa 80; - } - - thermodynamics - { - Hf 0; - Cp 450; - } - - equationOfState - { - rho 8000; - } -} - -solidComponents -( - pmma char -); - -pmmaCoeffs -{ - specie - { - nMoles 1; - molWeight 100; - } - - transport - { - kappa 0.152; - } - - thermodynamics - { - Hf 0; - Cp 1462; - } - - equationOfState - { - rho 1114.0; - } -} - -charCoeffs -{ - specie - { - nMoles 1; - molWeight 50; - } - - transport - { - kappa 0.4; - } - - 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 new file mode 120000 index 0000000000..dc4d3a18ee --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties @@ -0,0 +1 @@ +../heater/thermophysicalProperties \ No newline at end of file