songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs 2011-05-16 12:01:12 +01:00
commit ec1b7c019a
6 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H
View File

@ -39,8 +39,6 @@ Description
+ massSource.SuTot()
);
rhoEqn.relax();
rhoEqn.solve();
}

24
src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
View File

@ -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)))
)
);
}

4
src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 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_)));
}

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution
View File

@ -77,7 +77,7 @@ PIMPLE
relaxationFactors
{
"h.* 1;
"h.*" 1;
"U.*" 1;
}

2
tutorials/incompressible/simpleFoam/motorBike/0.org/U
View File

@ -35,7 +35,7 @@ boundaryField
lowerWall
{
type fixedValue;
value uniform (20 0 0);
value $internalField;
}
"motorBike_.*"

2
tutorials/mesh/snappyHexMesh/flange/Allclean
View File

@ -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