Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
henry
2009-07-16 12:42:45 +01:00
42 changed files with 195 additions and 230 deletions

4
.gitignore vendored
View File

@ -41,10 +41,6 @@ SunOS*Gcc*/
# reinstate wmake/rules that might look like build folders
!wmake/rules/*/
# but do continue to ignore the derived wmake files
wmake/rules/*/dirToString
wmake/rules/*/wmkdep
# doxygen generated documentation
doc/[Dd]oxygen/html
doc/[Dd]oxygen/latex

View File

@ -85,7 +85,7 @@ For finer control, the build stages can be also selected individually
-make
-makedoc
-install
[-envpath] alter absolute paths in CMake files to use env variables
-envpath alter absolute paths in CMake files to use env variables
Build and install paraview-$ParaView_VERSION
- run from folder above the ParaView source folder or place the ParaView
@ -150,8 +150,7 @@ do
runINSTALL=true
shift
;;
-envpath) # optional: change cmake files to use env variables
# This is now the default behaviour
-envpath) # stage 5: change cmake files to use env variables
runCONFIG=false
runMAKE=false
runMAKEDOC=false

View File

@ -86,9 +86,10 @@ find -H $packDir \
-a ! -name "log[0-9]*" \
-a ! -name "so_locations" \
| sed \
-e "\@$packDir/.git/@d" \
-e "\@$packDir/lib/@d" \
-e '\@/\.git/@d' \
-e '\@applications/bin/@d' \
-e '\@wmake/utilbin/@d' \
-e '\@/t/@d' \
-e '\@Make[.A-Za-z]*/[^/]*/@d' \
-e '\@doc/[Dd]oxygen/html@d' \
@ -100,7 +101,7 @@ find -H $packDir \
tar czpf $packFile --files-from $tmpFile
if [ $? = 0 ]
if [ $? -eq 0 ]
then
echo "Finished packing and compressing $packDir into file $packFile"
else

View File

