mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'olesenm'
This commit is contained in:
@ -1,165 +0,0 @@
|
||||
// ============================================================================
|
||||
// gzstream, C++ iostream classes wrapping the zlib compression library.
|
||||
// Copyright (C) 2001 Deepak Bandyopadhyay, Lutz Kettner
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
// License as published by the Free Software Foundation; either
|
||||
// version 2.1 of the License, or (at your option) any later version.
|
||||
//
|
||||
// This library 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
|
||||
// Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
// ============================================================================
|
||||
//
|
||||
// File : gzstream.C
|
||||
// Revision : $Revision: 1.7 $
|
||||
// Revision_date : $Date: 2003/01/08 14:41:27 $
|
||||
// Author(s) : Deepak Bandyopadhyay, Lutz Kettner
|
||||
//
|
||||
// Standard streambuf implementation following Nicolai Josuttis, "The
|
||||
// Standard C++ Library".
|
||||
// ============================================================================
|
||||
|
||||
#include <gzstream.h>
|
||||
#include <iostream>
|
||||
#include <string.h> // for memcpy
|
||||
|
||||
#ifdef GZSTREAM_NAMESPACE
|
||||
namespace GZSTREAM_NAMESPACE {
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Internal classes to implement gzstream. See header file for user classes.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// --------------------------------------
|
||||
// class gzstreambuf:
|
||||
// --------------------------------------
|
||||
|
||||
gzstreambuf* gzstreambuf::open( const char* name, int open_mode) {
|
||||
if ( is_open())
|
||||
return reinterpret_cast<gzstreambuf*>(0);
|
||||
mode = open_mode;
|
||||
// no append nor read/write mode
|
||||
if ((mode & std::ios::ate) || (mode & std::ios::app)
|
||||
|| ((mode & std::ios::in) && (mode & std::ios::out)))
|
||||
return reinterpret_cast<gzstreambuf*>(0);
|
||||
char fmode[10];
|
||||
char* fmodeptr = fmode;
|
||||
if ( mode & std::ios::in)
|
||||
*fmodeptr++ = 'r';
|
||||
else if ( mode & std::ios::out)
|
||||
*fmodeptr++ = 'w';
|
||||
*fmodeptr++ = 'b';
|
||||
*fmodeptr = '\0';
|
||||
file = gzopen( name, fmode);
|
||||
if (file == 0)
|
||||
return reinterpret_cast<gzstreambuf*>(0);
|
||||
opened = 1;
|
||||
return this;
|
||||
}
|
||||
|
||||
gzstreambuf * gzstreambuf::close() {
|
||||
if ( is_open()) {
|
||||
sync();
|
||||
opened = 0;
|
||||
if ( gzclose( file) == Z_OK)
|
||||
return this;
|
||||
}
|
||||
return reinterpret_cast<gzstreambuf*>(0);
|
||||
}
|
||||
|
||||
int gzstreambuf::underflow() { // used for input buffer only
|
||||
if ( gptr() && ( gptr() < egptr()))
|
||||
return * reinterpret_cast<unsigned char *>( gptr());
|
||||
|
||||
if ( ! (mode & std::ios::in) || ! opened)
|
||||
return EOF;
|
||||
// Josuttis' implementation of inbuf
|
||||
int n_putback = gptr() - eback();
|
||||
if ( n_putback > 4)
|
||||
n_putback = 4;
|
||||
memcpy( buffer + (4 - n_putback), gptr() - n_putback, n_putback);
|
||||
|
||||
int num = gzread( file, buffer+4, bufferSize-4);
|
||||
if (num <= 0) // ERROR or EOF
|
||||
return EOF;
|
||||
|
||||
// reset buffer pointers
|
||||
setg( buffer + (4 - n_putback), // beginning of putback area
|
||||
buffer + 4, // read position
|
||||
buffer + 4 + num); // end of buffer
|
||||
|
||||
// return next character
|
||||
return * reinterpret_cast<unsigned char *>( gptr());
|
||||
}
|
||||
|
||||
int gzstreambuf::flush_buffer() {
|
||||
// Separate the writing of the buffer from overflow() and
|
||||
// sync() operation.
|
||||
int w = pptr() - pbase();
|
||||
if ( gzwrite( file, pbase(), w) != w)
|
||||
return EOF;
|
||||
pbump( -w);
|
||||
return w;
|
||||
}
|
||||
|
||||
int gzstreambuf::overflow( int c) { // used for output buffer only
|
||||
if ( ! ( mode & std::ios::out) || ! opened)
|
||||
return EOF;
|
||||
if (c != EOF) {
|
||||
*pptr() = c;
|
||||
pbump(1);
|
||||
}
|
||||
if ( flush_buffer() == EOF)
|
||||
return EOF;
|
||||
return c;
|
||||
}
|
||||
|
||||
int gzstreambuf::sync() {
|
||||
// Changed to use flush_buffer() instead of overflow( EOF)
|
||||
// which caused improper behavior with std::endl and flush(),
|
||||
// bug reported by Vincent Ricard.
|
||||
if ( pptr() && pptr() > pbase()) {
|
||||
if ( flush_buffer() == EOF)
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
// --------------------------------------
|
||||
// class gzstreambase:
|
||||
// --------------------------------------
|
||||
|
||||
gzstreambase::gzstreambase( const char* name, int mode) {
|
||||
init( &buf);
|
||||
open( name, mode);
|
||||
}
|
||||
|
||||
gzstreambase::~gzstreambase() {
|
||||
buf.close();
|
||||
}
|
||||
|
||||
void gzstreambase::open( const char* name, int open_mode) {
|
||||
if ( ! buf.open( name, open_mode))
|
||||
clear( rdstate() | std::ios::badbit);
|
||||
}
|
||||
|
||||
void gzstreambase::close() {
|
||||
if ( buf.is_open())
|
||||
if ( ! buf.close())
|
||||
clear( rdstate() | std::ios::badbit);
|
||||
}
|
||||
|
||||
#ifdef GZSTREAM_NAMESPACE
|
||||
} // namespace GZSTREAM_NAMESPACE
|
||||
#endif
|
||||
|
||||
// ============================================================================
|
||||
// EOF //
|
||||
@ -1,121 +0,0 @@
|
||||
// ============================================================================
|
||||
// gzstream, C++ iostream classes wrapping the zlib compression library.
|
||||
// Copyright (C) 2001 Deepak Bandyopadhyay, Lutz Kettner
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
// License as published by the Free Software Foundation; either
|
||||
// version 2.1 of the License, or (at your option) any later version.
|
||||
//
|
||||
// This library 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
|
||||
// Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
// ============================================================================
|
||||
//
|
||||
// File : gzstream.h
|
||||
// Revision : $Revision: 1.5 $
|
||||
// Revision_date : $Date: 2002/04/26 23:30:15 $
|
||||
// Author(s) : Deepak Bandyopadhyay, Lutz Kettner
|
||||
//
|
||||
// Standard streambuf implementation following Nicolai Josuttis, "The
|
||||
// Standard C++ Library".
|
||||
// ============================================================================
|
||||
|
||||
#ifndef GZSTREAM_H
|
||||
#define GZSTREAM_H 1
|
||||
|
||||
// standard C++ with new header file names and std:: namespace
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <zlib.h>
|
||||
|
||||
#ifdef GZSTREAM_NAMESPACE
|
||||
namespace GZSTREAM_NAMESPACE {
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Internal classes to implement gzstream. See below for user classes.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class gzstreambuf : public std::streambuf {
|
||||
private:
|
||||
static const int bufferSize = 47+256; // size of data buff
|
||||
// totals 512 bytes under g++ for igzstream at the end.
|
||||
|
||||
gzFile file; // file handle for compressed file
|
||||
char buffer[bufferSize]; // data buffer
|
||||
char opened; // open/close state of stream
|
||||
int mode; // I/O mode
|
||||
|
||||
int flush_buffer();
|
||||
public:
|
||||
gzstreambuf() : opened(0) {
|
||||
setp( buffer, buffer + (bufferSize-1));
|
||||
setg( buffer + 4, // beginning of putback area
|
||||
buffer + 4, // read position
|
||||
buffer + 4); // end position
|
||||
// ASSERT: both input & output capabilities will not be used together
|
||||
}
|
||||
int is_open() { return opened; }
|
||||
gzstreambuf* open( const char* name, int open_mode);
|
||||
gzstreambuf* close();
|
||||
~gzstreambuf() { close(); }
|
||||
|
||||
virtual int overflow( int c = EOF);
|
||||
virtual int underflow();
|
||||
virtual int sync();
|
||||
};
|
||||
|
||||
class gzstreambase : virtual public std::ios {
|
||||
protected:
|
||||
gzstreambuf buf;
|
||||
public:
|
||||
gzstreambase() { init(&buf); }
|
||||
gzstreambase( const char* name, int open_mode);
|
||||
~gzstreambase();
|
||||
void open( const char* name, int open_mode);
|
||||
void close();
|
||||
gzstreambuf* rdbuf() { return &buf; }
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// User classes. Use igzstream and ogzstream analogously to ifstream and
|
||||
// ofstream respectively. They read and write files based on the gz*
|
||||
// function interface of the zlib. Files are compatible with gzip compression.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class igzstream : public gzstreambase, public std::istream {
|
||||
public:
|
||||
igzstream() : std::istream( &buf) {}
|
||||
igzstream( const char* name, int open_mode = std::ios::in)
|
||||
: gzstreambase( name, open_mode), std::istream( &buf) {}
|
||||
gzstreambuf* rdbuf() { return gzstreambase::rdbuf(); }
|
||||
void open( const char* name, int open_mode = std::ios::in) {
|
||||
gzstreambase::open( name, open_mode);
|
||||
}
|
||||
};
|
||||
|
||||
class ogzstream : public gzstreambase, public std::ostream {
|
||||
public:
|
||||
ogzstream() : std::ostream( &buf) {}
|
||||
ogzstream( const char* name, int mode = std::ios::out)
|
||||
: gzstreambase( name, mode), std::ostream( &buf) {}
|
||||
gzstreambuf* rdbuf() { return gzstreambase::rdbuf(); }
|
||||
void open( const char* name, int open_mode = std::ios::out) {
|
||||
gzstreambase::open( name, open_mode);
|
||||
}
|
||||
};
|
||||
|
||||
#ifdef GZSTREAM_NAMESPACE
|
||||
} // namespace GZSTREAM_NAMESPACE
|
||||
#endif
|
||||
|
||||
#endif // GZSTREAM_H
|
||||
// ============================================================================
|
||||
// EOF //
|
||||
|
||||
@ -803,7 +803,7 @@ public:
|
||||
(
|
||||
const dictionary& shrinkDict,
|
||||
const dictionary& motionDict,
|
||||
const scalar nAllowableErrors,
|
||||
const label nAllowableErrors,
|
||||
motionSmoother&
|
||||
);
|
||||
|
||||
|
||||
@ -2346,7 +2346,7 @@ void Foam::autoHexMeshDriver::addLayers
|
||||
(
|
||||
const dictionary& shrinkDict,
|
||||
const dictionary& motionDict,
|
||||
const scalar nAllowableErrors,
|
||||
const label nAllowableErrors,
|
||||
motionSmoother& meshMover
|
||||
)
|
||||
{
|
||||
|
||||
@ -32,15 +32,28 @@ License
|
||||
// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
// adjust negative resistance values to be multiplier of max value
|
||||
void Foam::porousZone::adjustNegativeResistance(vector& resist)
|
||||
void Foam::porousZone::adjustNegativeResistance(dimensionedVector& resist)
|
||||
{
|
||||
scalar maxCmpt = max(0, cmptMax(resist));
|
||||
scalar maxCmpt = max(0, cmptMax(resist.value()));
|
||||
|
||||
for (label cmpt=0; cmpt < vector::nComponents; ++cmpt)
|
||||
if (maxCmpt < 0)
|
||||
{
|
||||
if (resist[cmpt] < 0)
|
||||
FatalErrorIn
|
||||
(
|
||||
"Foam::porousZone::porousZone::adjustNegativeResistance"
|
||||
"(dimensionedVector&)"
|
||||
) << "negative resistances! " << resist
|
||||
<< exit(FatalError);
|
||||
}
|
||||
else
|
||||
{
|
||||
vector& val = resist.value();
|
||||
for (label cmpt=0; cmpt < vector::nComponents; ++cmpt)
|
||||
{
|
||||
resist[cmpt] *= -maxCmpt;
|
||||
if (val[cmpt] < 0)
|
||||
{
|
||||
val[cmpt] *= -maxCmpt;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -71,24 +84,20 @@ Foam::porousZone::porousZone
|
||||
FatalErrorIn
|
||||
(
|
||||
"Foam::porousZone::porousZone"
|
||||
"(const fvMesh&, const Istream&)"
|
||||
"(const fvMesh&, const word&, const dictionary&)"
|
||||
) << "cannot find porous cellZone " << name_
|
||||
<< exit(FatalError);
|
||||
}
|
||||
|
||||
// local-to-global transformation tensor
|
||||
const tensor& E = coordSys_.R();
|
||||
|
||||
// porosity
|
||||
if (dict_.found("porosity"))
|
||||
if (dict_.readIfPresent("porosity", porosity_))
|
||||
{
|
||||
dict_.lookup("porosity") >> porosity_;
|
||||
|
||||
if (porosity_ <= 0.0 || porosity_ > 1.0)
|
||||
{
|
||||
FatalIOErrorIn
|
||||
(
|
||||
"Foam::porousZone::porousZone(const fvMesh&, const Istream&)",
|
||||
"Foam::porousZone::porousZone"
|
||||
"(const fvMesh&, const word&, const dictionary&)",
|
||||
dict_
|
||||
)
|
||||
<< "out-of-range porosity value " << porosity_
|
||||
@ -97,73 +106,64 @@ Foam::porousZone::porousZone
|
||||
}
|
||||
|
||||
// powerLaw coefficients
|
||||
if (dict_.found("powerLaw"))
|
||||
if (const dictionary* dictPtr = dict_.subDictPtr("powerLaw"))
|
||||
{
|
||||
const dictionary& subDict = dict_.subDict("powerLaw");
|
||||
if (subDict.found("C0"))
|
||||
{
|
||||
subDict.lookup("C0") >> C0_;
|
||||
}
|
||||
if (subDict.found("C1"))
|
||||
{
|
||||
subDict.lookup("C1") >> C1_;
|
||||
}
|
||||
dictPtr->readIfPresent("C0", C0_);
|
||||
dictPtr->readIfPresent("C1", C1_);
|
||||
}
|
||||
|
||||
// Darcy-Forchheimer coefficients
|
||||
if (dict_.found("Darcy"))
|
||||
if (const dictionary* dictPtr = dict_.subDictPtr("Darcy"))
|
||||
{
|
||||
const dictionary& subDict = dict_.subDict("Darcy");
|
||||
// local-to-global transformation tensor
|
||||
const tensor& E = coordSys_.R();
|
||||
|
||||
dimensionedVector d("d", D_.dimensions(), vector::zero);
|
||||
dimensionedVector f("f", F_.dimensions(), vector::zero);
|
||||
|
||||
if (subDict.found("d"))
|
||||
dimensionedVector d(vector::zero);
|
||||
if (dictPtr->readIfPresent("d", d))
|
||||
{
|
||||
// d = dimensionedVector("d", subDict.lookup("d"));
|
||||
subDict.lookup("d") >> d;
|
||||
adjustNegativeResistance(d.value());
|
||||
if (D_.dimensions() != d.dimensions())
|
||||
{
|
||||
FatalIOErrorIn
|
||||
(
|
||||
"Foam::porousZone::porousZone"
|
||||
"(const fvMesh&, const word&, const dictionary&)",
|
||||
dict_
|
||||
) << "incorrect dimensions for d: " << d.dimensions()
|
||||
<< " should be " << D_.dimensions()
|
||||
<< exit(FatalIOError);
|
||||
}
|
||||
|
||||
}
|
||||
if (subDict.found("f"))
|
||||
{
|
||||
// f = dimensionedVector("f", subDict.lookup("f"));
|
||||
subDict.lookup("f") >> f;
|
||||
adjustNegativeResistance(f.value());
|
||||
adjustNegativeResistance(d);
|
||||
|
||||
D_.value().xx() = d.value().x();
|
||||
D_.value().yy() = d.value().y();
|
||||
D_.value().zz() = d.value().z();
|
||||
D_.value() = (E & D_ & E.T()).value();
|
||||
}
|
||||
|
||||
if (D_.dimensions() != d.dimensions())
|
||||
dimensionedVector f(vector::zero);
|
||||
if (dictPtr->readIfPresent("f", f))
|
||||
{
|
||||
FatalIOErrorIn
|
||||
(
|
||||
"Foam::porousZone::porousZone(const fvMesh&, const Istream&)",
|
||||
dict_
|
||||
) << "incorrect dimensions for d: " << d.dimensions()
|
||||
<< " should be " << D_.dimensions()
|
||||
<< exit(FatalIOError);
|
||||
if (F_.dimensions() != f.dimensions())
|
||||
{
|
||||
FatalIOErrorIn
|
||||
(
|
||||
"Foam::porousZone::porousZone"
|
||||
"(const fvMesh&, const word&, const dictionary&)",
|
||||
dict_
|
||||
) << "incorrect dimensions for f: " << f.dimensions()
|
||||
<< " should be " << F_.dimensions()
|
||||
<< exit(FatalIOError);
|
||||
}
|
||||
|
||||
adjustNegativeResistance(f);
|
||||
|
||||
// leading 0.5 is from 1/2 * rho
|
||||
F_.value().xx() = 0.5*f.value().x();
|
||||
F_.value().yy() = 0.5*f.value().y();
|
||||
F_.value().zz() = 0.5*f.value().z();
|
||||
F_.value() = (E & F_ & E.T()).value();
|
||||
}
|
||||
|
||||
if (F_.dimensions() != f.dimensions())
|
||||
{
|
||||
FatalIOErrorIn
|
||||
(
|
||||
"Foam::porousZone::porousZone(const fvMesh&, const Istream&)",
|
||||
dict_
|
||||
) << "incorrect dimensions for f: " << f.dimensions()
|
||||
<< " should be " << F_.dimensions()
|
||||
<< exit(FatalIOError);
|
||||
}
|
||||
|
||||
D_.value().xx() = d.value().x();
|
||||
D_.value().yy() = d.value().y();
|
||||
D_.value().zz() = d.value().z();
|
||||
D_.value() = (E & D_ & E.T()).value();
|
||||
|
||||
// leading 0.5 is from 1/2 * rho
|
||||
F_.value().xx() = 0.5*f.value().x();
|
||||
F_.value().yy() = 0.5*f.value().y();
|
||||
F_.value().zz() = 0.5*f.value().z();
|
||||
F_.value() = (E & F_ & E.T()).value();
|
||||
}
|
||||
|
||||
// provide some feedback for the user
|
||||
@ -179,7 +179,8 @@ Foam::porousZone::porousZone
|
||||
{
|
||||
FatalIOErrorIn
|
||||
(
|
||||
"Foam::porousZone::porousZone(const fvMesh&, const Istream&)",
|
||||
"Foam::porousZone::porousZone"
|
||||
"(const fvMesh&, const word&, const dictionary&)",
|
||||
dict_
|
||||
) << "neither powerLaw (C0/C1) "
|
||||
"nor Darcy-Forchheimer law (d/f) specified"
|
||||
|
||||
@ -128,7 +128,7 @@ class porousZone
|
||||
// Private Member Functions
|
||||
|
||||
//- adjust negative resistance values to be multiplier of max value
|
||||
static void adjustNegativeResistance(vector& resist);
|
||||
static void adjustNegativeResistance(dimensionedVector& resist);
|
||||
|
||||
//- Power-law resistance
|
||||
template<class RhoFieldType>
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
EXE_INC = \
|
||||
-I$(WM_THIRD_PARTY_DIR)/zlib-1.2.3
|
||||
|
||||
|
||||
@ -29,6 +29,24 @@ Description
|
||||
Launder, Reece and Rodi Reynolds-stress turbulence model for
|
||||
compressible flows.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
LRRCoeffs
|
||||
{
|
||||
Cmu 0.09;
|
||||
Clrr1 1.8;
|
||||
Clrr2 0.6;
|
||||
C1 1.44;
|
||||
C2 1.92;
|
||||
Cs 0.25;
|
||||
Ceps 0.15;
|
||||
alphah 1.0; // only for compressible
|
||||
alphaEps 0.76923;
|
||||
alphaR 1.22; // only for compressible
|
||||
couplingFactor 0.0; // only for incompressible
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
LRR.C
|
||||
LRRcorrect.C
|
||||
|
||||
@ -28,6 +28,26 @@ Class
|
||||
Description
|
||||
Launder-Gibson Reynolds stress turbulence model for compressible flows.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
LaunderGibsonRSTMCoeffs
|
||||
{
|
||||
Cmu 0.09;
|
||||
Clg1 1.8;
|
||||
Clg2 0.6;
|
||||
C1 1.44;
|
||||
C2 1.92;
|
||||
C1Ref 0.5;
|
||||
C2Ref 0.3;
|
||||
Cs 0.25;
|
||||
Ceps 0.15;
|
||||
alphah 1.0; // only for compressible
|
||||
alphaEps 0.76923;
|
||||
alphaR 1.22;
|
||||
couplingFactor 0.0;
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
LaunderGibsonRSTM.C
|
||||
LaunderGibsonRSTMcorrect.C
|
||||
|
||||
@ -29,6 +29,20 @@ Description
|
||||
Launder and Sharma low-Reynolds k-epsilon turbulence model for
|
||||
compressible and combusting flows.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
LaunderSharmaKECoeffs
|
||||
{
|
||||
Cmu 0.09;
|
||||
C1 1.44;
|
||||
C2 1.92;
|
||||
C3 -0.33;
|
||||
alphah 1.0; // only for compressible
|
||||
alphahk 1.0; // only for compressible
|
||||
alphaEps 0.76923;
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
LaunderSharmaKE.C
|
||||
LaunderSharmaKECorrect.C
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
SOURCE = \
|
||||
$(EXE_SRC)/RNGkEpsilon.C
|
||||
@ -28,6 +28,22 @@ Class
|
||||
Description
|
||||
Renormalisation group k-epsilon turbulence model for compressible flows.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
RNGkEpsilonCoeffs
|
||||
{
|
||||
Cmu 0.0845;
|
||||
C1 1.42;
|
||||
C2 1.68;
|
||||
C3 -0.33; // only for compressible
|
||||
alphah 1.0; // only for compressible
|
||||
alphak 1.39;
|
||||
alphaEps 1.39;
|
||||
eta0 4.38;
|
||||
beta 0.012;
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
RNGkEpsilon.C
|
||||
RNGkEpsilonCorrect.C
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
SOURCE = \
|
||||
$(EXE_SRC)/RNGkEpsilon.C
|
||||
@ -44,6 +44,21 @@ Description
|
||||
Ph.D. thesis, University of Michigan, 1996.
|
||||
@endverbatim
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
SpalartAllmarasCoeffs
|
||||
{
|
||||
Cb1 0.1355;
|
||||
Cb2 0.622;
|
||||
Cw2 0.3;
|
||||
Cw3 2.0;
|
||||
Cv1 7.1;
|
||||
Cv2 5.0;
|
||||
alphaNut 1.5;
|
||||
alphah 1.0; // only for compressible
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
SpalartAllmaras.C
|
||||
SpalartAllmarasCorrect.C
|
||||
|
||||
@ -28,6 +28,20 @@ Class
|
||||
Description
|
||||
Standard k-epsilon turbulence model for compressible flows
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
kEpsilonCoeffs
|
||||
{
|
||||
Cmu 0.09;
|
||||
C1 1.44;
|
||||
C2 1.92;
|
||||
C3 -0.33; // only for compressible
|
||||
alphak 1.0; // only for compressible
|
||||
alphaEps 0.76923;
|
||||
alphah 1.0; // only for compressible
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
kEpsilon.C
|
||||
kEpsilonCorrect.C
|
||||
|
||||
@ -39,7 +39,7 @@ Description
|
||||
Note that this implementation is written in terms of alpha diffusion
|
||||
coefficients rather than the more traditional sigma (alpha = 1/sigma) so
|
||||
that the blending can be applied to all coefficuients in a consistent
|
||||
manner. The paper suggests that sigma is blended but this woulf not be
|
||||
manner. The paper suggests that sigma is blended but this would not be
|
||||
consistent with the blending of the k-epsilon and k-omega models.
|
||||
|
||||
Also note that the error in the last term of equation (2) relating to
|
||||
@ -52,6 +52,26 @@ Description
|
||||
uncertainty in their origin, range of applicability and that is y+ becomes
|
||||
sufficiently small blending u_tau in this manner clearly becomes nonsense.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
kOmegaSST
|
||||
{
|
||||
Cmu 0.09;
|
||||
alphaK1 0.85034;
|
||||
alphaK2 1.0;
|
||||
alphaOmega1 0.5;
|
||||
alphaOmega2 0.85616;
|
||||
alphah 1.0; // only for compressible
|
||||
beta1 0.075;
|
||||
beta2 0.0828;
|
||||
betaStar 0.09;
|
||||
gamma1 0.5532;
|
||||
gamma2 0.4403;
|
||||
a1 0.31;
|
||||
c1 10.0;
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
kOmegaSST.C
|
||||
kOmegaWallFunctionsI.H
|
||||
|
||||
@ -37,7 +37,20 @@ Description
|
||||
Jiang Zhu
|
||||
|
||||
Computers and Fluids Vol. 24, No. 3, pp. 227-238, 1995
|
||||
@endverbatim
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
realizableKE
|
||||
{
|
||||
Cmu 0.09;
|
||||
A0 4.0;
|
||||
C2 1.9;
|
||||
alphak 1.0;
|
||||
alphaEps 0.833333;
|
||||
alphah 1.0; // only for compressible
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
realizableKE.C
|
||||
|
||||
@ -29,6 +29,24 @@ Description
|
||||
Launder, Reece and Rodi Reynolds-stress turbulence model for
|
||||
incompressible flows.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
LRRCoeffs
|
||||
{
|
||||
Cmu 0.09;
|
||||
Clrr1 1.8;
|
||||
Clrr2 0.6;
|
||||
C1 1.44;
|
||||
C2 1.92;
|
||||
Cs 0.25;
|
||||
Ceps 0.15;
|
||||
alphah 1.0; // only for compressible
|
||||
alphaEps 0.76923;
|
||||
alphaR 1.22; // only for compressible
|
||||
couplingFactor 0.0; // only for incompressible
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
LRR.C
|
||||
|
||||
|
||||
@ -28,6 +28,26 @@ Class
|
||||
Description
|
||||
Launder-Gibson Reynolds stress turbulence model for incompressible flows.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
LaunderGibsonRSTMCoeffs
|
||||
{
|
||||
Cmu 0.09;
|
||||
Clg1 1.8;
|
||||
Clg2 0.6;
|
||||
C1 1.44;
|
||||
C2 1.92;
|
||||
C1Ref 0.5;
|
||||
C2Ref 0.3;
|
||||
Cs 0.25;
|
||||
Ceps 0.15;
|
||||
alphah 1.0; // only for compressible
|
||||
alphaEps 0.76923;
|
||||
alphaR 1.22;
|
||||
couplingFactor 0.0;
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
LaunderGibsonRSTM.C
|
||||
|
||||
|
||||
@ -29,6 +29,20 @@ Description
|
||||
Launder and Sharma low-Reynolds k-epsilon turbulence model for
|
||||
incompressible flows.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
LaunderSharmaKECoeffs
|
||||
{
|
||||
Cmu 0.09;
|
||||
C1 1.44;
|
||||
C2 1.92;
|
||||
C3 -0.33;
|
||||
alphah 1.0; // only for compressible
|
||||
alphahk 1.0; // only for compressible
|
||||
alphaEps 0.76923;
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
LaunderSharmaKE.C
|
||||
|
||||
|
||||
@ -28,6 +28,22 @@ Class
|
||||
Description
|
||||
Renormalisation group k-epsilon turbulence model for incompressible flows.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
RNGkEpsilonCoeffs
|
||||
{
|
||||
Cmu 0.0845;
|
||||
C1 1.42;
|
||||
C2 1.68;
|
||||
C3 -0.33; // only for compressible
|
||||
alphah 1.0; // only for compressible
|
||||
alphak 1.39;
|
||||
alphaEps 1.39;
|
||||
eta0 4.38;
|
||||
beta 0.012;
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
RNGkEpsilon.C
|
||||
|
||||
|
||||
@ -42,7 +42,22 @@ Description
|
||||
for High Reynolds Number Compressible Flows"
|
||||
G.A. Ashford,
|
||||
Ph.D. thesis, University of Michigan, 1996.
|
||||
@endverbatim
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
SpalartAllmarasCoeffs
|
||||
{
|
||||
Cb1 0.1355;
|
||||
Cb2 0.622;
|
||||
Cw2 0.3;
|
||||
Cw3 2.0;
|
||||
Cv1 7.1;
|
||||
Cv2 5.0;
|
||||
alphaNut 1.5;
|
||||
alphah 1.0; // only for compressible
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
SpalartAllmaras.C
|
||||
|
||||
@ -28,6 +28,20 @@ Class
|
||||
Description
|
||||
Standard k-epsilon turbulence model for incompressible flows.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
kEpsilonCoeffs
|
||||
{
|
||||
Cmu 0.09;
|
||||
C1 1.44;
|
||||
C2 1.92;
|
||||
C3 -0.33; // only for compressible
|
||||
alphak 1.0; // only for compressible
|
||||
alphaEps 0.76923;
|
||||
alphah 1.0; // only for compressible
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
kEpsilon.C
|
||||
|
||||
|
||||
@ -53,6 +53,26 @@ Description
|
||||
uncertainty in their origin, range of applicability and that is y+ becomes
|
||||
sufficiently small blending u_tau in this manner clearly becomes nonsense.
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
kOmegaSST
|
||||
{
|
||||
Cmu 0.09;
|
||||
alphaK1 0.85034;
|
||||
alphaK2 1.0;
|
||||
alphaOmega1 0.5;
|
||||
alphaOmega2 0.85616;
|
||||
alphah 1.0; // only for compressible
|
||||
beta1 0.075;
|
||||
beta2 0.0828;
|
||||
betaStar 0.09;
|
||||
gamma1 0.5532;
|
||||
gamma2 0.4403;
|
||||
a1 0.31;
|
||||
c1 10.0;
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
kOmegaSST.C
|
||||
kOmegaWallFunctionsI.H
|
||||
|
||||
@ -37,8 +37,20 @@ Description
|
||||
Jiang Zhu
|
||||
|
||||
Computers and Fluids Vol. 24, No. 3, pp. 227-238, 1995
|
||||
@verbatim
|
||||
@endverbatim
|
||||
|
||||
The default model coefficients correspond to the following:
|
||||
@verbatim
|
||||
realizableKE
|
||||
{
|
||||
Cmu 0.09;
|
||||
A0 4.0;
|
||||
C2 1.9;
|
||||
alphak 1.0;
|
||||
alphaEps 0.833333;
|
||||
alphah 1.0; // only for compressible
|
||||
}
|
||||
@endverbatim
|
||||
|
||||
SourceFiles
|
||||
realizableKE.C
|
||||
|
||||
Reference in New Issue
Block a user