zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
andy
2009-08-03 12:06:51 +01:00
parent 6dbb672b01 8f95d4ea3d
commit 60e3918be8
13 changed files with 97 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Allwmake
View File

@ -1,6 +1,14 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
if [ "$PWD" != "$WM_PROJECT_DIR" ]
then
echo "Error: Current directory in not \$WM_PROJECT_DIR"
echo " The environment variable are not consistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them."
exit 1
fi
# wmake is required for subsequent targets
( cd wmake/src && make )

9
applications/Allwmake
View File

@ -1,5 +1,14 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
if [ "$PWD" != "$WM_PROJECT_DIR/applications" ]
then
echo "Error: Current directory in not \$WM_PROJECT_DIR/applications"
echo " The environment variable are not consistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them."
exit 1
fi
set -x
wmake all solvers

9
src/Allwmake
View File

@ -1,5 +1,14 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
if [ "$PWD" != "$WM_PROJECT_DIR/src" ]
then
echo "Error: Current directory in not \$WM_PROJECT_DIR/src"
echo " The environment variable are not consistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them."
exit 1
fi
set -x
# update OpenFOAM version strings if required

4
src/turbulenceModels/compressible/LES/LESModel/LESModel.C
View File

@ -84,6 +84,10 @@ LESModel::LESModel
delta_(LESdelta::New("delta", U.mesh(), *this))
{
readIfPresent("k0", k0_);
// Force the construction of the mesh deltaCoeffs which may be needed
// for the construction of the derived models and BCs
mesh_.deltaCoeffs();
}

6
src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
View File

@ -88,7 +88,11 @@ RASModel::RASModel
omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
y_(mesh_)
{}
{
// Force the construction of the mesh deltaCoeffs which may be needed
// for the construction of the derived models and BCs
mesh_.deltaCoeffs();
}
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //

4
src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
View File

@ -82,6 +82,10 @@ LESModel::LESModel
delta_(LESdelta::New("delta", U.mesh(), *this))
{
readIfPresent("k0", k0_);
// Force the construction of the mesh deltaCoeffs which may be needed
// for the construction of the derived models and BCs
mesh_.deltaCoeffs();
}

4
src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
View File

@ -133,8 +133,8 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
const scalarField& nuw =
patch().lookupPatchField<volScalarField, scalar>(nuName_);
scalarField& nuSgsw = *this;
scalarField& nuSgsw = *this;
scalarField magFaceGradU = mag(U.snGrad());
@ -178,6 +178,8 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
nuSgsw[facei] = 0;
}
}
fixedValueFvPatchScalarField::evaluate();
}

6
src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
View File

@ -87,7 +87,11 @@ RASModel::RASModel
omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
y_(mesh_)
{}
{
// Force the construction of the mesh deltaCoeffs which may be needed
// for the construction of the derived models and BCs
mesh_.deltaCoeffs();
}
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //

2
tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

25
tutorials/incompressible/simpleFoam/motorBike/0/k
View File

@ -20,6 +20,29 @@ dimensions [0 2 -2 0 0 0 0];
internalField uniform $turbulentKE;
#include "turbulentBoundaryField"
boundaryField
{
#include "fixedInlet"
outlet
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
lowerWall
{
type kqRWallFunction;
}
"motorBike_.*"
{
type kqRWallFunction;
}
#include "frontBackUpperPatches"
}
// ************************************************************************* //

25
tutorials/incompressible/simpleFoam/motorBike/0/omega
View File

@ -20,6 +20,29 @@ dimensions [0 0 -1 0 0 0 0];
internalField uniform $turbulentOmega;
#include "turbulentBoundaryField"
boundaryField
{
#include "fixedInlet"
outlet
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
lowerWall
{
type omegaWallFunction;
}
"motorBike_.*"
{
type omegaWallFunction;
}
#include "frontBackUpperPatches"
}
// ************************************************************************* //

33
tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField
View File

@ -1,33 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
boundaryField
{
#include "fixedInlet"
outlet
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
lowerWall
{
type kqRWallFunction;
}
"motorBike_.*"
{
type kqRWallFunction;
}
#include "frontBackUpperPatches"
}
// ************************************************************************* //

2
tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/