@ -41,6 +41,9 @@ then
fi
arch=$1
# base arch (w/o precision, optimization, etc)
baseArch=$(echo "$arch" | sed -e 's@[DS]P.*$@@')
timeStamp=$(date +%Y-%m-%d)
packDir=$WM_PROJECT-$WM_PROJECT_VERSION
packFile=${packDir}.${arch}_${timeStamp}.gtgz
@ -73,6 +76,7 @@ dirList=$(
$packDir/lib/$arch \
$packDir/applications/bin/$arch \
$packDir/wmake/rules \
$packDir/wmake/utilbin/$baseArch \
;
do
[ -d $dir ] && echo $dir
@ -80,12 +84,12 @@ dirList=$(
)
echo
echo "Packing $arch port of $packDir into $packFile"
echo "Packing $arch ($baseArch) port of $packDir into $packFile"
echo
tar czpf $packFile $dirList
if [ $? = 0 ]
if [ $? -eq 0 ]
then
echo "Finished packing and compressing file $packFile"
else

View File

@ -112,7 +112,7 @@ else
tar czpf $packFile $packDir/doc/Doxygen/html
fi
if [ $? = 0 ]
if [ $? -eq 0 ]
then
echo "Finished packing doxygen html into file $packFile"
else

View File

@ -62,7 +62,7 @@ echo $timeStamp 2>/dev/null > $packDir/.timeStamp
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo
echo "Packing $packDir into $packFile"
echo "Packing $packDir source files into $packFile"
echo
foamPackSource $packDir $packFile

View File

@ -78,19 +78,24 @@ find -H $packDir \
-a ! -name "log[0-9]*" \
-a ! -name "libccmio*" \
| sed \
-e "\@$packDir/.git/@d" \
-e "\@/.tags/@d" \
-e "\@$packDir/lib/@d" \
-e "\@libccmio.*/@d" \
-e '\@/\.git/@d' \
-e '\@/\.tags/@d' \
-e '\@applications/bin/@d' \
-e '\@wmake/utilbin/@d' \
-e '\@/t/@d' \
-e '\@/Make[.A-Za-z]*/[^/]*/@d'\
-e '\@/platforms/@d' \
-e '\@libccmio.*/@d' \
> $tmpFile
# provide some feedback
wc $tmpFile | awk '{print "Packing",$1,"files - this could take some time ..."}'
tar czpf $packFile --files-from $tmpFile
if [ $? = 0 ]
if [ $? -eq 0 ]
then
echo "Finished packing and compressing $packDir into file $packFile"
else

View File

@ -31,7 +31,7 @@
#
#------------------------------------------------------------------------------
if [ $# = 0 ]
if [ $# -eq 0 ]
then
echo "Error: archOptions type expected, exiting"
echo
@ -41,16 +41,23 @@ then
fi
archOptions=$1
arch=${archOptions%%G*} # TODO: works for Gcc only
arch3264=$(echo "$arch" | sed 's@64@-64@')
arch3264=$(echo "$arch" | sed -e 's@64@-64@')
echo "archOptions=$archOptions"
echo "arch=$arch"
echo "arch3264=$arch3264"
timeStamp=$(date +%Y-%m-%d)
packDir=ThirdParty
packDir=${WM_THIRD_PARTY_DIR:-ThirdParty}
packDir=${packDir##*/}
packFile=${packDir}.${archOptions}_${timeStamp}.gtgz
if [ ! -d $packDir ]
then
echo "Error: directory $packDir does not exist"
exit 1
fi
# add optional output directory
if [ -d "$2" ]
then
@ -71,7 +78,7 @@ echo
tar czpf $packFile $dirList
if [ $? = 0 ]
if [ $? -eq 0 ]
then
echo "Finished packing and compressing file $packFile"
else

View File

@ -32,7 +32,8 @@
#------------------------------------------------------------------------------
timeStamp=$(date +%Y-%m-%d)
packDir=ThirdParty
packDir=${WM_THIRD_PARTY_DIR:-ThirdParty}
packDir=${packDir##*/}
packFile=${packDir}.General_${timeStamp}.gtgz
if [ ! -d $packDir ]
@ -62,7 +63,7 @@ echo $timeStamp 2>/dev/null > $packDir/.timeStamp
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo
echo "Packing $packDir into $packFile"
echo "Packing $packDir source files into $packFile"
echo
foamPackSource $packDir $packFile

View File

@ -1,5 +0,0 @@
[Dolphin]
AdditionalInfo=3
SortOrder=0
Timestamp=2009,6,10,15,58,20
ViewMode=1

View File

@ -33,13 +33,13 @@ Class
Foam::compressible::LESModel
Description
Class for all compressible flow LES SGS models.
Base class for all compressible flow LES SGS models.
This class defines the basic interface for a compressible flow SGS model,
and encapsulates data of value to all possible models. In particular
this includes references to all the dependent fields (rho, U, phi),
the physical viscosity mu, and the LESProperties dictionary,
which contains the model selection and model coefficients.
This class defines the basic interface for a compressible flow SGS
model, and encapsulates data of value to all possible models.
In particular this includes references to all the dependent fields
(rho, U, phi), the physical viscosity mu, and the LESProperties
dictionary, which contains the model selection and model coefficients.
SourceFiles
LESModel.C

View File

@ -51,8 +51,8 @@ void kQRWallFunctionFvPatchField<Type>::checkType()
<< "Invalid wall function specification" << nl
<< " Patch type for patch " << this->patch().name()
<< " must be wall" << nl
<< " Current patch type is " << this->patch().type()
<< nl << endl << abort(FatalError);
<< " Current patch type is " << this->patch().type() << nl << endl
<< abort(FatalError);
}
}

View File

@ -30,12 +30,11 @@ Description
SourceFiles
laminar.C
laminarCorrect.C
\*---------------------------------------------------------------------------*/
#ifndef compressibleLaminar_H
#define compressibleLaminar_H
#ifndef compressibleRasLaminar_H
#define compressibleRasLaminar_H
#include "RASModel.H"
@ -82,42 +81,42 @@ public:
// Member Functions
//- Return the turbulence viscosity, i.e. 0 for laminar flow
tmp<volScalarField> mut() const;
virtual tmp<volScalarField> mut() const;
//- Return the effective viscosity, i.e. the laminar viscosity
tmp<volScalarField> muEff() const
virtual tmp<volScalarField> muEff() const
{
return tmp<volScalarField>(new volScalarField("muEff", mu()));
}
//- Return the effective turbulent thermal diffusivity,
// i.e. the laminar thermal diffusivity
tmp<volScalarField> alphaEff() const
virtual tmp<volScalarField> alphaEff() const
{
return tmp<volScalarField>(new volScalarField("alphaEff", alpha()));
}
//- Return the turbulence kinetic energy, i.e. 0 for laminar flow
tmp<volScalarField> k() const;
virtual tmp<volScalarField> k() const;
//- Return the turbulence kinetic energy dissipation rate,
// i.e. 0 for laminar flow
tmp<volScalarField> epsilon() const;
virtual tmp<volScalarField> epsilon() const;
//- Return the Reynolds stress tensor, i.e. 0 for laminar flow
tmp<volSymmTensorField> R() const;
virtual tmp<volSymmTensorField> R() const;
//- Return the effective stress tensor, i.e. the laminar stress
tmp<volSymmTensorField> devRhoReff() const;
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
//- Correct the laminar viscosity
void correct();
virtual void correct();
//- Read RASProperties dictionary
bool read();
virtual bool read();
};

View File

@ -1,5 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
LIB_LIBS = \

View File

@ -52,10 +52,10 @@ laminar::laminar
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
const basicThermo& thermoPhysicalModel
const basicThermo& thermophysicalModel
)
:
turbulenceModel(rho, U, phi, thermoPhysicalModel)
turbulenceModel(rho, U, phi, thermophysicalModel)
{}
@ -66,10 +66,10 @@ autoPtr<laminar> laminar::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
const basicThermo& thermoPhysicalModel
const basicThermo& thermophysicalModel
)
{
return autoPtr<laminar>(new laminar(rho, U, phi, thermoPhysicalModel));
return autoPtr<laminar>(new laminar(rho, U, phi, thermophysicalModel));
}
@ -96,18 +96,6 @@ tmp<volScalarField> laminar::mut() const
}
tmp<volScalarField> laminar::muEff() const
{
return tmp<volScalarField>(new volScalarField("muEff", mu()));
}
tmp<volScalarField> laminar::alphaEff() const
{
return tmp<volScalarField>(new volScalarField("alphaEff", alpha()));
}
tmp<volScalarField> laminar::k() const
{
return tmp<volScalarField>

View File

@ -33,8 +33,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef laminar_H
#define laminar_H
#ifndef compressibleLaminar_H
#define compressibleLaminar_H
#include "turbulenceModel.H"
@ -67,7 +67,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
const basicThermo& thermoPhysicalModel
const basicThermo& thermophysicalModel
);
@ -79,7 +79,7 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
const basicThermo& thermoPhysicalModel
const basicThermo& thermophysicalModel
);
@ -94,10 +94,17 @@ public:
virtual tmp<volScalarField> mut() const;
//- Return the effective viscosity, i.e. the laminar viscosity
virtual tmp<volScalarField> muEff() const;
virtual tmp<volScalarField> muEff() const
{
return tmp<volScalarField>(new volScalarField("muEff", mu()));
}
//- Return the effective turbulent thermal diffusivity
virtual tmp<volScalarField> alphaEff() const;
//- Return the effective turbulent thermal diffusivity,
// i.e. the laminar thermal diffusivity
virtual tmp<volScalarField> alphaEff() const
{
return tmp<volScalarField>(new volScalarField("alphaEff", alpha()));
}
//- Return the turbulence kinetic energy, i.e. 0 for laminar flow
virtual tmp<volScalarField> k() const;
@ -109,7 +116,7 @@ public:
//- Return the Reynolds stress tensor, i.e. 0 for laminar flow
virtual tmp<volSymmTensorField> R() const;
//- Return the effective stress tensor including the laminar stress
//- Return the effective stress tensor, i.e. the laminar stress
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation

