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

This commit is contained in:
laurence
2013-08-14 14:43:33 +01:00
14 changed files with 156 additions and 133 deletions

View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
object alpha1;
object alpha.air;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -5,9 +5,9 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
cp 0/alpha1.org 0/alpha1
cp 0/alpha2.org 0/alpha2
cp 0/alpha3.org 0/alpha3
cp 0/alpha.air.org 0/alpha.air
cp 0/alpha.other.org 0/alpha.other
cp 0/alpha.water.org 0/alpha.water
runApplication setFields
runApplication `getApplication`

View File

@ -44,6 +44,7 @@ FoamFile
defaultFaces
{
type empty;
inGroups 1(empty);
nFaces 4536;
startFace 4640;
}

View File

@ -15,24 +15,23 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Air
phase1
phases (air other water);
air
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 1.48e-05;
rho rho [1 -3 0 0 0 0 0] 1;
}
// Other Liquid
phase2
other
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 1e-6;
rho rho [1 -3 0 0 0 0 0] 1010;
}
// Water
phase3
water
{
transportModel Newtonian;
nu nu [0 2 -1 0 0 0 0] 1e-6;

View File

@ -53,7 +53,7 @@ fluxRequired
default no;
p_rgh;
pcorr;
"alpha.";
"alpha.*";
}

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
"alpha."
"alpha.*"
{
nAlphaCorr 1;
nAlphaSubCycles 2;

View File

@ -17,9 +17,9 @@ FoamFile
defaultFieldValues
(
volScalarFieldValue alpha1 0
volScalarFieldValue alpha2 1
volScalarFieldValue alpha3 0
volScalarFieldValue alpha.air 0
volScalarFieldValue alpha.other 1
volScalarFieldValue alpha.water 0
);
regions
@ -29,9 +29,9 @@ regions
box (0 0 -1) (0.1461 0.292 1);
fieldValues
(
volScalarFieldValue alpha1 0
volScalarFieldValue alpha2 0
volScalarFieldValue alpha3 1
volScalarFieldValue alpha.air 0
volScalarFieldValue alpha.other 0
volScalarFieldValue alpha.water 1
);
}
boxToCell
@ -39,9 +39,9 @@ regions
box (0.1461 0.05 -1) (1 1 1);
fieldValues
(
volScalarFieldValue alpha1 1
volScalarFieldValue alpha2 0
volScalarFieldValue alpha3 0
volScalarFieldValue alpha.air 1
volScalarFieldValue alpha.other 0
volScalarFieldValue alpha.water 0
);
}
);