Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
aef0a00b
Commit
aef0a00b
authored
Mar 30, 2011
by
mattijs
Browse files
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
parents
56609d10
4802014f
Changes
5
Hide whitespace changes
Inline
Side-by-side
applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H
View file @
aef0a00b
...
...
@@ -11,7 +11,7 @@
scalar
rDeltaTSmoothingCoeff
(
piso
.
lookupOrDefault
<
scalar
>
(
"rDeltaTSmoothingCoeff"
,
0
.
02
)
piso
.
lookupOrDefault
<
scalar
>
(
"rDeltaTSmoothingCoeff"
,
0
.
1
)
);
label
nAlphaSpreadIter
...
...
@@ -21,17 +21,17 @@
scalar
alphaSpreadDiff
(
piso
.
lookupOrDefault
<
label
>
(
"alphaSpreadDiff"
,
0
.
2
)
piso
.
lookupOrDefault
<
scalar
>
(
"alphaSpreadDiff"
,
0
.
2
)
);
scalar
alphaSpreadMax
(
piso
.
lookupOrDefault
<
label
>
(
"alphaSpreadMax"
,
0
.
99
)
piso
.
lookupOrDefault
<
scalar
>
(
"alphaSpreadMax"
,
0
.
99
)
);
scalar
alphaSpreadMin
(
piso
.
lookupOrDefault
<
label
>
(
"alphaSpreadMin"
,
0
.
01
)
piso
.
lookupOrDefault
<
scalar
>
(
"alphaSpreadMin"
,
0
.
01
)
);
label
nAlphaSweepIter
...
...
@@ -63,11 +63,14 @@
{
// Further limit the reciprocal time-step
// in the vicinity of the interface
volScalarField
alpha1Bar
=
fvc
::
average
(
alpha1
);
rDeltaT
.
dimensionedInternalField
()
=
max
(
rDeltaT
.
dimensionedInternalField
(),
pos
(
alpha1
.
dimensionedInternalField
()
-
0
.
01
)
*
pos
(
0
.
99
-
alpha1
.
dimensionedInternalField
())
pos
(
alpha1
Bar
.
dimensionedInternalField
()
-
alphaSpreadMin
)
*
pos
(
alphaSpreadMax
-
alpha1
Bar
.
dimensionedInternalField
())
*
fvc
::
surfaceSum
(
mag
(
phi
))().
dimensionedInternalField
()
/
((
2
*
maxAlphaCo
)
*
mesh
.
V
())
);
...
...
src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
View file @
aef0a00b
...
...
@@ -154,20 +154,13 @@ void Foam::fvc::spread
const
label
own
=
owner
[
facei
];
const
label
nbr
=
neighbour
[
facei
];
if
(
(
alpha
[
own
]
>
alphaMin
&&
alpha
[
own
]
<
alphaMax
)
||
(
alpha
[
nbr
]
>
alphaMin
&&
alpha
[
nbr
]
<
alphaMax
)
)
if
(
mag
(
alpha
[
own
]
-
alpha
[
nbr
])
>
alphaDiff
)
{
if
(
mag
(
alpha
[
own
]
-
alpha
[
nbr
])
>
alphaDiff
)
{
changedFaces
.
append
(
facei
);
changedFacesInfo
.
append
(
smoothData
(
max
(
field
[
own
],
field
[
nbr
]))
);
}
changedFaces
.
append
(
facei
);
changedFacesInfo
.
append
(
smoothData
(
max
(
field
[
own
],
field
[
nbr
]))
);
}
}
...
...
@@ -188,20 +181,10 @@ void Foam::fvc::spread
alpha
.
boundaryField
()[
patchi
].
patchNeighbourField
()
);
if
(
(
alpha
[
own
]
>
alphaMin
&&
alpha
[
own
]
<
alphaMax
)
||
(
alphapn
[
patchFacei
]
>
alphaMin
&&
alphapn
[
patchFacei
]
<
alphaMax
)
)
if
(
mag
(
alpha
[
own
]
-
alphapn
[
patchFacei
])
>
alphaDiff
)
{
if
(
mag
(
alpha
[
own
]
-
alphapn
[
patchFacei
])
>
alphaDiff
)
{
changedFaces
.
append
(
facei
);
changedFacesInfo
.
append
(
smoothData
(
field
[
own
]));
}
changedFaces
.
append
(
facei
);
changedFacesInfo
.
append
(
smoothData
(
field
[
own
]));
}
}
}
...
...
tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha1.org
View file @
aef0a00b
...
...
@@ -29,9 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
inletValue uniform 0;
value uniform 0;
type zeroGradient;
}
sides
...
...
tutorials/multiphase/LTSInterFoam/wigleyHull/system/controlDict
View file @
aef0a00b
...
...
@@ -23,7 +23,7 @@ startTime 0;
stopAt endTime;
endTime
3
000;
endTime
2
000;
deltaT 1;
...
...
tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
View file @
aef0a00b
...
...
@@ -83,9 +83,10 @@ PISO
nAlphaSubCycles 1;
cAlpha 1;
maxCo 0.
8
;
maxCo 0.
9
;
maxAlphaCo 0.2;
rDeltaTSmoothingCoeff 0.02;
rDeltaTSmoothingCoeff 0.1;
rDeltaTDampingCoeff 1;
maxDeltaT 1;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment