diff --git a/applications/utilities/mesh/manipulation/setSet/.setSet b/applications/utilities/mesh/manipulation/setSet/.setSet
deleted file mode 100644
index ff604669be5caa27f3a0073fdc8fb1e8f21bfd5f..0000000000000000000000000000000000000000
--- a/applications/utilities/mesh/manipulation/setSet/.setSet
+++ /dev/null
@@ -1 +0,0 @@
-quit
diff --git a/bin/foamLog b/bin/foamLog
index 28e97a46306a5692506731190fbaa8c167d4fd25..0848d50cc1b7c6f2eeb56cef3c4590da7f0456f0 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -47,7 +47,7 @@ printUsage() {
cat <<LABUSAGE
$PROGNAME - extracts xy files from Foam logs.
-Usage: $PROGNAME [-n][-s] <root> <case> <log>
+Usage: $PROGNAME [-n][-s] <log>
extracts xy files from log
$PROGNAME -l <log>
lists but does not extract
@@ -82,11 +82,11 @@ files with the extracted data only.
The query database is a simple text format with three entries per line,
separated with '/'. Column 1 is the name of the variable (cannot contain
-spaces), column 2 is the regular expression to select the line and
-column 3 is the string to select the column inside the line. The value
-taken will be the first (non-space)word after this column.
-The database will either be \$HOME/.${PROGNAME}.db or if not found
-$PROGDIR/${PROGNAME}.db.
+spaces), column 2 is the extended regular expression (egrep) to select
+the line and column 3 is the string (fgrep) to select the column inside the
+line. The value taken will be the first (non-space)word after this
+column. The database will either be \$HOME/.${PROGNAME}.db or if not
+found $PROGDIR/${PROGNAME}.db.
Option -s suppresses the default information and only prints the extracted
variables.
@@ -105,7 +105,7 @@ myEcho() {
# getSolvedVars logFile
# Prints names of all 'solved for' variables in the log file.
getSolvedVars() {
- grep ' Solving for ' $1 | fgrep ',' | sed -e 's/.* Solving for \([^,]*\)[,:].*/\1/' | sort -u
+ fgrep ' Solving for ' $1 | fgrep ',' | sed -e 's/.* Solving for \([^,]*\)[,:].*/\1/' | sort -u
}
@@ -163,7 +163,7 @@ getAllQueries() {
for var in $dbQueries
do
getQueries $1 "$var"
- line=`grep "$LINEQ" $2`
+ line=`egrep "$LINEQ" $2`
if [ "$line" ]; then
column=`echo "$line" | fgrep "$NUMQ"`
if [ "$column" ]; then
@@ -228,14 +228,13 @@ if [ "$LISTONLY" ]; then
exit 0
fi
-if [ $# -ne 3 ]; then
+if [ $# -ne 1 ]; then
printUsage
exit 1
fi
-ROOT=$1
-CASE=$2
-LOG=$3
+CASEDIR=.
+LOG=$1
if [ ! -r $LOG ]; then
echo "$PROGNAME: Cannot read log $LOG"
exit 1
@@ -244,13 +243,13 @@ fi
QUERYNAMES=`getAllQueries $DBFILE $LOG`
-if [ ! "$ROOT" -o ! "$CASE" ]; then
+if [ ! "$CASEDIR" ]; then
printUsage
exit 1
fi
-if [ ! -d "$ROOT/$CASE" ]; then
- echo "$PROGNAME: Cannot read $ROOT/$CASE"
+if [ ! -d "$CASEDIR" ]; then
+ echo "$PROGNAME: Cannot read $CASEDIR"
exit 1
fi
@@ -262,16 +261,14 @@ fi
#-- Make logs dir in case directory and put awk file there.
-mkdir -p $ROOT/$CASE/logs
-AWKFILE=$ROOT/$CASE/logs/$PROGNAME.awk
+mkdir -p $CASEDIR/logs
+AWKFILE=$CASEDIR/logs/$PROGNAME.awk
myEcho "Using:"
-myEcho " root : $ROOT"
-myEcho " case : $CASE"
myEcho " log : $LOG"
myEcho " database : $DBFILE"
myEcho " awk file : $AWKFILE"
-myEcho " files to : $ROOT/$CASE/logs"
+myEcho " files to : $CASEDIR/logs"
myEcho ""
@@ -364,19 +361,19 @@ cat <<LABSOLVE >> $AWKFILE
varName=varNameVal[1]
file=varName "_" subIter[varName]++
- file="$ROOT/$CASE/logs/" file
+ file="$CASEDIR/logs/" file
extract(\$0, "Initial residual = ", val)
print $TIMENAME "\t" val[1] > file
varName=varNameVal[1] "FinalRes"
file=varName "_" subIter[varName]++
- file="$ROOT/$CASE/logs/" file
+ file="$CASEDIR/logs/" file
extract(\$0, "Final residual = ", val)
print $TIMENAME "\t" val[1] > file
varName=varNameVal[1] "Iters"
file=varName "_" subIter[varName]++
- file="$ROOT/$CASE/logs/" file
+ file="$CASEDIR/logs/" file
extract(\$0, "No Iterations ", val)
print $TIMENAME "\t" val[1] > file
}
@@ -393,7 +390,7 @@ do
echo "#-- Extraction of $queryName" >> $AWKFILE
echo "/$LINEQ/ {" >> $AWKFILE
echo " extract(\$0, \"$NUMQ\", val)" >> $AWKFILE
- echo " file=\"$ROOT/$CASE/logs/${queryName}_\" ${counter}" >> $AWKFILE
+ echo " file=\"$CASEDIR/logs/${queryName}_\" ${counter}" >> $AWKFILE
echo " print $TIMENAME \"\\t\" val[1] > file" >> $AWKFILE
echo " ${counter}++" >> $AWKFILE
echo "}" >> $AWKFILE
diff --git a/bin/foamLog.db b/bin/foamLog.db
index 933dae1a8d80e563caeb656a423104c3bf0fa950..49d551f32c42fdac5f9e3b0944a983d2cee8e96c 100644
--- a/bin/foamLog.db
+++ b/bin/foamLog.db
@@ -48,6 +48,6 @@ epsMax/bounding epsilon,/max:
epsAvg/bounding epsilon,/average:
#- gamma bounding
-gammaMin/Min\(gamma\) =/Min(gamma) =
-gammaMax/Max\(gamma\) =/Max(gamma) =
+gammaMin/Min\(gamma\) =/Min(gamma) =
+gammaMax/Max\(gamma\) =/Max(gamma) =
diff --git a/doc/Doxygen/tools/README b/doc/Doxygen/tools/README
index 0a3a9ceecbdebda2b4685489d2c8a458f56af78a..86c4e8ae734d2080c5ac23d0fed4c7130236bbcd 100644
--- a/doc/Doxygen/tools/README
+++ b/doc/Doxygen/tools/README
@@ -11,4 +11,5 @@ Misc Tools
1. find-templateInComments
2. find-its
3. find-junkFiles
+4. find-longlines
diff --git a/doc/Doxygen/tools/find-longlines b/doc/Doxygen/tools/find-longlines
new file mode 100755
index 0000000000000000000000000000000000000000..c5294715d8c3a6e878fa1098f99e9bd68e1c73f6
--- /dev/null
+++ b/doc/Doxygen/tools/find-longlines
@@ -0,0 +1,46 @@
+#!/usr/bin/perl -w
+use strict;
+use File::Find ();
+
+# -----------------------------------------------------------------------------
+#
+# Script
+# find-longlines
+#
+# Description
+# Search for *.[CH] files that exceed the 80-column width
+#
+# - print filename lineNumber and offending line (with truncation point)
+#
+# -----------------------------------------------------------------------------
+
+my $maxlen = 80;
+my $re_filespec = qr{^.+\.[CH]$};
+my $count;
+
+sub wanted {
+ unless ( lstat($_) and -f _ and -r _ and not -l _ and /$re_filespec/ ) {
+ return;
+ }
+
+ local @ARGV = $_;
+ while (<>) {
+ chomp;
+ s{\s+$}{}; # trim
+
+ if ( $maxlen < length ) {
+ $count++;
+ substr( $_, $maxlen, 0 ) = "||->>"; # show truncation point
+ print "$ARGV $. $_\n";
+ }
+ }
+ close ARGV;
+}
+
+## Traverse desired filesystems
+for my $dir (@ARGV) {
+ no warnings 'File::Find';
+ warn "(**) checking '$dir' ...\n";
+ File::Find::find( { wanted => \&wanted }, $dir );
+}
+
diff --git a/src/OpenFOAM/db/IOstreams/gzstream/gzstream.C.1.7 b/src/OpenFOAM/db/IOstreams/gzstream/gzstream.C.1.7
deleted file mode 100644
index 361609a24ab28cde75715982ae7202369b1b20bf..0000000000000000000000000000000000000000
--- a/src/OpenFOAM/db/IOstreams/gzstream/gzstream.C.1.7
+++ /dev/null
@@ -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 //
diff --git a/src/OpenFOAM/db/IOstreams/gzstream/gzstream.h.1.5 b/src/OpenFOAM/db/IOstreams/gzstream/gzstream.h.1.5
deleted file mode 100644
index 861653f4810f244e60ec1e049ec60bc903a573ce..0000000000000000000000000000000000000000
--- a/src/OpenFOAM/db/IOstreams/gzstream/gzstream.h.1.5
+++ /dev/null
@@ -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 //
-
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
index 6576e3699c4b6829866372e841cfabbc54623ce0..790ef687b9acdad60f8d5c2414b966f28a082298 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H
@@ -803,7 +803,7 @@ public:
(
const dictionary& shrinkDict,
const dictionary& motionDict,
- const scalar nAllowableErrors,
+ const label nAllowableErrors,
motionSmoother&
);
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriverLayers.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriverLayers.C
index 1cfbee79d4f8c92d52862f13fc5974eeec17715c..1de6e845fb7ac8450e6ea297cf38c8dba199333a 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriverLayers.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriverLayers.C
@@ -2346,7 +2346,7 @@ void Foam::autoHexMeshDriver::addLayers
(
const dictionary& shrinkDict,
const dictionary& motionDict,
- const scalar nAllowableErrors,
+ const label nAllowableErrors,
motionSmoother& meshMover
)
{
diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
index 1a1d9401937107f376ca1c4ff206178ba5246667..c2fca0bbd9c9de0672eeea0e64c27d49f9a2765f 100644
--- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
+++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
@@ -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");
-
- dimensionedVector d("d", D_.dimensions(), vector::zero);
- dimensionedVector f("f", F_.dimensions(), vector::zero);
+ // local-to-global transformation tensor
+ const tensor& E = coordSys_.R();
- 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 (subDict.found("f"))
- {
- // f = dimensionedVector("f", subDict.lookup("f"));
- subDict.lookup("f") >> f;
- adjustNegativeResistance(f.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);
+ }
+
+ 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"
diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H
index eb58f7bb4717a7ab568dc7207d93372c9942de6c..671c39fa459482565d68056c6869d164cf4c7855 100644
--- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H
+++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.H
@@ -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>
diff --git a/src/triSurface/Make/options b/src/triSurface/Make/options
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cd3f5ed69c3b97c7bd5a38c86e0a230089feb8f4 100644
--- a/src/triSurface/Make/options
+++ b/src/triSurface/Make/options
@@ -0,0 +1,3 @@
+EXE_INC = \
+ -I$(WM_THIRD_PARTY_DIR)/zlib-1.2.3
+
diff --git a/src/turbulenceModels/RAS/compressible/LRR/LRR.H b/src/turbulenceModels/RAS/compressible/LRR/LRR.H
index 186abc311c7680e5454f32ab4d9e409efbfaedc6..ad2d9df8f4d395e08349a8f092168e3557c084e8 100644
--- a/src/turbulenceModels/RAS/compressible/LRR/LRR.H
+++ b/src/turbulenceModels/RAS/compressible/LRR/LRR.H
@@ -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
diff --git a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 9c403c5d4254e01bf0e58ad672dd8ab33e641ae3..8457e178d0a54f59e37f5fed00faae100008f07b 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -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
diff --git a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
index 65151f87072f7d3a8970a03be145c183bff5448d..ec1a66e09f2a198c39273c45fa1880256bf8e2db 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
@@ -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
diff --git a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/sourceFiles b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/sourceFiles
deleted file mode 100644
index 4af781d2c82f290a1765bedaf3d2a059f04f9572..0000000000000000000000000000000000000000
--- a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/sourceFiles
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCE = \
-$(EXE_SRC)/RNGkEpsilon.C
diff --git a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
index 66295b73ae5f0779e68a1c0530a490e1c779d430..38d66ad0c715c3ad2be729da05329f7ef8b5f717 100644
--- a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
@@ -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
diff --git a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/sourceFiles b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/sourceFiles
deleted file mode 100644
index 4af781d2c82f290a1765bedaf3d2a059f04f9572..0000000000000000000000000000000000000000
--- a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/sourceFiles
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCE = \
-$(EXE_SRC)/RNGkEpsilon.C
diff --git a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
index a163335fd6352817f981f729d121e0a0421f30a0..2a96baa02f5dbee7aff48d239ea887eb39ee25c1 100644
--- a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
@@ -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
diff --git a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
index 91f6d90af9486f77376c476bbb8f8690bc6e9755..521c722937aeb45e8449221c144ffcabdaf1eb48 100644
--- a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
@@ -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
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
index 3ddcde214eda5777915f9356b3661f9eb07bb7b2..7e321cc59462953b45b7851039d0393c6dad0d6d 100644
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
@@ -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
diff --git a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
index 1e70ab521d94913b22d4fe41e6fd05a672ef5d88..510134ee6d5cb08847a81be3e2fa7d5afb67a20d 100644
--- a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.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
diff --git a/src/turbulenceModels/RAS/incompressible/LRR/LRR.H b/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
index 84f2692e4ac7572fac2b77eda632b78bd6055fec..e61319364d2450943b07a1c6f127951afbe90423 100644
--- a/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
+++ b/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
@@ -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
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index d84ddbd93b00a96307a5b6432978aa49dc3a8849..0bb147f3a545342d78075e4c6d288a6c8aba0138 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -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
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
index e4e134d44238f39b6da1cf6c532fd41279cff174..eb7a371d328b7f782492753078825fb26e305490 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
@@ -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
diff --git a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
index 58cd18a943105c0b9557fe8825253aaf58530e2c..01b50d03eefa88ce6497f021a11f256c45687890 100644
--- a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
@@ -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
diff --git a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
index 98fc25adb0336cde6a8fda10227c6053a7ec9ba2..947eda2c884c59c0f45dd766514d522b66bde4f3 100644
--- a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
@@ -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
diff --git a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
index c3383f2d36cbc3ee4f28f64ed566c815df37124f..b0e93d3a47283163386b0f8c0444476e3c1eb16f 100644
--- a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
@@ -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
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
index 418b759d240035e193e041a6451ed4d2ccede541..da3c2dc06494295efe762b9cfc7105429e332353 100644
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
@@ -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
diff --git a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
index 84b585595346d9ddc1a22324f4f9e675c888afcc..7a38d7e62d51862c763355b2502c86dd1da37fe4 100644
--- a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.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