View File

@ -117,12 +117,6 @@ autoPtr<turbulenceModel> turbulenceModel::New
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
turbulenceModel::~turbulenceModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void turbulenceModel::correct()

View File

@ -144,7 +144,8 @@ public:
//- Destructor
virtual ~turbulenceModel();
virtual ~turbulenceModel()
{}
// Member Functions

View File

@ -124,8 +124,8 @@ autoPtr<LESModel> LESModel::New
{
FatalErrorIn
(
"LESModel::select(const volVectorField&, const "
"surfaceScalarField&, transportModel&)"
"LESModel::New(const volVectorField& U, const "
"surfaceScalarField& phi, transportModel&)"
) << "Unknown LESModel type " << modelName
<< endl << endl
<< "Valid LESModel types are :" << endl
@ -137,12 +137,6 @@ autoPtr<LESModel> LESModel::New
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
LESModel::~LESModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void LESModel::correct(const tmp<volTensorField>&)

View File

@ -35,10 +35,10 @@ Description
Base class for all incompressible flow LES SGS models.
This class defines the basic interface for an incompressible flow SGS
model, and encapsulates data of value to all possible models. In
particular this includes references to all the dependent fields (U,
phi), the physical viscosity nu, and the LESProperties
dictionary which contains the model selection and model coefficients.
model, and encapsulates data of value to all possible models.
In particular this includes references to all the dependent fields
(U, phi), the physical viscosity nu, and the LESProperties
dictionary, which contains the model selection and model coefficients.
SourceFiles
LESModel.C
@ -151,7 +151,8 @@ public:
//- Destructor
virtual ~LESModel();
virtual ~LESModel()
{}
// Member Functions
@ -240,14 +241,14 @@ public:
}
//- Correct Eddy-Viscosity and related properties
virtual void correct(const tmp<volTensorField>& gradU);
//- Correct Eddy-Viscosity and related properties.
// This calls correct(const tmp<volTensorField>& gradU) by supplying
// gradU calculated locally.
void correct();
//- Correct Eddy-Viscosity and related properties
virtual void correct(const tmp<volTensorField>& gradU);
//- Read LESProperties dictionary
virtual bool read() = 0;
};

