mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merged all multiphase developments in OpenFOAM-1.7.x
This commit is contained in:
@ -7,23 +7,19 @@ cd ${0%/*} || exit 1 # run from this directory
|
||||
keepCases="damBreak"
|
||||
loseCases="damBreakFine"
|
||||
|
||||
for caseName in $keepCases
|
||||
for case in $keepCases
|
||||
do
|
||||
(
|
||||
cd $caseName || exit
|
||||
(cd $case && foamCleanTutorials)
|
||||
|
||||
foamCleanTutorials
|
||||
|
||||
if [ "$caseName" = damBreak ]
|
||||
if [ "$case" = "damBreak" ]
|
||||
then
|
||||
cp 0/alpha1.org 0/alpha1
|
||||
cp $case/0/alpha1.org $case/0/alpha1
|
||||
fi
|
||||
)
|
||||
done
|
||||
|
||||
for caseName in $loseCases
|
||||
for case in $loseCases
|
||||
do
|
||||
removeCase $caseName
|
||||
removeCase $case
|
||||
done
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
||||
@ -7,11 +7,10 @@ cd ${0%/*} || exit 1 # run from this directory
|
||||
# Set application name
|
||||
application="interFoam"
|
||||
|
||||
setDamBreakFine()
|
||||
setDamBreakFine ()
|
||||
{
|
||||
blockMeshDict="constant/polyMesh/blockMeshDict"
|
||||
controlDict="system/controlDict"
|
||||
|
||||
sed \
|
||||
-e s/"23 8"/"46 10"/g \
|
||||
-e s/"19 8"/"40 10"/g \
|
||||
@ -20,7 +19,6 @@ setDamBreakFine()
|
||||
-e s/"19 42\(.*\) 1 1)"/"40 76\1 2 1)"/g \
|
||||
$blockMeshDict > temp.$$
|
||||
mv temp.$$ $blockMeshDict
|
||||
|
||||
sed \
|
||||
-e s/"\(deltaT[ \t]*\) 0.001;"/"\1 5e-04;"/g \
|
||||
-e s/"\(endTime[ \t]*\) 1;"/"\1 0.4;"/g \
|
||||
@ -29,7 +27,7 @@ setDamBreakFine()
|
||||
}
|
||||
|
||||
# Do damBreak
|
||||
( cd damBreak && foamRunTutorials )
|
||||
(cd damBreak && foamRunTutorials)
|
||||
|
||||
# Clone case
|
||||
cloneCase damBreak damBreakFine
|
||||
@ -40,7 +38,6 @@ cloneCase damBreak damBreakFine
|
||||
# Modify case
|
||||
setDamBreakFine
|
||||
cp ../damBreak/0/alpha1.org 0/alpha1
|
||||
|
||||
# And execute
|
||||
runApplication blockMesh
|
||||
runApplication setFields
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class volSymmTensorField;
|
||||
location "0";
|
||||
object R;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
dimensions [ 0 2 -2 0 0 0 0 ];
|
||||
|
||||
internalField uniform ( 0 0 0 0 0 0 );
|
||||
|
||||
boundaryField
|
||||
{
|
||||
leftWall
|
||||
{
|
||||
type kqRWallFunction;
|
||||
value uniform ( 0 0 0 0 0 0 );
|
||||
}
|
||||
|
||||
rightWall
|
||||
{
|
||||
type kqRWallFunction;
|
||||
value uniform ( 0 0 0 0 0 0 );
|
||||
}
|
||||
|
||||
lowerWall
|
||||
{
|
||||
type kqRWallFunction;
|
||||
value uniform ( 0 0 0 0 0 0 );
|
||||
}
|
||||
|
||||
atmosphere
|
||||
{
|
||||
type inletOutlet;
|
||||
inletValue uniform ( 0 0 0 0 0 0 );
|
||||
value uniform ( 0 0 0 0 0 0 );
|
||||
}
|
||||
|
||||
defaultFaces
|
||||
{
|
||||
type empty;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -1,55 +0,0 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class volScalarField;
|
||||
location "0";
|
||||
object mut;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
dimensions [ 1 -1 -1 0 0 0 0 ];
|
||||
|
||||
internalField uniform 0;
|
||||
|
||||
boundaryField
|
||||
{
|
||||
leftWall
|
||||
{
|
||||
type mutkWallFunction;
|
||||
value uniform 0;
|
||||
}
|
||||
|
||||
rightWall
|
||||
{
|
||||
type mutkWallFunction;
|
||||
value uniform 0;
|
||||
}
|
||||
|
||||
lowerWall
|
||||
{
|
||||
type mutkWallFunction;
|
||||
value uniform 0;
|
||||
}
|
||||
|
||||
atmosphere
|
||||
{
|
||||
type calculated;
|
||||
value uniform 0;
|
||||
}
|
||||
|
||||
defaultFaces
|
||||
{
|
||||
type empty;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -10,7 +10,7 @@ FoamFile
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class volScalarField;
|
||||
object p;
|
||||
object p_rgh;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -37,17 +37,18 @@ writeFormat ascii;
|
||||
|
||||
writePrecision 6;
|
||||
|
||||
writeCompression off;
|
||||
writeCompression uncompressed;
|
||||
|
||||
timeFormat general;
|
||||
|
||||
timePrecision 6;
|
||||
|
||||
runTimeModifiable true;
|
||||
runTimeModifiable yes;
|
||||
|
||||
adjustTimeStep yes;
|
||||
adjustTimeStep on;
|
||||
|
||||
maxCo 0.2;
|
||||
maxAlphaCo 0.2;
|
||||
|
||||
maxDeltaT 1;
|
||||
|
||||
|
||||
@ -46,7 +46,6 @@ laplacianSchemes
|
||||
interpolationSchemes
|
||||
{
|
||||
default linear;
|
||||
interpolate(HbyA) linear;
|
||||
}
|
||||
|
||||
snGradSchemes
|
||||
@ -57,7 +56,7 @@ snGradSchemes
|
||||
fluxRequired
|
||||
{
|
||||
default no;
|
||||
p;
|
||||
p_rgh;
|
||||
pcorr;
|
||||
alpha;
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ solvers
|
||||
relTol 0;
|
||||
}
|
||||
|
||||
p
|
||||
p_rgh
|
||||
{
|
||||
solver PCG;
|
||||
preconditioner DIC;
|
||||
@ -33,9 +33,10 @@ solvers
|
||||
relTol 0.05;
|
||||
}
|
||||
|
||||
pFinal
|
||||
p_rghFinal
|
||||
{
|
||||
$p;
|
||||
solver PCG;
|
||||
preconditioner DIC;
|
||||
tolerance 1e-07;
|
||||
relTol 0;
|
||||
}
|
||||
@ -50,7 +51,8 @@ solvers
|
||||
|
||||
"(k|epsilon|R|nuTilda)"
|
||||
{
|
||||
$U;
|
||||
solver PBiCG;
|
||||
preconditioner DILU;
|
||||
tolerance 1e-08;
|
||||
relTol 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user