diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict index 8d7927c42b..ef479dbbbb 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict @@ -255,6 +255,8 @@ addLayersControls relativeSizes true; // Per final patch (so not geometry!) the layer information + // Note: This behaviour changed after 21x. Any non-mentioned patches + // now slide unless nSurfaceLayers is explicitly mentioned to be 0. layers { sphere.stl_firstSolid @@ -265,6 +267,17 @@ addLayersControls maxY { nSurfaceLayers 1; + // Per patch layer data + expansionRatio 1.3; + finalLayerThickness 0.3; + minThickness 0.1; + } + + // Disable any mesh shrinking and layer addition on any point of + // a patch by setting nSurfaceLayers to 0 + frozenPatches + { + nSurfaceLayers 0; } } @@ -281,6 +294,7 @@ addLayersControls //- Minimum thickness of cell layer. If for any reason layer // cannot be above minThickness do not add layer. + // Relative to undistorted size of cell outside layer. // See relativeSizes parameter. minThickness 0.25; @@ -417,7 +431,7 @@ meshQualityControls // Flags for optional output // 0 : only write final meshes // 1 : write intermediate meshes -// 2 : write volScalarFields with cellLevel and cell centres for postprocessing +// 2 : write volScalarField with cellLevel for postprocessing // 4 : write current intersections as .obj files debug 0; diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H index 3ab69cc81c..59c434ee72 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H @@ -38,7 +38,11 @@ Description myPatch { type codedMixed; - value uniform 0; + + refValue uniform (0 0 0); + refGradient uniform (0 0 0); + valueFraction uniform 1; + redirectType rampedMixed; // name of generated BC code diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options index fef235e518..ca8cb9e2e4 100644 --- a/src/mesh/autoMesh/Make/options +++ b/src/mesh/autoMesh/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude LIB_LIBS = \ @@ -13,5 +14,6 @@ LIB_LIBS = \ -llagrangian \ -lmeshTools \ -ledgeMesh \ + -lsurfMesh \ -ltriSurface \ -ldistributed diff --git a/src/surfMesh/Make/files b/src/surfMesh/Make/files index a62f9c27f9..3b63a621ae 100644 --- a/src/surfMesh/Make/files +++ b/src/surfMesh/Make/files @@ -26,6 +26,7 @@ $(surfaceFormats)/ftr/FTRsurfaceFormatRunTime.C $(surfaceFormats)/gts/GTSsurfaceFormatRunTime.C $(surfaceFormats)/nas/NASsurfaceFormatRunTime.C $(surfaceFormats)/obj/OBJsurfaceFormatRunTime.C +$(surfaceFormats)/obj/OBJstream.C $(surfaceFormats)/off/OFFsurfaceFormatRunTime.C $(surfaceFormats)/ofs/OFSsurfaceFormatCore.C $(surfaceFormats)/ofs/OFSsurfaceFormatRunTime.C diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.C b/src/surfMesh/surfaceFormats/obj/OBJstream.C new file mode 100644 index 0000000000..ca24b6b6aa --- /dev/null +++ b/src/surfMesh/surfaceFormats/obj/OBJstream.C @@ -0,0 +1,323 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / 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 "OBJstream.H" +//#include "token.H" +#include "primitivePatch.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +defineTypeNameAndDebug(Foam::OBJstream, 0); + + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +void Foam::OBJstream::writeAndCheck(const char c) +{ + if (c == '\n') + { + startOfLine_ = true; + } + else if (startOfLine_) + { + startOfLine_ = false; + if (c == 'v') + { + nVertices_++; + } + } + OFstream::write(c); +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::OBJstream::OBJstream +( + const fileName& pathname, + streamFormat format, + versionNumber version, + compressionType compression +) +: + OFstream(pathname, format, version, compression), + startOfLine_(true), + nVertices_(0) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::OBJstream::~OBJstream() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::Ostream& Foam::OBJstream::write(const char c) +{ + writeAndCheck(c); + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const char* str) +{ + for (const char* p = str; *p != '\0'; ++p) + { + writeAndCheck(*p); + } + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const word& str) +{ + write(str.c_str()); + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const string& str) +{ + OFstream::write(token::BEGIN_STRING); + + register int backslash = 0; + for (string::const_iterator iter = str.begin(); iter != str.end(); ++iter) + { + register char c = *iter; + + if (c == '\\') + { + backslash++; + // suppress output until we know if other characters follow + continue; + } + else if (c == token::NL) + { + lineNumber_++; + backslash++; // backslash escape for newline + } + else if (c == token::END_STRING) + { + backslash++; // backslash escape for quote + } + + // output pending backslashes + while (backslash) + { + OFstream::write('\\'); + backslash--; + } + + writeAndCheck(c); + } + + // silently drop any trailing backslashes + // they would otherwise appear like an escaped end-quote + + OFstream::write(token::END_STRING); + return *this; +} + + +Foam::Ostream& Foam::OBJstream::writeQuoted +( + const std::string& str, + const bool quoted +) +{ + if (quoted) + { + OFstream::write(token::BEGIN_STRING); + + register int backslash = 0; + for + ( + string::const_iterator iter = str.begin(); + iter != str.end(); + ++iter + ) + { + register char c = *iter; + + if (c == '\\') + { + backslash++; + // suppress output until we know if other characters follow + continue; + } + else if (c == token::NL) + { + lineNumber_++; + backslash++; // backslash escape for newline + } + else if (c == token::END_STRING) + { + backslash++; // backslash escape for quote + } + + // output pending backslashes + while (backslash) + { + OFstream::write('\\'); + backslash--; + } + + writeAndCheck(c); + } + + // silently drop any trailing backslashes + // they would otherwise appear like an escaped end-quote + OFstream::write(token::END_STRING); + } + else + { + // output unquoted string, only advance line number on newline + write(str.c_str()); + } + + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const point& pt) +{ + write("v ") << pt.x() << ' ' << pt.y() << ' ' << pt.z() + << nl; + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const point& pt, const vector& n) +{ + write(pt); + OFstream::write("vn ") << n.x() << ' ' << n.y() + << ' ' << n.z() << nl; + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const edge& e, const pointField& points) +{ + write(points[e[0]]); + write(points[e[1]]); + write("l ") << nVertices_-1 << ' ' << nVertices_ << nl; + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const linePointRef& ln) +{ + write(ln.start()); + write(ln.end()); + write("l ") << nVertices_-1 << ' ' << nVertices_ << nl; + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write +( + const face& f, + const pointField& points, + const bool lines +) +{ + label start = nVertices_; + forAll(f, i) + { + write(points[f[i]]); + } + if (lines) + { + write('l'); + forAll(f, i) + { + write(' ') << start+1+i; + } + write(' ') << start+1 << '\n'; + } + else + { + write('f'); + forAll(f, i) + { + write(' ') << start+1+i; + } + write('\n'); + } + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write +( + const faceList& fcs, + const pointField& points, + const bool lines +) +{ + SubList allFcs(fcs, fcs.size()); + + primitivePatch pp(allFcs, points); + + const pointField& localPoints = pp.localPoints(); + const faceList& localFaces = pp.localFaces(); + + label start = nVertices_; + + forAll(localPoints, i) + { + write(localPoints[i]); + } + + if (lines) + { + const edgeList& edges = pp.edges(); + forAll(edges, edgeI) + { + const edge& e = edges[edgeI]; + + write("l ") << start+e[0]+1 << ' ' << start+e[1]+1 << nl; + } + } + else + { + forAll(localFaces, faceI) + { + const face& f = localFaces[faceI]; + write('f'); + forAll(f, i) + { + write(' ') << start+f[i]+1; + } + write('\n'); + } + } + return *this; +} + + +// ************************************************************************* // diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.H b/src/surfMesh/surfaceFormats/obj/OBJstream.H new file mode 100644 index 0000000000..9e62cbdbeb --- /dev/null +++ b/src/surfMesh/surfaceFormats/obj/OBJstream.H @@ -0,0 +1,164 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / 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 . + +Class + Foam::OBJstream + +Description + OFstream which keeps track of vertices + +SourceFiles + OBJstream.C + +\*---------------------------------------------------------------------------*/ + +#ifndef OBJstream_H +#define OBJstream_H + +#include "OFstream.H" +#include "point.H" +#include "edge.H" +#include "face.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + + +/*---------------------------------------------------------------------------*\ + Class OBJstream Declaration +\*---------------------------------------------------------------------------*/ + +class OBJstream +: + public OFstream +{ + // Private data + + bool startOfLine_; + + label nVertices_; + + + // Private Member Functions + + void writeAndCheck(const char); + +public: + + // Declare name of the class and its debug switch + ClassName("OBJstream"); + + + // Constructors + + //- Construct from pathname + OBJstream + ( + const fileName& pathname, + streamFormat format=ASCII, + versionNumber version=currentVersion, + compressionType compression=UNCOMPRESSED + ); + + + //- Destructor + ~OBJstream(); + + + // Member functions + + // Access + + //- Return the name of the stream + label nVertices() const + { + return nVertices_; + } + + + // Ostream implementation + + //- Write character + virtual Ostream& write(const char); + + //- Write character string + virtual Ostream& write(const char*); + + //- Write word + virtual Ostream& write(const word&); + + virtual Ostream& write(const string&); + + //- Write std::string surrounded by quotes. + // Optional write without quotes. + virtual Ostream& writeQuoted + ( + const std::string&, + const bool quoted=true + ); + + + // Direct write functionality + + //- Write point + Ostream& write(const point&); + + //- Write point and vector normal ('vn') + Ostream& write(const point&, const vector&); + + //- Write edge as points with line + Ostream& write(const edge&, const pointField&); + + //- Write line + Ostream& write(const linePointRef&); + + //- Write face as points with lines or filled polygon + Ostream& write + ( + const face&, + const pointField&, + const bool lines = true + ); + + //- Write patch as points and faces with lines or filled polygons + Ostream& write + ( + const faceList&, + const pointField&, + const bool lines = true + ); + +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C index d20f1cbe4d..d938fb77a2 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C +++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C @@ -156,12 +156,14 @@ Foam::basicThermo::basicThermo {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + Foam::autoPtr Foam::basicThermo::New ( const fvMesh& mesh ) { - return NewThermo(mesh); + return New(mesh); } diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H index 85ffe04467..3bd01792ba 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H +++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H @@ -29,7 +29,6 @@ Description SourceFiles basicThermo.C - basicThermoNew.C \*---------------------------------------------------------------------------*/ @@ -104,8 +103,14 @@ public: basicThermo(const fvMesh&, const dictionary&); - //- Selector - static autoPtr New(const fvMesh&); + // Selectors + + //- Generic New for each of the related thermodynamics packages + template + static autoPtr New(const fvMesh&); + + //- Specialisation of the Generic New for basicThermo + static autoPtr New(const fvMesh&); //- Destructor @@ -344,132 +349,18 @@ public: }; -template -autoPtr NewThermo -( - const fvMesh& mesh -) -{ - IOdictionary thermoDict - ( - IOobject - ( - "thermophysicalProperties", - mesh.time().constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ); - - word thermoTypeName; - - if (thermoDict.isDict("thermoType")) - { - const dictionary& thermoTypeDict(thermoDict.subDict("thermoType")); - - Info<< "Selecting thermodynamics package " << thermoTypeDict << endl; - - const int nCmpt = 7; - const char* cmptNames[nCmpt] = - { - "type", - "mixture", - "transport", - "thermo", - "equationOfState", - "specie", - "energy" - }; - - // Construct the name of the thermo package from the components - thermoTypeName = - word(thermoTypeDict.lookup("type")) + '<' - + word(thermoTypeDict.lookup("mixture")) + '<' - + word(thermoTypeDict.lookup("transport")) + '<' - + word(thermoTypeDict.lookup("thermo")) + '<' - + word(thermoTypeDict.lookup("equationOfState")) + '<' - + word(thermoTypeDict.lookup("specie")) + ">>," - + word(thermoTypeDict.lookup("energy")) + ">>>"; - - // Lookup the thermo package - typename Thermo::fvMeshConstructorTable::iterator cstrIter = - Thermo::fvMeshConstructorTablePtr_->find(thermoTypeName); - - // Print error message if package not found in the table - if (cstrIter == Thermo::fvMeshConstructorTablePtr_->end()) - { - FatalErrorIn(Thermo::typeName + "::New(const fvMesh&)") - << "Unknown " << Thermo::typeName << " type " << nl - << "thermoType" << thermoTypeDict << nl << nl - << "Valid " << Thermo::typeName << " types are:" << nl << nl; - - // Get the list of all the suitable thermo packages available - wordList validThermoTypeNames - ( - Thermo::fvMeshConstructorTablePtr_->sortedToc() - ); - - // Build a table of the thermo packages constituent parts - // Note: row-0 contains the names of constituent parts - List validThermoTypeNameCmpts - ( - validThermoTypeNames.size() + 1 - ); - - validThermoTypeNameCmpts[0].setSize(nCmpt); - forAll(validThermoTypeNameCmpts[0], j) - { - validThermoTypeNameCmpts[0][j] = cmptNames[j]; - } - - // Split the thermo package names into their constituent parts - forAll(validThermoTypeNames, i) - { - validThermoTypeNameCmpts[i+1] = - Thermo::splitThermoName(validThermoTypeNames[i], nCmpt); - } - - // Print the table of available packages - // in terms of their constituent parts - printTable(validThermoTypeNameCmpts, FatalError); - - FatalError<< exit(FatalError); - } - - return autoPtr(cstrIter()(mesh)); - } - else - { - thermoTypeName = word(thermoDict.lookup("thermoType")); - - Info<< "Selecting thermodynamics package " << thermoTypeName << endl; - - typename Thermo::fvMeshConstructorTable::iterator cstrIter = - Thermo::fvMeshConstructorTablePtr_->find(thermoTypeName); - - if (cstrIter == Thermo::fvMeshConstructorTablePtr_->end()) - { - FatalErrorIn(Thermo::typeName + "::New(const fvMesh&)") - << "Unknown " << Thermo::typeName << " type " - << thermoTypeName << nl << nl - << "Valid " << Thermo::typeName << " types are:" << nl - << Thermo::fvMeshConstructorTablePtr_->sortedToc() << nl - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh)); - } -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#ifdef NoRepository +# include "basicThermoTemplates.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + #endif // ************************************************************************* // diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C new file mode 100644 index 0000000000..99fe8cacc2 --- /dev/null +++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C @@ -0,0 +1,150 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / 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" + +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +template +Foam::autoPtr Foam::basicThermo::New +( + const fvMesh& mesh +) +{ + IOdictionary thermoDict + ( + IOobject + ( + "thermophysicalProperties", + mesh.time().constant(), + mesh, + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + false + ) + ); + + word thermoTypeName; + + if (thermoDict.isDict("thermoType")) + { + const dictionary& thermoTypeDict(thermoDict.subDict("thermoType")); + + Info<< "Selecting thermodynamics package " << thermoTypeDict << endl; + + const int nCmpt = 7; + const char* cmptNames[nCmpt] = + { + "type", + "mixture", + "transport", + "thermo", + "equationOfState", + "specie", + "energy" + }; + + // Construct the name of the thermo package from the components + thermoTypeName = + word(thermoTypeDict.lookup("type")) + '<' + + word(thermoTypeDict.lookup("mixture")) + '<' + + word(thermoTypeDict.lookup("transport")) + '<' + + word(thermoTypeDict.lookup("thermo")) + '<' + + word(thermoTypeDict.lookup("equationOfState")) + '<' + + word(thermoTypeDict.lookup("specie")) + ">>," + + word(thermoTypeDict.lookup("energy")) + ">>>"; + + // Lookup the thermo package + typename Thermo::fvMeshConstructorTable::iterator cstrIter = + Thermo::fvMeshConstructorTablePtr_->find(thermoTypeName); + + // Print error message if package not found in the table + if (cstrIter == Thermo::fvMeshConstructorTablePtr_->end()) + { + FatalErrorIn(Thermo::typeName + "::New(const fvMesh&)") + << "Unknown " << Thermo::typeName << " type " << nl + << "thermoType" << thermoTypeDict << nl << nl + << "Valid " << Thermo::typeName << " types are:" << nl << nl; + + // Get the list of all the suitable thermo packages available + wordList validThermoTypeNames + ( + Thermo::fvMeshConstructorTablePtr_->sortedToc() + ); + + // Build a table of the thermo packages constituent parts + // Note: row-0 contains the names of constituent parts + List validThermoTypeNameCmpts + ( + validThermoTypeNames.size() + 1 + ); + + validThermoTypeNameCmpts[0].setSize(nCmpt); + forAll(validThermoTypeNameCmpts[0], j) + { + validThermoTypeNameCmpts[0][j] = cmptNames[j]; + } + + // Split the thermo package names into their constituent parts + forAll(validThermoTypeNames, i) + { + validThermoTypeNameCmpts[i+1] = + Thermo::splitThermoName(validThermoTypeNames[i], nCmpt); + } + + // Print the table of available packages + // in terms of their constituent parts + printTable(validThermoTypeNameCmpts, FatalError); + + FatalError<< exit(FatalError); + } + + return autoPtr(cstrIter()(mesh)); + } + else + { + thermoTypeName = word(thermoDict.lookup("thermoType")); + + Info<< "Selecting thermodynamics package " << thermoTypeName << endl; + + typename Thermo::fvMeshConstructorTable::iterator cstrIter = + Thermo::fvMeshConstructorTablePtr_->find(thermoTypeName); + + if (cstrIter == Thermo::fvMeshConstructorTablePtr_->end()) + { + FatalErrorIn(Thermo::typeName + "::New(const fvMesh&)") + << "Unknown " << Thermo::typeName << " type " + << thermoTypeName << nl << nl + << "Valid " << Thermo::typeName << " types are:" << nl + << Thermo::fvMeshConstructorTablePtr_->sortedToc() << nl + << exit(FatalError); + } + + return autoPtr(cstrIter()(mesh)); + } +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C index b0438e6431..4aef741b50 100644 --- a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C +++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.C @@ -49,12 +49,14 @@ Foam::fluidThermo::fluidThermo(const fvMesh& mesh, const dictionary& dict) {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + Foam::autoPtr Foam::fluidThermo::New ( const fvMesh& mesh ) { - return NewThermo(mesh); + return basicThermo::New(mesh); } diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H index 7f33cdfdd3..21de4808ff 100644 --- a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H +++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H @@ -29,7 +29,6 @@ Description SourceFiles fluidThermo.C - fluidThermoNew.C \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C index e9a6a2219e..30949d16d7 100644 --- a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C +++ b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.C @@ -70,12 +70,14 @@ Foam::psiThermo::psiThermo(const fvMesh& mesh) {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + Foam::autoPtr Foam::psiThermo::New ( const fvMesh& mesh ) { - return NewThermo(mesh); + return basicThermo::New(mesh); } diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H index 990341965d..84a9dff0b4 100644 --- a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H +++ b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermo.H @@ -29,7 +29,6 @@ Description SourceFiles psiThermo.C - psiThermoNew.C \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C index ababc128c2..d5e572f615 100644 --- a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C +++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.C @@ -130,12 +130,14 @@ Foam::rhoThermo::rhoThermo(const fvMesh& mesh, const dictionary& dict) {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + Foam::autoPtr Foam::rhoThermo::New ( const fvMesh& mesh ) { - return NewThermo(mesh); + return basicThermo::New(mesh); } diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H index 9cb27bd4b8..cc477d35eb 100644 --- a/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H +++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermo/rhoThermo.H @@ -29,7 +29,6 @@ Description SourceFiles rhoThermo.C - rhoThermoNew.C \*---------------------------------------------------------------------------*/ diff --git a/src/thermophysicalModels/reactionThermo/Make/files b/src/thermophysicalModels/reactionThermo/Make/files index d90ed39720..fa58c87312 100644 --- a/src/thermophysicalModels/reactionThermo/Make/files +++ b/src/thermophysicalModels/reactionThermo/Make/files @@ -9,7 +9,6 @@ psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C -psiReactionThermo/psiuReactionThermo/psiuReactionThermoNew.C psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.C index 42e319c7d5..c0afb6a513 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.C +++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermo.C @@ -42,6 +42,17 @@ Foam::psiReactionThermo::psiReactionThermo(const fvMesh& mesh) {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +Foam::autoPtr Foam::psiReactionThermo::New +( + const fvMesh& mesh +) +{ + return basicThermo::New(mesh); +} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::psiReactionThermo::~psiReactionThermo() diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C index 794f4259ef..1e0c8c8aa8 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C +++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermo/psiReactionThermoNew.C @@ -26,8 +26,7 @@ License #include "psiReactionThermo.H" #include "fvMesh.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - +/* Foam::autoPtr Foam::psiReactionThermo::New ( const fvMesh& mesh @@ -68,7 +67,7 @@ Foam::autoPtr Foam::psiReactionThermo::New return autoPtr(cstrIter()(mesh)); } - +*/ Foam::autoPtr Foam::psiReactionThermo::NewType ( diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C index 18c29d360a..b5f824c376 100644 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C +++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermo.C @@ -106,6 +106,17 @@ psiuReactionThermo::psiuReactionThermo(const fvMesh& mesh) {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +Foam::autoPtr Foam::psiuReactionThermo::New +( + const fvMesh& mesh +) +{ + return basicThermo::New(mesh); +} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // psiuReactionThermo::~psiuReactionThermo() diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermoNew.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermoNew.C deleted file mode 100644 index 12757ba5f8..0000000000 --- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/psiuReactionThermo/psiuReactionThermoNew.C +++ /dev/null @@ -1,73 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "psiuReactionThermo.H" -#include "fvMesh.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -Foam::autoPtr Foam::psiuReactionThermo::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("psiuReactionThermo::New(const fvMesh&)") - << "Unknown psiuReactionThermo type " - << modelType << nl << nl - << "Valid psiuReactionThermo types are :" << endl - << fvMeshConstructorTablePtr_->sortedToc() - << exit(FatalError); - } - - return autoPtr(cstrIter()(mesh)); -} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C index 5b131929a6..ef056e4267 100644 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C +++ b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermo.C @@ -42,6 +42,17 @@ Foam::rhoReactionThermo::rhoReactionThermo(const fvMesh& mesh) {} +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +Foam::autoPtr Foam::rhoReactionThermo::New +( + const fvMesh& mesh +) +{ + return basicThermo::New(mesh); +} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::rhoReactionThermo::~rhoReactionThermo() diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C index a331040618..8530d2cd3b 100644 --- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C +++ b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermo/rhoReactionThermoNew.C @@ -26,8 +26,7 @@ License #include "rhoReactionThermo.H" #include "fvMesh.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - +/* Foam::autoPtr Foam::rhoReactionThermo::New ( const fvMesh& mesh @@ -68,6 +67,7 @@ Foam::autoPtr Foam::rhoReactionThermo::New return autoPtr(cstrIter()(mesh)); } +*/ Foam::autoPtr Foam::rhoReactionThermo::NewType diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C index a378d6f2e5..1fbb1afca2 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermoNew.C @@ -76,7 +76,8 @@ Foam::autoPtr Foam::solidThermo::New Foam::autoPtr Foam::solidThermo::New ( - const fvMesh& mesh, const dictionary& dict + const fvMesh& mesh, + const dictionary& dict ) { if (debug) @@ -106,4 +107,5 @@ Foam::autoPtr Foam::solidThermo::New return autoPtr(cstrIter()(mesh, dict)); } + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties index 519e0e6d78..c7426d104e 100644 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heheuReactionThermo>,absoluteEnthalpy>>>; +thermoType +{ + type heheuReactionThermo; + mixture inhomogeneousMixture; + transport sutherlandTransport; + thermo janafThermo; + equationOfState perfectGas; + specie specie; + energy absoluteEnthalpy; +} stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.5776; diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary index 2c67db9e2b..bcc6d4798f 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary @@ -20,30 +20,35 @@ FoamFile left { type symmetryPlane; + inGroups 1(symmetryPlane); nFaces 35; startFace 4795; } right { type symmetryPlane; + inGroups 1(symmetryPlane); nFaces 35; startFace 4830; } top { type symmetryPlane; + inGroups 1(symmetryPlane); nFaces 70; startFace 4865; } bottom { type symmetryPlane; + inGroups 1(symmetryPlane); nFaces 70; startFace 4935; } frontAndBack { type empty; + inGroups 1(empty); nFaces 4900; startFace 5005; } diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties index 7b90190601..d265c0bc1a 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heheuReactionThermo>,absoluteEnthalpy>>>; +thermoType +{ + type heheuReactionThermo; + mixture homogeneousMixture; + transport sutherlandTransport; + thermo janafThermo; + equationOfState perfectGas; + specie specie; + energy 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 f0ce1adb1a..29f628b4dc 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heheuReactionThermo>,absoluteEnthalpy>>>; +thermoType +{ + type heheuReactionThermo; + mixture inhomogeneousMixture; + transport sutherlandTransport; + thermo janafThermo; + equationOfState perfectGas; + specie specie; + energy absoluteEnthalpy; +} stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336; diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties index 562bc6c8ec..cecce6e7b2 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport sutherlandTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} mixture { diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties index c6179ae4c5..9a4df2030a 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport sutherlandTransport; + thermo janafThermo; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} mixture { diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties index 807bed8913..aad77235ff 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy 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 8bd843241a..dde7c242fa 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} mixture { diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties index 1edc08f91b..2ac6e58ee4 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} mixture { diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties index 8bd843241a..dde7c242fa 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} mixture { diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties index 84fbe3d678..49716e9507 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleEnthalpy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties index 1af5e2549d..9723272741 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleEnthalpy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport sutherlandTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties index 9343571437..9ee57766cf 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleEnthalpy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties index 1af5e2549d..9723272741 100644 --- a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleEnthalpy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport sutherlandTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties index 1af5e2549d..9723272741 100644 --- a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleEnthalpy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport sutherlandTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties index a59b1bb17a..317544a7bf 100644 --- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleEnthalpy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport sutherlandTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties index 143dcad7b5..0cd2cebd8e 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport sutherlandTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} mixture { diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties index 1c7da0f171..6a961a3b73 100644 --- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport sutherlandTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} mixture { diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties index 807bed8913..aad77235ff 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy 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 f501963c68..cd10ed5923 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} mixture { diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties index d078c46ccb..43831f935b 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} mixture { diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties index d078c46ccb..43831f935b 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; +} mixture { diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties index 1870035bf9..0085820454 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties @@ -15,8 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; -//thermoType heRhoThermo>,sensibleInternalEnergy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} pRef 100000; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties index 6a782154be..0a1f8cd359 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleEnthalpy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties index 6a782154be..0a1f8cd359 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleEnthalpy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties index d4a80ceaa3..1433c8c53e 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleEnthalpy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} pRef 100000; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties index d4a80ceaa3..1433c8c53e 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hePsiThermo>,sensibleEnthalpy>>>; +thermoType +{ + type hePsiThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} pRef 100000; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties index 030a3a3ddd..67d6054e23 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties index 62209d1071..b1783beb14 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties index 20cc9f2275..50d01b91d1 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties @@ -14,7 +14,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState rhoConst; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties index 62209d1071..b1783beb14 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties index 030a3a3ddd..67d6054e23 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties index 62209d1071..b1783beb14 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties index 030a3a3ddd..67d6054e23 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties index 62209d1071..b1783beb14 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties index 030a3a3ddd..67d6054e23 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture { diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties index 62209d1071..b1783beb14 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties @@ -15,7 +15,16 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType heRhoThermo>,sensibleEnthalpy>>>; +thermoType +{ + type heRhoThermo; + mixture pureMixture; + transport constTransport; + thermo hConstThermo; + equationOfState perfectGas; + specie specie; + energy sensibleEnthalpy; +} mixture {