songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/hunt2/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs 2008-10-02 08:43:39 +01:00
commit c15ceeb6ed
29 changed files with 314 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Allwmake
View File

@ -2,7 +2,8 @@
cd ${0%/*} || exit 1 # run from this directory
set -x
( cd OpenFOAM && wmakeLnInclude . )
wmakeLnInclude -f OpenFOAM
wmakeLnInclude -f OSspecific/$WM_OS
( cd Pstream && ./Allwmake )
wmake libo OSspecific/$WM_OS

22
src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C
View File

@ -31,13 +31,16 @@ License
namespace Foam
{
namespace compressibilityModels
{
defineTypeNameAndDebug(Chung, 0);
addToRunTimeSelectionTable(barotropicCompressibilityModel, Chung, dictionary);
}
namespace compressibilityModels
{
defineTypeNameAndDebug(Chung, 0);
addToRunTimeSelectionTable
(
barotropicCompressibilityModel,
Chung,
dictionary
);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -45,10 +48,11 @@ addToRunTimeSelectionTable(barotropicCompressibilityModel, Chung, dictionary);
Foam::compressibilityModels::Chung::Chung
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName
)
:
barotropicCompressibilityModel(compressibilityProperties, gamma),
barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
psiv_(compressibilityProperties_.lookup("psiv")),
psil_(compressibilityProperties_.lookup("psil")),
rhovSat_(compressibilityProperties_.lookup("rhovSat")),

3
src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
View File

@ -75,7 +75,8 @@ public:
Chung
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName = "psi"
);

27
src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C
View File

@ -31,13 +31,16 @@ License
namespace Foam
{
namespace compressibilityModels
{
defineTypeNameAndDebug(Wallis, 0);
addToRunTimeSelectionTable(barotropicCompressibilityModel, Wallis, dictionary);
}
namespace compressibilityModels
{
defineTypeNameAndDebug(Wallis, 0);
addToRunTimeSelectionTable
(
barotropicCompressibilityModel,
Wallis,
dictionary
);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -45,10 +48,11 @@ addToRunTimeSelectionTable(barotropicCompressibilityModel, Wallis, dictionary);
Foam::compressibilityModels::Wallis::Wallis
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName
)
:
barotropicCompressibilityModel(compressibilityProperties, gamma),
barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
psiv_(compressibilityProperties_.lookup("psiv")),
psil_(compressibilityProperties_.lookup("psil")),
rhovSat_(compressibilityProperties_.lookup("rhovSat")),
@ -62,8 +66,9 @@ Foam::compressibilityModels::Wallis::Wallis
void Foam::compressibilityModels::Wallis::correct()
{
psi_ = (gamma_*rhovSat_ + (scalar(1) - gamma_)*rholSat_)
*(gamma_*psiv_/rhovSat_ + (scalar(1) - gamma_)*psil_/rholSat_);
psi_ =
(gamma_*rhovSat_ + (scalar(1) - gamma_)*rholSat_)
*(gamma_*psiv_/rhovSat_ + (scalar(1) - gamma_)*psil_/rholSat_);
}

3
src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
View File

@ -75,7 +75,8 @@ public:
Wallis
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName = "psi"
);

7
src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.C
View File

@ -42,7 +42,8 @@ namespace Foam
Foam::barotropicCompressibilityModel::barotropicCompressibilityModel
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName
)
:
compressibilityProperties_(compressibilityProperties),
@ -50,12 +51,12 @@ Foam::barotropicCompressibilityModel::barotropicCompressibilityModel
(
IOobject
(
"psi",
psiName,
gamma.mesh().time().timeName(),
gamma.mesh()
),
gamma.mesh(),
dimensionedScalar("psi", dimensionSet(0, -2, 2, 0, 0), 0)
dimensionedScalar(psiName, dimensionSet(0, -2, 2, 0, 0), 0)
),
gamma_(gamma)
{}

11
src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
View File

@ -97,9 +97,10 @@ public:
dictionary,
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName
),
(compressibilityProperties, gamma)
(compressibilityProperties, gamma, psiName)
);
@ -109,7 +110,8 @@ public:
static autoPtr<barotropicCompressibilityModel> New
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName = "psi"
);
@ -119,7 +121,8 @@ public:
barotropicCompressibilityModel
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName = "psi"
);

5
src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C
View File

@ -32,7 +32,8 @@ Foam::autoPtr<Foam::barotropicCompressibilityModel>
Foam::barotropicCompressibilityModel::New
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName
)
{
word bcModelTypeName
@ -60,7 +61,7 @@ Foam::barotropicCompressibilityModel::New
return autoPtr<barotropicCompressibilityModel>
(
cstrIter()(compressibilityProperties, gamma)
cstrIter()(compressibilityProperties, gamma, psiName)
);
}

22
src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.C
View File

@ -31,13 +31,16 @@ License
namespace Foam
{
namespace compressibilityModels
{
defineTypeNameAndDebug(linear, 0);
addToRunTimeSelectionTable(barotropicCompressibilityModel, linear, dictionary);
}
namespace compressibilityModels
{
defineTypeNameAndDebug(linear, 0);
addToRunTimeSelectionTable
(
barotropicCompressibilityModel,
linear,
dictionary
);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -45,10 +48,11 @@ addToRunTimeSelectionTable(barotropicCompressibilityModel, linear, dictionary);
Foam::compressibilityModels::linear::linear
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName
)
:
barotropicCompressibilityModel(compressibilityProperties, gamma),
barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
psiv_(compressibilityProperties_.lookup("psiv")),
psil_(compressibilityProperties_.lookup("psil"))
{

3
src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H
View File

@ -72,7 +72,8 @@ public:
linear
(
const dictionary& compressibilityProperties,
const volScalarField& gamma
const volScalarField& gamma,
const word& psiName = "psi"
);

156
src/triSurface/triSurface/interfaces/NAS/readNAS.C
View File

@ -23,10 +23,16 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Nastran surface reader. Does Ansa $ANSA_NAME extension to get name
of patch. Handles Ansa coordinates like:
Nastran surface reader.
- Uses the Ansa "$ANSA_NAME" or the Hypermesh "$HMNAME COMP" extensions
to obtain patch names.
- Handles Nastran short and long formats, but not free format.
- Properly handles the Nastran compact floating point notation: \n
@verbatim
GRID 28 10.20269-.030265-2.358-8
@endverbatim
\*---------------------------------------------------------------------------*/
@ -49,13 +55,13 @@ static scalar parseNASCoord(const string& s)
if (expSign != string::npos && expSign > 0 && !isspace(s[expSign-1]))
{
scalar mantissa = readScalar(IStringStream(s.substr(0, expSign))());
scalar exp = readScalar(IStringStream(s.substr(expSign+1))());
scalar exponent = readScalar(IStringStream(s.substr(expSign+1))());
if (s[expSign] == '-')
{
exp = -exp;
exponent = -exponent;
}
return mantissa*pow(10, exp);
return mantissa*pow(10, exponent);
}
else
{
@ -64,14 +70,14 @@ static scalar parseNASCoord(const string& s)
}
bool triSurface::readNAS(const fileName& OBJfileName)
bool triSurface::readNAS(const fileName& fName)
{
IFstream OBJfile(OBJfileName);
IFstream is(fName);
if (!OBJfile.good())
if (!is.good())
{
FatalErrorIn("triSurface::readNAS(const fileName&)")
<< "Cannot read file " << OBJfileName
<< "Cannot read file " << fName
<< exit(FatalError);
}
@ -90,17 +96,17 @@ bool triSurface::readNAS(const fileName& OBJfileName)
// Ansa tags. Denoted by $ANSA_NAME. These will appear just before the
// first use of a type. We read them and store the pshell types which
// are used to name the patches.
label ansaID = -1;
label ansaId = -1;
word ansaType;
string ansaName;
// Done warnings per unrecognized command
// A single warning per unrecognized command
HashSet<word> unhandledCmd;
while (OBJfile.good())
while (is.good())
{
string line;
OBJfile.getLine(line);
is.getLine(line);
// Ansa extension
if (line.substr(0, 10) == "$ANSA_NAME")
@ -116,14 +122,14 @@ bool triSurface::readNAS(const fileName& OBJfileName)
&& sem2 != string::npos
)
{
ansaID = readLabel
ansaId = readLabel
(
IStringStream(line.substr(sem0+1, sem1-sem0-1))()
);
ansaType = line.substr(sem1+1, sem2-sem1-1);
string nameString;
OBJfile.getLine(ansaName);
is.getLine(ansaName);
if (ansaName[ansaName.size()-1] == '\r')
{
ansaName = ansaName.substr(1, ansaName.size()-2);
@ -132,13 +138,37 @@ bool triSurface::readNAS(const fileName& OBJfileName)
{
ansaName = ansaName.substr(1, ansaName.size()-1);
}
//Pout<< "ANSA tag for NastranID:" << ansaID
// << " of type " << ansaType
// << " name " << ansaName << endl;
// Info<< "ANSA tag for NastranID:" << ansaId
// << " of type " << ansaType
// << " name " << ansaName << endl;
}
}
// Hypermesh extension
// $HMNAME COMP 1"partName"
if
(
line.substr(0, 12) == "$HMNAME COMP"
&& line.find ('"') != string::npos
)
{
label groupId = readLabel
(
IStringStream(line.substr(16, 16))()
);
IStringStream lineStream(line.substr(32));
string rawName;
lineStream >> rawName;
groupToName.insert(groupId, string::validate<word>(rawName));
Info<< "group " << groupId << " => " << rawName << endl;
}
if (line.size() == 0 || line[0] == '$')
{
// Skip empty or comment
@ -153,7 +183,7 @@ bool triSurface::readNAS(const fileName& OBJfileName)
while (true)
{
string buf;
OBJfile.getLine(buf);
is.getLine(buf);
if (buf.size() > 72 && buf[72]=='+')
{
@ -174,26 +204,21 @@ bool triSurface::readNAS(const fileName& OBJfileName)
if (cmd == "CTRIA3")
{
//label index, group, a, b, c;
//lineStream >> index >> group >> a >> b >> c;
label group = readLabel(IStringStream(line.substr(16,8))());
label groupId = readLabel(IStringStream(line.substr(16,8))());
label a = readLabel(IStringStream(line.substr(24,8))());
label b = readLabel(IStringStream(line.substr(32,8))());
label c = readLabel(IStringStream(line.substr(40,8))());
// Convert group into patch
Map<label>::const_iterator iter = groupToPatch.find(group);
Map<label>::const_iterator iter = groupToPatch.find(groupId);
label patchI;
if (iter == groupToPatch.end())
{
patchI = nPatches++;
Pout<< "Allocating Foam patch " << patchI
<< " for group " << group << endl;
groupToPatch.insert(group, patchI);
groupToPatch.insert(groupId, patchI);
Info<< "patch " << patchI << " => group " << groupId << endl;
}
else
{
@ -204,26 +229,21 @@ bool triSurface::readNAS(const fileName& OBJfileName)
}
else if (cmd == "CQUAD4")
{
//label index, group, a, b, c, d;
//lineStream >> index >> group >> a >> b >> c >> d;
label group = readLabel(IStringStream(line.substr(16,8))());
label groupId = readLabel(IStringStream(line.substr(16,8))());
label a = readLabel(IStringStream(line.substr(24,8))());
label b = readLabel(IStringStream(line.substr(32,8))());
label c = readLabel(IStringStream(line.substr(40,8))());
label d = readLabel(IStringStream(line.substr(48,8))());
// Convert group into patch
Map<label>::const_iterator iter = groupToPatch.find(group);
Map<label>::const_iterator iter = groupToPatch.find(groupId);
label patchI;
if (iter == groupToPatch.end())
{
patchI = nPatches++;
Pout<< "Allocating Foam patch " << patchI
<< " for group " << group << endl;
groupToPatch.insert(group, patchI);
groupToPatch.insert(groupId, patchI);
Info<< "patch " << patchI << " => group " << groupId << endl;
}
else
{
@ -235,66 +255,56 @@ bool triSurface::readNAS(const fileName& OBJfileName)
}
else if (cmd == "PSHELL")
{
// Read shell type since gives patchnames.
//label group;
//lineStream >> group;
label group = readLabel(IStringStream(line.substr(8,8))());
if (group == ansaID && ansaType == "PSHELL")
// Read shell type since group gives patchnames
label groupId = readLabel(IStringStream(line.substr(8,8))());
if (groupId == ansaId && ansaType == "PSHELL")
{
Pout<< "Found name " << ansaName << " for group "
<< group << endl;
groupToName.insert(group, string::validate<word>(ansaName));
groupToName.insert(groupId, string::validate<word>(ansaName));
Info<< "group " << groupId << " => " << ansaName << endl;
}
}
else if (cmd == "GRID")
{
//label index;
//lineStream >> index;
label index = readLabel(IStringStream(line.substr(8,8))());
indices.append(index);
scalar x = parseNASCoord(line.substr(24, 8));
scalar y = parseNASCoord(line.substr(32, 8));
scalar z = parseNASCoord(line.substr(40, 8));
indices.append(index);
points.append(point(x, y, z));
}
else if (cmd == "GRID*")
{
// Assume on two lines with '*' continuation symbol on start of
// second line. (comes out of Tgrid. Typical line (spaces truncated)
// Long format is on two lines with '*' continuation symbol
// on start of second line.
// Typical line (spaces compacted)
// GRID* 126 0 -5.55999875E+02 -5.68730474E+02
// * 2.14897901E+02
string line2;
OBJfile.getLine(line2);
if (line2[0] != '*')
label index = readLabel(IStringStream(line.substr(8,16))());
scalar x = parseNASCoord(line.substr(40, 16));
scalar y = parseNASCoord(line.substr(56, 16));
is.getLine(line);
if (line[0] != '*')
{
FatalErrorIn("triSurface::readNAS(const fileName&)")
<< "Expected continuation symbol '*' when reading GRID*"
<< " (double precision coordinate) output by Tgrid" << nl
<< "Read:" << line2 << nl
<< "File:" << OBJfile.name()
<< " line:" << OBJfile.lineNumber()
<< " (double precision coordinate) output" << nl
<< "Read:" << line << nl
<< "File:" << is.name()
<< " line:" << is.lineNumber()
<< exit(FatalError);
}
IStringStream lineStream(line.substr(10) + line2.substr(1));
scalar z = parseNASCoord(line.substr(8, 16));
label index;
lineStream >> index;
indices.append(index);
readScalar(lineStream); // What is this field?
scalar x = readScalar(lineStream);
scalar y = readScalar(lineStream);
scalar z = readScalar(lineStream);
points.append(point(x, y, z));
}
else if (unhandledCmd.insert(cmd))
{
Info<< "Unhandled Nastran command " << line << nl
<< "File:" << OBJfile.name()
<< " line:" << OBJfile.lineNumber()
<< endl;
<< "File:" << is.name() << " line:" << is.lineNumber() << endl;
}
}
@ -303,7 +313,7 @@ bool triSurface::readNAS(const fileName& OBJfileName)
faces.shrink();
Pout<< "Read triangles:" << faces.size() << " points:" << points.size()
Info<< "Read triangles:" << faces.size() << " points:" << points.size()
<< endl;
{
@ -314,7 +324,7 @@ bool triSurface::readNAS(const fileName& OBJfileName)
indexToPoint.insert(indices[i], i);
}
// Relabel triangles
// Relabel faces
forAll(faces, i)
{
labelledTri& f = faces[i];
@ -341,7 +351,7 @@ bool triSurface::readNAS(const fileName& OBJfileName)
);
}
Pout<< "patches:" << patches << endl;
Info<< "patches:" << patches << endl;
// Transfer DynamicLists to straight ones.

3
src/turbulenceModels/LES/Allwmake
View File

@ -2,8 +2,9 @@
cd ${0%/*} || exit 1 # run from this directory
set -x
wmakeLnInclude -f incompressible
wmake libso LESfilters
wmakeLnInclude incompressible
wmake libso LESdeltas
wmake libso incompressible
wmake libso compressible

2
src/turbulenceModels/LES/compressible/Make/files
View File

@ -14,6 +14,6 @@ SpalartAllmaras/SpalartAllmaras.C
wallFunctions=derivedFvPatchFields/wallFunctions
muSgsWallFunctions=$(wallFunctions)/muSgsWallFunctions
$(muSgsWallFunctions)/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
$(muSgsWallFunctions)/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libcompressibleLESModels

2
src/turbulenceModels/LES/compressible/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I../LESdeltas/lnInclude \
-I../LESfilters/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude

34
src/turbulenceModels/LES/compressible/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C → src/turbulenceModels/LES/compressible/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "muSgsWallFunctionFvPatchScalarField.H"
#include "muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H"
#include "LESModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
@ -41,7 +41,8 @@ namespace LESModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -51,9 +52,10 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
{}
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField& ptf,
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@ -63,7 +65,8 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
{}
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -74,7 +77,8 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
{}
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -85,18 +89,20 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
{}
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField& tppsf
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
)
:
fixedValueFvPatchScalarField(tppsf)
{}
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField& tppsf,
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF
)
:
@ -106,7 +112,7 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void muSgsWallFunctionFvPatchScalarField::evaluate
void muSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
(
const Pstream::commsTypes
)
@ -184,7 +190,11 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField(fvPatchScalarField, muSgsWallFunctionFvPatchScalarField);
makePatchTypeField
(
fvPatchScalarField,
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

46
src/turbulenceModels/LES/compressible/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H → src/turbulenceModels/LES/compressible/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H
View File

@ -23,18 +23,19 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::compressible::LESModels::muSgsWallFunctionFvPatchScalarField
Foam::compressible::LESModels::
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
Description
wall function boundary condition for compressible flows
Spalart Allmaas wall function boundary condition for compressible flows
SourceFiles
muSgsWallFunctionFvPatchScalarField.C
muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
#ifndef muSgsWallFunctionFvPatchScalarField_H
#define muSgsWallFunctionFvPatchScalarField_H
#ifndef muSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#define muSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
@ -48,10 +49,10 @@ namespace LESModels
{
/*---------------------------------------------------------------------------*\
Class muSgsWallFunctionFvPatch Declaration
Class muSgsSpalartAllmarasWallFunctionFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class muSgsWallFunctionFvPatchScalarField
class muSgsSpalartAllmarasWallFunctionFvPatchScalarField
:
public fixedValueFvPatchScalarField
{
@ -61,20 +62,20 @@ class muSgsWallFunctionFvPatchScalarField
public:
//- Runtime type information
TypeName("muSgsWallFunction");
TypeName("muSgsSpalartAllmarasWallFunction");
// Constructors
//- Construct from patch and internal field
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and Istream
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@ -82,27 +83,28 @@ public:
);
//- Construct from patch, internal field and dictionary
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const dictionary&
);
//- Construct by mapping given muSgsWallFunctionFvPatchScalarField
//- Construct by mapping given
// muSgsSpalartAllmarasWallFunctionFvPatchScalarField
// onto a new patch
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField&,
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField&
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&
);
//- Construct and return a clone
@ -110,14 +112,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new muSgsWallFunctionFvPatchScalarField(*this)
new muSgsSpalartAllmarasWallFunctionFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
muSgsWallFunctionFvPatchScalarField
muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField&,
const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@ -129,7 +131,11 @@ public:
{
return tmp<fvPatchScalarField>
(
new muSgsWallFunctionFvPatchScalarField(*this, iF)
new muSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
*this,
iF
)
);
}

2
src/turbulenceModels/LES/incompressible/Make/files
View File

@ -29,7 +29,7 @@ dynMixedSmagorinsky/dynMixedSmagorinsky.C
wallFunctions=derivedFvPatchFields/wallFunctions
nuSgsWallFunctions=$(wallFunctions)/nuSgsWallFunctions
$(nuSgsWallFunctions)/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
$(nuSgsWallFunctions)/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libincompressibleLESModels

31
src/turbulenceModels/LES/incompressible/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C → src/turbulenceModels/LES/incompressible/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "nuSgsWallFunctionFvPatchScalarField.H"
#include "nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H"
#include "LESModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
@ -41,7 +41,8 @@ namespace LESModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -51,9 +52,10 @@ nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
{}
nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField& ptf,
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@ -63,7 +65,8 @@ nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
{}
nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -74,18 +77,20 @@ nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
{}
nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField& tppsf
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
)
:
fixedValueFvPatchScalarField(tppsf)
{}
nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField& tppsf,
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF
)
:
@ -95,7 +100,7 @@ nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void nuSgsWallFunctionFvPatchScalarField::evaluate
void nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
(
const Pstream::commsTypes
)
@ -166,7 +171,11 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField(fvPatchScalarField, nuSgsWallFunctionFvPatchScalarField);
makePatchTypeField
(
fvPatchScalarField,
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

44
src/turbulenceModels/LES/incompressible/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H → src/turbulenceModels/LES/incompressible/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H
View File

@ -23,18 +23,19 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::incompressible::LESModels::nuSgsWallFunctionFvPatchScalarField
Foam::incompressible::LESModels::
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
Description
wall function boundary condition for incompressible flows
Spalart Allmaras wall function boundary condition for incompressible flows
SourceFiles
nuSgsWallFunctionFvPatchScalarField.C
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
#ifndef nuSgsWallFunctionFvPatchScalarField_H
#define nuSgsWallFunctionFvPatchScalarField_H
#ifndef nuSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#define nuSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
@ -48,10 +49,10 @@ namespace LESModels
{
/*---------------------------------------------------------------------------*\
Class nuSgsWallFunctionFvPatch Declaration
Class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class nuSgsWallFunctionFvPatchScalarField
class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
:
public fixedValueFvPatchScalarField
{
@ -61,40 +62,41 @@ class nuSgsWallFunctionFvPatchScalarField
public:
//- Runtime type information
TypeName("nuSgsWallFunction");
TypeName("nuSgsSpalartAllmarasWallFunction");
// Constructors
//- Construct from patch and internal field
nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const dictionary&
);
//- Construct by mapping given nuSgsWallFunctionFvPatchScalarField
//- Construct by mapping given
// nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
// onto a new patch
nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField&,
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField&
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&
);
//- Construct and return a clone
@ -102,14 +104,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new nuSgsWallFunctionFvPatchScalarField(*this)
new nuSgsSpalartAllmarasWallFunctionFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
nuSgsWallFunctionFvPatchScalarField
nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
const nuSgsWallFunctionFvPatchScalarField&,
const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@ -121,7 +123,11 @@ public:
{
return tmp<fvPatchScalarField>
(
new nuSgsWallFunctionFvPatchScalarField(*this, iF)
new nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
(
*this,
iF
)
);
}

10
tutorials/Allclean
View File

@ -32,15 +32,15 @@
cd ${0%/*} || exit 1 # run from this directory
echo "Cleaning backup files"
echo "--------"
echo "Cleaning tutorials ..."
echo "Removing backup files"
find . -type f \( -name "*~" -o -name "*.bak" \) -exec rm {} \;
find . \( -name 'core' -o -name 'core.[1-9]*' \) -exec rm {} \;
find . \( -name '*.pvs' -o -name '*.OpenFOAM' \) -exec rm {} \;
rm logs > /dev/null 2>&1
rm testLoopReport > /dev/null 2>&1
echo ""
rm logs testLoopReport > /dev/null 2>&1
foamCleanTutorials cases
echo "--------"
# ----------------------------------------------------------------- end-of-file

4
tutorials/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
View File

@ -15,8 +15,8 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General m4 macros
changecom(//)changequote([,])
define(calc, [esyscmd(perl -e 'use Math::Trig; use POSIX; printf ($1)')])
changecom(//)changequote([,]) dnl>
define(calc, [esyscmd(perl -e 'use Math::Trig; print ($1)')]) dnl>
define(VCOUNT, 0)
define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])

4
tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
View File

@ -15,8 +15,8 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General m4 macros
changecom(//)changequote([,])
define(calc, [esyscmd(perl -e 'use Math::Trig; use POSIX; print ($1)')])
changecom(//)changequote([,]) dnl>
define(calc, [esyscmd(perl -e 'use Math::Trig; print ($1)')]) dnl>
define(VCOUNT, 0)
define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])

4
tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
View File

@ -15,8 +15,8 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General m4 macros
changecom(//)changequote([,])
define(calc, [esyscmd(perl -e 'use Math::Trig; use POSIX; printf ($1)')])
changecom(//)changequote([,]) dnl>
define(calc, [esyscmd(perl -e 'use Math::Trig; print ($1)')]) dnl>
define(VCOUNT, 0)
define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])

4
tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
View File

@ -15,8 +15,8 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General m4 macros
changecom(//)changequote([,])
define(calc, [esyscmd(perl -e 'use Math::Trig; use POSIX; print ($1)')])
changecom(//)changequote([,]) dnl>
define(calc, [esyscmd(perl -e 'use Math::Trig; print ($1)')]) dnl>
define(VCOUNT, 0)
define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])

4
tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
View File

@ -15,8 +15,8 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General m4 macros
changecom(//)changequote([,])
define(calc, [esyscmd(perl -e 'use Math::Trig; use POSIX; print ($1)')])
changecom(//)changequote([,]) dnl>
define(calc, [esyscmd(perl -e 'use Math::Trig; print ($1)')]) dnl>
define(VCOUNT, 0)
define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])

11
wmake/wcleanAll
View File

@ -39,20 +39,27 @@
for dir in lib applications/bin
do
echo "Removing $dir/"
[ -d $dir ] && rm -rf $dir/*
done
( cd tutorials && ./Allclean )
echo "Removing *~ backup files"
find . -name '*~' -exec rm {} \;
echo "Removing .dep files"
find . -name '*.dep' -exec rm {} \;
echo "Cleaning Make subdirectories"
find `find . -depth \( -name "Make.[A-Za-z]*" -o -name "Make" \) -type d -print` -depth \( -type d ! -name "*Make.[A-Za-z]*" ! -name "*Make" \) -exec rm -rf {} \;
echo "Removing lnInclude and intermediate directories"
find . -depth -type d \( -name lnInclude -o -name ii_files -o -name Templates.DB \) -exec rm -rf {} \;
echo "Removing misc files"
find . \( -name exe -o -name log -o -name so_locations \) -exec rm {} \;
# rm -rf src/mpich-${MPICH_VERSION}/platforms
( cd tutorials && ./Allclean )
#------------------------------------------------------------------------------

18
wmake/wcleanAlmostAll
View File

@ -24,11 +24,10 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# wmakeAlmostAll
# wcleanAlmostAll
#
# Description
# script that searches all the directories below the current for the
# object file directories of all machines and then deletes them.
# as per wcleanAll, but retains "*~" backup files
#
#------------------------------------------------------------------------------
@ -39,18 +38,25 @@
for dir in lib applications/bin
do
echo "Removing $dir/"
[ -d $dir ] && rm -rf $dir/*
done
( cd tutorials && ./Allclean )
echo "Retaining *~ backup files"
## find . -name '*~' -exec rm {} \;
# find . -name '*~' -exec rm {} \;
echo "Removing .dep files"
find . -name '*.dep' -exec rm {} \;
find `find . -depth \( -name "Make[.A-Za-z]*" -o -name "Make" \) -type d -print` -depth \( -type d ! -name "*Make[.A-Za-z]*" ! -name "*Make" \) -exec rm -r {} \;
echo "Cleaning Make subdirectories"
find `find . -depth \( -name "Make.[A-Za-z]*" -o -name "Make" \) -type d -print` -depth \( -type d ! -name "*Make.[A-Za-z]*" ! -name "*Make" \) -exec rm -rf {} \;
echo "Removing lnInclude and intermediate directories"
find . -depth -type d \( -name lnInclude -o -name ii_files -o -name Templates.DB \) -exec rm -rf {} \;
echo "Removing misc files"
find . \( -name exe -o -name log -o -name so_locations \) -exec rm {} \;
( cd tutorials && ./Allclean )
#------------------------------------------------------------------------------

2
wmake/wcleanLnIncludeAll
View File

@ -24,7 +24,7 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# wmakeLnInclude
# wcleanLnIncludeAll
#
# Description
# Delete all the lnInclude directories in the tree.

45
wmake/wmakeLnInclude
View File

@ -80,8 +80,18 @@ do
done
baseDir=$1
# convert incorrect path/dir/lnInclude to something sensible
while [ "${baseDir##*/}" = lnInclude ]
do
baseDir="${baseDir%/*}"
if [ "$baseDir" = lnInclude ]
then
baseDir="."
fi
done
incDir=$baseDir/lnInclude
if [ $# -eq 1 ]
then
lnOpt="-s"
@ -89,7 +99,7 @@ elif [ $# -eq 2 ]
then
lnOpt="$2"
else
usage "ERROR: wrong number of arguments"
usage "ERROR: incorrect number of arguments"
fi
@ -101,7 +111,6 @@ fi
if [ -d $incDir ]
then
# could change force to remove lnInclude first
if [ ! "$forceUpdate" ]
then
# echo $Script: include directory $incDir already exists, exiting.
@ -117,24 +126,34 @@ then
exit 0
fi
cd $incDir || exit 1
# Link include files
# ~~~~~~~~~~~~~~~~~~
echo $Script: linking include files to $incDir
echo
cd $incDir
find .. $findOpt \
\( -name lnInclude -o -name -Make -o -name config \) -prune \
-o \( -name '*.[CHh]' -o -name '*.[ch]xx' -o -name '*.[ch]pp' -o -name '*.type' \) \
-a ! -name ".#*" \
-exec ln $lnOpt {} . \;
#
# remove any broken links
# remove any broken links first (this helps when file locations have moved)
#
find -L . -type l -exec rm \{\} \;
#
# create links, avoid recreating links unless necessary
#
find .. $findOpt \
\( -name lnInclude -o -name Make -o -name config \) -prune \
-o \( -name '*.[CHh]' -o -name '*.[ch]xx' -o -name '*.[ch]pp' -o -name '*.type' \) \
-a ! -name ".#*" \
-print | \
while read src
do
link=$(readlink ${src##*/})
if [ "$link" != "$src" ]
then
rm $link 2>/dev/null
ln $lnOpt $src .
fi
done
#------------------------------------------------------------------------------