View File

@ -133,12 +133,6 @@ dynOneEqEddy::dynOneEqEddy
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
dynOneEqEddy::~dynOneEqEddy()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void dynOneEqEddy::correct(const tmp<volTensorField>& gradU)

View File

@ -116,7 +116,8 @@ public:
//- Destructor
virtual ~dynOneEqEddy();
virtual ~dynOneEqEddy()
{}
// Member Functions

View File

@ -124,12 +124,6 @@ dynSmagorinsky::dynSmagorinsky
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
dynSmagorinsky::~dynSmagorinsky()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void dynSmagorinsky::correct(const tmp<volTensorField>& gradU)

View File

@ -125,7 +125,8 @@ public:
//- Destructor
virtual ~dynSmagorinsky();
virtual ~dynSmagorinsky()
{}
// Member Functions

View File

@ -34,8 +34,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef laminar_H
#define laminar_H
#ifndef lesLaminar_H
#define lesLaminar_H
#include "LESModel.H"
#include "volFields.H"

View File

@ -126,12 +126,6 @@ locDynOneEqEddy::locDynOneEqEddy
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
locDynOneEqEddy::~locDynOneEqEddy()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void locDynOneEqEddy::correct(const tmp<volTensorField>& gradU)

View File

@ -138,7 +138,8 @@ public:
//- Destructor
virtual ~locDynOneEqEddy();
virtual ~locDynOneEqEddy()
{}
// Member Functions

