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
ec1b7c01
Commit
ec1b7c01
authored
May 16, 2011
by
mattijs
Browse files
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
parents
d3b12e79
3868902d
Changes
6
Hide whitespace changes
Inline
Side-by-side
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H
View file @
ec1b7c01
...
...
@@ -39,8 +39,6 @@ Description
+
massSource
.
SuTot
()
);
rhoEqn
.
relax
();
rhoEqn
.
solve
();
}
...
...
src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
View file @
ec1b7c01
...
...
@@ -52,10 +52,28 @@ Foam::viscosityModels::HerschelBulkley::calcNu() const
{
dimensionedScalar
tone
(
"tone"
,
dimTime
,
1
.
0
);
dimensionedScalar
rtone
(
"rtone"
,
dimless
/
dimTime
,
1
.
0
);
tmp
<
volScalarField
>
sr
(
strainRate
());
return
(
min
(
nu0_
,(
tau0_
+
k_
*
rtone
*
(
pow
(
tone
*
sr
(),
n_
)
-
pow
(
tone
*
tau0_
/
nu0_
,
n_
)))
/
(
max
(
sr
(),
dimensionedScalar
(
"VSMALL"
,
dimless
/
dimTime
,
VSMALL
)))));
// return
// (
// min
// (
// nu0_,
// (tau0_ + k_*rtone*(pow(tone*sr(), n_) - pow(tone*tau0_/nu0_, n_)))
// /max(sr(), dimensionedScalar("VSMALL", dimless/dimTime, VSMALL))
// )
// );
return
(
min
(
nu0_
,
(
tau0_
+
k_
*
rtone
*
pow
(
tone
*
sr
(),
n_
))
/
(
max
(
sr
(),
dimensionedScalar
(
"VSMALL"
,
dimless
/
dimTime
,
VSMALL
)))
)
);
}
...
...
src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.C
View file @
ec1b7c01
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -57,7 +57,7 @@ Foam::viscosityModel::viscosityModel
Foam
::
tmp
<
Foam
::
volScalarField
>
Foam
::
viscosityModel
::
strainRate
()
const
{
return
mag
(
symm
(
fvc
::
grad
(
U_
)));
return
sqrt
(
2
.
0
)
*
mag
(
symm
(
fvc
::
grad
(
U_
)));
}
...
...
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution
View file @
ec1b7c01
...
...
@@ -77,7 +77,7 @@ PIMPLE
relaxationFactors
{
"h.*
1;
"h.*
"
1;
"U.*" 1;
}
...
...
tutorials/incompressible/simpleFoam/motorBike/0.org/U
View file @
ec1b7c01
...
...
@@ -35,7 +35,7 @@ boundaryField
lowerWall
{
type fixedValue;
value
uniform (20 0 0)
;
value
$internalField
;
}
"motorBike_.*"
...
...
tutorials/mesh/snappyHexMesh/flange/Allclean
View file @
ec1b7c01
...
...
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory
.
$WM_PROJECT_DIR
/bin/tools/CleanFunctions
rm
-rf
0
>
/dev/null 2>&1
rm
-f
./
*
.obj
>
/dev/null 2>&1
rm
-f
./flange
./
*
.obj
>
/dev/null 2>&1
rm
-rf
constant/extendedFeatureEdgeMesh
>
/dev/null 2>&1
rm
-f
constant/triSurface/flange.eMesh
>
/dev/null 2>&1
rm
-f
constant/polyMesh/boundary
...
...
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