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

This commit is contained in:
mattijs
2011-11-28 16:55:27 +00:00
31 changed files with 129 additions and 420214 deletions

View File

@ -1,36 +0,0 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cases=" \
shockTube \
wedge15Ma5 \
obliqueShock \
forwardStep \
LadenburgJet60psi \
biconic25-55Run35 \
"
for caseName in $cases
do
(
cd $caseName || exit
if [ "$caseName" = shockTube ]
then
rm -rf 0
cp -r 0.org 0
fi
foamCleanTutorials && cleanSamples
if [ "$caseName" = "biconic25-55Run35" ]
then
rm -rf constant/polyMesh/boundary
fi
)
done
# ----------------------------------------------------------------- end-of-file

View File

@ -1,58 +0,0 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
cases=" \
shockTube \
wedge15Ma5 \
obliqueShock \
forwardStep \
LadenburgJet60psi \
biconic25-55Run35 \
"
moveTimeMeshToConstant()
{
DT=`foamInfoExec -times | tail -1`
if [ "$DT" != 0 ]
then
mv ${DT}/polyMesh/* constant/polyMesh
rm -rf ${DT}
fi
}
for caseName in $cases
do
(
cd $caseName || exit
runApplication blockMesh
case "$caseName" in
shockTube)
runApplication setFields
;;
biconic25-55Run35)
runApplication datToFoam grid256.dat
CONST="constant"
cat $CONST/pointsHeader $CONST/points.tmp > $CONST/polyMesh/points
runApplication collapseEdges "2e-07" 5
moveTimeMeshToConstant
echo "Changing patch type to wedge type in boundary file"
mv $CONST/polyMesh/boundary $CONST/polyMesh/boundary.bak
sed -f $CONST/wedgeScr $CONST/polyMesh/boundary.bak > $CONST/polyMesh/boundary
rm $CONST/polyMesh/boundary.bak
;;
esac
runApplication `getApplication`
)
done
# ----------------------------------------------------------------- end-of-file

View File

@ -0,0 +1,11 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
cleanSamples
rm -rf constant/polyMesh/boundary
# ----------------------------------------------------------------- end-of-file

View File

@ -0,0 +1,34 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
moveTimeMeshToConstant()
{
DT=`foamInfoExec -times | tail -1`
if [ "$DT" != 0 ]
then
mv ${DT}/polyMesh/* constant/polyMesh
rm -rf ${DT}
fi
}
runApplication blockMesh
runApplication datToFoam grid256.dat
CONST="constant"
cat $CONST/pointsHeader $CONST/points.tmp > $CONST/polyMesh/points
runApplication collapseEdges "2e-07" 5
moveTimeMeshToConstant
echo "Changing patch type to wedge type in boundary file"
mv $CONST/polyMesh/boundary $CONST/polyMesh/boundary.bak
sed -f $CONST/wedgeScr $CONST/polyMesh/boundary.bak > $CONST/polyMesh/boundary
rm $CONST/polyMesh/boundary.bak
runApplication `getApplication`
# ----------------------------------------------------------------- end-of-file

View File

@ -45,7 +45,7 @@ timePrecision 6;
adjustTimeStep yes;
maxCo 0.5;
maxCo 0.4;
maxDeltaT 1;

View File

@ -0,0 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
rm -rf 0
cp -r 0.org 0
cleanCase
cleanSamples
# ----------------------------------------------------------------- end-of-file

View File

@ -0,0 +1,11 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
runApplication setFields
runApplication `getApplication`
# ----------------------------------------------------------------- end-of-file

View File

@ -17,13 +17,13 @@ FoamFile
application rhoPimpleFoam;
startFrom startTime;
startFrom latestTime;
startTime 0;
stopAt endTime;
endTime 10;
endTime 0.3;
deltaT 1e-05;

View File

@ -22,7 +22,7 @@ solvers
solver PCG;
preconditioner DIC;
tolerance 1e-6;
relTol 0;
relTol 0.01;
}
"(p|rho)Final"
@ -36,7 +36,7 @@ solvers
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
relTol 0.01;
}
"(U|h|k|nuTilda)Final"
@ -49,7 +49,7 @@ solvers
PIMPLE
{
momentumPredictor yes;
nOuterCorrectors 2;
nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
rhoMin rhoMin [ 1 -3 0 0 0 ] 0.5;

View File

@ -15,8 +15,15 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 4;
numberOfSubdomains 2;
method ptscotch;
method hierarchical;
hierarchicalCoeffs
{
n (2 1 1);
delta 0.001;
order xyz;
}
// ************************************************************************* //

View File

@ -15,19 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
2
1
(
blob.stl_patch1
walls
{
type wall;
nFaces 64564;
startFace 459986;
}
cvMesh_defaultPatch
{
type wall;
nFaces 0;
startFace 524550;
nFaces 638;
startFace 2948;
}
)

View File

@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
# remove surface
\rm -f constant/triSurface/flange.stl.gz
rm -rf 0 > /dev/null 2>&1
rm -f ./flange ./*.obj > /dev/null 2>&1
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1

View File

@ -2,6 +2,9 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# copy flange surface from resources folder
cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
runApplication blockMesh
runApplication surfaceFeatureExtract -includedAngle 150 -writeObj constant/triSurface/flange.stl flange
runApplication snappyHexMesh -overwrite

View File

@ -0,0 +1,4 @@
Folder to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
folder

View File

@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
# remove surface
\rm -f constant/triSurface/wigley-scaled-oriented.stl.gz
cleanCase
rm 0/alpha1.gz 0/cellLevel.gz 0/pointLevel.gz constant/polyMesh/boundary \
> /dev/null 2>&1

View File

@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# copy wigley surface from resources folder
cp $FOAM_TUTORIALS/resources/geometry/wigley-scaled-oriented.stl.gz constant/triSurface/
runApplication blockMesh
runApplication snappyHexMesh -overwrite
if [ ! -e log.transformPoints ]

View File

@ -0,0 +1,4 @@
Folder to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
folder

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 1 -1 -2 0 0 0 0 ];
dimensions [1 -1 -2 0 0 0 0];
internalField uniform 0;
@ -53,7 +53,6 @@ boundaryField
type porousBafflePressure;
patchType cyclic;
jump uniform 0;
value uniform 0;
D 700;
I 500;
length 1.05;

View File

@ -0,0 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
# remove surface
\rm -f constant/triSurface/bullet.stl.gz
cleanCase
# ----------------------------------------------------------------- end-of-file

View File

@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# copy bullet surface from resources folder
cp $FOAM_TUTORIALS/resources/geometry/bullet.stl.gz constant/triSurface/
# Generate the base block mesh
runApplication blockMesh

View File

@ -0,0 +1,4 @@
Folder to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
folder

View File

@ -22,7 +22,7 @@ solvers
solver PCG;
preconditioner DIC;
tolerance 1e-07;
relTol 0.1;
relTol 0.01;
}
p_rghFinal

View File

@ -22,7 +22,7 @@ solvers
solver PCG;
preconditioner DIC;
tolerance 1e-07;
relTol 0.1;
relTol 0.01;
}
p_rghFinal

Binary file not shown.

Binary file not shown.

Binary file not shown.