View File

@ -56,12 +56,6 @@ scaleSimilarity::scaleSimilarity
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
scaleSimilarity::~scaleSimilarity()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
tmp<volScalarField> scaleSimilarity::k() const

View File

@ -90,7 +90,8 @@ public:
//- Destructor
virtual ~scaleSimilarity();
virtual ~scaleSimilarity()
{}
// Member Functions

View File

@ -174,14 +174,9 @@ autoPtr<RASModel> RASModel::New
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
RASModel::~RASModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const
{
scalar ypl = 11.0;

View File

@ -182,7 +182,8 @@ public:
//- Destructor
virtual ~RASModel();
virtual ~RASModel()
{}
// Member Functions
@ -310,9 +311,6 @@ public:
);
}
//- Return yPlus for the given patch
virtual tmp<scalarField> yPlus(const label patchI) const;
//- Return the turbulence kinetic energy
virtual tmp<volScalarField> k() const = 0;
@ -328,6 +326,9 @@ public:
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const = 0;
//- Return yPlus for the given patch
virtual tmp<scalarField> yPlus(const label patchI) const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct() = 0;

View File

@ -77,12 +77,6 @@ tmp<volScalarField> laminar::nut() const
}
tmp<volScalarField> laminar::nuEff() const
{
return tmp<volScalarField>(new volScalarField("nuEff", nu()));
}
tmp<volScalarField> laminar::k() const
{
return tmp<volScalarField>

View File

@ -33,8 +33,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef laminar_H
#define laminar_H
#ifndef rasLaminar_H
#define rasLaminar_H
#include "RASModel.H"
@ -83,7 +83,10 @@ public:
virtual tmp<volScalarField> nut() const;
//- Return the effective viscosity, i.e. the laminar viscosity
virtual tmp<volScalarField> nuEff() const;
virtual tmp<volScalarField> nuEff() const
{
return tmp<volScalarField>(new volScalarField("nuEff", nu()));
}
//- Return the turbulence kinetic energy, i.e. 0 for laminar flow
virtual tmp<volScalarField> k() const;
@ -95,7 +98,7 @@ public:
//- Return the Reynolds stress tensor, i.e. 0 for laminar flow
virtual tmp<volSymmTensorField> R() const;
//- Return the effective stress tensor including the laminar stress
//- Return the effective stress tensor, i.e. the laminar stress
virtual tmp<volSymmTensorField> devReff() const;
//- Return the source term for the momentum equation

View File

@ -1,5 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/transportModels
LIB_LIBS = \

View File

@ -104,7 +104,7 @@ public:
//- Return the Reynolds stress tensor, i.e. 0 for laminar flow
virtual tmp<volSymmTensorField> R() const;
//- Return the effective stress tensor including the laminar stress
//- Return the effective stress tensor, i.e. the laminar stress
virtual tmp<volSymmTensorField> devReff() const;
//- Return the source term for the momentum equation

View File

@ -110,12 +110,6 @@ autoPtr<turbulenceModel> turbulenceModel::New
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
turbulenceModel::~turbulenceModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void turbulenceModel::correct()

View File

@ -139,7 +139,8 @@ public:
//- Destructor
virtual ~turbulenceModel();
virtual ~turbulenceModel()
{}
// Member Functions

View File

@ -19,6 +19,8 @@ LESModel oneEqEddy;
delta cubeRootVol;
turbulence on;
printCoeffs on;
laminarCoeffs

View File

@ -19,6 +19,8 @@ LESModel oneEqEddy;
delta cubeRootVol;
turbulence on;
printCoeffs on;
laminarCoeffs

View File

@ -17,6 +17,8 @@ FoamFile
LESModel oneEqEddy;
turbulence on;
printCoeffs on;
delta cubeRootVol;

View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -I$(PVM_ROOT)/include
PLIBS = -L$(PVM_ROOT)/lib/$(PVM_ARCH) -lgpvm3 -lpvm3s