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

Merge commit 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen 2009-07-29 16:17:37 +02:00
commit ea8d14cccb
10 changed files with 80 additions and 41 deletions
Show Stats 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

2
etc/bashrc
View File

@ -33,7 +33,7 @@
#------------------------------------------------------------------------------
export WM_PROJECT=OpenFOAM
export WM_PROJECT_VERSION=1.6
export WM_PROJECT_VERSION=dev
################################################################################
# USER EDITABLE PART

2
etc/cshrc
View File

@ -32,7 +32,7 @@
#------------------------------------------------------------------------------
setenv WM_PROJECT OpenFOAM
setenv WM_PROJECT_VERSION 1.6
setenv WM_PROJECT_VERSION dev
################################################################################
# USER EDITABLE PART

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

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 | |
\*---------------------------------------------------------------------------*/

6
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties
View File

@ -16,9 +16,9 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// x y z u v w d rho mDot T cp Y0..YN
(
(0.1 0.32 0.0 0.5 0.25 0.0 0.001 1000 0.2 300 4200 1.0)
(0.1 0.44 0.0 0.5 0.1 0.0 0.001 1000 0.2 300 4200 1.0)
(0.1 0.56 0.0 0.5 -0.1.0 0.0 0.001 1000 0.2 300 4200 1.0)
(0.1 0.32 0.0 0.5 0.25 0.0 0.001 1000 0.2 300 4200 1.0)
(0.1 0.44 0.0 0.5 0.10 0.0 0.001 1000 0.2 300 4200 1.0)
(0.1 0.56 0.0 0.5 -0.10 0.0 0.001 1000 0.2 300 4200 1.0)
(0.1 0.68 0.0 0.5 -0.25 0.0 0.001 1000 0.2 300 4200 1.0)
);